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: v7 <- #1069] feat!: using ica controller instead of intertx #1074

Merged
merged 2 commits into from
Apr 17, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 15, 2024

  • Changing the existing ICA funcs to use interchain-accounts controller instead of intertx module as it is deprecated.

With the moving of the module features to module_modname.go, open to moving the ica features to module_ica_controller.go


This is an automatic backport of pull request #1069 done by Mergify.

* replacing intertx with interchain account controller

* adding generic icatx support

* updating SendICABankTransfer to use interchain account controller module

* adding chain level wrappers for ica controller

* go mod

* Revert "go mod"

This reverts commit 2638272.

(cherry picked from commit 94f966a)

# Conflicts:
#	chain/cosmos/chain_node.go
#	chain/cosmos/cosmos_chain.go
@mergify mergify bot requested a review from a team as a code owner April 15, 2024 14:06
@mergify mergify bot requested a review from Reecepbcups April 15, 2024 14:06
Copy link

vercel bot commented Apr 15, 2024

The latest updates on your projects. Learn more about Vercel for Git ↗︎

1 Ignored Deployment
Name Status Preview Comments Updated (UTC)
interchaintest-docs ⬜️ Ignored (Inspect) Visit Preview Apr 17, 2024 8:52pm

Copy link
Contributor Author

mergify bot commented Apr 15, 2024

Cherry-pick of 94f966a has failed:

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

You are currently cherry-picking commit 94f966a.
  (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 <file>..." to mark resolution)
	both modified:   chain/cosmos/chain_node.go
	both modified:   chain/cosmos/cosmos_chain.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/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

@Reecepbcups Reecepbcups merged commit 0f83fea into v7 Apr 17, 2024
16 checks passed
@Reecepbcups Reecepbcups deleted the mergify/bp/v7/pr-1069 branch April 17, 2024 21:06
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