chore: upgrade to v0.52 part 1

.gitignore

@@ -18,9 +18,6 @@ build/
 # Dependency directories (remove the comment below to include it)
 # vendor/
 
-# Workspace state
-go.work*
-
 # editor
 .idea/
 

Makefile

@@ -124,7 +124,7 @@ TEST_E2E_TAGS = e2e
 
 test-e2e: $(TEST_E2E_DEPS)
 	@echo "Running e2e tests..."
-	@go test ./tests/e2e/e2e_test.go -timeout 30m -p 1 -race -v -tags='$(TEST_E2E_TAGS)'
+	@go test ./tests/e2e/e2e_test.go -timeout 30m -p 1 -v -tags='$(TEST_E2E_TAGS)'
 
 test-unit:
 	@go test -v -race $(shell go list ./... | grep -v tests/)
@@ -213,4 +213,4 @@ mocks: use-main
 	@go generate ./...
 	make format
 
-.PHONY: format mocks
+.PHONY: format mocks

contrib/images/feemarket.e2e.Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.22-bullseye AS builder
+FROM golang:1.23-bullseye AS builder
 
 WORKDIR /src/feemarket
 COPY . .

tests/app/ante.go

@@ -1,21 +1,26 @@
 package app
 
 import (
+	"github.com/cosmos/cosmos-sdk/x/auth/ante/unorderedtx"
+
+	circuitante "cosmossdk.io/x/circuit/ante"
+
 	errorsmod "cosmossdk.io/errors"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
-	authante "github.com/cosmos/cosmos-sdk/x/auth/ante"
+	ante "github.com/cosmos/cosmos-sdk/x/auth/ante"
 
 	feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante"
 )
 
 // AnteHandlerOptions are the options required for constructing an SDK AnteHandler with the fee market injected.
 type AnteHandlerOptions struct {
-	BaseOptions     authante.HandlerOptions
+	ante.HandlerOptions
 	BankKeeper      feemarketante.BankKeeper
 	AccountKeeper   feemarketante.AccountKeeper
 	FeeMarketKeeper feemarketante.FeeMarketKeeper
+	CircuitKeeper   circuitante.CircuitBreaker
 }
 
 // NewAnteHandler returns an AnteHandler that checks and increments sequence
@@ -26,11 +31,15 @@ func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
 	}
 
-	if options.BaseOptions.BankKeeper == nil {
+	if options.CircuitKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "circuit keeper is required for ante builder")
+	}
+
+	if options.BankKeeper == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "base options bank keeper is required for ante builder")
 	}
 
-	if options.BaseOptions.SignModeHandler == nil {
+	if options.SignModeHandler == nil {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
 	}
 
@@ -42,30 +51,34 @@ func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) {
 		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper keeper is required for ante builder")
 	}
 
-	anteDecorators := []sdk.AnteDecorator{
-		authante.NewSetUpContextDecorator(), // outermost AnteDecorator. SetUpContext must be called first
-		authante.NewExtensionOptionsDecorator(options.BaseOptions.ExtensionOptionChecker),
-		authante.NewValidateBasicDecorator(),
-		authante.NewTxTimeoutHeightDecorator(),
-		authante.NewValidateMemoDecorator(options.AccountKeeper),
-		authante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		feemarketante.NewFeeMarketCheckDecorator( // fee market check replaces fee deduct decorator
+	if options.FeegrantKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "feegrant keeper is required for ante builder")
+	}
+
+	feemarketDecorator := feemarketante.NewFeeMarketCheckDecorator( // fee market check replaces fee deduct decorator
+		options.AccountKeeper,
+		options.BankKeeper,
+		options.FeegrantKeeper,
+		options.FeeMarketKeeper,
+		ante.NewDeductFeeDecorator(
 			options.AccountKeeper,
 			options.BankKeeper,
-			options.BaseOptions.FeegrantKeeper,
-			options.FeeMarketKeeper,
-			authante.NewDeductFeeDecorator(
-				options.AccountKeeper,
-				options.BaseOptions.BankKeeper,
-				options.BaseOptions.FeegrantKeeper,
-				options.BaseOptions.TxFeeChecker,
-			),
-		), // fees are deducted in the fee market deduct post handler
-		authante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
-		authante.NewValidateSigCountDecorator(options.AccountKeeper),
-		authante.NewSigGasConsumeDecorator(options.AccountKeeper, options.BaseOptions.SigGasConsumer),
-		authante.NewSigVerificationDecorator(options.AccountKeeper, options.BaseOptions.SignModeHandler),
-		authante.NewIncrementSequenceDecorator(options.AccountKeeper),
+			options.FeegrantKeeper,
+			options.TxFeeChecker,
+		),
+	) // fees are deducted in the fee market deduct post handler
+	anteDecorators := []sdk.AnteDecorator{
+		ante.NewSetUpContextDecorator(options.Environment, options.ConsensusKeeper), // outermost AnteDecorator. SetUpContext must be called first
+		circuitante.NewCircuitBreakerDecorator(options.CircuitKeeper),
+		ante.NewExtensionOptionsDecorator(options.ExtensionOptionChecker),
+		ante.NewValidateBasicDecorator(options.Environment),
+		ante.NewTxTimeoutHeightDecorator(options.Environment),
+		ante.NewUnorderedTxDecorator(unorderedtx.DefaultMaxTimeoutDuration, options.UnorderedTxManager, options.Environment, ante.DefaultSha256Cost),
+		ante.NewValidateMemoDecorator(options.AccountKeeper),
+		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
+		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler, options.SigGasConsumer, options.AccountAbstractionKeeper),
+		feemarketDecorator,
+		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 	}
 
 	return sdk.ChainAnteDecorators(anteDecorators...), nil