Merge pull request #5634

1488109 rpc: fix get_transactions getting v1 txes from the txpool (moneromooo-monero)
This commit is contained in:
luigi1111 2019-08-14 15:35:24 -05:00
commit 0ba675622f
No known key found for this signature in database
GPG Key ID: F4ACA0183641E010

View File

@ -605,7 +605,8 @@ namespace cryptonote
return true; return true;
} }
const cryptonote::blobdata pruned = ss.str(); 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)); missed_txs.erase(std::find(missed_txs.begin(), missed_txs.end(), h));
pool_tx_hashes.insert(h); pool_tx_hashes.insert(h);
const std::string hash_string = epee::string_tools::pod_to_hex(h); const std::string hash_string = epee::string_tools::pod_to_hex(h);