[DO NOT MERGE] v0.52.x integration CI tests

Makefile

@@ -1,12 +1,9 @@
 VERSION := $(shell echo $(shell git describe --tags 2>/dev/null || git log -1 --format='%h') | sed 's/^v//')
 COMMIT := $(shell git rev-parse --short HEAD)
 DOCKER := $(shell which docker)
-DOCKER_BUF := $(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace bufbuild/buf
-IMAGE := ghcr.io/tendermint/docker-build-proto:latest
-DOCKER_PROTO_BUILDER := docker run -v $(shell pwd):/workspace --workdir /workspace $(IMAGE)
 PROJECTNAME=$(shell basename "$(PWD)")
 HTTPS_GIT := https://github.com/celestiaorg/celestia-app.git
-PACKAGE_NAME          := github.com/celestiaorg/celestia-app/v3
+PACKAGE_NAME          := github.com/celestiaorg/celestia-app/v4
 # Before upgrading the GOLANG_CROSS_VERSION, please verify that a Docker image exists with the new tag.
 # See https://github.com/goreleaser/goreleaser-cross/pkgs/container/goreleaser-cross
 GOLANG_CROSS_VERSION  ?= v1.23.1
@@ -18,10 +15,15 @@ ldflags = -X github.com/cosmos/cosmos-sdk/version.Name=celestia-app \
 		  -X github.com/cosmos/cosmos-sdk/version.AppName=celestia-appd \
 		  -X github.com/cosmos/cosmos-sdk/version.Version=$(VERSION) \
 		  -X github.com/cosmos/cosmos-sdk/version.Commit=$(COMMIT) \
-		  -X github.com/celestiaorg/celestia-app/v3/pkg/appconsts.OverrideSquareSizeUpperBoundStr=$(OVERRIDE_MAX_SQUARE_SIZE)
+		  -X github.com/celestiaorg/celestia-app/v4/pkg/appconsts.OverrideSquareSizeUpperBoundStr=$(OVERRIDE_MAX_SQUARE_SIZE)
 
 BUILD_FLAGS := -tags "ledger" -ldflags '$(ldflags)'
 
+# proto builder image
+protoVer=0.15.2
+protoImageName=ghcr.io/cosmos/proto-builder:$(protoVer)
+protoImage=$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace $(protoImageName)
+
 ## help: Get more info on make commands.
 help: Makefile
 	@echo " Choose a command run in "$(PROJECTNAME)":"
@@ -59,25 +61,25 @@ mod-verify: mod
 ## proto-gen: Generate protobuf files. Requires docker.
 proto-gen:
 	@echo "--> Generating Protobuf files"
-	$(DOCKER) run --rm -v $(CURDIR):/workspace --workdir /workspace tendermintdev/sdk-proto-gen:v0.7 sh ./scripts/protocgen.sh
+	@$(protoImage) sh ./scripts/protocgen.sh
 .PHONY: proto-gen
 
 ## proto-lint: Lint protobuf files. Requires docker.
 proto-lint:
 	@echo "--> Linting Protobuf files"
-	@$(DOCKER_BUF) lint --error-format=json
+	@$(protoImage) buf lint --error-format=json
 .PHONY: proto-lint
 
 ## proto-check-breaking: Check if there are any breaking change to protobuf definitions.
 proto-check-breaking:
 	@echo "--> Checking if Protobuf definitions have any breaking changes"
-	@$(DOCKER_BUF) breaking --against $(HTTPS_GIT)#branch=main
+	@$(protoImage) buf breaking --against $(HTTPS_GIT)#branch=main
 .PHONY: proto-check-breaking
 
 ## proto-format: Format protobuf files. Requires Docker.
 proto-format:
 	@echo "--> Formatting Protobuf files"
-	@$(DOCKER_PROTO_BUILDER) find . -name '*.proto' -path "./proto/*" -exec clang-format -i {} \;
+	@$(protoImage) find ./ -name "*.proto" -exec clang-format -i {} \;
 .PHONY: proto-format
 
 build-docker:

app/ante/ante.go

@@ -1,27 +1,32 @@
 package ante
 
 import (
-	blobante "github.com/celestiaorg/celestia-app/v3/x/blob/ante"
-	blob "github.com/celestiaorg/celestia-app/v3/x/blob/keeper"
+	"context"
+
+	paramkeeper "cosmossdk.io/x/params/keeper"
+	"cosmossdk.io/x/tx/signing"
+	blobante "github.com/celestiaorg/celestia-app/v4/x/blob/ante"
+	blob "github.com/celestiaorg/celestia-app/v4/x/blob/keeper"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	"github.com/cosmos/cosmos-sdk/x/auth/signing"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
-	paramkeeper "github.com/cosmos/cosmos-sdk/x/params/keeper"
-	ibcante "github.com/cosmos/ibc-go/v6/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v6/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v9/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v9/modules/core/keeper"
 )
 
 func NewAnteHandler(
-	accountKeeper ante.AccountKeeper,
+	authkeeper ante.AccountKeeper,
+	accountAbstractionKeeper ante.AccountAbstractionKeeper,
 	bankKeeper authtypes.BankKeeper,
 	blobKeeper blob.Keeper,
+	consensusKeeper ConsensusKeeper,
 	feegrantKeeper ante.FeegrantKeeper,
-	signModeHandler signing.SignModeHandler,
+	signModeHandler *signing.HandlerMap,
 	sigGasConsumer ante.SignatureVerificationGasConsumer,
 	channelKeeper *ibckeeper.Keeper,
 	paramKeeper paramkeeper.Keeper,
 	msgVersioningGateKeeper *MsgVersioningGateKeeper,
+	forbiddenGovUpdateParams map[string][]string,
 ) sdk.AnteHandler {
 	return sdk.ChainAnteDecorators(
 		// Wraps the panic with the string format of the transaction
@@ -31,56 +36,57 @@ func NewAnteHandler(
 		msgVersioningGateKeeper,
 		// Set up the context with a gas meter.
 		// Must be called before gas consumption occurs in any other decorator.
-		ante.NewSetUpContextDecorator(),
+		ante.NewSetUpContextDecorator(authkeeper.GetEnvironment(), consensusKeeper),
 		// Ensure the tx is not larger than the configured threshold.
-		NewMaxTxSizeDecorator(),
+		NewMaxTxSizeDecorator(consensusKeeper),
 		// Ensure the tx does not contain any extension options.
 		ante.NewExtensionOptionsDecorator(nil),
 		// Ensure the tx passes ValidateBasic.
-		ante.NewValidateBasicDecorator(),
+		ante.NewValidateBasicDecorator(authkeeper.GetEnvironment()),
 		// Ensure the tx has not reached a height timeout.
-		ante.NewTxTimeoutHeightDecorator(),
+		ante.NewTxTimeoutHeightDecorator(authkeeper.GetEnvironment()),
 		// Ensure the tx memo <= max memo characters.
-		ante.NewValidateMemoDecorator(accountKeeper),
+		ante.NewValidateMemoDecorator(authkeeper),
 		// Ensure the tx's gas limit is > the gas consumed based on the tx size.
 		// Side effect: consumes gas from the gas meter.
-		NewConsumeGasForTxSizeDecorator(accountKeeper),
+		NewConsumeGasForTxSizeDecorator(authkeeper, consensusKeeper),
 		// Ensure the feepayer (fee granter or first signer) has enough funds to pay for the tx.
 		// Ensure the gas price >= network min gas price if app version >= 2.
 		// Side effect: deducts fees from the fee payer. Sets the tx priority in context.
-		ante.NewDeductFeeDecorator(accountKeeper, bankKeeper, feegrantKeeper, ValidateTxFeeWrapper(paramKeeper)),
-		// Set public keys in the context for fee-payer and all signers.
-		// Contract: must be called before all signature verification decorators.
-		ante.NewSetPubKeyDecorator(accountKeeper),
+		ante.NewDeductFeeDecorator(authkeeper, bankKeeper, feegrantKeeper, ValidateTxFeeWrapper(paramKeeper, consensusKeeper)),
 		// Ensure that the tx's count of signatures is <= the tx signature limit.
-		ante.NewValidateSigCountDecorator(accountKeeper),
-		// Ensure that the tx's gas limit is > the gas consumed based on signature verification.
-		// Side effect: consumes gas from the gas meter.
-		ante.NewSigGasConsumeDecorator(accountKeeper, sigGasConsumer),
+		ante.NewValidateSigCountDecorator(authkeeper),
 		// Ensure that the tx's signatures are valid. For each signature, ensure
 		// that the signature's sequence number (a.k.a nonce) matches the
 		// account sequence number of the signer.
-		// Note: does not consume gas from the gas meter.
-		ante.NewSigVerificationDecorator(accountKeeper, signModeHandler),
+		// Ensure that the tx's gas limit is > the gas consumed based on signature verification.
+		// Set public keys in the context for fee-payer and all signers.
+		// Side effect: consumes gas from the gas meter.
+		// Side effect: increment the nonce for all tx signers.
+		ante.NewSigVerificationDecorator(authkeeper, signModeHandler, sigGasConsumer, accountAbstractionKeeper),
 		// Ensure that the tx's gas limit is > the gas consumed based on the blob size(s).
 		// Contract: must be called after all decorators that consume gas.
 		// Note: does not consume gas from the gas meter.
-		blobante.NewMinGasPFBDecorator(blobKeeper),
+		blobante.NewMinGasPFBDecorator(blobKeeper, consensusKeeper),
 		// Ensure that the tx's total blob size is <= the max blob size.
 		// Only applies to app version == 1.
-		blobante.NewMaxTotalBlobSizeDecorator(blobKeeper),
+		blobante.NewMaxTotalBlobSizeDecorator(blobKeeper, consensusKeeper),
 		// Ensure that the blob shares occupied by the tx <= the max shares
 		// available to blob data in a data square. Only applies to app version
 		// >= 2.
-		blobante.NewBlobShareDecorator(blobKeeper),
+		blobante.NewBlobShareDecorator(blobKeeper, consensusKeeper),
 		// Ensure that tx's with a MsgSubmitProposal have at least one proposal
-		// message.
-		NewGovProposalDecorator(),
-		// Side effect: increment the nonce for all tx signers.
-		ante.NewIncrementSequenceDecorator(accountKeeper),
+		// message. Additionally ensure that the proposals do not contain any
+		NewGovProposalDecorator(forbiddenGovUpdateParams),
 		// Ensure that the tx is not an IBC packet or update message that has already been processed.
 		ibcante.NewRedundantRelayDecorator(channelKeeper),
 	)
 }
 
 var DefaultSigVerificationGasConsumer = ante.DefaultSigVerificationGasConsumer
+
+// ConsensusKeeper is the expected interface of the consensus keeper
+type ConsensusKeeper interface {
+	ante.ConsensusKeeper
+	AppVersion(context.Context) (uint64, error)
+}

app/ante/fee_checker.go

@@ -1,15 +1,18 @@
 package ante
 
 import (
+	"context"
+
+	"cosmossdk.io/core/transaction"
 	errors "cosmossdk.io/errors"
 	"cosmossdk.io/math"
-	"github.com/celestiaorg/celestia-app/v3/pkg/appconsts"
-	v1 "github.com/celestiaorg/celestia-app/v3/pkg/appconsts/v1"
-	"github.com/celestiaorg/celestia-app/v3/x/minfee"
+	params "cosmossdk.io/x/params/keeper"
+	"github.com/celestiaorg/celestia-app/v4/pkg/appconsts"
+	v1 "github.com/celestiaorg/celestia-app/v4/pkg/appconsts/v1"
+	"github.com/celestiaorg/celestia-app/v4/x/minfee"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerror "github.com/cosmos/cosmos-sdk/types/errors"
 	"github.com/cosmos/cosmos-sdk/x/auth/ante"
-	params "github.com/cosmos/cosmos-sdk/x/params/keeper"
 )
 
 const (
@@ -19,16 +22,18 @@ const (
 
 // The purpose of this wrapper is to enable the passing of an additional paramKeeper parameter in
 // ante.NewDeductFeeDecorator whilst still satisfying the ante.TxFeeChecker type.
-func ValidateTxFeeWrapper(paramKeeper params.Keeper) ante.TxFeeChecker {
-	return func(ctx sdk.Context, tx sdk.Tx) (sdk.Coins, int64, error) {
-		return ValidateTxFee(ctx, tx, paramKeeper)
+func ValidateTxFeeWrapper(paramKeeper params.Keeper, consensusKeeper ConsensusKeeper) ante.TxFeeChecker {
+	return func(ctx context.Context, tx transaction.Tx) (sdk.Coins, int64, error) {
+		return ValidateTxFee(ctx, tx, paramKeeper, consensusKeeper)
 	}
 }
 
 // ValidateTxFee implements default fee validation logic for transactions.
 // It ensures that the provided transaction fee meets a minimum threshold for the node
 // as well as a network minimum threshold and computes the tx priority based on the gas price.
-func ValidateTxFee(ctx sdk.Context, tx sdk.Tx, paramKeeper params.Keeper) (sdk.Coins, int64, error) {
+func ValidateTxFee(ctx context.Context, tx transaction.Tx, paramKeeper params.Keeper, consensusKeeper ConsensusKeeper) (sdk.Coins, int64, error) {
+	sdkCtx := sdk.UnwrapSDKContext(ctx)
+
 	feeTx, ok := tx.(sdk.FeeTx)
 	if !ok {
 		return nil, 0, errors.Wrap(sdkerror.ErrTxDecode, "Tx must be a FeeTx")
@@ -40,8 +45,8 @@ func ValidateTxFee(ctx sdk.Context, tx sdk.Tx, paramKeeper params.Keeper) (sdk.C
 	// Ensure that the provided fee meets a minimum threshold for the node.
 	// This is only for local mempool purposes, and thus
 	// is only ran on check tx.
-	if ctx.IsCheckTx() {
-		minGasPrice := ctx.MinGasPrices().AmountOf(appconsts.BondDenom)
+	if sdkCtx.IsCheckTx() {
+		minGasPrice := sdkCtx.MinGasPrices().AmountOf(appconsts.BondDenom)
 		if !minGasPrice.IsZero() {
 			err := verifyMinFee(fee, gas, minGasPrice, "insufficient minimum gas price for this node")
 			if err != nil {
@@ -52,20 +57,26 @@ func ValidateTxFee(ctx sdk.Context, tx sdk.Tx, paramKeeper params.Keeper) (sdk.C
 
 	// Ensure that the provided fee meets a network minimum threshold.
 	// Network minimum fee only applies to app versions greater than one.
-	if ctx.BlockHeader().Version.App > v1.Version {
+	appVersion, err := consensusKeeper.AppVersion(sdkCtx)
+	if err != nil {
+		return nil, 0, errors.Wrap(sdkerror.ErrLogic, "failed to get app version")
+	}
+
+	// sdkCtx.BlockHeight() > 0 is used to avoid errors when running tests which initialize genesis from v4
+	if appVersion > v1.Version && sdkCtx.BlockHeight() > 0 {
 		subspace, exists := paramKeeper.GetSubspace(minfee.ModuleName)
 		if !exists {
 			return nil, 0, errors.Wrap(sdkerror.ErrInvalidRequest, "minfee is not a registered subspace")
 		}
 
-		if !subspace.Has(ctx, minfee.KeyNetworkMinGasPrice) {
+		if !subspace.Has(sdkCtx, minfee.KeyNetworkMinGasPrice) {
 			return nil, 0, errors.Wrap(sdkerror.ErrKeyNotFound, "NetworkMinGasPrice")
 		}
 
-		var networkMinGasPrice sdk.Dec
+		var networkMinGasPrice math.LegacyDec
 		// Gets the network minimum gas price from the param store.
 		// Panics if not configured properly.
-		subspace.Get(ctx, minfee.KeyNetworkMinGasPrice, &networkMinGasPrice)
+		subspace.Get(sdkCtx, minfee.KeyNetworkMinGasPrice, &networkMinGasPrice)
 
 		err := verifyMinFee(fee, gas, networkMinGasPrice, "insufficient gas price for the network")
 		if err != nil {
@@ -78,10 +89,10 @@ func ValidateTxFee(ctx sdk.Context, tx sdk.Tx, paramKeeper params.Keeper) (sdk.C
 }
 
 // verifyMinFee validates that the provided transaction fee is sufficient given the provided minimum gas price.
-func verifyMinFee(fee math.Int, gas uint64, minGasPrice sdk.Dec, errMsg string) error {
+func verifyMinFee(fee math.Int, gas uint64, minGasPrice math.LegacyDec, errMsg string) error {
 	// Determine the required fee by multiplying required minimum gas
 	// price by the gas limit, where fee = minGasPrice * gas.
-	minFee := minGasPrice.MulInt(sdk.NewIntFromUint64(gas)).Ceil()
+	minFee := minGasPrice.MulInt(math.NewIntFromUint64(gas)).Ceil()
 	if fee.LT(minFee.TruncateInt()) {
 		return errors.Wrapf(sdkerror.ErrInsufficientFee, "%s; got: %s required at least: %s", errMsg, fee, minFee)
 	}
@@ -94,7 +105,7 @@ func verifyMinFee(fee math.Int, gas uint64, minGasPrice sdk.Dec, errMsg string)
 func getTxPriority(fee sdk.Coins, gas int64) int64 {
 	var priority int64
 	for _, c := range fee {
-		p := c.Amount.Mul(sdk.NewInt(priorityScalingFactor)).QuoRaw(gas)
+		p := c.Amount.Mul(math.NewInt(priorityScalingFactor)).QuoRaw(gas)
 		if !p.IsInt64() {
 			continue
 		}

app/ante/get_tx_priority_test.go

@@ -3,7 +3,7 @@ package ante
 import (
 	"testing"
 
-	"github.com/celestiaorg/celestia-app/v3/pkg/appconsts"
+	"github.com/celestiaorg/celestia-app/v4/pkg/appconsts"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/stretchr/testify/assert"
 )