Merge pull request #2916

a9217641 wallet-rpc: added receiving address to res of get(_bulk)_payments; selective addresses for getaddress (stoffu)

1 files changed, 4 insertions, 0 deletions

diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index 57cc01e27..258894bc7 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -95,8 +95,10 @@ namespace wallet_rpc
     struct request
     {
       uint32_t account_index;
+      std::vector<uint32_t> address_index;
       BEGIN_KV_SERIALIZE_MAP()
         KV_SERIALIZE(account_index)
+        KV_SERIALIZE(address_index)
       END_KV_SERIALIZE_MAP()
     };
 
@@ -601,6 +603,7 @@ namespace wallet_rpc
     uint64_t block_height;
     uint64_t unlock_time;
     cryptonote::subaddress_index subaddr_index;
+    std::string address;
 
     BEGIN_KV_SERIALIZE_MAP()
       KV_SERIALIZE(payment_id)
@@ -609,6 +612,7 @@ namespace wallet_rpc
       KV_SERIALIZE(block_height)
       KV_SERIALIZE(unlock_time)
       KV_SERIALIZE(subaddr_index)
+      KV_SERIALIZE(address)
     END_KV_SERIALIZE_MAP()
   };