Add dynamic fees config

config/config.go

@@ -45,8 +45,10 @@ import (
 	"github.com/ava-labs/avalanchego/utils/timer"
 	"github.com/ava-labs/avalanchego/version"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 	"github.com/ava-labs/avalanchego/vms/proposervm"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 const (
@@ -766,7 +768,7 @@ func getTxFeeConfig(v *viper.Viper, networkID uint32) genesis.TxFeeConfig {
 	if networkID != constants.MainnetID && networkID != constants.FujiID {
 		return genesis.TxFeeConfig{
 			CreateAssetTxFee: v.GetUint64(CreateAssetTxFeeKey),
-			StaticFeeConfig: fee.StaticConfig{
+			StaticFeeConfig: txfee.StaticConfig{
 				TxFee:                         v.GetUint64(TxFeeKey),
 				CreateSubnetTxFee:             v.GetUint64(CreateSubnetTxFeeKey),
 				TransformSubnetTxFee:          v.GetUint64(TransformSubnetTxFeeKey),
@@ -776,6 +778,19 @@ func getTxFeeConfig(v *viper.Viper, networkID uint32) genesis.TxFeeConfig {
 				AddSubnetValidatorFee:         v.GetUint64(AddSubnetValidatorFeeKey),
 				AddSubnetDelegatorFee:         v.GetUint64(AddSubnetDelegatorFeeKey),
 			},
+			DynamicFeeConfig: feecomponent.Config{
+				Weights: feecomponent.Dimensions{
+					feecomponent.Bandwidth: v.GetUint64(DynamicFeesBandwidthWeightKey),
+					feecomponent.DBRead:    v.GetUint64(DynamicFeesDBReadWeightKey),
+					feecomponent.DBWrite:   v.GetUint64(DynamicFeesDBWriteWeightKey),
+					feecomponent.Compute:   v.GetUint64(DynamicFeesComputeWeightKey),
+				},
+				MaxGasCapacity:           feecomponent.Gas(v.GetUint64(DynamicFeesMaxGasCapacityKey)),
+				MaxGasPerSecond:          feecomponent.Gas(v.GetUint64(DynamicFeesMaxGasPerSecondKey)),
+				TargetGasPerSecond:       feecomponent.Gas(v.GetUint64(DynamicFeesTargetGasPerSecondKey)),
+				MinGasPrice:              feecomponent.GasPrice(v.GetUint64(DynamicFeesMinGasPriceKey)),
+				ExcessConversionConstant: feecomponent.Gas(v.GetUint64(DynamicFeesExcessConversionConstantKey)),
+			},
 		}
 	}
 	return genesis.GetTxFeeConfig(networkID)

config/flags.go

@@ -24,6 +24,7 @@ import (
 	"github.com/ava-labs/avalanchego/utils/dynamicip"
 	"github.com/ava-labs/avalanchego/utils/ulimit"
 	"github.com/ava-labs/avalanchego/utils/units"
+	"github.com/ava-labs/avalanchego/vms/components/fee"
 )
 
 const (
@@ -98,7 +99,18 @@ func addNodeFlags(fs *pflag.FlagSet) {
 	fs.IntSlice(ACPSupportKey, nil, "ACPs to support adoption")
 	fs.IntSlice(ACPObjectKey, nil, "ACPs to object adoption")
 
-	// AVAX fees
+	// AVAX fees:
+	// Dynamic fees:
+	fs.Uint64(DynamicFeesBandwidthWeightKey, genesis.LocalParams.DynamicFeeConfig.Weights[fee.Bandwidth], "Complexity multiplier used to convert Bandwidth into Gas")
+	fs.Uint64(DynamicFeesDBReadWeightKey, genesis.LocalParams.DynamicFeeConfig.Weights[fee.DBRead], "Complexity multiplier used to convert DB Reads into Gas")
+	fs.Uint64(DynamicFeesDBWriteWeightKey, genesis.LocalParams.DynamicFeeConfig.Weights[fee.DBWrite], "Complexity multiplier used to convert DB Writes into Gas")
+	fs.Uint64(DynamicFeesComputeWeightKey, genesis.LocalParams.DynamicFeeConfig.Weights[fee.Compute], "Complexity multiplier used to convert Compute into Gas")
+	fs.Uint64(DynamicFeesMaxGasCapacityKey, uint64(genesis.LocalParams.DynamicFeeConfig.MaxGasCapacity), "Maximum amount of Gas the chain is allowed to store for future use")
+	fs.Uint64(DynamicFeesMaxGasPerSecondKey, uint64(genesis.LocalParams.DynamicFeeConfig.MaxGasPerSecond), "Rate at which Gas is stored for future use")
+	fs.Uint64(DynamicFeesTargetGasPerSecondKey, uint64(genesis.LocalParams.DynamicFeeConfig.TargetGasPerSecond), "Target rate of Gas usage")
+	fs.Uint64(DynamicFeesMinGasPriceKey, uint64(genesis.LocalParams.DynamicFeeConfig.MinGasPrice), "Minimum Gas price")
+	fs.Uint64(DynamicFeesExcessConversionConstantKey, uint64(genesis.LocalParams.DynamicFeeConfig.ExcessConversionConstant), "Constant to convert excess Gas to the Gas price")
+	// Static fees:
 	fs.Uint64(TxFeeKey, genesis.LocalParams.StaticFeeConfig.TxFee, "Transaction fee, in nAVAX")
 	fs.Uint64(CreateAssetTxFeeKey, genesis.LocalParams.CreateAssetTxFee, "Transaction fee, in nAVAX, for transactions that create new assets")
 	fs.Uint64(CreateSubnetTxFeeKey, genesis.LocalParams.StaticFeeConfig.CreateSubnetTxFee, "Transaction fee, in nAVAX, for transactions that create new subnets")

config/keys.go

@@ -8,52 +8,61 @@ package config
 const HTTPWriteTimeoutKey = "http-write-timeout" // #nosec G101
 
 const (
-	DataDirKey                       = "data-dir"
-	ConfigFileKey                    = "config-file"
-	ConfigContentKey                 = "config-file-content"
-	ConfigContentTypeKey             = "config-file-content-type"
-	VersionKey                       = "version"
-	VersionJSONKey                   = "version-json"
-	GenesisFileKey                   = "genesis-file"
-	GenesisFileContentKey            = "genesis-file-content"
-	NetworkNameKey                   = "network-id"
-	ACPSupportKey                    = "acp-support"
-	ACPObjectKey                     = "acp-object"
-	TxFeeKey                         = "tx-fee"
-	CreateAssetTxFeeKey              = "create-asset-tx-fee"
-	CreateSubnetTxFeeKey             = "create-subnet-tx-fee"
-	TransformSubnetTxFeeKey          = "transform-subnet-tx-fee"
-	CreateBlockchainTxFeeKey         = "create-blockchain-tx-fee"
-	AddPrimaryNetworkValidatorFeeKey = "add-primary-network-validator-fee"
-	AddPrimaryNetworkDelegatorFeeKey = "add-primary-network-delegator-fee"
-	AddSubnetValidatorFeeKey         = "add-subnet-validator-fee"
-	AddSubnetDelegatorFeeKey         = "add-subnet-delegator-fee"
-	UptimeRequirementKey             = "uptime-requirement"
-	MinValidatorStakeKey             = "min-validator-stake"
-	MaxValidatorStakeKey             = "max-validator-stake"
-	MinDelegatorStakeKey             = "min-delegator-stake"
-	MinDelegatorFeeKey               = "min-delegation-fee"
-	MinStakeDurationKey              = "min-stake-duration"
-	MaxStakeDurationKey              = "max-stake-duration"
-	StakeMaxConsumptionRateKey       = "stake-max-consumption-rate"
-	StakeMinConsumptionRateKey       = "stake-min-consumption-rate"
-	StakeMintingPeriodKey            = "stake-minting-period"
-	StakeSupplyCapKey                = "stake-supply-cap"
-	DBTypeKey                        = "db-type"
-	DBReadOnlyKey                    = "db-read-only"
-	DBPathKey                        = "db-dir"
-	DBConfigFileKey                  = "db-config-file"
-	DBConfigContentKey               = "db-config-file-content"
-	PublicIPKey                      = "public-ip"
-	PublicIPResolutionFreqKey        = "public-ip-resolution-frequency"
-	PublicIPResolutionServiceKey     = "public-ip-resolution-service"
-	HTTPHostKey                      = "http-host"
-	HTTPPortKey                      = "http-port"
-	HTTPSEnabledKey                  = "http-tls-enabled"
-	HTTPSKeyFileKey                  = "http-tls-key-file"
-	HTTPSKeyContentKey               = "http-tls-key-file-content"
-	HTTPSCertFileKey                 = "http-tls-cert-file"
-	HTTPSCertContentKey              = "http-tls-cert-file-content"
+	DataDirKey                             = "data-dir"
+	ConfigFileKey                          = "config-file"
+	ConfigContentKey                       = "config-file-content"
+	ConfigContentTypeKey                   = "config-file-content-type"
+	VersionKey                             = "version"
+	VersionJSONKey                         = "version-json"
+	GenesisFileKey                         = "genesis-file"
+	GenesisFileContentKey                  = "genesis-file-content"
+	NetworkNameKey                         = "network-id"
+	ACPSupportKey                          = "acp-support"
+	ACPObjectKey                           = "acp-object"
+	DynamicFeesBandwidthWeightKey          = "dynamic-fees-bandwidth-weight"
+	DynamicFeesDBReadWeightKey             = "dynamic-fees-db-read-weight"
+	DynamicFeesDBWriteWeightKey            = "dynamic-fees-db-write-weight"
+	DynamicFeesComputeWeightKey            = "dynamic-fees-compute-weight"
+	DynamicFeesMaxGasCapacityKey           = "dynamic-fees-max-gas-capacity"
+	DynamicFeesMaxGasPerSecondKey          = "dynamic-fees-max-gas-per-second"
+	DynamicFeesTargetGasPerSecondKey       = "dynamic-fees-target-gas-per-second"
+	DynamicFeesMinGasPriceKey              = "dynamic-fees-min-gas-price"
+	DynamicFeesExcessConversionConstantKey = "dynamic-fees-excess-conversion-constant"
+	TxFeeKey                               = "tx-fee"
+	CreateAssetTxFeeKey                    = "create-asset-tx-fee"
+	CreateSubnetTxFeeKey                   = "create-subnet-tx-fee"
+	TransformSubnetTxFeeKey                = "transform-subnet-tx-fee"
+	CreateBlockchainTxFeeKey               = "create-blockchain-tx-fee"
+	AddPrimaryNetworkValidatorFeeKey       = "add-primary-network-validator-fee"
+	AddPrimaryNetworkDelegatorFeeKey       = "add-primary-network-delegator-fee"
+	AddSubnetValidatorFeeKey               = "add-subnet-validator-fee"
+	AddSubnetDelegatorFeeKey               = "add-subnet-delegator-fee"
+	UptimeRequirementKey                   = "uptime-requirement"
+	MinValidatorStakeKey                   = "min-validator-stake"
+	MaxValidatorStakeKey                   = "max-validator-stake"
+	MinDelegatorStakeKey                   = "min-delegator-stake"
+	MinDelegatorFeeKey                     = "min-delegation-fee"
+	MinStakeDurationKey                    = "min-stake-duration"
+	MaxStakeDurationKey                    = "max-stake-duration"
+	StakeMaxConsumptionRateKey             = "stake-max-consumption-rate"
+	StakeMinConsumptionRateKey             = "stake-min-consumption-rate"
+	StakeMintingPeriodKey                  = "stake-minting-period"
+	StakeSupplyCapKey                      = "stake-supply-cap"
+	DBTypeKey                              = "db-type"
+	DBReadOnlyKey                          = "db-read-only"
+	DBPathKey                              = "db-dir"
+	DBConfigFileKey                        = "db-config-file"
+	DBConfigContentKey                     = "db-config-file-content"
+	PublicIPKey                            = "public-ip"
+	PublicIPResolutionFreqKey              = "public-ip-resolution-frequency"
+	PublicIPResolutionServiceKey           = "public-ip-resolution-service"
+	HTTPHostKey                            = "http-host"
+	HTTPPortKey                            = "http-port"
+	HTTPSEnabledKey                        = "http-tls-enabled"
+	HTTPSKeyFileKey                        = "http-tls-key-file"
+	HTTPSKeyContentKey                     = "http-tls-key-file-content"
+	HTTPSCertFileKey                       = "http-tls-cert-file"
+	HTTPSCertContentKey                    = "http-tls-cert-file-content"
 
 	HTTPAllowedOrigins       = "http-allowed-origins"
 	HTTPAllowedHostsKey      = "http-allowed-hosts"

genesis/genesis_fuji.go

@@ -10,7 +10,9 @@ import (
 
 	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 var (
@@ -21,7 +23,7 @@ var (
 	FujiParams = Params{
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: 10 * units.MilliAvax,
-			StaticFeeConfig: fee.StaticConfig{
+			StaticFeeConfig: txfee.StaticConfig{
 				TxFee:                         units.MilliAvax,
 				CreateSubnetTxFee:             100 * units.MilliAvax,
 				TransformSubnetTxFee:          1 * units.Avax,
@@ -31,6 +33,20 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
+			// TODO: Set these values to something more reasonable
+			DynamicFeeConfig: feecomponent.Config{
+				Weights: feecomponent.Dimensions{
+					feecomponent.Bandwidth: 1,
+					feecomponent.DBRead:    1,
+					feecomponent.DBWrite:   1,
+					feecomponent.Compute:   1,
+				},
+				MaxGasCapacity:           1_000_000,
+				MaxGasPerSecond:          1_000,
+				TargetGasPerSecond:       500,
+				MinGasPrice:              1,
+				ExcessConversionConstant: 1,
+			},
 		},
 		StakingConfig: StakingConfig{
 			UptimeRequirement: .8, // 80%

genesis/genesis_local.go

@@ -13,7 +13,9 @@ import (
 	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/utils/wrappers"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 // PrivateKey-vmRQiZeXEXYMyJhEiqdC2z5JhuDbxL8ix9UVvjgMu2Er1NepE => P-local1g65uqn6t77p656w64023nh8nd9updzmxyymev2
@@ -39,7 +41,7 @@ var (
 	LocalParams = Params{
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: units.MilliAvax,
-			StaticFeeConfig: fee.StaticConfig{
+			StaticFeeConfig: txfee.StaticConfig{
 				TxFee:                         units.MilliAvax,
 				CreateSubnetTxFee:             100 * units.MilliAvax,
 				TransformSubnetTxFee:          100 * units.MilliAvax,
@@ -49,6 +51,20 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
+			// TODO: Set these values to something more reasonable
+			DynamicFeeConfig: feecomponent.Config{
+				Weights: feecomponent.Dimensions{
+					feecomponent.Bandwidth: 1,
+					feecomponent.DBRead:    1,
+					feecomponent.DBWrite:   1,
+					feecomponent.Compute:   1,
+				},
+				MaxGasCapacity:           1_000_000,
+				MaxGasPerSecond:          1_000,
+				TargetGasPerSecond:       500,
+				MinGasPrice:              1,
+				ExcessConversionConstant: 1,
+			},
 		},
 		StakingConfig: StakingConfig{
 			UptimeRequirement: .8, // 80%

genesis/genesis_mainnet.go

@@ -10,7 +10,9 @@ import (
 
 	"github.com/ava-labs/avalanchego/utils/units"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 var (
@@ -21,7 +23,7 @@ var (
 	MainnetParams = Params{
 		TxFeeConfig: TxFeeConfig{
 			CreateAssetTxFee: 10 * units.MilliAvax,
-			StaticFeeConfig: fee.StaticConfig{
+			StaticFeeConfig: txfee.StaticConfig{
 				TxFee:                         units.MilliAvax,
 				CreateSubnetTxFee:             1 * units.Avax,
 				TransformSubnetTxFee:          10 * units.Avax,
@@ -31,6 +33,20 @@ var (
 				AddSubnetValidatorFee:         units.MilliAvax,
 				AddSubnetDelegatorFee:         units.MilliAvax,
 			},
+			// TODO: Set these values to something more reasonable
+			DynamicFeeConfig: feecomponent.Config{
+				Weights: feecomponent.Dimensions{
+					feecomponent.Bandwidth: 1,
+					feecomponent.DBRead:    1,
+					feecomponent.DBWrite:   1,
+					feecomponent.Compute:   1,
+				},
+				MaxGasCapacity:           1_000_000,
+				MaxGasPerSecond:          1_000,
+				TargetGasPerSecond:       500,
+				MinGasPrice:              1,
+				ExcessConversionConstant: 1,
+			},
 		},
 		StakingConfig: StakingConfig{
 			UptimeRequirement: .8, // 80%

genesis/params.go

@@ -8,7 +8,9 @@ import (
 
 	"github.com/ava-labs/avalanchego/utils/constants"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 type StakingConfig struct {
@@ -35,8 +37,9 @@ type StakingConfig struct {
 }
 
 type TxFeeConfig struct {
-	CreateAssetTxFee uint64           `json:"createAssetTxFee"`
-	StaticFeeConfig  fee.StaticConfig `json:"staticFeeConfig"`
+	CreateAssetTxFee uint64              `json:"createAssetTxFee"`
+	StaticFeeConfig  txfee.StaticConfig  `json:"staticFeeConfig"`
+	DynamicFeeConfig feecomponent.Config `json:"dynamicFeeConfig"`
 }
 
 type Params struct {

node/node.go

@@ -1229,6 +1229,7 @@ func (n *Node) initVMs() error {
 				TrackedSubnets:            n.Config.TrackedSubnets,
 				CreateAssetTxFee:          n.Config.CreateAssetTxFee,
 				StaticFeeConfig:           n.Config.StaticFeeConfig,
+				DynamicFeeConfig:          n.Config.DynamicFeeConfig,
 				UptimePercentage:          n.Config.UptimeRequirement,
 				MinValidatorStake:         n.Config.MinValidatorStake,
 				MaxValidatorStake:         n.Config.MaxValidatorStake,

vms/platformvm/config/config.go

@@ -14,8 +14,10 @@ import (
 	"github.com/ava-labs/avalanchego/utils/set"
 	"github.com/ava-labs/avalanchego/vms/platformvm/reward"
 	"github.com/ava-labs/avalanchego/vms/platformvm/txs"
-	"github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 	"github.com/ava-labs/avalanchego/vms/platformvm/upgrade"
+
+	feecomponent "github.com/ava-labs/avalanchego/vms/components/fee"
+	txfee "github.com/ava-labs/avalanchego/vms/platformvm/txs/fee"
 )
 
 // Struct collecting all foundational parameters of PlatformVM
@@ -31,9 +33,12 @@ type Config struct {
 	//            calling VM.Initialize.
 	Validators validators.Manager
 
-	// All static fees config active before E-upgrade
+	// Static fees are active before the E-upgrade
 	CreateAssetTxFee uint64 // Override for CreateSubnet and CreateChain before AP3
-	StaticFeeConfig  fee.StaticConfig
+	StaticFeeConfig  txfee.StaticConfig
+
+	// Dynamic fees are active after the E-upgrade
+	DynamicFeeConfig feecomponent.Config
 
 	// Provides access to the uptime manager as a thread safe data structure
 	UptimeLockedCalculator uptime.LockedCalculator