mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-07-24 21:56:43 +00:00
consensus/misc/eip4844: avoid computing rules
This commit is contained in:
parent
8c83bdccc1
commit
5fc3cc4d43
1 changed files with 4 additions and 4 deletions
|
|
@ -129,12 +129,12 @@ func VerifyEIP4844Header(config *params.ChainConfig, parent, header *types.Heade
|
||||||
// CalcExcessBlobGas calculates the excess blob gas after applying the set of
|
// CalcExcessBlobGas calculates the excess blob gas after applying the set of
|
||||||
// blobs on top of the excess blob gas.
|
// blobs on top of the excess blob gas.
|
||||||
func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTimestamp uint64) uint64 {
|
func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTimestamp uint64) uint64 {
|
||||||
rules := config.Rules(config.LondonBlock, true, headTimestamp)
|
isOsaka := config.IsOsaka(config.LondonBlock, headTimestamp)
|
||||||
bcfg := latestBlobConfig(config, headTimestamp)
|
bcfg := latestBlobConfig(config, headTimestamp)
|
||||||
return calcExcessBlobGas(rules, bcfg, parent)
|
return calcExcessBlobGas(isOsaka, bcfg, parent)
|
||||||
}
|
}
|
||||||
|
|
||||||
func calcExcessBlobGas(rules params.Rules, bcfg *BlobConfig, parent *types.Header) uint64 {
|
func calcExcessBlobGas(isOsaka bool, bcfg *BlobConfig, parent *types.Header) uint64 {
|
||||||
var parentExcessBlobGas, parentBlobGasUsed uint64
|
var parentExcessBlobGas, parentBlobGasUsed uint64
|
||||||
if parent.ExcessBlobGas != nil {
|
if parent.ExcessBlobGas != nil {
|
||||||
parentExcessBlobGas = *parent.ExcessBlobGas
|
parentExcessBlobGas = *parent.ExcessBlobGas
|
||||||
|
|
@ -148,7 +148,7 @@ func calcExcessBlobGas(rules params.Rules, bcfg *BlobConfig, parent *types.Heade
|
||||||
|
|
||||||
// EIP-7918 (post-Osaka) introduces a different formula for computing excess,
|
// EIP-7918 (post-Osaka) introduces a different formula for computing excess,
|
||||||
// in cases where the price is lower than a 'reserve price'.
|
// in cases where the price is lower than a 'reserve price'.
|
||||||
if rules.IsOsaka {
|
if isOsaka {
|
||||||
var (
|
var (
|
||||||
baseCost = big.NewInt(params.BlobBaseCost)
|
baseCost = big.NewInt(params.BlobBaseCost)
|
||||||
reservePrice = baseCost.Mul(baseCost, parent.BaseFee)
|
reservePrice = baseCost.Mul(baseCost, parent.BaseFee)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue