diff options
author | Riccardo Spagni <ric@spagni.net> | 2019-04-06 15:58:25 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2019-04-06 15:58:25 +0200 |
commit | 9e72f785d6b96b4fc53752107a8ad019f1146985 (patch) | |
tree | d9d431a84d50e9fa8cb0779d539656a379cc27a6 /src | |
parent | Merge pull request #5342 (diff) | |
parent | wallet2: set confirmations to 0 for pool txes in proofs (diff) | |
download | monero-9e72f785d6b96b4fc53752107a8ad019f1146985.tar.xz |
Merge pull request #5343
cafa15b9 wallet2: set confirmations to 0 for pool txes in proofs (moneromooo-monero)
Diffstat (limited to 'src')
-rw-r--r-- | src/wallet/wallet2.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 0e82f1a91..e2e07d189 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -10584,13 +10584,13 @@ void wallet2::check_tx_key_helper(const crypto::hash &txid, const crypto::key_de check_tx_key_helper(tx, derivation, additional_derivations, address, received); in_pool = res.txs.front().in_pool; - confirmations = (uint64_t)-1; + 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 + 1); + confirmations = bc_height - res.txs.front().block_height; } } @@ -10786,13 +10786,13 @@ bool wallet2::check_tx_proof(const crypto::hash &txid, const cryptonote::account return false; in_pool = res.txs.front().in_pool; - confirmations = (uint64_t)-1; + 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 + 1); + confirmations = bc_height - res.txs.front().block_height; } return true; |