Merge pull request ethereum#40 from marioevz/eip-7002

cmd/evm: Add Withdrawal Requests
marioevz · Apr 25, 2024 · 4e8bf1b · 4e8bf1b
2 parents 5daca0b + 528760d
commit 4e8bf1b
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 47 deletions.
diff --git a/cmd/evm/internal/t8ntool/execution.go b/cmd/evm/internal/t8ntool/execution.go
@@ -53,21 +53,22 @@ type Prestate struct {
 // ExecutionResult contains the execution status after running a state test, any
 // error that might have occurred and a dump of the final state if requested.
 type ExecutionResult struct {
-	StateRoot            common.Hash           `json:"stateRoot"`
-	TxRoot               common.Hash           `json:"txRoot"`
-	ReceiptRoot          common.Hash           `json:"receiptsRoot"`
-	LogsHash             common.Hash           `json:"logsHash"`
-	Bloom                types.Bloom           `json:"logsBloom"        gencodec:"required"`
-	Receipts             types.Receipts        `json:"receipts"`
-	Rejected             []*rejectedTx         `json:"rejected,omitempty"`
-	Difficulty           *math.HexOrDecimal256 `json:"currentDifficulty" gencodec:"required"`
-	GasUsed              math.HexOrDecimal64   `json:"gasUsed"`
-	BaseFee              *math.HexOrDecimal256 `json:"currentBaseFee,omitempty"`
-	WithdrawalsRoot      *common.Hash          `json:"withdrawalsRoot,omitempty"`
-	CurrentExcessBlobGas *math.HexOrDecimal64  `json:"currentExcessBlobGas,omitempty"`
-	CurrentBlobGasUsed   *math.HexOrDecimal64  `json:"blobGasUsed,omitempty"`
-	RequestsRoot         *common.Hash          `json:"requestsRoot,omitempty"`
-	DepositRequests      *types.Deposits       `json:"depositRequests,omitempty"`
+	StateRoot            common.Hash               `json:"stateRoot"`
+	TxRoot               common.Hash               `json:"txRoot"`
+	ReceiptRoot          common.Hash               `json:"receiptsRoot"`
+	LogsHash             common.Hash               `json:"logsHash"`
+	Bloom                types.Bloom               `json:"logsBloom"        gencodec:"required"`
+	Receipts             types.Receipts            `json:"receipts"`
+	Rejected             []*rejectedTx             `json:"rejected,omitempty"`
+	Difficulty           *math.HexOrDecimal256     `json:"currentDifficulty" gencodec:"required"`
+	GasUsed              math.HexOrDecimal64       `json:"gasUsed"`
+	BaseFee              *math.HexOrDecimal256     `json:"currentBaseFee,omitempty"`
+	WithdrawalsRoot      *common.Hash              `json:"withdrawalsRoot,omitempty"`
+	CurrentExcessBlobGas *math.HexOrDecimal64      `json:"currentExcessBlobGas,omitempty"`
+	CurrentBlobGasUsed   *math.HexOrDecimal64      `json:"blobGasUsed,omitempty"`
+	RequestsRoot         *common.Hash              `json:"requestsRoot,omitempty"`
+	DepositRequests      *types.Deposits           `json:"depositRequests,omitempty"`
+	WithdrawalRequests   *types.WithdrawalRequests `json:"withdrawalRequests,omitempty"`
 }
 
 type ommer struct {
@@ -345,22 +346,55 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		amount := new(big.Int).Mul(new(big.Int).SetUint64(w.Amount), big.NewInt(params.GWei))
 		statedb.AddBalance(w.Address, uint256.MustFromBig(amount), tracing.BalanceIncreaseWithdrawal)
 	}
+	// Retrieve deposit and withdrawal requests
+	var (
+		depositRequests    *types.Deposits
+		withdrawalRequests *types.WithdrawalRequests
+		requestsRoot       *common.Hash
+	)
+	if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time) {
+		// Parse deposit requests from the logs
+		var allLogs []*types.Log
+		for _, receipt := range receipts {
+			allLogs = append(allLogs, receipt.Logs...)
+		}
+		requests, err := core.ParseDepositLogs(allLogs)
+		if err != nil {
+			return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err))
+		}
+		// Process the withdrawal requests contract execution
+		vmenv := vm.NewEVM(vmContext, vm.TxContext{}, statedb, chainConfig, vmConfig)
+		wxs := core.ProcessDequeueWithdrawalRequests(vmenv, statedb)
+		requests = append(requests, wxs...)
+		// Calculate the requests root
+		h := types.DeriveSha(requests, trie.NewStackTrie(nil))
+		requestsRoot = &h
+		// Get the deposits from the requests
+		deposits := requests.Deposits()
+		depositRequests = &deposits
+		// Get the withdrawals from the requests
+		withdrawals := requests.Withdrawals()
+		withdrawalRequests = &withdrawals
+	}
 	// Commit block
 	root, err := statedb.Commit(vmContext.BlockNumber.Uint64(), chainConfig.IsEIP158(vmContext.BlockNumber))
 	if err != nil {
 		return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not commit state: %v", err))
 	}
 	execRs := &ExecutionResult{
-		StateRoot:   root,
-		TxRoot:      types.DeriveSha(includedTxs, trie.NewStackTrie(nil)),
-		ReceiptRoot: types.DeriveSha(receipts, trie.NewStackTrie(nil)),
-		Bloom:       types.CreateBloom(receipts),
-		LogsHash:    rlpHash(statedb.Logs()),
-		Receipts:    receipts,
-		Rejected:    rejectedTxs,
-		Difficulty:  (*math.HexOrDecimal256)(vmContext.Difficulty),
-		GasUsed:     (math.HexOrDecimal64)(gasUsed),
-		BaseFee:     (*math.HexOrDecimal256)(vmContext.BaseFee),
+		StateRoot:          root,
+		TxRoot:             types.DeriveSha(includedTxs, trie.NewStackTrie(nil)),
+		ReceiptRoot:        types.DeriveSha(receipts, trie.NewStackTrie(nil)),
+		Bloom:              types.CreateBloom(receipts),
+		LogsHash:           rlpHash(statedb.Logs()),
+		Receipts:           receipts,
+		Rejected:           rejectedTxs,
+		Difficulty:         (*math.HexOrDecimal256)(vmContext.Difficulty),
+		GasUsed:            (math.HexOrDecimal64)(gasUsed),
+		BaseFee:            (*math.HexOrDecimal256)(vmContext.BaseFee),
+		RequestsRoot:       requestsRoot,
+		DepositRequests:    depositRequests,
+		WithdrawalRequests: withdrawalRequests,
 	}
 	if pre.Env.Withdrawals != nil {
 		h := types.DeriveSha(types.Withdrawals(pre.Env.Withdrawals), trie.NewStackTrie(nil))
@@ -370,23 +404,6 @@ func (pre *Prestate) Apply(vmConfig vm.Config, chainConfig *params.ChainConfig,
 		execRs.CurrentExcessBlobGas = (*math.HexOrDecimal64)(&excessBlobGas)
 		execRs.CurrentBlobGasUsed = (*math.HexOrDecimal64)(&blobGasUsed)
 	}
-	if chainConfig.IsPrague(vmContext.BlockNumber, vmContext.Time) {
-		// Parse the requests from the logs
-		var allLogs []*types.Log
-		for _, receipt := range receipts {
-			allLogs = append(allLogs, receipt.Logs...)
-		}
-		requests, err := core.ParseDepositLogs(allLogs)
-		if err != nil {
-			return nil, nil, nil, NewError(ErrorEVM, fmt.Errorf("could not parse requests logs: %v", err))
-		}
-		// Calculate the requests root
-		h := types.DeriveSha(requests, trie.NewStackTrie(nil))
-		execRs.RequestsRoot = &h
-		// Get the deposits from the requests
-		deposits := requests.Deposits()
-		execRs.DepositRequests = &deposits
-	}
 	// Re-create statedb instance with new root upon the updated database
 	// for accessing latest states.
 	statedb, err = state.New(root, statedb.Database(), nil)

diff --git a/core/types/request.go b/core/types/request.go
@@ -67,13 +67,24 @@ func (s Requests) EncodeIndex(i int, w *bytes.Buffer) {
 
 // Retrieve deposits from a requests list.
 func (s Requests) Deposits() Deposits {
-	deposits := make(Deposits, 0, len(s))
+	dr := make(Deposits, 0, len(s))
 	for _, req := range s {
 		if req.Type() == DepositRequestType {
-			deposits = append(deposits, req.inner.(*Deposit))
+			dr = append(dr, req.inner.(*Deposit))
 		}
 	}
-	return deposits
+	return dr
+}
+
+// Retrieve withdrawals requests from a requests list.
+func (s Requests) Withdrawals() WithdrawalRequests {
+	wr := make(WithdrawalRequests, 0, len(s))
+	for _, req := range s {
+		if req.Type() == WithdrawalRequestType {
+			wr = append(wr, req.inner.(*WithdrawalRequest))
+		}
+	}
+	return wr
 }
 
 type RequestData interface {

diff --git a/core/types/withdrawal_request.go b/core/types/withdrawal_request.go
@@ -26,8 +26,8 @@ import (
 // WithdrawalRequest represents an EIP-7002 withdrawal request from source for
 // the validator associated with the public key for amount.
 type WithdrawalRequest struct {
-	Source    common.Address `json:"source"`
-	PublicKey BLSPublicKey   `json:"pubkey"`
+	Source    common.Address `json:"sourceAddress"`
+	PublicKey BLSPublicKey   `json:"validatorPublicKey"`
 	Amount    uint64         `json:"amount"`
 }