Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: skip same-sender non-sequential sequence and then add others txs new solution (backport #19177) #19249

Merged
merged 3 commits into from
Jan 26, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 25, 2024

This is an automatic backport of pull request #19177 done by Mergify.
Cherry-pick of fe32bcc has failed:

On branch mergify/bp/release/v0.50.x/pr-19177
Your branch is up to date with 'origin/release/v0.50.x'.

You are currently cherry-picking commit fe32bcc1d.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   baseapp/abci_utils.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   baseapp/abci_utils_test.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

… new solution (#19177)

Co-authored-by: SuperLee <[email protected]>
Co-authored-by: Facundo Medica <[email protected]>
Co-authored-by: Aleksandr Bezobchuk <[email protected]>
(cherry picked from commit fe32bcc)

# Conflicts:
#	CHANGELOG.md
#	baseapp/abci_utils_test.go
@mergify mergify bot requested a review from a team as a code owner January 25, 2024 17:17
@mergify mergify bot added the conflicts label Jan 25, 2024
@@ -42,6 +42,8 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (abci): [#19200](https://github.com/cosmos/cosmos-sdk/pull/19200) Ensure that sdk side ve math matches cometbft
* [#19106](https://github.com/cosmos/cosmos-sdk/pull/19106) Allow empty public keys when setting signatures. Public keys aren't needed for every transaction.
* (baseapp) [#19198](https://github.com/cosmos/cosmos-sdk/pull/19198) Remove usage of pointers in logs in all OE goroutines.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this cl was in v0.50.3 by mistake

Comment on lines +281 to +287
for sender, seq := range txSignersSeqs {
if txsLen != selectedTxsNums {
selectedTxsSignersSeqs[sender] = seq
} else if _, ok := selectedTxsSignersSeqs[sender]; !ok {
selectedTxsSignersSeqs[sender] = seq - 1
}
}

Check warning

Code scanning / CodeQL

Iteration over map Warning

Iteration over map may be a possible source of non-determinism
@facundomedica facundomedica enabled auto-merge (squash) January 26, 2024 15:22
@facundomedica facundomedica merged commit c4a2fe2 into release/v0.50.x Jan 26, 2024
42 of 45 checks passed
@facundomedica facundomedica deleted the mergify/bp/release/v0.50.x/pr-19177 branch January 26, 2024 15:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants