@getpara/cosmos-wallet-connectors 2.0.0-alpha.19 → 2.0.0-alpha.21

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export { CosmosExternalWalletContext } from './providers/CosmosExternalWalletContext.js';
-export type { CosmosExternalWalletContextType } from './providers/CosmosExternalWalletContext.js';
+export { type CosmosExternalWalletContextType, type CosmosSignResult, defaultCosmosExternalWallet, } from './providers/CosmosExternalWalletContext.js';
 export { ParaCosmosProvider } from './providers/ParaCosmosContext.js';
 export type { ParaCosmosProviderProps, ParaGrazProviderProps, ParaCosmosProviderConfig, } from './providers/ParaCosmosContext.js';
 export * from './wallets/connectors/index.js';

package/dist/index.js

@@ -1,9 +1,13 @@
 "use client";
 import "./chunk-IV3L3JVM.js";
 import { CosmosExternalWalletContext } from "./providers/CosmosExternalWalletContext.js";
+import {
+  defaultCosmosExternalWallet
+} from "./providers/CosmosExternalWalletContext.js";
 import { ParaCosmosProvider } from "./providers/ParaCosmosContext.js";
 export * from "./wallets/connectors/index.js";
 export {
   CosmosExternalWalletContext,
-  ParaCosmosProvider
+  ParaCosmosProvider,
+  defaultCosmosExternalWallet
 };

package/dist/providers/CosmosExternalWalletContext.d.ts

@@ -1,46 +1,26 @@
 import { PropsWithChildren } from 'react';
 import { ParaCosmosProviderConfig } from './ParaCosmosContext.js';
 import { WalletWithType } from '../types/Wallet.js';
-import ParaWeb, { Wallet } from '@getpara/web-sdk';
-import type { CommonChain, CommonWallet, TExternalWallet } from '@getpara/react-common';
-export type CosmosExternalWalletContextType = {
-    wallets: CommonWallet[];
-    chains: CommonChain[];
-    chainId?: string;
+import type { ChainManagement, ConnectParaEmbedded, ExternalWalletContextType, ExternalWalletProviderConfig, ExternalWalletProviderConfigBase, SignResult } from '@getpara/react-common';
+export declare const defaultCosmosExternalWallet: {
+    wallets: any[];
+    chains: any[];
+    chainId: any;
     disconnect: () => Promise<void>;
-    switchChain: (chainId: string) => Promise<{
-        error?: string[];
-    }>;
-    connectParaEmbedded: () => Promise<{
-        result?: unknown;
-        error?: string;
-    }>;
-    signMessage: (message: string) => Promise<{
-        signature?: string;
-        error?: string;
-    }>;
-    signVerificationMessage: () => Promise<{
-        address?: string;
-        signature?: string;
-        cosmosPublicKeyHex?: string;
-        cosmosSigner?: string;
-        error?: string;
-        addressBech32?: string;
-    }>;
+    switchChain: () => Promise<void>;
+    connectParaEmbedded: () => Promise<{}>;
+    signMessage: () => Promise<{}>;
+    signVerificationMessage: () => Promise<{}>;
+    requestInfo: () => Promise<any>;
+    disconnectBase: () => Promise<void>;
 };
-export type CosmosExternalWalletProviderConfig = {
-    onSwitchWallet?: (args: {
-        address?: string;
-        error?: string;
-    }) => void;
-    para: ParaWeb;
-    walletsWithFullAuth: TExternalWallet[];
-    includeWalletVerification?: boolean;
-    connectionOnly?: boolean;
-    connectedWallet?: Omit<Wallet, 'signer'> | null;
+export type CosmosSignResult = SignResult & {
+    cosmosPublicKeyHex?: string;
+    cosmosSigner?: string;
+    addressBech32?: string;
 };
-export type CosmosExternalWalletProviderConfigFull = {
-    wallets: WalletWithType[];
-} & Omit<ParaCosmosProviderConfig, 'wallets'> & CosmosExternalWalletProviderConfig;
+export type CosmosExternalWalletContextType = ExternalWalletContextType<CosmosSignResult> & ChainManagement<string> & ConnectParaEmbedded;
+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, includeWalletVerification, connectionOnly, }: CosmosExternalWalletProviderConfigFull & PropsWithChildren): import("react/jsx-runtime").JSX.Element;

package/dist/providers/CosmosExternalWalletContext.js

@@ -18,16 +18,19 @@ import {
   getWallet as grazGetWallet
 } from "@getpara/graz";
 import { useExternalWalletStore } from "../stores/useStore.js";
+import { rawSecp256k1PubkeyToRawAddress } from "@getpara/web-sdk";
 import { formatEthHexAddress } from "../utils/formatEthHexAddress.js";
 const defaultCosmosExternalWallet = {
   wallets: [],
   chains: [],
   chainId: void 0,
   disconnect: () => Promise.resolve(),
-  switchChain: () => Promise.resolve({}),
+  switchChain: () => Promise.resolve(),
   connectParaEmbedded: () => Promise.resolve({}),
   signMessage: () => Promise.resolve({}),
-  signVerificationMessage: () => Promise.resolve({})
+  signVerificationMessage: () => Promise.resolve({}),
+  requestInfo: () => Promise.resolve({}),
+  disconnectBase: () => Promise.resolve()
 };
 const CosmosExternalWalletContext = createContext(defaultCosmosExternalWallet);
 function CosmosExternalWalletProvider({
@@ -63,6 +66,7 @@ function CosmosExternalWalletProvider({
   const updateExternalWalletState = useExternalWalletStore((state) => state.updateState);
   const ethAddress = multiChain ? (_b = (_a = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _a.ethereumHexAddress) == null ? void 0 : _b.toLowerCase() : (_c = account == null ? void 0 : account.ethereumHexAddress) == null ? void 0 : _c.toLowerCase();
   const address = multiChain ? (_d = account == null ? void 0 : account[selectedChainId]) == null ? void 0 : _d.bech32Address : account == null ? void 0 : account.bech32Address;
+  const isLinkingAccount = useRef(false);
   const verificationMessage = useRef();
   const reset = () => __async(this, null, function* () {
     yield disconnectAsync();
@@ -96,10 +100,12 @@ function CosmosExternalWalletProvider({
     if (!changeResp.error) {
       onSwitchChain(chainId);
       const storedExternalWallet = para.externalWallets[(_a2 = changeResp.ethAddress) != null ? _a2 : ""];
+      const { provider, providerId } = getProvider(walletType);
       para.setExternalWallet({
         address: changeResp.ethAddress,
         type: "COSMOS",
-        provider: getProviderName(walletType),
+        provider,
+        providerId,
         addressBech32: changeResp.address,
         withFullParaAuth: storedExternalWallet.isExternalWithParaAuth,
         withVerification: includeWalletVerification,
@@ -108,15 +114,22 @@ function CosmosExternalWalletProvider({
     }
     return { error };
   });
-  const login = (ethAddress2, address2, isFullAuthWallet, providerName) => __async(this, null, function* () {
+  const login = (_0) => __async(this, [_0], function* ({
+    address: address2,
+    addressBech32,
+    withFullParaAuth,
+    providerId,
+    provider
+  }) {
     try {
       return yield para.loginExternalWallet({
         externalWallet: {
-          address: ethAddress2,
+          address: address2,
           type: "COSMOS",
-          provider: providerName,
-          addressBech32: address2,
-          withFullParaAuth: isFullAuthWallet,
+          provider,
+          providerId,
+          addressBech32,
+          withFullParaAuth,
           withVerification: includeWalletVerification,
           isConnectionOnly: connectionOnly
         }
@@ -128,14 +141,14 @@ function CosmosExternalWalletProvider({
   });
   useEffect(() => {
     const storedExternalWallet = para.externalWallets[ethAddress != null ? ethAddress : ""];
-    if (isConnected && !isConnecting && !isReconnecting && !isLocalConnecting && !!ethAddress && !storedExternalWallet && walletType !== GrazWalletType.PARA) {
+    if (isConnected && !isConnecting && !isReconnecting && !isLocalConnecting && !!ethAddress && !storedExternalWallet && walletType !== GrazWalletType.PARA && !isLinkingAccount.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")) {
+      if (!isLocalConnecting && !isConnecting && !isReconnecting && connectedWallet && connectedWallet.type === "COSMOS" && (connectedWallet.isExternal ? walletType !== ((_a2 = connectedWallet.name) == null ? void 0 : _a2.toLowerCase()) : walletType !== "para") && !isLinkingAccount.current) {
         const isLoggedIn = yield para.isFullyLoggedIn();
         if (!isLoggedIn) {
           return;
@@ -149,20 +162,30 @@ function CosmosExternalWalletProvider({
     });
     connect2();
   }, [isLocalConnecting, isConnecting, isReconnecting, walletType, connectedWallet]);
-  const signMessage = (message) => __async(this, null, function* () {
-    const wallet = grazGetWallet(walletType);
+  const signMessage = (_0) => __async(this, [_0], function* ({ message, externalWallet }) {
+    let wallet, signAddress, signEthAddress;
+    if (externalWallet) {
+      const commonWallet = wallets.find((w) => w.internalId === externalWallet.providerId);
+      wallet = grazGetWallet(commonWallet == null ? void 0 : commonWallet.grazType);
+      signAddress = externalWallet.addressBech32;
+      signEthAddress = externalWallet.address;
+    } else {
+      wallet = grazGetWallet(walletType);
+      signAddress = address;
+      signEthAddress = ethAddress;
+    }
     if (!wallet) {
       return { error: "Connected wallet not found" };
     }
     try {
       const publicKey = (yield wallet.getKey(selectedChainId)).pubKey;
-      const signature = yield wallet.signArbitrary(selectedChainId, address, message);
+      const signature = yield wallet.signArbitrary(selectedChainId, signAddress, message);
       return {
-        address: ethAddress,
-        addressBech32: address,
+        address: signEthAddress,
+        addressBech32: signAddress,
         signature: signature.signature,
         cosmosPublicKeyHex: Buffer.from(publicKey).toString("hex"),
-        cosmosSigner: address
+        cosmosSigner: signAddress
       };
     } catch (e) {
       if (e.message.includes("Request rejected")) {
@@ -172,74 +195,94 @@ function CosmosExternalWalletProvider({
     }
   });
   const signVerificationMessage = () => __async(this, null, function* () {
-    const signature = yield signMessage(verificationMessage.current);
+    const signature = yield signMessage({ message: verificationMessage.current });
     return signature;
   });
-  const connect = (walletType2, chainId) => __async(this, null, function* () {
+  const connectBase = (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();
     }
     const _chainId = chainId != null ? chainId : multiChain ? chains.map((c) => c.chainId) : selectedChainId;
     if (!_chainId) {
-      console.error("Chain id not provided.");
-      return;
+      throw new Error("Chain id not provided.");
     }
-    let address2;
-    let ethAddress2;
-    let error;
-    let authState;
     if (!walletType2) {
-      console.error("Graz wallet type not provided.");
-      return;
-    } else {
-      try {
-        let chainInfo;
-        if (shouldUseSuggestChainAndConnect) {
-          if (typeof _chainId !== "string") {
-            console.error("multiChain is not compatible with shouldUseSuggestChainAndConnect.");
-            return;
-          }
-          chainInfo = getChainInfo({ chainId: _chainId });
-          if (!chainInfo) {
-            console.error("Chain not found.");
-            return;
-          }
-        }
-        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;
-        ethAddress2 = formatEthHexAddress(connectedWallet2.accounts[firstChain].address);
-        if (connectedWallet2.accounts[firstChain]) {
-          try {
-            authState = yield login(ethAddress2, address2, isFullAuthWallet, getProviderName(walletType2));
-            verificationMessage.current = authState.stage === "verify" ? authState.signatureVerificationMessage : void 0;
-          } catch (err) {
-            authState = void 0;
-            ethAddress2 = void 0;
-            address2 = void 0;
-            error = err;
-          }
+      throw new Error("Graz wallet type not provided.");
+    }
+    try {
+      let chainInfo;
+      if (shouldUseSuggestChainAndConnect) {
+        if (typeof _chainId !== "string") {
+          console.error("multiChain is not compatible with shouldUseSuggestChainAndConnect.");
+          return;
         }
-      } catch (err) {
-        if (err.message === "No wallet exists") {
-          error = err.message;
-        } else {
-          console.error("Graz connection error:", err);
-          error = "An unknown error occurred.";
+        chainInfo = getChainInfo({ chainId: _chainId });
+        if (!chainInfo) {
+          console.error("Chain not found.");
+          return;
         }
       }
+      const connectedWallet2 = 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;
+      let rawAddress;
+      const accountAddress = connectedWallet2.accounts[firstChain].address;
+      if (!accountAddress || accountAddress.length === 0 || accountAddress.byteLength === 0) {
+        const pubKey = connectedWallet2.accounts[firstChain].pubKey;
+        rawAddress = rawSecp256k1PubkeyToRawAddress(pubKey);
+      } else {
+        rawAddress = accountAddress;
+      }
+      const address2 = formatEthHexAddress(rawAddress);
+      const { provider, providerId } = getProvider(walletType2);
+      return {
+        type: "COSMOS",
+        address: address2,
+        addressBech32,
+        provider,
+        providerId
+      };
+    } 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}`;
+      }
+      throw error;
+    }
+  });
+  const connect = (walletType2, chainId) => __async(this, null, function* () {
+    var _a2, _b2;
+    updateExternalWalletState({ isConnecting: true });
+    const walletId = (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.id;
+    const isFullAuthWallet = 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;
+      return {
+        address: externalWallet.address,
+        authState
+      };
+    } catch (e) {
+      return {
+        error: (_b2 = e == null ? void 0 : e.message) != null ? _b2 : e
+      };
+    } finally {
+      updateExternalWalletState({ isConnecting: false });
     }
-    updateExternalWalletState({ isConnecting: false });
-    return { authState, address: address2, ethAddress: ethAddress2, error };
   });
   const getWallet = (walletType2) => incompleteWallets.find((w) => w.grazType === walletType2 || w.grazMobileType === walletType2);
-  const getProviderName = (walletType2) => {
-    var _a2;
-    return (_a2 = getWallet(walletType2)) == null ? void 0 : _a2.name;
+  const getProvider = (walletType2) => {
+    const wallet = getWallet(walletType2);
+    return {
+      provider: wallet == null ? void 0 : wallet.name,
+      providerId: wallet == null ? void 0 : wallet.internalId
+    };
   };
   const wallets = incompleteWallets.map((wallet) => {
     return __spreadProps(__spreadValues({
@@ -270,6 +313,34 @@ function CosmosExternalWalletProvider({
       return { error };
     }
   }), [para, multiChain, chains, selectedChainId]);
+  const requestInfo = (providerId) => __async(this, null, function* () {
+    var _a2;
+    const wallet = wallets.find((w) => w.internalId === providerId);
+    if (!wallet) {
+      throw new Error(`Wallet for provider ${providerId} not found`);
+    }
+    isLinkingAccount.current = true;
+    try {
+      const externalWallet = yield connectBase(
+        wallet.grazType,
+        multiChain ? chains.map((c) => c.chainId) : selectedChainId
+      );
+      return externalWallet;
+    } catch (e) {
+      console.error("Error linking account:", e);
+      throw new Error((_a2 = e == null ? void 0 : e.message) != null ? _a2 : e);
+    }
+  });
+  const disconnectBase = () => __async(this, null, function* () {
+    var _a2;
+    isLinkingAccount.current = true;
+    try {
+      yield disconnectAsync();
+    } catch (e) {
+      console.error("Error linking account:", e);
+      throw new Error((_a2 = e == null ? void 0 : e.message) != null ? _a2 : e);
+    }
+  });
   return /* @__PURE__ */ jsx(
     CosmosExternalWalletContext.Provider,
     {
@@ -282,7 +353,9 @@ function CosmosExternalWalletProvider({
           switchChain,
           connectParaEmbedded,
           signMessage,
-          signVerificationMessage
+          signVerificationMessage,
+          requestInfo,
+          disconnectBase
         }),
         [
           wallets,
@@ -292,7 +365,9 @@ function CosmosExternalWalletProvider({
           switchChain,
           connectParaEmbedded,
           signMessage,
-          signVerificationMessage
+          signVerificationMessage,
+          requestInfo,
+          disconnectBase
         ]
       ),
       children
@@ -301,5 +376,6 @@ function CosmosExternalWalletProvider({
 }
 export {
   CosmosExternalWalletContext,
-  CosmosExternalWalletProvider
+  CosmosExternalWalletProvider,
+  defaultCosmosExternalWallet
 };

package/dist/wallets/connectors/cosmostation/cosmostation.js

@@ -6,6 +6,7 @@ import { isMobile } from "@getpara/web-sdk";
 const cosmostationWallet = () => {
   return {
     id: "cosmostation",
+    internalId: "COSMOSTATION",
     name: "Cosmostation",
     iconUrl: icon,
     isExtension: true,

package/dist/wallets/connectors/keplr/keplr.js

@@ -6,6 +6,7 @@ import { isMobile } from "@getpara/web-sdk";
 const keplrWallet = () => {
   return {
     id: "keplr",
+    internalId: "KEPLR",
     name: "Keplr",
     iconUrl: icon,
     isExtension: true,

package/dist/wallets/connectors/leap/leap.js

@@ -6,6 +6,7 @@ import { isMobile } from "@getpara/web-sdk";
 const leapWallet = () => {
   return {
     id: "leap",
+    internalId: "LEAP",
     name: "Leap",
     iconUrl: icon,
     isExtension: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getpara/cosmos-wallet-connectors",
-  "version": "2.0.0-alpha.19",
+  "version": "2.0.0-alpha.21",
   "type": "module",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -19,14 +19,14 @@
     "@cosmjs/proto-signing": "<=0.31.3",
     "@cosmjs/stargate": "<=0.33.1",
     "@cosmjs/tendermint-rpc": "<=0.31.3",
-    "@getpara/graz": "^1.0.0-dev.2",
-    "@getpara/web-sdk": "2.0.0-alpha.19",
+    "@getpara/graz": "^2.0.0-alpha.1",
+    "@getpara/web-sdk": "2.0.0-alpha.21",
     "@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-alpha.19",
+    "@getpara/react-common": "2.0.0-alpha.21",
     "@types/react": "^18.0.31",
     "@types/react-dom": "^18.2.7",
     "typescript": "^5.4.3"
@@ -39,5 +39,5 @@
     "dist",
     "package.json"
   ],
-  "gitHead": "80d2c5d7e1203fb12378aa29bfd4d7003c7d7075"
+  "gitHead": "03daa3537312bc52e0640225c8abdbf8047c15da"
 }