diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp index 6395b6c6d..e8f49a3be 100644 --- a/src/wallet/wallet_rpc_server.cpp +++ b/src/wallet/wallet_rpc_server.cpp @@ -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()); diff --git a/src/wallet/wallet_rpc_server_commands_defs.h b/src/wallet/wallet_rpc_server_commands_defs.h index ebd55dac6..8a80dc24e 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 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 diff --git a/tests/functional_tests/cold_signing.py b/tests/functional_tests/cold_signing.py index 542cb963c..09adbebc1 100755 --- a/tests/functional_tests/cold_signing.py +++ b/tests/functional_tests/cold_signing.py @@ -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]