Git-Mirrors/monero
1
0
Fork 0
mirror of https://github.com/monero-project/monero.git synced 2025-08-23 11:15:16 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7662

Browse source 
4da1112 rpc: send confirmations in get_transactions result (moneromooo-monero)
This commit is contained in:
luigi1111 2021-06-10 11:34:20 -05:00
commit a1a3e970f7
No known key found for this signature in database
GPG key ID: F4ACA0183641E010
3 changed files with 19 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/wallet/wallet2.cpp
View file

@ -11516,6 +11516,9 @@ void wallet2::check_tx_key_helper(const cryptonote::transaction &tx, const crypt
void wallet2::check_tx_key_helper(const crypto::hash &txid, const crypto::key_derivation &derivation, const std::vector<crypto::key_derivation> &additional_derivations, const cryptonote::account_public_address &address, uint64_t &received, bool &in_pool, uint64_t &confirmations)
{
uint32_t rpc_version;
THROW_WALLET_EXCEPTION_IF(!check_connection(&rpc_version), error::wallet_internal_error, "Failed to connect to daemon: " + get_daemon_address());
COMMAND_RPC_GET_TRANSACTIONS::request req;
COMMAND_RPC_GET_TRANSACTIONS::response res;
req.txs_hashes.push_back(epee::string_tools::pod_to_hex(txid));
@ -11561,10 +11564,17 @@ void wallet2::check_tx_key_helper(const crypto::hash &txid, const crypto::key_de
confirmations = 0;
if (!in_pool)
{
std::string err;
uint64_t bc_height = get_daemon_blockchain_height(err);
if (err.empty())
confirmations = bc_height - res.txs.front().block_height;
if (rpc_version < MAKE_CORE_RPC_VERSION(3, 7))
{
std::string err;
uint64_t bc_height = get_daemon_blockchain_height(err);
if (err.empty() && bc_height > res.txs.front().block_height)
confirmations = bc_height - res.txs.front().block_height;
}
else
{
confirmations = res.txs.front().confirmations;
}
}
}