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 to main

Browse source
This commit is contained in:
halo3mic 2024-02-14 15:57:10 +00:00
commit 33e34d7019
3 changed files with 11 additions and 12 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:

4
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"
@ -20,6 +17,7 @@ type BuildBlockArgs struct {
Withdrawals []*Withdrawal Withdrawals []*Withdrawal
ParentBeaconBlockRoot common.Hash ParentBeaconBlockRoot common.Hash
Extra []byte Extra []byte
BeaconRoot common.Hash
FillPending bool FillPending bool
} }

5
miner/worker.go
View file

@ -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 {
@ -1295,7 +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.ParentBeaconBlockRoot, beaconRoot: &args.BeaconRoot,
// noUncle: true, // noUncle: true,
noTxs: false, noTxs: false,
} }
@ -1344,7 +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.ParentBeaconBlockRoot, beaconRoot: &args.BeaconRoot,
// noUncle: true, // noUncle: true,
noTxs: false, noTxs: false,
} }