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(x/auth): Add fees on batch sign (backport #18564) #18592

Merged
merged 3 commits into from
Nov 30, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 29, 2023

This is an automatic backport of pull request #18564 done by Mergify.
Cherry-pick of 7bdbc46 has failed:

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

You are currently cherry-picking commit 7bdbc4629.
  (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:   tests/integration/auth/client/cli/suite_test.go
	modified:   x/auth/client/testutil/helpers.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   tests/e2e/auth/suite.go
	deleted by us:   x/auth/CHANGELOG.md
	both modified:   x/auth/client/cli/tx_sign.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

(cherry picked from commit 7bdbc46)

# Conflicts:
#	tests/e2e/auth/suite.go
#	x/auth/CHANGELOG.md
#	x/auth/client/cli/tx_sign.go
@mergify mergify bot requested a review from a team as a code owner November 29, 2023 14:40
@mergify mergify bot added the conflicts label Nov 29, 2023
Copy link
Contributor

coderabbitai bot commented Nov 29, 2023

Important

Auto Review Skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.


Tips

Chat with CodeRabbit Bot (@coderabbitai)

  • If you reply to a review comment from CodeRabbit, the bot will automatically respond.
  • To engage with CodeRabbit bot directly around the specific lines of code in the PR, mention @coderabbitai in your review comment
  • Note: Review comments are made on code diffs or files, not on the PR overview.
  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

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.

Note: For conversation with the bot, please use the review comments on code diffs or files.

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

@julienrbrt
Copy link
Member

@raynaudoe are you up to fix the conflicts here please :)

@@ -52,6 +52,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

### Bug Fixes

* (x/auth) [#18564](https://github.com/cosmos/cosmos-sdk/pull/18564) Fix total fees calculation when batch signing.
Copy link
Member

Choose a reason for hiding this comment

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

Note for myself, search in the whole main repo for issue number when changelog merging after tag of a patch release, given that a changelog can be under all submodules from now on main.

filename,
}

func TxSignBatchExec(clientCtx client.Context, from fmt.Stringer, filenames []string, extraArgs ...string) (testutil.BufferWriter, error) {
Copy link
Member

Choose a reason for hiding this comment

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

We cannot introduce a breaking change in patch release, so let's revert this here and on main (as the breaking change wasn't necessary at the first place).
For the test case, we can just use clitestutil.ExecTestCLICmd directly and leave the API unchanged for the others.

@raynaudoe
Copy link
Contributor

@raynaudoe are you up to fix the conflicts here please :)

Should I commit the fix directly on this branch ?

@julienrbrt
Copy link
Member

@raynaudoe are you up to fix the conflicts here please :)

Should I commit the fix directly on this branch ?

Yes, you can push directly here.

@raynaudoe
Copy link
Contributor

@raynaudoe are you up to fix the conflicts here please :)

Should I commit the fix directly on this branch ?

Yes, you can push directly here.

Done!

Copy link
Member

@julienrbrt julienrbrt left a comment

Choose a reason for hiding this comment

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

lgtm!

@raynaudoe are you up as well to remove the API break from main as well as you did here?

@raynaudoe
Copy link
Contributor

lgtm!

@raynaudoe are you up as well to remove the API break from main as well as you did here?

yeah sure! I'll do a PR today

@raynaudoe
Copy link
Contributor

lgtm!
@raynaudoe are you up as well to remove the API break from main as well as you did here?

yeah sure! I'll do a PR today

#18602

@julienrbrt julienrbrt merged commit 5051495 into release/v0.50.x Nov 30, 2023
48 checks passed
@julienrbrt julienrbrt deleted the mergify/bp/release/v0.50.x/pr-18564 branch November 30, 2023 14:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants