[stable2503] Backport #7777#8112
Closed
paritytech-release-backport-bot[bot] wants to merge 2 commits intostable2503from
Closed
[stable2503] Backport #7777#8112paritytech-release-backport-bot[bot] wants to merge 2 commits intostable2503from
paritytech-release-backport-bot[bot] wants to merge 2 commits intostable2503from
Conversation
Author
|
Please cherry-pick the changes locally and resolve any conflicts. git fetch origin backport-7777-to-stable2503
git worktree add --checkout .worktree/backport-7777-to-stable2503 backport-7777-to-stable2503
cd .worktree/backport-7777-to-stable2503
git reset --hard HEAD^
git cherry-pick -x 954d8571df26b5cc0d342c6c05d414bd6912f1cd
git push --force-with-lease |
github-actions
bot
added
the
A3-backport
…ing the view (#7777) Avoid banning future/stale transactions reported as invalid by the authorship module. When re-org is handled by transaction pool, the view for new fork (`Bn'`) is cloned from the tip of the other existing fork (`Bn`). The new view is not entirely re-validated during the maintain process (it will be revalidated in the background), so it may happen that it contains transactions that are ready on (`Bn`) but actually are not ready on (`Bn'`). All required (which are expected to be in retracted set) transactions are submitted to the new view, but order of txs in ready iterator is not updated. The proper fix would require to re-build the the iterator - which is not trivial as we do not have tags for transactions for block `Bn'` yet. We could force retracted txs to be before ready transactions but it also does not feel to be a good solution - it still would be best effort trial. For now allowing future transactions to re-enter the view immediately is in my opinion a good compromise. This PR is a quick fix and actually brings back behavior of txpool from before merging #6008. The bad thing is that incorrect transactions are detected during block authorship, but this situation to happen requires some specific pre-conditions which should be rare. If this PR is not merged, some transaction will get included into blocks, only after [`DEFAULT_BAN_TIME_SECS`](https://github.com/paritytech/polkadot-sdk/blob/4b39ff00b887039bc3e02a763a29deb09df56833/substrate/client/transaction-pool/src/graph/rotator.rs#L37), which is pretty bad. --------- Co-authored-by: cmd[bot] <41898282+github-actions[bot]@users.noreply.github.com> (cherry picked from commit 954d857)
michalkucharczyk
force-pushed
the
backport-7777-to-stable2503
branch
from
fb99ac3 to
eb13da2
Compare
michalkucharczyk
approved these changes
Apr 1, 2025
Contributor
|
This pull request is amending an existing release. Please proceed with extreme caution,
Emergency Bypass
If you really need to bypass this check: add |
|
All GitHub workflows were cancelled due to failure one of the required jobs. |
iulianbarbu
approved these changes
Apr 1, 2025
Contributor
|
There are a few tests that we want to fix in #8089 to make the CI almost green I hope for 2503 before merging a few more backports. Should we wait for the PR to be merged before merging this? There are a few PRs lined up already. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Backport #7777 into
stable2503from michalkucharczyk.See the documentation on how to use this bot.