Merge pull request ethereum#46 from MariusVanDerWijden/prague-payload…

…-fix

eth/catalyst: fix deposit requests

beacon/engine/types.go

@@ -241,9 +241,12 @@ func ExecutableDataToBlock(params ExecutableData, versionedHashes []common.Hash,
 		requests     types.Requests
 	)
 	if params.Deposits != nil {
+		requests = make(types.Requests, 0)
 		requests = append(requests, params.Deposits.Requests()...)
 	}
 	if params.WithdrawalRequests != nil {
+		// We assume that withdrawal reqs are non-nil only if deposits are non-nil
+		// (both can be empty)
 		requests = append(requests, params.WithdrawalRequests.Requests()...)
 	}
 	if requests != nil {

eth/catalyst/api.go

@@ -230,7 +230,11 @@ func (api *ConsensusAPI) ForkchoiceUpdatedV3(update engine.ForkchoiceStateV1, pa
 	// hash, even if params are wrong. To do this we need to split up
 	// forkchoiceUpdate into a function that only updates the head and then a
 	// function that kicks off block construction.
-	return api.forkchoiceUpdated(update, params, engine.PayloadV3, false)
+	payloadVersion := engine.PayloadV3
+	if params != nil && api.eth.BlockChain().Config().LatestFork(params.Timestamp) == forks.Prague {
+		payloadVersion = engine.PayloadV4
+	}
+	return api.forkchoiceUpdated(update, params, payloadVersion, false)
 }
 
 func (api *ConsensusAPI) forkchoiceUpdated(update engine.ForkchoiceStateV1, payloadAttributes *engine.PayloadAttributes, payloadVersion engine.PayloadVersion, simulatorMode bool) (engine.ForkChoiceResponse, error) {

eth/catalyst/simulated_beacon.go

@@ -164,7 +164,7 @@ func (c *SimulatedBeacon) sealBlock(withdrawals []*types.Withdrawal, timestamp u
 		Withdrawals:           withdrawals,
 		Random:                random,
 		BeaconRoot:            &common.Hash{},
-	}, engine.PayloadV3, true)
+	}, engine.PayloadV4, true)
 	if err != nil {
 		return err
 	}

miner/worker.go

@@ -105,7 +105,26 @@ func (miner *Miner) generateWork(params *generateParams) *newPayloadResult {
 			log.Warn("Block building is interrupted", "allowance", common.PrettyDuration(miner.config.Recommit))
 		}
 	}
+
 	body := types.Body{Transactions: work.txs, Withdrawals: params.withdrawals}
+	allLogs := make([]*types.Log, 0)
+	for _, r := range work.receipts {
+		allLogs = append(allLogs, r.Logs...)
+	}
+	// Read requests if Prague is enabled.
+	if miner.chainConfig.IsPrague(work.header.Number, work.header.Time) {
+		requests := make(types.Requests, 0)
+		reqs, err := core.ParseDepositLogs(allLogs)
+		if err != nil {
+			return &newPayloadResult{err: err}
+		}
+		requests = append(requests, reqs...)
+		context := core.NewEVMBlockContext(work.header, miner.chain, nil)
+		vmenv := vm.NewEVM(context, vm.TxContext{}, work.state, miner.chainConfig, vm.Config{})
+		wxs := core.ProcessDequeueWithdrawalRequests(vmenv, work.state)
+		requests = append(requests, wxs...)
+		body.Requests = requests
+	}
 	block, err := miner.engine.FinalizeAndAssemble(miner.chain, work.header, work.state, &body, work.receipts)
 	if err != nil {
 		return &newPayloadResult{err: err}