aboutsummaryrefslogtreecommitdiff
path: root/src/rpc/core_rpc_server.cpp
diff options
context:
space:
mode:
authorstoffu <stoffu@protonmail.ch>2017-08-30 11:30:31 +0900
committerstoffu <stoffu@protonmail.ch>2017-09-21 07:46:19 +0900
commitb5cbdce8a6980b59424c2b5c82e5f0000696a085 (patch)
tree49b657e4e00271b9a319cec5a4f2e90614cb3887 /src/rpc/core_rpc_server.cpp
parentMerge pull request #2441 (diff)
downloadmonero-b5cbdce8a6980b59424c2b5c82e5f0000696a085.tar.xz
wallet2: correctly handle in/out payments for view-only wallet
Diffstat (limited to 'src/rpc/core_rpc_server.cpp')
-rw-r--r--src/rpc/core_rpc_server.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp
index 1f7f4a1ff..1aac2f886 100644
--- a/src/rpc/core_rpc_server.cpp
+++ b/src/rpc/core_rpc_server.cpp
@@ -510,11 +510,12 @@ namespace cryptonote
e.in_pool = pool_tx_hashes.find(tx_hash) != pool_tx_hashes.end();
if (e.in_pool)
{
- e.block_height = std::numeric_limits<uint64_t>::max();
+ e.block_height = e.block_timestamp = std::numeric_limits<uint64_t>::max();
}
else
{
e.block_height = m_core.get_blockchain_storage().get_db().get_tx_block_height(tx_hash);
+ e.block_timestamp = m_core.get_blockchain_storage().get_db().get_block_timestamp(e.block_height);
}
// fill up old style responses too, in case an old wallet asks