Merge pull request #17 from eden-network/dancun_beacon_root

Fix Dancun changes

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

miner/worker.go

@@ -938,8 +938,12 @@ func (w *worker) prepareWork(genParams *generateParams) (*environment, error) {
 	}
 	// Set the extra field.
 	if len(w.extra) != 0 {
+		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{}) {
 		header.MixDigest = genParams.random