bump dependencies

fee whitelist

Makefile

@@ -151,7 +151,7 @@ update-swagger-docs: statik
 ###                                Protobuf                                 ###
 ###############################################################################
 
-protoVer=0.13.0
+protoVer=0.14.0
 protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
 protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
 

app/app.go

@@ -102,8 +102,8 @@ import (
 
 	// initia imports
 
-	initiaapplanes "github.com/initia-labs/initia/app/lanes"
-	initiaappparams "github.com/initia-labs/initia/app/params"
+	initialanes "github.com/initia-labs/initia/app/lanes"
+	"github.com/initia-labs/initia/app/params"
 	ibchooks "github.com/initia-labs/initia/x/ibc-hooks"
 	ibchookskeeper "github.com/initia-labs/initia/x/ibc-hooks/keeper"
 	ibchookstypes "github.com/initia-labs/initia/x/ibc-hooks/types"
@@ -118,6 +118,7 @@ import (
 	// OPinit imports
 	opchild "github.com/initia-labs/OPinit/x/opchild"
 	opchildkeeper "github.com/initia-labs/OPinit/x/opchild/keeper"
+	opchildlanes "github.com/initia-labs/OPinit/x/opchild/lanes"
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
 
 	// skip imports
@@ -144,7 +145,6 @@ import (
 	apphook "github.com/initia-labs/miniwasm/app/hook"
 	ibcwasmhooks "github.com/initia-labs/miniwasm/app/ibc-hooks"
 	appkeepers "github.com/initia-labs/miniwasm/app/keepers"
-	applanes "github.com/initia-labs/miniwasm/app/lanes"
 	"github.com/initia-labs/miniwasm/x/bank"
 	bankkeeper "github.com/initia-labs/miniwasm/x/bank/keeper"
 	"github.com/initia-labs/miniwasm/x/tokenfactory"
@@ -264,7 +264,7 @@ func NewMinitiaApp(
 	appOpts servertypes.AppOptions,
 	baseAppOptions ...func(*baseapp.BaseApp),
 ) *MinitiaApp {
-	encodingConfig := initiaappparams.MakeEncodingConfig()
+	encodingConfig := params.MakeEncodingConfig()
 	std.RegisterLegacyAminoCodec(encodingConfig.Amino)
 	std.RegisterInterfaces(encodingConfig.InterfaceRegistry)
 
@@ -727,7 +727,7 @@ func NewMinitiaApp(
 		app.keys[auctiontypes.StoreKey],
 		app.AccountKeeper,
 		app.BankKeeper,
-		applanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
+		opchildlanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
 		authorityAddr,
 	)
 	app.AuctionKeeper = &auctionKeeper
@@ -902,7 +902,10 @@ func NewMinitiaApp(
 		MaxTxs:          100,
 		SignerExtractor: signerExtractor,
 	}
-	freeLane := initiaapplanes.NewFreeLane(freeConfig, applanes.FreeLaneMatchHandler())
+	freeLane := initialanes.NewFreeLane(
+		freeConfig,
+		opchildlanes.NewFreeLaneMatchHandler(ac, app.OPChildKeeper).MatchHandler(),
+	)
 
 	defaultLaneConfig := blockbase.LaneConfig{
 		Logger:          app.Logger(),
@@ -912,7 +915,7 @@ func NewMinitiaApp(
 		MaxTxs:          0,
 		SignerExtractor: signerExtractor,
 	}
-	defaultLane := initiaapplanes.NewDefaultLane(defaultLaneConfig)
+	defaultLane := initialanes.NewDefaultLane(defaultLaneConfig)
 
 	lanes := []block.Lane{mevLane, freeLane, defaultLane}
 	mempool, err := block.NewLanedMempool(app.Logger(), lanes)