miner: send full request when resolving full payload (#30615)

lightclient · holiman · commit 5d41ac58a8ff · 2024-11-19T14:50:11.000+01:00
Fixes an issue missed in #30576 where we send empty requests for a full payload being resolved, causing hash mismatch later on when we get the payload back via `NewPayload`.
diff --git a/miner/payload_building.go b/miner/payload_building.go
@@ -145,7 +145,7 @@ func (payload *Payload) Resolve() *engine.ExecutionPayloadEnvelope {
 		close(payload.stop)
 	}
 	if payload.full != nil {
-		envelope := engine.BlockToExecutableData(payload.full, payload.fullFees, payload.sidecars, payload.emptyRequests)
+		envelope := engine.BlockToExecutableData(payload.full, payload.fullFees, payload.sidecars, payload.requests)
 		if payload.fullWitness != nil {
 			envelope.Witness = new(hexutil.Bytes)
 			*envelope.Witness, _ = rlp.EncodeToBytes(payload.fullWitness) // cannot fail

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ func (payload Payload) Resolve() engine.ExecutionPayloadEnvelope {`
`145`	`145`	`close(payload.stop)`
`146`	`146`	`}`
`147`	`147`	`if payload.full != nil {`
`148`		`- envelope := engine.BlockToExecutableData(payload.full, payload.fullFees, payload.sidecars, payload.emptyRequests)`
	`148`	`+ envelope := engine.BlockToExecutableData(payload.full, payload.fullFees, payload.sidecars, payload.requests)`
`149`	`149`	`if payload.fullWitness != nil {`
`150`	`150`	`envelope.Witness = new(hexutil.Bytes)`
`151`	`151`	`*envelope.Witness, _ = rlp.EncodeToBytes(payload.fullWitness) // cannot fail`