aboutsummaryrefslogtreecommitdiff
path: root/src/wallet/wallet2.cpp
diff options
context:
space:
mode:
authorselsta <selsta@sent.at>2020-12-03 02:18:58 +0100
committerselsta <selsta@sent.at>2020-12-03 02:18:58 +0100
commit89bbb802c04895829bcd189c361738c9b1eb259a (patch)
treea1f23579cc2fdaff7b91d3202a063ef051ca10f3 /src/wallet/wallet2.cpp
parentMerge pull request #7025 (diff)
downloadmonero-89bbb802c04895829bcd189c361738c9b1eb259a.tar.xz
wallet2: set propagation timeout to current max timeout
Diffstat (limited to 'src/wallet/wallet2.cpp')
-rw-r--r--src/wallet/wallet2.cpp3
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())