diff options
| author | Riccardo Spagni <ric@spagni.net> | 2016-01-29 19:24:24 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2016-01-29 19:24:24 +0200 |
| commit | b91fc2dc3c4489f44a74915ae80fd1968d150302 (patch) | |
| tree | 96f432c221f6edb336b65000acf30f0c45e3efa9 /src/wallet/wallet2.h | |
| parent | Merge pull request #628 (diff) | |
| parent | tx_pool: do not accept txes not in a block if they timed out before (diff) | |
| download | monero-b91fc2dc3c4489f44a74915ae80fd1968d150302.tar.xz | |
Merge pull request #629
94b98fb tx_pool: do not accept txes not in a block if they timed out before (moneromooo-monero)
eadbdf3 tx_pool: fix use of invalidated iterator (moneromooo-monero)
3b1d7e0 Fix V1/V2 use of hard fork related parameters (moneromooo-monero)
Diffstat (limited to 'src/wallet/wallet2.h')
| -rw-r--r-- | src/wallet/wallet2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/wallet/wallet2.h b/src/wallet/wallet2.h index 9912226c6..e29619444 100644 --- a/src/wallet/wallet2.h +++ b/src/wallet/wallet2.h @@ -356,7 +356,7 @@ namespace tools void process_new_blockchain_entry(const cryptonote::block& b, const cryptonote::block_complete_entry& bche, const crypto::hash& bl_id, uint64_t height); void detach_blockchain(uint64_t height); void get_short_chain_history(std::list<crypto::hash>& ids) const; - bool is_tx_spendtime_unlocked(uint64_t unlock_time) const; + bool is_tx_spendtime_unlocked(uint64_t unlock_time, uint64_t block_height) const; bool is_transfer_unlocked(const transfer_details& td) const; bool clear(); void pull_blocks(uint64_t start_height, uint64_t& blocks_start_height, const std::list<crypto::hash> &short_chain_history, std::list<cryptonote::block_complete_entry> &blocks); |