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

feat: support other coin decimals, e.g. Ethermint (backport #866) #878

Merged
merged 4 commits into from
Dec 4, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 19, 2023

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

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

You are currently cherry-picking commit a033ba4.
  (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:   chain/cosmos/chain_node.go
	modified:   chainspec.go
	modified:   conformance/test.go
	modified:   examples/cosmos/chain_miscellaneous_test.go
	modified:   examples/cosmos/chain_param_change_test.go
	new file:   examples/cosmos/ethermint_test.go
	modified:   examples/ibc/learn_ibc_test.go
	modified:   examples/ibc/wasm/wasm_ibc_test.go
	modified:   examples/ibc/wasm/wasm_icq_test.go
	modified:   examples/polkadot/polkadot_chain_test.go
	modified:   examples/polkadot/push_wasm_client_code_test.go
	modified:   ibc/types.go
	modified:   interchain_test.go
	modified:   test_user.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   chain/cosmos/cosmos_chain.go
	both modified:   examples/cosmos/chain_upgrade_ibc_test.go
	deleted by us:   examples/cosmwasm/rust-optimizer/rust_optimizer_test.go
	deleted by us:   examples/cosmwasm/workspace-optimizer/workspace_optimizer_test.go
	both modified:   examples/hyperspace/hyperspace_test.go
	both modified:   examples/penumbra/penumbra_chain_test.go
	both modified:   go.sum
	both modified:   go.work.sum

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

* move to math.NewInt

* mod tidy

* ethermint support + chain example

* remove c.CoinDecimals from isFullyConfigured check

* revert accidental hyperspace finalStakeBal change

* use heighliner image

* remove unused docker state export

---------

Co-authored-by: Dan Kanefsky <[email protected]>
(cherry picked from commit a033ba4)

# Conflicts:
#	chain/cosmos/cosmos_chain.go
#	examples/cosmos/chain_upgrade_ibc_test.go
#	examples/cosmwasm/rust-optimizer/rust_optimizer_test.go
#	examples/cosmwasm/workspace-optimizer/workspace_optimizer_test.go
#	examples/hyperspace/hyperspace_test.go
#	examples/penumbra/penumbra_chain_test.go
#	go.sum
#	go.work.sum
@mergify mergify bot requested a review from a team as a code owner November 19, 2023 23:36
@mergify mergify bot added the conflicts label Nov 19, 2023
@mergify mergify bot requested a review from agouin November 19, 2023 23:36
@Reecepbcups Reecepbcups linked an issue Nov 19, 2023 that may be closed by this pull request
@Reecepbcups
Copy link
Member

hmm, as I am seeing it to integrate into dymension: ethermint is still on SDK v46 so it's not liking the IBC go v7 requirements of the new cosmossdk.io in 47+

@Reecepbcups
Copy link
Member

@Reecepbcups Reecepbcups enabled auto-merge (squash) December 4, 2023 20:47
@Reecepbcups Reecepbcups merged commit 03f9a67 into v7 Dec 4, 2023
11 checks passed
@Reecepbcups Reecepbcups deleted the mergify/bp/v7/pr-866 branch December 4, 2023 21:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Add Ethermint chain support to v7 / v6
1 participant