diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-09-25 16:40:16 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-09-25 16:40:16 +0200 |
| commit | ec0e144e90247f0289085d9da9b3613b2b69f267 (patch) | |
| tree | 580b9414320d4cf064cdc9f7a9c1f8db407abe98 /src/rpc/core_rpc_server.cpp | |
| parent | Merge pull request #2357 (diff) | |
| parent | wallet2: correctly handle in/out payments for view-only wallet (diff) | |
| download | monero-ec0e144e90247f0289085d9da9b3613b2b69f267.tar.xz | |
Merge pull request #2377
b5cbdce8 wallet2: correctly handle in/out payments for view-only wallet (stoffu)
Diffstat (limited to 'src/rpc/core_rpc_server.cpp')
| -rw-r--r-- | src/rpc/core_rpc_server.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/rpc/core_rpc_server.cpp b/src/rpc/core_rpc_server.cpp index 02d7ea73f..3cc9bf3f0 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 |