feat(wallets): MultiWallet generic Network (#13648)

Author: mablr

crates/cast/src/cmd/send.rs

@@ -13,6 +13,7 @@ use foundry_cli::{
     opts::TransactionOpts,
     utils::{LoadConfig, get_provider},
 };
+use foundry_primitives::FoundryNetwork;
 
 use crate::tx::{self, CastTxBuilder, CastTxSender, SendTxOpts};
 
@@ -139,7 +140,7 @@ impl SendTxArgs {
         let is_tempo = builder.is_tempo();
 
         // Launch browser signer if `--browser` flag is set
-        let browser = send_tx.browser.run().await?;
+        let browser = send_tx.browser.run::<FoundryNetwork>().await?;
 
         // Tempo transactions with browser signer are not supported
         if is_tempo && browser.is_some() {
@@ -189,7 +190,7 @@ impl SendTxArgs {
             // Browser wallet work differently as it sign and send the transaction in one step.
             if let Some(browser) = browser {
                 let (tx_request, _) = builder.build(browser.address()).await?;
-                let tx_hash = browser.send_transaction_via_browser(tx_request.into_inner()).await?;
+                let tx_hash = browser.send_transaction_via_browser(tx_request).await?;
 
                 if send_tx.cast_async {
                     sh_println!("{tx_hash:#x}")?;

crates/wallets/src/wallet_browser/opts.rs

@@ -1,5 +1,6 @@
 use std::time::Duration;
 
+use alloy_network::Network;
 use clap::Parser;
 use eyre::Result;
 use serde::Serialize;
@@ -31,7 +32,7 @@ pub struct BrowserWalletOpts {
 }
 
 impl BrowserWalletOpts {
-    pub async fn run(&self) -> Result<Option<BrowserSigner>> {
+    pub async fn run<N: Network>(&self) -> Result<Option<BrowserSigner<N>>> {
         Ok(if self.browser {
             Some(
                 BrowserSigner::new(

crates/wallets/src/wallet_multi/mod.rs

@@ -4,6 +4,7 @@ use crate::{
     utils,
     wallet_browser::signer::BrowserSigner,
 };
+use alloy_network::{Ethereum, Network};
 use alloy_primitives::map::AddressHashMap;
 use alloy_signer::Signer;
 use clap::Parser;
@@ -14,22 +15,32 @@ use serde::Serialize;
 use std::path::PathBuf;
 
 /// Container for multiple wallets.
-#[derive(Debug, Default)]
-pub struct MultiWallet {
+#[derive(Debug)]
+pub struct MultiWallet<N: Network = Ethereum> {
     /// Vector of wallets that require an action to be unlocked.
     /// Those are lazily unlocked on the first access of the signers.
     pending_signers: Vec<PendingSigner>,
     /// Contains unlocked signers.
     signers: AddressHashMap<WalletSigner>,
     /// Browser signer
-    browser: Option<BrowserSigner>,
+    browser: Option<BrowserSigner<N>>,
 }
 
-impl MultiWallet {
+impl<N: Network> Default for MultiWallet<N> {
+    fn default() -> Self {
+        Self {
+            pending_signers: Default::default(),
+            signers: Default::default(),
+            browser: Default::default(),
+        }
+    }
+}
+
+impl<N: Network> MultiWallet<N> {
     pub fn new(
         pending_signers: Vec<PendingSigner>,
         signers: Vec<WalletSigner>,
-        browser: Option<BrowserSigner>,
+        browser: Option<BrowserSigner<N>>,
     ) -> Self {
         let signers = signers.into_iter().map(|signer| (signer.address(), signer)).collect();
         Self { pending_signers, signers, browser }
@@ -43,12 +54,16 @@ impl MultiWallet {
         Ok(())
     }
 
-    pub fn signers(&mut self) -> Result<(&AddressHashMap<WalletSigner>, Option<&BrowserSigner>)> {
+    pub fn signers(
+        &mut self,
+    ) -> Result<(&AddressHashMap<WalletSigner>, Option<&BrowserSigner<N>>)> {
         self.maybe_unlock_pending()?;
         Ok((&self.signers, self.browser.as_ref()))
     }
 
-    pub fn into_signers(mut self) -> Result<(AddressHashMap<WalletSigner>, Option<BrowserSigner>)> {
+    pub fn into_signers(
+        mut self,
+    ) -> Result<(AddressHashMap<WalletSigner>, Option<BrowserSigner<N>>)> {
         self.maybe_unlock_pending()?;
         Ok((self.signers, self.browser))
     }
@@ -245,7 +260,7 @@ pub struct MultiWalletOpts {
 
 impl MultiWalletOpts {
     /// Returns [MultiWallet] container configured with provided options.
-    pub async fn get_multi_wallet(&self) -> Result<MultiWallet> {
+    pub async fn get_multi_wallet<N: Network>(&self) -> Result<MultiWallet<N>> {
         let mut pending = Vec::new();
         let mut signers: Vec<WalletSigner> = Vec::new();
         let browser = self.browser_signer().await?;
@@ -502,7 +517,7 @@ impl MultiWalletOpts {
     }
 
     /// Launches and returns the Browser signer if `--browser` flag is set
-    pub async fn browser_signer(&self) -> Result<Option<BrowserSigner>> {
+    pub async fn browser_signer<N: Network>(&self) -> Result<Option<BrowserSigner<N>>> {
         self.browser.run().await
     }
 }