Merge pull request ethereum#17 from eden-network/dancun_beacon_root

Fix Dancun changes
allnil · Feb 14, 2024 · d0a8120 · d0a8120
2 parents 75ecca1 + 33e34d7
commit d0a8120
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/core/types/suave_structs.go b/core/types/suave_structs.go
@@ -15,6 +15,7 @@ type BuildBlockArgs struct {
 	GasLimit       uint64
 	Random         common.Hash
 	Withdrawals    []*Withdrawal
+	ParentBeaconBlockRoot common.Hash
 	Extra          []byte
 	BeaconRoot     common.Hash
 	FillPending    bool

diff --git a/miner/worker.go b/miner/worker.go
@@ -938,7 +938,11 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 	}
 	// Set the extra field.
 	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.
 	if genParams.random != (common.Hash{}) {