Merge pull request #5871

3407743 wallet_rpc_server: add locked field to get_transfers/get_{bulk_,}_payments (moneromooo-monero)

1 files changed, 5 insertions, 1 deletions

diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h
index e9b8b60f5..d70de68be 100644
--- a/src/wallet/wallet_rpc_server_commands_defs.h
+++ b/src/wallet/wallet_rpc_server_commands_defs.h
@@ -47,7 +47,7 @@
 // advance which version they will stop working with
 // Don't go over 32767 for any of these
 #define WALLET_RPC_VERSION_MAJOR 1
-#define WALLET_RPC_VERSION_MINOR 14
+#define WALLET_RPC_VERSION_MINOR 15
 #define MAKE_WALLET_RPC_VERSION(major,minor) (((major)<<16)|(minor))
 #define WALLET_RPC_VERSION MAKE_WALLET_RPC_VERSION(WALLET_RPC_VERSION_MAJOR, WALLET_RPC_VERSION_MINOR)
 namespace tools
@@ -916,6 +916,7 @@ namespace wallet_rpc
     uint64_t amount;
     uint64_t block_height;
     uint64_t unlock_time;
+    bool locked;
     cryptonote::subaddress_index subaddr_index;
     std::string address;
 
@@ -925,6 +926,7 @@ namespace wallet_rpc
       KV_SERIALIZE(amount)
       KV_SERIALIZE(block_height)
       KV_SERIALIZE(unlock_time)
+      KV_SERIALIZE(locked)
       KV_SERIALIZE(subaddr_index)
       KV_SERIALIZE(address)
     END_KV_SERIALIZE_MAP()
@@ -1364,6 +1366,7 @@ namespace wallet_rpc
     std::list<transfer_destination> destinations;
     std::string type;
     uint64_t unlock_time;
+    bool locked;
     cryptonote::subaddress_index subaddr_index;
     std::vector<cryptonote::subaddress_index> subaddr_indices;
     std::string address;
@@ -1382,6 +1385,7 @@ namespace wallet_rpc
       KV_SERIALIZE(destinations);
       KV_SERIALIZE(type);
       KV_SERIALIZE(unlock_time)
+      KV_SERIALIZE(locked)
       KV_SERIALIZE(subaddr_index);
       KV_SERIALIZE(subaddr_indices);
       KV_SERIALIZE(address);