feat(v2.11): feemarket

.gitignore

@@ -9,7 +9,6 @@
 .idea
 *.code-workspace
 
-
 # Build
 bin
 build
@@ -29,6 +28,7 @@ client/lcd/keys/*
 client/docs/statik/statik.go
 remote/ansible/testnets
 mytestnet
+data/*
 
 # Testing
 coverage.txt
@@ -58,4 +58,4 @@ scripts/tests/ibc-hooks/counter/target
 scripts/tests/vesting-accounts/.vesting-periods.json
 node_modules
 test-data
-chain-upgrade-data
+chain-upgrade-data

app/ante/ante.go

@@ -3,8 +3,8 @@ package ante
 import (
 	ibcante "github.com/cosmos/ibc-go/v7/modules/core/ante"
 	ibckeeper "github.com/cosmos/ibc-go/v7/modules/core/keeper"
-	feesharekeeper "github.com/terra-money/core/v2/x/feeshare/keeper"
 
+	errorsmod "cosmossdk.io/errors"
 	"github.com/cosmos/cosmos-sdk/client"
 	storetypes "github.com/cosmos/cosmos-sdk/store/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
@@ -14,6 +14,8 @@ import (
 
 	wasmkeeper "github.com/CosmWasm/wasmd/x/wasm/keeper"
 	wasmTypes "github.com/CosmWasm/wasmd/x/wasm/types"
+
+	feemarketante "github.com/skip-mev/feemarket/x/feemarket/ante"
 )
 
 // HandlerOptions extends the SDK's AnteHandler options by requiring the IBC
@@ -22,8 +24,8 @@ type HandlerOptions struct {
 	ante.HandlerOptions
 
 	IBCkeeper         *ibckeeper.Keeper
-	FeeShareKeeper    feesharekeeper.Keeper
 	BankKeeper        bankKeeper.Keeper
+	FeeMarketKeeper   feemarketante.FeeMarketKeeper
 	TxCounterStoreKey storetypes.StoreKey
 	WasmConfig        wasmTypes.WasmConfig
 	TxConfig          client.TxConfig
@@ -34,15 +36,19 @@ type HandlerOptions struct {
 // signer.
 func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 	if options.AccountKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for ante builder")
 	}
 
 	if options.BankKeeper == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for ante builder")
 	}
 
 	if options.SignModeHandler == nil {
-		return nil, sdkerrors.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "sign mode handler is required for ante builder")
+	}
+
+	if options.FeeMarketKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "feemarket keeper is required for ante builder")
 	}
 
 	sigGasConsumer := options.SigGasConsumer
@@ -59,9 +65,14 @@ func NewAnteHandler(options HandlerOptions) (sdk.AnteHandler, error) {
 		ante.NewTxTimeoutHeightDecorator(),
 		ante.NewValidateMemoDecorator(options.AccountKeeper),
 		ante.NewConsumeGasForTxSizeDecorator(options.AccountKeeper),
-		ante.NewDeductFeeDecorator(options.AccountKeeper, options.BankKeeper, options.FeegrantKeeper, options.TxFeeChecker),
-		// SetPubKeyDecorator must be called before all signature verification decorators
-		ante.NewSetPubKeyDecorator(options.AccountKeeper),
+		feemarketante.NewFeeMarketCheckDecorator( // fee market check replaces fee deduct decorator
+			options.FeeMarketKeeper,
+			options.AccountKeeper,
+			options.BankKeeper,
+			options.FeegrantKeeper,
+			options.TxFeeChecker,
+		), // fees are deducted in the fee market deduct post handler
+		ante.NewSetPubKeyDecorator(options.AccountKeeper), // SetPubKeyDecorator must be called before all signature verification decorators
 		ante.NewValidateSigCountDecorator(options.AccountKeeper),
 		ante.NewSigGasConsumeDecorator(options.AccountKeeper, sigGasConsumer),
 		ante.NewSigVerificationDecorator(options.AccountKeeper, options.SignModeHandler),

app/app.go

@@ -259,22 +259,28 @@ func NewTerraApp(
 				SigGasConsumer:  cosmosante.DefaultSigVerificationGasConsumer,
 			},
 			BankKeeper:        app.Keepers.BankKeeper,
-			FeeShareKeeper:    app.Keepers.FeeShareKeeper,
 			IBCkeeper:         app.Keepers.IBCKeeper,
 			TxCounterStoreKey: app.keys[wasmtypes.StoreKey],
 			WasmConfig:        wasmConfig,
+			FeeMarketKeeper:   app.Keepers.FeeMarketKeeper,
 		},
 	)
 	if err != nil {
 		panic(err)
 	}
-	postHandler := post.NewPostHandler(
+	postHandler, err := post.NewPostHandler(
 		post.HandlerOptions{
-			FeeShareKeeper: app.Keepers.FeeShareKeeper,
-			BankKeeper:     app.Keepers.BankKeeper,
-			WasmKeeper:     app.Keepers.WasmKeeper,
+			FeeShareKeeper:  app.Keepers.FeeShareKeeper,
+			BankKeeper:      app.Keepers.BankKeeper,
+			WasmKeeper:      app.Keepers.WasmKeeper,
+			AccountKeeper:   app.Keepers.AccountKeeper,
+			FeeMarketKeeper: app.Keepers.FeeMarketKeeper,
+			FeeGrantKeeper:  app.Keepers.FeeGrantKeeper,
 		},
 	)
+	if err != nil {
+		panic(err)
+	}
 
 	// initialize BaseApp
 	app.SetInitChainer(app.InitChainer)

app/genesis.go

@@ -3,6 +3,9 @@ package app
 import (
 	"encoding/json"
 
+	"cosmossdk.io/math"
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
+
 	icqtypes "github.com/cosmos/ibc-apps/modules/async-icq/v7/types"
 	icacontrollertypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/controller/types"
 	icagenesistypes "github.com/cosmos/ibc-go/v7/modules/apps/27-interchain-accounts/genesis/types"
@@ -79,6 +82,34 @@ func (genState GenesisState) SetDefaultTerraConfig(cdc codec.JSONCodec) GenesisS
 	}
 	genState[icatypes.ModuleName] = cdc.MustMarshalJSON(&icaGenState)
 
+	var feemarketGenState feemarkettypes.GenesisState
+	cdc.MustUnmarshalJSON(genState[feemarkettypes.ModuleName], &feemarketGenState)
+	feemarketGenState.State = feemarkettypes.State{
+		LearningRate: math.LegacyMustNewDecFromStr("0.125"),
+		Window:       []uint64{0},
+		Index:        0,
+	}
+	feemarketGenState.Params = feemarkettypes.NewParams(
+		feemarkettypes.DefaultWindowSize,
+		feemarkettypes.DefaultAlpha,
+		feemarkettypes.DefaultBeta,
+		feemarkettypes.DefaultTheta,
+		feemarkettypes.DefaultTargetBlockUtilization,
+		feemarkettypes.DefaultMaxBlockUtilization,
+		feemarkettypes.DefaultMinLearningRate,
+		feemarkettypes.DefaultMaxLearningRate,
+		true,
+		config.BondDenom,
+	)
+	feemarketGenState.FeeDenomParams = []feemarkettypes.FeeDenomParam{
+		feemarkettypes.NewFeeDenomParam(
+			config.BondDenom,
+			math.LegacyMustNewDecFromStr("0.0015"),
+			math.LegacyMustNewDecFromStr("0.0015"),
+		),
+	}
+	genState[feemarkettypes.ModuleName] = cdc.MustMarshalJSON(&feemarketGenState)
+
 	return genState
 }
 

app/keepers/keepers.go

@@ -100,6 +100,9 @@ import (
 	feesharekeeper "github.com/terra-money/core/v2/x/feeshare/keeper"
 	feesharetypes "github.com/terra-money/core/v2/x/feeshare/types"
 
+	feemarketkeeper "github.com/skip-mev/feemarket/x/feemarket/keeper"
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
+
 	terraappconfig "github.com/terra-money/core/v2/app/config"
 	// unnamed import of statik for swagger UI support
 	_ "github.com/terra-money/core/v2/client/docs/statik"
@@ -164,6 +167,9 @@ type TerraAppKeepers struct {
 	Ics20WasmHooks   *ibchooks.WasmHooks
 	HooksICS4Wrapper ibchooks.ICS4Middleware
 
+	// Fee market
+	FeeMarketKeeper *feemarketkeeper.Keeper
+
 	// make scoped keepers public for test purposes
 	ScopedIBCKeeper           capabilitykeeper.ScopedKeeper
 	ScopedTransferKeeper      capabilitykeeper.ScopedKeeper
@@ -519,6 +525,13 @@ func NewTerraAppKeepers(
 		authtypes.NewModuleAddress(govtypes.ModuleName).String(),
 	)
 
+	keepers.FeeMarketKeeper = feemarketkeeper.NewKeeper(
+		appCodec,
+		keys[feemarkettypes.StoreKey],
+		keepers.AccountKeeper,
+		govModuleAddress,
+	)
+
 	// Set legacy router for backwards compatibility with gov v1beta1
 	govKeeper.SetLegacyRouter(govRouter)
 	keepers.GovKeeper = *govKeeper.SetHooks(

app/keepers/keys.go

@@ -39,6 +39,8 @@ import (
 
 	ibchookstypes "github.com/cosmos/ibc-apps/modules/ibc-hooks/v7/types"
 
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
+
 	wasmtypes "github.com/CosmWasm/wasmd/x/wasm/types"
 
 	tokenfactorytypes "github.com/terra-money/core/v2/x/tokenfactory/types"
@@ -61,6 +63,7 @@ func (keepers *TerraAppKeepers) GenerateKeys() {
 		consensusparamtypes.StoreKey, tokenfactorytypes.StoreKey, wasmtypes.StoreKey,
 		ibcfeetypes.StoreKey, ibchookstypes.StoreKey, crisistypes.StoreKey,
 		alliancetypes.StoreKey, feesharetypes.StoreKey, icqtypes.StoreKey,
+		feemarkettypes.StoreKey,
 	)
 
 	keepers.tkeys = sdk.NewTransientStoreKeys(paramstypes.TStoreKey)

app/modules.go

@@ -80,6 +80,9 @@ import (
 	ibcexported "github.com/cosmos/ibc-go/v7/modules/core/exported"
 	terrappsparams "github.com/terra-money/core/v2/app/params"
 
+	"github.com/skip-mev/feemarket/x/feemarket"
+	feemarkettypes "github.com/skip-mev/feemarket/x/feemarket/types"
+
 	"github.com/cosmos/cosmos-sdk/x/feegrant"
 )
 
@@ -117,6 +120,7 @@ var ModuleBasics = module.NewBasicManager(
 	alliance.AppModuleBasic{},
 	feeshare.AppModuleBasic{},
 	icq.AppModuleBasic{},
+	feemarket.AppModuleBasic{},
 )
 
 // NOTE: Any module instantiated in the module manager that is later modified
@@ -154,6 +158,7 @@ func appModules(app *TerraApp, encodingConfig terrappsparams.EncodingConfig, ski
 		alliance.NewAppModule(app.appCodec, app.Keepers.AllianceKeeper, app.Keepers.StakingKeeper, app.Keepers.AccountKeeper, app.Keepers.BankKeeper, app.interfaceRegistry, app.GetSubspace(alliancetypes.ModuleName)),
 		feeshare.NewAppModule(app.Keepers.FeeShareKeeper, app.Keepers.AccountKeeper, app.GetSubspace(feesharetypes.ModuleName)),
 		icq.NewAppModule(app.Keepers.ICQKeeper),
+		feemarket.NewAppModule(app.appCodec, *app.Keepers.FeeMarketKeeper),
 	}
 }
 
@@ -191,6 +196,7 @@ var initGenesisOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	feemarkettypes.ModuleName,
 }
 
 var beginBlockersOrder = []string{
@@ -223,6 +229,7 @@ var beginBlockersOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	feemarkettypes.ModuleName,
 }
 
 var endBlockerOrder = []string{
@@ -255,4 +262,5 @@ var endBlockerOrder = []string{
 	feesharetypes.ModuleName,
 	consensusparamtypes.ModuleName,
 	icqtypes.ModuleName,
+	feemarkettypes.ModuleName,
 }

app/post/post.go

@@ -1,25 +1,50 @@
 package post
 
 import (
+	errorsmod "cosmossdk.io/errors"
+	sdk "github.com/cosmos/cosmos-sdk/types"
+	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
+
+	feemarketpost "github.com/skip-mev/feemarket/x/feemarket/post"
 	feesharepost "github.com/terra-money/core/v2/x/feeshare/post"
 	customwasmkeeper "github.com/terra-money/core/v2/x/wasm/keeper"
 	wasmpost "github.com/terra-money/core/v2/x/wasm/post"
-
-	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 type HandlerOptions struct {
 	FeeShareKeeper feesharepost.FeeShareKeeper
 	BankKeeper     feesharepost.BankKeeper
 	WasmKeeper     customwasmkeeper.Keeper
+
+	AccountKeeper   feemarketpost.AccountKeeper
+	FeeMarketKeeper feemarketpost.FeeMarketKeeper
+	FeeGrantKeeper  feemarketpost.FeeGrantKeeper
 }
 
-func NewPostHandler(options HandlerOptions) sdk.PostHandler {
+func NewPostHandler(options HandlerOptions) (sdk.PostHandler, error) {
+
+	if options.AccountKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "account keeper is required for post builder")
+	}
+
+	if options.BankKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "bank keeper is required for post builder")
+	}
+
+	if options.FeeMarketKeeper == nil {
+		return nil, errorsmod.Wrap(sdkerrors.ErrLogic, "feemarket keeper is required for post builder")
+	}
 
 	postDecorators := []sdk.PostDecorator{
+		feemarketpost.NewFeeMarketDeductDecorator(
+			options.AccountKeeper,
+			options.BankKeeper,
+			options.FeeGrantKeeper,
+			options.FeeMarketKeeper,
+		),
 		feesharepost.NewFeeSharePayoutDecorator(options.FeeShareKeeper, options.BankKeeper, options.WasmKeeper),
 		wasmpost.NewWasmdDecorator(options.WasmKeeper),
 	}
 
-	return sdk.ChainPostDecorators(postDecorators...)
+	return sdk.ChainPostDecorators(postDecorators...), nil
 }