diff options
author | Alexander Blair <snipa@jagtech.io> | 2020-03-12 01:02:31 -0700 |
---|---|---|
committer | Alexander Blair <snipa@jagtech.io> | 2020-03-12 01:02:31 -0700 |
commit | d500bbe68f7d35e22eb331f3a17b0c64ce65f612 (patch) | |
tree | 89bc45d1a2f829454a7798c93893a6092bf646e1 /src/wallet/wallet2.h | |
parent | Merge pull request #6263 (diff) | |
parent | wallet: fix exceptions getting the hash of a pruned tx (diff) | |
download | monero-d500bbe68f7d35e22eb331f3a17b0c64ce65f612.tar.xz |
Merge pull request #6268
a6c24412 wallet: fix exceptions getting the hash of a pruned tx (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
-rw-r--r-- | src/wallet/wallet2.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 80422bd2c..8ecc4d8fa 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -1224,8 +1224,8 @@ private: bool import_key_images(signed_tx_set & signed_tx, size_t offset=0, bool only_selected_transfers=false); crypto::public_key get_tx_pub_key_from_received_outs(const tools::wallet2::transfer_details &td) const; - void update_pool_state(std::vector<std::pair<cryptonote::transaction, bool>> &process_txs, bool refreshed = false); - void process_pool_state(const std::vector<std::pair<cryptonote::transaction, bool>> &txs); + void update_pool_state(std::vector<std::tuple<cryptonote::transaction, crypto::hash, bool>> &process_txs, bool refreshed = false); + void process_pool_state(const std::vector<std::tuple<cryptonote::transaction, crypto::hash, bool>> &txs); void remove_obsolete_pool_txs(const std::vector<crypto::hash> &tx_hashes); std::string encrypt(const char *plaintext, size_t len, const crypto::secret_key &skey, bool authenticated = true) const; |