Just the bugfix from #26205 (but reimplemented without refactoring)
Bugfix: Wallet: ResubmitWalletTransactions: Only bump m_next_resend if actually doing a relay #26270
pull luke-jr wants to merge 1 commits into bitcoin:master from luke-jr:fix_wallet_nextresend_only_relaying changing 1 files +1 −1-
luke-jr commented at 12:10 AM on October 6, 2022: member
-
Bugfix: Wallet: ResubmitWalletTransactions: Only bump m_next_resend if actually doing a relay a44e9e23b8
- luke-jr renamed this:
Bugfix: Wallet: ResubmitWalletTransactions: Only bump "next resend" time if actually doing a relay
Bugfix: Wallet: ResubmitWalletTransactions: Only bump m_next_resend if actually doing a relay
on Oct 6, 2022 -
DrahtBot commented at 4:18 AM on October 6, 2022: contributor
<!--e57a25ab6845829454e8d69fc972939a-->
The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.
<!--174a7506f384e20aa4161008e828411d-->
Conflicts
Reviewers, this pull request conflicts with the following ones:
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
- stickies-v changes_requested
-
stickies-v commented at 9:45 AM on October 6, 2022: contributor
I'm not against a simple bugfix carve-out, but I think this is an incomplete fix because transactions can get rebroadcasted the first time
ResubmitWalletTransactionsis called withrelay=True, as opposed to the expected behaviour where nothing will get rebroadcast in the first 12 hours.I think you need to either default initialize
m_next_resend(the approach taken in #26205, which is why I first introducedGetDefaultNextResend()) or re-introduce thefFirstflag that #25768 removed and updatewallet_resendwallettransactions.pyto re-introduce thenode.mockscheduler(60)call that was removed. -
maflcko commented at 1:24 PM on October 6, 2022: member
Why not backport the whole #26205? This function was re-written from scratch anyway for 24.x/master, so doing another rewrite and keeping it the same for 24.x/master seems preferable than having two completely unrelated re-writes in each branch.
- luke-jr closed this on Oct 7, 2022
- bitcoin locked this on Oct 7, 2023