core/types, internal/ethapi: fixes for prague RPC encoding (#30926)

Fixing some issues I found while regenerating RPC tests for Prague: - Authorization signature values were not encoded as hex - `requestsRoot` in block should be `requestsHash` - `authorizationList` should work for `eth_call`
ethereum · Dec 17, 2024 · 06dfb42 · 06dfb42
1 parent 5b9a3ea
commit 06dfb42
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 12 deletions.
diff --git a/core/types/block.go b/core/types/block.go
@@ -105,7 +105,7 @@ type Header struct {
 	ParentBeaconRoot *common.Hash `json:"parentBeaconBlockRoot" rlp:"optional"`
 
 	// RequestsHash was added by EIP-7685 and is ignored in legacy headers.
-	RequestsHash *common.Hash `json:"requestsRoot" rlp:"optional"`
+	RequestsHash *common.Hash `json:"requestsHash" rlp:"optional"`
 }
 
 // field type overrides for gencodec

diff --git a/core/types/gen_authorization.go b/core/types/gen_authorization.go
diff --git a/core/types/gen_header_json.go b/core/types/gen_header_json.go
diff --git a/core/types/tx_setcode.go b/core/types/tx_setcode.go
@@ -83,6 +83,8 @@ type authorizationMarshaling struct {
 	ChainID hexutil.Uint64
 	Nonce   hexutil.Uint64
 	V       hexutil.Uint64
+	R       hexutil.U256
+	S       hexutil.U256
 }
 
 // SignAuth signs the provided authorization.

diff --git a/internal/ethapi/api.go b/internal/ethapi/api.go
@@ -895,7 +895,7 @@ func RPCMarshalHeader(head *types.Header) map[string]interface{} {
 		result["parentBeaconBlockRoot"] = head.ParentBeaconRoot
 	}
 	if head.RequestsHash != nil {
-		result["requestsRoot"] = head.RequestsHash
+		result["requestsHash"] = head.RequestsHash
 	}
 	return result
 }

diff --git a/internal/ethapi/transaction_args.go b/internal/ethapi/transaction_args.go
@@ -466,6 +466,7 @@ func (args *TransactionArgs) ToMessage(baseFee *big.Int, skipNonceCheck, skipEoA
 		AccessList:       accessList,
 		BlobGasFeeCap:    (*big.Int)(args.BlobFeeCap),
 		BlobHashes:       args.BlobHashes,
+		AuthList:         args.AuthorizationList,
 		SkipNonceChecks:  skipNonceCheck,
 		SkipFromEOACheck: skipEoACheck,
 	}