Merge pull request #105 from bitfinity-network/http_outcall_fix

[EPROD-642] http outcall client fix

Author: F3kilo

Cargo.toml

@@ -79,6 +79,7 @@ tokio = { version = "1.24", features = ["macros", "rt", "signal"] }
 wiremock = "0.5"
 yup-oauth2 = "8.3.2"
 zip = "0.6"
+url = "2.5"
 
 [profile.dev]
 debug = false

src/ethereum-json-rpc-client/Cargo.toml

@@ -15,6 +15,7 @@ pocket-ic-tests-client = [
   "ic-canister-client/pocket-ic-client",
 ]
 reqwest = ["dep:reqwest"]
+http-outcall = ["dep:url"]
 
 [dependencies]
 anyhow = { workspace = true }
@@ -23,6 +24,7 @@ did = { path = "../did" }
 hex = { workspace = true }
 ic-exports = { workspace = true }
 ic-canister-client = { workspace = true, optional = true }
+url = { workspace = true, optional = true }
 itertools = { workspace = true }
 log = { workspace = true }
 reqwest = { workspace = true, optional = true, features = [

src/ethereum-json-rpc-client/src/canister_client.rs

@@ -35,12 +35,20 @@ impl<T: CanisterClient + Sync + 'static> Client for T {
 
             let args = HttpRequest::new(&request)?;
 
-            let http_response: HttpResponse = if is_update_call {
+            let http_response: Result<HttpResponse, _> = if is_update_call {
                 client.update("http_request_update", (args,)).await
             } else {
                 client.query("http_request", (args,)).await
             }
-            .context("failed to send RPC request")?;
+            .map_err(anyhow::Error::from);
+
+            let http_response = match http_response {
+                Ok(response) => response,
+                Err(e) => {
+                    log::warn!("failed to send RPC request: {e}");
+                    return Err(e);
+                }
+            };
 
             let response = serde_json::from_slice(&http_response.body)
                 .context("failed to deserialize RPC request")?;

src/ethereum-json-rpc-client/src/http_outcall.rs

@@ -7,7 +7,6 @@ use ic_exports::ic_cdk::api::management_canister::http_request::{
     self, CanisterHttpRequestArgument, HttpHeader, HttpMethod, TransformContext,
 };
 use jsonrpc_core::Request;
-use reqwest::Url;
 
 use crate::Client;
 
@@ -56,12 +55,12 @@ impl Client for HttpOutcallClient {
         Box::pin(async move {
             log::trace!("CanisterClient - sending 'http_outcall'. url: {url}");
 
-            let real_url =
-                Url::parse(&url).map_err(|e| anyhow::format_err!("error parsing the url {e}"))?;
+            let parsed_url = url::Url::parse(&url)
+                .map_err(|e| anyhow::format_err!("failed to parse url `{url}`: {e}"))?;
 
-            let host = real_url
+            let host = parsed_url
                 .host_str()
-                .ok_or_else(|| anyhow::format_err!("empty host of url".to_string()))?;
+                .ok_or_else(|| anyhow::format_err!("no host in url `{parsed_url}`"))?;
 
             let headers = vec![
                 HttpHeader {

src/ethereum-json-rpc-client/src/lib.rs

@@ -17,6 +17,7 @@ pub mod reqwest;
 #[cfg(feature = "ic-canister-client")]
 pub mod canister_client;
 
+#[cfg(feature = "http-outcall")]
 pub mod http_outcall;
 
 const ETH_CHAIN_ID_METHOD: &str = "eth_chainId";
@@ -336,7 +337,8 @@ impl<C: Client> EthJsonRcpClient<C> {
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct EthGetLogsParams {
     /// Addresses of contracts to filter logs for.
-    pub address: Vec<H160>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub address: Option<Vec<H160>>,
 
     /// Start search logs from this block number.
     #[serde(rename = "fromBlock")]
@@ -347,7 +349,8 @@ pub struct EthGetLogsParams {
     pub to_block: BlockNumber,
 
     /// Filter logs by topics.
-    pub topics: Vec<H256>,
+    #[serde(skip_serializing_if = "Option::is_none")]
+    pub topics: Option<Vec<Vec<H256>>>,
 }
 
 pub trait Client: Clone + Send + Sync {
@@ -366,22 +369,28 @@ mod tests {
     #[test]
     fn test_eth_get_logs_params_serialization() {
         let get_logs_params = EthGetLogsParams {
-            address: vec!["0xb59f67a8bff5d8cd03f6ac17265c550ed8f33907"
+            address: Some(vec!["0xb59f67a8bff5d8cd03f6ac17265c550ed8f33907"
                 .parse()
-                .unwrap()],
+                .unwrap()]),
             from_block: BlockNumber::Number(42u64.into()),
             to_block: BlockNumber::Latest,
-            topics: vec![
-                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-                    .parse()
-                    .unwrap(),
-                "0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75"
-                    .parse()
-                    .unwrap(),
-                "0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078"
-                    .parse()
-                    .unwrap(),
-            ],
+            topics: Some(vec![
+                vec![
+                    "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+                        .parse()
+                        .unwrap(),
+                ],
+                vec![
+                    "0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75"
+                        .parse()
+                        .unwrap(),
+                ],
+                vec![
+                    "0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078"
+                        .parse()
+                        .unwrap(),
+                ],
+            ]),
         };
 
         let json = serde_json::to_string(&get_logs_params).unwrap();
@@ -391,9 +400,9 @@ mod tests {
             \"fromBlock\":\"0x2a\",\
             \"toBlock\":\"latest\",\
             \"topics\":[\
-                \"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef\",\
-                \"0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75\",\
-                \"0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078\"\
+                [\"0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef\"],\
+                [\"0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75\"],\
+                [\"0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078\"]\
         ]}";
         assert_eq!(json, expected_json);
     }

src/ethereum-json-rpc-client/tests/reqwest/mod.rs

@@ -105,22 +105,28 @@ async fn should_get_full_blocks_by_number() {
 #[tokio::test]
 async fn should_get_logs() {
     let params = EthGetLogsParams {
-        address: vec!["0xb59f67a8bff5d8cd03f6ac17265c550ed8f33907"
+        address: Some(vec!["0xb59f67a8bff5d8cd03f6ac17265c550ed8f33907"
             .parse()
-            .unwrap()],
+            .unwrap()]),
         from_block: "0x429d3b".parse().unwrap(),
         to_block: BlockNumber::Latest,
-        topics: vec![
-            "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
-                .parse()
-                .unwrap(),
-            "0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75"
-                .parse()
-                .unwrap(),
-            "0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078"
-                .parse()
-                .unwrap(),
-        ],
+        topics: Some(vec![
+            vec![
+                "0xddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef"
+                    .parse()
+                    .unwrap(),
+            ],
+            vec![
+                "0x00000000000000000000000000b46c2526e227482e2ebb8f4c69e4674d262e75"
+                    .parse()
+                    .unwrap(),
+            ],
+            vec![
+                "0x00000000000000000000000054a2d42a40f51259dedd1978f6c118a0f0eff078"
+                    .parse()
+                    .unwrap(),
+            ],
+        ]),
     };
 
     let result = reqwest_client().get_logs(params).await.unwrap();