merge main

packages/sdk/src/evm/core/classes/account.ts

@@ -27,9 +27,10 @@ import { AddressOrEns } from "../../schema";
 import { resolveAddress } from "../../common";
 import { Signer } from "ethers";
 
-export class SmartWallet<TContract extends IAccountCore>
-  implements DetectableFeature {
-  featureName = FEATURE_SMART_WALLET.name;
+export class Account<TContract extends IAccountCore>
+  implements DetectableFeature
+{
+  featureName = FEATURE_ACCOUNT.name;
   private contractWrapper: ContractWrapper<IAccountCore>;
 
   private emptyRole: string =

packages/wallets/src/evm/connectors/smart-wallet/index.ts

@@ -250,7 +250,28 @@ export class SmartWalletConnector extends Connector<SmartWalletConnectionArgs> {
     };
   }
 
-  set factoryAddress(value: string) {
-    this.factoryAddress = value;
+  private async getChainSlug(
+    chainOrRpc: ChainOrRpcUrl,
+    provider: ethers.providers.Provider,
+  ): Promise<string> {
+    if (typeof chainOrRpc === "object") {
+      return chainOrRpc.slug;
+    }
+    if (typeof chainOrRpc === "number") {
+      const chain = getChainByChainId(chainOrRpc);
+      return chain.slug;
+    }
+    if (typeof chainOrRpc === "string") {
+      if (chainOrRpc.startsWith("http") || chainOrRpc.startsWith("ws")) {
+        // if it's a url, try to get the chain id from the provider
+        const chainId = (await provider.getNetwork()).chainId;
+        const chain = getChainByChainId(chainId);
+        return chain.slug;
+      }
+      // otherwise its the network name
+      return chainOrRpc;
+    } else {
+      throw new Error(`Invalid network: ${chainOrRpc}`);
+    }
   }
 }

packages/wallets/src/evm/wallets/smart-wallet.ts

@@ -48,14 +48,7 @@ export class SmartWallet
 
     this.enableConnectApp = options?.enableConnectApp || false;
     this.#wcWallet = this.enableConnectApp
-      ? options?.wcVersion === "v1"
-        ? new WalletConnectV1Handler({
-          walletConnectWalletMetadata: options?.walletConnectWalletMetadata,
-          walletConenctV2ProjectId: options?.walletConenctV2ProjectId,
-          walletConnectV2RelayUrl: options?.walletConnectV2RelayUrl,
-          storage: options?.wcStorage || createLocalStorage("smart-wallet"),
-        })
-        : new WalletConnectV2Handler({
+      ? new WalletConnectV2Handler({
           walletConnectWalletMetadata: options?.walletConnectWalletMetadata,
           walletConenctV2ProjectId: options?.walletConenctV2ProjectId,
           walletConnectV2RelayUrl: options?.walletConnectV2RelayUrl,