default initialize rpc structures

1 files changed, 308 insertions, 152 deletions

diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index c450b2b37..546e572bc 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -59,7 +59,7 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_GET_BALANCE
   {
-    struct request
+    struct request_t
     {
       uint32_t account_index;
       std::set<uint32_t> address_indices;
@@ -70,6 +70,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(all_accounts, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct per_subaddress_info
     {
@@ -92,7 +93,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       uint64_t 	 balance;
       uint64_t 	 unlocked_balance;
@@ -106,11 +107,12 @@ namespace wallet_rpc
         KV_SERIALIZE(per_subaddress)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
     struct COMMAND_RPC_GET_ADDRESS
   {
-    struct request
+    struct request_t
     {
       uint32_t account_index;
       std::vector<uint32_t> address_index;
@@ -119,6 +121,7 @@ namespace wallet_rpc
         KV_SERIALIZE(address_index)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct address_info
     {
@@ -135,7 +138,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::string address;                  // to remain compatible with older RPC format
       std::vector<address_info> addresses;
@@ -145,30 +148,33 @@ namespace wallet_rpc
         KV_SERIALIZE(addresses)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ADDRESS_INDEX
   {
-    struct request
+    struct request_t
     {
       std::string address;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       cryptonote::subaddress_index index;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(index)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CREATE_ADDRESS
   {
-    struct request
+    struct request_t
     {
       uint32_t account_index;
       std::string label;
@@ -178,8 +184,9 @@ namespace wallet_rpc
         KV_SERIALIZE(label)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string   address;
       uint32_t      address_index;
@@ -189,11 +196,12 @@ namespace wallet_rpc
         KV_SERIALIZE(address_index)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_LABEL_ADDRESS
   {
-    struct request
+    struct request_t
     {
       cryptonote::subaddress_index index;
       std::string label;
@@ -203,17 +211,19 @@ namespace wallet_rpc
         KV_SERIALIZE(label)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ACCOUNTS
   {
-    struct request
+    struct request_t
     {
       std::string tag;      // all accounts if empty, otherwise those accounts with this tag
 
@@ -221,6 +231,7 @@ namespace wallet_rpc
         KV_SERIALIZE(tag)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct subaddress_account_info
     {
@@ -241,7 +252,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       uint64_t total_balance;
       uint64_t total_unlocked_balance;
@@ -253,19 +264,21 @@ namespace wallet_rpc
         KV_SERIALIZE(subaddress_accounts)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CREATE_ACCOUNT
   {
-    struct request
+    struct request_t
     {
       std::string label;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(label)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint32_t account_index;
       std::string address;      // the 0-th address for convenience
@@ -274,11 +287,12 @@ namespace wallet_rpc
         KV_SERIALIZE(address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_LABEL_ACCOUNT
   {
-    struct request
+    struct request_t
     {
       uint32_t account_index;
       std::string label;
@@ -288,21 +302,24 @@ namespace wallet_rpc
         KV_SERIALIZE(label)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ACCOUNT_TAGS
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct account_tag_info
     {
@@ -317,7 +334,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::vector<account_tag_info> account_tags;
 
@@ -325,11 +342,12 @@ namespace wallet_rpc
         KV_SERIALIZE(account_tags)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_TAG_ACCOUNTS
   {
-    struct request
+    struct request_t
     {
       std::string tag;
       std::set<uint32_t> accounts;
@@ -339,17 +357,19 @@ namespace wallet_rpc
         KV_SERIALIZE(accounts)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_UNTAG_ACCOUNTS
   {
-    struct request
+    struct request_t
     {
       std::set<uint32_t> accounts;
 
@@ -357,17 +377,19 @@ namespace wallet_rpc
         KV_SERIALIZE(accounts)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_ACCOUNT_TAG_DESCRIPTION
   {
-    struct request
+    struct request_t
     {
       std::string tag;
       std::string description;
@@ -377,29 +399,33 @@ namespace wallet_rpc
         KV_SERIALIZE(description)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
     struct COMMAND_RPC_GET_HEIGHT
     {
-      struct request
+      struct request_t
       {
         BEGIN_KV_SERIALIZE_MAP()
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
 
-      struct response
+      struct response_t
       {
         uint64_t  height;
         BEGIN_KV_SERIALIZE_MAP()
           KV_SERIALIZE(height)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
     };
 
   struct transfer_destination
@@ -414,7 +440,7 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_TRANSFER
   {
-    struct request
+    struct request_t
     {
       std::list<transfer_destination> destinations;
       uint32_t account_index;
@@ -444,8 +470,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_metadata, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string tx_hash;
       std::string tx_key;
@@ -467,11 +494,12 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_TRANSFER_SPLIT
   {
-    struct request
+    struct request_t
     {
       std::list<transfer_destination> destinations;
       uint32_t account_index;
@@ -501,6 +529,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_metadata, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct key_list
     {
@@ -511,7 +540,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::list<std::string> tx_hash_list;
       std::list<std::string> tx_key_list;
@@ -533,6 +562,7 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_DESCRIBE_TRANSFER
@@ -577,7 +607,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct request
+    struct request_t
     {
       std::string unsigned_txset;
 
@@ -585,8 +615,9 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<transfer_description> desc;
 
@@ -594,11 +625,12 @@ namespace wallet_rpc
         KV_SERIALIZE(desc)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SIGN_TRANSFER
   {
-    struct request
+    struct request_t
     {
       std::string unsigned_txset;
       bool export_raw;
@@ -610,8 +642,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_keys, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string signed_txset;
       std::list<std::string> tx_hash_list;
@@ -625,11 +658,12 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_key_list)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SUBMIT_TRANSFER
   {
-    struct request
+    struct request_t
     {
       std::string tx_data_hex;
 
@@ -637,8 +671,9 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_data_hex)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<std::string> tx_hash_list;
 
@@ -646,11 +681,12 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_hash_list)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SWEEP_DUST
   {
-    struct request
+    struct request_t
     {
       bool get_tx_keys;
       bool do_not_relay;
@@ -664,6 +700,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_metadata, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct key_list
     {
@@ -674,7 +711,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::list<std::string> tx_hash_list;
       std::list<std::string> tx_key_list;
@@ -696,11 +733,12 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SWEEP_ALL
   {
-    struct request
+    struct request_t
     {
       std::string address;
       uint32_t account_index;
@@ -734,6 +772,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_metadata, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct key_list
     {
@@ -744,7 +783,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::list<std::string> tx_hash_list;
       std::list<std::string> tx_key_list;
@@ -766,11 +805,12 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SWEEP_SINGLE
   {
-    struct request
+    struct request_t
     {
       std::string address;
       uint32_t priority;
@@ -800,8 +840,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(get_tx_metadata, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string tx_hash;
       std::string tx_key;
@@ -823,11 +864,12 @@ namespace wallet_rpc
         KV_SERIALIZE(unsigned_txset)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_RELAY_TX
   {
-    struct request
+    struct request_t
     {
       std::string hex;
 
@@ -835,8 +877,9 @@ namespace wallet_rpc
         KV_SERIALIZE(hex)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string tx_hash;
 
@@ -844,21 +887,24 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_hash)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_STORE
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct payment_details
@@ -884,7 +930,7 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_GET_PAYMENTS
   {
-    struct request
+    struct request_t
     {
       std::string payment_id;
 
@@ -892,8 +938,9 @@ namespace wallet_rpc
         KV_SERIALIZE(payment_id)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<payment_details> payments;
 
@@ -901,11 +948,12 @@ namespace wallet_rpc
         KV_SERIALIZE(payments)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BULK_PAYMENTS
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> payment_ids;
       uint64_t min_block_height;
@@ -915,8 +963,9 @@ namespace wallet_rpc
         KV_SERIALIZE(min_block_height)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<payment_details> payments;
 
@@ -924,6 +973,7 @@ namespace wallet_rpc
         KV_SERIALIZE(payments)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct transfer_details
@@ -947,7 +997,7 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_INCOMING_TRANSFERS
   {
-    struct request
+    struct request_t
     {
       std::string transfer_type;
       uint32_t account_index;
@@ -959,8 +1009,9 @@ namespace wallet_rpc
         KV_SERIALIZE(subaddr_indices)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<transfer_details> transfers;
 
@@ -968,12 +1019,13 @@ namespace wallet_rpc
         KV_SERIALIZE(transfers)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //JSON RPC V2
   struct COMMAND_RPC_QUERY_KEY
   {
-    struct request
+    struct request_t
     {
       std::string key_type;
 
@@ -981,8 +1033,9 @@ namespace wallet_rpc
         KV_SERIALIZE(key_type)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string key;
 
@@ -990,11 +1043,12 @@ namespace wallet_rpc
         KV_SERIALIZE(key)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_MAKE_INTEGRATED_ADDRESS
   {
-    struct request
+    struct request_t
     {
       std::string standard_address;
       std::string payment_id;
@@ -1004,8 +1058,9 @@ namespace wallet_rpc
         KV_SERIALIZE(payment_id)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string integrated_address;
       std::string payment_id;
@@ -1015,11 +1070,12 @@ namespace wallet_rpc
         KV_SERIALIZE(payment_id)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SPLIT_INTEGRATED_ADDRESS
   {
-    struct request
+    struct request_t
     {
       std::string integrated_address;
 
@@ -1027,8 +1083,9 @@ namespace wallet_rpc
         KV_SERIALIZE(integrated_address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string standard_address;
       std::string payment_id;
@@ -1040,26 +1097,29 @@ namespace wallet_rpc
         KV_SERIALIZE(is_subaddress)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_STOP_WALLET
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_RESCAN_BLOCKCHAIN
   {
-    struct request
+    struct request_t
     {
       bool hard;
 
@@ -1067,17 +1127,19 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(hard, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_TX_NOTES
   {
-    struct request
+    struct request_t
     {
       std::list<std::string> txids;
       std::list<std::string> notes;
@@ -1087,17 +1149,19 @@ namespace wallet_rpc
         KV_SERIALIZE(notes)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TX_NOTES
   {
-    struct request
+    struct request_t
     {
       std::list<std::string> txids;
 
@@ -1105,8 +1169,9 @@ namespace wallet_rpc
         KV_SERIALIZE(txids)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<std::string> notes;
 
@@ -1114,11 +1179,12 @@ namespace wallet_rpc
         KV_SERIALIZE(notes)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_ATTRIBUTE
   {
-    struct request
+    struct request_t
     {
       std::string key;
       std::string value;
@@ -1128,17 +1194,19 @@ namespace wallet_rpc
         KV_SERIALIZE(value)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ATTRIBUTE
   {
-    struct request
+    struct request_t
     {
 
       std::string key;
@@ -1147,8 +1215,9 @@ namespace wallet_rpc
         KV_SERIALIZE(key)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string value;
 
@@ -1156,11 +1225,12 @@ namespace wallet_rpc
         KV_SERIALIZE(value)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TX_KEY
   {
-    struct request
+    struct request_t
     {
       std::string txid;
 
@@ -1168,8 +1238,9 @@ namespace wallet_rpc
         KV_SERIALIZE(txid)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string tx_key;
 
@@ -1177,11 +1248,12 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_key)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CHECK_TX_KEY
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       std::string tx_key;
@@ -1193,8 +1265,9 @@ namespace wallet_rpc
         KV_SERIALIZE(address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t received;
       bool in_pool;
@@ -1206,11 +1279,12 @@ namespace wallet_rpc
         KV_SERIALIZE(confirmations)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TX_PROOF
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       std::string address;
@@ -1222,8 +1296,9 @@ namespace wallet_rpc
         KV_SERIALIZE(message)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string signature;
 
@@ -1231,11 +1306,12 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CHECK_TX_PROOF
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       std::string address;
@@ -1249,8 +1325,9 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       bool good;
       uint64_t received;
@@ -1264,6 +1341,7 @@ namespace wallet_rpc
         KV_SERIALIZE(confirmations)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct transfer_entry
@@ -1305,7 +1383,7 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_GET_SPEND_PROOF
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       std::string message;
@@ -1315,8 +1393,9 @@ namespace wallet_rpc
         KV_SERIALIZE(message)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string signature;
 
@@ -1324,11 +1403,12 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CHECK_SPEND_PROOF
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       std::string message;
@@ -1340,8 +1420,9 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       bool good;
 
@@ -1349,11 +1430,12 @@ namespace wallet_rpc
         KV_SERIALIZE(good)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_RESERVE_PROOF
   {
-    struct request
+    struct request_t
     {
       bool all;
       uint32_t account_index;     // ignored when `all` is true
@@ -1367,8 +1449,9 @@ namespace wallet_rpc
         KV_SERIALIZE(message)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string signature;
 
@@ -1376,11 +1459,12 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CHECK_RESERVE_PROOF
   {
-    struct request
+    struct request_t
     {
       std::string address;
       std::string message;
@@ -1392,8 +1476,9 @@ namespace wallet_rpc
         KV_SERIALIZE(signature)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       bool good;
       uint64_t total;
@@ -1405,11 +1490,12 @@ namespace wallet_rpc
         KV_SERIALIZE(spent)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TRANSFERS
   {
-    struct request
+    struct request_t
     {
       bool in;
       bool out;
@@ -1438,8 +1524,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(all_accounts, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<transfer_entry> in;
       std::list<transfer_entry> out;
@@ -1455,11 +1542,12 @@ namespace wallet_rpc
         KV_SERIALIZE(pool);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TRANSFER_BY_TXID
   {
-    struct request
+    struct request_t
     {
       std::string txid;
       uint32_t account_index;
@@ -1469,8 +1557,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(account_index, (uint32_t)0)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       transfer_entry transfer;
       std::list<transfer_entry> transfers;
@@ -1480,11 +1569,12 @@ namespace wallet_rpc
         KV_SERIALIZE(transfers);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SIGN
   {
-    struct request
+    struct request_t
     {
       std::string data;
 
@@ -1492,8 +1582,9 @@ namespace wallet_rpc
         KV_SERIALIZE(data);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string signature;
 
@@ -1501,11 +1592,12 @@ namespace wallet_rpc
         KV_SERIALIZE(signature);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_VERIFY
   {
-    struct request
+    struct request_t
     {
       std::string data;
       std::string address;
@@ -1517,8 +1609,9 @@ namespace wallet_rpc
         KV_SERIALIZE(signature);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       bool good;
 
@@ -1526,17 +1619,19 @@ namespace wallet_rpc
         KV_SERIALIZE(good);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_EXPORT_OUTPUTS
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string outputs_data_hex;
 
@@ -1544,11 +1639,12 @@ namespace wallet_rpc
         KV_SERIALIZE(outputs_data_hex);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_IMPORT_OUTPUTS
   {
-    struct request
+    struct request_t
     {
       std::string outputs_data_hex;
 
@@ -1556,8 +1652,9 @@ namespace wallet_rpc
         KV_SERIALIZE(outputs_data_hex);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t num_imported;
 
@@ -1565,11 +1662,12 @@ namespace wallet_rpc
         KV_SERIALIZE(num_imported);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_EXPORT_KEY_IMAGES
   {
-    struct request
+    struct request_t
     {
       bool all;
 
@@ -1577,6 +1675,7 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(all, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct signed_key_image
     {
@@ -1589,7 +1688,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       uint32_t offset;
       std::vector<signed_key_image> signed_key_images;
@@ -1599,6 +1698,7 @@ namespace wallet_rpc
         KV_SERIALIZE(signed_key_images);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_IMPORT_KEY_IMAGES
@@ -1614,7 +1714,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct request
+    struct request_t
     {
       uint32_t offset;
       std::vector<signed_key_image> signed_key_images;
@@ -1624,8 +1724,9 @@ namespace wallet_rpc
         KV_SERIALIZE(signed_key_images);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t height;
       uint64_t spent;
@@ -1637,6 +1738,7 @@ namespace wallet_rpc
         KV_SERIALIZE(unspent)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct uri_spec
@@ -1658,11 +1760,12 @@ namespace wallet_rpc
 
   struct COMMAND_RPC_MAKE_URI
   {
-    struct request: public uri_spec
+    struct request_t: public uri_spec
     {
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string uri;
 
@@ -1670,11 +1773,12 @@ namespace wallet_rpc
         KV_SERIALIZE(uri)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_PARSE_URI
   {
-    struct request
+    struct request_t
     {
       std::string uri;
 
@@ -1682,8 +1786,9 @@ namespace wallet_rpc
         KV_SERIALIZE(uri)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uri_spec uri;
       std::vector<std::string> unknown_parameters;
@@ -1693,11 +1798,12 @@ namespace wallet_rpc
         KV_SERIALIZE(unknown_parameters);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_ADD_ADDRESS_BOOK_ENTRY
   {
-    struct request
+    struct request_t
     {
       std::string address;
       std::string payment_id;
@@ -1709,8 +1815,9 @@ namespace wallet_rpc
         KV_SERIALIZE(description)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t index;
 
@@ -1718,11 +1825,12 @@ namespace wallet_rpc
         KV_SERIALIZE(index);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ADDRESS_BOOK_ENTRY
   {
-    struct request
+    struct request_t
     {
       std::list<uint64_t> entries;
 
@@ -1730,6 +1838,7 @@ namespace wallet_rpc
         KV_SERIALIZE(entries)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct entry
     {
@@ -1746,7 +1855,7 @@ namespace wallet_rpc
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::vector<entry> entries;
 
@@ -1754,11 +1863,12 @@ namespace wallet_rpc
         KV_SERIALIZE(entries)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_DELETE_ADDRESS_BOOK_ENTRY
   {
-    struct request
+    struct request_t
     {
       uint64_t index;
 
@@ -1766,32 +1876,36 @@ namespace wallet_rpc
         KV_SERIALIZE(index);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_RESCAN_SPENT
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_REFRESH
   {
-    struct request
+    struct request_t
     {
       uint64_t start_height;
 
@@ -1799,8 +1913,9 @@ namespace wallet_rpc
         KV_SERIALIZE_OPT(start_height, (uint64_t) 0)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t blocks_fetched;
       bool received_money;
@@ -1810,11 +1925,12 @@ namespace wallet_rpc
         KV_SERIALIZE(received_money);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_START_MINING
   {
-    struct request
+    struct request_t
     {
       uint64_t    threads_count;
       bool        do_background_mining;
@@ -1826,37 +1942,43 @@ namespace wallet_rpc
         KV_SERIALIZE(ignore_battery)        
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_STOP_MINING
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_LANGUAGES
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
-    struct response
+    typedef epee::misc_utils::struct_init<request_t> request;
+
+    struct response_t
     {
       std::vector<std::string> languages;
 
@@ -1864,11 +1986,12 @@ namespace wallet_rpc
         KV_SERIALIZE(languages)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CREATE_WALLET
   {
-    struct request
+    struct request_t
     {
       std::string filename;
       std::string password;
@@ -1880,16 +2003,19 @@ namespace wallet_rpc
         KV_SERIALIZE(language)
       END_KV_SERIALIZE_MAP()
     };
-    struct response
+    typedef epee::misc_utils::struct_init<request_t> request;
+
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_OPEN_WALLET
   {
-    struct request
+    struct request_t
     {
       std::string filename;
       std::string password;
@@ -1899,31 +2025,36 @@ namespace wallet_rpc
         KV_SERIALIZE(password)
       END_KV_SERIALIZE_MAP()
     };
-    struct response
+    typedef epee::misc_utils::struct_init<request_t> request;
+
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CLOSE_WALLET
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_CHANGE_WALLET_PASSWORD
   {
-    struct request
+    struct request_t
     {
       std::string old_password;
       std::string new_password;
@@ -1933,16 +2064,19 @@ namespace wallet_rpc
         KV_SERIALIZE(new_password)
       END_KV_SERIALIZE_MAP()
     };
-    struct response
+    typedef epee::misc_utils::struct_init<request_t> request;
+
+    struct response_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_RESTORE_DETERMINISTIC_WALLET
   {
-    struct request
+    struct request_t
     {
       uint64_t restore_height;
       std::string filename;
@@ -1960,8 +2094,9 @@ namespace wallet_rpc
       KV_SERIALIZE(language)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string address;
       std::string seed;
@@ -1975,17 +2110,19 @@ namespace wallet_rpc
       KV_SERIALIZE(was_deprecated)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_IS_MULTISIG
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       bool multisig;
       bool ready;
@@ -1999,17 +2136,19 @@ namespace wallet_rpc
         KV_SERIALIZE(total)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_PREPARE_MULTISIG
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string multisig_info;
 
@@ -2017,11 +2156,12 @@ namespace wallet_rpc
         KV_SERIALIZE(multisig_info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_MAKE_MULTISIG
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> multisig_info;
       uint32_t threshold;
@@ -2033,8 +2173,9 @@ namespace wallet_rpc
         KV_SERIALIZE(password)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string address;
       std::string multisig_info;
@@ -2044,17 +2185,19 @@ namespace wallet_rpc
         KV_SERIALIZE(multisig_info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_EXPORT_MULTISIG
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string info;
 
@@ -2062,11 +2205,12 @@ namespace wallet_rpc
         KV_SERIALIZE(info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_IMPORT_MULTISIG
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> info;
 
@@ -2074,8 +2218,9 @@ namespace wallet_rpc
         KV_SERIALIZE(info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t n_outputs;
 
@@ -2083,11 +2228,12 @@ namespace wallet_rpc
         KV_SERIALIZE(n_outputs)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_FINALIZE_MULTISIG
   {
-    struct request
+    struct request_t
     {
       std::string password;
       std::vector<std::string> multisig_info;
@@ -2097,8 +2243,9 @@ namespace wallet_rpc
         KV_SERIALIZE(multisig_info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string address;
 
@@ -2106,11 +2253,12 @@ namespace wallet_rpc
         KV_SERIALIZE(address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_EXCHANGE_MULTISIG_KEYS
   {
-    struct request
+    struct request_t
     {
       std::string password;
       std::vector<std::string> multisig_info;
@@ -2120,8 +2268,9 @@ namespace wallet_rpc
         KV_SERIALIZE(multisig_info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string address;
       std::string multisig_info;
@@ -2131,11 +2280,12 @@ namespace wallet_rpc
         KV_SERIALIZE(multisig_info)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SIGN_MULTISIG
   {
-    struct request
+    struct request_t
     {
       std::string tx_data_hex;
 
@@ -2143,8 +2293,9 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_data_hex)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string tx_data_hex;
       std::list<std::string> tx_hash_list;
@@ -2154,11 +2305,12 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_hash_list)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SUBMIT_MULTISIG
   {
-    struct request
+    struct request_t
     {
       std::string tx_data_hex;
 
@@ -2166,8 +2318,9 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_data_hex)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::list<std::string> tx_hash_list;
 
@@ -2175,17 +2328,19 @@ namespace wallet_rpc
         KV_SERIALIZE(tx_hash_list)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_VERSION
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint32_t version;
 
@@ -2193,6 +2348,7 @@ namespace wallet_rpc
         KV_SERIALIZE(version)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_VALIDATE_ADDRESS