@getpara/evm-wallet-connectors 2.0.0-dev.3 → 2.0.0-dev.7

package/dist/providers/EvmExternalWalletContext.d.ts

@@ -4,7 +4,9 @@ import { TExternalHooks } from './externalHooks.js';
 export type EvmExternalWalletContextType = ExternalWalletContextType & ChainManagement<number> & BalanceManagement & ConnectParaEmbedded & TExternalHooks & {
     username?: string;
     avatar?: string;
-} & FarcasterMiniAppManagement;
+} & FarcasterMiniAppManagement & {
+    verificationStage: 'verifying' | 'switchingChain';
+};
 export declare const EvmExternalWalletContext: import("react").Context<EvmExternalWalletContextType>;
 export type EvmExternalWalletProviderConfig = ExternalWalletProviderConfigBase;
 export declare function EvmExternalWalletProvider({ children, onSwitchWallet, para, walletsWithFullAuth, connectedWallet, includeWalletVerification, connectionOnly, }: EvmExternalWalletProviderConfig & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/providers/EvmExternalWalletContext.js

@@ -5,7 +5,7 @@ import {
   __spreadValues
 } from "../chunk-MMUBH76A.js";
 import { jsx } from "react/jsx-runtime";
-import { createContext, useCallback, useEffect, useMemo, useRef } from "react";
+import { createContext, useCallback, useEffect, useMemo, useRef, useState } from "react";
 import {
   useAccount,
   useSwitchChain,
@@ -28,7 +28,10 @@ import {
 import { isMobile } from "@getpara/web-sdk";
 import { etherUnits, formatUnits } from "viem";
 import { externalHooks } from "./externalHooks.js";
-const EvmExternalWalletContext = createContext(defaultEvmExternalWallet);
+const EvmExternalWalletContext = createContext(__spreadProps(__spreadValues({}, defaultEvmExternalWallet), {
+  farcasterStatus: void 0,
+  verificationStage: void 0
+}));
 function EvmExternalWalletProvider({
   children,
   onSwitchWallet,
@@ -62,6 +65,7 @@ function EvmExternalWalletProvider({
   const connectors = untypedConnectors;
   const connectionsRef = useRef(connections);
   const connectorsRef = useRef(connectors);
+  const [verificationStage, setVerificationStage] = useState("verifying");
   const isLocalConnecting = useExternalWalletStore((state) => state.isConnecting);
   const updateExternalWalletState = useExternalWalletStore((state) => state.updateState);
   const getStoredExternalWallets = () => {
@@ -75,14 +79,18 @@ function EvmExternalWalletProvider({
   const switchAccount = useCallback(
     (connectorName) => {
       var _a;
-      const connector = (_a = connections.find((c) => c.connector.name === connectorName)) == null ? void 0 : _a.connector;
+      const connector = (_a = connectionsRef.current.find((c) => {
+        var _a2;
+        const paraDetails = (_a2 = c.connector) == null ? void 0 : _a2.paraDetails;
+        return [paraDetails == null ? void 0 : paraDetails.name, paraDetails == null ? void 0 : paraDetails.id, paraDetails == null ? void 0 : paraDetails.internalId].includes(connectorName);
+      })) == null ? void 0 : _a.connector;
       if (!connector) {
         console.warn(`connector not found: ${connectorName}`);
         return;
       }
       wagmiSwitchAccount({ connector });
     },
-    [connections, wagmiSwitchAccount]
+    [wagmiSwitchAccount]
   );
   const findConnectorAndAccount = (externalWallet) => {
     var _a;
@@ -90,12 +98,10 @@ function EvmExternalWalletProvider({
     switch (true) {
       case !!externalWallet.providerId:
         {
-          connector = (_a = connectionsRef.current.find(
-            (c) => {
-              var _a2;
-              return ((_a2 = c.connector.paraDetails) == null ? void 0 : _a2.internalId) === externalWallet.providerId;
-            }
-          )) == null ? void 0 : _a.connector;
+          connector = (_a = connectionsRef.current.find((c) => {
+            var _a2;
+            return ((_a2 = c.connector) == null ? void 0 : _a2.name) === externalWallet.providerId;
+          })) == null ? void 0 : _a.connector;
         }
         break;
     }
@@ -122,29 +128,52 @@ function EvmExternalWalletProvider({
     }
   }, [isLocalConnecting, wagmiAddress, isConnected]);
   useEffect(() => {
-    if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedConnector && connectedWallet.type === "EVM" && connectedConnector.name !== connectedWallet.name) {
+    var _a;
+    const connectedConnectorName = (connectedConnector == null ? void 0 : connectedConnector.name) === "WalletConnect" ? (_a = connectedConnector == null ? void 0 : connectedConnector.paraDetails) == null ? void 0 : _a.name : connectedConnector == null ? void 0 : connectedConnector.name;
+    if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedConnector && connectedWallet.type === "EVM" && connectedConnectorName !== connectedWallet.name) {
       switchAccount(connectedWallet.isExternal ? connectedWallet.name : "Para");
     }
   }, [isLocalConnecting, isConnecting, isReconnecting, connectedWallet, wagmiSwitchAccount]);
   useEffect(() => {
-    if (!isLocalConnecting && !isConnecting && !isReconnecting && !isConnected && !connectedConnector) {
-      if (Object.values(para.wallets).length === 0) {
-        return;
+    const connectPara = () => __async(this, null, function* () {
+      if (!isLocalConnecting && !isConnecting && !isReconnecting && !isConnected && !connectedConnector) {
+        if (Object.values(para.wallets).length === 0 || !(yield para.isFullyLoggedIn())) {
+          return;
+        }
+        connectParaEmbedded();
       }
-      connectParaEmbedded();
-    }
+    });
+    connectPara();
   }, [isLocalConnecting, isConnecting, isReconnecting, isConnected, connectedConnector]);
   const reset = () => __async(this, null, function* () {
     yield disconnectAsync();
     yield para.logout();
   });
+  const getChainParams = (chainId2) => {
+    var _a;
+    const chain = chains.find((c) => c.id === chainId2);
+    if (!chain) return null;
+    return {
+      chainId: `0x${chainId2.toString(16)}`,
+      chainName: chain.name,
+      nativeCurrency: {
+        name: chain.nativeCurrency.name,
+        symbol: chain.nativeCurrency.symbol,
+        decimals: chain.nativeCurrency.decimals
+      },
+      rpcUrls: [chain.rpcUrls.default.http[0]],
+      blockExplorerUrls: ((_a = chain.blockExplorers) == null ? void 0 : _a.default) ? [chain.blockExplorers.default.url] : void 0
+    };
+  };
   const signMessage = (_0) => __async(this, [_0], function* ({ message, externalWallet }) {
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     let signOpts = {};
     if (externalWallet) {
       signOpts = findConnectorAndAccount(externalWallet);
+      yield switchAccount((_a = externalWallet.providerId) != null ? _a : "");
     }
+    const address = signOpts.account ? typeof signOpts.account === "string" ? signOpts.account : signOpts.account.getAddress() : wagmiAddress;
     try {
-      const address = signOpts.account ? typeof signOpts.account === "string" ? signOpts.account : signOpts.account.getAddress() : wagmiAddress;
       const signature = yield signMessageAsync(__spreadValues({
         message,
         account: address
@@ -155,6 +184,29 @@ function EvmExternalWalletProvider({
       };
     } catch (e) {
       console.error("Error signing message:", e);
+      console.error("Error signing message:", e.message, e.details);
+      if (e.message.includes("Chain not configured") || e.details.includes("Chain not configured")) {
+        setVerificationStage("switchingChain");
+        const currentChainParams = getChainParams((_c = (_b = chains[0]) == null ? void 0 : _b.id) != null ? _c : chainId);
+        if (!currentChainParams) {
+          return {
+            error: `Chain ${chainId} not found in configuration`
+          };
+        }
+        try {
+          yield switchChainAsync({
+            addEthereumChainParameter: currentChainParams,
+            chainId: (_e = (_d = chains[0]) == null ? void 0 : _d.id) != null ? _e : chainId
+          });
+          setVerificationStage("verifying");
+          return yield signMessage({ message, externalWallet });
+        } catch (error) {
+          console.error("Error adding chain:", error);
+          return {
+            error: `Error adding chain. You may need to add ${currentChainParams == null ? void 0 : currentChainParams.chainName} support to ${(_h = (_g = (_f = connectedConnector == null ? void 0 : connectedConnector.paraDetails) == null ? void 0 : _f.name) != null ? _g : connectedConnector == null ? void 0 : connectedConnector.name) != null ? _h : "the wallet"} manually.`
+          };
+        }
+      }
       switch (e.name) {
         case "UserRejectedRequestError": {
           return { error: "Signature request rejected" };
@@ -166,6 +218,7 @@ function EvmExternalWalletProvider({
     }
   });
   const signVerificationMessage = () => __async(this, null, function* () {
+    setVerificationStage("verifying");
     const signature = yield signMessage({ message: verificationMessage.current });
     return signature;
   });
@@ -202,6 +255,7 @@ function EvmExternalWalletProvider({
       refetchEnsAvatar();
       return yield para.loginExternalWallet({
         externalWallet: {
+          partnerId: para.partnerId,
           address,
           type: "EVM",
           provider,
@@ -268,7 +322,7 @@ function EvmExternalWalletProvider({
           authState = yield login(__spreadValues({
             address
           }, loginInfo));
-          verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
+          verificationMessage.current = authState.signatureVerificationMessage;
         } catch (err) {
           address = void 0;
           error = err;
@@ -299,25 +353,35 @@ function EvmExternalWalletProvider({
     const _connector = connector.walletConnectModalConnector && _isMobile ? connector.walletConnectModalConnector : connector;
     return yield connect(_connector);
   });
+  const findConnector = (providerId) => {
+    return connectorsRef.current.find(
+      (w) => {
+        var _a, _b, _c;
+        return [(_a = w == null ? void 0 : w.paraDetails) == null ? void 0 : _a.name, (_b = w == null ? void 0 : w.paraDetails) == null ? void 0 : _b.id, (_c = w == null ? void 0 : w.paraDetails) == null ? void 0 : _c.internalId].includes(providerId);
+      }
+    );
+  };
   const requestInfo = (providerId) => __async(this, null, function* () {
-    var _a, _b;
-    const connector = connectors.find((c) => {
-      var _a2;
-      return ((_a2 = c.paraDetails) == null ? void 0 : _a2.internalId) === providerId;
-    });
-    if (connector.isAuthorized) isLinkingAccount.current = true;
+    var _a, _b, _c;
+    const connector = findConnector(providerId);
+    isLinkingAccount.current = true;
     try {
       const address = yield connectBase(connector);
+      const providerId2 = (_b = (_a = wallets.find((w) => {
+        var _a2, _b2;
+        return (w == null ? void 0 : w.name) === ((_b2 = (_a2 = connector == null ? void 0 : connector.paraDetails) == null ? void 0 : _a2.name) != null ? _b2 : "");
+      })) == null ? void 0 : _a.name) != null ? _b : connector == null ? void 0 : connector.name;
       return {
+        partnerId: para.partnerId,
         address,
         type: "EVM",
-        providerId: (_a = connector.paraDetails) == null ? void 0 : _a.internalId,
-        provider: connector.name,
+        providerId: providerId2,
+        provider: providerId2,
         ensName,
         ensAvatar
       };
     } catch (e) {
-      throw new Error((_b = e == null ? void 0 : e.message) != null ? _b : e);
+      throw new Error((_c = e == null ? void 0 : e.message) != null ? _c : e);
     }
   });
   const disconnectBase = (providerId) => __async(this, null, function* () {
@@ -325,13 +389,10 @@ function EvmExternalWalletProvider({
     if (!providerId) {
       throw new Error("Provider ID is required to disconnect");
     }
-    const connector = connectors.find((c) => {
-      var _a2;
-      return ((_a2 = c.paraDetails) == null ? void 0 : _a2.internalId) === providerId;
-    });
+    const connector = findConnector(providerId);
     isLinkingAccount.current = true;
     try {
-      yield connector.disconnect();
+      yield connector == null ? void 0 : connector.disconnect();
     } catch (e) {
       throw new Error((_a = e == null ? void 0 : e.message) != null ? _a : e);
     }
@@ -346,32 +407,45 @@ function EvmExternalWalletProvider({
       }
     }
   });
-  const eip6963ids = connectors.filter((c) => isEIP6963Connector(c)).map((c) => c.id);
+  const eip6963Names = connectors.filter((c) => isEIP6963Connector(c)).map((c) => c.name);
   const dedupedConnectors = connectors.map((c) => {
-    var _a, _b, _c;
+    var _a, _b;
     if ((_a = c.paraDetails) == null ? void 0 : _a.isWalletConnectModalConnector) {
       return;
     }
-    if (!isEIP6963Connector(c) && eip6963ids.includes((_b = c.paraDetails) == null ? void 0 : _b.rdns)) {
+    if (!isEIP6963Connector(c) && eip6963Names.includes(c.name)) {
       return;
     }
     if (isEIP6963Connector(c)) {
       const paraMetadata = nonEip6963ConnectorsByRdns[c.id];
       return __spreadProps(__spreadValues({}, c), { paraDetails: paraMetadata });
     }
-    if (((_c = c.paraDetails) == null ? void 0 : _c.id) === "WALLETCONNECT" && walletConnectModalConnector) {
+    if (((_b = c.paraDetails) == null ? void 0 : _b.internalId) === "WALLETCONNECT" && walletConnectModalConnector) {
       return __spreadProps(__spreadValues({}, c), { walletConnectModalConnector });
     }
     return c;
   }).filter((c) => !!c);
   const wallets = dedupedConnectors.map((c) => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e, _f, _g;
     if (((_a = c.paraDetails) == null ? void 0 : _a.internalId) === "SAFE" && (typeof window === "undefined" || window.parent === window)) {
       return void 0;
     }
     const connector = __spreadValues(__spreadValues({}, c), c.paraDetails);
     const supportsWalletConnect = connector.type === "walletConnect" || ((_b = connector.paraDetails) == null ? void 0 : _b.internalId) === "WALLETCONNECT" || ((_c = connector.paraDetails) == null ? void 0 : _c.showQrModal);
+    const isInjected = !c.paraDetails && eip6963Names.includes(c.name);
+    if (isInjected && connectors.some((c2) => {
+      var _a2;
+      return ((_a2 = c2.paraDetails) == null ? void 0 : _a2.rdns) === c2.id;
+    })) {
+      return void 0;
+    }
     return __spreadValues(__spreadProps(__spreadValues({}, connector), {
+      // Using name here since that's the only common id across the networks
+      id: connector.name,
+      internalId: (_d = connector.internalId) != null ? _d : connector.name,
+      isExtension: (_e = connector.isExtension) != null ? _e : isInjected,
+      installed: (_f = connector.installed) != null ? _f : isInjected,
+      iconUrl: (_g = connector.iconUrl) != null ? _g : connector.icon,
       connect: () => connect(connector),
       connectMobile: (manual) => connectMobile(connector, manual),
       type: "EVM"
@@ -379,12 +453,11 @@ function EvmExternalWalletProvider({
   }).filter(Boolean);
   const getConnectorInfo = (connector) => {
     const paraDetails = connector.paraDetails;
-    const providerId = paraDetails == null ? void 0 : paraDetails.internalId;
-    const withFullParaAuth = walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(providerId);
+    const withFullParaAuth = walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes(paraDetails == null ? void 0 : paraDetails.internalId);
     return {
       type: "EVM",
-      providerId,
-      provider: paraDetails == null ? void 0 : paraDetails.name,
+      providerId: connector.name,
+      provider: connector.name,
       withFullParaAuth
     };
   };
@@ -404,10 +477,10 @@ function EvmExternalWalletProvider({
       }
     );
     if (!connection) {
-      return void 0;
+      return { isPresent: false };
     }
     const address = (_a = connection == null ? void 0 : connection.accounts) == null ? void 0 : _a[0];
-    return address ? { isConnected: true, address } : { isConnected: false };
+    return address ? { isPresent: true, isConnected: true, address } : { isPresent: true, isConnected: false };
   }, [connections]);
   const connectParaEmbedded = useCallback(() => __async(this, null, function* () {
     const paraConnectorInstance = connectors.find((c) => c.id === "para");
@@ -445,7 +518,8 @@ function EvmExternalWalletProvider({
         getWalletBalance,
         requestInfo,
         disconnectBase,
-        farcasterStatus
+        farcasterStatus,
+        verificationStage
       }, externalHooks),
       children
     }

package/dist/utils/isEIP6963Connector.js

@@ -2,7 +2,7 @@
 import "../chunk-MMUBH76A.js";
 const isEIP6963Connector = (wallet) => {
   var _a;
-  return !!(!wallet.isRainbowKitConnector && ((_a = wallet.icon) == null ? void 0 : _a.startsWith("data:image")) && wallet.uid && wallet.name);
+  return !!(!wallet.isRainbowKitConnector && ((_a = wallet.icon) == null ? void 0 : _a.trim().startsWith("data:image")) && wallet.uid && wallet.name);
 };
 export {
   isEIP6963Connector

package/dist/wallets/connectors/backpack/backpack.js

@@ -13,7 +13,7 @@ const backpackWallet = ({ projectId, walletConnectParameters }) => {
     id: "backpack",
     internalId: "BACKPACK",
     name: "Backpack",
-    rdns: "app.backpack.mobile",
+    rdns: "app.backpack",
     iconUrl: icon,
     installed: isBackpackInjected,
     isExtension: true,

package/dist/wallets/connectors/farcaster/farcaster.js

@@ -13,7 +13,7 @@ const farcasterWallet = ({ para, createFarcasterConnector }) => {
     iconUrl: icon,
     installed: (para == null ? void 0 : para.isReady) && (para == null ? void 0 : para.isFarcasterMiniApp),
     isExtension: true,
-    downloadUrl: "https://warpcast.xyz/",
+    downloadUrl: "https://farcaster.xyz/",
     createConnector: (walletDetails) => createConnector((config) => __spreadValues(__spreadValues({}, createFarcasterConnector()(config)), walletDetails))
   };
 };

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@getpara/evm-wallet-connectors",
-  "version": "2.0.0-dev.3",
+  "version": "2.0.0-dev.7",
   "dependencies": {
     "@coinbase/wallet-sdk": "4.3.0",
-    "@getpara/wagmi-v2-connector": "2.0.0-dev.3",
-    "@getpara/web-sdk": "2.0.0-dev.3",
+    "@getpara/wagmi-v2-connector": "2.0.0-dev.7",
+    "@getpara/web-sdk": "2.0.0-dev.7",
     "zustand": "^4.5.2",
     "zustand-sync-tabs": "^0.2.2"
   },
   "devDependencies": {
-    "@getpara/react-common": "2.0.0-dev.3",
+    "@getpara/react-common": "2.0.0-dev.7",
     "@tanstack/react-query": "^5.74.0",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
@@ -25,7 +25,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "ffe34f7d8df2dd3c2327ca1f35bcc9764e0a68a2",
+  "gitHead": "225cd3693edaab4dac81df7285956d2616e5717f",
   "main": "dist/index.js",
   "peerDependencies": {
     "@farcaster/miniapp-wagmi-connector": "^1.0.0",