Add request hash to header for builder: executable data to block

Author: terencechain

testing/middleware/builder/builder.go

@@ -376,7 +376,7 @@ func (p *Builder) handleHeaderRequest(w http.ResponseWriter, req *http.Request)
 	}
 	d, err := signing.ComputeDomain(params.BeaconConfig().DomainApplicationBuilder,
 		nil, /* fork version */
-		nil /* genesis val root */)
+		nil  /* genesis val root */)
 	if err != nil {
 		p.cfg.logger.WithError(err).Error("Could not compute the domain")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -454,7 +454,7 @@ func (p *Builder) handleHeaderRequestCapella(w http.ResponseWriter) {
 	}
 	d, err := signing.ComputeDomain(params.BeaconConfig().DomainApplicationBuilder,
 		nil, /* fork version */
-		nil /* genesis val root */)
+		nil  /* genesis val root */)
 	if err != nil {
 		p.cfg.logger.WithError(err).Error("Could not compute the domain")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -540,7 +540,7 @@ func (p *Builder) handleHeaderRequestDeneb(w http.ResponseWriter) {
 	}
 	d, err := signing.ComputeDomain(params.BeaconConfig().DomainApplicationBuilder,
 		nil, /* fork version */
-		nil /* genesis val root */)
+		nil  /* genesis val root */)
 	if err != nil {
 		p.cfg.logger.WithError(err).Error("Could not compute the domain")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -674,7 +674,7 @@ func (p *Builder) handleHeaderRequestElectra(w http.ResponseWriter) {
 	}
 	d, err := signing.ComputeDomain(params.BeaconConfig().DomainApplicationBuilder,
 		nil, /* fork version */
-		nil /* genesis val root */)
+		nil  /* genesis val root */)
 	if err != nil {
 		p.cfg.logger.WithError(err).Error("Could not compute the domain")
 		http.Error(w, err.Error(), http.StatusInternalServerError)
@@ -955,15 +955,15 @@ func unmarshalRPCObject(b []byte) (*jsonRPCObject, error) {
 }
 
 func modifyExecutionPayload(execPayload engine.ExecutableData, fees *big.Int, prevBeaconRoot []byte, requests [][]byte) (*engine.ExecutionPayloadEnvelope, error) {
-	modifiedBlock, err := executableDataToBlock(execPayload, prevBeaconRoot)
+	modifiedBlock, err := executableDataToBlock(execPayload, prevBeaconRoot, requests)
 	if err != nil {
 		return &engine.ExecutionPayloadEnvelope{}, err
 	}
 	return engine.BlockToExecutableData(modifiedBlock, fees, nil /*blobs*/, requests /*requests*/), nil
 }
 
 // This modifies the provided payload to imprint the builder's extra data
-func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte) (*gethTypes.Block, error) {
+func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte, requests [][]byte) (*gethTypes.Block, error) {
 	txs, err := decodeTransactions(params.Transactions)
 	if err != nil {
 		return nil, err
@@ -977,6 +977,12 @@ func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte)
 		withdrawalsRoot = &h
 	}
 
+	var requestsHash *common.Hash
+	if requests != nil {
+		h := gethTypes.CalcRequestsHash(requests)
+		requestsHash = &h
+	}
+
 	header := &gethTypes.Header{
 		ParentHash:      params.ParentHash,
 		UncleHash:       gethTypes.EmptyUncleHash,
@@ -996,7 +1002,9 @@ func executableDataToBlock(params engine.ExecutableData, prevBeaconRoot []byte)
 		WithdrawalsHash: withdrawalsRoot,
 		BlobGasUsed:     params.BlobGasUsed,
 		ExcessBlobGas:   params.ExcessBlobGas,
+		RequestsHash:    requestsHash,
 	}
+
 	if prevBeaconRoot != nil {
 		pRoot := common.Hash(prevBeaconRoot)
 		header.ParentBeaconRoot = &pRoot