Merge branch 'initia-labs:main' into main

Author: osrm

.github/config/.codespellignore

@@ -0,0 +1,14 @@
+cips
+pullrequest
+keypair
+pastTime
+hasTables
+Nam
+EyT
+upTo
+initia
+minitia
+expRes
+crate
+totalIn
+totalOut

.github/workflows/build-darwin-amd64.yml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22.5"
+          go-version: "1.22"
 
       - name: Set environment variables
         run: |

.github/workflows/build-darwin-arm64.yml

@@ -14,7 +14,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22.5"
+          go-version: "1.22"
       - name: Set environment variables
         run: |
           MINIWASM_NETWORK_NAME="miniwasm-1"

.github/workflows/build-linux-amd64.yml

@@ -12,7 +12,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: "1.22.5"
+          go-version: "1.22"
 
       - name: Set environment variables
         run: |

.github/workflows/lint.yml

@@ -23,14 +23,14 @@ concurrency:
 jobs:
   golangci:
     env:
-      GOLANGCI_LINT_VERSION: v1.59.1
+      GOLANGCI_LINT_VERSION: v1.61.0
     name: golangci-lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
           check-latest: true
       - uses: technote-space/[email protected]
         id: git_diff
@@ -72,7 +72,7 @@ jobs:
       - name: Setup go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.22
+          go-version: 1.23
           check-latest: true
       - run: |
           go mod tidy

.github/workflows/spellcheck.yml

@@ -0,0 +1,28 @@
+name: Spell Check
+
+on:
+  pull_request:
+
+jobs:
+  spellcheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v4
+      - name: Run codespell
+        continue-on-error: true
+        run: |
+          sudo apt-get install codespell -y
+          codespell -w --skip="*.pulsar.go,*.pb.go,*.pb.gw.go,*.cosmos_orm.go,*.json,*.git,*.js,crypto/keys,fuzz,*.h,proto/tendermint,*.bin,go.sum,go.work.sum,go.mod,statik.go,*.map,swagger.yaml" --ignore-words=.github/config/.codespellignore
+      - uses: peter-evans/[email protected]
+        if: github.event_name != 'pull_request'
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          commit-message: "chore: fix typos"
+          title: "chore: fix typos"
+          branch: "chore/fix-typos"
+          delete-branch: true
+          body: |
+            This PR fixes typos in the codebase.
+            Please review it, and merge if everything is fine.
+            If there are proto changes, run `make proto-gen` and commit the changes.

Dockerfile

@@ -2,7 +2,7 @@ FROM golang:1.22-alpine3.19 AS go-builder
 #ARG arch=x86_64
 
 # See https://github.com/CosmWasm/wasmvm/releases
-ENV LIBWASMVM_VERSION=v2.1.2
+ENV LIBWASMVM_VERSION=v2.1.3
 
 # this comes from standard alpine nightly file
 #  https://github.com/rust-lang/docker-rust-nightly/blob/master/alpine3.12/Dockerfile

Dockerfile.arm64

@@ -3,7 +3,7 @@ FROM arm64v8/golang:1.22-bullseye AS go-builder
 # Install minimum necessary dependencies, build Cosmos SDK, remove packages
 RUN apt update
 RUN apt install -y curl git build-essential
-# debug: for live editting in the image
+# debug: for live editing in the image
 RUN apt install -y vim
 
 WORKDIR /code

README.md

@@ -4,7 +4,7 @@ MiniWasm is an optimistic rollup consumer chain powered by WasmVM, designed to s
 
 ## Prerequisites
 
-- Go v1.22.5+
+- Go v1.22.7+
 
 ## Getting Started
 

app/ante/ante.go

@@ -12,8 +12,9 @@ import (
 	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 
 	opchildante "github.com/initia-labs/OPinit/x/opchild/ante"
-	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
+	opchildkeeper "github.com/initia-labs/OPinit/x/opchild/keeper"
 	"github.com/initia-labs/initia/app/ante/accnum"
+	"github.com/initia-labs/initia/app/ante/sigverify"
 
 	"github.com/skip-mev/block-sdk/v2/block"
 	auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante"
@@ -29,8 +30,8 @@ type HandlerOptions struct {
 	ante.HandlerOptions
 	Codec         codec.BinaryCodec
 	IBCkeeper     *ibckeeper.Keeper
-	OPChildKeeper opchildtypes.AnteKeeper
-	AuctionKeeper auctionkeeper.Keeper
+	OPChildKeeper *opchildkeeper.Keeper
+	AuctionKeeper *auctionkeeper.Keeper
 	TxEncoder     sdk.TxEncoder
 	MevLane       auctionante.MEVLane
 	FreeLane      block.Lane
@@ -48,30 +49,34 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
 	}
-
 	if options.BankKeeper == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
 	}
-
 	if options.SignModeHandler == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}
-
 	if options.WasmConfig == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm config is required for ante builder")
 	}
-
 	if options.WasmKeeper == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm keeper is required for ante builder")
 	}
-
 	if options.TXCounterStoreService == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "wasm store service is required for ante builder")
 	}
+	if options.OPChildKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "opchild keeper is required for ante builder")
+	}
+	if options.AuctionKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "auction keeper is required for ante builder")
+	}
+	if options.IBCkeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "IBC keeper is required for ante builder")
+	}
 
 	sigGasConsumer := options.SigGasConsumer
 	if sigGasConsumer == nil {
-		sigGasConsumer = ante.DefaultSigVerificationGasConsumer
+		sigGasConsumer = sigverify.DefaultSigVerificationGasConsumer
 	}
 
 	txFeeChecker := options.TxFeeChecker
@@ -111,10 +116,11 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		ante.NewSetPubKeyDecorator(options.AccountKeeper),
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
-		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
+		sigverify.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),
 		ante.NewIncrementSequenceDecorator(options.AccountKeeper),
 		ibcante.NewRedundantRelayDecorator(options.IBCkeeper),
 		auctionante.NewAuctionDecorator(options.AuctionKeeper, options.TxEncoder, options.MevLane),
+		opchildante.NewRedundantBridgeDecorator(options.OPChildKeeper),
 	}
 
 	return sdk.ChainAnteDecorators(anteDecorators...), nil

app/blocksdk.go

@@ -47,7 +47,7 @@ func setupBlockSDK(
 		Logger:          app.Logger(),
 		TxEncoder:       app.txConfig.TxEncoder(),
 		TxDecoder:       app.txConfig.TxDecoder(),
-		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.01"),
+		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.1"),
 		MaxTxs:          1,
 		SignerExtractor: signerExtractor,
 	}, opchildlanes.SystemLaneMatchHandler())
@@ -57,7 +57,7 @@ func setupBlockSDK(
 		Logger:          app.Logger(),
 		TxEncoder:       app.txConfig.TxEncoder(),
 		TxDecoder:       app.txConfig.TxDecoder(),
-		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.09"),
+		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.1"),
 		MaxTxs:          100,
 		SignerExtractor: signerExtractor,
 	}, factory, factory.MatchHandler())
@@ -75,7 +75,7 @@ func setupBlockSDK(
 		Logger:          app.Logger(),
 		TxEncoder:       app.txConfig.TxEncoder(),
 		TxDecoder:       app.txConfig.TxDecoder(),
-		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.8"),
+		MaxBlockSpace:   math.LegacyMustNewDecFromStr("0.7"),
 		MaxTxs:          mempoolMaxTxs,
 		SignerExtractor: signerExtractor,
 	})
@@ -98,7 +98,7 @@ func setupBlockSDK(
 			Codec:                 app.appCodec,
 			OPChildKeeper:         app.OPChildKeeper,
 			TxEncoder:             app.txConfig.TxEncoder(),
-			AuctionKeeper:         *app.AuctionKeeper,
+			AuctionKeeper:         app.AuctionKeeper,
 			MevLane:               mevLane,
 			FreeLane:              freeLane,
 			WasmKeeper:            app.WasmKeeper,

app/keepers/keepers.go

@@ -244,7 +244,7 @@ func NewAppKeeper(
 	appKeepers.OracleKeeper = &oracleKeeper
 
 	// Add the oracle keeper as a hook to market map keeper so new market map entries can be created
-	// and propogated to the oracle keeper.
+	// and propagated to the oracle keeper.
 	appKeepers.MarketMapKeeper.SetHooks(appKeepers.OracleKeeper.Hooks())
 
 	appKeepers.OPChildKeeper = opchildkeeper.NewKeeper(
@@ -293,6 +293,7 @@ func NewAppKeeper(
 	appKeepers.FeeGrantKeeper = &feeGrantKeeper
 
 	authzKeeper := authzkeeper.NewKeeper(runtime.NewKVStoreService(appKeepers.keys[authzkeeper.StoreKey]), appCodec, bApp.MsgServiceRouter(), appKeepers.AccountKeeper)
+	authzKeeper = authzKeeper.SetBankKeeper(appKeepers.BankKeeper)
 	appKeepers.AuthzKeeper = &authzKeeper
 
 	groupConfig := group.DefaultConfig()

app/upgrade.go

@@ -5,15 +5,33 @@ import (
 
 	upgradetypes "cosmossdk.io/x/upgrade/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+
+	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
 )
 
-const upgradeName = "0.2.4"
+const upgradeName = "0.6.4"
 
 // RegisterUpgradeHandlers returns upgrade handlers
 func (app *MinitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) {
-	app.UpgradeKeeper.SetUpgradeHandler(upgradeName,
-		func(ctx context.Context, plan upgradetypes.Plan, fromVM module.VersionMap) (module.VersionMap, error) {
-			return fromVM, nil
+	app.UpgradeKeeper.SetUpgradeHandler(
+		upgradeName,
+		func(ctx context.Context, _ upgradetypes.Plan, vm module.VersionMap) (module.VersionMap, error) {
+			params, err := app.OPChildKeeper.GetParams(ctx)
+			if err != nil {
+				return nil, err
+			}
+
+			// set non-zero default values for new params
+			if params.HookMaxGas == 0 {
+				params.HookMaxGas = opchildtypes.DefaultHookMaxGas
+
+				err = app.OPChildKeeper.SetParams(ctx, params)
+				if err != nil {
+					return nil, err
+				}
+			}
+
+			return vm, nil
 		},
 	)
 }

client/docs/statik/statik.go

@@ -37125,10 +37125,8 @@ paths:
                     description: bridge_config is the configuration of the bridge.
                     type: object
                     properties:
-                      challengers:
-                        type: array
-                        items:
-                          type: string
+                      challenger:
+                        type: string
                         description: The address of the challenger.
                       proposer:
                         type: string
@@ -70722,10 +70720,8 @@ definitions:
         description: bridge_config is the configuration of the bridge.
         type: object
         properties:
-          challengers:
-            type: array
-            items:
-              type: string
+          challenger:
+            type: string
             description: The address of the challenger.
           proposer:
             type: string
@@ -70853,10 +70849,8 @@ definitions:
             description: bridge_config is the configuration of the bridge.
             type: object
             properties:
-              challengers:
-                type: array
-                items:
-                  type: string
+              challenger:
+                type: string
                 description: The address of the challenger.
               proposer:
                 type: string
@@ -71629,10 +71623,8 @@ definitions:
   opinit.ophost.v1.BridgeConfig:
     type: object
     properties:
-      challengers:
-        type: array
-        items:
-          type: string
+      challenger:
+        type: string
         description: The address of the challenger.
       proposer:
         type: string

client/docs/swagger-ui/swagger.yaml

@@ -2,16 +2,21 @@ package main
 
 import (
 	"encoding/json"
-	"os"
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
+
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/module"
+
 	"github.com/initia-labs/OPinit/contrib/launchtools"
 	"github.com/initia-labs/OPinit/contrib/launchtools/steps"
+
 	"github.com/initia-labs/initia/app/params"
 	minitiaapp "github.com/initia-labs/miniwasm/app"
+
+	"github.com/initia-labs/miniwasm/contrib"
+
 	"github.com/pkg/errors"
 	"github.com/spf13/cobra"
 )
@@ -69,13 +74,14 @@ func LaunchCommand(ac *appCreator, enc params.EncodingConfig, mbm module.BasicMa
 func StoreAndInstantiateNFTContracts(input *launchtools.Config) launchtools.LauncherStepFunc {
 	return func(ctx launchtools.Launcher) error {
 		ctx.Logger().Info("Storing and instantiating cw721 and ics721 contracts")
+		fs := contrib.FS()
 
-		cw721, err := os.ReadFile("contrib/wasm/cw721_base.wasm")
+		cw721, err := fs.ReadFile("wasm/cw721_base.wasm")
 		if err != nil {
 			return errors.Wrapf(err, "failed to read cw721_base.wasm")
 		}
 
-		ics721, err := os.ReadFile("contrib/wasm/ics721_base.wasm")
+		ics721, err := fs.ReadFile("wasm/ics721_base.wasm")
 		if err != nil {
 			return errors.Wrapf(err, "failed to read ics721_base.wasm")
 		}