wallet_rpc_server: include account index in incoming_transfers RPC

6 years ago · b35beaa8d6
parent bad2c7cf31
commit b35beaa8d6
2 changed files with 2 additions and 2 deletions
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@ -1539,7 +1539,7 @@ namespace tools
        rpc_transfers.spent        = td.m_spent;
        rpc_transfers.global_index = td.m_global_output_index;
        rpc_transfers.tx_hash      = epee::string_tools::pod_to_hex(td.m_txid);
-        rpc_transfers.subaddr_index = td.m_subaddr_index.minor;
+        rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor};
        rpc_transfers.key_image    = req.verbose && td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : "";
        res.transfers.push_back(rpc_transfers);
      }
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@ -859,7 +859,7 @@ namespace wallet_rpc
    bool spent;
    uint64_t global_index;
    std::string tx_hash;
-    uint32_t subaddr_index;
+    cryptonote::subaddress_index subaddr_index;
    std::string key_image;

    BEGIN_KV_SERIALIZE_MAP()