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

package/dist/index.js

@@ -45,7 +45,6 @@ import {
   checkWallet,
   WalletType as GrazWalletType,
   useAccount,
-  useActiveChainIds,
   useActiveWalletType,
   useConnect,
   useDisconnect,
@@ -94,19 +93,21 @@ function CosmosExternalWalletProvider({
   multiChain,
   shouldUseSuggestChainAndConnect,
   onSwitchChain,
-  para
+  para,
+  walletsWithFullAuth,
+  connectedWallet
 }) {
   var _a, _b;
   const { suggestAndConnectAsync } = useSuggestChainAndConnect();
   const {
     data: account,
     isConnecting,
-    isReconnecting
+    isReconnecting,
+    isConnected
   } = useAccount({
     chainId: multiChain ? chains.map((c) => c.chainId) : selectedChainId,
     multiChain
   });
-  const activeChainIds = useActiveChainIds();
   const { connectAsync } = useConnect();
   const { disconnectAsync } = useDisconnect();
   const { walletType } = useActiveWalletType();
@@ -120,30 +121,51 @@ function CosmosExternalWalletProvider({
     yield para.logout();
   });
   const switchChain = (chainId) => __async(this, null, function* () {
+    var _a2;
     let error;
-    const hasActiveChain = activeChainIds.includes(chainId);
-    if (!hasActiveChain) {
-      updateExternalWalletState({ isConnecting: true });
-      let changeResp;
-      changeResp = yield connect(walletType, chainId);
-      onSwitchWallet(changeResp);
-      updateExternalWalletState({ isConnecting: false });
-      if (changeResp.error) {
-        error = [changeResp == null ? void 0 : changeResp.error];
+    let changeResp = {};
+    try {
+      let chainInfo;
+      if (shouldUseSuggestChainAndConnect) {
+        chainInfo = getChainInfo({ chainId });
+        if (!chainInfo) {
+          console.error("Chain not found.");
+          return;
+        }
+      }
+      const connectedWallet2 = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType, chainInfo }) : connectAsync({ walletType, chainId });
+      changeResp.address = connectedWallet2.accounts[chainId].bech32Address;
+      changeResp.bufferAddress = connectedWallet2.accounts[chainId].address.toString();
+    } catch (err) {
+      if (err.message === "No wallet exists") {
+        changeResp.error = err.message;
+      } else {
+        console.error("Graz connection error:", err);
+        changeResp.error = "An unknown error occurred.";
       }
     }
-    if (!error) {
+    onSwitchWallet(changeResp);
+    if (!changeResp.error) {
       onSwitchChain(chainId);
+      const storedExternalWallet = para.externalWallets[(_a2 = changeResp.bufferAddress) != null ? _a2 : ""];
+      para.setExternalWallet({
+        address: changeResp.bufferAddress,
+        type: WalletType.COSMOS,
+        provider: getProviderName(walletType),
+        addressBech32: changeResp.address,
+        withFullParaAuth: storedExternalWallet.isExternalWithParaAuth
+      });
     }
     return { error };
   });
-  const login = (bufferAddress2, address2, providerName) => __async(this, null, function* () {
+  const login = (bufferAddress2, address2, isFullAuthWallet, providerName) => __async(this, null, function* () {
     try {
       return yield para.externalWalletLogin({
         address: bufferAddress2,
         type: WalletType.COSMOS,
         provider: providerName,
-        addressBech32: address2
+        addressBech32: address2,
+        withFullParaAuth: isFullAuthWallet
       });
     } catch (err) {
       yield reset();
@@ -152,21 +174,27 @@ function CosmosExternalWalletProvider({
   });
   useEffect(() => {
     const storedExternalWallet = para.externalWallets[bufferAddress != null ? bufferAddress : ""];
-    if (!isConnecting && !isReconnecting && !isLocalConnecting && address && storedExternalWallet && storedExternalWallet.address !== address && walletType !== GrazWalletType.PARA) {
-      para.setExternalWallet({
-        address: bufferAddress,
-        type: WalletType.COSMOS,
-        provider: getProviderName(walletType),
-        addressBech32: address
-      });
-    }
-  }, [isConnecting, isReconnecting, address]);
-  useEffect(() => {
-    const storedExternalWallet = para.externalWallets[bufferAddress != null ? bufferAddress : ""];
-    if (!isConnecting && !isReconnecting && !isLocalConnecting && !!bufferAddress && !storedExternalWallet && walletType !== GrazWalletType.PARA) {
+    if (isConnected && !isConnecting && !isReconnecting && !isLocalConnecting && !!bufferAddress && !storedExternalWallet && walletType !== GrazWalletType.PARA) {
       reset();
     }
-  }, [isConnecting, isReconnecting]);
+  }, [isConnecting, isLocalConnecting, isReconnecting, isConnected]);
+  useEffect(() => {
+    const connect2 = () => __async(this, null, function* () {
+      var _a2;
+      if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedWallet.type === WalletType.COSMOS && (connectedWallet.isExternal ? walletType !== ((_a2 = connectedWallet.name) == null ? void 0 : _a2.toLowerCase()) : walletType !== "para")) {
+        const isLoggedIn = yield para.isFullyLoggedIn();
+        if (!isLoggedIn) {
+          return;
+        }
+        const chainId = multiChain ? chains.map((c) => c.chainId) : selectedChainId;
+        yield connectAsync({
+          walletType: connectedWallet.isExternal ? connectedWallet.name.toLowerCase() : GrazWalletType.PARA,
+          chainId
+        });
+      }
+    });
+    connect2();
+  }, [isLocalConnecting, isConnecting, isReconnecting, walletType, connectedWallet]);
   const signMessage = (message) => __async(this, null, function* () {
     const wallet = grazGetWallet(walletType);
     if (!wallet) {
@@ -193,7 +221,10 @@ function CosmosExternalWalletProvider({
     return signature;
   });
   const connect = (walletType2, chainId) => __async(this, null, function* () {
+    var _a2;
     updateExternalWalletState({ isConnecting: true });
+    const walletId = (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.id;
+    const isFullAuthWallet = walletsWithFullAuth.includes(walletId.toUpperCase());
     if (!chainId) {
       yield disconnectAsync();
     }
@@ -224,13 +255,13 @@ function CosmosExternalWalletProvider({
             return;
           }
         }
-        const connectedWallet = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType: walletType2, chainInfo }) : connectAsync({ walletType: walletType2, chainId: _chainId });
-        const firstChain = typeof _chainId === "string" ? _chainId : _chainId[0];
-        address2 = connectedWallet.accounts[firstChain].bech32Address;
-        bufferAddress2 = connectedWallet.accounts[firstChain].address.toString();
-        if (connectedWallet.accounts[firstChain]) {
+        const connectedWallet2 = yield shouldUseSuggestChainAndConnect ? suggestAndConnectAsync({ walletType: walletType2, chainInfo }) : connectAsync({ walletType: walletType2, chainId: _chainId });
+        const firstChain = !chainId ? selectedChainId : typeof _chainId === "string" ? _chainId : _chainId[0];
+        address2 = connectedWallet2.accounts[firstChain].bech32Address;
+        bufferAddress2 = connectedWallet2.accounts[firstChain].address.toString();
+        if (connectedWallet2.accounts[firstChain]) {
           try {
-            const loginResp = yield login(bufferAddress2, address2, getProviderName(walletType2));
+            const loginResp = yield login(bufferAddress2, address2, isFullAuthWallet, getProviderName(walletType2));
             userExists = loginResp.userExists;
             isVerified = loginResp.isVerified;
             verificationMessage.current = loginResp.signatureVerificationMessage;
@@ -252,14 +283,15 @@ function CosmosExternalWalletProvider({
     updateExternalWalletState({ isConnecting: false });
     return { address: address2, bufferAddress: bufferAddress2, error, userExists, isVerified };
   });
+  const getWallet = (walletType2) => incompleteWallets.find((w) => w.grazType === walletType2 || w.grazMobileType === walletType2);
   const getProviderName = (walletType2) => {
     var _a2;
-    return (_a2 = incompleteWallets.find((w) => w.grazType === walletType2 || w.grazMobileType === walletType2)) == null ? void 0 : _a2.name;
+    return (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.name;
   };
   const wallets = incompleteWallets.map((wallet) => {
     return __spreadProps(__spreadValues({
       connect: () => connect(wallet.grazType),
-      connectMobile: () => connect(wallet.grazMobileType),
+      connectMobile: () => connect(wallet.grazType),
       getQrUri: () => "",
       type: WalletType.COSMOS
     }, wallet), {

package/dist/providers/CosmosExternalWalletContext.d.ts

@@ -1,8 +1,8 @@
 import { PropsWithChildren } from 'react';
 import { ParaCosmosProviderConfig } from './ParaCosmosContext.js';
 import { WalletWithType } from '../types/Wallet.js';
-import ParaWeb from '@getpara/web-sdk';
-import type { CommonChain, CommonWallet } from '@getpara/react-common';
+import ParaWeb, { Wallet } from '@getpara/web-sdk';
+import type { CommonChain, CommonWallet, TExternalWallet } from '@getpara/react-common';
 export type CosmosExternalWalletContextType = {
     wallets: CommonWallet[];
     chains: CommonChain[];
@@ -33,9 +33,11 @@ export type CosmosExternalWalletProviderConfig = {
         error?: string;
     }) => void;
     para: ParaWeb;
+    walletsWithFullAuth: TExternalWallet[];
+    connectedWallet?: Omit<Wallet, 'signer'> | null;
 };
 export type CosmosExternalWalletProviderConfigFull = {
     wallets: WalletWithType[];
 } & Omit<ParaCosmosProviderConfig, 'wallets'> & CosmosExternalWalletProviderConfig;
 export declare const CosmosExternalWalletContext: import("react").Context<CosmosExternalWalletContextType>;
-export declare function CosmosExternalWalletProvider({ children, onSwitchWallet, selectedChainId, wallets: incompleteWallets, chains, multiChain, shouldUseSuggestChainAndConnect, onSwitchChain, para, }: CosmosExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;
+export declare function CosmosExternalWalletProvider({ children, onSwitchWallet, selectedChainId, wallets: incompleteWallets, chains, multiChain, shouldUseSuggestChainAndConnect, onSwitchChain, para, walletsWithFullAuth, connectedWallet, }: CosmosExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/cosmos-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",
@@ -19,14 +19,14 @@
     "@cosmjs/proto-signing": "<=0.31.3",
     "@cosmjs/stargate": "<=0.31.3",
     "@cosmjs/tendermint-rpc": "<=0.31.3",
-    "@getpara/graz": "^0.1.0",
-    "@getpara/web-sdk": "^2.0.0-dev.0",
+    "@getpara/graz": "^1.0.0-dev.1",
+    "@getpara/web-sdk": "^2.0.0-dev.1",
     "@leapwallet/cosmos-social-login-capsule-provider": "^0.0.41",
     "zustand": "^4.5.2",
     "zustand-sync-tabs": "^0.2.2"
   },
   "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"
@@ -39,5 +39,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "f94ef031ef0e1894f5f0800e55f6ca2904641780"
+  "gitHead": "426e843bd6084fb2e5f30ab87b02c79fc2f52832"
 }