fix(rollapp): fix packet lookup for non-rollapp chain-id (#1243)

danwt · web-flow · commit 61d5018fc282 · 2024-09-25T10:51:21.000+01:00
diff --git a/app/keepers/keepers.go b/app/keepers/keepers.go
@@ -357,6 +357,7 @@ func (a *AppKeepers) InitKeepers(
 		nil,
 		a.BankKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		nil,
 	)
 
 	a.SequencerKeeper = *sequencermodulekeeper.NewKeeper(
@@ -376,6 +377,7 @@ func (a *AppKeepers) InitKeepers(
 	)
 
 	a.RollappKeeper.SetSequencerKeeper(a.SequencerKeeper)
+	a.RollappKeeper.SetCanonicalClientKeeper(a.LightClientKeeper)
 
 	a.IncentivesKeeper = incentiveskeeper.NewKeeper(
 		a.keys[incentivestypes.StoreKey],
diff --git a/go.mod b/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/cosmos/ics23/go v0.10.0
 	github.com/decred/dcrd/dcrec/edwards v1.0.0
 	github.com/dustin/go-humanize v1.0.1
-	github.com/dymensionxyz/gerr-cosmos v1.0.0
+	github.com/dymensionxyz/gerr-cosmos v1.1.0
 	github.com/dymensionxyz/sdk-utils v0.2.9
 	github.com/ethereum/go-ethereum v1.10.26
 	github.com/evmos/ethermint v0.22.0
diff --git a/go.sum b/go.sum
@@ -502,8 +502,8 @@ github.com/dvsekhvalnov/jose2go v1.6.0 h1:Y9gnSnP4qEI0+/uQkHvFXeD2PLPJeXEL+ySMEA
 github.com/dvsekhvalnov/jose2go v1.6.0/go.mod h1:QsHjhyTlD/lAVqn/NSbVZmSCGeDehTB/mPZadG+mhXU=
 github.com/dymensionxyz/ethermint v0.22.0-dymension-v0.4.1.0.20240625101522-b1506ae83050 h1:1mtlo6bDOdBihHWbDpOaai0NMC/4xHCkCHGCqdLT8WM=
 github.com/dymensionxyz/ethermint v0.22.0-dymension-v0.4.1.0.20240625101522-b1506ae83050/go.mod h1:aokD0im7cUMMtR/khzNsmcGtINtxCpBfcgRvJdmLymA=
-github.com/dymensionxyz/gerr-cosmos v1.0.0 h1:oi91rgOkpJWr41oX9JOyjvvBnhGY54tj513x8VlDAEc=
-github.com/dymensionxyz/gerr-cosmos v1.0.0/go.mod h1:n+0olxPogzWqFKba45mCpvrHLGmeS8W9UZjggHnWk6c=
+github.com/dymensionxyz/gerr-cosmos v1.1.0 h1:IW/P7HCB/iP9kgk3VXaWUoMoyx3vD76YO6p1fnubHVc=
+github.com/dymensionxyz/gerr-cosmos v1.1.0/go.mod h1:n+0olxPogzWqFKba45mCpvrHLGmeS8W9UZjggHnWk6c=
 github.com/dymensionxyz/osmosis/osmomath v0.0.6-dymension-v0.1.0.20240820121212-c0e21fa21e43 h1:EskhZ6ILN3vwJ6l8gPWPZ49RFSB52WghT5v+pmzrNCI=
 github.com/dymensionxyz/osmosis/osmomath v0.0.6-dymension-v0.1.0.20240820121212-c0e21fa21e43/go.mod h1:SdGCL9CZb14twRAJUSzb7bRE0OoopRpF2Hnd1UhJpFU=
 github.com/dymensionxyz/osmosis/v15 v15.2.1-0.20240820121212-c0e21fa21e43 h1:ugbpHwwlckB4W/aNXUTEsxaakPFgXi+LAsCtvfJ200Q=
diff --git a/ibctesting/bridging_fee_test.go b/ibctesting/bridging_fee_test.go
@@ -50,6 +50,7 @@ func (s *bridgingFeeSuite) TestBridgingFee() {
 	s.fundSenderAccount()
 	s.createRollappWithFinishedGenesis(path.EndpointA.ChannelID)
 	s.registerSequencer()
+	s.setRollappLightClientID(s.rollappCtx().ChainID(), path.EndpointA.ClientID)
 
 	rollappEndpoint := path.EndpointB
 	rollappIBCKeeper := s.rollappChain().App.GetIBCKeeper()
diff --git a/ibctesting/delayed_ack_test.go b/ibctesting/delayed_ack_test.go
@@ -97,6 +97,7 @@ func (s *delayedAckSuite) TestTransferRollappToHubNotFinalized() {
 	hubIBCKeeper := s.hubChain().App.GetIBCKeeper()
 
 	s.createRollappWithFinishedGenesis(path.EndpointA.ChannelID)
+	s.setRollappLightClientID(s.rollappCtx().ChainID(), path.EndpointA.ClientID)
 	s.registerSequencer()
 	s.updateRollappState(uint64(s.rollappCtx().BlockHeight()))
 
@@ -139,6 +140,7 @@ func (s *delayedAckSuite) TestTransferRollappToHubFinalization() {
 	rollappIBCKeeper := s.rollappChain().App.GetIBCKeeper()
 
 	s.createRollappWithFinishedGenesis(path.EndpointA.ChannelID)
+	s.setRollappLightClientID(s.rollappCtx().ChainID(), path.EndpointA.ClientID)
 	s.registerSequencer()
 
 	// Update rollapp state
@@ -191,6 +193,7 @@ func (s *delayedAckSuite) TestHubToRollappTimeout() {
 	hubIBCKeeper := s.hubChain().App.GetIBCKeeper()
 	// Create rollapp and update its initial state
 	s.createRollappWithFinishedGenesis(path.EndpointA.ChannelID)
+	s.setRollappLightClientID(s.rollappCtx().ChainID(), path.EndpointA.ClientID)
 	s.registerSequencer()
 	s.updateRollappState(uint64(s.rollappCtx().BlockHeight()))
 	// Set the timeout height
diff --git a/ibctesting/eibc_test.go b/ibctesting/eibc_test.go
@@ -58,6 +58,7 @@ func (s *eibcSuite) SetupTest() {
 	// Register sequencer
 	s.registerSequencer()
 	s.path = path
+	s.setRollappLightClientID(s.rollappChain().ChainID, path.EndpointA.ClientID)
 }
 
 func (s *eibcSuite) TestEIBCDemandOrderCreation() {
diff --git a/ibctesting/utils_test.go b/ibctesting/utils_test.go
@@ -164,6 +164,12 @@ func (s *utilSuite) createRollapp(transfersEnabled bool, channelID *string) {
 	}
 }
 
+// necessary for tests which do not execute the entire light client flow, and just need to make transfers work
+// (all tests except the light client tests themselves)
+func (s *utilSuite) setRollappLightClientID(chainID, clientID string) {
+	s.hubApp().LightClientKeeper.SetCanonicalClient(s.hubCtx(), chainID, clientID)
+}
+
 func (s *utilSuite) registerSequencer() {
 	bond := sequencertypes.DefaultParams().MinBond
 	// fund account
@@ -197,7 +203,7 @@ func (s *utilSuite) updateRollappState(endHeight uint64) {
 	stateInfo, found := rollappKeeper.GetStateInfo(s.hubCtx(), rollappChainID(), latestStateInfoIndex.Index)
 	startHeight := uint64(1)
 	if found {
-		startHeight = stateInfo.StartHeight + stateInfo.NumBlocks
+		startHeight = stateInfo.LastHeight() + 1
 	}
 	numBlocks := endHeight - startHeight + 1
 	// populate the block descriptors
@@ -231,7 +237,8 @@ func (s *utilSuite) finalizeRollappState(index uint64, endHeight uint64) (sdk.Ev
 	stateInfoIdx := rollapptypes.StateInfoIndex{RollappId: rollappChainID(), Index: index}
 	stateInfo, found := rollappKeeper.GetStateInfo(ctx, rollappChainID(), stateInfoIdx.Index)
 	s.Require().True(found)
-	stateInfo.NumBlocks = endHeight - stateInfo.StartHeight + 1
+	// this is a hack to increase the finalized height by modifying the last state info instead of submitting a new one
+	stateInfo = stateInfo.WithNumBlocks(endHeight - stateInfo.StartHeight + 1)
 	stateInfo.Status = common.Status_FINALIZED
 	// update the status of the stateInfo
 	rollappKeeper.SetStateInfo(ctx, stateInfo)
diff --git a/proto/dymensionxyz/dymension/rollapp/state_info.proto b/proto/dymensionxyz/dymension/rollapp/state_info.proto
@@ -34,8 +34,7 @@ message StateInfo {
     string sequencer = 2;
     // startHeight is the block height of the first block in the batch
     uint64 startHeight = 3;
-    // numBlocks is the number of blocks included in this batch update
-    uint64 numBlocks = 4;
+    reserved 4; // used to be num blocks, deprecating in favour of counting len of BDs
     // DAPath is the description of the location on the DA layer
     string DAPath = 5;
 
diff --git a/testutil/keeper/dymns.go b/testutil/keeper/dymns.go
@@ -96,6 +96,7 @@ func DymNSKeeper(t testing.TB) (dymnskeeper.Keeper, dymnstypes.BankKeeper, rolla
 		nil, nil, nil,
 		bankKeeper,
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+		nil,
 	)
 
 	k := dymnskeeper.NewKeeper(cdc,
diff --git a/testutil/keeper/rollapp.go b/testutil/keeper/rollapp.go
@@ -40,7 +40,7 @@ func RollappKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {
 		memStoreKey,
 		"RollappParams",
 	)
-	k := keeper.NewKeeper(cdc, storeKey, paramsSubspace, nil, nil, nil, nil, authtypes.NewModuleAddress(govtypes.ModuleName).String())
+	k := keeper.NewKeeper(cdc, storeKey, paramsSubspace, nil, nil, nil, nil, authtypes.NewModuleAddress(govtypes.ModuleName).String(), nil)
 
 	ctx := sdk.NewContext(stateStore, cometbftproto.Header{}, false, log.NewNopLogger())
 
diff --git a/x/delayedack/keeper/finalize_test.go b/x/delayedack/keeper/finalize_test.go
@@ -71,10 +71,9 @@ func (s *DelayedAckTestSuite) TestFinalizePacket() {
 					Index:     1,
 				},
 				StartHeight: 1,
-				NumBlocks:   tc.rollappHeight,
 				Status:      commontypes.Status_FINALIZED,
 				Sequencer:   proposer,
-			}
+			}.WithNumBlocks(tc.rollappHeight)
 
 			// save state info
 			s.App.RollappKeeper.SetStateInfo(s.Ctx, stateInfo)
@@ -197,10 +196,9 @@ func (s *DelayedAckTestSuite) TestFinalizeRollappPacketsByReceiver() {
 					Index:     1,
 				},
 				StartHeight: 1,
-				NumBlocks:   tc.rollappHeight,
 				Status:      commontypes.Status_FINALIZED,
 				Sequencer:   proposer,
-			}
+			}.WithNumBlocks(tc.rollappHeight)
 
 			// save state info
 			s.App.RollappKeeper.SetStateInfo(s.Ctx, stateInfo)
diff --git a/x/delayedack/keeper/invariants_test.go b/x/delayedack/keeper/invariants_test.go
@@ -236,20 +236,18 @@ func (suite *DelayedAckTestSuite) TestRollappPacketsCasesInvariant() {
 					Index:     1,
 				},
 				StartHeight: 1,
-				NumBlocks:   10,
 				Status:      commontypes.Status_FINALIZED,
 				Sequencer:   proposer,
-			}
+			}.WithNumBlocks(10)
 			stateInfo2 := rollapptypes.StateInfo{
 				StateInfoIndex: rollapptypes.StateInfoIndex{
 					RollappId: rollapp,
 					Index:     2,
 				},
 				StartHeight: 11,
-				NumBlocks:   10,
 				Status:      commontypes.Status_PENDING,
 				Sequencer:   proposer,
-			}
+			}.WithNumBlocks(10)
 
 			// if nothingFinalized true, all the state infos submitted should be pending
 			if tc.nothingFinalized {
diff --git a/x/delayedack/keeper/keeper.go b/x/delayedack/keeper/keeper.go
@@ -63,7 +63,7 @@ func (k Keeper) getRollappFinalizedHeight(ctx sdk.Context, chainID string) (uint
 	}
 
 	stateInfo := k.rollappKeeper.MustGetStateInfo(ctx, chainID, latestFinalizedStateIndex.Index)
-	return stateInfo.StartHeight + stateInfo.NumBlocks - 1, nil
+	return stateInfo.GetLatestHeight(), nil
 }
 
 /* -------------------------------------------------------------------------- */
diff --git a/x/dymns/keeper/keeper_suite_test.go b/x/dymns/keeper/keeper_suite_test.go
@@ -144,6 +144,7 @@ func (s *KeeperTestSuite) SetupTest() {
 			nil, nil, nil,
 			bk,
 			authtypes.NewModuleAddress(govtypes.ModuleName).String(),
+			nil,
 		)
 
 		dk = dymnskeeper.NewKeeper(cdc,
diff --git a/x/lightclient/ante/ibc_msg_channel_open_ack.go b/x/lightclient/ante/ibc_msg_channel_open_ack.go
@@ -19,6 +19,7 @@ func (i IBCMessagesDecorator) HandleMsgChannelOpenAck(ctx sdk.Context, msg *ibcc
 	}
 	rollappID, found := i.lightClientKeeper.GetRollappForClientID(ctx, connection.GetClientID())
 	if !found {
+		// channel is for non rollapp
 		return nil
 	}
 	// Check if canon channel already exists for rollapp, if yes, return err
diff --git a/x/lightclient/ante/ibc_msg_update_client_test.go b/x/lightclient/ante/ibc_msg_update_client_test.go
@@ -109,7 +109,6 @@ func TestHandleMsgUpdateClient(t *testing.T) {
 									Index: 3,
 								},
 								StartHeight: 3,
-								NumBlocks:   1,
 								BDs: rollapptypes.BlockDescriptors{
 									BD: []rollapptypes.BlockDescriptor{
 										{
@@ -178,7 +177,6 @@ func TestHandleMsgUpdateClient(t *testing.T) {
 									Index: 1,
 								},
 								StartHeight: 1,
-								NumBlocks:   1,
 								BDs: rollapptypes.BlockDescriptors{
 									BD: []rollapptypes.BlockDescriptor{
 										{
@@ -195,7 +193,6 @@ func TestHandleMsgUpdateClient(t *testing.T) {
 									Index: 2,
 								},
 								StartHeight: 2,
-								NumBlocks:   1,
 								BDs: rollapptypes.BlockDescriptors{
 									BD: []rollapptypes.BlockDescriptor{
 										{
@@ -268,7 +265,6 @@ func TestHandleMsgUpdateClient(t *testing.T) {
 									Index: 1,
 								},
 								StartHeight: 1,
-								NumBlocks:   2,
 								BDs: rollapptypes.BlockDescriptors{
 									BD: []rollapptypes.BlockDescriptor{
 										{
diff --git a/x/lightclient/keeper/hook_listener_test.go b/x/lightclient/keeper/hook_listener_test.go
@@ -44,7 +44,6 @@ func TestAfterUpdateState(t *testing.T) {
 					stateInfo: &rollapptypes.StateInfo{
 						Sequencer:   keepertest.Alice,
 						StartHeight: 1,
-						NumBlocks:   1,
 						BDs: rollapptypes.BlockDescriptors{
 							BD: []rollapptypes.BlockDescriptor{
 								{
@@ -71,7 +70,6 @@ func TestAfterUpdateState(t *testing.T) {
 					stateInfo: &rollapptypes.StateInfo{
 						Sequencer:   keepertest.Alice,
 						StartHeight: 1,
-						NumBlocks:   3,
 						BDs: rollapptypes.BlockDescriptors{
 							BD: []rollapptypes.BlockDescriptor{
 								{
@@ -108,7 +106,6 @@ func TestAfterUpdateState(t *testing.T) {
 					stateInfo: &rollapptypes.StateInfo{
 						Sequencer:   keepertest.Alice,
 						StartHeight: 1,
-						NumBlocks:   3,
 						BDs: rollapptypes.BlockDescriptors{
 							BD: []rollapptypes.BlockDescriptor{
 								{
diff --git a/x/lightclient/types/expected_keepers.go b/x/lightclient/types/expected_keepers.go
@@ -21,7 +21,6 @@ type SequencerKeeperExpected interface {
 type RollappKeeperExpected interface {
 	GetRollapp(ctx sdk.Context, rollappId string) (val rollapptypes.Rollapp, found bool)
 	FindStateInfoByHeight(ctx sdk.Context, rollappId string, height uint64) (*rollapptypes.StateInfo, error)
-	GetStateInfo(ctx sdk.Context, rollappId string, index uint64) (val rollapptypes.StateInfo, found bool)
 	SetRollapp(ctx sdk.Context, rollapp rollapptypes.Rollapp)
 	HandleFraud(ctx sdk.Context, rollappID, clientId string, fraudHeight uint64, seqAddr string) error
 }
diff --git a/x/rollapp/keeper/authenticate_packet.go b/x/rollapp/keeper/authenticate_packet.go
@@ -4,10 +4,8 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	transfertypes "github.com/cosmos/ibc-go/v7/modules/apps/transfer/types"
-	"github.com/dymensionxyz/gerr-cosmos/gerrc"
-	uibc "github.com/dymensionxyz/sdk-utils/utils/uibc"
-
 	"github.com/dymensionxyz/dymension/v3/x/rollapp/types"
+	"github.com/dymensionxyz/gerr-cosmos/gerrc"
 )
 
 /*
@@ -52,40 +50,38 @@ func (k Keeper) GetValidTransfer(
 
 var errRollappNotFound = errorsmod.Wrap(gerrc.ErrNotFound, "rollapp")
 
-// getRollappByPortChan returns the rollapp id that a packet came from, if we are certain
-// that the packet came from that rollapp. That means that the canonical channel
-// has already been set.
+// getRollappByPortChan will get the rollapp for a transfer
+// if the transfer did not original from a rollapp, will return rollapp not found error
+// if the transfer did originate from a rollapp, but on the wrong channel, returns error
+//
+// in order to allow rollapp and non rollapps to have the same chain ID, the (possible)
+// rollapp is looked up by light client ID rather than chain ID. That requires the canonical
+// light client for the rollapp to have been set. That should always be the case for
+// correctly operated rollapps.
 func (k Keeper) getRollappByPortChan(ctx sdk.Context,
 	raPortOnHub, raChanOnHub string,
 ) (*types.Rollapp, error) {
-	/*
-		TODO:
-			There is an open issue of how we go about making sure that the packet really came from the rollapp, and once we know that it came
-			from the rollapp, also how we deal with fraud from the sequencer
-			See https://github.com/dymensionxyz/research/issues/242 for info
-			See
-				https://github.com/dymensionxyz/dymension/blob/8734e239483bb6290de6d01c196da35fa033e160/x/delayedack/keeper/authenticate_packet.go#L100-L204
-				https://github.com/dymensionxyz/dymension/blob/8734e239483bb6290de6d01c196da35fa033e160/x/delayedack/keeper/authenticate_packet.go#L100-L204
-				https://github.com/dymensionxyz/dymension/blob/a74ffb0cec00768bbb8dbe3fd6413e66388010d3/x/delayedack/keeper/keeper.go#L98-L107
-				https://github.com/dymensionxyz/dymension/blob/986d51ccd4807d514c91b3a147ac1b8ce5b590a1/x/delayedack/keeper/authenticate_packet.go#L47-L59
-				for the old implementations of checks
-	*/
-	chainID, err := uibc.ChainIDFromPortChannel(ctx, k.channelKeeper, raPortOnHub, raChanOnHub)
+	clientID, _, err := k.channelKeeper.GetChannelClientState(ctx, raPortOnHub, raChanOnHub)
 	if err != nil {
-		return nil, errorsmod.Wrap(err, "chain id from port and channel")
+		return nil, errorsmod.Wrap(err, "get chan client state")
+	}
+	chainID, ok := k.canonicalClientKeeper.GetRollappForClientID(ctx, clientID)
+	if !ok {
+		// non rollapp case. Note, we cannot differentiate the case where the transfer is not from a rollapp, or it is from a rollapp
+		// but that rollapp has (incorrectly) not got a canonical client
+		return nil, errorsmod.Wrapf(errRollappNotFound, "client id: %s: port: %s: channel: %s", clientID, raPortOnHub, raChanOnHub)
 	}
 	rollapp, ok := k.GetRollapp(ctx, chainID)
 	if !ok {
-		return nil, errorsmod.Wrapf(errRollappNotFound, "chain id: %s: port: %s: channel: %s", chainID, raPortOnHub, raChanOnHub)
+		return nil, errorsmod.Wrap(gerrc.ErrInternal, "have canonical client id but rollapp not found")
 	}
 	if rollapp.ChannelId == "" {
-		return nil, errorsmod.Wrapf(gerrc.ErrFailedPrecondition, "rollapp canonical channel mapping has not been set: %s", chainID)
+		return nil, errorsmod.Wrap(gerrc.ErrInternal, "canonical client for rollapp is set, but canonical channel is missing")
 	}
-
 	if rollapp.ChannelId != raChanOnHub {
 		return nil, errorsmod.Wrapf(
 			gerrc.ErrInvalidArgument,
-			"packet destination channel id mismatch: expect: %s: got: %s", rollapp.ChannelId, raChanOnHub,
+			"transfer from rollapp is not on canonical channel, packet destination channel id mismatch: expect: %s: got: %s", rollapp.ChannelId, raChanOnHub,
 		)
 	}
 	return &rollapp, nil
diff --git a/x/rollapp/keeper/grpc_query_get_state_info_by_height_test.go b/x/rollapp/keeper/grpc_query_get_state_info_by_height_test.go
diff --git a/x/rollapp/keeper/grpc_query_state_info_test.go b/x/rollapp/keeper/grpc_query_state_info_test.go
diff --git a/x/rollapp/keeper/keeper.go b/x/rollapp/keeper/keeper.go
diff --git a/x/rollapp/keeper/msg_server_update_state.go b/x/rollapp/keeper/msg_server_update_state.go
diff --git a/x/rollapp/keeper/msg_server_update_state_test.go b/x/rollapp/keeper/msg_server_update_state_test.go
diff --git a/x/rollapp/types/expected_keepers.go b/x/rollapp/types/expected_keepers.go
diff --git a/x/rollapp/types/state_info.go b/x/rollapp/types/state_info.go
diff --git a/x/rollapp/types/state_info.pb.go b/x/rollapp/types/state_info.pb.go

Original file line number	Diff line number	Diff line change
`@@ -357,6 +357,7 @@ func (a *AppKeepers) InitKeepers(`
`357`	`357`	`nil,`
`358`	`358`	`a.BankKeeper,`
`359`	`359`	`authtypes.NewModuleAddress(govtypes.ModuleName).String(),`
	`360`	`+ nil,`
`360`	`361`	`)`
`361`	`362`
`362`	`363`	`a.SequencerKeeper = *sequencermodulekeeper.NewKeeper(`
`@@ -376,6 +377,7 @@ func (a *AppKeepers) InitKeepers(`
`376`	`377`	`)`
`377`	`378`
`378`	`379`	`a.RollappKeeper.SetSequencerKeeper(a.SequencerKeeper)`
	`380`	`+ a.RollappKeeper.SetCanonicalClientKeeper(a.LightClientKeeper)`
`379`	`381`
`380`	`382`	`a.IncentivesKeeper = incentiveskeeper.NewKeeper(`
`381`	`383`	`a.keys[incentivestypes.StoreKey],`
Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@ func (s *eibcSuite) SetupTest() {`
`58`	`58`	`// Register sequencer`
`59`	`59`	`s.registerSequencer()`
`60`	`60`	`s.path = path`
	`61`	`+ s.setRollappLightClientID(s.rollappChain().ChainID, path.EndpointA.ClientID)`
`61`	`62`	`}`
`62`	`63`
`63`	`64`	`func (s *eibcSuite) TestEIBCDemandOrderCreation() {`
Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ func DymNSKeeper(t testing.TB) (dymnskeeper.Keeper, dymnstypes.BankKeeper, rolla`
`96`	`96`	`nil, nil, nil,`
`97`	`97`	`bankKeeper,`
`98`	`98`	`authtypes.NewModuleAddress(govtypes.ModuleName).String(),`
	`99`	`+ nil,`
`99`	`100`	`)`
`100`	`101`
`101`	`102`	`k := dymnskeeper.NewKeeper(cdc,`
Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func RollappKeeper(t testing.TB) (*keeper.Keeper, sdk.Context) {`
`40`	`40`	`memStoreKey,`
`41`	`41`	`"RollappParams",`
`42`	`42`	`)`
`43`		`- k := keeper.NewKeeper(cdc, storeKey, paramsSubspace, nil, nil, nil, nil, authtypes.NewModuleAddress(govtypes.ModuleName).String())`
	`43`	`+ k := keeper.NewKeeper(cdc, storeKey, paramsSubspace, nil, nil, nil, nil, authtypes.NewModuleAddress(govtypes.ModuleName).String(), nil)`
`44`	`44`
`45`	`45`	`ctx := sdk.NewContext(stateStore, cometbftproto.Header{}, false, log.NewNopLogger())`
`46`	`46`