only return ethereum wallet accounts

packages/eip-1193-provider/src/index.ts

@@ -116,9 +116,19 @@ export const createEIP1193Provider = async (
             organizationId,
             walletId,
           });
-          walletAccounts.accounts.map(({ address }: { address: string }) => {
-            accounts.add(address as Address);
-          });
+          walletAccounts.accounts.map(
+            ({
+              address,
+              addressFormat,
+            }: {
+              address: string;
+              addressFormat: string;
+            }) => {
+              if (addressFormat === "ADDRESS_FORMAT_ETHEREUM") {
+                accounts.add(address as Address);
+              }
+            },
+          );
           setConnected(true, { chainId: activeChain.chainId });
           return [...accounts];
         }
@@ -186,6 +196,8 @@ export const createEIP1193Provider = async (
           return `0x${signedTransaction}`;
         }
         case "wallet_addEthereumChain": {
+          console.log("wallet_addEthereumChain: all added chains", addedChains);
+
           const [chain] = params as [AddEthereumChainParameter];
 
           // Validate the to be added
@@ -206,15 +218,35 @@ export const createEIP1193Provider = async (
             throw new ChainIdMismatchError(chain.chainId as Hex, rpcChainId);
           }
 
-          addedChains.push({ ...chain, connected: true });
+          // Only add if it hasn't been added already
+          if (!addedChains.some((c) => c.chainId === rpcChainId)) {
+            addedChains.push({ ...chain, connected: true });
+          }
+
+          console.log("wallet_addEthereumChain: new chain id", rpcChainId);
+          console.log("wallet_addEthereumChain: new added chains", addedChains);
 
           return null;
         }
 
         case "wallet_switchEthereumChain": {
-          const [targetChainId] = params as [string];
-          const targetChain = addedChains.find(
-            (chain) => chain.chainId === targetChainId,
+          const [targetChainId] = params as [{ chainId: string }];
+          const targetChain = addedChains.find((chain) => {
+            console.log("iterating through added chains:", chain);
+            return chain.chainId === targetChainId.chainId;
+          });
+
+          console.log(
+            "wallet_switchEthereumChain: target chain id",
+            targetChainId,
+          );
+          console.log(
+            "wallet_switchEthereumChain: target chain id type",
+            typeof targetChainId,
+          );
+          console.log(
+            "wallet_switchEthereumChain: all added chains",
+            addedChains,
           );
 
           if (!targetChain) {

packages/eip-1193-provider/src/utils.ts

@@ -10,7 +10,6 @@ import type { WalletAddEthereumChain, TransactionType } from "./types";
 import {
   BlockExplorerUrlError,
   RpcUrlsRequiredError,
-  ChainIdAlreadyAddedError,
   InvalidChainIdFormatError,
   ChainIdValueExceedsError,
   InvalidRpcUrlError,
@@ -123,7 +122,8 @@ export const validateChain = (
   const { rpcUrls, blockExplorerUrls, chainId, nativeCurrency } = chain;
 
   if (addedChains.some((c) => c.chainId === chainId)) {
-    throw new ChainIdAlreadyAddedError();
+    // Chain already added; return early
+    return;
   }
 
   let decimalChainId: Chain["id"];