backport-v7.8.x: self client/consensus state removal from connection handshake #7128

colin-axner · 2024-08-12T14:01:39Z

Description

A selection of changes from #6931 and #6937

Before we can merge this PR, please make sure that all the following items have been
checked off. If any of the checklist items are not applicable, please leave them but
write a little note why.

…nnection handshake

coderabbitai · 2024-08-12T14:01:44Z

Important

Review skipped

Auto reviews are disabled on base/target branches other than the default branch.

Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Thank you for using CodeRabbit. We offer it for free to the OSS community and would appreciate your support in helping us grow. If you find it useful, would you consider giving us a shout-out on your favorite social media?

Share

Tips

Chat

There are 3 ways to chat with CodeRabbit:

Review comments: Directly reply to a review comment made by CodeRabbit. Example:
- I pushed a fix in commit <commit_id>.
- Generate unit testing code for this file.
- Open a follow-up GitHub issue for this discussion.
Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
- @coderabbitai generate unit testing code for this file.
- @coderabbitai modularize this function.
PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
- @coderabbitai generate interesting stats about this repository and render them as a table.
- @coderabbitai show all the console.log statements in this repository.
- @coderabbitai read src/utils.ts and generate unit testing code.
- @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
- @coderabbitai help me debug CodeRabbit configuration file.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (invoked as PR comments)

@coderabbitai pause to pause the reviews on a PR.
@coderabbitai resume to resume the paused reviews.
@coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
@coderabbitai full review to do a full review from scratch and review all the files again.
@coderabbitai summary to regenerate the summary of the PR.
@coderabbitai resolve resolve all the CodeRabbit review comments.
@coderabbitai configuration to show the current CodeRabbit configuration for the repository.
@coderabbitai help to get help.

Additionally, you can add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.

CodeRabbit Configuration File (`.coderabbit.yaml`)

You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
Please see the configuration documentation for more information.
If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

Visit our Documentation for detailed information on how to use CodeRabbit.
Join our Discord Community to get help, request features, and share feedback.
Follow us on X/Twitter for updates and announcements.

damiannolan

LGTM!

crodriguezvega

Thank you for managing the back port, @colin-axner!

I guess we could also do a bit more of clean up in endpoint.go in ConnOpenTry and ConnOpenAck.

We could also _ the not used arguments of NewMsgConnectionOpenTry and NewMsgConnectionOpenAck. And we could also do a bit of clean up in TestNewMsgConnectionOpenTry and TestNewMsgConnectionOpenAck.

Anyway, it's all just cleanup in a release branch, so fine leaving it all as is.

crodriguezvega · 2024-08-13T07:08:22Z

modules/core/keeper/msg_server.go

 	if _, err := k.ConnectionKeeper.ConnOpenTry(
-		ctx, msg.Counterparty, msg.DelayPeriod, msg.ClientId, targetClient,
+		ctx, msg.Counterparty, msg.DelayPeriod, msg.ClientId, nil,
 		connectiontypes.ProtoVersionsToExported(msg.CounterpartyVersions), msg.ProofInit, msg.ProofClient, msg.ProofConsensus,


We can leave it as is, but I guess we could also pass default zero values for proof client, proof consensus and consensus height, since they are not used anymore.

crodriguezvega · 2024-08-13T07:08:42Z

modules/core/keeper/msg_server.go

 	if err := k.ConnectionKeeper.ConnOpenAck(
-		ctx, msg.ConnectionId, targetClient, msg.Version, msg.CounterpartyConnectionId,
+		ctx, msg.ConnectionId, nil, msg.Version, msg.CounterpartyConnectionId,
 		msg.ProofTry, msg.ProofClient, msg.ProofConsensus,


Same thing here. Fine to leave as is though!

crodriguezvega · 2024-08-13T07:10:42Z

proto/ibc/core/connection/v1/tx.proto

  string signer = 12;
  // optional proof data for host state machines that are unable to introspect their own consensus state
-  bytes host_consensus_state_proof = 13;
+  bytes host_consensus_state_proof = 13 [deprecated = true];


For all these deprecated fields, I can share a message with hermes team to let them know that from v7.8.0, v8.5.0 and v9.0.0 they don't need to fill them in anymore, right? Not urgent that they change it, but they can do it when it fits them.

Yup exactly!

crodriguezvega · 2024-08-13T07:22:32Z

testing/solomachine.go

@@ -281,15 +281,10 @@ func (solo *Solomachine) ConnOpenAck(chain *TestChain, clientID, connectionID st
 	proofTry := solo.GenerateConnOpenTryProof(clientID, connectionID)

 	clientState := ibctm.NewClientState(chain.ChainID, DefaultTrustLevel, TrustingPeriod, UnbondingPeriod, MaxClockDrift, chain.LastHeader.GetHeight().(clienttypes.Height), commitmenttypes.GetSDKSpecs(), UpgradePath)


I guess we could also remove this and pass nil to NewMsgConnectionOpenAck.

colin-axner · 2024-08-13T08:55:57Z

Merging, I'm opting for least effort on this backport. If someone wants to do additional changes they can. All the changes made were required for tests to pass

colin-axner added 2 commits August 12, 2024 12:23

refactor: remove self validation of client and consensus states in co…

a48a67b

…nnection handshake

fix: tests + additional removal in msg validation

8e19097

colin-axner added the priority PRs that need prompt reviews label Aug 12, 2024

colin-axner added 2 commits August 12, 2024 16:11

changelog

d384bcd

chore: add deprecation notice to protos

ee21ddb

colin-axner marked this pull request as ready for review August 12, 2024 14:27

colin-axner requested review from AdityaSripal, damiannolan, crodriguezvega and chatton as code owners August 12, 2024 14:27

damiannolan approved these changes Aug 13, 2024

View reviewed changes

crodriguezvega approved these changes Aug 13, 2024

View reviewed changes

colin-axner merged commit e49ed07 into release/v7.8.x Aug 13, 2024
14 checks passed

colin-axner deleted the colin/backport-client-cosnensus-validation-connection-handshake-v7.8.x branch August 13, 2024 08:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

backport-v7.8.x: self client/consensus state removal from connection handshake #7128

backport-v7.8.x: self client/consensus state removal from connection handshake #7128

colin-axner commented Aug 12, 2024 •

edited

Loading

coderabbitai bot commented Aug 12, 2024 •

edited

Loading

Review skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configuration File (`.coderabbit.yaml`)

Documentation and Community

damiannolan left a comment

crodriguezvega left a comment

crodriguezvega Aug 13, 2024

crodriguezvega Aug 13, 2024

crodriguezvega Aug 13, 2024

colin-axner Aug 13, 2024

crodriguezvega Aug 13, 2024

colin-axner commented Aug 13, 2024

		@@ -281,15 +281,10 @@ func (solo Solomachine) ConnOpenAck(chain TestChain, clientID, connectionID st
		proofTry := solo.GenerateConnOpenTryProof(clientID, connectionID)

		clientState := ibctm.NewClientState(chain.ChainID, DefaultTrustLevel, TrustingPeriod, UnbondingPeriod, MaxClockDrift, chain.LastHeader.GetHeight().(clienttypes.Height), commitmenttypes.GetSDKSpecs(), UpgradePath)

backport-v7.8.x: self client/consensus state removal from connection handshake #7128

backport-v7.8.x: self client/consensus state removal from connection handshake #7128

Conversation

colin-axner commented Aug 12, 2024 • edited Loading

Description

coderabbitai bot commented Aug 12, 2024 • edited Loading

Review skipped

Chat

CodeRabbit Commands (invoked as PR comments)

CodeRabbit Configuration File (.coderabbit.yaml)

Documentation and Community

damiannolan left a comment

Choose a reason for hiding this comment

crodriguezvega left a comment

Choose a reason for hiding this comment

crodriguezvega Aug 13, 2024

Choose a reason for hiding this comment

crodriguezvega Aug 13, 2024

Choose a reason for hiding this comment

crodriguezvega Aug 13, 2024

Choose a reason for hiding this comment

colin-axner Aug 13, 2024

Choose a reason for hiding this comment

crodriguezvega Aug 13, 2024

Choose a reason for hiding this comment

colin-axner commented Aug 13, 2024

colin-axner commented Aug 12, 2024 •

edited

Loading

coderabbitai bot commented Aug 12, 2024 •

edited

Loading

CodeRabbit Configuration File (`.coderabbit.yaml`)