Feat/add rpc header arg

cmd/crates/soroban-test/src/lib.rs

@@ -224,6 +224,7 @@ impl TestEnv {
         config::Args {
             network: network::Args {
                 rpc_url: Some(self.rpc_url.clone()),
+                rpc_header: None,
                 network_passphrase: Some(LOCAL_NETWORK_PASSPHRASE.to_string()),
                 network: None,
             },

cmd/soroban-cli/src/commands/contract/deploy/asset.rs

@@ -18,7 +18,8 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, network},
-    rpc::{Client, Error as SorobanRpcError},
+    rpc::Error as SorobanRpcError,
+    rpc_client::{Error as RpcClientError, RpcClient},
     utils::{contract_id_hash_from_asset, parsing::parse_asset},
 };
 
@@ -44,6 +45,8 @@ pub enum Error {
     Data(#[from] data::Error),
     #[error(transparent)]
     Network(#[from] network::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl From<Infallible> for Error {
@@ -93,7 +96,7 @@ impl NetworkRunnable for Cmd {
         let asset = parse_asset(&self.asset)?;
 
         let network = config.get_network()?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

cmd/soroban-cli/src/commands/contract/deploy/wasm.rs

@@ -18,7 +18,8 @@ use soroban_env_host::{
 use crate::{
     commands::{contract::install, HEADING_RPC},
     config::{self, data, locator, network},
-    rpc::{self, Client},
+    rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
     utils, wasm,
 };
 use crate::{
@@ -115,6 +116,8 @@ pub enum Error {
     InvalidAliasFormat { alias: String },
     #[error(transparent)]
     Locator(#[from] locator::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl Cmd {
@@ -208,7 +211,7 @@ impl NetworkRunnable for Cmd {
             None => rand::thread_rng().gen::<[u8; 32]>(),
         };
 
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

cmd/soroban-cli/src/commands/contract/extend.rs

@@ -15,8 +15,8 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, locator, network},
-    key,
-    rpc::{self, Client},
+    key, rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
     wasm, Pwd,
 };
 
@@ -86,6 +86,8 @@ pub enum Error {
     Network(#[from] network::Error),
     #[error(transparent)]
     Locator(#[from] locator::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl Cmd {
@@ -131,7 +133,7 @@ impl NetworkRunnable for Cmd {
         let network = config.get_network()?;
         tracing::trace!(?network);
         let keys = self.key.parse_keys(&config.locator, &network)?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let key = config.source_account()?;
         let extend_to = self.ledgers_to_extend();
 

cmd/soroban-cli/src/commands/contract/fetch.rs

@@ -7,12 +7,14 @@ use std::{fmt::Debug, fs, io};
 
 use clap::{arg, command, Parser};
 
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{
-    self, locator,
-    network::{self, Network},
+use crate::{
+    commands::{global, NetworkRunnable},
+    config::{
+        self, locator,
+        network::{self, Network},
+    },
+    wasm, Pwd,
 };
-use crate::{wasm, Pwd};
 
 #[derive(Parser, Debug, Default, Clone)]
 #[allow(clippy::struct_excessive_bools)]

cmd/soroban-cli/src/commands/contract/info/shared.rs

@@ -2,13 +2,14 @@ use std::path::PathBuf;
 
 use clap::arg;
 use soroban_env_host::xdr;
-use soroban_rpc::Client;
 
-use crate::commands::contract::info::shared::Error::InvalidWasmHash;
-use crate::config::{locator, network};
-use crate::utils::rpc::get_remote_wasm_from_hash;
-use crate::wasm;
-use crate::wasm::Error::ContractIsStellarAsset;
+use crate::{
+    commands::contract::info::shared::Error::InvalidWasmHash,
+    config::{locator, network},
+    rpc_client::{Error as RpcClientError, RpcClient},
+    utils::rpc::get_remote_wasm_from_hash,
+    wasm::{self, Error::ContractIsStellarAsset},
+};
 
 #[derive(Debug, clap::Args, Clone, Default)]
 #[command(group(
@@ -56,6 +57,8 @@ pub enum Error {
     InvalidWasmHash(String),
     #[error(transparent)]
     Rpc(#[from] soroban_rpc::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
@@ -71,7 +74,8 @@ pub async fn fetch_wasm(args: &Args) -> Result<Option<Vec<u8>>, Error> {
 
         let hash = xdr::Hash(hash);
 
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
+
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

cmd/soroban-cli/src/commands/contract/install.rs

@@ -11,13 +11,19 @@ use soroban_env_host::xdr::{
 };
 
 use super::restore;
-use crate::commands::txn_result::{TxnEnvelopeResult, TxnResult};
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{self, data, network};
-use crate::key;
-use crate::print::Print;
-use crate::rpc::{self, Client};
-use crate::{utils, wasm};
+use crate::{
+    commands::{
+        global,
+        txn_result::{TxnEnvelopeResult, TxnResult},
+        NetworkRunnable,
+    },
+    config::{self, data, network},
+    key,
+    print::Print,
+    rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+    utils, wasm,
+};
 
 const CONTRACT_META_SDK_KEY: &str = "rssdkver";
 const PUBLIC_NETWORK_PASSPHRASE: &str = "Public Global Stellar Network ; September 2015";
@@ -70,6 +76,8 @@ pub enum Error {
     Network(#[from] network::Error),
     #[error(transparent)]
     Data(#[from] data::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl Cmd {
@@ -100,7 +108,7 @@ impl NetworkRunnable for Cmd {
         let config = config.unwrap_or(&self.config);
         let contract = self.wasm.read()?;
         let network = config.get_network()?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

cmd/soroban-cli/src/commands/contract/invoke.rs

@@ -23,15 +23,18 @@ use soroban_spec::read::FromWasmError;
 
 use super::super::events;
 use super::arg_parsing;
-use crate::commands::contract::arg_parsing::{build_host_function_parameters, output_to_string};
-use crate::commands::txn_result::{TxnEnvelopeResult, TxnResult};
-use crate::commands::NetworkRunnable;
-use crate::get_spec::{self, get_remote_contract_spec};
-use crate::print;
 use crate::{
-    commands::global,
+    commands::{
+        contract::arg_parsing::{build_host_function_parameters, output_to_string},
+        global,
+        txn_result::{TxnEnvelopeResult, TxnResult},
+        NetworkRunnable,
+    },
     config::{self, data, locator, network},
-    rpc, Pwd,
+    get_spec::{self, get_remote_contract_spec},
+    print, rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+    Pwd,
 };
 use soroban_spec_tools::contract;
 
@@ -128,6 +131,8 @@ pub enum Error {
     GetSpecError(#[from] get_spec::Error),
     #[error(transparent)]
     ArgParsing(#[from] arg_parsing::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl From<Infallible> for Error {
@@ -209,7 +214,7 @@ impl NetworkRunnable for Cmd {
             // For testing wasm arg parsing
             let _ = build_host_function_parameters(&contract_id, &self.slop, spec_entries, config)?;
         }
-        let client = rpc::Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let account_details = if self.is_view {
             default_account_entry()
         } else {

cmd/soroban-cli/src/commands/contract/read.rs

@@ -16,7 +16,8 @@ use crate::{
     commands::{global, NetworkRunnable},
     config::{self, locator},
     key,
-    rpc::{self, Client, FullLedgerEntries, FullLedgerEntry},
+    rpc::{self, FullLedgerEntries, FullLedgerEntry},
+    rpc_client::{Error as RpcClientError, RpcClient},
 };
 
 #[derive(Parser, Debug, Clone)]
@@ -89,6 +90,8 @@ pub enum Error {
     OnlyDataAllowed,
     #[error(transparent)]
     Locator(#[from] locator::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl Cmd {
@@ -185,7 +188,7 @@ impl NetworkRunnable for Cmd {
         let config = config.unwrap_or(&self.config);
         let network = config.get_network()?;
         tracing::trace!(?network);
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let keys = self.key.parse_keys(&config.locator, &network)?;
         Ok(client.get_full_ledger_entries(&keys).await?)
     }

cmd/soroban-cli/src/commands/contract/restore.rs

@@ -17,8 +17,8 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, locator, network},
-    key,
-    rpc::{self, Client},
+    key, rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
     wasm, Pwd,
 };
 
@@ -89,6 +89,8 @@ pub enum Error {
     Data(#[from] data::Error),
     #[error(transparent)]
     Network(#[from] network::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 impl Cmd {
@@ -134,7 +136,7 @@ impl NetworkRunnable for Cmd {
         let network = config.get_network()?;
         tracing::trace!(?network);
         let entry_keys = self.key.parse_keys(&config.locator, &network)?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let key = config.source_account()?;
 
         // Get the account sequence number

cmd/soroban-cli/src/commands/events.rs

@@ -4,8 +4,11 @@ use std::io;
 use soroban_env_host::xdr::{self, Limits, ReadXdr};
 
 use super::{global, NetworkRunnable};
-use crate::config::{self, locator, network};
-use crate::rpc;
+use crate::{
+    config::{self, locator, network},
+    rpc,
+    rpc_client::{Error as RpcClientError, RpcClient},
+};
 
 #[derive(Parser, Debug, Clone)]
 #[group(skip)]
@@ -119,6 +122,8 @@ pub enum Error {
     Locator(#[from] locator::Error),
     #[error(transparent)]
     Config(#[from] config::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 #[derive(Clone, Copy, Debug, Eq, Hash, PartialEq, clap::ValueEnum)]
@@ -207,7 +212,7 @@ impl NetworkRunnable for Cmd {
             self.network.get(&self.locator)
         }?;
 
-        let client = rpc::Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

cmd/soroban-cli/src/commands/tx/send.rs

@@ -1,8 +1,11 @@
 use async_trait::async_trait;
 use soroban_rpc::GetTransactionResponse;
 
-use crate::commands::{global, NetworkRunnable};
-use crate::config::{self, locator, network};
+use crate::{
+    commands::{global, NetworkRunnable},
+    config::{self, locator, network},
+    rpc_client::{Error as RpcClientError, RpcClient},
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -16,6 +19,8 @@ pub enum Error {
     Rpc(#[from] crate::rpc::Error),
     #[error(transparent)]
     SerdeJson(#[from] serde_json::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 #[derive(Debug, clap::Parser, Clone)]
@@ -52,7 +57,7 @@ impl NetworkRunnable for Cmd {
         } else {
             self.network.get(&self.locator)?
         };
-        let client = crate::rpc::Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let tx_env = super::xdr::tx_envelope_from_stdin()?;
         Ok(client.send_transaction_polling(&tx_env).await?)
     }

cmd/soroban-cli/src/commands/tx/simulate.rs

@@ -3,6 +3,7 @@ use async_trait::async_trait;
 use soroban_rpc::Assembled;
 
 use crate::commands::{config, global, NetworkRunnable};
+use crate::rpc_client::{Error as RpcClientError, RpcClient};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -14,6 +15,8 @@ pub enum Error {
     Rpc(#[from] crate::rpc::Error),
     #[error(transparent)]
     Xdr(#[from] xdr::Error),
+    #[error(transparent)]
+    RpcClient(#[from] RpcClientError),
 }
 
 /// Command to simulate a transaction envelope via rpc
@@ -48,7 +51,7 @@ impl NetworkRunnable for Cmd {
     ) -> Result<Self::Result, Self::Error> {
         let config = config.unwrap_or(&self.config);
         let network = config.get_network()?;
-        let client = crate::rpc::Client::new(&network.rpc_url)?;
+        let client = RpcClient::new(network.clone())?;
         let tx = super::xdr::unwrap_envelope_v1(super::xdr::tx_envelope_from_stdin()?)?;
         Ok(client.simulate_and_assemble_transaction(&tx).await?)
     }