feat: browser wallet

Cargo.toml

@@ -260,8 +260,8 @@ alloy-transport = { version = "1.0.42", default-features = false }
 alloy-transport-http = { version = "1.0.42", default-features = false }
 alloy-transport-ipc = { version = "1.0.42", default-features = false }
 alloy-transport-ws = { version = "1.0.42", default-features = false }
-alloy-hardforks = { version = "0.4.0", default-features = false }
-alloy-op-hardforks = { version = "0.4.0", default-features = false }
+alloy-hardforks = { version = "0.4.3", default-features = false }
+alloy-op-hardforks = { version = "0.4.3", default-features = false }
 
 ## alloy-core
 alloy-dyn-abi = "1.4.1"
@@ -288,10 +288,10 @@ op-alloy-flz = "0.13.1"
 ## revm
 revm = { version = "30.2.0", default-features = false }
 revm-inspectors = { version = "0.31.2", features = ["serde"] }
-op-revm = { version = "11.1.2", default-features = false }
+op-revm = { version = "11.3.0", default-features = false }
 ## alloy-evm
-alloy-evm = "0.22.3"
-alloy-op-evm = "0.22.3"
+alloy-evm = "0.22.6"
+alloy-op-evm = "0.22.6"
 
 ## cli
 anstream = "0.6"
@@ -344,7 +344,7 @@ mesc = "0.3"
 memchr = "2.7"
 num-format = "0.4"
 parking_lot = "0.12"
-proptest = "1.8.0"
+proptest = "1.9.0"
 rand = "0.9"
 rand_08 = { package = "rand", version = "0.8" }
 rand_chacha = "0.9.0"

crates/cast/src/cmd/send.rs

@@ -1,7 +1,5 @@
-use crate::{
-    Cast,
-    tx::{self, CastTxBuilder},
-};
+use std::{path::PathBuf, str::FromStr, time::Duration};
+
 use alloy_ens::NameOrAddress;
 use alloy_network::{AnyNetwork, EthereumWallet};
 use alloy_provider::{Provider, ProviderBuilder};
@@ -15,7 +13,12 @@ use foundry_cli::{
     utils,
     utils::LoadConfig,
 };
-use std::{path::PathBuf, str::FromStr, time::Duration};
+use foundry_wallets::WalletSigner;
+
+use crate::{
+    Cast,
+    tx::{self, CastTxBuilder},
+};
 
 /// CLI arguments for `cast send`.
 #[derive(Debug, Parser)]
@@ -158,7 +161,7 @@ impl SendTxArgs {
         // Default to sending via eth_sendTransaction if the --unlocked flag is passed.
         // This should be the only way this RPC method is used as it requires a local node
         // or remote RPC with unlocked accounts.
-        if unlocked {
+        if unlocked && !eth.wallet.browser {
             // only check current chain id if it was specified in the config
             if let Some(config_chain) = config.chain {
                 let current_chain_id = provider.get_chain_id().await?;
@@ -192,14 +195,33 @@ impl SendTxArgs {
 
             tx::validate_from_address(eth.wallet.from, from)?;
 
-            let (tx, _) = builder.build(&signer).await?;
+            // Browser wallets work differently as they sign and send the transaction in one step.
+            if eth.wallet.browser
+                && let WalletSigner::Browser(ref browser_signer) = signer
+            {
+                let (tx_request, _) = builder.build(from).await?;
+                let tx_hash = browser_signer.send_transaction_via_browser(tx_request.inner).await?;
+
+                if cast_async {
+                    sh_println!("{tx_hash:#x}")?;
+                } else {
+                    let receipt = Cast::new(&provider)
+                        .receipt(format!("{tx_hash:#x}"), None, confirmations, Some(timeout), false)
+                        .await?;
+                    sh_println!("{receipt}")?;
+                }
+
+                return Ok(());
+            }
+
+            let (tx_request, _) = builder.build(&signer).await?;
 
             let wallet = EthereumWallet::from(signer);
             let provider = ProviderBuilder::<_, _, AnyNetwork>::default()
                 .wallet(wallet)
                 .connect_provider(&provider);
 
-            cast_send(provider, tx, cast_async, confirmations, timeout).await
+            cast_send(provider, tx_request, cast_async, confirmations, timeout).await
         }
     }
 }

crates/cast/src/cmd/wallet/list.rs

@@ -4,7 +4,7 @@ use std::env;
 
 use foundry_common::{fs, sh_err, sh_println};
 use foundry_config::Config;
-use foundry_wallets::multi_wallet::MultiWalletOptsBuilder;
+use foundry_wallets::wallet_multi::MultiWalletOptsBuilder;
 
 /// CLI arguments for `cast wallet list`.
 #[derive(Clone, Debug, Parser)]

crates/cheatcodes/src/inspector.rs

@@ -46,7 +46,7 @@ use foundry_evm_core::{
 use foundry_evm_traces::{
     TracingInspector, TracingInspectorConfig, identifier::SignaturesIdentifier,
 };
-use foundry_wallets::multi_wallet::MultiWallet;
+use foundry_wallets::wallet_multi::MultiWallet;
 use itertools::Itertools;
 use proptest::test_runner::{RngAlgorithm, TestRng, TestRunner};
 use rand::Rng;

crates/cheatcodes/src/script.rs

@@ -7,7 +7,7 @@ use alloy_rpc_types::Authorization;
 use alloy_signer::SignerSync;
 use alloy_signer_local::PrivateKeySigner;
 use alloy_sol_types::SolValue;
-use foundry_wallets::{WalletSigner, multi_wallet::MultiWallet};
+use foundry_wallets::{WalletSigner, wallet_multi::MultiWallet};
 use parking_lot::Mutex;
 use revm::{
     bytecode::Bytecode,

crates/lint/Cargo.toml

@@ -1,4 +1,3 @@
-
 [package]
 name = "forge-lint"
 

crates/wallets/Cargo.toml

@@ -25,6 +25,15 @@ alloy-consensus.workspace = true
 alloy-sol-types.workspace = true
 alloy-dyn-abi.workspace = true
 
+# browser wallet
+alloy-rpc-types.workspace = true
+axum.workspace = true
+foundry-common.workspace = true
+serde_json.workspace = true
+tokio = { workspace = true, features = ["macros"] }
+uuid.workspace = true
+webbrowser = "1.0.6"
+
 # aws-kms
 alloy-signer-aws = { workspace = true, features = ["eip712"], optional = true }
 aws-config = { version = "1", default-features = true, optional = true }
@@ -39,11 +48,14 @@ eyre.workspace = true
 rpassword = "7"
 serde.workspace = true
 thiserror.workspace = true
+tower.workspace = true
+tower-http = { workspace = true, features = ["cors", "set-header"] }
 tracing.workspace = true
 eth-keystore = "0.5.0"
 
 [dev-dependencies]
 tokio = { workspace = true, features = ["macros"] }
+reqwest = { workspace = true, features = ["json"] }
 
 [features]
 aws-kms = ["dep:alloy-signer-aws", "dep:aws-config"]

crates/wallets/src/error.rs

@@ -10,6 +10,8 @@ use alloy_signer_aws::AwsSignerError;
 #[cfg(feature = "gcp-kms")]
 use alloy_signer_gcp::GcpSignerError;
 
+use crate::wallet_browser::error::BrowserWalletError;
+
 #[derive(Debug, thiserror::Error)]
 pub enum PrivateKeyError {
     #[error("Failed to create wallet from private key. Private key is invalid hex: {0}")]
@@ -37,6 +39,8 @@ pub enum WalletSignerError {
     #[cfg(feature = "gcp-kms")]
     Gcp(#[from] Box<GcpSignerError>),
     #[error(transparent)]
+    Browser(#[from] BrowserWalletError),
+    #[error(transparent)]
     Io(#[from] std::io::Error),
     #[error(transparent)]
     InvalidHex(#[from] FromHexError),
@@ -54,4 +58,8 @@ impl WalletSignerError {
     pub fn gcp_unsupported() -> Self {
         Self::UnsupportedSigner("Google Cloud KMS")
     }
+
+    pub fn browser_unsupported() -> Self {
+        Self::UnsupportedSigner("Browser Wallet")
+    }
 }

crates/wallets/src/lib.rs

@@ -5,20 +5,24 @@
 #![cfg_attr(not(test), warn(unused_crate_dependencies))]
 #![cfg_attr(docsrs, feature(doc_cfg))]
 
+#[macro_use]
+extern crate foundry_common;
+
 #[macro_use]
 extern crate tracing;
 
 pub mod error;
-pub mod multi_wallet;
-pub mod raw_wallet;
+pub mod opts;
+pub mod signer;
 pub mod utils;
-pub mod wallet;
-pub mod wallet_signer;
+pub mod wallet_browser;
+pub mod wallet_multi;
+pub mod wallet_raw;
 
-pub use multi_wallet::MultiWalletOpts;
-pub use raw_wallet::RawWalletOpts;
-pub use wallet::WalletOpts;
-pub use wallet_signer::{PendingSigner, WalletSigner};
+pub use opts::WalletOpts;
+pub use signer::{PendingSigner, WalletSigner};
+pub use wallet_multi::MultiWalletOpts;
+pub use wallet_raw::RawWalletOpts;
 
 #[cfg(feature = "aws-kms")]
 use aws_config as _;

crates/wallets/src/wallet.rs → crates/wallets/src/opts.rs

@@ -1,4 +1,4 @@
-use crate::{raw_wallet::RawWalletOpts, utils, wallet_signer::WalletSigner};
+use crate::{signer::WalletSigner, utils, wallet_raw::RawWalletOpts};
 use alloy_primitives::Address;
 use clap::Parser;
 use eyre::Result;
@@ -9,8 +9,9 @@ use serde::Serialize;
 /// 2. Ledger
 /// 3. Trezor
 /// 4. Keystore (via file path)
-/// 5. AWS KMS
-/// 6. Google Cloud KMS
+/// 5. Browser wallet
+/// 6. AWS KMS
+/// 7. Google Cloud KMS
 #[derive(Clone, Debug, Default, Serialize, Parser)]
 #[command(next_help_heading = "Wallet options", about = None, long_about = None)]
 pub struct WalletOpts {
@@ -91,6 +92,36 @@ pub struct WalletOpts {
     /// See: <https://cloud.google.com/kms/docs>
     #[arg(long, help_heading = "Wallet options - remote", hide = !cfg!(feature = "gcp-kms"))]
     pub gcp: bool,
+
+    /// Use a browser wallet.
+    #[arg(long, help_heading = "Wallet options - browser")]
+    pub browser: bool,
+
+    /// Port for the browser wallet server.
+    #[arg(
+        long,
+        help_heading = "Wallet options - browser",
+        value_name = "PORT",
+        default_value = "9545",
+        requires = "browser"
+    )]
+    pub browser_port: u16,
+
+    /// Whether to open the browser for wallet connection.
+    #[arg(
+        long,
+        help_heading = "Wallet options - browser",
+        default_value_t = false,
+        requires = "browser"
+    )]
+    pub browser_disable_open: bool,
+
+    /// Enable development mode for the browser wallet.
+    /// This relaxes certain security features for local development.
+    ///
+    /// **WARNING**: This should only be used in a development environment.
+    #[arg(long, help_heading = "Wallet options - browser", hide = true)]
+    pub browser_development: bool,
 }
 
 impl WalletOpts {
@@ -120,6 +151,13 @@ impl WalletOpts {
                 .parse()
                 .map_err(|_| eyre::eyre!("GCP_KEY_VERSION could not be parsed into u64"))?;
             WalletSigner::from_gcp(project_id, location, keyring, key_name, key_version).await?
+        } else if self.browser {
+            WalletSigner::from_browser(
+                self.browser_port,
+                !self.browser_disable_open,
+                self.browser_development,
+            )
+            .await?
         } else if let Some(raw_wallet) = self.raw.signer()? {
             raw_wallet
         } else if let Some(path) = utils::maybe_get_keystore_path(
@@ -154,6 +192,7 @@ flag to set your key via:
 --gcp
 --trezor
 --ledger
+--browser
 
 Alternatively, when using the `cast send` or `cast mktx` commands with a local node
 or RPC that has unlocked accounts, the --unlocked or --ethsign flags can be used,
@@ -222,6 +261,10 @@ mod tests {
             trezor: false,
             aws: false,
             gcp: false,
+            browser: false,
+            browser_port: 9545,
+            browser_development: false,
+            browser_disable_open: false,
         };
         match wallet.signer().await {
             Ok(_) => {

crates/wallets/src/wallet_signer.rs → crates/wallets/src/signer.rs

@@ -1,4 +1,4 @@
-use crate::error::WalletSignerError;
+use crate::{error::WalletSignerError, wallet_browser::signer::BrowserSigner};
 use alloy_consensus::SignableTransaction;
 use alloy_dyn_abi::TypedData;
 use alloy_network::TxSigner;
@@ -9,7 +9,7 @@ use alloy_signer_local::{MnemonicBuilder, PrivateKeySigner, coins_bip39::English
 use alloy_signer_trezor::{HDPath as TrezorHDPath, TrezorSigner};
 use alloy_sol_types::{Eip712Domain, SolStruct};
 use async_trait::async_trait;
-use std::{collections::HashSet, path::PathBuf};
+use std::{collections::HashSet, path::PathBuf, time::Duration};
 use tracing::warn;
 
 #[cfg(feature = "aws-kms")]
@@ -35,6 +35,8 @@ pub enum WalletSigner {
     Ledger(LedgerSigner),
     /// Wrapper around Trezor signer.
     Trezor(TrezorSigner),
+    /// Wrapper around browser wallet.
+    Browser(BrowserSigner),
     /// Wrapper around AWS KMS signer.
     #[cfg(feature = "aws-kms")]
     Aws(AwsSigner),
@@ -54,6 +56,18 @@ impl WalletSigner {
         Ok(Self::Trezor(trezor))
     }
 
+    pub async fn from_browser(
+        port: u16,
+        open_browser: bool,
+        browser_development: bool,
+    ) -> Result<Self> {
+        let browser_signer =
+            BrowserSigner::new(port, open_browser, Duration::from_secs(300), browser_development)
+                .await
+                .map_err(|e| WalletSignerError::Browser(e.into()))?;
+        Ok(Self::Browser(browser_signer))
+    }
+
     pub async fn from_aws(key_id: String) -> Result<Self> {
         #[cfg(feature = "aws-kms")]
         {
@@ -175,6 +189,9 @@ impl WalletSigner {
                     }
                 }
             }
+            Self::Browser(browser) => {
+                senders.insert(alloy_signer::Signer::address(browser));
+            }
             #[cfg(feature = "aws-kms")]
             Self::Aws(aws) => {
                 senders.insert(alloy_signer::Signer::address(aws));
@@ -215,6 +232,7 @@ macro_rules! delegate {
             Self::Local($inner) => $e,
             Self::Ledger($inner) => $e,
             Self::Trezor($inner) => $e,
+            Self::Browser($inner) => $e,
             #[cfg(feature = "aws-kms")]
             Self::Aws($inner) => $e,
             #[cfg(feature = "gcp-kms")]

crates/wallets/src/wallet_browser/app/assets/index.html

@@ -0,0 +1,14 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <link rel="icon" type="image/png" href="/logo.png" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Foundry</title>
+    <script type="module" crossorigin src="/main.js"></script>
+    <link rel="stylesheet" crossorigin href="/styles.css">
+  </head>
+  <body>
+    <div id="root"></div>
+  </body>
+</html>