From f90715192efb5377deb49ef04899cb56ce0b4c10 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Thu, 15 Sep 2022 09:38:48 -0400 Subject: [PATCH] Do not delete expired txs for now, it doesn't work correctly, and log more info about them --- src/wallet/wallet.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/wallet/wallet.cpp b/src/wallet/wallet.cpp index e9450161f..3a84f267e 100644 --- a/src/wallet/wallet.cpp +++ b/src/wallet/wallet.cpp @@ -3136,9 +3136,10 @@ std::vector CWallet::ResendWalletTransactionsBefore(int64_t nTime) // Do not relay expired transactions, to avoid other nodes banning us // Current code will not ban nodes relaying expired txs but older nodes will if (wtx.nExpiryHeight > 0 && wtx.nExpiryHeight < chainActive.LastTip()->GetHeight()) { - fprintf(stderr,"%s: ignoring expired tx %s\n", __func__, wtx.GetHash().ToString().c_str() ); + fprintf(stderr,"%s: ignoring expired tx %s with expiry %d at height %d\n", __func__, wtx.GetHash().ToString().c_str(), wtx.nExpiryHeight, chainActive.LastTip()->GetHeight() ); + // TODO: expired detection doesn't seem to work right // append to list of txs to delete - vwtxh.push_back(wtx.GetHash()); + // vwtxh.push_back(wtx.GetHash()); continue; }