@getpara/cosmos-wallet-connectors 2.11.0 → 2.13.0

package/dist/providers/CosmosExternalWalletContext.d.ts

@@ -12,4 +12,4 @@ export type CosmosExternalWalletContextType = ExternalWalletContextType<CosmosSi
 export type CosmosExternalWalletProviderConfig = ExternalWalletProviderConfigBase;
 export type CosmosExternalWalletProviderConfigFull = ExternalWalletProviderConfig<WalletWithType, Omit<ParaCosmosProviderConfig, 'wallets'>>;
 export declare const CosmosExternalWalletContext: import("react").Context<CosmosExternalWalletContextType>;
-export declare function CosmosExternalWalletProvider({ children, onSwitchWallet, selectedChainId, wallets: incompleteWallets, chains, multiChain, shouldUseSuggestChainAndConnect, onSwitchChain, para, walletsWithFullAuth, connectedWallet: connectedWalletProp, includeWalletVerification, connectionOnly, }: CosmosExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function CosmosExternalWalletProvider({ children, onSwitchWallet, selectedChainId, wallets: incompleteWallets, chains, multiChain, shouldUseSuggestChainAndConnect, onSwitchChain, para, walletsWithFullAuth, includeWalletVerification, connectionOnly, }: CosmosExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/providers/CosmosExternalWalletContext.js

@@ -19,7 +19,9 @@ import {
   WALLET_TYPES
 } from "graz";
 import { useExternalWalletStore } from "../stores/useStore.js";
-import { rawSecp256k1PubkeyToRawAddress } from "@getpara/web-sdk";
+import {
+  rawSecp256k1PubkeyToRawAddress
+} from "@getpara/web-sdk";
 import {
   defaultCosmosExternalWallet
 } from "@getpara/react-common";
@@ -39,7 +41,6 @@ function CosmosExternalWalletProvider({
   onSwitchChain,
   para,
   walletsWithFullAuth,
-  connectedWallet: connectedWalletProp,
   includeWalletVerification,
   connectionOnly
 }) {
@@ -47,9 +48,8 @@ function CosmosExternalWalletProvider({
   const { suggestAndConnectAsync } = useSuggestChainAndConnect();
   const {
     data: account,
-    isConnecting,
-    isReconnecting,
-    isConnected
+    isConnected,
+    isDisconnected
   } = useAccount(
     multiChain ? {
       chainId: chains.map((c) => c.chainId)
@@ -60,18 +60,100 @@ function CosmosExternalWalletProvider({
   const { connectAsync } = useConnect();
   const { disconnectAsync, status: disconnectStatus } = useDisconnect();
   const { walletType } = useActiveWalletType();
-  const isLocalConnecting = useExternalWalletStore((state) => state.isConnecting);
   const updateExternalWalletState = useExternalWalletStore((state) => state.updateState);
-  const isConnectError = useRef(false);
-  const connectedWallet = connectedWalletProp ? para.findWallet(connectedWalletProp.id, connectedWalletProp.type) : null;
-  const ethAddress = (_b = (_a = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _a.ethereumHexAddress) == null ? void 0 : _b.toLowerCase();
-  const address = (_c = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _c.bech32Address;
   const disconnectTypeRef = useRef();
-  const verificationMessage = useRef();
-  const reset = () => __async(this, null, function* () {
-    yield disconnectAsync();
-    yield para.logout();
-  });
+  const ethAddressRef = useRef((_b = (_a = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _a.ethereumHexAddress) == null ? void 0 : _b.toLowerCase());
+  const bech32AddressRef = useRef((_c = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _c.bech32Address);
+  const wasConnectedRef = useRef(isConnected);
+  const disconnectionCallbackRef = useRef(null);
+  const walletChangeCallbackRef = useRef(null);
+  useEffect(() => {
+    var _a2;
+    if (walletChangeCallbackRef.current && (account == null ? void 0 : account[selectedChainId])) {
+      const ethAddress = (_a2 = account[selectedChainId].ethereumHexAddress) == null ? void 0 : _a2.toLowerCase();
+      const bech32Address = account[selectedChainId].bech32Address;
+      if (ethAddress && bech32Address) {
+        const { provider, providerId } = getProvider(walletType);
+        walletChangeCallbackRef.current({
+          externalWallet: {
+            providerId,
+            provider,
+            address: ethAddress,
+            addressBech32: bech32Address,
+            type: "COSMOS"
+          }
+        });
+      }
+    }
+  }, [account, selectedChainId, walletType]);
+  useEffect(() => {
+    if (wasConnectedRef.current && isDisconnected) {
+      ethAddressRef.current = void 0;
+      bech32AddressRef.current = void 0;
+      if (disconnectionCallbackRef.current) {
+        disconnectionCallbackRef.current();
+      }
+    }
+    wasConnectedRef.current = isConnected;
+  }, [isConnected, isDisconnected]);
+  useEffect(() => {
+    if (!para.isSetup) {
+      return;
+    }
+    const initializeConfig = () => __async(this, null, function* () {
+      yield para.initExternalWalletProvider({
+        type: "COSMOS",
+        interface: {
+          disconnect: () => __async(this, null, function* () {
+            yield disconnectAsync();
+          }),
+          getAddress: () => __async(this, null, function* () {
+            return ethAddressRef.current;
+          }),
+          signMessage: (_0) => __async(this, [_0], function* ({ message }) {
+            try {
+              const wallet = grazGetWallet(walletType);
+              const signAddress = bech32AddressRef.current;
+              const signEthAddress = ethAddressRef.current;
+              if (!wallet || !signAddress || !signEthAddress) {
+                throw new Error("No connected wallet found");
+              }
+              return yield signMessageBase({
+                message,
+                wallet,
+                bech32Address: signAddress,
+                ethAddress: signEthAddress
+              });
+            } catch (e) {
+              console.error(e);
+              if (e.message.includes("User rejected the request")) {
+                throw new Error("Signature request rejected");
+              }
+              console.error("Cosmos signature error:", e.message);
+              throw new Error("An unknown error occurred");
+            }
+          }),
+          watchDisconnection: (callback) => {
+            disconnectionCallbackRef.current = callback;
+            return () => {
+              disconnectionCallbackRef.current = null;
+            };
+          },
+          watchWalletChange: (callback) => {
+            walletChangeCallbackRef.current = callback;
+            return () => {
+              walletChangeCallbackRef.current = null;
+            };
+          },
+          connectParaConnector: () => __async(this, null, function* () {
+            const chainId = multiChain ? chains.map((c) => c.chainId) : selectedChainId;
+            yield connectAsync({ walletType: GrazWalletType.PARA, chainId });
+          })
+        }
+      });
+    });
+    initializeConfig();
+  }, [para.isSetup]);
   const switchChain = (chainId) => __async(this, null, function* () {
     var _a2;
     let error;
@@ -85,9 +167,9 @@ function CosmosExternalWalletProvider({
           return;
         }
       }
-      const connectedWallet2 = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType, chainInfo }) : connectAsync({ walletType, chainId });
-      changeResp.address = connectedWallet2.accounts[chainId].bech32Address;
-      changeResp.ethAddress = formatEthHexAddress(connectedWallet2.accounts[chainId].address);
+      const connectedWallet = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType, chainInfo }) : connectAsync({ walletType, chainId });
+      changeResp.address = connectedWallet.accounts[chainId].bech32Address;
+      changeResp.ethAddress = formatEthHexAddress(connectedWallet.accounts[chainId].address);
     } catch (err) {
       if (err.message === "No wallet exists") {
         changeResp.error = err.message;
@@ -115,87 +197,54 @@ function CosmosExternalWalletProvider({
     }
     return { error };
   });
-  const login = (_0) => __async(this, [_0], function* ({
-    address: address2,
-    addressBech32,
-    withFullParaAuth,
-    providerId,
-    provider
-  }) {
-    try {
-      return yield para.loginExternalWallet({
-        externalWallet: {
-          partnerId: para.partnerId,
-          address: address2,
-          type: "COSMOS",
-          provider,
-          providerId,
-          addressBech32,
-          withFullParaAuth,
-          withVerification: includeWalletVerification,
-          isConnectionOnly: connectionOnly
-        },
-        uri: window == null ? void 0 : window.location.origin,
-        chainId: selectedChainId
+  const switchAccount = useCallback(
+    (connectorName) => __async(this, null, function* () {
+      const chainId = multiChain ? chains.map((c) => c.chainId) : selectedChainId;
+      yield connectAsync({
+        walletType: connectorName.toLowerCase(),
+        chainId
       });
-    } catch (e) {
-      yield reset();
-      throw "Error logging you in. Please try again.";
-    }
+    }),
+    [connectAsync]
+  );
+  const signMessageBase = (_0) => __async(this, [_0], function* ({
+    message,
+    wallet,
+    bech32Address,
+    ethAddress
+  }) {
+    const publicKey = (yield wallet.getKey(selectedChainId)).pubKey;
+    const signature = yield wallet.signArbitrary(selectedChainId, bech32Address, message);
+    return {
+      address: ethAddress,
+      addressBech32: bech32Address,
+      signature: signature.signature,
+      cosmosPublicKeyHex: Buffer.from(publicKey).toString("hex"),
+      cosmosSigner: bech32Address
+    };
   });
-  useEffect(() => {
-    const storedExternalWallet = para.externalWallets[ethAddress != null ? ethAddress : ""];
-    if (isConnected && !isConnecting && !isReconnecting && !isLocalConnecting && !!ethAddress && !storedExternalWallet && walletType !== GrazWalletType.PARA && !disconnectTypeRef.current) {
-      reset();
-    }
-  }, [isConnecting, isLocalConnecting, isReconnecting, isConnected]);
-  useEffect(() => {
-    const connect2 = () => __async(this, null, function* () {
-      var _a2;
-      if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedWallet.type === "COSMOS" && (connectedWallet.isExternal ? walletType !== ((_a2 = connectedWallet.name) == null ? void 0 : _a2.toLowerCase()) : walletType !== "para") && !disconnectTypeRef.current && !isConnectError.current) {
-        const isLoggedIn = yield para.isFullyLoggedIn();
-        if (!isLoggedIn) {
-          return;
-        }
-        const chainId = multiChain ? chains.map((c) => c.chainId) : selectedChainId;
-        const targetWalletType = connectedWallet.isExternal ? connectedWallet.name.toLowerCase() : GrazWalletType.PARA;
-        try {
-          yield connectAsync({
-            walletType: targetWalletType,
-            chainId
-          });
-        } catch (e) {
-          isConnectError.current = true;
-        }
-      }
-    });
-    connect2();
-  }, [isLocalConnecting, isConnecting, isReconnecting, walletType, connectedWallet]);
   const signMessage = (_0) => __async(this, [_0], function* ({ message, externalWallet }) {
-    let wallet, signAddress, signEthAddress;
+    let wallet, bech32Address, ethAddress;
     if (externalWallet) {
       const commonWallet = wallets.find((w) => w.id === externalWallet.providerId);
       wallet = grazGetWallet(commonWallet == null ? void 0 : commonWallet.grazType);
-      signAddress = externalWallet.addressBech32;
-      signEthAddress = externalWallet.address;
+      bech32Address = externalWallet.addressBech32;
+      ethAddress = externalWallet.address;
     } else {
       wallet = grazGetWallet(walletType);
-      signAddress = address;
-      signEthAddress = ethAddress;
+      bech32Address = bech32AddressRef.current;
+      ethAddress = ethAddressRef.current;
     }
     if (!wallet) {
       return { error: "Connected wallet not found" };
     }
     try {
-      const publicKey = (yield wallet.getKey(selectedChainId)).pubKey;
-      const signature = yield wallet.signArbitrary(selectedChainId, signAddress, message);
-      return {
-        address: signEthAddress,
-        addressBech32: signAddress,
-        signature: signature.signature,
-        cosmosPublicKeyHex: Buffer.from(publicKey).toString("hex"),
-        cosmosSigner: signAddress
-      };
+      return yield signMessageBase({
+        message,
+        wallet,
+        bech32Address,
+        ethAddress
+      });
     } catch (e) {
       if (e.message.includes("Request rejected")) {
         return { error: "Signature request rejected" };
@@ -203,12 +252,8 @@ function CosmosExternalWalletProvider({
       return { error: "An unknown error occurred" };
     }
   });
-  const signVerificationMessage = () => __async(this, null, function* () {
-    const signature = yield signMessage({ message: verificationMessage.current });
-    return signature;
-  });
   const connectBase = (walletType2, chainId) => __async(this, null, function* () {
-    var _a2;
+    var _a2, _b2;
     if (!chainId) {
       yield disconnectAsync();
     }
@@ -220,6 +265,8 @@ function CosmosExternalWalletProvider({
       throw new Error("Graz wallet type not provided.");
     }
     try {
+      const walletId = (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.id;
+      const isFullAuthWallet = walletsWithFullAuth === "ALL" || walletsWithFullAuth.includes(walletId.toUpperCase());
       let chainInfo;
       if (shouldUseSuggestChainAndConnect) {
         if (typeof _chainId !== "string") {
@@ -232,50 +279,63 @@ function CosmosExternalWalletProvider({
           return;
         }
       }
-      const connectedWallet2 = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType: walletType2, chainInfo }) : connectAsync({ walletType: walletType2, chainId: _chainId });
+      const connectedWallet = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType: walletType2, chainInfo }) : connectAsync({ walletType: walletType2, chainId: _chainId });
       const firstChain = !chainId ? selectedChainId : typeof _chainId === "string" ? _chainId : _chainId[0];
-      const addressBech32 = connectedWallet2.accounts[firstChain].bech32Address;
+      const addressBech32 = connectedWallet.accounts[firstChain].bech32Address;
       let rawAddress;
-      const accountAddress = connectedWallet2.accounts[firstChain].address;
+      const accountAddress = connectedWallet.accounts[firstChain].address;
       if (!accountAddress || accountAddress.length === 0 || accountAddress.byteLength === 0) {
-        const pubKey = connectedWallet2.accounts[firstChain].pubKey;
+        const pubKey = connectedWallet.accounts[firstChain].pubKey;
         rawAddress = rawSecp256k1PubkeyToRawAddress(pubKey);
       } else {
         rawAddress = accountAddress;
       }
-      const address2 = formatEthHexAddress(rawAddress);
+      const address = formatEthHexAddress(rawAddress);
       const { provider, providerId } = getProvider(walletType2);
       return {
         partnerId: para.partnerId,
         type: "COSMOS",
-        address: address2,
+        address,
         addressBech32,
         provider,
-        providerId
+        providerId,
+        withFullParaAuth: isFullAuthWallet,
+        withVerification: includeWalletVerification,
+        isConnectionOnly: connectionOnly
       };
     } catch (e) {
       let error;
       if (e.message === "No wallet exists") {
         error = e.message;
       } else {
-        error = `Graz connection error: ${(_a2 = e == null ? void 0 : e.message) != null ? _a2 : e}`;
+        error = `Graz connection error: ${(_b2 = e == null ? void 0 : e.message) != null ? _b2 : e}`;
       }
       throw error;
     }
   });
-  const connect = (walletType2, chainId) => __async(this, null, function* () {
+  const connectCallback = (walletType2) => {
+    return () => __async(this, null, function* () {
+      try {
+        const _chainId = multiChain ? chains.map((c) => c.chainId) : selectedChainId;
+        const firstChain = typeof _chainId === "string" ? _chainId : _chainId[0];
+        const walletInfo = yield connectBase(walletType2, firstChain);
+        ethAddressRef.current = walletInfo.address;
+        bech32AddressRef.current = walletInfo.addressBech32;
+        return { externalWallet: walletInfo, chainId: firstChain };
+      } catch (e) {
+        throw e;
+      }
+    });
+  };
+  const connect = (walletType2) => __async(this, null, function* () {
     var _a2, _b2;
     updateExternalWalletState({ isConnecting: true });
-    const walletId = (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.id;
-    const isFullAuthWallet = walletsWithFullAuth === "ALL" || walletsWithFullAuth.includes(walletId.toUpperCase());
     try {
-      const externalWallet = yield connectBase(walletType2, chainId);
-      const authState = yield login(__spreadProps(__spreadValues({}, externalWallet), {
-        withFullParaAuth: isFullAuthWallet
-      }));
-      verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
+      const authState = yield para.connectExternalWallet({
+        connect: connectCallback(walletType2)
+      });
       return {
-        address: externalWallet.address,
+        address: (_a2 = authState.externalWallet) == null ? void 0 : _a2.address,
         authState
       };
     } catch (e) {
@@ -382,9 +442,9 @@ function CosmosExternalWalletProvider({
           disconnect: disconnectAsync,
           disconnectStatus,
           switchChain,
+          switchConnection: switchAccount,
           connectParaEmbedded,
           signMessage,
-          signVerificationMessage,
           requestInfo,
           disconnectBase
         }, externalHooks),
@@ -394,9 +454,9 @@ function CosmosExternalWalletProvider({
           selectedChainId,
           disconnectAsync,
           switchChain,
+          switchAccount,
           connectParaEmbedded,
           signMessage,
-          signVerificationMessage,
           requestInfo,
           disconnectBase
         ]

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@getpara/cosmos-wallet-connectors",
-  "version": "2.11.0",
+  "version": "2.13.0",
   "dependencies": {
-    "@getpara/graz-connector": "2.11.0",
-    "@getpara/react-common": "2.11.0",
-    "@getpara/web-sdk": "2.11.0",
+    "@getpara/graz-connector": "2.13.0",
+    "@getpara/react-common": "2.13.0",
+    "@getpara/web-sdk": "2.13.0",
     "@leapwallet/cosmos-social-login-capsule-provider": "^0.0.41",
     "zustand": "^4.5.2",
     "zustand-sync-tabs": "^0.2.2"
@@ -23,7 +23,7 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "1cce45857320460cca03c4a9d0a59db169b222d6",
+  "gitHead": "75ac5d1ebe87366c23bb4e485481deb1b593e299",
   "main": "dist/index.js",
   "peerDependencies": {
     "graz": ">=0.4.1",