Commit ab2378e3 authored by Mark Tyneway's avatar Mark Tyneway

gas-oracle: fix type usage

Convert the average block gas limit to a `uint64` in the
codebase instead of it being used as a `float64`.
parent 3af7ce3f
...@@ -16,7 +16,7 @@ type GasPriceUpdater struct { ...@@ -16,7 +16,7 @@ type GasPriceUpdater struct {
mu *sync.RWMutex mu *sync.RWMutex
gasPricer *GasPricer gasPricer *GasPricer
epochStartBlockNumber uint64 epochStartBlockNumber uint64
averageBlockGasLimit float64 averageBlockGasLimit uint64
epochLengthSeconds uint64 epochLengthSeconds uint64
getLatestBlockNumberFn GetLatestBlockNumberFn getLatestBlockNumberFn GetLatestBlockNumberFn
getGasUsedByBlockFn GetGasUsedByBlockFn getGasUsedByBlockFn GetGasUsedByBlockFn
...@@ -26,7 +26,7 @@ type GasPriceUpdater struct { ...@@ -26,7 +26,7 @@ type GasPriceUpdater struct {
func NewGasPriceUpdater( func NewGasPriceUpdater(
gasPricer *GasPricer, gasPricer *GasPricer,
epochStartBlockNumber uint64, epochStartBlockNumber uint64,
averageBlockGasLimit float64, averageBlockGasLimit uint64,
epochLengthSeconds uint64, epochLengthSeconds uint64,
getLatestBlockNumberFn GetLatestBlockNumberFn, getLatestBlockNumberFn GetLatestBlockNumberFn,
getGasUsedByBlockFn GetGasUsedByBlockFn, getGasUsedByBlockFn GetGasUsedByBlockFn,
......
...@@ -16,7 +16,7 @@ func makeTestGasPricerAndUpdater(curPrice uint64) (*GasPricer, *GasPriceUpdater, ...@@ -16,7 +16,7 @@ func makeTestGasPricerAndUpdater(curPrice uint64) (*GasPricer, *GasPriceUpdater,
gpsTarget := 3300000.0 gpsTarget := 3300000.0
getGasTarget := func() float64 { return gpsTarget } getGasTarget := func() float64 { return gpsTarget }
epochLengthSeconds := uint64(10) epochLengthSeconds := uint64(10)
averageBlockGasLimit := 11000000.0 averageBlockGasLimit := uint64(11000000)
// Based on our 10 second epoch, we are targetting 3 blocks per epoch. // Based on our 10 second epoch, we are targetting 3 blocks per epoch.
gasPricer, err := NewGasPricer(curPrice, 1, getGasTarget, 10) gasPricer, err := NewGasPricer(curPrice, 1, getGasTarget, 10)
if err != nil { if err != nil {
...@@ -33,7 +33,7 @@ func makeTestGasPricerAndUpdater(curPrice uint64) (*GasPricer, *GasPriceUpdater, ...@@ -33,7 +33,7 @@ func makeTestGasPricerAndUpdater(curPrice uint64) (*GasPricer, *GasPriceUpdater,
// This is paramaterized based on 3 blocks per epoch, where each uses // This is paramaterized based on 3 blocks per epoch, where each uses
// the average block gas limit plus an additional bit of gas added // the average block gas limit plus an additional bit of gas added
getGasUsedByBlockFn := func(number *big.Int) (uint64, error) { getGasUsedByBlockFn := func(number *big.Int) (uint64, error) {
return uint64(averageBlockGasLimit)*3/epochLengthSeconds + 1, nil return averageBlockGasLimit*3/epochLengthSeconds + 1, nil
} }
startBlock, _ := getLatestBlockNumber() startBlock, _ := getLatestBlockNumber()
......
...@@ -26,7 +26,7 @@ type Config struct { ...@@ -26,7 +26,7 @@ type Config struct {
floorPrice uint64 floorPrice uint64
targetGasPerSecond uint64 targetGasPerSecond uint64
maxPercentChangePerEpoch float64 maxPercentChangePerEpoch float64
averageBlockGasLimitPerEpoch float64 averageBlockGasLimitPerEpoch uint64
epochLengthSeconds uint64 epochLengthSeconds uint64
l2GasPriceSignificanceFactor float64 l2GasPriceSignificanceFactor float64
l1BaseFeeSignificanceFactor float64 l1BaseFeeSignificanceFactor float64
...@@ -52,7 +52,7 @@ func NewConfig(ctx *cli.Context) *Config { ...@@ -52,7 +52,7 @@ func NewConfig(ctx *cli.Context) *Config {
cfg.gasPriceOracleAddress = common.HexToAddress(addr) cfg.gasPriceOracleAddress = common.HexToAddress(addr)
cfg.targetGasPerSecond = ctx.GlobalUint64(flags.TargetGasPerSecondFlag.Name) cfg.targetGasPerSecond = ctx.GlobalUint64(flags.TargetGasPerSecondFlag.Name)
cfg.maxPercentChangePerEpoch = ctx.GlobalFloat64(flags.MaxPercentChangePerEpochFlag.Name) cfg.maxPercentChangePerEpoch = ctx.GlobalFloat64(flags.MaxPercentChangePerEpochFlag.Name)
cfg.averageBlockGasLimitPerEpoch = ctx.GlobalFloat64(flags.AverageBlockGasLimitPerEpochFlag.Name) cfg.averageBlockGasLimitPerEpoch = ctx.GlobalUint64(flags.AverageBlockGasLimitPerEpochFlag.Name)
cfg.epochLengthSeconds = ctx.GlobalUint64(flags.EpochLengthSecondsFlag.Name) cfg.epochLengthSeconds = ctx.GlobalUint64(flags.EpochLengthSecondsFlag.Name)
cfg.l2GasPriceSignificanceFactor = ctx.GlobalFloat64(flags.L2GasPriceSignificanceFactorFlag.Name) cfg.l2GasPriceSignificanceFactor = ctx.GlobalFloat64(flags.L2GasPriceSignificanceFactorFlag.Name)
cfg.floorPrice = ctx.GlobalUint64(flags.FloorPriceFlag.Name) cfg.floorPrice = ctx.GlobalUint64(flags.FloorPriceFlag.Name)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment