feat: Remove wallet_getCapabilities (#110)

Closes #99 


Removed `get_capabilities` from the `WalletCapabilities` trait
In `e2e_tests` the capabilities is initialised manually with the
contract address being pulled in from `env` variables.


Related PR:
ithacaxyz/odyssey#104 (review)

---------

Author: 0xtinkle

bin/odyssey/src/main.rs

@@ -24,7 +24,6 @@
 //! - `min-trace-logs`: Disables all logs below `trace` level.
 
 use alloy_network::{Ethereum, EthereumWallet, NetworkWallet};
-use alloy_primitives::Address;
 use alloy_signer_local::PrivateKeySigner;
 use clap::Parser;
 use eyre::Context;
@@ -91,21 +90,12 @@ fn main() {
 
                     // register traverse wallet namespace
                     if let Some(wallet) = wallet {
-                        let raw_delegations = std::env::var("EXP1_WHITELIST")
-                            .wrap_err("No EXP0001 delegations specified")?;
-                        let valid_delegations: Vec<Address> = raw_delegations
-                            .split(',')
-                            .map(|addr| Address::parse_checksummed(addr, None))
-                            .collect::<Result<_, _>>()
-                            .wrap_err("No valid EXP0001 delegations specified")?;
-
                         ctx.modules.merge_configured(
                             TraverseWallet::new(
                                 ctx.provider().clone(),
                                 wallet,
                                 ctx.registry.eth_api().clone(),
                                 ctx.config().chain.chain().id(),
-                                valid_delegations,
                             )
                             .into_rpc(),
                         )?;

crates/e2e-tests/src/tests.rs

@@ -1,8 +1,8 @@
-use std::{collections::BTreeMap, sync::LazyLock};
+use std::{str::FromStr, sync::LazyLock};
 
 use alloy::{
     eips::eip7702::Authorization,
-    primitives::{b256, Address, B256, U256},
+    primitives::{b256, Address, B256},
     providers::{PendingTransactionBuilder, Provider, ProviderBuilder},
     signers::SignerSync,
 };
@@ -54,14 +54,11 @@ async fn test_wallet_api() -> Result<(), Box<dyn std::error::Error>> {
         "59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
     ))?;
 
-    let capabilities: BTreeMap<U256, BTreeMap<String, BTreeMap<String, Vec<Address>>>> =
-        provider.client().request_noparams("wallet_getCapabilities").await?;
-
-    let chain_id = U256::from(provider.get_chain_id().await?);
-
-    let delegation_address =
-        capabilities.get(&chain_id).unwrap().get("delegation").unwrap().get("addresses").unwrap()
-            [0];
+    let delegation_address = Address::from_str(
+        &std::env::var("DELEGATION_ADDRESS")
+            .unwrap_or_else(|_| "0x90f79bf6eb2c4f870365e785982e1f101e93b906".to_string()),
+    )
+    .unwrap();
 
     let auth = Authorization {
         chain_id: provider.get_chain_id().await?,
@@ -98,14 +95,11 @@ async fn test_new_wallet_api() -> Result<(), Box<dyn std::error::Error>> {
         "59c6995e998f97a5a0044966f0945389dc9e86dae88c7a8412f4603b6b78690d"
     ))?;
 
-    let capabilities: BTreeMap<U256, BTreeMap<String, BTreeMap<String, Vec<Address>>>> =
-        provider.client().request_noparams("wallet_getCapabilities").await?;
-
-    let chain_id = U256::from(provider.get_chain_id().await?);
-
-    let delegation_address =
-        capabilities.get(&chain_id).unwrap().get("delegation").unwrap().get("addresses").unwrap()
-            [0];
+    let delegation_address = Address::from_str(
+        &std::env::var("DELEGATION_ADDRESS")
+            .unwrap_or_else(|_| "0x90f79bf6eb2c4f870365e785982e1f101e93b906".to_string()),
+    )
+    .unwrap();
 
     let auth = Authorization {
         chain_id: provider.get_chain_id().await?,

crates/wallet/src/lib.rs

@@ -2,8 +2,6 @@
 //!
 //! Implementations of a custom `wallet_` namespace for Traverse experiment 1.
 //!
-//! - `wallet_getCapabilities` based on [EIP-5792][eip-5792], with the only capability being
-//!   `delegation`.
 //! - `traverse_sendTransaction` that can perform sequencer-sponsored [EIP-7702][eip-7702]
 //!   delegations and send other sequencer-sponsored transactions on behalf of EOAs with delegated
 //!   code.
@@ -23,7 +21,7 @@ use alloy_eips::BlockId;
 use alloy_network::{
     eip2718::Encodable2718, Ethereum, EthereumWallet, NetworkWallet, TransactionBuilder,
 };
-use alloy_primitives::{map::HashMap, Address, ChainId, TxHash, TxKind, U256, U64};
+use alloy_primitives::{Address, ChainId, TxHash, TxKind, U256};
 use alloy_rpc_types::TransactionRequest;
 use jsonrpsee::{
     core::{async_trait, RpcResult},
@@ -53,39 +51,10 @@ pub struct DelegationCapability {
     pub addresses: Vec<Address>,
 }
 
-/// Wallet capabilities for a specific chain.
-#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
-pub struct Capabilities {
-    /// The capability to delegate.
-    pub delegation: DelegationCapability,
-}
-
-/// A map of wallet capabilities per chain ID.
-// NOTE(onbjerg): We use `U64` to serialize the chain ID as a quantity. This can be changed back to `ChainId` with https://github.com/alloy-rs/alloy/issues/1502
-#[derive(Debug, Clone, Eq, PartialEq, Deserialize, Serialize)]
-pub struct WalletCapabilities(pub HashMap<U64, Capabilities>);
-
-impl WalletCapabilities {
-    /// Get the capabilities of the wallet API for the specified chain ID.
-    pub fn get(&self, chain_id: ChainId) -> Option<&Capabilities> {
-        self.0.get(&U64::from(chain_id))
-    }
-}
-
 /// Traverse `wallet_` RPC namespace.
 #[cfg_attr(not(test), rpc(server, namespace = "wallet"))]
 #[cfg_attr(test, rpc(server, client, namespace = "wallet"))]
 pub trait TraverseWalletApi {
-    /// Get the capabilities of the wallet.
-    ///
-    /// Currently the only capability is [`DelegationCapability`].
-    ///
-    /// See also [EIP-5792][eip-5792].
-    ///
-    /// [eip-5792]: https://eips.ethereum.org/EIPS/eip-5792
-    #[method(name = "getCapabilities")]
-    fn get_capabilities(&self) -> RpcResult<WalletCapabilities>;
-
     /// Send a sequencer-sponsored transaction.
     ///
     /// The transaction will only be processed if:
@@ -172,17 +141,12 @@ impl<Provider, Eth> TraverseWallet<Provider, Eth> {
         wallet: EthereumWallet,
         eth_api: Eth,
         chain_id: ChainId,
-        valid_designations: Vec<Address>,
     ) -> Self {
         let inner = TraverseWalletInner {
             provider,
             wallet,
             eth_api,
             chain_id,
-            capabilities: WalletCapabilities(HashMap::from_iter([(
-                U64::from(chain_id),
-                Capabilities { delegation: DelegationCapability { addresses: valid_designations } },
-            )])),
             permit: Default::default(),
             metrics: WalletMetrics::default(),
         };
@@ -200,11 +164,6 @@ where
     Provider: StateProviderFactory + Send + Sync + 'static,
     Eth: FullEthApi + Send + Sync + 'static,
 {
-    fn get_capabilities(&self) -> RpcResult<WalletCapabilities> {
-        trace!(target: "rpc::wallet", "Serving wallet_getCapabilities");
-        Ok(self.inner.capabilities.clone())
-    }
-
     async fn send_transaction(&self, mut request: TransactionRequest) -> RpcResult<TxHash> {
         trace!(target: "rpc::wallet", ?request, "Serving traverse_sendTransaction");
 
@@ -328,7 +287,6 @@ struct TraverseWalletInner<Provider, Eth> {
     eth_api: Eth,
     wallet: EthereumWallet,
     chain_id: ChainId,
-    capabilities: WalletCapabilities,
     /// Used to guard tx signing
     permit: Mutex<()>,
     /// Metrics for the `wallet_` RPC namespace.
@@ -366,52 +324,9 @@ struct WalletMetrics {
 
 #[cfg(test)]
 mod tests {
-    use crate::{
-        validate_tx_request, Capabilities, DelegationCapability, TraverseWalletError,
-        WalletCapabilities,
-    };
-    use alloy_primitives::{address, map::HashMap, Address, U256, U64};
+    use crate::{validate_tx_request, TraverseWalletError};
+    use alloy_primitives::{Address, U256};
     use alloy_rpc_types::TransactionRequest;
-
-    #[test]
-    fn ser() {
-        let caps = WalletCapabilities(HashMap::from_iter([(
-            U64::from(0x69420),
-            Capabilities {
-                delegation: DelegationCapability {
-                    addresses: vec![address!("90f79bf6eb2c4f870365e785982e1f101e93b906")],
-                },
-            },
-        )]));
-        assert_eq!(serde_json::to_string(&caps).unwrap(), "{\"0x69420\":{\"delegation\":{\"addresses\":[\"0x90f79bf6eb2c4f870365e785982e1f101e93b906\"]}}}");
-    }
-
-    #[test]
-    fn de() {
-        let caps: WalletCapabilities = serde_json::from_str(
-            r#"{
-                    "0x69420": {
-                        "delegation": {
-                            "addresses": ["0x90f79bf6eb2c4f870365e785982e1f101e93b906"]
-                        }
-                    }
-                }"#,
-        )
-        .expect("could not deser");
-
-        assert_eq!(
-            caps,
-            WalletCapabilities(HashMap::from_iter([(
-                U64::from(0x69420),
-                Capabilities {
-                    delegation: DelegationCapability {
-                        addresses: vec![address!("90f79bf6eb2c4f870365e785982e1f101e93b906")],
-                    },
-                },
-            )]))
-        );
-    }
-
     #[test]
     fn no_value_allowed() {
         assert_eq!(