@getpara/evm-wallet-connectors 2.0.0-dev.0 → 2.0.0-dev.1

package/dist/index.js

@@ -53,7 +53,17 @@ var __async = (__this, __arguments, generator) => {
 
 // src/providers/EvmExternalWalletContext.tsx
 import { createContext, useCallback, useEffect, useMemo, useRef } from "react";
-import { useAccount, useSwitchChain, useConnect, useDisconnect, useEnsName, useEnsAvatar, useSignMessage } from "wagmi";
+import {
+  useAccount,
+  useSwitchChain,
+  useConnect,
+  useDisconnect,
+  useEnsName,
+  useEnsAvatar,
+  useSignMessage,
+  useSwitchAccount,
+  useConnections
+} from "wagmi";
 
 // src/utils/isEIP6963Connector.ts
 var isEIP6963Connector = (wallet) => {
@@ -117,10 +127,21 @@ var EvmExternalWalletContext = createContext(defaultEvmExternalWallet);
 function EvmExternalWalletProvider({
   children,
   onSwitchWallet,
-  para
+  para,
+  walletsWithFullAuth,
+  connectedWallet
 }) {
   const { connectAsync, connectors: untypedConnectors } = useConnect();
-  const { address: wagmiAddress, isConnecting, isReconnecting, chainId, connector: connectedConnector } = useAccount();
+  const connections = useConnections();
+  const {
+    address: wagmiAddress,
+    isConnecting,
+    isReconnecting,
+    chainId,
+    connector: connectedConnector,
+    isConnected
+  } = useAccount();
+  const { switchAccount: wagmiSwitchAccount } = useSwitchAccount();
   const { chains, switchChainAsync } = useSwitchChain();
   const { disconnectAsync } = useDisconnect();
   const { data: ensName } = useEnsName({ address: wagmiAddress });
@@ -137,18 +158,43 @@ function EvmExternalWalletProvider({
     }
     return storedExternalWallets;
   };
+  const switchAccount = useCallback(
+    (connectorName) => {
+      var _a;
+      const connector = (_a = connections.find((c) => c.connector.name === connectorName)) == null ? void 0 : _a.connector;
+      if (!connector) {
+        console.warn(`connector not found: ${connectorName}`);
+        return;
+      }
+      wagmiSwitchAccount({ connector });
+    },
+    [connections, wagmiSwitchAccount]
+  );
   useEffect(() => {
     const storedExternalWallet = getStoredExternalWallets()[wagmiAddress != null ? wagmiAddress : ""];
-    if (!isConnecting && !isReconnecting && !isLocalConnecting && !!wagmiAddress && !storedExternalWallet && !((connectedConnector == null ? void 0 : connectedConnector.id) === "para")) {
+    if (!isConnecting && !isReconnecting && !isLocalConnecting && !!wagmiAddress && !storedExternalWallet && (connectedConnector == null ? void 0 : connectedConnector.id) !== "para") {
       reset();
     }
   }, [isConnecting, isReconnecting, isLocalConnecting, wagmiAddress, connectedConnector]);
   useEffect(() => {
     const storedExternalWallet = Object.values(para.externalWallets || {})[0];
-    if (!isLocalConnecting && !isConnecting && !isReconnecting && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === WalletType.EVM && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== wagmiAddress) {
+    if (!isLocalConnecting && !isConnecting && !isReconnecting && (storedExternalWallet == null ? void 0 : storedExternalWallet.type) === WalletType.EVM && (storedExternalWallet == null ? void 0 : storedExternalWallet.address) !== wagmiAddress && (connectedConnector == null ? void 0 : connectedConnector.id) !== "para") {
       switchWallet(wagmiAddress);
     }
   }, [isLocalConnecting, wagmiAddress, isReconnecting, isConnecting]);
+  useEffect(() => {
+    if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedConnector && connectedWallet.type === WalletType.EVM && connectedConnector.name !== 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;
+      }
+      connectParaEmbedded();
+    }
+  }, [isLocalConnecting, isConnecting, isReconnecting, isConnected, connectedConnector]);
   const connectors = untypedConnectors;
   const reset = () => __async(this, null, function* () {
     yield disconnectAsync();
@@ -203,9 +249,19 @@ function EvmExternalWalletProvider({
     }
     return { error };
   });
-  const login = (_0) => __async(this, [_0], function* ({ address, connectorName }) {
+  const login = (_0) => __async(this, [_0], function* ({
+    address,
+    walletId,
+    connectorName
+  }) {
+    var _a;
     try {
-      return yield para.externalWalletLogin({ address, type: WalletType.EVM, provider: connectorName });
+      return yield para.externalWalletLogin({
+        address,
+        type: WalletType.EVM,
+        provider: connectorName,
+        withFullParaAuth: walletsWithFullAuth == null ? void 0 : walletsWithFullAuth.includes((_a = walletId == null ? void 0 : walletId.toUpperCase()) != null ? _a : "")
+      });
     } catch (err) {
       yield disconnectAsync();
       yield para.logout();
@@ -213,15 +269,24 @@ function EvmExternalWalletProvider({
     }
   });
   const switchWallet = (address) => __async(this, null, function* () {
+    var _a;
     updateExternalWalletState({ isConnecting: true });
     let error;
     if (!address) {
       yield para.logout();
     } else {
-      try {
-        yield login({ address, connectorName: connectedConnector == null ? void 0 : connectedConnector.name });
-      } catch (err) {
-        error = err;
+      if (para.isExternalWalletAuth) {
+        yield reset();
+      } else {
+        try {
+          yield login({
+            address,
+            connectorName: connectedConnector == null ? void 0 : connectedConnector.name,
+            walletId: (_a = getParaDetails(connectedConnector.id)) == null ? void 0 : _a.id
+          });
+        } catch (err) {
+          error = err;
+        }
       }
     }
     onSwitchWallet == null ? void 0 : onSwitchWallet({ address, error });
@@ -248,7 +313,7 @@ function EvmExternalWalletProvider({
       address = (_d = data.accounts) == null ? void 0 : _d[0];
       if (address) {
         try {
-          const loginResp = yield login({ address, connectorName: connector.name });
+          const loginResp = yield login({ address, connectorName: connector.name, walletId: connector.paraDetails.id });
           userExists = loginResp.userExists;
           isVerified = loginResp.isVerified;
           verificationMessage.current = loginResp.signatureVerificationMessage;
@@ -322,6 +387,10 @@ function EvmExternalWalletProvider({
       getQrUri: getQrUri(connector)
     });
   });
+  const getParaDetails = (id) => {
+    var _a;
+    return (_a = connectors.find((w) => w.id === id)) == null ? void 0 : _a.paraDetails;
+  };
   const formattedChains = chains.map((c) => {
     return {
       id: c.id,
@@ -698,8 +767,14 @@ function isMetaMask(ethereum) {
   return true;
 }
 var metaMaskWallet = ({ projectId, walletConnectParameters }) => {
-  var _a, _b, _c;
-  const isMetaMaskInjected = hasInjectedProvider({ flag: "isMetaMask" });
+  var _a, _b, _c, _d;
+  let metaMaskTarget = typeof window !== "undefined" ? (_c = (_b = (_a = window.ethereum) == null ? void 0 : _a.providers) == null ? void 0 : _b.find(isMetaMask)) != null ? _c : window.ethereum : void 0;
+  const metaMaskInjectedProvider = metaMaskTarget ? metaMaskTarget : getInjectedProvider({ flag: "isMetaMask" });
+  const isMetaMaskInjected = !!metaMaskInjectedProvider && metaMaskInjectedProvider.isMetaMask;
+  const providerMapTarget = (_d = metaMaskTarget == null ? void 0 : metaMaskTarget.providerMap) == null ? void 0 : _d.get("MetaMask");
+  if (providerMapTarget) {
+    metaMaskTarget = providerMapTarget;
+  }
   const getUri = (uri) => {
     return isAndroid() ? `metamask://wc?uri=${encodeURIComponent(uri)}` : isIOS() ? !isTelegram() ? (
       // currently broken in MetaMask v6.5.0 https://github.com/MetaMask/metamask-mobile/issues/6457
@@ -717,7 +792,7 @@ var metaMaskWallet = ({ projectId, walletConnectParameters }) => {
     downloadUrl: "https://metamask.io/download/",
     getUri,
     createConnector: isMetaMaskInjected ? getInjectedConnector({
-      target: typeof window !== "undefined" ? (_c = (_b = (_a = window.ethereum) == null ? void 0 : _a.providers) == null ? void 0 : _b.find(isMetaMask)) != null ? _c : window.ethereum : void 0
+      target: metaMaskTarget
     }) : getWalletConnectConnector({
       projectId,
       walletConnectParameters

package/dist/providers/EvmExternalWalletContext.d.ts

@@ -1,6 +1,6 @@
 import { PropsWithChildren } from 'react';
-import type { CommonChain, CommonWallet } from '@getpara/react-common';
-import ParaWeb from '@getpara/web-sdk';
+import type { CommonChain, CommonWallet, TExternalWallet } from '@getpara/react-common';
+import ParaWeb, { Wallet } from '@getpara/web-sdk';
 export type EvmExternalWalletContextType = {
     wallets: CommonWallet[];
     chains: CommonChain[];
@@ -32,5 +32,7 @@ export type EvmExternalWalletProviderConfig = {
         error?: string;
     }) => void;
     para: ParaWeb;
+    walletsWithFullAuth: TExternalWallet[];
+    connectedWallet?: Omit<Wallet, 'signer'> | null;
 };
-export declare function EvmExternalWalletProvider({ children, onSwitchWallet, para, }: EvmExternalWalletProviderConfig & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function EvmExternalWalletProvider({ children, onSwitchWallet, para, walletsWithFullAuth, connectedWallet, }: EvmExternalWalletProviderConfig & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/utils/getInjectedConnector.d.ts

@@ -4,6 +4,10 @@ export declare function hasInjectedProvider({ flag, namespace }: {
     flag?: WalletProviderFlags;
     namespace?: string;
 }): boolean;
+export declare function getInjectedProvider({ flag, namespace }: {
+    flag?: WalletProviderFlags;
+    namespace?: string;
+}): any;
 export declare function getInjectedConnector({ flag, namespace, target, }: {
     flag?: WalletProviderFlags;
     namespace?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/evm-wallet-connectors",
-  "version": "2.0.0-dev.0",
+  "version": "2.0.0-dev.1",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "@coinbase/wallet-sdk": "4.3.0",
-    "@getpara/wagmi-v2-connector": "2.0.0-dev.0",
-    "@getpara/web-sdk": "^2.0.0-dev.0",
+    "@getpara/wagmi-v2-connector": "2.0.0-dev.1",
+    "@getpara/web-sdk": "^2.0.0-dev.1",
     "viem": "2.x",
     "wagmi": "2.x",
     "zustand": "^4.5.2",
@@ -23,7 +23,7 @@
     "test": "vitest run --coverage"
   },
   "devDependencies": {
-    "@getpara/react-common": "^2.0.0-dev.0",
+    "@getpara/react-common": "^2.0.0-dev.1",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.4.3"
@@ -36,5 +36,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "f94ef031ef0e1894f5f0800e55f6ca2904641780"
+  "gitHead": "426e843bd6084fb2e5f30ab87b02c79fc2f52832"
 }