mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-05-14 12:06:40 +00:00
consensus: implement EIP-7918
Co-authored-by: Sina Mahmoodi <itz.s1na@gmail.com>
This commit is contained in:
parent
32b2d3e51d
commit
3b8609a605
3 changed files with 66 additions and 2 deletions
|
|
@ -70,11 +70,28 @@ func CalcExcessBlobGas(config *params.ChainConfig, parent *types.Header, headTim
|
||||||
parentExcessBlobGas = *parent.ExcessBlobGas
|
parentExcessBlobGas = *parent.ExcessBlobGas
|
||||||
parentBlobGasUsed = *parent.BlobGasUsed
|
parentBlobGasUsed = *parent.BlobGasUsed
|
||||||
}
|
}
|
||||||
excessBlobGas := parentExcessBlobGas + parentBlobGasUsed
|
var (
|
||||||
targetGas := uint64(targetBlobsPerBlock(config, headTimestamp)) * params.BlobTxBlobGasPerBlob
|
excessBlobGas = parentExcessBlobGas + parentBlobGasUsed
|
||||||
|
target = targetBlobsPerBlock(config, headTimestamp)
|
||||||
|
targetGas = uint64(target) * params.BlobTxBlobGasPerBlob
|
||||||
|
)
|
||||||
if excessBlobGas < targetGas {
|
if excessBlobGas < targetGas {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
if !config.IsOsaka(config.LondonBlock, headTimestamp) {
|
||||||
|
return excessBlobGas - targetGas
|
||||||
|
}
|
||||||
|
|
||||||
|
// EIP-7918 (post-Osaka).
|
||||||
|
var (
|
||||||
|
reservePrice = new(big.Int).Mul(parent.BaseFee, big.NewInt(params.BlobBaseCost))
|
||||||
|
blobPrice = calcBlobPrice(config, parent)
|
||||||
|
)
|
||||||
|
if reservePrice.Cmp(blobPrice) > 0 {
|
||||||
|
max := MaxBlobsPerBlock(config, headTimestamp)
|
||||||
|
scaledExcess := parentBlobGasUsed * uint64(max-target) / uint64(max)
|
||||||
|
return parentExcessBlobGas + scaledExcess
|
||||||
|
}
|
||||||
return excessBlobGas - targetGas
|
return excessBlobGas - targetGas
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -185,3 +202,9 @@ func fakeExponential(factor, numerator, denominator *big.Int) *big.Int {
|
||||||
}
|
}
|
||||||
return output.Div(output, denominator)
|
return output.Div(output, denominator)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// calcBlobPrice calculates the blob price for a block.
|
||||||
|
func calcBlobPrice(config *params.ChainConfig, header *types.Header) *big.Int {
|
||||||
|
blobBaseFee := CalcBlobFee(config, header)
|
||||||
|
return new(big.Int).Mul(blobBaseFee, big.NewInt(params.BlobTxBlobGasPerBlob))
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -127,3 +127,43 @@ func TestFakeExponential(t *testing.T) {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestCalcExcessBlobGasEIP7918(t *testing.T) {
|
||||||
|
var (
|
||||||
|
cfg = params.MergedTestChainConfig
|
||||||
|
targetBlobs = targetBlobsPerBlock(cfg, *cfg.CancunTime)
|
||||||
|
blobGasTarget = uint64(targetBlobs) * params.BlobTxBlobGasPerBlob
|
||||||
|
)
|
||||||
|
makeHeader := func(parentExcess, parentBaseFee uint64, blobsUsed int) *types.Header {
|
||||||
|
blobGasUsed := uint64(blobsUsed) * params.BlobTxBlobGasPerBlob
|
||||||
|
return &types.Header{
|
||||||
|
BaseFee: big.NewInt(int64(parentBaseFee)),
|
||||||
|
ExcessBlobGas: &parentExcess,
|
||||||
|
BlobGasUsed: &blobGasUsed,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
tests := []struct {
|
||||||
|
name string
|
||||||
|
header *types.Header
|
||||||
|
wantExcessGas uint64
|
||||||
|
}{
|
||||||
|
{
|
||||||
|
name: "BelowReservePrice",
|
||||||
|
header: makeHeader(0, 1_000_000_000, targetBlobs),
|
||||||
|
wantExcessGas: blobGasTarget * 3 / 9,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: "AboveReservePrice",
|
||||||
|
header: makeHeader(0, 1, targetBlobs),
|
||||||
|
wantExcessGas: 0,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
for _, tc := range tests {
|
||||||
|
got := CalcExcessBlobGas(cfg, tc.header, *cfg.CancunTime)
|
||||||
|
if got != tc.wantExcessGas {
|
||||||
|
t.Fatalf("%s: excess-blob-gas mismatch – have %d, want %d",
|
||||||
|
tc.name, got, tc.wantExcessGas)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
|
|
@ -178,6 +178,7 @@ const (
|
||||||
BlobTxBlobGasPerBlob = 1 << 17 // Gas consumption of a single data blob (== blob byte size)
|
BlobTxBlobGasPerBlob = 1 << 17 // Gas consumption of a single data blob (== blob byte size)
|
||||||
BlobTxMinBlobGasprice = 1 // Minimum gas price for data blobs
|
BlobTxMinBlobGasprice = 1 // Minimum gas price for data blobs
|
||||||
BlobTxPointEvaluationPrecompileGas = 50000 // Gas price for the point evaluation precompile.
|
BlobTxPointEvaluationPrecompileGas = 50000 // Gas price for the point evaluation precompile.
|
||||||
|
BlobBaseCost = 1 << 14 // Base execution gas cost for a blob.
|
||||||
|
|
||||||
HistoryServeWindow = 8192 // Number of blocks to serve historical block hashes for, EIP-2935.
|
HistoryServeWindow = 8192 // Number of blocks to serve historical block hashes for, EIP-2935.
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue