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

mergify · 2024-01-25T17:17:50Z

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

On branch mergify/bp/release/v0.47.x/pr-19177
Your branch is up to date with 'origin/release/v0.47.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/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	deleted by us:   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 <9109321+superlee_8@user.noreply.gitee.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> (cherry picked from commit fe32bcc) # Conflicts: # CHANGELOG.md # baseapp/abci_utils_test.go

baseapp/abci_utils.go

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


baseapp/abci_utils.go

alexanderbez · 2024-01-26T16:47:09Z

baseapp/abci_utils.go

+
+				txsLen := len(h.txSelector.SelectedTxs())


This block deserves a decent comment explaining what is happening.

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

facundomedica

I'll add the comments Bez mentions in a new PR to main

alexanderbez · 2024-01-29T18:49:00Z

Thanks @facundomedica -- we should still merge this one, as your PR will simply build on top of this.

… new solution (backport cosmos#19177) (cosmos#19250) Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

* fix(server): consensus failure while restart node with wrong `chainId` in genesis (cosmos#18920) * test: add NodeURI for clientCtx (backport cosmos#18930) (cosmos#18988) Co-authored-by: mmsqe <tqd0800210105@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * chore: clean-up buf workspace (backport cosmos#18993) (cosmos#18998) * build(deps): Bump cosmossdk.io/log from 1.2.1 to 1.3.0 (cosmos#19024) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * build(deps): Bump cosmossdk.io/errors from 1.0.0 to 1.0.1 (cosmos#19025) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * fix: allow empty public keys when setting signatures (backport cosmos#19106) (cosmos#19108) Co-authored-by: Callum Waters <cmwaters19@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * chore: prepare v0.47.8 (cosmos#19162) * docs: fix typo in 06-grpc_rest.md (backport cosmos#19192) (cosmos#19194) Co-authored-by: Yoksirod <103229163+taramakage@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: skip same-sender non-sequential sequence and then add others txs new solution (backport cosmos#19177) (cosmos#19250) Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> * test(baseapp): Refactor tx selector tests + better comments (backport cosmos#19284) (cosmos#19288) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> * build(deps): Bump cosmossdk.io/log from 1.3.0 to 1.3.1 (cosmos#19359) * chore: prepare v0.47.9 (cosmos#19451) * build(deps): Bump github.com/cosmos/cosmos-proto from 1.0.0-beta.2 to 1.0.0-beta.4 (cosmos#19472) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * Merge pull request from GHSA-4j93-fm92-rp4m * fix(x/auth/vesting): Add `BlockedAddr` check in `CreatePeriodicVestingAccount` * updates * build(deps): Bump cosmossdk.io/math from 1.2.0 to 1.3.0 (cosmos#19564) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: use proper `db_backend` type when reading chain-id (cosmos#19573) * Merge pull request from GHSA-86h5-xcpx-cfqc * fix slashing logic * add test * changelog + release notes * word --------- Co-authored-by: Julien Robert <julien@rbrt.fr> * build(deps): Bump deps (backport cosmos#19655) (cosmos#19712) Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(x/gov): grpc query tally for failed proposal (backport cosmos#19725) (cosmos#19728) Co-authored-by: David Tumcharoen <david@alleslabs.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(crypto): error if incorrect ledger public key (backport cosmos#19691) (cosmos#19746) Co-authored-by: Rootul P <rootulp@gmail.com> Co-authored-by: sontrinh16 <trinhleson2000@gmail.com> * build(deps): Bump github.com/cometbft/cometbft from 0.37.4 to 0.37.5 (cosmos#19752) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Julien Robert <julien@rbrt.fr> * fix: Implement gogoproto customtype to secp256r1 keys (backport cosmos#20027) (cosmos#20032) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Marko <marko@baricevic.me> * fix: secp256r1 json missing quotes (backport cosmos#20060) (cosmos#20070) Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> * build(deps): Bump github.com/cosmos/cosmos-proto from 1.0.0-beta.4 to 1.0.0-beta.5 (cosmos#20094) * chore: prepare v0.47.11 (cosmos#20088) * fix: use timestamp for sim log file name (backport cosmos#20108) (cosmos#20112) Co-authored-by: mmsqe <mavis@crypto.com> * fix(x/authz,x/feegrant): check blocked address (backport cosmos#20102) (cosmos#20114) Co-authored-by: Julien Robert <julien@rbrt.fr> * fix(testsuite/sims): set all signatures (backport cosmos#20151) (cosmos#20186) Co-authored-by: Leon <156270887+leonz789@users.noreply.github.com> * build(deps): Bump github.com/cometbft/cometbft from 0.37.5 to 0.37.6 (cosmos#20205) Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> * go mod tidy * chore: downgrade to go 1.19 (cosmos#20211) * chore: tidy with go 1.19 (cosmos#20220) * chore: revert comet 0.37.6 upgrade due to go version bump (cosmos#20247) * fix: remove txs from mempool when antehandler fails in recheck (backport cosmos#20144) (cosmos#20252) Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: marbar3778 <marbar3778@yahoo.com> * Revert "chore: downgrade to go 1.19 (cosmos#20211)" This reverts commit aba4e40. * Revert "chore: revert comet 0.37.6 upgrade due to go version bump (cosmos#20247)" This reverts commit 00e4273. * bump go in ci * update docker file --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: atheeshp <59333759+atheeshp@users.noreply.github.com> Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com> Co-authored-by: mmsqe <tqd0800210105@gmail.com> Co-authored-by: Julien Robert <julien@rbrt.fr> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: Callum Waters <cmwaters19@gmail.com> Co-authored-by: Yoksirod <103229163+taramakage@users.noreply.github.com> Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com> Co-authored-by: Facundo Medica <14063057+facundomedica@users.noreply.github.com> Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com> Co-authored-by: Kevin Yang <5478483+k-yang@users.noreply.github.com> Co-authored-by: khanh <50263489+catShaark@users.noreply.github.com> Co-authored-by: David Tumcharoen <david@alleslabs.com> Co-authored-by: Rootul P <rootulp@gmail.com> Co-authored-by: sontrinh16 <trinhleson2000@gmail.com> Co-authored-by: marbar3778 <marbar3778@yahoo.com> Co-authored-by: Marko <marko@baricevic.me> Co-authored-by: mmsqe <mavis@crypto.com> Co-authored-by: Leon <156270887+leonz789@users.noreply.github.com>

mergify bot requested a review from a team as a code owner January 25, 2024 17:17

mergify bot added the conflicts label Jan 25, 2024

alexanderbez approved these changes Jan 25, 2024

View reviewed changes

fix conflicts and add test

264025e

facundomedica removed the conflicts label Jan 26, 2024

facundomedica requested a review from alexanderbez January 26, 2024 15:21

github-advanced-security bot found potential problems Jan 26, 2024

View reviewed changes

alexanderbez approved these changes Jan 26, 2024

View reviewed changes

alexanderbez requested review from facundomedica and testinginprod January 26, 2024 16:47

facundomedica and others added 2 commits January 26, 2024 17:55

Update baseapp/abci_utils.go

059d1d2

Co-authored-by: Aleksandr Bezobchuk <alexanderbez@users.noreply.github.com>

fix

86966ef

facundomedica approved these changes Jan 29, 2024

View reviewed changes

alexanderbez merged commit 2a10f13 into release/v0.47.x Jan 29, 2024
24 of 26 checks passed

alexanderbez deleted the mergify/bp/release/v0.47.x/pr-19177 branch January 29, 2024 18:49

faddat mentioned this pull request Mar 20, 2024

sdk version bump rust-ninja/cosmos-sdk#1

Open

12 tasks

0xstepit mentioned this pull request Jul 1, 2024

chore(cachemulti): add Copy method evmos/cosmos-sdk#52

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

mergify bot commented Jan 25, 2024

alexanderbez Jan 26, 2024

facundomedica left a comment

alexanderbez commented Jan 29, 2024

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

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

Conversation

mergify bot commented Jan 25, 2024

alexanderbez Jan 26, 2024

Choose a reason for hiding this comment

facundomedica left a comment

Choose a reason for hiding this comment

alexanderbez commented Jan 29, 2024