default initialize rpc structures

1 files changed, 259 insertions, 140 deletions

diff --git a/src/rpc/core_rpc_server_commands_defs.h b/src/rpc/core_rpc_server_commands_defs.h
index e52e4fc67..88fa9b4e7 100644
--- a/src/rpc/core_rpc_server_commands_defs.h
+++ b/src/rpc/core_rpc_server_commands_defs.h
@@ -90,13 +90,14 @@ namespace cryptonote
 
   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;
       std::string status;
@@ -108,12 +109,13 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BLOCKS_FAST
   {
 
-    struct request
+    struct request_t
     {
       std::list<crypto::hash> block_ids; //*first 10 blocks id goes sequential, next goes in pow(2,n) offset, like 2, 4, 8, 16, 32, 64 and so on, and the last one is always genesis block */
       uint64_t    start_height;
@@ -126,6 +128,7 @@ namespace cryptonote
         KV_SERIALIZE_OPT(no_miner_tx, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct tx_output_indices
     {
@@ -145,7 +148,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::vector<block_complete_entry> blocks;
       uint64_t    start_height;
@@ -163,19 +166,21 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BLOCKS_BY_HEIGHT
   {
-    struct request
+    struct request_t
     {
       std::vector<uint64_t> heights;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(heights)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::vector<block_complete_entry> blocks;
       std::string status;
@@ -187,17 +192,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
     struct COMMAND_RPC_GET_ALT_BLOCKS_HASHES
     {
-        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::vector<std::string> blks_hashes;
             std::string status;
@@ -209,11 +216,12 @@ namespace cryptonote
                 KV_SERIALIZE(untrusted)
             END_KV_SERIALIZE_MAP()
         };
+        typedef epee::misc_utils::struct_init<response_t> response;
     };
   struct COMMAND_RPC_GET_HASHES_FAST
   {
 
-    struct request
+    struct request_t
     {
       std::list<crypto::hash> block_ids; //*first 10 blocks id goes sequential, next goes in pow(2,n) offset, like 2, 4, 8, 16, 32, 64 and so on, and the last one is always genesis block */
       uint64_t    start_height;
@@ -222,8 +230,9 @@ namespace cryptonote
         KV_SERIALIZE(start_height)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::vector<crypto::hash> m_block_ids;
       uint64_t    start_height;
@@ -239,12 +248,13 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //-----------------------------------------------
   struct COMMAND_RPC_GET_ADDRESS_TXS
   {
-      struct request
+      struct request_t
       {
         std::string address;
         std::string view_key;
@@ -254,6 +264,7 @@ namespace cryptonote
           KV_SERIALIZE(view_key)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
       
       struct spent_output {
         uint64_t amount;
@@ -304,7 +315,7 @@ namespace cryptonote
       };
       
       
-      struct response
+      struct response_t
       {
         //std::list<std::string> txs_as_json;
         uint64_t total_received;
@@ -324,12 +335,13 @@ namespace cryptonote
           KV_SERIALIZE(status)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   //-----------------------------------------------
   struct COMMAND_RPC_GET_ADDRESS_INFO
   {
-      struct request
+      struct request_t
       {
         std::string address;
         std::string view_key;
@@ -339,6 +351,7 @@ namespace cryptonote
           KV_SERIALIZE(view_key)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
       
       struct spent_output 
       {
@@ -356,10 +369,8 @@ namespace cryptonote
           KV_SERIALIZE(mixin)
         END_KV_SERIALIZE_MAP()
       };
-  
-      
-      
-      struct response
+ 
+      struct response_t
       { 
         uint64_t locked_funds;
         uint64_t total_received;
@@ -382,12 +393,13 @@ namespace cryptonote
           KV_SERIALIZE(spent_outputs)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   //-----------------------------------------------
   struct COMMAND_RPC_GET_UNSPENT_OUTS
   {
-      struct request
+      struct request_t
       {
         std::string amount;
         std::string address;
@@ -406,6 +418,7 @@ namespace cryptonote
           KV_SERIALIZE(dust_threshold)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
     
       
       struct output {
@@ -437,7 +450,7 @@ namespace cryptonote
         END_KV_SERIALIZE_MAP()
       };
       
-      struct response
+      struct response_t
       {
         uint64_t amount;
         std::list<output> outputs;
@@ -452,12 +465,13 @@ namespace cryptonote
           KV_SERIALIZE(reason)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   //-----------------------------------------------
   struct COMMAND_RPC_GET_RANDOM_OUTS
   {
-      struct request
+      struct request_t
       {
         std::vector<std::string> amounts;
         uint32_t count;
@@ -467,6 +481,7 @@ namespace cryptonote
           KV_SERIALIZE(count)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
     
       
       struct output {
@@ -491,7 +506,7 @@ namespace cryptonote
         
       };
       
-      struct response
+      struct response_t
       {
         std::vector<amount_out> amount_outs;
         std::string Error;
@@ -500,11 +515,12 @@ namespace cryptonote
           KV_SERIALIZE(Error)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_SUBMIT_RAW_TX
   {
-      struct request
+      struct request_t
       {
         std::string address;
         std::string view_key;
@@ -516,9 +532,10 @@ namespace cryptonote
           KV_SERIALIZE(tx)  
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<request_t> request;
     
       
-      struct response
+      struct response_t
       {
         std::string status;
         std::string error;
@@ -528,11 +545,12 @@ namespace cryptonote
           KV_SERIALIZE(error)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_LOGIN
   {
-      struct request
+      struct request_t
       {
         std::string address;
         std::string view_key;
@@ -544,9 +562,9 @@ namespace cryptonote
           KV_SERIALIZE(create_account) 
         END_KV_SERIALIZE_MAP()
       };
-    
-      
-      struct response
+      typedef epee::misc_utils::struct_init<request_t> request;
+
+      struct response_t
       {
         std::string status;
         std::string reason;
@@ -558,11 +576,12 @@ namespace cryptonote
           KV_SERIALIZE(new_address)
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_IMPORT_WALLET_REQUEST
   {
-      struct request
+      struct request_t
       {
         std::string address;
         std::string view_key;
@@ -572,9 +591,9 @@ namespace cryptonote
           KV_SERIALIZE(view_key)
         END_KV_SERIALIZE_MAP()
       };
-    
-      
-      struct response
+      typedef epee::misc_utils::struct_init<request_t> request;
+
+      struct response_t
       {
         std::string payment_id;
         uint64_t import_fee;
@@ -592,11 +611,12 @@ namespace cryptonote
           KV_SERIALIZE(status)            
         END_KV_SERIALIZE_MAP()
       };
+      typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_GET_TRANSACTIONS
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> txs_hashes;
       bool decode_as_json;
@@ -610,6 +630,7 @@ namespace cryptonote
         KV_SERIALIZE_OPT(split, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct entry
     {
@@ -640,7 +661,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       // older compatibility stuff
       std::vector<std::string> txs_as_hex;  //transactions blobs as hex (old compat)
@@ -663,6 +684,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //-----------------------------------------------
@@ -674,7 +696,7 @@ namespace cryptonote
       SPENT_IN_POOL = 2,
     };
 
-    struct request
+    struct request_t
     {
       std::vector<std::string> key_images;
 
@@ -682,9 +704,10 @@ namespace cryptonote
         KV_SERIALIZE(key_images)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
 
-    struct response
+    struct response_t
     {
       std::vector<int> spent_status;
       std::string status;
@@ -696,21 +719,23 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //-----------------------------------------------
   struct COMMAND_RPC_GET_TX_GLOBAL_OUTPUTS_INDEXES
   {
-    struct request
+    struct request_t
     {
       crypto::hash txid;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE_VAL_POD_AS_BLOB(txid)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
 
-    struct response
+    struct response_t
     {
       std::vector<uint64_t> o_indexes;
       std::string status;
@@ -721,6 +746,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct get_outputs_out
@@ -736,7 +762,7 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_OUTPUTS_BIN
   {
-    struct request
+    struct request_t
     {
       std::vector<get_outputs_out> outputs;
       bool get_txid;
@@ -746,6 +772,7 @@ namespace cryptonote
         KV_SERIALIZE_OPT(get_txid, true)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct outkey
     {
@@ -764,7 +791,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::vector<outkey> outs;
       std::string status;
@@ -776,11 +803,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_GET_OUTPUTS
   {
-    struct request
+    struct request_t
     {
       std::vector<get_outputs_out> outputs;
 
@@ -788,6 +816,7 @@ namespace cryptonote
         KV_SERIALIZE(outputs)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct outkey
     {
@@ -806,7 +835,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::vector<outkey> outs;
       std::string status;
@@ -818,11 +847,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_SEND_RAW_TX
   {
-    struct request
+    struct request_t
     {
       std::string tx_as_hex;
       bool do_not_relay;
@@ -832,9 +862,10 @@ namespace cryptonote
         KV_SERIALIZE_OPT(do_not_relay, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::string reason;
@@ -864,11 +895,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_START_MINING
   {
-    struct request
+    struct request_t
     {
       std::string miner_address;
       uint64_t    threads_count;
@@ -882,8 +914,9 @@ namespace cryptonote
         KV_SERIALIZE(ignore_battery)        
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -891,18 +924,20 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   //-----------------------------------------------
   struct COMMAND_RPC_GET_INFO
   {
-    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 status;
       uint64_t height;
@@ -974,21 +1009,23 @@ namespace cryptonote
         KV_SERIALIZE(version)
       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
     {
       std::string status;
 
@@ -996,20 +1033,22 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //-----------------------------------------------
   struct COMMAND_RPC_MINING_STATUS
   {
-    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 status;
       bool active;
@@ -1027,20 +1066,22 @@ namespace cryptonote
         KV_SERIALIZE(is_background_mining_enabled)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   //-----------------------------------------------
   struct COMMAND_RPC_SAVE_BC
   {
-    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 status;
 
@@ -1048,6 +1089,7 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   //
@@ -1055,7 +1097,7 @@ namespace cryptonote
   {
     typedef std::list<std::string> request;
 
-    struct response
+    struct response_t
     {
       uint64_t count;
       std::string status;
@@ -1065,7 +1107,7 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
-
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GETBLOCKHASH
@@ -1078,7 +1120,7 @@ namespace cryptonote
 
   struct COMMAND_RPC_GETBLOCKTEMPLATE
   {
-    struct request
+    struct request_t
     {
       uint64_t reserve_size;       //max 255 bytes
       std::string wallet_address;
@@ -1088,8 +1130,9 @@ namespace cryptonote
         KV_SERIALIZE(wallet_address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint64_t difficulty;
       uint64_t height;
@@ -1113,13 +1156,14 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SUBMITBLOCK
   {
     typedef std::vector<std::string> request;
     
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -1127,11 +1171,12 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GENERATEBLOCKS
   {
-    struct request
+    struct request_t
     {
       uint64_t amount_of_blocks;
       std::string wallet_address;
@@ -1141,8 +1186,9 @@ namespace cryptonote
         KV_SERIALIZE(wallet_address)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
     
-    struct response
+    struct response_t
     {
       uint64_t height;
       std::string status;
@@ -1152,6 +1198,7 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct block_header_response
@@ -1197,7 +1244,7 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_LAST_BLOCK_HEADER
   {
-    struct request
+    struct request_t
     {
       bool fill_pow_hash;
 
@@ -1205,8 +1252,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(fill_pow_hash, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       block_header_response block_header;
@@ -1218,12 +1266,13 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
 
   };
   
   struct COMMAND_RPC_GET_BLOCK_HEADER_BY_HASH
   {
-    struct request
+    struct request_t
     {
       std::string hash;
       bool fill_pow_hash;
@@ -1233,8 +1282,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(fill_pow_hash, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       block_header_response block_header;
@@ -1246,12 +1296,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
-
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BLOCK_HEADER_BY_HEIGHT
   {
-    struct request
+    struct request_t
     {
       uint64_t height;
       bool fill_pow_hash;
@@ -1261,8 +1311,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(fill_pow_hash, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       block_header_response block_header;
@@ -1274,12 +1325,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
-
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BLOCK
   {
-    struct request
+    struct request_t
     {
       std::string hash;
       uint64_t height;
@@ -1291,8 +1342,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(fill_pow_hash, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       block_header_response block_header;
@@ -1312,7 +1364,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
-
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct peer {
@@ -1344,13 +1396,14 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_PEER_LIST
   {
-    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 status;
       std::vector<peer> white_list;
@@ -1362,11 +1415,12 @@ namespace cryptonote
         KV_SERIALIZE(gray_list)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_LOG_HASH_RATE
   {
-    struct request
+    struct request_t
     {
       bool visible;
 
@@ -1374,19 +1428,21 @@ namespace cryptonote
         KV_SERIALIZE(visible)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_LOG_LEVEL
   {
-    struct request
+    struct request_t
     {
       int8_t level;
 
@@ -1394,19 +1450,21 @@ namespace cryptonote
         KV_SERIALIZE(level)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SET_LOG_CATEGORIES
   {
-    struct request
+    struct request_t
     {
       std::string categories;
 
@@ -1414,8 +1472,9 @@ namespace cryptonote
         KV_SERIALIZE(categories)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::string categories;
@@ -1425,6 +1484,7 @@ namespace cryptonote
         KV_SERIALIZE(categories)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct tx_info
@@ -1479,13 +1539,14 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_TRANSACTION_POOL
   {
-    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 status;
       std::vector<tx_info> transactions;
@@ -1499,17 +1560,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TRANSACTION_POOL_HASHES_BIN
   {
-    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 status;
       std::vector<crypto::hash> tx_hashes;
@@ -1521,17 +1584,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_TRANSACTION_POOL_HASHES
   {
-    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 status;
       std::vector<std::string> tx_hashes;
@@ -1543,6 +1608,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct tx_backlog_entry
@@ -1554,13 +1620,14 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_TRANSACTION_POOL_BACKLOG
   {
-    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 status;
       std::vector<tx_backlog_entry> backlog;
@@ -1572,6 +1639,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct txpool_histo
@@ -1622,13 +1690,14 @@ namespace cryptonote
 
   struct COMMAND_RPC_GET_TRANSACTION_POOL_STATS
   {
-    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 status;
       txpool_stats pool_stats;
@@ -1640,17 +1709,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_CONNECTIONS
   {
-    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 status;
       std::list<connection_info> connections;
@@ -1660,12 +1731,12 @@ namespace cryptonote
         KV_SERIALIZE(connections)
       END_KV_SERIALIZE_MAP()
     };
-
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BLOCK_HEADERS_RANGE
   {
-    struct request
+    struct request_t
     {
       uint64_t start_height;
       uint64_t end_height;
@@ -1677,8 +1748,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(fill_pow_hash, false);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::vector<block_header_response> headers;
@@ -1690,17 +1762,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_STOP_DAEMON
   {
-    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 status;
 
@@ -1708,17 +1782,19 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_FAST_EXIT
   {
-	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 status;
 	  
@@ -1726,17 +1802,19 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_GET_LIMIT
   {
-    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 status;
       uint64_t limit_up;
@@ -1750,11 +1828,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_SET_LIMIT
   {
-    struct request
+    struct request_t
     {
       int64_t limit_down;  // all limits (for get and set) are kB/s
       int64_t limit_up;
@@ -1764,8 +1843,9 @@ namespace cryptonote
         KV_SERIALIZE(limit_up)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
     
-    struct response
+    struct response_t
     {
       std::string status;
       int64_t limit_up;
@@ -1777,19 +1857,21 @@ namespace cryptonote
         KV_SERIALIZE(limit_down)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_OUT_PEERS
   {
-	struct request
+    struct request_t
     {
 	  uint64_t out_peers;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(out_peers)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
     
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -1797,19 +1879,21 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_IN_PEERS
   {
-    struct request
+    struct request_t
     {
       uint64_t in_peers;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(in_peers)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -1817,17 +1901,19 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
     
   struct COMMAND_RPC_START_SAVE_GRAPH
   {
-	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 status;
 	  
@@ -1835,17 +1921,19 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
   
   struct COMMAND_RPC_STOP_SAVE_GRAPH
   {
-	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 status;
 	  
@@ -1853,11 +1941,12 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_HARD_FORK_INFO
   {
-    struct request
+    struct request_t
     {
       uint8_t version;
 
@@ -1865,8 +1954,9 @@ namespace cryptonote
         KV_SERIALIZE(version)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint8_t version;
       bool enabled;
@@ -1892,6 +1982,7 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GETBANS
@@ -1909,13 +2000,14 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    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 status;
       std::vector<ban> bans;
@@ -1925,6 +2017,7 @@ namespace cryptonote
         KV_SERIALIZE(bans)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SETBANS
@@ -1944,7 +2037,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct request
+    struct request_t
     {
       std::vector<ban> bans;
 
@@ -1952,8 +2045,9 @@ namespace cryptonote
         KV_SERIALIZE(bans)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -1961,11 +2055,12 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_FLUSH_TRANSACTION_POOL
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> txids;
 
@@ -1973,8 +2068,9 @@ namespace cryptonote
         KV_SERIALIZE(txids)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -1982,11 +2078,12 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_OUTPUT_HISTOGRAM
   {
-    struct request
+    struct request_t
     {
       std::vector<uint64_t> amounts;
       uint64_t min_count;
@@ -2002,6 +2099,7 @@ namespace cryptonote
         KV_SERIALIZE(recent_cutoff);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct entry
     {
@@ -2022,7 +2120,7 @@ namespace cryptonote
       entry() {}
     };
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::vector<entry> histogram;
@@ -2034,17 +2132,19 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       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
     {
       std::string status;
       uint32_t version;
@@ -2056,11 +2156,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_COINBASE_TX_SUM
   {
-    struct request
+    struct request_t
     {
       uint64_t height;
       uint64_t count;
@@ -2070,8 +2171,9 @@ namespace cryptonote
         KV_SERIALIZE(count);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       uint64_t emission_amount;
@@ -2083,11 +2185,12 @@ namespace cryptonote
         KV_SERIALIZE(fee_amount)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_BASE_FEE_ESTIMATE
   {
-    struct request
+    struct request_t
     {
       uint64_t grace_blocks;
 
@@ -2095,8 +2198,9 @@ namespace cryptonote
         KV_SERIALIZE(grace_blocks)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       uint64_t fee;
@@ -2110,15 +2214,17 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_ALTERNATE_CHAINS
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct chain_info
     {
@@ -2139,7 +2245,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::list<chain_info> chains;
@@ -2149,11 +2255,12 @@ namespace cryptonote
         KV_SERIALIZE(chains)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_UPDATE
   {
-    struct request
+    struct request_t
     {
       std::string command;
       std::string path;
@@ -2163,8 +2270,9 @@ namespace cryptonote
         KV_SERIALIZE(path);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       bool update;
@@ -2184,11 +2292,12 @@ namespace cryptonote
         KV_SERIALIZE(path)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_RELAY_TX
   {
-    struct request
+    struct request_t
     {
       std::vector<std::string> txids;
 
@@ -2196,8 +2305,9 @@ namespace cryptonote
         KV_SERIALIZE(txids)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
 
@@ -2205,15 +2315,17 @@ namespace cryptonote
         KV_SERIALIZE(status)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_SYNC_INFO
   {
-    struct request
+    struct request_t
     {
       BEGIN_KV_SERIALIZE_MAP()
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct peer
     {
@@ -2245,7 +2357,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::string status;
       uint64_t height;
@@ -2265,11 +2377,12 @@ namespace cryptonote
         KV_SERIALIZE(overview)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_GET_OUTPUT_DISTRIBUTION
   {
-    struct request
+    struct request_t
     {
       std::vector<uint64_t> amounts;
       uint64_t from_height;
@@ -2287,6 +2400,7 @@ namespace cryptonote
         KV_SERIALIZE_OPT(compress, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
     struct distribution
     {
@@ -2330,7 +2444,7 @@ namespace cryptonote
       END_KV_SERIALIZE_MAP()
     };
 
-    struct response
+    struct response_t
     {
       std::string status;
       std::vector<distribution> distributions;
@@ -2342,11 +2456,12 @@ namespace cryptonote
         KV_SERIALIZE(untrusted)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_POP_BLOCKS
   {
-    struct request
+    struct request_t
     {
       uint64_t nblocks;
 
@@ -2354,8 +2469,9 @@ namespace cryptonote
         KV_SERIALIZE(nblocks);
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       std::string status;
       uint64_t height;
@@ -2365,11 +2481,12 @@ namespace cryptonote
         KV_SERIALIZE(height)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
   struct COMMAND_RPC_PRUNE_BLOCKCHAIN
   {
-    struct request
+    struct request_t
     {
       bool check;
 
@@ -2377,8 +2494,9 @@ namespace cryptonote
         KV_SERIALIZE_OPT(check, false)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<request_t> request;
 
-    struct response
+    struct response_t
     {
       uint32_t pruning_seed;
       std::string status;
@@ -2388,6 +2506,7 @@ namespace cryptonote
         KV_SERIALIZE(pruning_seed)
       END_KV_SERIALIZE_MAP()
     };
+    typedef epee::misc_utils::struct_init<response_t> response;
   };
 
 }