mirror of
https://github.com/wownero/wownero-ng.git
synced 2026-11-18 14:34:09 +01:00
Merge pull request #7662
4da1112 rpc: send confirmations in get_transactions result (moneromooo-monero)
This commit is contained in:
+14
-4
@@ -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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user