forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-19 11:20:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

eth/catalyst: use payload v4 for amsterdam

Browse source
This commit is contained in:
Dibus198407 2026-03-04 15:05:17 +08:00
parent 6d99759f01
commit 230c6d9cc8
2 changed files with 38 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
eth/catalyst/simulated_beacon.go
View file

@ -103,6 +103,8 @@ type SimulatedBeacon struct {
func payloadVersion(config *params.ChainConfig, time uint64) engine.PayloadVersion {
switch config.LatestFork(time) {
case forks.Amsterdam:
return engine.PayloadV4
case forks.BPO5, forks.BPO4, forks.BPO3, forks.BPO2, forks.BPO1, forks.Osaka, forks.Prague, forks.Cancun:
return engine.PayloadV3
case forks.Paris, forks.Shanghai:
@ -111,6 +113,21 @@ func payloadVersion(config *params.ChainConfig, time uint64) engine.PayloadVersi
panic("invalid fork, simulated beacon needs to be started post-merge")
}
func payloadAttributes(version engine.PayloadVersion, timestamp uint64, feeRecipient common.Address, withdrawals []*types.Withdrawal, random [32]byte) *engine.PayloadAttributes {
attributes := &engine.PayloadAttributes{
Timestamp: timestamp,
SuggestedFeeRecipient: feeRecipient,
Withdrawals: withdrawals,
Random: random,
BeaconRoot: &common.Hash{},
}
if version == engine.PayloadV4 {
slotNumber := uint64(0)
attributes.SlotNumber = &slotNumber
}
return attributes
}
// NewSimulatedBeacon constructs a new simulated beacon chain.
func NewSimulatedBeacon(period uint64, feeRecipient common.Address, eth *eth.Ethereum) (*SimulatedBeacon, error) {
block := eth.BlockChain().CurrentBlock()
@ -198,13 +215,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
var random [32]byte
rand.Read(random[:])
fcResponse, err := c.engineAPI.forkchoiceUpdated(c.curForkchoiceState, &engine.PayloadAttributes{
Timestamp: timestamp,
SuggestedFeeRecipient: feeRecipient,
Withdrawals: withdrawals,
Random: random,
BeaconRoot: &common.Hash{},
}, version, false)
fcResponse, err := c.engineAPI.forkchoiceUpdated(c.curForkchoiceState, payloadAttributes(version, timestamp, feeRecipient, withdrawals, random), version, false)
if err != nil {
return err
}

20
eth/catalyst/simulated_beacon_test.go
View file

@ -23,6 +23,7 @@ import (
"testing"
"time"
"github.com/ethereum/go-ethereum/beacon/engine"
"github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core"
"github.com/ethereum/go-ethereum/core/types"
@ -70,6 +71,25 @@ func startSimulatedBeaconEthService(t *testing.T, genesis *core.Genesis, period
return n, ethservice, simBeacon
}
func TestPayloadVersionAmsterdam(t *testing.T) {
amsterdamTime := uint64(1)
cfg := &params.ChainConfig{
LondonBlock: big.NewInt(0),
AmsterdamTime: &amsterdamTime,
}
if got := payloadVersion(cfg, amsterdamTime); got != engine.PayloadV4 {
t.Fatalf("unexpected payload version: have %v want %v", got, engine.PayloadV4)
}
}
func TestPayloadAttributesAmsterdamSlotNumber(t *testing.T) {
var random [32]byte
attrs := payloadAttributes(engine.PayloadV4, 1, common.Address{}, nil, random)
if attrs.SlotNumber == nil {
t.Fatal("missing slot number for payload v4")
}
}
// send 20 transactions, >10 withdrawals and ensure they are included in order
// send enough transactions to fill multiple blocks
func TestSimulatedBeaconSendWithdrawals(t *testing.T) {