@orderly.network/wallet-connector-privy 2.1.1 → 2.1.2

package/dist/index.js

@@ -3,11 +3,11 @@
 var React12 = require('react');
 var hooks = require('@orderly.network/hooks');
 var ui = require('@orderly.network/ui');
-var WagmiExport = require('wagmi');
 var types = require('@orderly.network/types');
-var walletAdapterReact = require('@solana/wallet-adapter-react');
-var walletAdapterBase = require('@solana/wallet-adapter-base');
 var reactAuth = require('@privy-io/react-auth');
+var walletAdapterBase = require('@solana/wallet-adapter-base');
+var walletAdapterReact = require('@solana/wallet-adapter-react');
+var WagmiExport = require('wagmi');
 var i18n = require('@orderly.network/i18n');
 var reactDom = require('react-dom');
 var uiConnector = require('@orderly.network/ui-connector');
@@ -43,124 +43,262 @@ var viemExport__namespace = /*#__PURE__*/_interopNamespace(viemExport);
 var WagmiConnectorsExport__namespace = /*#__PURE__*/_interopNamespace(WagmiConnectorsExport);
 
 // src/provider.tsx
-var WagmiWalletContext = React12.createContext(null);
-var WagmiWalletProvider = ({
+var Network = /* @__PURE__ */ ((Network2) => {
+  Network2["mainnet"] = "mainnet";
+  Network2["testnet"] = "testnet";
+  return Network2;
+})(Network || {});
+var WalletType = /* @__PURE__ */ ((WalletType2) => {
+  WalletType2["EVM"] = "EVM";
+  WalletType2["SOL"] = "SOL";
+  WalletType2["PRIVY"] = "privy";
+  return WalletType2;
+})(WalletType || {});
+var SolanaChains = /* @__PURE__ */ new Map([[walletAdapterBase.WalletAdapterNetwork.Devnet, 901901901], [walletAdapterBase.WalletAdapterNetwork.Mainnet, 900900900]]);
+var SolanaChainsMap = /* @__PURE__ */ new Map([
+  [walletAdapterBase.WalletAdapterNetwork.Devnet, 901901901],
+  ["testnet" /* testnet */, 901901901],
+  ["mainnet" /* mainnet */, 900900900],
+  [walletAdapterBase.WalletAdapterNetwork.Mainnet, 900900900]
+]);
+var WalletChainTypeEnum = /* @__PURE__ */ ((WalletChainTypeEnum2) => {
+  WalletChainTypeEnum2["onlyEVM"] = "onlyEVM";
+  WalletChainTypeEnum2["onlySOL"] = "onlySOL";
+  WalletChainTypeEnum2["EVM_SOL"] = "EVM_SOL";
+  return WalletChainTypeEnum2;
+})(WalletChainTypeEnum || {});
+
+// src/providers/privyWalletProvider.tsx
+var getPrivyEmbeddedWalletChainId = (chainId) => {
+  if (!chainId) {
+    return null;
+  }
+  return parseInt(chainId.split("eip155:")[1]);
+};
+var PrivyWalletContext = React12.createContext(null);
+var PrivyWalletProvider = ({
   children
 }) => {
-  const { connectorWalletType } = useWalletConnectorPrivy();
-  const [wallet, setWallet] = React12.useState(void 0);
-  const { connect, connectors: wagmiConnectors2 } = connectorWalletType.disableWagmi ? { connect: () => Promise.resolve(), connectors: [] } : WagmiExport.useConnect();
-  const { disconnect } = connectorWalletType.disableWagmi ? { disconnect: () => Promise.resolve() } : WagmiExport.useDisconnect();
-  const { connector, isConnected, address, chainId } = connectorWalletType.disableWagmi ? { connector: null, isConnected: false, address: null, chainId: null } : WagmiExport.useAccount();
-  const { switchChain } = connectorWalletType.disableWagmi ? { switchChain: () => Promise.resolve() } : WagmiExport.useSwitchChain();
-  const connectedChain = React12.useMemo(() => {
-    if (chainId) {
+  const { network, solanaInfo, setSolanaInfo, connectorWalletType } = useWalletConnectorPrivy();
+  const {
+    login,
+    logout,
+    ready,
+    authenticated,
+    user,
+    exportWallet: exportEvmWallet,
+    createWallet: createEvmWallet
+  } = reactAuth.usePrivy();
+  const { wallets: walletsEVM } = connectorWalletType.disablePrivy ? { wallets: [] } : reactAuth.useWallets();
+  const connectedRef = React12.useRef(false);
+  const {
+    ready: solanaReady,
+    wallets: walletsSOL,
+    createWallet: createSolanaWallet,
+    exportWallet: exportSolanaWallet
+  } = connectorWalletType.disablePrivy ? {
+    ready: false,
+    wallets: [],
+    createWallet: () => Promise.resolve(),
+    exportWallet: () => Promise.resolve()
+  } : reactAuth.useSolanaWallets();
+  const [walletEVM, setWalletEVM] = React12.useState(null);
+  const [walletSOL, setWalletSOL] = React12.useState(null);
+  const { track } = hooks.useTrack();
+  const linkedAccount = React12.useMemo(() => {
+    if (user && user.linkedAccounts) {
+      const account = user.linkedAccounts.filter((item) => item.type !== "wallet").sort(
+        (a, b) => (b.latestVerifiedAt?.getTime() ?? 0) - (a.latestVerifiedAt?.getTime() ?? 0)
+      )[0];
+      let address = null;
+      if (account.type === "email") {
+        address = account.address;
+      } else if (account.type === "twitter_oauth") {
+        address = `@${account.username}`;
+      } else if (account.type === "google_oauth") {
+        address = `@${account.name}`;
+      }
       return {
-        id: chainId,
-        namespace: types.ChainNamespace.evm
+        type: account.type,
+        address
       };
     }
     return null;
-  }, [chainId]);
-  const setChain = React12.useCallback(
-    (chainId2) => {
-      return new Promise((resolve, reject) => {
-        switchChain(
-          { chainId: chainId2 },
-          {
-            onSuccess: () => resolve(true),
-            onError: (e) => {
-              return reject(e);
-            }
-          }
-        );
+  }, [user]);
+  const switchChain = (chainId) => {
+    const wallet = walletsEVM[0];
+    if (wallet) {
+      return wallet.switchChain(chainId);
+    }
+    return Promise.reject("no wallet");
+  };
+  const connect = () => {
+    login();
+  };
+  const disconnect = () => {
+    return logout();
+  };
+  const exportWallet = (namespace) => {
+    if (namespace === types.ChainNamespace.evm) {
+      track(types.TrackerEventName.clickExportPrivateKey, {
+        type: "evm"
       });
-    },
-    [switchChain]
-  );
+      return exportEvmWallet();
+    } else if (namespace === types.ChainNamespace.solana) {
+      track(types.TrackerEventName.clickExportPrivateKey, {
+        type: "solana"
+      });
+      return exportSolanaWallet();
+    }
+    return Promise.reject("no namespace");
+  };
+  const isConnected = React12.useMemo(() => {
+    if (ready && authenticated) {
+      return true;
+    }
+    return false;
+  }, [ready, authenticated]);
   React12.useEffect(() => {
-    if (!connector || !isConnected) {
-      setWallet(void 0);
+    if (!authenticated || !walletsEVM || !walletsEVM[0]) {
+      setWalletEVM(null);
       return;
     }
-    connector.getProvider().then((provider) => {
-      setWallet({
-        label: connector.name,
+    const wallet = walletsEVM[0];
+    wallet.getEthereumProvider().then((provider) => {
+      setWalletEVM({
+        label: "privy",
         icon: "",
         provider,
         accounts: [
           {
-            address
+            address: wallet.address
           }
         ],
         chains: [
           {
-            id: chainId,
+            id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
             namespace: types.ChainNamespace.evm
           }
         ],
-        chain: connectedChain
+        chain: {
+          id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
+          namespace: types.ChainNamespace.evm
+        }
       });
     });
-  }, [connector, chainId, isConnected, address, connectedChain]);
-  const connectors = React12.useMemo(() => {
-    return wagmiConnectors2.filter((connector2) => connector2.id !== "injected").sort(
-      (a, b) => a.type === "injected" ? -1 : 1
+  }, [walletsEVM, authenticated]);
+  React12.useEffect(() => {
+    if (!authenticated) {
+      setWalletSOL(null);
+      return;
+    }
+    if (!solanaReady) {
+      return;
+    }
+    if (!user) {
+      return;
+    }
+    const embededSolanaWallet = (user?.linkedAccounts).find(
+      (item) => item.chainType === "solana" && item.connectorType === "embedded"
     );
-  }, [wagmiConnectors2]);
+    if (!embededSolanaWallet) {
+      createSolanaWallet().then();
+      return;
+    }
+    if (!walletsSOL || !walletsSOL[0]) {
+      return;
+    }
+    const wallet = walletsSOL.find((w) => w.connectorType === "embedded");
+    if (wallet) {
+      if (walletSOL && wallet.address === walletSOL.accounts[0].address) {
+        if (walletSOL.chain.id === SolanaChainsMap.get(network)) {
+          return;
+        }
+      }
+      setWalletSOL({
+        label: "privy",
+        icon: "",
+        provider: {
+          signMessage: wallet.signMessage,
+          signTransaction: wallet.signTransaction,
+          sendTransaction: wallet.sendTransaction,
+          network: solanaInfo?.network ?? walletAdapterBase.WalletAdapterNetwork.Devnet,
+          rpcUrl: solanaInfo?.rpcUrl ?? void 0
+        },
+        accounts: [
+          {
+            address: wallet.address
+          }
+        ],
+        chains: [
+          {
+            id: SolanaChainsMap.get(network),
+            namespace: types.ChainNamespace.solana
+          }
+        ],
+        chain: {
+          id: SolanaChainsMap.get(network),
+          namespace: types.ChainNamespace.solana
+        }
+      });
+    }
+  }, [
+    walletsSOL,
+    authenticated,
+    createSolanaWallet,
+    solanaReady,
+    user,
+    walletSOL,
+    network,
+    solanaInfo
+  ]);
+  React12.useEffect(() => {
+    if (isConnected && linkedAccount) {
+      if (connectedRef.current) {
+        return;
+      }
+      connectedRef.current = true;
+      track(types.TrackerEventName.socialLoginSuccess, {
+        type: linkedAccount.type,
+        address: linkedAccount.address
+      });
+    }
+  }, [isConnected, linkedAccount, connectedRef]);
   const value = React12.useMemo(
     () => ({
-      connectors,
       connect,
-      wallet,
-      connectedChain,
-      setChain,
+      walletEVM,
+      walletSOL,
+      isConnected,
       disconnect,
-      isConnected
+      switchChain,
+      linkedAccount,
+      exportWallet,
+      createEvmWallet,
+      createSolanaWallet
     }),
     [
-      connectors,
       connect,
-      wallet,
-      connectedChain,
-      setChain,
+      walletEVM,
+      walletSOL,
+      isConnected,
       disconnect,
-      isConnected
-    ]
-  );
-  return /* @__PURE__ */ React12__default.default.createElement(WagmiWalletContext.Provider, { value }, children);
-};
-function useWagmiWallet() {
-  const context = React12.useContext(WagmiWalletContext);
-  if (!context) {
-    throw new Error("useWagmiWallet must be used within a WagmiWalletProvider");
-  }
-  return context;
-}
-var Network = /* @__PURE__ */ ((Network2) => {
-  Network2["mainnet"] = "mainnet";
-  Network2["testnet"] = "testnet";
-  return Network2;
-})(Network || {});
-var WalletType = /* @__PURE__ */ ((WalletType2) => {
-  WalletType2["EVM"] = "EVM";
-  WalletType2["SOL"] = "SOL";
-  WalletType2["PRIVY"] = "privy";
-  return WalletType2;
-})(WalletType || {});
-var SolanaChains = /* @__PURE__ */ new Map([[walletAdapterBase.WalletAdapterNetwork.Devnet, 901901901], [walletAdapterBase.WalletAdapterNetwork.Mainnet, 900900900]]);
-var SolanaChainsMap = /* @__PURE__ */ new Map([
-  [walletAdapterBase.WalletAdapterNetwork.Devnet, 901901901],
-  ["testnet" /* testnet */, 901901901],
-  ["mainnet" /* mainnet */, 900900900],
-  [walletAdapterBase.WalletAdapterNetwork.Mainnet, 900900900]
-]);
-var WalletChainTypeEnum = /* @__PURE__ */ ((WalletChainTypeEnum2) => {
-  WalletChainTypeEnum2["onlyEVM"] = "onlyEVM";
-  WalletChainTypeEnum2["onlySOL"] = "onlySOL";
-  WalletChainTypeEnum2["EVM_SOL"] = "EVM_SOL";
-  return WalletChainTypeEnum2;
-})(WalletChainTypeEnum || {});
+      switchChain,
+      linkedAccount,
+      exportWallet,
+      createEvmWallet,
+      createSolanaWallet
+    ]
+  );
+  return /* @__PURE__ */ React12__default.default.createElement(PrivyWalletContext.Provider, { value }, children);
+};
+function usePrivyWallet() {
+  const context = React12.useContext(PrivyWalletContext);
+  if (!context) {
+    throw new Error("usePrivyWallet must be used within a PrivyWalletProvider");
+  }
+  return context;
+}
 var SolanaWalletContext = React12.createContext(
   null
 );
@@ -386,231 +524,102 @@ function useSolanaWallet() {
   }
   return context;
 }
-var getPrivyEmbeddedWalletChainId = (chainId) => {
-  if (!chainId) {
-    return null;
-  }
-  return parseInt(chainId.split("eip155:")[1]);
-};
-var PrivyWalletContext = React12.createContext(null);
-var PrivyWalletProvider = ({
+var WagmiWalletContext = React12.createContext(null);
+var WagmiWalletProvider = ({
   children
 }) => {
-  const { network, solanaInfo, setSolanaInfo, connectorWalletType } = useWalletConnectorPrivy();
-  const {
-    login,
-    logout,
-    ready,
-    authenticated,
-    user,
-    exportWallet: exportEvmWallet,
-    createWallet: createEvmWallet
-  } = reactAuth.usePrivy();
-  const { wallets: walletsEVM } = connectorWalletType.disablePrivy ? { wallets: [] } : reactAuth.useWallets();
-  const connectedRef = React12.useRef(false);
-  const {
-    ready: solanaReady,
-    wallets: walletsSOL,
-    createWallet: createSolanaWallet,
-    exportWallet: exportSolanaWallet
-  } = connectorWalletType.disablePrivy ? { ready: false, wallets: [], createWallet: () => Promise.resolve(), exportWallet: () => Promise.resolve() } : reactAuth.useSolanaWallets();
-  const [walletEVM, setWalletEVM] = React12.useState(null);
-  const [walletSOL, setWalletSOL] = React12.useState(null);
-  const { track } = hooks.useTrack();
-  const linkedAccount = React12.useMemo(() => {
-    if (user && user.linkedAccounts) {
-      const account = user.linkedAccounts.filter((item) => item.type !== "wallet").sort(
-        (a, b) => (b.latestVerifiedAt?.getTime() ?? 0) - (a.latestVerifiedAt?.getTime() ?? 0)
-      )[0];
-      let address = null;
-      if (account.type === "email") {
-        address = account.address;
-      } else if (account.type === "twitter_oauth") {
-        address = `@${account.username}`;
-      } else if (account.type === "google_oauth") {
-        address = `@${account.name}`;
-      }
+  const { connectorWalletType } = useWalletConnectorPrivy();
+  const [wallet, setWallet] = React12.useState(void 0);
+  const { connect, connectors: wagmiConnectors2 } = connectorWalletType.disableWagmi ? { connect: () => Promise.resolve(), connectors: [] } : WagmiExport.useConnect();
+  const { disconnect } = connectorWalletType.disableWagmi ? { disconnect: () => Promise.resolve() } : WagmiExport.useDisconnect();
+  const { connector, isConnected, address, chainId } = connectorWalletType.disableWagmi ? { connector: null, isConnected: false, address: null, chainId: null } : WagmiExport.useAccount();
+  const { switchChain } = connectorWalletType.disableWagmi ? { switchChain: () => Promise.resolve() } : WagmiExport.useSwitchChain();
+  const connectedChain = React12.useMemo(() => {
+    if (chainId) {
       return {
-        type: account.type,
-        address
+        id: chainId,
+        namespace: types.ChainNamespace.evm
       };
     }
     return null;
-  }, [user]);
-  const switchChain = (chainId) => {
-    const wallet = walletsEVM[0];
-    if (wallet) {
-      return wallet.switchChain(chainId);
-    }
-    return Promise.reject("no wallet");
-  };
-  const connect = () => {
-    login();
-  };
-  const disconnect = () => {
-    return logout();
-  };
-  const exportWallet = (namespace) => {
-    if (namespace === types.ChainNamespace.evm) {
-      track(types.EnumTrackerKeys.clickExportPrivateKey, {
-        type: "evm"
-      });
-      return exportEvmWallet();
-    } else if (namespace === types.ChainNamespace.solana) {
-      track(types.EnumTrackerKeys.clickExportPrivateKey, {
-        type: "solana"
+  }, [chainId]);
+  const setChain = React12.useCallback(
+    (chainId2) => {
+      return new Promise((resolve, reject) => {
+        switchChain(
+          { chainId: chainId2 },
+          {
+            onSuccess: () => resolve(true),
+            onError: (e) => {
+              return reject(e);
+            }
+          }
+        );
       });
-      return exportSolanaWallet();
-    }
-    return Promise.reject("no namespace");
-  };
-  const isConnected = React12.useMemo(() => {
-    if (ready && authenticated) {
-      return true;
-    }
-    return false;
-  }, [ready, authenticated]);
+    },
+    [switchChain]
+  );
   React12.useEffect(() => {
-    if (!authenticated || !walletsEVM || !walletsEVM[0]) {
-      setWalletEVM(null);
+    if (!connector || !isConnected) {
+      setWallet(void 0);
       return;
     }
-    const wallet = walletsEVM[0];
-    wallet.getEthereumProvider().then((provider) => {
-      setWalletEVM({
-        label: "privy",
+    connector.getProvider().then((provider) => {
+      setWallet({
+        label: connector.name,
         icon: "",
         provider,
         accounts: [
           {
-            address: wallet.address
+            address
           }
         ],
         chains: [
           {
-            id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
+            id: chainId,
             namespace: types.ChainNamespace.evm
           }
         ],
-        chain: {
-          id: getPrivyEmbeddedWalletChainId(wallet.chainId) ?? 1,
-          namespace: types.ChainNamespace.evm
-        }
+        chain: connectedChain
       });
     });
-  }, [walletsEVM, authenticated]);
-  React12.useEffect(() => {
-    if (!authenticated) {
-      setWalletSOL(null);
-      return;
-    }
-    if (!solanaReady) {
-      return;
-    }
-    if (!user) {
-      return;
-    }
-    const embededSolanaWallet = (user?.linkedAccounts).find(
-      (item) => item.chainType === "solana" && item.connectorType === "embedded"
+  }, [connector, chainId, isConnected, address, connectedChain]);
+  const connectors = React12.useMemo(() => {
+    return wagmiConnectors2.filter((connector2) => connector2.id !== "injected").sort(
+      (a, b) => a.type === "injected" ? -1 : 1
     );
-    if (!embededSolanaWallet) {
-      createSolanaWallet().then();
-      return;
-    }
-    if (!walletsSOL || !walletsSOL[0]) {
-      return;
-    }
-    const wallet = walletsSOL.find((w) => w.connectorType === "embedded");
-    if (wallet) {
-      if (walletSOL && wallet.address === walletSOL.accounts[0].address) {
-        if (walletSOL.chain.id === SolanaChainsMap.get(network)) {
-          return;
-        }
-      }
-      setWalletSOL({
-        label: "privy",
-        icon: "",
-        provider: {
-          signMessage: wallet.signMessage,
-          signTransaction: wallet.signTransaction,
-          sendTransaction: wallet.sendTransaction,
-          network: solanaInfo?.network ?? walletAdapterBase.WalletAdapterNetwork.Devnet,
-          rpcUrl: solanaInfo?.rpcUrl ?? void 0
-        },
-        accounts: [
-          {
-            address: wallet.address
-          }
-        ],
-        chains: [
-          {
-            id: SolanaChainsMap.get(network),
-            namespace: types.ChainNamespace.solana
-          }
-        ],
-        chain: {
-          id: SolanaChainsMap.get(network),
-          namespace: types.ChainNamespace.solana
-        }
-      });
-    }
-  }, [
-    walletsSOL,
-    authenticated,
-    createSolanaWallet,
-    solanaReady,
-    user,
-    walletSOL,
-    network,
-    solanaInfo
-  ]);
-  React12.useEffect(() => {
-    if (isConnected && linkedAccount) {
-      if (connectedRef.current) {
-        return;
-      }
-      connectedRef.current = true;
-      track(types.EnumTrackerKeys.socialLoginSuccess, {
-        type: linkedAccount.type,
-        address: linkedAccount.address
-      });
-    }
-  }, [isConnected, linkedAccount, connectedRef]);
+  }, [wagmiConnectors2]);
   const value = React12.useMemo(
     () => ({
+      connectors,
       connect,
-      walletEVM,
-      walletSOL,
-      isConnected,
+      wallet,
+      connectedChain,
+      setChain,
       disconnect,
-      switchChain,
-      linkedAccount,
-      exportWallet,
-      createEvmWallet,
-      createSolanaWallet
+      isConnected
     }),
     [
+      connectors,
       connect,
-      walletEVM,
-      walletSOL,
-      isConnected,
+      wallet,
+      connectedChain,
+      setChain,
       disconnect,
-      switchChain,
-      linkedAccount,
-      exportWallet,
-      createEvmWallet,
-      createSolanaWallet
+      isConnected
     ]
   );
-  return /* @__PURE__ */ React12__default.default.createElement(PrivyWalletContext.Provider, { value }, children);
+  return /* @__PURE__ */ React12__default.default.createElement(WagmiWalletContext.Provider, { value }, children);
 };
-function usePrivyWallet() {
-  const context = React12.useContext(PrivyWalletContext);
+function useWagmiWallet() {
+  const context = React12.useContext(WagmiWalletContext);
   if (!context) {
-    throw new Error("usePrivyWallet must be used within a PrivyWalletProvider");
+    throw new Error("useWagmiWallet must be used within a WagmiWalletProvider");
   }
   return context;
 }
+
+// src/hooks/useWallet.tsx
 function useWallet2() {
   const { track } = hooks.useTrack();
   const { walletChainType } = useWalletConnectorPrivy();
@@ -682,7 +691,7 @@ function useWallet2() {
         }
         isManual.current = true;
         return setChainPrivy(parseInt(chain.chainId)).then((res) => {
-          track(types.EnumTrackerKeys.switchNetworkSuccess, {
+          track(types.TrackerEventName.switchNetworkSuccess, {
             from_chain: storageChain?.chainId,
             to_chain: chain.chainId
           });
@@ -711,7 +720,7 @@ function useWallet2() {
         if (tempNamespace === types.ChainNamespace.evm) {
           await setChainEvm(parseInt(chain.chainId));
           setStorageChain(parseInt(chain.chainId));
-          track(types.EnumTrackerKeys.switchNetworkSuccess, {
+          track(types.TrackerEventName.switchNetworkSuccess, {
             from_chain: storageChain?.chainId,
             to_chain: chain.chainId
           });
@@ -767,7 +776,7 @@ function useWallet2() {
         }
       }
     }
-    track(types.EnumTrackerKeys.clickSwitchWallet, {
+    track(types.TrackerEventName.clickSwitchWallet, {
       fromWallet,
       toWallet
     });
@@ -2120,12 +2129,10 @@ function InitSolanaProvider({
     } else {
       rpcUrl = devnetRpc ?? null;
     }
-    if (rpcUrl) {
-      setSolanaInfo({
-        rpcUrl,
-        network: network === "mainnet" ? walletAdapterBase.WalletAdapterNetwork.Mainnet : walletAdapterBase.WalletAdapterNetwork.Devnet
-      });
-    }
+    setSolanaInfo({
+      rpcUrl,
+      network: network === "mainnet" ? walletAdapterBase.WalletAdapterNetwork.Mainnet : walletAdapterBase.WalletAdapterNetwork.Devnet
+    });
   }, [network, mainnetRpc, devnetRpc, setSolanaInfo]);
   return /* @__PURE__ */ React12__default.default.createElement(walletAdapterReact.WalletProvider, { wallets, onError }, children);
 }