Skip to content

Commit

Permalink
fix: avoid invalid identifier error when validate genesis (#7397)
Browse files Browse the repository at this point in the history
* fix: avoid invalid identifier error when validate genesis

that contains localhost client

* Apply suggestions from code review

* skip
  • Loading branch information
mmsqe authored Oct 7, 2024
1 parent 3af3462 commit ff2b668
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ Ref: https://keepachangelog.com/en/1.0.0/

* (apps/27-interchain-accounts) [\#7277](https://github.com/cosmos/ibc-go/pull/7277) Use `GogoResolver` when populating module query safe allow list to avoid panics from unresolvable protobuf dependencies.
* (core/04-channel) [\#7342](https://github.com/cosmos/ibc-go/pull/7342) Read Tx cmd flags including from address to avoid Address cannot be empty error when upgrade-channels via cli.
* (core/03-connection) [\#7397](https://github.com/cosmos/ibc-go/pull/7397) Skip the genesis validation connectionID for localhost client.

## [v9.0.0](https://github.com/cosmos/ibc-go/releases/tag/v9.0.0) - 2024-10-01

Expand Down
16 changes: 9 additions & 7 deletions modules/core/03-connection/types/genesis.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"fmt"

host "github.com/cosmos/ibc-go/v9/modules/core/24-host"
"github.com/cosmos/ibc-go/v9/modules/core/exported"
)

// NewConnectionPaths creates a ConnectionPaths instance.
Expand Down Expand Up @@ -45,13 +46,14 @@ func (gs GenesisState) Validate() error {
var maxSequence uint64

for i, conn := range gs.Connections {
sequence, err := ParseConnectionSequence(conn.Id)
if err != nil {
return err
}

if sequence > maxSequence {
maxSequence = sequence
if conn.Id != exported.LocalhostConnectionID {
sequence, err := ParseConnectionSequence(conn.Id)
if err != nil {
return err
}
if sequence > maxSequence {
maxSequence = sequence
}
}

if err := conn.ValidateBasic(); err != nil {
Expand Down
15 changes: 15 additions & 0 deletions modules/core/03-connection/types/genesis_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (

"github.com/cosmos/ibc-go/v9/modules/core/03-connection/types"
commitmenttypes "github.com/cosmos/ibc-go/v9/modules/core/23-commitment/types"
"github.com/cosmos/ibc-go/v9/modules/core/exported"
ibctesting "github.com/cosmos/ibc-go/v9/testing"
)

Expand Down Expand Up @@ -91,6 +92,20 @@ func TestValidateGenesis(t *testing.T) {
),
expPass: false,
},
{
name: "localhost connection identifier",
genState: types.NewGenesisState(
[]types.IdentifiedConnection{
types.NewIdentifiedConnection(exported.LocalhostConnectionID, types.NewConnectionEnd(types.INIT, clientID, types.Counterparty{clientID2, connectionID2, commitmenttypes.NewMerklePrefix([]byte("prefix"))}, []*types.Version{ibctesting.ConnectionVersion}, 500)),
},
[]types.ConnectionPaths{
{clientID, []string{connectionID}},
},
0,
types.DefaultParams(),
),
expPass: true,
},
{
name: "next connection sequence is not greater than maximum connection identifier sequence provided",
genState: types.NewGenesisState(
Expand Down

0 comments on commit ff2b668

Please sign in to comment.