mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-20 10:52:25 +00:00
Pass beacon root from build args to block header.
This commit is contained in:
parent
46dd095ac1
commit
4b6f39ee25
1 changed files with 8 additions and 5 deletions
|
|
@ -934,6 +934,7 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
|
||||||
GasLimit: core.CalcGasLimit(parent.GasLimit, w.config.GasCeil),
|
GasLimit: core.CalcGasLimit(parent.GasLimit, w.config.GasCeil),
|
||||||
Time: timestamp,
|
Time: timestamp,
|
||||||
Coinbase: genParams.coinbase,
|
Coinbase: genParams.coinbase,
|
||||||
|
ParentBeaconRoot: genParams.beaconRoot,
|
||||||
}
|
}
|
||||||
// Set the extra field.
|
// Set the extra field.
|
||||||
if len(w.extra) != 0 {
|
if len(w.extra) != 0 {
|
||||||
|
|
@ -1291,6 +1292,7 @@ func (w *worker) buildBlockFromTxs(ctx context.Context, args *types.BuildBlockAr
|
||||||
random: args.Random,
|
random: args.Random,
|
||||||
extra: args.Extra,
|
extra: args.Extra,
|
||||||
withdrawals: args.Withdrawals,
|
withdrawals: args.Withdrawals,
|
||||||
|
beaconRoot: &args.BeaconRoot,
|
||||||
// noUncle: true,
|
// noUncle: true,
|
||||||
noTxs: false,
|
noTxs: false,
|
||||||
}
|
}
|
||||||
|
|
@ -1339,6 +1341,7 @@ func (w *worker) buildBlockFromBundles(ctx context.Context, args *types.BuildBlo
|
||||||
random: args.Random,
|
random: args.Random,
|
||||||
extra: args.Extra,
|
extra: args.Extra,
|
||||||
withdrawals: args.Withdrawals,
|
withdrawals: args.Withdrawals,
|
||||||
|
beaconRoot: &args.BeaconRoot,
|
||||||
// noUncle: true,
|
// noUncle: true,
|
||||||
noTxs: false,
|
noTxs: false,
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue