forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-06-04 22:18:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

miner: set slot number for pending block post-Amsterdam (#34792)
Some checks are pending
/ Linux Build (push) Waiting to run
Details
/ Linux Build (arm) (push) Waiting to run
Details
/ Keeper Build (push) Waiting to run
Details
/ Windows Build (push) Waiting to run
Details
/ Docker Image (push) Waiting to run
Details

Browse source
This commit is contained in:
Barnabas Busa 2026-05-28 10:52:27 +02:00 committed by GitHub
parent 4017efe345
commit 95320ffe69
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 16 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
miner/miner.go
View file

@ -151,12 +151,24 @@ func (miner *Miner) getPending() *newPayloadResult {
return cached return cached
} }
var ( var (
timestamp = uint64(time.Now().Unix()) timestamp = uint64(time.Now().Unix())
withdrawal types.Withdrawals childNumber = new(big.Int).Add(header.Number, big.NewInt(1))
withdrawal types.Withdrawals
slotNum *uint64
) )
if miner.chainConfig.IsShanghai(new(big.Int).Add(header.Number, big.NewInt(1)), timestamp) { if miner.chainConfig.IsShanghai(childNumber, timestamp) {
withdrawal = []*types.Withdrawal{} withdrawal = []*types.Withdrawal{}
} }
// Post-Amsterdam, prepareWork requires a slot number (EIP-7843). The pending
// block is synthetic and has no canonical slot, so derive one from the parent
// when available and fall back to zero otherwise.
if miner.chainConfig.IsAmsterdam(childNumber, timestamp) {
var n uint64
if header.SlotNumber != nil {
n = *header.SlotNumber + 1
}
slotNum = &n
}
ret := miner.generateWork(context.Background(), ret := miner.generateWork(context.Background(),
&generateParams{ &generateParams{
timestamp: timestamp, timestamp: timestamp,
@ -166,6 +178,7 @@ func (miner *Miner) getPending() *newPayloadResult {
random: common.Hash{}, random: common.Hash{},
withdrawals: withdrawal, withdrawals: withdrawal,
beaconRoot: nil, beaconRoot: nil,
slotNum: slotNum,
noTxs: false, noTxs: false,
}, false) // we will never make a witness for a pending block }, false) // we will never make a witness for a pending block
if ret.err != nil { if ret.err != nil {