forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-20 10:52:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge branch 'main' into feature/e2e-block-building-builderapi

Browse source
This commit is contained in:
Ferran Borreguero 2024-02-15 11:09:30 +00:00
commit 124d217e16
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/checks.yml vendored
View file

@ -15,7 +15,7 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
strategy: strategy:
matrix: matrix:
go-version: [ '1.20', '1.21.x' ] go-version: ['1.21.x', '1.22.x']
# goarch: [amd64, arm64] # goarch: [amd64, arm64]
steps: steps:

5
core/types/suave_structs.go
View file

@ -1,6 +1,3 @@
// Code generated by suave/gen in https://github.com/flashbots/suave-geth.
// DO NOT EDIT.
// Hash: c60f303834fbdbbd940aae7cb3679cf3755a25f7384f1052c20bf6c38d9a0451
package types package types
import "github.com/ethereum/go-ethereum/common" import "github.com/ethereum/go-ethereum/common"
@ -18,7 +15,9 @@ type BuildBlockArgs struct {
GasLimit uint64 GasLimit uint64
Random common.Hash Random common.Hash
Withdrawals []*Withdrawal Withdrawals []*Withdrawal
ParentBeaconBlockRoot common.Hash
Extra []byte Extra []byte
BeaconRoot common.Hash
FillPending bool FillPending bool
} }

19
miner/worker.go
View file

@ -929,15 +929,20 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
} }
// Construct the sealing block header. // Construct the sealing block header.
header := &types.Header{ header := &types.Header{
ParentHash: parent.Hash(), ParentHash: parent.Hash(),
Number: new(big.Int).Add(parent.Number, common.Big1), Number: new(big.Int).Add(parent.Number, common.Big1),
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 {
header.Extra = w.extra if len(genParams.extra) != 0 {
header.Extra = genParams.extra
} else {
header.Extra = w.extra
}
} }
// Set the randomness field from the beacon chain if it's available. // Set the randomness field from the beacon chain if it's available.
if genParams.random != (common.Hash{}) { if genParams.random != (common.Hash{}) {
@ -1291,6 +1296,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 +1345,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,
} }