Merge branch 'main' into indexer-v2

Author: Vritra4

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"
@@ -279,7 +279,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)
 
@@ -742,7 +742,7 @@ func NewMinitiaApp(
 		app.keys[auctiontypes.StoreKey],
 		app.AccountKeeper,
 		app.BankKeeper,
-		applanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
+		opchildlanes.NewRewardsAddressProvider(authtypes.FeeCollectorName),
 		authorityAddr,
 	)
 	app.AuctionKeeper = &auctionKeeper
@@ -924,7 +924,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(),
@@ -934,7 +937,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)

app/lanes/free.go

@@ -36679,6 +36679,11 @@ paths:
                     description: >-
                       the account address of admin who can execute permissioned
                       cosmos messages.
+                  fee_whitelist:
+                    type: array
+                    items:
+                      type: string
+                    description: the list of addresses that are allowed to pay zero fee.
             description: >-
               QueryParamsResponse is response type for the Query/Params RPC
               method.
@@ -68414,6 +68419,11 @@ definitions:
         description: >-
           the account address of admin who can execute permissioned cosmos
           messages.
+      fee_whitelist:
+        type: array
+        items:
+          type: string
+        description: the list of addresses that are allowed to pay zero fee.
     description: Params defines the set of move parameters.
   opinit.opchild.v1.QueryBridgeInfoResponse:
     type: object
@@ -68523,6 +68533,11 @@ definitions:
             description: >-
               the account address of admin who can execute permissioned cosmos
               messages.
+          fee_whitelist:
+            type: array
+            items:
+              type: string
+            description: the list of addresses that are allowed to pay zero fee.
     description: QueryParamsResponse is response type for the Query/Params RPC method.
   opinit.opchild.v1.QueryValidatorResponse:
     type: object

app/lanes/mev.go

@@ -186,6 +186,7 @@ func genesisCommand(encodingConfig params.EncodingConfig, basicManager module.Ba
 	cmd.AddCommand(
 		genutilcli.AddGenesisAccountCmd(minitiaapp.DefaultNodeHome, ac),
 		opchildcli.AddGenesisValidatorCmd(basicManager, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, minitiaapp.DefaultNodeHome),
+		opchildcli.AddFeeWhitelistCmd(minitiaapp.DefaultNodeHome, ac),
 		genutilcli.ValidateGenesisCmd(basicManager),
 		genutilcli.GenTxCmd(basicManager, encodingConfig.TxConfig, banktypes.GenesisBalancesIterator{}, minitiaapp.DefaultNodeHome, ac),
 	)

client/docs/statik/statik.go

@@ -35,7 +35,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/grpc-ecosystem/grpc-gateway v1.16.0
 	github.com/hashicorp/go-metrics v0.5.2
-	github.com/initia-labs/OPinit v0.2.3
+	github.com/initia-labs/OPinit v0.2.4
 	github.com/initia-labs/initia v0.2.4
 	github.com/initia-labs/kvindexer v0.0.0-20240418053137-f8c414401ba9
 	github.com/pkg/errors v0.9.1
@@ -144,7 +144,7 @@ require (
 	github.com/iancoleman/strcase v0.3.0 // indirect
 	github.com/improbable-eng/grpc-web v0.15.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e // indirect
+	github.com/initia-labs/OPinit/api v0.2.4 // indirect
 	github.com/jmespath/go-jmespath v0.4.0 // indirect
 	github.com/jmhodges/levigo v1.0.0 // indirect
 	github.com/klauspost/compress v1.17.7 // indirect

client/docs/swagger-ui/swagger.yaml

@@ -730,10 +730,10 @@ 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.2.3 h1:QWjYlHi2ibQ972PU1sJF03P3B/NWrZecVvrbm/CWbFE=
-github.com/initia-labs/OPinit v0.2.3/go.mod h1:1dn1iseG1S4wfXUtnb4mUkraJdL9/lWBQPpI+HbVzL0=
-github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e h1:PxrLVIOox7+r2M1nV6KtlIZtVSEONdkh6oyklduJMHc=
-github.com/initia-labs/OPinit/api v0.0.0-20240414040035-1a494620f55e/go.mod h1:ASCaZChzhQenOxDLIBicEgi5drhMV3YjPxzV29nGvwM=
+github.com/initia-labs/OPinit v0.2.4 h1:91X75LD84wXeHF48u0+etcFC84/6xYT9YGbUYG5cebs=
+github.com/initia-labs/OPinit v0.2.4/go.mod h1:pr1BXooQo/vKwt1tGsaKMI0gH+bJ+FgUImE1uXwwGhc=
+github.com/initia-labs/OPinit/api v0.2.4 h1:W4OxVmCLwgcK5paZLTWeFt3EaknBG54+5IEB57lVgcY=
+github.com/initia-labs/OPinit/api v0.2.4/go.mod h1:wo2P41YSL9kQ+/PvHN5HIp5ICAmKvE39QQEQKbsxqm4=
 github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3 h1:IX3182+BZ8ksVtAdIlU9ub01dmSAM9lvjHuUz9GWzjc=
 github.com/initia-labs/cometbft v0.0.0-20240404091408-238cddd887d3/go.mod h1:qv+nhSohSXLgU45IxHDGM5x4+bG4khsqqyn+e0iEbfo=
 github.com/initia-labs/cosmos-sdk v0.0.0-20240313050640-ff14560eeb21 h1:AwqnO5IR+3LWzjqR33MzOkce38ExWLtQwlqrLZVrMyw=

cmd/minitiad/root.go

@@ -55,8 +55,6 @@ cd ..
 # all the individual swagger files need to be configured in `config.json` for merging
 swagger-combine ./client/docs/config.json -o ./client/docs/swagger-ui/swagger.yaml -f yaml --continueOnConflictingPaths true --includeDefinitions true
 
-ls -ltrR ./tmp-swagger-gen
-
 # clean swagger files
 rm -rf ./tmp-swagger-gen