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

refactor!: remove tips (backport #17787) #17819

Merged
merged 5 commits into from
Sep 21, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 20, 2023

This is an automatic backport of pull request #17787 done by Mergify.
Cherry-pick of 6715b5a has failed:

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

You are currently cherry-picking commit 6715b5afb.
  (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:   api/cosmos/tx/signing/v1beta1/signing.pulsar.go
	modified:   api/cosmos/tx/v1beta1/tx.pulsar.go
	modified:   baseapp/baseapp.go
	modified:   client/tx/aux_builder.go
	modified:   client/tx/aux_builder_test.go
	modified:   client/tx/legacy_test.go
	modified:   client/tx/tx_test.go
	modified:   client/tx_config.go
	modified:   docs/docs/develop/advanced/00-baseapp.md
	modified:   docs/docs/develop/advanced/01-transactions.md
	modified:   proto/cosmos/tx/signing/v1beta1/signing.proto
	modified:   proto/cosmos/tx/v1beta1/tx.proto
	modified:   simapp/app.go
	modified:   simapp/simd/cmd/commands.go
	modified:   tests/e2e/auth/suite.go
	modified:   tests/integration/auth/client/cli/suite_test.go
	modified:   tests/integration/tx/aminojson/aminojson_test.go
	modified:   types/tx/direct_aux.go
	modified:   types/tx/direct_aux_test.go
	modified:   types/tx/signing/signing.pb.go
	deleted:    types/tx/tips.go
	modified:   types/tx/tx.pb.go
	modified:   x/auth/README.md
	deleted:    x/auth/client/cli/tips.go
	modified:   x/auth/client/testutil/helpers.go
	modified:   x/auth/migrations/legacytx/stdsign.go
	modified:   x/auth/migrations/legacytx/stdtx.go
	modified:   x/auth/migrations/legacytx/stdtx_builder.go
	modified:   x/auth/migrations/legacytx/stdtx_test.go
	deleted:    x/auth/posthandler/tips.go
	modified:   x/auth/signing/sig_verifiable_tx.go
	modified:   x/auth/tx/adapter.go
	modified:   x/auth/tx/builder.go
	modified:   x/auth/tx/legacy_amino_json.go
	modified:   x/auth/tx/legacy_amino_json_test.go
	modified:   x/authz/msgs_test.go
	modified:   x/feegrant/msgs_test.go
	modified:   x/tx/decode/decode_test.go
	modified:   x/tx/signing/aminojson/aminojson.go
	modified:   x/tx/signing/aminojson/aminojson_test.go
	modified:   x/tx/signing/aminojson/internal/aminojsonpb/aminojson.proto
	modified:   x/tx/signing/aminojson/internal/aminojsonpb/aminojson.pulsar.go
	modified:   x/tx/signing/directaux/direct_aux.go
	modified:   x/tx/signing/directaux/direct_aux_test.go
	modified:   x/tx/signing/testutil/util.go
	modified:   x/tx/signing/textual/internal/testdata/e2e.json
	modified:   x/tx/signing/textual/internal/testdata/tx.json
	modified:   x/tx/signing/textual/internal/textualpb/textual.proto
	modified:   x/tx/signing/textual/tx.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   CHANGELOG.md
	both modified:   client/tx/factory.go
	both modified:   client/tx/tx.go
	deleted by them: docs/docs/develop/advanced/14-tips.md
	both modified:   x/auth/tx/aux_test.go
	deleted by us:   x/tx/decode/fuzz_test.go
	deleted by us:   x/tx/signing/aminojson/fuzz_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

@julienrbrt
Copy link
Member

In this PR we should update x/tx in simapp/go.mod to use a pseudo version from main.

@julienrbrt julienrbrt force-pushed the mergify/bp/release/v0.50.x/pr-17787 branch from 3d07fe8 to e982c91 Compare September 20, 2023 20:41
@github-actions github-actions bot removed the C:x/tx label Sep 20, 2023
@tac0turtle tac0turtle merged commit deea20c into release/v0.50.x Sep 21, 2023
46 of 50 checks passed
@tac0turtle tac0turtle deleted the mergify/bp/release/v0.50.x/pr-17787 branch September 21, 2023 08: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