refactor: config args

graphops · Jan 11, 2024 · 779ce5e · 779ce5e
1 parent c1c152c
commit 779ce5e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/subfile-exchange/src/config.rs b/subfile-exchange/src/config.rs
@@ -136,13 +136,6 @@ pub struct DownloaderArgs {
         help = "Blockchain provider endpoint"
     )]
     pub provider: String,
-    #[clap(
-        long,
-        value_name = "chain_id",
-        env = "CHAIN_ID",
-        help = "Protocol network's Chain ID"
-    )]
-    pub chain_id: u64,
     #[clap(
         long,
         value_name = "verifier",

diff --git a/subfile-exchange/src/subfile_client/mod.rs b/subfile-exchange/src/subfile_client/mod.rs
@@ -1,6 +1,7 @@
 use alloy_primitives::{Address, U256};
 use bytes::Bytes;
 
+use ethers::providers::{Http, Middleware, Provider};
 use http::header::{AUTHORIZATION, CONTENT_RANGE};
 use rand::seq::SliceRandom;
 use reqwest::Client;
@@ -57,13 +58,21 @@ impl SubfileDownloader {
         .expect("Read subfile");
 
         let wallet = build_wallet(&args.mnemonic).expect("Mnemonic build wallet");
-        //TODO: Factor away from client, Transactions could be a separate entity
         let signing_key = wallet.signer().to_bytes();
         let secp256k1_private_key =
             SecretKey::from_slice(&signing_key).expect("Private key from wallet");
+        let provider = Provider::<Http>::try_from(&args.provider).expect("Connect to the provider");
+        //TODO: migrate ethers type to alloy
+        let chain_id = U256::from(
+            provider
+                .get_chainid()
+                .await
+                .expect("Get chain id from provider")
+                .as_u128(),
+        );
         let receipt_signer = ReceiptSigner::new(
             secp256k1_private_key,
-            U256::from(args.chain_id),
+            chain_id,
             Address::from_str(&args.verifier).expect("Parse verifier"),
         )
         .await;

diff --git a/subfile-exchange/tests/file_transfer.rs b/subfile-exchange/tests/file_transfer.rs
@@ -45,7 +45,6 @@ mod tests {
                 "http://localhost:5677".to_string(),
             ]
             .to_vec(),
-            chain_id: 421614,
             verifier: String::from("0xfC24cE7a4428A6B89B52645243662A02BA734ECF"),
             mnemonic: String::from(
                 "sheriff obscure trick beauty army fat wink legal flee leader section suit",