merge to main

.github/workflows/checks.yml

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

core/types/suave_structs.go

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

miner/worker.go

@@ -934,6 +934,7 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 		GasLimit:         core.CalcGasLimit(parent.GasLimit, w.config.GasCeil),
 		Time:             timestamp,
 		Coinbase:         genParams.coinbase,
+		ParentBeaconRoot: genParams.beaconRoot,
 	}
 	// Set the extra field.
 	if len(w.extra) != 0 {
@@ -1295,7 +1296,7 @@ func (w *worker) buildBlockFromTxs(ctx context.Context, args *types.BuildBlockAr
 		random:      args.Random,
 		extra:       args.Extra,
 		withdrawals: args.Withdrawals,
-		beaconRoot:  &args.ParentBeaconBlockRoot,
+		beaconRoot:  &args.BeaconRoot,
 		// noUncle:     true,
 		noTxs: false,
 	}
@@ -1344,7 +1345,7 @@ func (w *worker) buildBlockFromBundles(ctx context.Context, args *types.BuildBlo
 		random:      args.Random,
 		extra:       args.Extra,
 		withdrawals: args.Withdrawals,
-		beaconRoot:  &args.ParentBeaconBlockRoot,
+		beaconRoot:  &args.BeaconRoot,
 		// noUncle:     true,
 		noTxs: false,
 	}