cmd, eth: offer maxprice flag for overwritting price cap (#21531)
* cmd, eth: offer maxprice flag for overwritting price cap * eth: rename default price cap
This commit is contained in:
@ -37,12 +37,14 @@ import (
|
||||
var DefaultFullGPOConfig = gasprice.Config{
|
||||
Blocks: 20,
|
||||
Percentile: 60,
|
||||
MaxPrice: gasprice.DefaultMaxPrice,
|
||||
}
|
||||
|
||||
// DefaultLightGPOConfig contains default gasprice oracle settings for light client.
|
||||
var DefaultLightGPOConfig = gasprice.Config{
|
||||
Blocks: 2,
|
||||
Percentile: 60,
|
||||
MaxPrice: gasprice.DefaultMaxPrice,
|
||||
}
|
||||
|
||||
// DefaultConfig contains default settings for use on the Ethereum main net.
|
||||
|
@ -24,18 +24,20 @@ import (
|
||||
|
||||
"github.com/ethereum/go-ethereum/common"
|
||||
"github.com/ethereum/go-ethereum/core/types"
|
||||
"github.com/ethereum/go-ethereum/log"
|
||||
"github.com/ethereum/go-ethereum/params"
|
||||
"github.com/ethereum/go-ethereum/rpc"
|
||||
)
|
||||
|
||||
const sampleNumber = 3 // Number of transactions sampled in a block
|
||||
|
||||
var maxPrice = big.NewInt(500 * params.GWei)
|
||||
var DefaultMaxPrice = big.NewInt(500 * params.GWei)
|
||||
|
||||
type Config struct {
|
||||
Blocks int
|
||||
Percentile int
|
||||
Default *big.Int `toml:",omitempty"`
|
||||
MaxPrice *big.Int `toml:",omitempty"`
|
||||
}
|
||||
|
||||
// OracleBackend includes all necessary background APIs for oracle.
|
||||
@ -51,6 +53,7 @@ type Oracle struct {
|
||||
backend OracleBackend
|
||||
lastHead common.Hash
|
||||
lastPrice *big.Int
|
||||
maxPrice *big.Int
|
||||
cacheLock sync.RWMutex
|
||||
fetchLock sync.Mutex
|
||||
|
||||
@ -64,17 +67,26 @@ func NewOracle(backend OracleBackend, params Config) *Oracle {
|
||||
blocks := params.Blocks
|
||||
if blocks < 1 {
|
||||
blocks = 1
|
||||
log.Warn("Sanitizing invalid gasprice oracle sample blocks", "provided", params.Blocks, "updated", blocks)
|
||||
}
|
||||
percent := params.Percentile
|
||||
if percent < 0 {
|
||||
percent = 0
|
||||
log.Warn("Sanitizing invalid gasprice oracle sample percentile", "provided", params.Percentile, "updated", percent)
|
||||
}
|
||||
if percent > 100 {
|
||||
percent = 100
|
||||
log.Warn("Sanitizing invalid gasprice oracle sample percentile", "provided", params.Percentile, "updated", percent)
|
||||
}
|
||||
maxPrice := params.MaxPrice
|
||||
if maxPrice == nil || maxPrice.Int64() <= 0 {
|
||||
maxPrice = DefaultMaxPrice
|
||||
log.Warn("Sanitizing invalid gasprice oracle price cap", "provided", params.MaxPrice, "updated", maxPrice)
|
||||
}
|
||||
return &Oracle{
|
||||
backend: backend,
|
||||
lastPrice: params.Default,
|
||||
maxPrice: maxPrice,
|
||||
checkBlocks: blocks,
|
||||
percentile: percent,
|
||||
}
|
||||
@ -146,8 +158,8 @@ func (gpo *Oracle) SuggestPrice(ctx context.Context) (*big.Int, error) {
|
||||
sort.Sort(bigIntArray(txPrices))
|
||||
price = txPrices[(len(txPrices)-1)*gpo.percentile/100]
|
||||
}
|
||||
if price.Cmp(maxPrice) > 0 {
|
||||
price = new(big.Int).Set(maxPrice)
|
||||
if price.Cmp(gpo.maxPrice) > 0 {
|
||||
price = new(big.Int).Set(gpo.maxPrice)
|
||||
}
|
||||
gpo.cacheLock.Lock()
|
||||
gpo.lastHead = headHash
|
||||
|
Reference in New Issue
Block a user