bump contracts and use local ante handler

Author: beer-1

app/ante/account_number.go

@@ -0,0 +1,48 @@
+package ante
+
+import (
+	storetypes "cosmossdk.io/store/types"
+
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	cosmosante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
+)
+
+// AccountNumberDecorator is a custom ante handler that increments the account number depending on
+// the execution mode (Simulate, CheckTx, Finalize).
+//
+// This is to avoid account number conflicts when running concurrent Simulate, CheckTx, and Finalize.
+type AccountNumberDecorator struct {
+	ak cosmosante.AccountKeeper
+}
+
+// NewAccountNumberDecorator creates a new instance of AccountNumberDecorator.
+func NewAccountNumberDecorator(ak cosmosante.AccountKeeper) AccountNumberDecorator {
+	return AccountNumberDecorator{ak}
+}
+
+// AnteHandle is the AnteHandler implementation for AccountNumberDecorator.
+func (and AccountNumberDecorator) AnteHandle(ctx sdk.Context, tx sdk.Tx, simulate bool, next sdk.AnteHandler) (sdk.Context, error) {
+	if !ctx.IsCheckTx() && !ctx.IsReCheckTx() && !simulate {
+		return next(ctx, tx, simulate)
+	}
+
+	ak := and.ak.(*authkeeper.AccountKeeper)
+
+	gasFreeCtx := ctx.WithGasMeter(storetypes.NewInfiniteGasMeter())
+	num, err := ak.AccountNumber.Peek(gasFreeCtx)
+	if err != nil {
+		return ctx, err
+	}
+
+	accountNumAddition := uint64(1_000_000)
+	if simulate {
+		accountNumAddition += 1_000_000
+	}
+
+	if err := ak.AccountNumber.Set(gasFreeCtx, num+accountNumAddition); err != nil {
+		return ctx, err
+	}
+
+	return next(ctx, tx, simulate)
+}

app/ante/ante.go

@@ -12,7 +12,6 @@ import (
 
 	opchildante "github.com/initia-labs/OPinit/x/opchild/ante"
 	opchildtypes "github.com/initia-labs/OPinit/x/opchild/types"
-	initiaante "github.com/initia-labs/initia/app/ante"
 
 	"github.com/skip-mev/block-sdk/v2/block"
 	auctionante "github.com/skip-mev/block-sdk/v2/x/auction/ante"
@@ -94,7 +93,7 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	}
 
 	anteDecorators := []sdk.AnteDecorator{
-		initiaante.NewAccountNumberDecorator(options.AccountKeeper),
+		NewAccountNumberDecorator(options.AccountKeeper),
 		ante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
 		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
 		// NOTE - WASM simulation gas limit can affect other module messages.

app/app.go

@@ -785,7 +785,7 @@ func NewMinitiaApp(
 		consensus.NewAppModule(appCodec, *app.ConsensusParamsKeeper),
 		wasm.NewAppModule(appCodec, app.WasmKeeper, nil /* unused */, app.AccountKeeper, app.BankKeeper, app.MsgServiceRouter(), nil),
 		auction.NewAppModule(app.appCodec, *app.AuctionKeeper),
-		tokenfactory.NewAppModule(appCodec, *app.TokenFactoryKeeper, *app.AccountKeeper, *app.BankKeeper),
+		tokenfactory.NewAppModule(appCodec, app.TokenFactoryKeeper, *app.AccountKeeper, *app.BankKeeper),
 		// ibc modules
 		ibc.NewAppModule(app.IBCKeeper),
 		ibctransfer.NewAppModule(*app.TransferKeeper),

app/ibc-hooks/contracts/Cargo.lock

@@ -28,9 +28,9 @@ overflow-checks = true
 
 
 [dependencies]
-cosmwasm-std = "1.1.0"
-cosmwasm-schema = "1.1.0"
-cw-storage-plus = "0.13.4"
+cosmwasm-std = "2.0.4"
+cosmwasm-schema = "2.0.4"
+cw-storage-plus = "2.0.0"
 
 [dev-dependencies]
 

app/ibc-hooks/contracts/Cargo.toml

@@ -1 +1,2 @@
 c132532b9641facc9afe6c4ad81bebd1237292c26f50ec782426b51cee4cdc90  counter-aarch64.wasm
+c7ef9d37456ef0e7754f0e7df70f6f2488a185ea2a1acdee464daf65428d66c3  counter.wasm