diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-03 12:20:14 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-03 12:20:14 -0800 |
| commit | 0833680c74a57a5dc277ddda49562f9decb9f90a (patch) | |
| tree | 33a390efe070150aba2ff0b0e16c59bea0a77763 | |
| parent | Merge pull request #7010 (diff) | |
| parent | wallet2: set propagation timeout to current max timeout (diff) | |
| download | monero-0833680c74a57a5dc277ddda49562f9decb9f90a.tar.xz | |
Merge pull request #7059
93135907d wallet2: set propagation timeout to current max timeout (selsta)
| -rw-r--r-- | src/wallet/wallet2.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/wallet/wallet2.cpp b/src/wallet/wallet2.cpp index 65411e392..299e427ce 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2961,7 +2961,8 @@ void wallet2::update_pool_state(std::vector<std::tuple<cryptonote::transaction, MTRACE("update_pool_state got pool"); // remove any pending tx that's not in the pool - constexpr const std::chrono::seconds tx_propagation_timeout{CRYPTONOTE_DANDELIONPP_EMBARGO_AVERAGE * 3 / 2}; + // TODO: set tx_propagation_timeout to CRYPTONOTE_DANDELIONPP_EMBARGO_AVERAGE * 3 / 2 after v15 hardfork + constexpr const std::chrono::seconds tx_propagation_timeout{500}; const auto now = std::chrono::system_clock::now(); std::unordered_map<crypto::hash, wallet2::unconfirmed_transfer_details>::iterator it = m_unconfirmed_txs.begin(); while (it != m_unconfirmed_txs.end()) |