Zero ParentBeaconBlockRoot in genesis (#7958)

See ethereum/EIPs#7445
erigontech · Sep 6, 2023 · 43502a8 · 43502a8
1 parent bf57f52
commit 43502a8
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 57 deletions.
diff --git a/core/genesis_write.go b/core/genesis_write.go
@@ -495,6 +495,13 @@ func GenesisToBlock(g *types.Genesis, tmpDir string) (*types.Block, *state.Intra
 			head.BaseFee = new(big.Int).SetUint64(params.InitialBaseFee)
 		}
 	}
+	if g.Config.IsCancun(g.Timestamp) {
+		if g.ParentBeaconBlockRoot == nil {
+			head.ParentBeaconBlockRoot = &libcommon.Hash{}
+		} else {
+			head.ParentBeaconBlockRoot = g.ParentBeaconBlockRoot
+		}
+	}
 
 	var withdrawals []*types.Withdrawal
 	if g.Config != nil && (g.Config.IsShanghai(g.Timestamp)) {

diff --git a/core/types/gen_genesis.go b/core/types/gen_genesis.go
diff --git a/core/types/genesis.go b/core/types/genesis.go
@@ -41,20 +41,21 @@ var ErrGenesisNoConfig = errors.New("genesis has no chain configuration")
 // Genesis specifies the header fields, state of a genesis block. It also defines hard
 // fork switch-over blocks through the chain configuration.
 type Genesis struct {
-	Config        *chain.Config  `json:"config"`
-	Nonce         uint64         `json:"nonce"`
-	Timestamp     uint64         `json:"timestamp"`
-	ExtraData     []byte         `json:"extraData"`
-	GasLimit      uint64         `json:"gasLimit"   gencodec:"required"`
-	Difficulty    *big.Int       `json:"difficulty" gencodec:"required"`
-	Mixhash       common.Hash    `json:"mixHash"`
-	Coinbase      common.Address `json:"coinbase"`
-	BaseFee       *big.Int       `json:"baseFeePerGas"`
-	BlobGasUsed   *uint64        `json:"blobGasUsed"`
-	ExcessBlobGas *uint64        `json:"excessBlobGas"`
-	Alloc         GenesisAlloc   `json:"alloc"      gencodec:"required"`
-	AuRaStep      uint64         `json:"auRaStep"`
-	AuRaSeal      []byte         `json:"auRaSeal"`
+	Config                *chain.Config  `json:"config"`
+	Nonce                 uint64         `json:"nonce"`
+	Timestamp             uint64         `json:"timestamp"`
+	ExtraData             []byte         `json:"extraData"`
+	GasLimit              uint64         `json:"gasLimit"   gencodec:"required"`
+	Difficulty            *big.Int       `json:"difficulty" gencodec:"required"`
+	Mixhash               common.Hash    `json:"mixHash"`
+	Coinbase              common.Address `json:"coinbase"`
+	BaseFee               *big.Int       `json:"baseFeePerGas"`
+	BlobGasUsed           *uint64        `json:"blobGasUsed"`
+	ExcessBlobGas         *uint64        `json:"excessBlobGas"`
+	Alloc                 GenesisAlloc   `json:"alloc"      gencodec:"required"`
+	AuRaStep              uint64         `json:"auRaStep"`
+	AuRaSeal              []byte         `json:"auRaSeal"`
+	ParentBeaconBlockRoot *common.Hash   `json:"parentBeaconBlockRoot"`
 
 	// These fields are used for consensus tests. Please don't use them
 	// in actual genesis blocks.