bump opinit

initia-labs · Nov 22, 2023 · 7348b09 · 7348b09
1 parent 4cf350f
commit 7348b09
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 13 deletions.
diff --git a/app/ante/ante.go b/app/ante/ante.go
@@ -24,7 +24,7 @@ type HandlerOptions struct {
 	ante.HandlerOptions
 	Codec         codec.BinaryCodec
 	IBCkeeper     *ibckeeper.Keeper
-	RollupKeeper  opchildtypes.AnteKeeper
+	OPChildKeeper opchildtypes.AnteKeeper
 	AuctionKeeper auctionkeeper.Keeper
 	TxEncoder     sdk.TxEncoder
 	MevLane       auctionante.MEVLane
@@ -54,7 +54,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 
 	txFeeChecker := options.TxFeeChecker
 	if txFeeChecker == nil {
-		txFeeChecker = opchildante.NewMempoolFeeChecker(options.RollupKeeper).CheckTxFeeWithMinGasPrices
+		txFeeChecker = opchildante.NewMempoolFeeChecker(options.OPChildKeeper).CheckTxFeeWithMinGasPrices
 	}
 
 	freeLaneFeeChecker := func(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, int64, error) {

diff --git a/app/app.go b/app/app.go
@@ -233,7 +233,7 @@ type MinitiaApp struct {
 	ICAAuthKeeper         *icaauthkeeper.Keeper
 	IBCFeeKeeper          *ibcfeekeeper.Keeper
 	MoveKeeper            *movekeeper.Keeper
-	RollupKeeper          *opchildkeeper.Keeper
+	OPChildKeeper         *opchildkeeper.Keeper
 	AuctionKeeper         *auctionkeeper.Keeper // x/auction keeper used to process bids for TOB auctions
 
 	// make scoped keepers public for test purposes
@@ -349,9 +349,9 @@ func NewMinitiaApp(
 	)
 	app.BankKeeper = &bankKeeper
 
-	////////////////////////////////
-	// RollupKeeper Configuration //
-	////////////////////////////////
+	/////////////////////////////////
+	// OPChildKeeper Configuration //
+	/////////////////////////////////
 
 	opchildKeeper := opchildkeeper.NewKeeper(
 		appCodec,
@@ -362,7 +362,8 @@ func NewMinitiaApp(
 		app.MsgServiceRouter(),
 		authtypes.NewModuleAddress(opchildtypes.ModuleName).String(),
 	)
-	app.RollupKeeper = &opchildKeeper
+	app.OPChildKeeper = &opchildKeeper
+	app.SetStreamingService(app.OPChildKeeper.GetABCIListener())
 
 	// get skipUpgradeHeights from the app options
 	skipUpgradeHeights := map[int64]bool{}
@@ -407,7 +408,7 @@ func NewMinitiaApp(
 		appCodec,
 		keys[ibcexported.StoreKey],
 		app.GetSubspace(ibcexported.ModuleName),
-		app.RollupKeeper,
+		app.OPChildKeeper,
 		app.UpgradeKeeper,
 		scopedIBCKeeper,
 	)
@@ -604,7 +605,7 @@ func NewMinitiaApp(
 	app.mm = module.NewManager(
 		auth.NewAppModule(appCodec, *app.AccountKeeper, nil, nil),
 		bank.NewAppModule(appCodec, *app.BankKeeper, app.AccountKeeper),
-		opchild.NewAppModule(*app.RollupKeeper),
+		opchild.NewAppModule(*app.OPChildKeeper),
 		capability.NewAppModule(appCodec, *app.CapabilityKeeper, false),
 		feegrantmodule.NewAppModule(appCodec, app.AccountKeeper, app.BankKeeper, *app.FeeGrantKeeper, app.interfaceRegistry),
 		upgrade.NewAppModule(app.UpgradeKeeper),
@@ -839,7 +840,7 @@ func (app *MinitiaApp) setAnteHandler(
 			},
 			IBCkeeper:     app.IBCKeeper,
 			Codec:         app.appCodec,
-			RollupKeeper:  app.RollupKeeper,
+			OPChildKeeper: app.OPChildKeeper,
 			TxEncoder:     app.txConfig.TxEncoder(),
 			AuctionKeeper: *app.AuctionKeeper,
 			MevLane:       mevLane,
@@ -1070,7 +1071,7 @@ func (app *MinitiaApp) GetAccountKeeper() *authkeeper.AccountKeeper {
 // GetStakingKeeper implements the TestingApp interface.
 // It returns opchild instead of original staking keeper.
 func (app *MinitiaApp) GetStakingKeeper() ibctestingtypes.StakingKeeper {
-	return app.RollupKeeper
+	return app.OPChildKeeper
 }
 
 // GetIBCKeeper implements the TestingApp interface.

diff --git a/app/export.go b/app/export.go
@@ -30,7 +30,7 @@ func (app *MinitiaApp) ExportAppStateAndValidators(
 		return servertypes.ExportedApp{}, err
 	}
 
-	validators, err := opchild.WriteValidators(ctx, app.RollupKeeper)
+	validators, err := opchild.WriteValidators(ctx, app.OPChildKeeper)
 	if err != nil {
 		return servertypes.ExportedApp{}, err
 	}

diff --git a/go.sum b/go.sum
@@ -657,7 +657,7 @@ github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANyt
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/influxdata/influxdb1-client v0.0.0-20191209144304-8bf82d3c094d/go.mod h1:qj24IKcXYK6Iy9ceXlo3Tc+vtHo9lIhSX5JddghvEPo=
-github.com/initia-labs/OPinit v0.1.0-beta.3 h1:5Strjy4m2IVg4Y0xzkFL1hftpAbw9Q4XuVz/SD5R2c0=
+github.com/initia-labs/OPinit v0.1.0-beta.3 h1:aceYaL+vXi0ISkqCexnAIl8j+8o5d22oSx9vNm9loLA=
 github.com/initia-labs/OPinit v0.1.0-beta.3/go.mod h1:MPnFU2x4xzeT3L8K3lc0wkOl09o/oekEabPHIwWdqJg=
 github.com/initia-labs/cometbft v0.0.0-20230712071302-2eb72ff629a1 h1:uRvrlR44s83ZdXW+zudw1cy/jMv1X4n/l62glM9RTw0=
 github.com/initia-labs/cometbft v0.0.0-20230712071302-2eb72ff629a1/go.mod h1:Y2MMMN//O5K4YKd8ze4r9jmk4Y7h0ajqILXbH5JQFVs=