@rango-dev/provider-walletconnect-2 0.7.0 → 0.7.1-next.1

package/dist/session.d.ts

@@ -1,6 +1,6 @@
+import type { ConnectParams, CreateSessionParams, WCInstance } from './types';
 import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { PairingTypes, SessionTypes, SignClientTypes } from '@walletconnect/types';
-import { ConnectParams, CreateSessionParams, WCInstance } from './types';
+import type { PairingTypes, SessionTypes, SignClientTypes } from '@walletconnect/types';
 export declare function getLastSession(client: SignClient): SessionTypes.Struct;
 /**
  *

package/dist/session.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,EACL,YAAY,EACZ,YAAY,EACZ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAW9B,OAAO,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAEzE,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,uBAEhD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,CAAC,MAAM,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAW1C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAiC9B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GACjB,YAAY,CAAC,MAAM,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAkC9B;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA0B9B;AAoBD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAiB3E;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,mBAwB1D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM;;;IAgBlE;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC;IACnC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC;CACrC,CAAC;;;IAeH"}
+{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../src/session.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,mBAAmB,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC9E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EACV,YAAY,EACZ,YAAY,EACZ,eAAe,EAChB,MAAM,sBAAsB,CAAC;AAe9B,wBAAgB,cAAc,CAAC,MAAM,EAAE,UAAU,uBAEhD;AAED;;;;;GAKG;AACH,wBAAsB,cAAc,CAClC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,YAAY,CAAC,MAAM,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,GAAG,SAAS,CAAC,CAW1C;AAED;;;;;;;GAOG;AACH,wBAAsB,aAAa,CACjC,MAAM,EAAE,UAAU,EAClB,OAAO,EAAE,mBAAmB,GAC3B,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA+C9B;AAED;;;;;;GAMG;AACH,wBAAgB,aAAa,CAC3B,MAAM,EAAE,UAAU,GACjB,YAAY,CAAC,MAAM,GAAG,SAAS,CAMjC;AAED;;;;GAIG;AACH,wBAAsB,UAAU,CAC9B,MAAM,EAAE,UAAU,EAClB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CAkC9B;AAED;;;;GAIG;AACH,wBAAsB,6BAA6B,CACjD,QAAQ,EAAE,UAAU,EACpB,MAAM,EAAE,aAAa,GACpB,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC,CA0B9B;AAoBD;;;;GAIG;AACH,wBAAsB,oBAAoB,CAAC,MAAM,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,iBAiB3E;AAED;;;;GAIG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,mBAwB1D;AAED,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,YAAY,CAAC,MAAM;;;IAkBlE;AAED,wBAAgB,oBAAoB,CAClC,KAAK,EAAE,eAAe,CAAC,aAAa,CAAC;IACnC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC;CACrC,CAAC;;;IAeH"}

package/dist/signers/cosmos.d.ts

@@ -1,7 +1,6 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
-import type { GenericSigner } from 'rango-types';
-import { CosmosTransaction } from 'rango-types';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
+import type { CosmosTransaction, GenericSigner } from 'rango-types';
 declare class COSMOSSigner implements GenericSigner<CosmosTransaction> {
     private client;
     private session;

package/dist/signers/cosmos.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../../src/signers/cosmos.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC1E,OAAO,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AAEpD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAe,iBAAiB,EAAmB,MAAM,aAAa,CAAC;AA8B9E,cAAM,YAAa,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAC5D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK/C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,aAAa,CACjB,EAAE,EAAE,iBAAiB,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAoJ5B,OAAO,CAAC,iCAAiC;CAyC1C;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"cosmos.d.ts","sourceRoot":"","sources":["../../src/signers/cosmos.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,iBAAiB,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AA+BpE,cAAM,YAAa,YAAW,aAAa,CAAC,iBAAiB,CAAC;IAC5D,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK/C,WAAW,IAAI,OAAO,CAAC,MAAM,CAAC;IAIrC,aAAa,CACjB,EAAE,EAAE,iBAAiB,EACrB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAyJ5B,OAAO,CAAC,iCAAiC;CAyC1C;AAED,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.7.0",
+  "version": "0.7.1-next.1",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.js",
@@ -23,15 +23,15 @@
     "@cosmjs/launchpad": "^0.27.1",
     "@keplr-wallet/cosmos": "^0.9.12",
     "@keplr-wallet/simple-fetch": "^0.12.14",
-    "@rango-dev/signer-cosmos": "^0.14.0",
+    "@rango-dev/signer-cosmos": "^0.14.1-next.0",
     "@rango-dev/signer-evm": "^0.14.0",
     "@rango-dev/signer-solana": "^0.14.0",
     "@rango-dev/wallets-shared": "^0.14.0",
     "@solana/web3.js": "^1.67.2",
     "@walletconnect/encoding": "^1.0.2",
+    "@walletconnect/modal": "^2.6.1",
     "@walletconnect/sign-client": "^2.9.1",
     "@walletconnect/utils": "^2.9.1",
-    "@web3modal/standalone": "^2.4.3",
     "bs58": "^5.0.0",
     "caip": "^1.1.0",
     "cosmos-wallet": "^1.2.0",

package/readme.md

@@ -3,7 +3,6 @@
 
 ## Known issues
 
-- Trust wallet doesn't return optional namespaces other than evms on its response. So Solana and Cosmos will be ask for connect in wallet but we can not use them.
 - Using Private key to import wallets other than `Ethereum` will be problematic. Because it imports only a single blockchain and we are by default asking for `Ethereum`.  
 - Signing a transaction on Metamask goes through an internal error.
 - We couldn't update exist session during a bug in `@walletconnect/utils`, so we are creating new session for accessing to new chains.

package/src/helpers.ts

@@ -1,9 +1,12 @@
-import { WalletState } from '@rango-dev/wallets-shared';
+import type { CosmosMeta } from './types';
+import type { WalletState } from '@rango-dev/wallets-shared';
+import type { ProposalTypes } from '@walletconnect/types';
+import type { BlockchainMeta } from 'rango-types';
+
 import { Networks } from '@rango-dev/wallets-shared';
-import { ProposalTypes } from '@walletconnect/types';
+import { WalletConnectModal } from '@walletconnect/modal';
 import { ChainId } from 'caip';
-import { BlockchainMeta, cosmosBlockchains, evmBlockchains } from 'rango-types';
-import { Web3Modal } from '@web3modal/standalone';
+import { cosmosBlockchains, evmBlockchains } from 'rango-types';
 
 import {
   DEFAULT_COSMOS_METHODS,
@@ -14,22 +17,20 @@ import {
   NAMESPACES,
 } from './constants';
 import { getLastSession } from './session';
-import { CosmosMeta } from './types';
 
-let web3Modal: Web3Modal;
+let web3Modal: WalletConnectModal;
 export function createModalInstance(projectId: string) {
   if (!web3Modal) {
-    web3Modal = new Web3Modal({
+    web3Modal = new WalletConnectModal({
       projectId,
       themeMode: 'light',
-      walletConnectVersion: 2,
       themeVariables: {
-        '--w3m-z-index': '999999999',
+        '--wcm-z-index': '999999999',
       },
     });
   }
 }
-export function getModal(): Web3Modal {
+export function getModal(): WalletConnectModal {
   return web3Modal;
 }
 
@@ -162,14 +163,15 @@ export async function simulateRequest(
 
       if (chainId) {
         return chainId;
-      } else {
-        const firstChain = standaloneChains[0];
-        const chainId = new ChainId(firstChain);
-        return chainId.reference;
       }
-    } else {
-      throw new Error(`Couldn't find any chain on namespace`);
+
+      const firstIndex = 0;
+      const firstChain = standaloneChains[firstIndex];
+      const firstChainId = new ChainId(firstChain);
+      return firstChainId.reference;
     }
+
+    throw new Error(`Couldn't find any chain on namespace`);
   }
   throw new Error('Dissallowed method:', params);
 }
@@ -182,7 +184,9 @@ export function getChainIdByNetworkName(
     (blockchain) => blockchain.name === network
   );
   const chainIdInHex = targetBlockchain?.chainId;
-  if (!chainIdInHex) return undefined;
+  if (!chainIdInHex) {
+    return undefined;
+  }
 
   const chainId = String(parseInt(chainIdInHex));
 

package/src/session.ts

@@ -1,13 +1,16 @@
-import { AccountId } from 'caip';
-import { Networks, timeout } from '@rango-dev/wallets-shared';
+import type { ConnectParams, CreateSessionParams, WCInstance } from './types';
 import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import {
+import type {
   PairingTypes,
   SessionTypes,
   SignClientTypes,
 } from '@walletconnect/types';
+
+import { Networks, timeout } from '@rango-dev/wallets-shared';
 import { getSdkError } from '@walletconnect/utils';
+import { AccountId } from 'caip';
 
+import { PING_TIMEOUT } from './constants';
 import {
   generateOptionalNamespace,
   generateRequiredNamespace,
@@ -15,8 +18,6 @@ import {
   getModal,
   solanaChainIdToNetworkName,
 } from './helpers';
-import { PING_TIMEOUT } from './constants';
-import { ConnectParams, CreateSessionParams, WCInstance } from './types';
 
 export function getLastSession(client: SignClient) {
   return client.session.values[client.session.values.length - 1];
@@ -66,6 +67,7 @@ export async function createSession(
     });
 
     // Open QRCode modal if a URI was returned (i.e. we're not connecting an existing pairing).
+    let onCloseModal;
     if (uri) {
       // Create a flat array of all requested chains across namespaces.
       const allNamespaces = {
@@ -77,14 +79,27 @@ export async function createSession(
         .map((namespace) => namespace.chains)
         .flat() as string[];
 
-      getModal().openModal({ uri, standaloneChains });
+      const modal = getModal();
+      void modal.openModal({ uri, standaloneChains });
+
+      onCloseModal = new Promise((_, reject) => {
+        modal.subscribeModal((state) => {
+          // the modal was closed so reject the promise
+          if (!state.open) {
+            reject(new Error('Modal has been closed.'));
+          }
+        });
+      });
     }
 
-    const session = await approval();
-    return session;
-  } catch (e) {
-    console.error(e);
-    throw e;
+    const session = approval();
+
+    if (onCloseModal) {
+      const result = await Promise.race([session, onCloseModal]);
+      // We know onClose only reject a modal and never returns a value.
+      return result as SessionTypes.Struct;
+    }
+    return await session;
   } finally {
     getModal().closeModal();
   }
@@ -266,8 +281,10 @@ export function getAccountsFromSession(session: SessionTypes.Struct) {
     .flat()
     .map((account) => {
       const { address, chainId } = new AccountId(account);
-      // Note: Solana has a specific ID, we need to convert it back to network name.
-      // It will return the chain id itslef if it's not that specific ID.
+      /*
+       * Note: Solana has a specific ID, we need to convert it back to network name.
+       * It will return the chain id itslef if it's not that specific ID.
+       */
       const chain = solanaChainIdToNetworkName(chainId.reference);
       return {
         accounts: [address],

package/src/signers/cosmos.ts

@@ -1,20 +1,20 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
+import type { AminoSignResponse } from '@cosmjs/launchpad';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
+import type { CosmosTransaction, GenericSigner } from 'rango-types';
+
+import { BroadcastMode, makeSignDoc } from '@cosmjs/launchpad';
+import { cosmos } from '@keplr-wallet/cosmos';
+import { getsignedTx } from '@rango-dev/signer-cosmos';
+import { uint8ArrayToHex } from '@rango-dev/wallets-shared';
 import { AccountId, ChainId } from 'caip';
-import type { GenericSigner } from 'rango-types';
-import { SignerError, CosmosTransaction, SignerErrorCode } from 'rango-types';
+import { formatDirectSignDoc, stringifySignDocValues } from 'cosmos-wallet';
+import { SignerError, SignerErrorCode } from 'rango-types';
+
 import { CosmosRPCMethods, NAMESPACES } from '../constants';
-import { getsignedTx, manipulateMsg } from '@rango-dev/signer-cosmos';
-import {
-  AminoSignResponse,
-  BroadcastMode,
-  makeSignDoc,
-} from '@cosmjs/launchpad';
+
 import { sendTx } from './helper';
 import { supportedChains } from './mock';
-import { uint8ArrayToHex } from '@rango-dev/wallets-shared';
-import { cosmos } from '@keplr-wallet/cosmos';
-import { formatDirectSignDoc, stringifySignDocValues } from 'cosmos-wallet';
 
 const NAMESPACE_NAME = NAMESPACES.COSMOS;
 type DirectSignResponse = {
@@ -60,22 +60,25 @@ class COSMOSSigner implements GenericSigner<CosmosTransaction> {
       const { memo, sequence, account_number, chainId, msgs, fee, signType } =
         tx.data;
       const msgsWithoutType = msgs.map((m) => ({
-        ...manipulateMsg(m),
+        ...m,
         __type: undefined,
         '@type': undefined,
       }));
-      if (!chainId)
+      if (!chainId) {
         throw SignerError.AssertionFailed('chainId is undefined from server');
-      if (!account_number)
+      }
+      if (!account_number) {
         throw SignerError.AssertionFailed(
           'account_number is undefined from server'
         );
-      if (!sequence)
+      }
+      if (!sequence) {
         throw SignerError.AssertionFailed('sequence is undefined from server');
+      }
 
       if (signType === 'AMINO') {
         const signDoc = makeSignDoc(
-          msgsWithoutType as any,
+          msgsWithoutType,
           fee as any,
           chainId,
           memo || undefined,
@@ -185,15 +188,17 @@ class COSMOSSigner implements GenericSigner<CosmosTransaction> {
         console.log({ result });
 
         return { hash: uint8ArrayToHex(result) };
-      } else {
-        throw new SignerError(
-          SignerErrorCode.OPERATION_UNSUPPORTED,
-          `Sign type for cosmos not supported, type: ${signType}`
-        );
       }
+      throw new SignerError(
+        SignerErrorCode.OPERATION_UNSUPPORTED,
+        `Sign type for cosmos not supported, type: ${signType}`
+      );
     } catch (err) {
-      if (SignerError.isSignerError(err)) throw err;
-      else throw new SignerError(SignerErrorCode.SEND_TX_ERROR, undefined, err);
+      if (SignerError.isSignerError(err)) {
+        throw err;
+      } else {
+        throw new SignerError(SignerErrorCode.SEND_TX_ERROR, undefined, err);
+      }
     }
   }