aboutsummaryrefslogtreecommitdiff
path: root/src/wallet
diff options
context:
space:
mode:
authormoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-04-16 20:59:57 +0000
committermoneromooo-monero <moneromooo-monero@users.noreply.github.com>2019-04-16 20:59:57 +0000
commit7110226794429ce01f3c95a48935866a748730fe (patch)
tree2074b53e4101709114f8bf7d1332ab58c9c666ca /src/wallet
parentMerge pull request #5430 (diff)
downloadmonero-7110226794429ce01f3c95a48935866a748730fe.tar.xz
wallet_rpc_server: set suggested_confirmations_threshold for pool txes
Diffstat (limited to 'src/wallet')
-rw-r--r--src/wallet/wallet_rpc_server.cpp8
1 files changed, 3 insertions, 5 deletions
diff --git a/src/wallet/wallet_rpc_server.cpp b/src/wallet/wallet_rpc_server.cpp
index 1dd589d41..387fadb55 100644
--- a/src/wallet/wallet_rpc_server.cpp
+++ b/src/wallet/wallet_rpc_server.cpp
@@ -86,12 +86,10 @@ namespace
void set_confirmations(tools::wallet_rpc::transfer_entry &entry, uint64_t blockchain_height, uint64_t block_reward)
{
if (entry.height >= blockchain_height || (entry.height == 0 && (!strcmp(entry.type.c_str(), "pending") || !strcmp(entry.type.c_str(), "pool"))))
- {
entry.confirmations = 0;
- entry.suggested_confirmations_threshold = 0;
- return;
- }
- entry.confirmations = blockchain_height - entry.height;
+ else
+ entry.confirmations = blockchain_height - entry.height;
+
if (block_reward == 0)
entry.suggested_confirmations_threshold = 0;
else