backport: fix ibc genesis export bug (#9401)

* correctly set next identifier sequence in genesis export for clients/connections/channels * add changelog
cosmos · Jun 9, 2021 · e9674d5 · e9674d5
1 parent 63980fa
commit e9674d5
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,10 @@ Ref: https://keepachangelog.com/en/1.0.0/
 
 ## Unreleased
 
+### Bug Fixes
+
+* [\#9401](https://github.com/cosmos/cosmos-sdk/pull/9401) Fixes incorrect export of IBC identifier sequences. Previously, the next identifier sequence for clients/connections/channels was not set during genesis export. This resulted in the next identifiers being generated on the new chain to reuse old identifiers (the sequences began again from 0).
+
 ### Features
 
 

diff --git a/x/ibc/core/02-client/genesis.go b/x/ibc/core/02-client/genesis.go
@@ -60,10 +60,11 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState {
 		panic(err)
 	}
 	return types.GenesisState{
-		Clients:          genClients,
-		ClientsMetadata:  clientsMetadata,
-		ClientsConsensus: k.GetAllConsensusStates(ctx),
-		Params:           k.GetParams(ctx),
-		CreateLocalhost:  false,
+		Clients:            genClients,
+		ClientsMetadata:    clientsMetadata,
+		ClientsConsensus:   k.GetAllConsensusStates(ctx),
+		Params:             k.GetParams(ctx),
+		CreateLocalhost:    false,
+		NextClientSequence: k.GetNextClientSequence(ctx),
 	}
 }
diff --git a/x/ibc/core/03-connection/genesis.go b/x/ibc/core/03-connection/genesis.go
@@ -22,7 +22,8 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
 // ExportGenesis returns the ibc connection submodule's exported genesis.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState {
 	return types.GenesisState{
-		Connections:           k.GetAllConnections(ctx),
-		ClientConnectionPaths: k.GetAllClientConnectionPaths(ctx),
+		Connections:            k.GetAllConnections(ctx),
+		ClientConnectionPaths:  k.GetAllClientConnectionPaths(ctx),
+		NextConnectionSequence: k.GetNextConnectionSequence(ctx),
 	}
 }
diff --git a/x/ibc/core/04-channel/genesis.go b/x/ibc/core/04-channel/genesis.go
@@ -37,12 +37,13 @@ func InitGenesis(ctx sdk.Context, k keeper.Keeper, gs types.GenesisState) {
 // ExportGenesis returns the ibc channel submodule's exported genesis.
 func ExportGenesis(ctx sdk.Context, k keeper.Keeper) types.GenesisState {
 	return types.GenesisState{
-		Channels:         k.GetAllChannels(ctx),
-		Acknowledgements: k.GetAllPacketAcks(ctx),
-		Commitments:      k.GetAllPacketCommitments(ctx),
-		Receipts:         k.GetAllPacketReceipts(ctx),
-		SendSequences:    k.GetAllPacketSendSeqs(ctx),
-		RecvSequences:    k.GetAllPacketRecvSeqs(ctx),
-		AckSequences:     k.GetAllPacketAckSeqs(ctx),
+		Channels:            k.GetAllChannels(ctx),
+		Acknowledgements:    k.GetAllPacketAcks(ctx),
+		Commitments:         k.GetAllPacketCommitments(ctx),
+		Receipts:            k.GetAllPacketReceipts(ctx),
+		SendSequences:       k.GetAllPacketSendSeqs(ctx),
+		RecvSequences:       k.GetAllPacketRecvSeqs(ctx),
+		AckSequences:        k.GetAllPacketAckSeqs(ctx),
+		NextChannelSequence: k.GetNextChannelSequence(ctx),
 	}
 }