XC-412: Formatting

Author: lpahlavi

evm_rpc_client/src/lib.rs

@@ -107,9 +107,18 @@ pub mod fixtures;
 mod request;
 mod runtime;
 
-use crate::request::{CallRequest, CallRequestBuilder, FeeHistoryRequest, FeeHistoryRequestBuilder, GetBlockByNumberRequest, GetBlockByNumberRequestBuilder, GetTransactionCountRequest, GetTransactionCountRequestBuilder, GetTransactionReceiptRequest, GetTransactionReceiptRequestBuilder, Request, RequestBuilder, SendRawTransactionRequest, SendRawTransactionRequestBuilder};
+use crate::request::{
+    CallRequest, CallRequestBuilder, FeeHistoryRequest, FeeHistoryRequestBuilder,
+    GetBlockByNumberRequest, GetBlockByNumberRequestBuilder, GetTransactionCountRequest,
+    GetTransactionCountRequestBuilder, GetTransactionReceiptRequest,
+    GetTransactionReceiptRequestBuilder, Request, RequestBuilder, SendRawTransactionRequest,
+    SendRawTransactionRequestBuilder,
+};
 use candid::{CandidType, Principal};
-use evm_rpc_types::{BlockTag, CallArgs, ConsensusStrategy, FeeHistoryArgs, GetLogsArgs, GetTransactionCountArgs, Hex, Hex32, RpcConfig, RpcServices};
+use evm_rpc_types::{
+    BlockTag, CallArgs, ConsensusStrategy, FeeHistoryArgs, GetLogsArgs, GetTransactionCountArgs,
+    Hex, Hex32, RpcConfig, RpcServices,
+};
 use ic_error_types::RejectCode;
 use request::{GetLogsRequest, GetLogsRequestBuilder};
 pub use runtime::{IcRuntime, Runtime};
@@ -565,7 +574,9 @@ impl<R> EvmRpcClient<R> {
     /// #       block_number: Nat256::from(0x52a975_u64),
     /// #       effective_gas_price: Nat256::from(0x6052340_u64),
     /// #       gas_used: Nat256::from(0x1308c_u64),
+    /// #       cumulative_gas_used: Nat256::from(0x797db0_u64),
     /// #       status: Some(Nat256::from(0x1_u8)),
+    /// #       root: None,
     /// #       transaction_hash: Hex32::from_str("0xa3ece39ae137617669c6933b7578b94e705e765683f260fcfe30eaa41932610f").unwrap(),
     /// #       contract_address: None,
     /// #       from: Hex20::from_str("0xd907941c8b3b966546fc408b8c942eb10a4f98df").unwrap(),

evm_rpc_types/src/response/alloy.rs

@@ -139,9 +139,15 @@ impl TryFrom<TransactionReceipt> for alloy_rpc_types::TransactionReceipt {
                 alloy_consensus::TxType::try_from(receipt.tx_type)?,
                 alloy_consensus::ReceiptWithBloom {
                     receipt: alloy_consensus::Receipt {
-                        status: validate_receipt_status(&receipt.block_number, receipt.status)?,
-                        // TODO XC-412: This field is required, why is it missing from `evm_rpc_types::TransactionReceipt`?
-                        cumulative_gas_used: 0,
+                        status: validate_receipt_status(
+                            &receipt.block_number,
+                            receipt.root,
+                            receipt.status,
+                        )?,
+                        cumulative_gas_used: try_from_nat256(
+                            receipt.cumulative_gas_used,
+                            "cumulative_gas_used",
+                        )?,
                         logs: receipt
                             .logs
                             .into_iter()
@@ -176,13 +182,11 @@ impl TryFrom<HexByte> for alloy_consensus::TxType {
     type Error = RpcError;
 
     fn try_from(value: HexByte) -> Result<Self, Self::Error> {
-        Ok(
-            alloy_consensus::TxType::try_from(value.into_byte()).map_err(|e| {
-                RpcError::ValidationError(ValidationError::Custom(format!(
-                    "Unable to parse transaction type: {e:?}"
-                )))
-            })?,
-        )
+        alloy_consensus::TxType::try_from(value.into_byte()).map_err(|e| {
+            RpcError::ValidationError(ValidationError::Custom(format!(
+                "Unable to parse transaction type: {e:?}"
+            )))
+        })
     }
 }
 
@@ -192,32 +196,35 @@ fn validate_difficulty(number: &Nat256, difficulty: Option<Nat256>) -> Result<U2
         difficulty
             .map(U256::from)
             .ok_or(RpcError::ValidationError(ValidationError::Custom(
-                "Missing difficulty in pre-Paris block".into(),
+                "Missing difficulty field in pre Paris upgrade block".into(),
             )))
     } else {
         match difficulty.map(U256::from) {
             None | Some(U256::ZERO) => Ok(U256::ZERO),
             _ => Err(RpcError::ValidationError(ValidationError::Custom(
-                "Post-Paris block has non-zero difficulty".into(),
+                "Post Paris upgrade block has non-zero difficulty".into(),
             ))),
         }
     }
 }
 
 fn validate_receipt_status(
     number: &Nat256,
+    root: Option<Hex32>,
     status: Option<Nat256>,
 ) -> Result<alloy_consensus::Eip658Value, RpcError> {
     const BYZANTIUM_BLOCK: u64 = 4_370_000;
     if number.as_ref() < &Nat::from(BYZANTIUM_BLOCK) {
-        // TODO XC-412: How do we want to handle pre-Byzantium blocks?
-        Err(RpcError::ValidationError(ValidationError::Custom(
-            "Missing state root in pre-Byzantium receipt".into(),
-        )))
+        match root {
+            None => Err(RpcError::ValidationError(ValidationError::Custom(
+                "Missing root field in transaction included before the Byzantium upgrade".into(),
+            ))),
+            Some(root) => Ok(alloy_consensus::Eip658Value::PostState(B256::from(root))),
+        }
     } else {
         match status.map(U256::from) {
             None => Err(RpcError::ValidationError(ValidationError::Custom(
-                "Missing status in post-Byzantium receipt".into(),
+                "Missing status field in transaction included after the Byzantium upgrade".into(),
             ))),
             Some(U256::ZERO) => Ok(alloy_consensus::Eip658Value::Eip658(false)),
             Some(U256::ONE) => Ok(alloy_consensus::Eip658Value::Eip658(true)),

src/rpc_client/tests.rs

@@ -117,8 +117,6 @@ mod eth_get_transaction_receipt {
         )
     }
 
-
-
     #[test]
     fn should_deserialize_post_byzantium_transaction_receipt() {
         const RECEIPT: &str = r#"{

tests/mock_http_runtime/mock/json/mod.rs

@@ -142,6 +142,7 @@ impl CanisterHttpRequestMatcher for JsonRpcRequestMatcher {
     }
 }
 
+#[derive(Clone)]
 pub struct JsonRpcResponse {
     pub status: u16,
     pub headers: Vec<CanisterHttpHeader>,