diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:35:24 -0500 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-08-14 15:35:24 -0500 |
| commit | 0ba675622fd7e90a32534ffe0b9ac2dbcb9e8faf (patch) | |
| tree | 034fea11db5c04ebd544c2a327a7e01bd88030c5 /src/rpc | |
| parent | Merge pull request #5607 (diff) | |
| parent | rpc: fix get_transactions getting v1 txes from the txpool (diff) | |
| download | monero-0ba675622fd7e90a32534ffe0b9ac2dbcb9e8faf.tar.xz | |
Merge pull request #5634
1488109 rpc: fix get_transactions getting v1 txes from the txpool (moneromooo-monero)
Diffstat (limited to 'src/rpc')
| -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 184ce48a1..c81cfa59c 100644 --- a/src/rpc/core_rpc_server.cpp +++ b/src/rpc/core_rpc_server.cpp @@ -605,7 +605,8 @@ namespace cryptonote return true; } const cryptonote::blobdata pruned = ss.str(); - sorted_txs.push_back(std::make_tuple(h, pruned, get_transaction_prunable_hash(tx), std::string(i->tx_blob, pruned.size()))); + const crypto::hash prunable_hash = tx.version == 1 ? crypto::null_hash : get_transaction_prunable_hash(tx); + sorted_txs.push_back(std::make_tuple(h, pruned, prunable_hash, std::string(i->tx_blob, pruned.size()))); missed_txs.erase(std::find(missed_txs.begin(), missed_txs.end(), h)); pool_tx_hashes.insert(h); const std::string hash_string = epee::string_tools::pod_to_hex(h); |