From 9d2d6ebb82da2ba4efe261d299e4a58ef5007b56 Mon Sep 17 00:00:00 2001 From: beer-1 Date: Fri, 15 Nov 2024 17:58:34 +0900 Subject: [PATCH] add missing opchild ante --- app/ante/ante.go | 7 ++++--- app/blocksdk.go | 2 +- go.mod | 4 ++-- go.sum | 8 ++++---- integration-tests/go.mod | 4 ++-- integration-tests/go.sum | 6 ++---- 6 files changed, 15 insertions(+), 16 deletions(-) diff --git a/app/ante/ante.go b/app/ante/ante.go index 3be51e4..e6c659a 100644 --- a/app/ante/ante.go +++ b/app/ante/ante.go @@ -11,7 +11,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" evmante "github.com/initia-labs/minievm/x/evm/ante" @@ -28,8 +28,8 @@ type HandlerOptions struct { ante.HandlerOptions Codec codec.BinaryCodec IBCkeeper *ibckeeper.Keeper - OPChildKeeper opchildtypes.AnteKeeper - AuctionKeeper auctionkeeper.Keeper + OPChildKeeper *opchildkeeper.Keeper + AuctionKeeper *auctionkeeper.Keeper EVMKeeper EVMKeeper TxEncoder sdk.TxEncoder @@ -100,6 +100,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) { evmante.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 342bebd..ee22e56 100644 --- a/app/blocksdk.go +++ b/app/blocksdk.go @@ -97,7 +97,7 @@ func setupBlockSDK( Codec: app.appCodec, OPChildKeeper: app.OPChildKeeper, TxEncoder: app.txConfig.TxEncoder(), - AuctionKeeper: *app.AuctionKeeper, + AuctionKeeper: app.AuctionKeeper, MevLane: mevLane, FreeLane: freeLane, EVMKeeper: app.EVMKeeper, diff --git a/go.mod b/go.mod index b9ea061..8995c74 100644 --- a/go.mod +++ b/go.mod @@ -36,7 +36,7 @@ require ( github.com/hashicorp/go-metrics v0.5.3 github.com/hashicorp/golang-lru/v2 v2.0.7 github.com/holiman/uint256 v1.3.1 - 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 @@ -178,7 +178,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/initia-labs/kvindexer/submodules/tx v0.1.0 // indirect github.com/jackpal/go-nat-pmp v1.0.2 // indirect github.com/jmespath/go-jmespath v0.4.0 // indirect diff --git a/go.sum b/go.sum index fd2a25e..a04a9af 100644 --- a/go.sum +++ b/go.sum @@ -1433,10 +1433,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-20241113064430-a371e2dc387f h1:PpYBvJ0L58bAgH7KwS/7GBEUphLnhf4fnTLua9uOov8= github.com/initia-labs/cometbft v0.0.0-20241113064430-a371e2dc387f/go.mod h1:y7+6kPknafzWlkSMCekzXC81wpRf1pcVAUnO0wRy9lQ= github.com/initia-labs/cometbft-client v0.0.0-20240924071428-ef115cefa07e h1:k+pg63SFozCAK4LZFSiZtof6z69Tlu0O/Zftj1aAwes= diff --git a/integration-tests/go.mod b/integration-tests/go.mod index 9d3df7b..ce5fbb6 100644 --- a/integration-tests/go.mod +++ b/integration-tests/go.mod @@ -146,8 +146,8 @@ 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 v0.5.7 // indirect - github.com/initia-labs/OPinit/api v0.5.7 // indirect + github.com/initia-labs/OPinit v0.6.0 // indirect + github.com/initia-labs/OPinit/api v0.6.0 // indirect github.com/initia-labs/kvindexer v0.1.9 // indirect github.com/initia-labs/kvindexer/submodules/block v0.1.0 // indirect github.com/initia-labs/kvindexer/submodules/evm-tx v0.1.2 // indirect diff --git a/integration-tests/go.sum b/integration-tests/go.sum index 8ffed47..1a6d8bf 100644 --- a/integration-tests/go.sum +++ b/integration-tests/go.sum @@ -1393,10 +1393,8 @@ 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/api v0.6.0 h1:Q3hDHpTd9EqlDfY/OryCKIwuXYWJxGJdGfJicV1RjL4= github.com/initia-labs/cometbft v0.0.0-20241113064430-a371e2dc387f h1:PpYBvJ0L58bAgH7KwS/7GBEUphLnhf4fnTLua9uOov8= github.com/initia-labs/cometbft v0.0.0-20241113064430-a371e2dc387f/go.mod h1:y7+6kPknafzWlkSMCekzXC81wpRf1pcVAUnO0wRy9lQ= github.com/initia-labs/evm v0.0.0-20241108055119-3d312736d7fb h1:oyH9gg/4f7uMCIJYnSpp7wa1NrGjSMsXTtypUfrsPLU=