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: adding 09-localhost loopback client module (backport #3229) #3262

Merged
merged 6 commits into from
Mar 9, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Mar 8, 2023

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

On branch mergify/bp/release/v7.1.x/pr-3229
Your branch is up to date with 'origin/release/v7.1.x'.

You are currently cherry-picking commit d840c699.
  (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:   docs/.vuepress/config.js
	new file:   docs/ibc/light-clients/localhost/client-state.md
	new file:   docs/ibc/light-clients/localhost/connection.md
	new file:   docs/ibc/light-clients/localhost/integration.md
	new file:   docs/ibc/light-clients/localhost/overview.md
	new file:   docs/ibc/light-clients/localhost/state-verification.md
	modified:   docs/ibc/params.md
	new file:   docs/ibc/troubleshooting.md
	new file:   docs/migrations/v7-to-v7_1.md
	new file:   e2e/tests/interchain_accounts/localhost_test.go
	new file:   e2e/tests/transfer/localhost_test.go
	new file:   e2e/testsuite/events.go
	modified:   modules/core/02-client/abci.go
	modified:   modules/core/02-client/genesis.go
	modified:   modules/core/02-client/keeper/client_test.go
	modified:   modules/core/02-client/keeper/grpc_query.go
	modified:   modules/core/02-client/keeper/grpc_query_test.go
	modified:   modules/core/02-client/keeper/keeper.go
	modified:   modules/core/02-client/keeper/keeper_test.go
	modified:   modules/core/02-client/keeper/migrations.go
	modified:   modules/core/02-client/migrations/v7/expected_keepers.go
	new file:   modules/core/02-client/migrations/v7/localhost.go
	new file:   modules/core/02-client/migrations/v7/localhost_test.go
	modified:   modules/core/02-client/types/client.pb.go
	modified:   modules/core/02-client/types/keys.go
	modified:   modules/core/02-client/types/params.go
	modified:   modules/core/03-connection/genesis.go
	modified:   modules/core/03-connection/keeper/grpc_query_test.go
	modified:   modules/core/03-connection/keeper/handshake.go
	modified:   modules/core/03-connection/keeper/handshake_test.go
	modified:   modules/core/03-connection/keeper/keeper.go
	modified:   modules/core/03-connection/keeper/keeper_test.go
	new file:   modules/core/03-connection/keeper/migrations.go
	new file:   modules/core/03-connection/migrations/v7/expected_keepers.go
	new file:   modules/core/03-connection/migrations/v7/localhost.go
	modified:   modules/core/03-connection/types/expected_keepers.go
	modified:   modules/core/03-connection/types/msgs.go
	modified:   modules/core/04-channel/keeper/events.go
	modified:   modules/core/04-channel/keeper/handshake.go
	modified:   modules/core/04-channel/keeper/handshake_test.go
	modified:   modules/core/04-channel/types/expected_keepers.go
	modified:   modules/core/04-channel/types/msgs_test.go
	modified:   modules/core/exported/client.go
	modified:   modules/core/exported/connection.go
	modified:   modules/core/module.go
	modified:   modules/core/types/codec.go
	modified:   modules/light-clients/07-tendermint/client_state_test.go
	new file:   modules/light-clients/09-localhost/client_state.go
	new file:   modules/light-clients/09-localhost/client_state_test.go
	new file:   modules/light-clients/09-localhost/codec.go
	new file:   modules/light-clients/09-localhost/keys.go
	new file:   modules/light-clients/09-localhost/localhost.pb.go
	new file:   modules/light-clients/09-localhost/localhost_test.go
	modified:   proto/ibc/core/client/v1/client.proto
	new file:   proto/ibc/lightclients/localhost/v2/localhost.proto
	modified:   testing/simapp/app.go
	modified:   testing/simapp/upgrades/upgrades.go
	deleted:    testing/simapp/upgrades/v6/upgrades.go
	deleted:    testing/simapp/upgrades/v7/upgrades.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/e2e-upgrade.yaml
	both modified:   docs/ibc/events.md
	deleted by us:   e2e/relayer/relayer.go
	deleted by us:   e2e/testconfig/testconfig.go
	deleted by us:   e2e/tests/upgrades/upgrade_test.go
	deleted by us:   e2e/testsuite/codec.go
	deleted by us:   e2e/testsuite/grpc_query.go
	deleted by us:   e2e/testsuite/testsuite.go
	both modified:   modules/core/02-client/keeper/client.go
	both modified:   modules/core/02-client/keeper/proposal.go
	both modified:   modules/core/02-client/types/errors.go
	both modified:   modules/core/03-connection/keeper/verify.go
	both modified:   modules/core/03-connection/types/msgs_test.go
	both modified:   modules/core/04-channel/keeper/packet.go
	both modified:   modules/core/04-channel/types/msgs.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

feat: adding 09-localhost loopback client module [\#3034](#3034). Please see the 09-localhost documentation [here](https://ibc.cosmos.network/main/ibc/light-clients/localhost/overview.html).
feat: AllowedClients on-chain param allows chains to pause usage of specific client types by removing the client type from the param.
imp: Update all channel events to use `connection_id` attribute. The `packet_connection` attribute has been deprecated.
(cherry picked from commit d840c69)

# Conflicts:
#	.github/workflows/e2e-upgrade.yaml
#	docs/ibc/events.md
#	e2e/relayer/relayer.go
#	e2e/testconfig/testconfig.go
#	e2e/tests/upgrades/upgrade_test.go
#	e2e/testsuite/codec.go
#	e2e/testsuite/grpc_query.go
#	e2e/testsuite/testsuite.go
#	modules/core/02-client/keeper/client.go
#	modules/core/02-client/keeper/proposal.go
#	modules/core/02-client/types/errors.go
#	modules/core/03-connection/keeper/verify.go
#	modules/core/03-connection/types/msgs_test.go
#	modules/core/04-channel/keeper/packet.go
#	modules/core/04-channel/types/msgs.go
@@ -0,0 +1,58 @@
package relayer
Copy link
Contributor

@colin-axner colin-axner Mar 8, 2023

Choose a reason for hiding this comment

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

the .gitignore didn't work? Maybe we could add a github action to auto remove the e2e directory

Copy link
Contributor

Choose a reason for hiding this comment

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

not a bad idea

@damiannolan damiannolan self-assigned this Mar 9, 2023
Copy link
Contributor

@damiannolan damiannolan left a comment

Choose a reason for hiding this comment

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

I've fixed up the conflicts, leaving my approval on this PR.

  • Removed /e2e directory
  • Removed e2e-upgrade.yaml
  • Fixed all occurrences of errorsmod -> sdkerrors

@damiannolan
Copy link
Contributor

I missed one last one which was the localhost client state file using ibcerrors instead of sdkerrors.

Should be g2g now

Copy link
Contributor

@chatton chatton left a comment

Choose a reason for hiding this comment

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

LGTM!

@damiannolan damiannolan removed their assignment Mar 9, 2023
Copy link
Contributor

@colin-axner colin-axner left a comment

Choose a reason for hiding this comment

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

Thanks @damiannolan ❤️

@colin-axner colin-axner merged commit 893b7af into release/v7.1.x Mar 9, 2023
@colin-axner colin-axner deleted the mergify/bp/release/v7.1.x/pr-3229 branch March 9, 2023 15:34
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
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.

3 participants