fix: use erc6492 lib and remove dedicated ERC-1271 verification logic

.github/workflows/ci.yaml

@@ -54,10 +54,7 @@ jobs:
           profile: default
           override: true
 
-      - name: Install Foundry
-        uses: foundry-rs/foundry-toolchain@v1
-
-      - uses: Swatinem/rust-cache@v2
+      # - uses: Swatinem/rust-cache@v2
 
       - uses: taiki-e/install-action@v1
         with:

blockchain_api/Cargo.toml

@@ -5,6 +5,9 @@ edition = "2021"
 license = "Apache-2.0"
 
 [dependencies]
+alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7" }
+alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7" }
+alloy-rpc-client = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7" }
 relay_rpc = { path = "../relay_rpc", features = ["cacao"] }
 reqwest = { version = "0.12.2", features = ["json"] }
 serde = "1.0"

blockchain_api/src/lib.rs

@@ -1,8 +1,16 @@
 pub use reqwest::Error;
 use {
-    relay_rpc::{auth::cacao::signature::get_rpc_url::GetRpcUrl, domain::ProjectId},
+    alloy_provider::ReqwestProvider,
+    alloy_rpc_client::RpcClient,
+    alloy_transport_http::Http,
+    relay_rpc::{auth::cacao::signature::get_provider::GetProvider, domain::ProjectId},
     serde::Deserialize,
-    std::{collections::HashSet, convert::Infallible, sync::Arc, time::Duration},
+    std::{
+        collections::{HashMap, HashSet},
+        convert::Infallible,
+        sync::Arc,
+        time::Duration,
+    },
     tokio::{sync::RwLock, task::JoinHandle},
     tracing::error,
     url::Url,
@@ -26,6 +34,8 @@ pub struct BlockchainApiProvider {
     blockchain_api_rpc_endpoint: Url,
     supported_chains: Arc<RwLock<HashSet<String>>>,
     refresh_job: Arc<JoinHandle<Infallible>>,
+    http_client: reqwest::Client,
+    provider_cache: Arc<RwLock<HashMap<String, ReqwestProvider>>>,
 }
 
 impl Drop for BlockchainApiProvider {
@@ -86,6 +96,8 @@ impl BlockchainApiProvider {
             blockchain_api_rpc_endpoint,
             supported_chains,
             refresh_job: Arc::new(refresh_job),
+            http_client: reqwest::Client::new(),
+            provider_cache: Arc::new(RwLock::new(HashMap::new())),
         })
     }
 }
@@ -98,19 +110,36 @@ fn build_rpc_url(blockchain_api_rpc_endpoint: Url, chain_id: &str, project_id: &
     url
 }
 
-impl GetRpcUrl for BlockchainApiProvider {
-    async fn get_rpc_url(&self, chain_id: String) -> Option<Url> {
-        self.supported_chains
-            .read()
-            .await
-            .contains(&chain_id)
-            .then(|| {
-                build_rpc_url(
-                    self.blockchain_api_rpc_endpoint.clone(),
-                    &chain_id,
-                    self.project_id.as_ref(),
-                )
-            })
+impl GetProvider for BlockchainApiProvider {
+    type Provider = ReqwestProvider;
+    type Transport = alloy_transport_http::Http<reqwest::Client>;
+
+    async fn get_provider(&self, chain_id: String) -> Option<Self::Provider> {
+        if self.supported_chains.read().await.contains(&chain_id) {
+            Some(
+                if let Some(provider) = self.provider_cache.read().await.get(&chain_id) {
+                    provider.clone()
+                } else {
+                    let url = build_rpc_url(
+                        self.blockchain_api_rpc_endpoint.clone(),
+                        &chain_id,
+                        self.project_id.as_ref(),
+                    );
+                    let provider = ReqwestProvider::new({
+                        let http = Http::with_client(self.http_client.clone(), url);
+                        let is_local = http.guess_local();
+                        RpcClient::new(http, is_local)
+                    });
+                    self.provider_cache
+                        .write()
+                        .await
+                        .insert(chain_id.clone(), provider.clone());
+                    provider
+                },
+            )
+        } else {
+            None
+        }
     }
 }
 

relay_client/src/websocket/stream.rs

@@ -141,7 +141,7 @@ impl ClientStream {
 
     /// Closes the connection.
     pub async fn close(&mut self, frame: Option<CloseFrame<'static>>) -> Result<(), ClientError> {
-        self.close_frame = frame.clone();
+        self.close_frame.clone_from(&frame);
         self.socket
             .close(frame)
             .await
@@ -220,7 +220,7 @@ impl ClientStream {
                 }
 
                 Message::Close(frame) => {
-                    self.close_frame = frame.clone();
+                    self.close_frame.clone_from(frame);
                     Some(StreamEvent::ConnectionClosed(frame.clone()))
                 }
 

relay_rpc/Cargo.toml

@@ -6,18 +6,10 @@ license = "Apache-2.0"
 
 [features]
 cacao = [
-    "dep:k256",
-    "dep:sha3",
+    "dep:erc6492",
     "dep:alloy-provider",
     "dep:alloy-transport",
-    "dep:alloy-transport-http",
-    "dep:alloy-rpc-types",
-    "dep:alloy-json-rpc",
-    "dep:alloy-json-abi",
-    "dep:alloy-sol-types",
     "dep:alloy-primitives",
-    "dep:alloy-node-bindings",
-    "dep:alloy-contract"
 ]
 
 [dependencies]
@@ -42,28 +34,19 @@ chrono = { version = "0.4", default-features = false, features = [
 regex = "1.7"
 once_cell = "1.16"
 jsonwebtoken = "8.1"
-k256 = { version = "0.13", optional = true }
-sha3 = { version = "0.10", optional = true }
 sha2 = { version = "0.10.6" }
 url = "2"
 alloy-provider = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
 alloy-transport = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-rpc-types = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-json-rpc = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-node-bindings = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-contract = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7", optional = true }
-alloy-json-abi = { version = "0.7.0", optional = true }
-alloy-sol-types = { version = "0.7.0", optional = true }
 alloy-primitives = { version = "0.7.0", optional = true }
+erc6492 = { git = "https://github.com/WalletConnect/erc6492.git", optional = true }
 strum = { version = "0.26", features = ["strum_macros", "derive"] }
 
 [dev-dependencies]
+k256 = "0.13"
 tokio = { version = "1.35.1", features = ["test-util", "macros"] }
-
-[build-dependencies]
-serde_json = "1.0"
-hex = "0.4.3"
+alloy-transport-http = { git = "https://github.com/alloy-rs/alloy.git", rev = "d68a6b7" }
+reqwest = "0.12.4"
 
 [lints.clippy]
 indexing_slicing = "deny"