[pull] develop from OffchainLabs:develop

beacon-chain/core/blocks/genesis.go

@@ -193,16 +193,34 @@ func NewGenesisBlockForState(ctx context.Context, st state.BeaconState) (interfa
 			Signature: params.BeaconConfig().EmptySignature[:],
 		})
 	case *ethpb.BeaconStateGloas:
+		gs := ps.(*ethpb.BeaconStateGloas)
 		return blocks.NewSignedBeaconBlock(&ethpb.SignedBeaconBlockGloas{
-			Block:     gloasGenesisBlock(root),
+			Block:     gloasGenesisBlock(root, gs.LatestExecutionPayloadBid),
 			Signature: params.BeaconConfig().EmptySignature[:],
 		})
 	default:
 		return nil, ErrUnrecognizedState
 	}
 }
 
-func gloasGenesisBlock(root [fieldparams.RootLength]byte) *ethpb.BeaconBlockGloas {
+func gloasGenesisBlock(root [fieldparams.RootLength]byte, latestBid *ethpb.ExecutionPayloadBid) *ethpb.BeaconBlockGloas {
+	// The genesis block body's signed_execution_payload_bid mirrors the state's
+	// latest_execution_payload_bid so the reconstructed block's body_root matches
+	// state.latest_block_header.body_root (which the genesis distribution tool
+	// commits to). Falling back to a zero bid is only useful in tests that
+	// initialize a Gloas state without populating latest_execution_payload_bid.
+	bidMessage := latestBid.Copy()
+	if bidMessage == nil {
+		bidMessage = &ethpb.ExecutionPayloadBid{
+			ParentBlockHash:       make([]byte, 32),
+			ParentBlockRoot:       make([]byte, 32),
+			BlockHash:             make([]byte, 32),
+			PrevRandao:            make([]byte, 32),
+			FeeRecipient:          make([]byte, 20),
+			BlobKzgCommitments:    make([][]byte, 0),
+			ExecutionRequestsRoot: make([]byte, 32),
+		}
+	}
 	return &ethpb.BeaconBlockGloas{
 		ParentRoot: params.BeaconConfig().ZeroHash[:],
 		StateRoot:  root[:],
@@ -218,17 +236,15 @@ func gloasGenesisBlock(root [fieldparams.RootLength]byte) *ethpb.BeaconBlockGloa
 				SyncCommitteeSignature: make([]byte, fieldparams.BLSSignatureLength),
 			},
 			SignedExecutionPayloadBid: &ethpb.SignedExecutionPayloadBid{
-				Message: &ethpb.ExecutionPayloadBid{
-					ParentBlockHash:    make([]byte, 32),
-					ParentBlockRoot:    make([]byte, 32),
-					BlockHash:          make([]byte, 32),
-					PrevRandao:         make([]byte, 32),
-					FeeRecipient:       make([]byte, 20),
-					BlobKzgCommitments: make([][]byte, 0),
-				},
+				Message:   bidMessage,
 				Signature: make([]byte, fieldparams.BLSSignatureLength),
 			},
 			PayloadAttestations: make([]*ethpb.PayloadAttestation, 0),
+			ParentExecutionRequests: &enginev1.ExecutionRequests{
+				Withdrawals:    make([]*enginev1.WithdrawalRequest, 0),
+				Deposits:       make([]*enginev1.DepositRequest, 0),
+				Consolidations: make([]*enginev1.ConsolidationRequest, 0),
+			},
 		},
 	}
 }

changelog/barnabasbusa_fix-gloas-genesis-block.md

@@ -0,0 +1,3 @@
+### Fixed
+
+- Fixed Gloas genesis block reconstruction so the body's `signed_execution_payload_bid.message` mirrors `state.latest_execution_payload_bid`, matching the body root committed to in `state.latest_block_header`. Without this, Prysm built a divergent genesis block (different `block_root` / `body_root` from other clients) and the validator client failed to propose at slot 1 with "parent root … does not match the latest block header signing root in state". Also initializes `parent_execution_requests` so the body's SSZ hash tree root can be computed.