Merge pull request #5470
31a9aa83
wallet_rpc_server: add block_height and frozen to incoming_transfers (moneromooo-monero)
This commit is contained in:
commit
fd7ed93526
|
@ -1848,6 +1848,8 @@ namespace tools
|
|||
rpc_transfers.tx_hash = epee::string_tools::pod_to_hex(td.m_txid);
|
||||
rpc_transfers.subaddr_index = {td.m_subaddr_index.major, td.m_subaddr_index.minor};
|
||||
rpc_transfers.key_image = td.m_key_image_known ? epee::string_tools::pod_to_hex(td.m_key_image) : "";
|
||||
rpc_transfers.block_height = td.m_block_height;
|
||||
rpc_transfers.frozen = td.m_frozen;
|
||||
rpc_transfers.unlocked = m_wallet->is_transfer_unlocked(td);
|
||||
res.transfers.push_back(rpc_transfers);
|
||||
}
|
||||
|
|
|
@ -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 12
|
||||
#define WALLET_RPC_VERSION_MINOR 13
|
||||
#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
|
||||
|
@ -982,6 +982,8 @@ namespace wallet_rpc
|
|||
std::string tx_hash;
|
||||
cryptonote::subaddress_index subaddr_index;
|
||||
std::string key_image;
|
||||
uint64_t block_height;
|
||||
bool frozen;
|
||||
bool unlocked;
|
||||
|
||||
BEGIN_KV_SERIALIZE_MAP()
|
||||
|
@ -991,6 +993,8 @@ namespace wallet_rpc
|
|||
KV_SERIALIZE(tx_hash)
|
||||
KV_SERIALIZE(subaddr_index)
|
||||
KV_SERIALIZE(key_image)
|
||||
KV_SERIALIZE(block_height)
|
||||
KV_SERIALIZE(frozen)
|
||||
KV_SERIALIZE(unlocked)
|
||||
END_KV_SERIALIZE_MAP()
|
||||
};
|
||||
|
|
Loading…
Reference in New Issue