feat: add module mint, feeburn

app/ante/handler_options.go

@@ -1,6 +1,7 @@
 package ante
 
 import (
+	feeBurnKeeper "github.com/AstraProtocol/astra/v2/x/feeburn/keeper"
 	"github.com/cosmos/cosmos-sdk/codec"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
@@ -14,6 +15,8 @@ import (
 	ethante "github.com/evmos/ethermint/app/ante"
 	evmtypes "github.com/evmos/ethermint/x/evm/types"
 
+	feeburnante "github.com/AstraProtocol/astra/v2/x/feeburn/ante"
+	feeburntypes "github.com/AstraProtocol/astra/v2/x/feeburn/types"
 	vestingtypes "github.com/evmos/evmos/v6/x/vesting/types"
 )
 
@@ -22,11 +25,13 @@ import (
 type HandlerOptions struct {
 	AccountKeeper   evmtypes.AccountKeeper
 	BankKeeper      evmtypes.BankKeeper
+	BankKeeperFork  feeburntypes.BankKeeper
 	IBCKeeper       *ibckeeper.Keeper
 	FeeMarketKeeper evmtypes.FeeMarketKeeper
 	StakingKeeper   vestingtypes.StakingKeeper
 	EvmKeeper       ethante.EVMKeeper
 	FeegrantKeeper  ante.FeegrantKeeper
+	FeeBurnKeeper   feeBurnKeeper.Keeper
 	SignModeHandler authsigning.SignModeHandler
 	SigGasConsumer  func(meter sdk.GasMeter, sig signing.SignatureV2, params authtypes.Params) error
 	Cdc             codec.BinaryCodec
@@ -59,8 +64,9 @@ func (options HandlerOptions) Validate() error {
 // newCosmosAnteHandler creates the default ante handler for Ethereum transactions
 func newEthAnteHandler(options HandlerOptions) sdk.AnteHandler {
 	return sdk.ChainAnteDecorators(
-		ethante.NewEthSetUpContextDecorator(options.EvmKeeper), // outermost AnteDecorator. SetUpContext must be called first
-		ethante.NewEthMempoolFeeDecorator(options.EvmKeeper),   // Check eth effective gas price against minimal-gas-prices
+		ethante.NewEthSetUpContextDecorator(options.EvmKeeper),                         // outermost AnteDecorator. SetUpContext must be called first
+		ethante.NewEthMempoolFeeDecorator(options.EvmKeeper),                           // Check eth effective gas price against minimal-gas-prices
+		ethante.NewEthMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper), // Check eth effective gas price against the global MinGasPrice
 		ethante.NewEthValidateBasicDecorator(options.EvmKeeper),
 		ethante.NewEthSigVerificationDecorator(options.EvmKeeper),
 		ethante.NewEthAccountVerificationDecorator(options.AccountKeeper, options.EvmKeeper),
@@ -80,11 +86,13 @@ func newCosmosAnteHandler(options HandlerOptions) sdk.AnteHandler {
 		ante.NewSetUpContextDecorator(),
 		ante.NewRejectExtensionOptionsDecorator(),
 		ante.NewMempoolFeeDecorator(),
+		ethante.NewMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper),
 		ante.NewValidateBasicDecorator(),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
+		feeburnante.NewFeeBurnDecorator(options.BankKeeperFork, options.FeeBurnKeeper),
 		NewVestingDelegationDecorator(options.AccountKeeper, options.StakingKeeper, options.Cdc),
 		NewValidatorCommissionDecorator(options.Cdc),
 		// SetPubKeyDecorator must be called before all signature verification decorators
@@ -105,10 +113,12 @@ func newCosmosAnteHandlerEip712(options HandlerOptions) sdk.AnteHandler {
 		ante.NewSetUpContextDecorator(),
 		ante.NewMempoolFeeDecorator(),
 		ante.NewValidateBasicDecorator(),
+		ethante.NewMinGasPriceDecorator(options.FeeMarketKeeper, options.EvmKeeper),
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
 		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper),
+		feeburnante.NewFeeBurnDecorator(options.BankKeeperFork, options.FeeBurnKeeper),
 		NewVestingDelegationDecorator(options.AccountKeeper, options.StakingKeeper, options.Cdc),
 		NewValidatorCommissionDecorator(options.Cdc),
 		// SetPubKeyDecorator must be called before all signature verification decorators

app/app.go

@@ -3,8 +3,12 @@ package app
 import (
 	"context"
 	"encoding/json"
-	"github.com/AstraProtocol/astra/v2/x/inflation"
-	"github.com/evmos/evmos/v6/x/epochs"
+	"github.com/AstraProtocol/astra/v2/x/feeburn"
+	feeBurnKeeper "github.com/AstraProtocol/astra/v2/x/feeburn/keeper"
+	feeBurnTypes "github.com/AstraProtocol/astra/v2/x/feeburn/types"
+	"github.com/AstraProtocol/astra/v2/x/mint"
+	mintkeeper "github.com/AstraProtocol/astra/v2/x/mint/keeper"
+	minttypes "github.com/AstraProtocol/astra/v2/x/mint/types"
 	"io"
 	"net/http"
 	"os"
@@ -108,8 +112,6 @@ import (
 	feemarkettypes "github.com/evmos/ethermint/x/feemarket/types"
 
 	"github.com/AstraProtocol/astra/v2/app/ante"
-	epochskeeper "github.com/evmos/evmos/v6/x/epochs/keeper"
-	epochstypes "github.com/evmos/evmos/v6/x/epochs/types"
 	"github.com/evmos/evmos/v6/x/erc20"
 	erc20client "github.com/evmos/evmos/v6/x/erc20/client"
 	erc20keeper "github.com/evmos/evmos/v6/x/erc20/keeper"
@@ -118,9 +120,6 @@ import (
 	vestingkeeper "github.com/evmos/evmos/v6/x/vesting/keeper"
 	vestingtypes "github.com/evmos/evmos/v6/x/vesting/types"
 
-	inflationkeeper "github.com/AstraProtocol/astra/v2/x/inflation/keeper"
-	inflationtypes "github.com/AstraProtocol/astra/v2/x/inflation/types"
-
 	v1_1 "github.com/AstraProtocol/astra/v2/app/upgrades/v1_1"
 	v2 "github.com/AstraProtocol/astra/v2/app/upgrades/v2"
 )
@@ -180,9 +179,9 @@ var (
 		vesting.AppModuleBasic{},
 		evm.AppModuleBasic{},
 		feemarket.AppModuleBasic{},
-		inflation.AppModuleBasic{},
+		mint.AppModuleBasic{},
 		erc20.AppModuleBasic{},
-		epochs.AppModuleBasic{},
+		feeburn.AppModuleBasic{},
 	)
 
 	// module account permissions
@@ -195,7 +194,7 @@ var (
 		govtypes.ModuleName:            {authtypes.Burner},
 		ibctransfertypes.ModuleName:    {authtypes.Minter, authtypes.Burner},
 		evmtypes.ModuleName:            {authtypes.Minter, authtypes.Burner}, // used for secure addition and subtraction of balance using module account
-		inflationtypes.ModuleName:      {authtypes.Minter},
+		minttypes.ModuleName:           {authtypes.Minter, authtypes.Burner},
 		erc20types.ModuleName:          {authtypes.Minter, authtypes.Burner},
 	}
 
@@ -252,14 +251,14 @@ type Astra struct {
 	ScopedTransferKeeper capabilitykeeper.ScopedKeeper
 
 	// Ethermint keepers
+	Erc20Keeper     erc20keeper.Keeper
 	EvmKeeper       *evmkeeper.Keeper
 	FeeMarketKeeper feemarketkeeper.Keeper
 
 	// Astra keepers
-	InflationKeeper inflationkeeper.Keeper
-	Erc20Keeper     erc20keeper.Keeper
-	EpochsKeeper    epochskeeper.Keeper
-	VestingKeeper   vestingkeeper.Keeper
+	MintKeeper    mintkeeper.Keeper
+	VestingKeeper vestingkeeper.Keeper
+	FeeBurnKeeper feeBurnKeeper.Keeper
 
 	// the module manager
 	mm *module.Manager
@@ -315,10 +314,10 @@ func NewAstraApp(
 		// ethermint keys
 		evmtypes.StoreKey, feemarkettypes.StoreKey,
 		// astra keys
-		inflationtypes.StoreKey,
+		minttypes.StoreKey,
 		erc20types.StoreKey,
-		epochstypes.StoreKey,
 		vestingtypes.StoreKey,
+		feeBurnTypes.StoreKey,
 	)
 
 	// Add the EVM transient store key
@@ -361,14 +360,21 @@ func NewAstraApp(
 	stakingKeeper := stakingkeeper.NewKeeper(
 		appCodec, keys[stakingtypes.StoreKey], app.AccountKeeper, app.BankKeeper, app.GetSubspace(stakingtypes.ModuleName),
 	)
-	//app.MintKeeper = mintkeeper.NewKeeper(
-	//	appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper,
-	//	app.AccountKeeper, app.BankKeeper, authtypes.FeeCollectorName,
-	//)
 	app.DistrKeeper = distrkeeper.NewKeeper(
 		appCodec, keys[distrtypes.StoreKey], app.GetSubspace(distrtypes.ModuleName), app.AccountKeeper, app.BankKeeper,
 		&stakingKeeper, authtypes.FeeCollectorName, app.ModuleAccountAddrs(),
 	)
+	app.MintKeeper = mintkeeper.NewKeeper(
+		appCodec, keys[minttypes.StoreKey], app.GetSubspace(minttypes.ModuleName), &stakingKeeper,
+		app.AccountKeeper, app.BankKeeper, app.DistrKeeper, authtypes.FeeCollectorName,
+	)
+	app.FeeBurnKeeper = feeBurnKeeper.NewKeeper(
+		appCodec,
+		keys[feeBurnTypes.StoreKey],
+		app.GetSubspace(feeBurnTypes.ModuleName),
+		app.BankKeeper,
+		authtypes.FeeCollectorName,
+	)
 	app.SlashingKeeper = slashingkeeper.NewKeeper(
 		appCodec, keys[slashingtypes.StoreKey], &stakingKeeper, app.GetSubspace(slashingtypes.ModuleName),
 	)
@@ -413,12 +419,6 @@ func NewAstraApp(
 		app.AccountKeeper, app.BankKeeper, &stakingKeeper, govRouter,
 	)
 
-	app.InflationKeeper = inflationkeeper.NewKeeper(
-		keys[inflationtypes.StoreKey], appCodec, app.GetSubspace(inflationtypes.ModuleName),
-		app.AccountKeeper, app.BankKeeper, &stakingKeeper,
-		authtypes.FeeCollectorName,
-	)
-
 	// register the staking hooks
 	// NOTE: stakingKeeper above is passed by reference, so that it will contain these hooks
 	// NOTE: Distr, Slashing and Claim must be created before calling the Hooks method to avoid returning a Keeper without its table generated
@@ -439,13 +439,6 @@ func NewAstraApp(
 		app.AccountKeeper, app.BankKeeper, app.EvmKeeper,
 	)
 
-	epochsKeeper := epochskeeper.NewKeeper(appCodec, keys[epochstypes.StoreKey])
-	app.EpochsKeeper = *epochsKeeper.SetHooks(
-		epochskeeper.NewMultiEpochHooks(
-			app.InflationKeeper.Hooks(),
-		),
-	)
-
 	app.GovKeeper = *govKeeper.SetHooks(
 		govtypes.NewMultiGovHooks(),
 	)
@@ -530,10 +523,11 @@ func NewAstraApp(
 		evm.NewAppModule(app.EvmKeeper, app.AccountKeeper),
 		feemarket.NewAppModule(app.FeeMarketKeeper),
 		// Astra app modules
-		inflation.NewAppModule(app.InflationKeeper, app.AccountKeeper, app.StakingKeeper),
+		mint.NewAppModule(appCodec, app.MintKeeper, app.AccountKeeper),
+		//inflation.NewAppModule(app.InflationKeeper, app.AccountKeeper, app.StakingKeeper),
 		erc20.NewAppModule(app.Erc20Keeper, app.AccountKeeper),
-		epochs.NewAppModule(appCodec, app.EpochsKeeper),
 		vesting.NewAppModule(app.VestingKeeper, app.AccountKeeper, app.BankKeeper, app.StakingKeeper),
+		feeburn.NewAppModule(appCodec, app.FeeBurnKeeper, app.AccountKeeper, app.BankKeeper),
 	)
 
 	// During begin block slashing happens after distr.BeginBlocker so that
@@ -545,7 +539,6 @@ func NewAstraApp(
 	app.mm.SetOrderBeginBlockers(
 		upgradetypes.ModuleName,
 		capabilitytypes.ModuleName,
-		epochstypes.ModuleName,
 		feemarkettypes.ModuleName,
 		evmtypes.ModuleName,
 		//minttypes.ModuleName,
@@ -565,8 +558,9 @@ func NewAstraApp(
 		feegrant.ModuleName,
 		paramstypes.ModuleName,
 		vestingtypes.ModuleName,
-		inflationtypes.ModuleName,
+		minttypes.ModuleName,
 		erc20types.ModuleName,
+		feeBurnTypes.ModuleName,
 	)
 
 	// NOTE: fee market module must go last in order to retrieve the block gas used.
@@ -576,7 +570,6 @@ func NewAstraApp(
 		stakingtypes.ModuleName,
 		evmtypes.ModuleName,
 		feemarkettypes.ModuleName,
-		epochstypes.ModuleName,
 		ibchost.ModuleName,
 		ibctransfertypes.ModuleName,
 		capabilitytypes.ModuleName,
@@ -593,8 +586,9 @@ func NewAstraApp(
 		upgradetypes.ModuleName,
 		// Astra modules
 		vestingtypes.ModuleName,
-		inflationtypes.ModuleName,
+		minttypes.ModuleName,
 		erc20types.ModuleName,
+		feeBurnTypes.ModuleName,
 	)
 
 	// NOTE: The genutils module must occur after staking so that pools are
@@ -627,8 +621,8 @@ func NewAstraApp(
 		// Astra modules
 		vestingtypes.ModuleName,
 		erc20types.ModuleName,
-		epochstypes.ModuleName,
-		inflationtypes.ModuleName,
+		minttypes.ModuleName,
+		feeBurnTypes.ModuleName,
 		// NOTE: crisis module must go at the end to check for invariants on each module
 		crisistypes.ModuleName,
 	)
@@ -661,7 +655,6 @@ func NewAstraApp(
 		ibc.NewAppModule(app.IBCKeeper),
 		transferModule,
 		evm.NewAppModule(app.EvmKeeper, app.AccountKeeper),
-		epochs.NewAppModule(appCodec, app.EpochsKeeper),
 		feemarket.NewAppModule(app.FeeMarketKeeper),
 	)
 
@@ -679,6 +672,7 @@ func NewAstraApp(
 	options := ante.HandlerOptions{
 		AccountKeeper:   app.AccountKeeper,
 		BankKeeper:      app.BankKeeper,
+		BankKeeperFork:  app.BankKeeper,
 		EvmKeeper:       app.EvmKeeper,
 		StakingKeeper:   app.StakingKeeper,
 		FeegrantKeeper:  app.FeeGrantKeeper,
@@ -938,8 +932,9 @@ func initParamsKeeper(
 	paramsKeeper.Subspace(evmtypes.ModuleName)
 	paramsKeeper.Subspace(feemarkettypes.ModuleName)
 	// astra subspaces
-	paramsKeeper.Subspace(inflationtypes.ModuleName)
+	paramsKeeper.Subspace(minttypes.ModuleName)
 	paramsKeeper.Subspace(erc20types.ModuleName)
+	paramsKeeper.Subspace(feeBurnTypes.ModuleName)
 	return paramsKeeper
 }
 

app/test_helpers.go

@@ -2,6 +2,8 @@ package app
 
 import (
 	"encoding/json"
+	minttypes "github.com/AstraProtocol/astra/v2/x/mint/types"
+	stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
 	"time"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -64,6 +66,12 @@ func Setup(
 		// init chain must be called to stop deliverState from being nil
 		genesisState := NewDefaultGenesisState()
 
+		stakingGenesisState := stakingtypes.DefaultGenesisState()
+		stakingGenesisState.Params.BondDenom = minttypes.DefaultInflationDenom
+		encCfg := encoding.MakeConfig(ModuleBasics)
+		stakingGenesis := encCfg.Marshaler.MustMarshalJSON(stakingGenesisState)
+		genesisState[stakingtypes.ModuleName] = stakingGenesis
+
 		// Verify feeMarket genesis
 		if feemarketGenesis != nil {
 			if err := feemarketGenesis.Validate(); err != nil {

client/docs/config.json

@@ -15,11 +15,10 @@
       }
     },
     {
-      "url": "./tmp-swagger-gen/astra/inflation/v1/query.swagger.json",
+      "url": "./tmp-swagger-gen/astra/feeburn/v1/query.swagger.json",
       "operationIds": {
         "rename": {
-          "Params": "InflationParams",
-          "TotalSupply": "InflationTotalSupply"
+          "Params": "FeeBurnParams"
         }
       }
     },
@@ -82,6 +81,9 @@
     {
       "url": "./tmp-swagger-gen/cosmos/authz/v1beta1/query.swagger.json"
     },
+    {
+      "url": "./tmp-swagger-gen/cosmos/mint/v1beta1/query.swagger.json"
+    },
     {
       "url": "./tmp-swagger-gen/cosmos/bank/v1beta1/query.swagger.json",
       "operationIds": {