diff options
| author | Alexander Blair <snipa@jagtech.io> | 2020-12-03 12:19:39 -0800 |
|---|---|---|
| committer | Alexander Blair <snipa@jagtech.io> | 2020-12-03 12:19:39 -0800 |
| commit | f83203ecefabb06c939aec99b6c15a31a96d32a7 (patch) | |
| tree | 7bc56b7a4a4fc8325fbcfa158a6c6dddeda0e79a | |
| parent | Merge pull request #7056 (diff) | |
| parent | wallet2: set propagation timeout to current max timeout (diff) | |
| download | monero-f83203ecefabb06c939aec99b6c15a31a96d32a7.tar.xz | |
Merge pull request #7058
89bbb802c 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 30d06c20c..852867b0c 100644 --- a/src/wallet/wallet2.cpp +++ b/src/wallet/wallet2.cpp @@ -2962,7 +2962,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()) |