WIP: fix few more issues

Author: akhilkumarpilli

Makefile

@@ -16,7 +16,7 @@ ifeq (,$(VERSION))
 endif
 
 SDK_VERSION := $(shell go list -m github.com/cosmos/cosmos-sdk | sed 's:.* ::')
-TM_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
+CMT_VERSION := $(shell go list -m github.com/cometbft/cometbft | sed 's:.* ::')
 
 LEDGER_ENABLED ?= true
 DB_BACKEND ?= goleveldb
@@ -103,7 +103,7 @@ ifeq ($(DB_BACKEND), badgerdb)
   ldflags += -X github.com/cosmos/cosmos-sdk/types.DBBackend=badgerdb
 endif
 
-ldflags += -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(TM_VERSION)
+ldflags += -X github.com/cometbft/cometbft/version.TMCoreSemVer=$(CMT_VERSION)
 
 ifeq ($(NO_STRIP),false)
   ldflags += -w -s
@@ -149,7 +149,7 @@ clean:
 GO_MAJOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f1)
 GO_MINOR_VERSION = $(shell go version | cut -c 14- | cut -d' ' -f1 | cut -d'.' -f2)
 MIN_GO_MAJOR_VERSION = 1
-MIN_GO_MINOR_VERSION = 18
+MIN_GO_MINOR_VERSION = 22
 GO_VERSION_ERROR = Golang version $(GO_MAJOR_VERSION).$(GO_MINOR_VERSION) is not supported, \
 please update to at least $(MIN_GO_MAJOR_VERSION).$(MIN_GO_MINOR_VERSION)
 

ante/fee_test.go

@@ -1,10 +1,11 @@
 package ante
 
 import (
+	sdkmath "cosmossdk.io/math"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
-func GetBurnFeePortion(burnFactor sdk.Dec, fee sdk.Coins) sdk.Coins {
+func GetBurnFeePortion(burnFactor sdkmath.LegacyDec, fee sdk.Coins) sdk.Coins {
 	feeDecCoins := sdk.NewDecCoinsFromCoins(fee...)
 
 	burnFeePortion, _ := feeDecCoins.MulDec(burnFactor).TruncateDecimal()

ante/feeburn.go

@@ -44,7 +44,7 @@ func ValidateDistributionFee(fee sdk.Coins, distrFeeAlloc DistributionFeeAllocat
 		return errorsmod.Wrap(sdkerrors.ErrInsufficientFee, "fee cannot be zero")
 	}
 
-	if !fee.IsEqual(SumDistributionFee(distrFeeAlloc)) {
+	if !fee.Equal(SumDistributionFee(distrFeeAlloc)) {
 		return errorsmod.Wrap(sdkerrors.ErrLogic, "fee distribution is invalid")
 	}
 

ante/feedistrib.go

@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	"cosmossdk.io/math"
-	tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
 	"github.com/skip-mev/feemarket/x/feemarket/types"
 	"github.com/stretchr/testify/suite"
 
@@ -83,8 +82,8 @@ func createTestApp(isCheckTx bool) (*cheqdapp.TestApp, sdk.Context, error) {
 	if err != nil {
 		return nil, sdk.Context{}, err
 	}
-	ctx := app.BaseApp.NewContext(isCheckTx, tmproto.Header{})
-	err = app.AccountKeeper.SetParams(ctx, authtypes.DefaultParams())
+	ctx := app.BaseApp.NewContext(isCheckTx)
+	err = app.AccountKeeper.Params.Set(ctx, authtypes.DefaultParams())
 	if err != nil {
 		return nil, sdk.Context{}, err
 	}
@@ -111,14 +110,12 @@ func (s *AnteTestSuite) SetupTest(isCheckTx bool) error {
 		return err
 	}
 	s.ctx = s.ctx.WithBlockHeight(1)
-	// Set up TxConfig.
-	encodingConfig := cheqdapp.MakeTestEncodingConfig()
 	// We're using TestMsg encoding in some tests, so register it here.
-	encodingConfig.Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
-	testdata.RegisterInterfaces(encodingConfig.InterfaceRegistry)
+	s.app.LegacyAmino().Amino.RegisterConcrete(&testdata.TestMsg{}, "testdata.TestMsg", nil)
+	testdata.RegisterInterfaces(s.app.InterfaceRegistry())
 
 	s.clientCtx = client.Context{}.
-		WithTxConfig(encodingConfig.TxConfig)
+		WithTxConfig(s.app.TxConfig())
 
 	anteHandler, err := cheqdapp.NewAnteHandler(
 		cheqdapp.HandlerOptions{
@@ -127,7 +124,7 @@ func (s *AnteTestSuite) SetupTest(isCheckTx bool) error {
 			FeegrantKeeper:  s.app.FeeGrantKeeper,
 			DidKeeper:       s.app.DidKeeper,
 			ResourceKeeper:  s.app.ResourceKeeper,
-			SignModeHandler: encodingConfig.TxConfig.SignModeHandler(),
+			SignModeHandler: s.app.TxConfig().SignModeHandler(),
 			SigGasConsumer:  sdkante.DefaultSigVerificationGasConsumer,
 			IBCKeeper:       s.app.IBCKeeper,
 			FeeMarketKeeper: s.app.FeeMarketKeeper,
@@ -182,7 +179,7 @@ func (s *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []uint
 		sigV2 := signing.SignatureV2{
 			PubKey: priv.PubKey(),
 			Data: &signing.SingleSignatureData{
-				SignMode:  s.clientCtx.TxConfig.SignModeHandler().DefaultMode(),
+				SignMode:  signing.SignMode(s.clientCtx.TxConfig.SignModeHandler().DefaultMode()),
 				Signature: nil,
 			},
 			Sequence: accSeqs[i],
@@ -203,8 +200,8 @@ func (s *AnteTestSuite) CreateTestTx(privs []cryptotypes.PrivKey, accNums []uint
 			AccountNumber: accNums[i],
 			Sequence:      accSeqs[i],
 		}
-		sigV2, err := tx.SignWithPrivKey(
-			s.clientCtx.TxConfig.SignModeHandler().DefaultMode(), signerData,
+		sigV2, err := tx.SignWithPrivKey(s.ctx,
+			signing.SignMode(s.clientCtx.TxConfig.SignModeHandler().DefaultMode()), signerData,
 			s.txBuilder, priv, s.clientCtx.TxConfig, accSeqs[i])
 		if err != nil {
 			return nil, err