Mirrors
/
monero
mirror of https://github.com/monero-project/monero.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

wallet2: set confirmations to 0 for pool txes in proofs 

It makes more sense than (uint64_t)-1, which is going to look
like very much confirmed when not checking in_pool
This commit is contained in:
moneromooo-monero 2019-03-21 00:22:11 +00:00
parent 36c037ec47
commit 3f1e9e84c0
No known key found for this signature in database
GPG Key ID: 686F07454D6CEFC3
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/wallet/wallet2.cpp
View File

@ -10573,13 +10573,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); check_tx_key_helper(tx, derivation, additional_derivations, address, received);
in_pool = res.txs.front().in_pool; in_pool = res.txs.front().in_pool;
confirmations = (uint64_t)-1; confirmations = 0;
if (!in_pool) if (!in_pool)
{ {
std::string err; std::string err;
uint64_t bc_height = get_daemon_blockchain_height(err); uint64_t bc_height = get_daemon_blockchain_height(err);
if (err.empty()) if (err.empty())
confirmations = bc_height - (res.txs.front().block_height + 1); confirmations = bc_height - res.txs.front().block_height;
} }
} }
@ -10775,13 +10775,13 @@ bool wallet2::check_tx_proof(const crypto::hash &txid, const cryptonote::account
return false; return false;
in_pool = res.txs.front().in_pool; in_pool = res.txs.front().in_pool;
confirmations = (uint64_t)-1; confirmations = 0;
if (!in_pool) if (!in_pool)
{ {
std::string err; std::string err;
uint64_t bc_height = get_daemon_blockchain_height(err); uint64_t bc_height = get_daemon_blockchain_height(err);
if (err.empty()) if (err.empty())
confirmations = bc_height - (res.txs.front().block_height + 1); confirmations = bc_height - res.txs.front().block_height;
} }
return true; return true;