feat: make v0.50 compile and fix unit-tests

app/ante.go

@@ -1,29 +1,29 @@
 package app
 
 import (
+	corestoretypes "cosmossdk.io/core/store"
 	sdkerrors "cosmossdk.io/errors"
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
-	"github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	"github.com/cosmos/cosmos-sdk/types/errors"
 	sdkante "github.com/cosmos/cosmos-sdk/x/auth/ante"
-	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
-	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
+	ibcante "github.com/cosmos/ibc-go/v8/modules/core/ante"
+	ibckeeper "github.com/cosmos/ibc-go/v8/modules/core/keeper"
 
 	"github.com/NibiruChain/nibiru/app/ante"
-	devgasante "github.com/NibiruChain/nibiru/x/devgas/v1/ante"
-	devgaskeeper "github.com/NibiruChain/nibiru/x/devgas/v1/keeper"
+	// devgasante "github.com/NibiruChain/nibiru/x/devgas/v1/ante"
+	// devgaskeeper "github.com/NibiruChain/nibiru/x/devgas/v1/keeper"
 )
 
 type AnteHandlerOptions struct {
 	sdkante.HandlerOptions
-	IBCKeeper        *ibckeeper.Keeper
-	DevGasKeeper     *devgaskeeper.Keeper
-	DevGasBankKeeper devgasante.BankKeeper
+	IBCKeeper *ibckeeper.Keeper
+	// DevGasKeeper     *devgaskeeper.Keeper
+	// DevGasBankKeeper devgasante.BankKeeper
 
-	TxCounterStoreKey types.StoreKey
-	WasmConfig        *wasmtypes.WasmConfig
+	TXCounterStoreService corestoretypes.KVStoreService
+	WasmConfig            *wasmtypes.WasmConfig
 }
 
 // NewAnteHandler returns and AnteHandler that checks and increments sequence
@@ -37,19 +37,19 @@ func NewAnteHandler(options AnteHandlerOptions) (sdk.AnteHandler, error) {
 	anteDecorators := []sdk.AnteDecorator{
 		sdkante.NewSetUpContextDecorator(),
 		wasmkeeper.NewLimitSimulationGasDecorator(options.WasmConfig.SimulationGasLimit),
-		wasmkeeper.NewCountTXDecorator(options.TxCounterStoreKey),
+		wasmkeeper.NewCountTXDecorator(options.TXCounterStoreService),
 		sdkante.NewExtensionOptionsDecorator(nil),
 		sdkante.NewValidateBasicDecorator(),
 		sdkante.NewTxTimeoutHeightDecorator(),
 		sdkante.NewValidateMemoDecorator(options.AccountKeeper),
-		ante.NewPostPriceFixedPriceDecorator(),
+		// ante.NewPostPriceFixedPriceDecorator(),
 		ante.AnteDecoratorStakingCommission{},
 		sdkante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		// Replace fee ante from cosmos auth with a custom one.
 		sdkante.NewDeductFeeDecorator(
 			options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
-		devgasante.NewDevGasPayoutDecorator(
-			options.DevGasBankKeeper, options.DevGasKeeper),
+		// devgasante.NewDevGasPayoutDecorator(
+		// 	options.DevGasBankKeeper, options.DevGasKeeper),
 		// SetPubKeyDecorator must be called before all signature verification decorators
 		sdkante.NewSetPubKeyDecorator(options.AccountKeeper),
 		sdkante.NewValidateSigCountDecorator(options.AccountKeeper),
@@ -78,9 +78,9 @@ func (opts *AnteHandlerOptions) ValidateAndClean() error {
 	if opts.WasmConfig == nil {
 		return AnteHandlerError("wasm config")
 	}
-	if opts.DevGasKeeper == nil {
-		return AnteHandlerError("devgas keeper")
-	}
+	// if opts.DevGasKeeper == nil {
+	// 	return AnteHandlerError("devgas keeper")
+	// }
 	if opts.IBCKeeper == nil {
 		return AnteHandlerError("ibc keeper")
 	}

app/ante/commission.go

@@ -6,7 +6,7 @@ import (
 	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 )
 
-func MAX_COMMISSION() sdk.Dec { return math.LegacyMustNewDecFromStr("0.25") }
+func MAX_COMMISSION() math.LegacyDec { return math.LegacyMustNewDecFromStr("0.25") }
 
 var _ sdk.AnteDecorator = (*AnteDecoratorStakingCommission)(nil)
 

app/ante/commission_test.go

@@ -32,7 +32,7 @@ func (s *AnteTestSuite) TestAnteDecoratorStakingCommission() {
 	}
 
 	valAddr := sdk.ValAddress(testutil.AccAddress()).String()
-	commissionRatePointer := new(sdk.Dec)
+	commissionRatePointer := new(math.LegacyDec)
 	*commissionRatePointer = math.LegacyNewDecWithPrec(10, 2)
 	happyMsgs := []sdk.Msg{
 		&stakingtypes.MsgCreateValidator{
@@ -63,7 +63,7 @@ func (s *AnteTestSuite) TestAnteDecoratorStakingCommission() {
 
 		sadMsgEditVal := new(stakingtypes.MsgEditValidator)
 		*sadMsgEditVal = *(happyMsgs[1]).(*stakingtypes.MsgEditValidator)
-		newCommissionRate := new(sdk.Dec)
+		newCommissionRate := new(math.LegacyDec)
 		*newCommissionRate = math.LegacyNewDecWithPrec(26, 2)
 		sadMsgEditVal.CommissionRate = newCommissionRate
 
@@ -120,6 +120,7 @@ func (s *AnteTestSuite) TestAnteDecoratorStakingCommission() {
 				WithFees(txGasCoins.String()).
 				WithChainID(s.ctx.ChainID()).
 				WithTxConfig(encCfg.TxConfig).
+				WithChainID("nibi-test-chain").
 				BuildUnsignedTx(tc.txMsgs...)
 			s.NoError(err)
 

app/ante/errors.go

@@ -2,7 +2,7 @@ package ante
 
 import (
 	sdkerrors "cosmossdk.io/errors"
-	sdk "github.com/cosmos/cosmos-sdk/types"
+	"cosmossdk.io/math"
 )
 
 var errorCodeIdx uint32 = 1
@@ -18,7 +18,7 @@ var (
 	ErrMaxValidatorCommission = registerError("validator commission rate is above max")
 )
 
-func NewErrMaxValidatorCommission(gotCommission sdk.Dec) error {
+func NewErrMaxValidatorCommission(gotCommission math.LegacyDec) error {
 	return ErrMaxValidatorCommission.Wrapf(
 		"got (%s), max rate is (%s)", gotCommission, MAX_COMMISSION())
 }

app/ante/fixed_gas.go

@@ -1,56 +1,49 @@
 package ante
 
-import (
-	sdkerrors "cosmossdk.io/errors"
-	sdk "github.com/cosmos/cosmos-sdk/types"
-
-	oracletypes "github.com/NibiruChain/nibiru/x/oracle/types"
-)
-
-const OracleMessageGas = 500
-
-var _ sdk.AnteDecorator = EnsureSinglePostPriceMessageDecorator{}
-
-// EnsureSinglePostPriceMessageDecorator ensures that there is only one oracle vote message in the transaction
-// and sets the gas meter to a fixed value.
-type EnsureSinglePostPriceMessageDecorator struct{}
-
-func NewPostPriceFixedPriceDecorator() EnsureSinglePostPriceMessageDecorator {
-	return EnsureSinglePostPriceMessageDecorator{}
-}
-
-func (gd EnsureSinglePostPriceMessageDecorator) AnteHandle(
-	ctx sdk.Context,
-	tx sdk.Tx,
-	simulate bool,
-	next sdk.AnteHandler,
-) (newCtx sdk.Context, err error) {
-	hasOracleVoteMsg := false
-	hasOraclePreVoteMsg := false
-
-	msgs := tx.GetMsgs()
-	for _, msg := range msgs {
-		switch msg.(type) {
-		case *oracletypes.MsgAggregateExchangeRatePrevote:
-			hasOraclePreVoteMsg = true
-		case *oracletypes.MsgAggregateExchangeRateVote:
-			hasOracleVoteMsg = true
-		}
-	}
-
-	if hasOracleVoteMsg && hasOraclePreVoteMsg {
-		if len(msgs) > 2 {
-			return ctx, sdkerrors.Wrap(ErrOracleAnte, "a transaction cannot have more than a single oracle vote and prevote message")
-		}
-
-		ctx = ctx.WithGasMeter(NewFixedGasMeter(OracleMessageGas))
-	} else if hasOraclePreVoteMsg || hasOracleVoteMsg {
-		if len(msgs) > 1 {
-			return ctx, sdkerrors.Wrap(ErrOracleAnte, "a transaction that includes an oracle vote or prevote message cannot have more than those two messages")
-		}
-
-		ctx = ctx.WithGasMeter(NewFixedGasMeter(OracleMessageGas))
-	}
-
-	return next(ctx, tx, simulate)
-}
+// const OracleMessageGas = 500
+
+// var _ sdk.AnteDecorator = EnsureSinglePostPriceMessageDecorator{}
+
+// // EnsureSinglePostPriceMessageDecorator ensures that there is only one oracle vote message in the transaction
+// // and sets the gas meter to a fixed value.
+// type EnsureSinglePostPriceMessageDecorator struct{}
+
+// func NewPostPriceFixedPriceDecorator() EnsureSinglePostPriceMessageDecorator {
+// 	return EnsureSinglePostPriceMessageDecorator{}
+// }
+
+// func (gd EnsureSinglePostPriceMessageDecorator) AnteHandle(
+// 	ctx sdk.Context,
+// 	tx sdk.Tx,
+// 	simulate bool,
+// 	next sdk.AnteHandler,
+// ) (newCtx sdk.Context, err error) {
+// 	hasOracleVoteMsg := false
+// 	hasOraclePreVoteMsg := false
+
+// 	msgs := tx.GetMsgs()
+// 	for _, msg := range msgs {
+// 		switch msg.(type) {
+// 		case *oracletypes.MsgAggregateExchangeRatePrevote:
+// 			hasOraclePreVoteMsg = true
+// 		case *oracletypes.MsgAggregateExchangeRateVote:
+// 			hasOracleVoteMsg = true
+// 		}
+// 	}
+
+// 	if hasOracleVoteMsg && hasOraclePreVoteMsg {
+// 		if len(msgs) > 2 {
+// 			return ctx, sdkerrors.Wrap(ErrOracleAnte, "a transaction cannot have more than a single oracle vote and prevote message")
+// 		}
+
+// 		ctx = ctx.WithGasMeter(NewFixedGasMeter(OracleMessageGas))
+// 	} else if hasOraclePreVoteMsg || hasOracleVoteMsg {
+// 		if len(msgs) > 1 {
+// 			return ctx, sdkerrors.Wrap(ErrOracleAnte, "a transaction that includes an oracle vote or prevote message cannot have more than those two messages")
+// 		}
+
+// 		ctx = ctx.WithGasMeter(NewFixedGasMeter(OracleMessageGas))
+// 	}
+
+// 	return next(ctx, tx, simulate)
+// }