mirror of
https://github.com/wownero/wownero.git
synced 2026-10-17 15:41:44 +02:00
Merge pull request #11132
a760393 wallet_rpc_server: leave unknown incoming tx hash empty (SlowBearDigger)
ACKs: selsta*, jpk68, jeffro256
This commit is contained in:
@@ -2269,7 +2269,7 @@ namespace tools
|
||||
rpc_transfers.amount = td.amount();
|
||||
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.tx_hash = td.m_txid == crypto::null_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.pubkey = epee::string_tools::pod_to_hex(td.get_public_key());
|
||||
|
||||
@@ -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 32
|
||||
#define WALLET_RPC_VERSION_MINOR 33
|
||||
#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
|
||||
|
||||
@@ -145,6 +145,9 @@ class ColdSigningTest():
|
||||
if do_check_key_images:
|
||||
attributes_to_cmp.append("key_image")
|
||||
for i in range(len(hot_transfers_list)):
|
||||
assert len(hot_transfers_list[i]['tx_hash']) == 64
|
||||
assert hot_transfers_list[i]['tx_hash'] != '0' * 64
|
||||
assert cold_transfers_list[i]['tx_hash'] == '', cold_transfers_list[i]['tx_hash']
|
||||
for attr in attributes_to_cmp:
|
||||
hot_val = hot_transfers_list[i][attr]
|
||||
cold_val = cold_transfers_list[i][attr]
|
||||
|
||||
Reference in New Issue
Block a user