Feat/add rpc header arg

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

@@ -235,6 +235,7 @@ impl TestEnv {
         config::Args {
             network: network::Args {
                 rpc_url: Some(self.rpc_url.clone()),
+                rpc_headers: [].to_vec(),
                 network_passphrase: Some(LOCAL_NETWORK_PASSPHRASE.to_string()),
                 network: None,
             },

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

@@ -16,7 +16,7 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, network},
-    rpc::{Client, Error as SorobanRpcError},
+    rpc::Error as SorobanRpcError,
     tx::builder,
     utils::contract_id_hash_from_asset,
 };
@@ -88,7 +88,7 @@ impl NetworkRunnable for Cmd {
         let asset = &self.asset;
 
         let network = config.get_network()?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

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

@@ -16,8 +16,7 @@ use crate::{
     assembled::simulate_and_assemble_transaction,
     commands::{contract::install, HEADING_RPC},
     config::{self, data, locator, network},
-    rpc::{self, Client},
-    utils, wasm,
+    rpc, utils, wasm,
 };
 use crate::{
     commands::{
@@ -208,7 +207,7 @@ impl NetworkRunnable for Cmd {
             None => rand::thread_rng().gen::<[u8; 32]>(),
         };
 
-        let client = Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

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

@@ -16,9 +16,7 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, locator, network},
-    key,
-    rpc::{self, Client},
-    wasm, Pwd,
+    key, rpc, wasm, Pwd,
 };
 
 const MAX_LEDGERS_TO_EXTEND: u32 = 535_679;
@@ -132,7 +130,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 = network.rpc_client()?;
         let source_account = 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,13 @@ use std::path::PathBuf;
 
 use crate::xdr;
 use clap::arg;
-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},
+    utils::rpc::get_remote_wasm_from_hash,
+    wasm::{self, Error::ContractIsStellarAsset},
+};
 
 #[derive(Debug, clap::Args, Clone, Default)]
 #[command(group(
@@ -71,7 +71,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 = network.rpc_client()?;
+
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

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

@@ -10,15 +10,20 @@ use crate::xdr::{
 use clap::{command, Parser};
 
 use super::restore;
-use crate::assembled::simulate_and_assemble_transaction;
-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::tx::builder::{self, TxExt};
-use crate::{utils, wasm};
+use crate::{
+    assembled::simulate_and_assemble_transaction,
+    commands::{
+        global,
+        txn_result::{TxnEnvelopeResult, TxnResult},
+        NetworkRunnable,
+    },
+    config::{self, data, network},
+    key,
+    print::Print,
+    rpc,
+    tx::builder::{self, TxExt},
+    utils, wasm,
+};
 
 const CONTRACT_META_SDK_KEY: &str = "rssdkver";
 const PUBLIC_NETWORK_PASSPHRASE: &str = "Public Global Stellar Network ; September 2015";
@@ -103,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 = network.rpc_client()?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

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

@@ -7,29 +7,30 @@ use std::{fmt::Debug, fs, io};
 
 use clap::{arg, command, Parser, ValueEnum};
 
-use crate::xdr::{
-    self, AccountEntry, AccountEntryExt, AccountId, ContractEvent, ContractEventType,
-    DiagnosticEvent, HostFunction, InvokeContractArgs, InvokeHostFunctionOp, LedgerEntryData,
-    Limits, Memo, MuxedAccount, Operation, OperationBody, Preconditions, PublicKey, ScSpecEntry,
-    SequenceNumber, String32, StringM, Thresholds, Transaction, TransactionExt, Uint256, VecM,
-    WriteXdr,
-};
-
 use soroban_rpc::{SimulateHostFunctionResult, SimulateTransactionResponse};
 use soroban_spec::read::FromWasmError;
 
 use super::super::events;
 use super::arg_parsing;
-use crate::assembled::simulate_and_assemble_transaction;
-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,
+    assembled::simulate_and_assemble_transaction,
+    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,
+    xdr::{
+        self, AccountEntry, AccountEntryExt, AccountId, ContractEvent, ContractEventType,
+        DiagnosticEvent, HostFunction, InvokeContractArgs, InvokeHostFunctionOp, LedgerEntryData,
+        Limits, Memo, MuxedAccount, Operation, OperationBody, Preconditions, PublicKey,
+        ScSpecEntry, SequenceNumber, String32, StringM, Thresholds, Transaction, TransactionExt,
+        Uint256, VecM, WriteXdr,
+    },
+    Pwd,
 };
 use soroban_spec_tools::contract;
 
@@ -203,7 +204,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 = network.rpc_client()?;
         let account_details = if self.is_view {
             default_account_entry()
         } else {

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

@@ -13,7 +13,7 @@ use crate::{
     commands::{global, NetworkRunnable},
     config::{self, locator},
     key,
-    rpc::{self, Client, FullLedgerEntries, FullLedgerEntry},
+    rpc::{self, FullLedgerEntries, FullLedgerEntry},
 };
 
 #[derive(Parser, Debug, Clone)]
@@ -181,7 +181,7 @@ impl NetworkRunnable for Cmd {
         let network = self.config.network.get(&locator)?;
 
         tracing::trace!(?network);
-        let client = Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         let keys = self.key.parse_keys(&locator, &network)?;
         Ok(client.get_full_ledger_entries(&keys).await?)
     }

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

@@ -17,9 +17,7 @@ use crate::{
         NetworkRunnable,
     },
     config::{self, data, locator, network},
-    key,
-    rpc::{self, Client},
-    wasm, Pwd,
+    key, rpc, wasm, Pwd,
 };
 
 #[derive(Parser, Debug, Clone)]
@@ -134,7 +132,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 = network.rpc_client()?;
         let source_account = config.source_account()?;
 
         // Get the account sequence number

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

@@ -4,8 +4,10 @@ use std::io;
 use crate::xdr::{self, Limits, ReadXdr};
 
 use super::{global, NetworkRunnable};
-use crate::config::{self, locator, network};
-use crate::rpc;
+use crate::{
+    config::{self, locator, network},
+    rpc,
+};
 
 #[derive(Parser, Debug, Clone)]
 #[group(skip)]
@@ -207,7 +209,7 @@ impl NetworkRunnable for Cmd {
             self.network.get(&self.locator)
         }?;
 
-        let client = rpc::Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         client
             .verify_network_passphrase(Some(&network.network_passphrase))
             .await?;

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

@@ -1,8 +1,10 @@
 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},
+};
 
 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -52,7 +54,7 @@ impl NetworkRunnable for Cmd {
         } else {
             self.network.get(&self.locator)?
         };
-        let client = crate::rpc::Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         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

@@ -16,6 +16,8 @@ pub enum Error {
     Rpc(#[from] crate::rpc::Error),
     #[error(transparent)]
     Xdr(#[from] xdr::Error),
+    #[error(transparent)]
+    Network(#[from] config::network::Error),
 }
 
 /// Command to simulate a transaction envelope via rpc
@@ -50,7 +52,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 = network.rpc_client()?;
         let tx = super::xdr::unwrap_envelope_v1(super::xdr::tx_envelope_from_stdin()?)?;
         let tx = simulate_and_assemble_transaction(&client, &tx).await?;
         Ok(tx)

cmd/soroban-cli/src/config/mod.rs

@@ -2,8 +2,6 @@ use address::Address;
 use clap::{arg, command};
 use serde::{Deserialize, Serialize};
 
-use soroban_rpc::Client;
-
 use crate::{
     print::Print,
     signer::{self, LocalKey, Signer, SignerKind},
@@ -98,7 +96,7 @@ impl Args {
     ) -> Result<Option<Transaction>, Error> {
         let network = self.get_network()?;
         let source_key = self.key_pair()?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         let latest_ledger = client.get_latest_ledger().await?.sequence;
         let seq_num = latest_ledger + 60; // ~ 5 min
         Ok(signer::sign_soroban_authorizations(
@@ -116,7 +114,7 @@ impl Args {
 
     pub async fn next_sequence_number(&self, account_str: &str) -> Result<SequenceNumber, Error> {
         let network = self.get_network()?;
-        let client = Client::new(&network.rpc_url)?;
+        let client = network.rpc_client()?;
         Ok((client.get_account(account_str).await?.seq_num.0 + 1).into())
     }
 }