From 74021dea2c705d2fde6264176c39c66c06d4c26d Mon Sep 17 00:00:00 2001 From: beer-1 <147697694+beer-1@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:08:06 +0900 Subject: [PATCH] upgrade: prepare upgrade (#80) * add missing opchild ante and prepare upgrade * add checking --- app/ante/ante.go | 21 +++++++++++++-------- app/blocksdk.go | 2 +- app/upgrade.go | 12 +++++++----- go.mod | 4 ++-- go.sum | 8 ++++---- 5 files changed, 27 insertions(+), 20 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 3edd4e4..80be822 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -12,7 +12,7 @@ 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" @@ -30,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 @@ -49,26 +49,30 @@ 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 { @@ -116,6 +120,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { 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 diff --git a/app/blocksdk.go b/app/blocksdk.go index 506b62e..4612027 100644 --- a/app/blocksdk.go +++ b/app/blocksdk.go @@ -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, diff --git a/app/upgrade.go b/app/upgrade.go index 8dba038..79ffed1 100644 --- a/app/upgrade.go +++ b/app/upgrade.go @@ -9,7 +9,7 @@ import ( opchildtypes "github.com/initia-labs/OPinit/x/opchild/types" ) -const upgradeName = "0.6.2" +const upgradeName = "0.6.3" // RegisterUpgradeHandlers returns upgrade handlers func (app *MinitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) { @@ -22,11 +22,13 @@ func (app *MinitiaApp) RegisterUpgradeHandlers(cfg module.Configurator) { } // set non-zero default values for new params - params.HookMaxGas = opchildtypes.DefaultHookMaxGas + if params.HookMaxGas == 0 { + params.HookMaxGas = opchildtypes.DefaultHookMaxGas - err = app.OPChildKeeper.SetParams(ctx, params) - if err != nil { - return nil, err + err = app.OPChildKeeper.SetParams(ctx, params) + if err != nil { + return nil, err + } } return vm, nil diff --git a/go.mod b/go.mod index 78deddd..ce338f3 100644 --- a/go.mod +++ b/go.mod @@ -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.3 - github.com/initia-labs/OPinit v0.5.7 + github.com/initia-labs/OPinit v0.6.0 github.com/initia-labs/initia v0.6.1 github.com/initia-labs/kvindexer v0.1.9 github.com/initia-labs/kvindexer/submodules/block v0.1.0 @@ -173,7 +173,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.5.7 // indirect + github.com/initia-labs/OPinit/api v0.6.0 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect github.com/jmhodges/levigo v1.0.0 // indirect github.com/jsternberg/zap-logfmt v1.3.0 // indirect diff --git a/go.sum b/go.sum index 6e35e65..0040a4a 100644 --- a/go.sum +++ b/go.sum @@ -1425,10 +1425,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.5.7 h1:25G0o2VXcO4EXzh9afdTdsXl1PTdYG9VMUx4efmWCuM= -github.com/initia-labs/OPinit v0.5.7/go.mod h1:lx1amLMszculwPu8ln+btJno38UV28fd2nP7XC88ZeE= -github.com/initia-labs/OPinit/api v0.5.7 h1:jghTmrrDEmowrqSpy7iL7IW9xJh40rn/S1y/LrwPkyE= -github.com/initia-labs/OPinit/api v0.5.7/go.mod h1:gHK6DEWb3/DqQD5LjKirUx9jilAh2UioXanoQdgqVfU= +github.com/initia-labs/OPinit v0.6.0 h1:V9jQf8+PjNctLX31FHMGUsk6fpnygVJO1WYzCmBMzkU= +github.com/initia-labs/OPinit v0.6.0/go.mod h1:gDpCh4Zx94mihwgzP/PLav8eVHLroZBu3dFyzCy8iIs= +github.com/initia-labs/OPinit/api v0.6.0 h1:Q3hDHpTd9EqlDfY/OryCKIwuXYWJxGJdGfJicV1RjL4= +github.com/initia-labs/OPinit/api v0.6.0/go.mod h1:gHK6DEWb3/DqQD5LjKirUx9jilAh2UioXanoQdgqVfU= github.com/initia-labs/cometbft v0.0.0-20241104064728-ef8cadf1bed8 h1:6msSRQr/WzQ7cIm1+foXoksqo2BH2fjBZM8j9q49Wpo= github.com/initia-labs/cometbft v0.0.0-20241104064728-ef8cadf1bed8/go.mod h1:q/3WRJxVVB19paSM7eB4g+8PxZKWpPBBTaHfxyICuLU= github.com/initia-labs/cometbft-client v0.0.0-20240924071428-ef115cefa07e h1:k+pg63SFozCAK4LZFSiZtof6z69Tlu0O/Zftj1aAwes=