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

[BP: v6 <- #565] SDK v47 features from Juno #643

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jun 22, 2023

This is an automatic backport of pull request #565 done by Mergify.
Cherry-pick of 220ce33 has failed:

On branch mergify/bp/v6/pr-565
Your branch is up to date with 'origin/v6'.

You are currently cherry-picking commit 220ce33.
  (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)

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   chain/cosmos/cosmos_chain.go
	deleted by us:   chain/cosmos/genesis.go
	deleted by us:   examples/cosmos/chain_param_change_test.go
	both modified:   examples/cosmos/chain_upgrade_ibc_test.go

no changes added to commit (use "git add" and/or "git commit -a")

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

* TxCommand gas auto

* makes SubmitProposal public for chains

* comment

* Adds BuildProposal for govv1

* Remove uneeded BuildProposal arg

* Adds ModifyGenesis generalized Function + test

* rename result -> path (of components)

* Revert "TxCommand gas auto"

This reverts commit 83b50de.

---------

Co-authored-by: Dan Kanefsky <56059752+boojamya@users.noreply.github.com>
(cherry picked from commit 220ce33)

# Conflicts:
#	chain/cosmos/cosmos_chain.go
#	chain/cosmos/genesis.go
#	examples/cosmos/chain_param_change_test.go
#	examples/cosmos/chain_upgrade_ibc_test.go
@mergify mergify bot requested a review from a team as a code owner June 22, 2023 19:34
@mergify mergify bot requested a review from agouin June 22, 2023 19:34
@mergify mergify bot added automerge BACKPORT backport into all maintained branches conflicts labels Jun 22, 2023
@boojamya boojamya closed this Jun 22, 2023
@mergify mergify bot deleted the mergify/bp/v6/pr-565 branch June 22, 2023 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge BACKPORT backport into all maintained branches conflicts
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants