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

ZiHengLee · 2024-01-23T12:45:28Z

Description

Closes: #XXXX

Author Checklist

All items are required. Please add a note to the item if the item is not applicable and
please add links to any relevant follow up issues.

I have...

included the correct type prefix in the PR title
confirmed ! in the type prefix if API or client breaking change
targeted the correct branch (see PR Targeting)
provided a link to the relevant issue or specification
reviewed "Files changed" and left comments if necessary
included the necessary unit and integration tests
added a changelog entry to CHANGELOG.md
updated the relevant documentation or specification, including comments for documenting Go code
confirmed all CI checks have passed

Reviewers Checklist

All items are required. Please add a note if the item is not applicable and please add
your handle next to the items reviewed if you only reviewed selected items.

I have...

confirmed the correct type prefix in the PR title
confirmed all author checklist items have been addressed
reviewed state machine logic, API design and naming, documentation is accurate, tests and test coverage

coderabbitai · 2024-01-23T12:45:36Z

Walkthrough

Recent updates focus on refining the baseapp module, enhancing the default proposal handler by integrating a new signerExtAdapter to better manage transaction signers and sequences. Bug fixes address pointer usage in logs, improve error handling during BaseApp initialization, and correct a potential integer conversion issue related to gas fee calculations, ensuring safer and more efficient operation.

Changes

File(s)	Summary
`CHANGELOG.md`	Documented bug fixes in the `baseapp` module, including enhancements to proposal handling and gas fee calculations.
`baseapp/abci_utils.go`	Updated `DefaultProposalHandler` with new `signerExtAdapter` field; improved transaction management in `PrepareProposalHandler`.
`baseapp/abci_utils_test.go`	Added imports, renamed crypto package, introduced new test function `TestDefaultProposalHandler_PriorityNonceMempoolTxSelection`, and added helper functions for testing.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Note: Auto-reply has been disabled for this repository by the repository owner. The CodeRabbit bot will not respond to your comments unless it is explicitly tagged.

Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit tests for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository from git and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit tests.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger a review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
The JSON schema for the configuration file is available here.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/coderabbit-overrides.v2.json

CodeRabbit Discord Community

Join our Discord Community to get help, request features, and share feedback.

baseapp/abci_utils.go

facundomedica · 2024-01-23T13:56:26Z

baseapp/abci_utils_test.go

+		req         *abci.RequestPrepareProposal
+		expectedTxs [][]byte
+	}{
+		"skip same-sender non-sequential sequence and then add others txs": {


let's add a multi signer test please

alexanderbez

ConceptACK. Just left a few minor comments. Thank you very much

alexanderbez · 2024-01-23T16:49:18Z

baseapp/abci_utils.go

+			// if the signers aren't in selectedTxsSignersSeqs then we haven't seen them before so we add them and return true
+			// so this tx gets selected.


Suggested change

// if the signers aren't in selectedTxsSignersSeqs then we haven't seen them before so we add them and return true

// so this tx gets selected.

// If the signers aren't in selectedTxsSignersSeqs then we haven't seen them before

// so we add them and return true so this tx gets selected.

baseapp/abci_utils.go

…thers txs (cosmos#19177)

facundomedica

Thank you!

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
+					}
+				}


ZiHengLee · 2024-01-25T11:15:05Z

Thank you!
Is there anything else I need to do afterwards?"

… 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

… new solution (backport #19177) (#19249) Co-authored-by: Brann Bronzebeard <90186866+ZiHengLee@users.noreply.github.com> Co-authored-by: Facundo <facundomedica@gmail.com>

… new solution (backport #19177) (#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>

… 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>

… 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>

ZiHengLee requested a review from a team as a code owner January 23, 2024 12:45

ZiHengLee changed the title ~~skip same-sender non-sequential sequence and then add others txs new solution~~ fix: skip same-sender non-sequential sequence and then add others txs new solution Jan 23, 2024

ZiHengLee mentioned this pull request Jan 23, 2024

fix: skip same-sender non-sequential sequence and then add others txs #19119

Closed

12 tasks

ZiHengLee force-pushed the lee/tx_default_selector_3 branch from 205b0eb to f85a6e4 Compare January 23, 2024 12:56

facundomedica reviewed Jan 23, 2024

View reviewed changes

baseapp/abci_utils.go Show resolved Hide resolved

facundomedica reviewed Jan 23, 2024

View reviewed changes

ZiHengLee force-pushed the lee/tx_default_selector_3 branch 2 times, most recently from 1834e6a to 04fb06d Compare January 23, 2024 15:57

alexanderbez reviewed Jan 23, 2024

View reviewed changes

ZiHengLee force-pushed the lee/tx_default_selector_3 branch 3 times, most recently from 147f1b9 to 1e4c5d7 Compare January 24, 2024 02:37

same-sender non-sequential sequence

ae267ea

ZiHengLee force-pushed the lee/tx_default_selector_3 branch from 1e4c5d7 to ae267ea Compare January 24, 2024 06:20

ZiHengLee requested a review from facundomedica January 24, 2024 15:12

alexanderbez approved these changes Jan 24, 2024

View reviewed changes

SuperLee and others added 2 commits January 25, 2024 11:26

fix(baseapp): skip same-sender non-sequential sequence and then add o…

7e3d64a

…thers txs (cosmos#19177)

Merge branch 'main' into lee/tx_default_selector_3

6b12b93

facundomedica approved these changes Jan 25, 2024

View reviewed changes

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

View reviewed changes

Merge branch 'main' into lee/tx_default_selector_3

dff9bdb

alexanderbez added backport/v0.47.x PR scheduled for inclusion in the v0.47's next stable release backport/v0.50.x PR scheduled for inclusion in the v0.50's next stable release labels Jan 25, 2024

alexanderbez enabled auto-merge January 25, 2024 16:40

alexanderbez added this pull request to the merge queue Jan 25, 2024

Merged via the queue into cosmos:main with commit fe32bcc Jan 25, 2024
55 of 57 checks passed

mergify bot mentioned this pull request Jan 25, 2024

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

Merged

mergify bot mentioned this pull request Jan 25, 2024

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

Merged

julienrbrt mentioned this pull request Jan 26, 2024

[Bug]: function SelectTxForProposal cause same sender non-sequential sequence #19097

Closed

1 task

faddat mentioned this pull request Mar 20, 2024

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

Open

12 tasks

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 #19177

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

ZiHengLee commented Jan 23, 2024

coderabbitai bot commented Jan 23, 2024 •

edited

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (`.coderabbit.yaml`)

CodeRabbit Discord Community

facundomedica Jan 23, 2024

alexanderbez left a comment

alexanderbez Jan 23, 2024

facundomedica left a comment

ZiHengLee commented Jan 25, 2024

		// if the signers aren't in selectedTxsSignersSeqs then we haven't seen them before so we add them and return true
		// so this tx gets selected.

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

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

Conversation

ZiHengLee commented Jan 23, 2024

Description

Author Checklist

Reviewers Checklist

coderabbitai bot commented Jan 23, 2024 • edited

Walkthrough

Changes

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configration File (.coderabbit.yaml)

CodeRabbit Discord Community

facundomedica Jan 23, 2024

Choose a reason for hiding this comment

alexanderbez left a comment

Choose a reason for hiding this comment

alexanderbez Jan 23, 2024

Choose a reason for hiding this comment

facundomedica left a comment

Choose a reason for hiding this comment

ZiHengLee commented Jan 25, 2024

coderabbitai bot commented Jan 23, 2024 •

edited

CodeRabbit Configration File (`.coderabbit.yaml`)