@rango-dev/provider-walletconnect-2 0.8.1-next.1 → 0.8.1-next.3

package/dist/signers/evm.d.ts

@@ -1,7 +1,7 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
-import type { GenericSigner } from 'rango-types';
-import { EvmTransaction } from 'rango-types/lib/api/main';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
+import type { EvmTransaction } from 'rango-types/lib/api/main';
+import { type GenericSigner } from 'rango-types';
 declare class EVMSigner implements GenericSigner<EvmTransaction> {
     private client;
     private session;

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

@@ -1 +1 @@
-{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/signers/evm.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,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAM1D,cAAM,SAAU,YAAW,aAAa,CAAC,cAAc,CAAC;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK/C,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IA8BZ,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAoB5B,OAAO,CAAC,iCAAiC;CAsD1C;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"evm.d.ts","sourceRoot":"","sources":["../../src/signers/evm.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AAK/D,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAMjD,cAAM,SAAU,YAAW,aAAa,CAAC,cAAc,CAAC;IACtD,OAAO,CAAC,MAAM,CAAa;IAC3B,OAAO,CAAC,OAAO,CAAsB;gBAEzB,MAAM,EAAE,UAAU,EAAE,OAAO,EAAE,YAAY,CAAC,MAAM;IAK/C,WAAW,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IAqCZ,aAAa,CACjB,EAAE,EAAE,cAAc,EAClB,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC;IAsB5B,OAAO,CAAC,iCAAiC;CAwD1C;AAED,eAAe,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.8.1-next.1",
+  "version": "0.8.1-next.3",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.js",
@@ -24,7 +24,7 @@
     "@keplr-wallet/cosmos": "^0.9.12",
     "@keplr-wallet/simple-fetch": "^0.12.14",
     "@rango-dev/signer-cosmos": "^0.15.0",
-    "@rango-dev/signer-evm": "^0.15.0",
+    "@rango-dev/signer-evm": "^0.15.1-next.0",
     "@rango-dev/signer-solana": "^0.15.0",
     "@rango-dev/wallets-shared": "^0.15.1-next.1",
     "@solana/web3.js": "^1.67.2",

package/src/index.ts

@@ -1,5 +1,5 @@
-import {
-  WalletTypes,
+import type { WCInstance } from './types';
+import type {
   CanSwitchNetwork,
   Connect,
   Disconnect,
@@ -9,19 +9,13 @@ import {
   WalletConfig,
   WalletInfo,
 } from '@rango-dev/wallets-shared';
-import { SignerFactory, BlockchainMeta, evmBlockchains } from 'rango-types';
 import type { ISignClient } from '@walletconnect/types';
+import type { BlockchainMeta, SignerFactory } from 'rango-types';
+
+import { WalletTypes } from '@rango-dev/wallets-shared';
 import Client from '@walletconnect/sign-client';
+import { evmBlockchains } from 'rango-types';
 
-import signer from './signer';
-import {
-  disconnectSessions,
-  cleanupSingleSession,
-  getAccountsFromEvent,
-  getAccountsFromSession,
-  tryConnect,
-  trySwitchByCreatingNewSession,
-} from './session';
 import {
   DEFAULT_APP_METADATA,
   DEFAULT_NETWORK,
@@ -29,7 +23,15 @@ import {
   RELAY_URL,
 } from './constants';
 import { createModalInstance, simulateRequest } from './helpers';
-import type { WCInstance } from './types';
+import {
+  cleanupSingleSession,
+  disconnectSessions,
+  getAccountsFromEvent,
+  getAccountsFromSession,
+  tryConnect,
+  trySwitchByCreatingNewSession,
+} from './session';
+import signer from './signer';
 
 const WALLET = WalletTypes.WALLET_CONNECT_2;
 
@@ -55,9 +57,9 @@ export const getInstance: GetInstance = async (options) => {
   const { currentProvider, getState, meta } = options;
 
   /*
-    Create a new pair, if exists use the pair,
-    Or use the already created one.
-  */
+   *Create a new pair, if exists use the pair,
+   *Or use the already created one.
+   */
   let provider: ISignClient;
   if (!currentProvider) {
     if (!envs.WC_PROJECT_ID) {
@@ -78,7 +80,8 @@ export const getInstance: GetInstance = async (options) => {
   return {
     client: provider,
     session: null,
-    request: (params: any) => simulateRequest(params, provider, meta, getState),
+    request: async (params: any) =>
+      simulateRequest(params, provider, meta, getState),
   };
 };
 
@@ -137,7 +140,7 @@ export const subscribe: Subscribe = ({
 
   client.on('session_delete', async (event) => {
     console.log('[WC2] your wallet has requested to delete session.', event);
-    cleanupSingleSession(client, event.topic);
+    void cleanupSingleSession(client, event.topic);
     disconnect();
   });
 };
@@ -172,7 +175,7 @@ export const disconnect: Disconnect = async ({ instance }) => {
   const { client } = instance as WCInstance;
 
   if (client) {
-    disconnectSessions(client);
+    void disconnectSessions(client);
   }
 };
 
@@ -184,7 +187,7 @@ export const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (
   const evms = evmBlockchains(allBlockChains);
   return {
     name: 'WalletConnect',
-    img: 'https://raw.githubusercontent.com/rango-exchange/rango-types/main/assets/icons/wallets/walletconnect.svg',
+    img: 'https://raw.githubusercontent.com/rango-exchange/rango-assets/main/wallets/walletconnect/icon.svg',
     installLink: '',
     color: '#b2dbff',
     supportedChains: evms,

package/src/signers/evm.ts

@@ -1,9 +1,12 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
-import { AccountId, ChainId } from 'caip';
-import type { GenericSigner } from 'rango-types';
-import { EvmTransaction } from 'rango-types/lib/api/main';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
+import type { EvmTransaction } from 'rango-types/lib/api/main';
+
+import { cleanEvmError } from '@rango-dev/signer-evm';
 import * as encoding from '@walletconnect/encoding';
+import { AccountId, ChainId } from 'caip';
+import { type GenericSigner } from 'rango-types';
+
 import { EthereumRPCMethods, NAMESPACES } from '../constants';
 
 const NAMESPACE_NAME = NAMESPACES.ETHEREUM;
@@ -35,18 +38,25 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
 
     const params = [hexMsg, address];
 
-    // Send message to wallet (using relayer)
-    const signature: string = await this.client.request({
-      topic: this.session.topic,
-      chainId: caipChainId.toString(),
-      request: {
-        method: EthereumRPCMethods.PERSONAL_SIGN,
-        params,
-      },
-    });
+    let signature: string;
+    try {
+      // Send message to wallet (using relayer)
+      signature = await this.client.request({
+        topic: this.session.topic,
+        chainId: caipChainId.toString(),
+        request: {
+          method: EthereumRPCMethods.PERSONAL_SIGN,
+          params,
+        },
+      });
+    } catch (error) {
+      throw cleanEvmError(error);
+    }
 
-    // TODO: We can also verify the signature here
-    // Check web-examples: dapps/react-dapp-v2/src/contexts/JsonRpcContext.tsx
+    /*
+     * TODO: We can also verify the signature here
+     * Check web-examples: dapps/react-dapp-v2/src/contexts/JsonRpcContext.tsx
+     */
 
     return signature;
   }
@@ -60,19 +70,21 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
       address,
       chainId,
     });
-
-    const signedTx: string = await this.client.request({
-      topic: this.session.topic,
-      chainId: requestedFor.caipChainId,
-      request: {
-        method: EthereumRPCMethods.SEND_TRANSACTION,
-        params: [tx],
-      },
-    });
-
-    return {
-      hash: signedTx,
-    };
+    try {
+      const hash: string = await this.client.request({
+        topic: this.session.topic,
+        chainId: requestedFor.caipChainId,
+        request: {
+          method: EthereumRPCMethods.SEND_TRANSACTION,
+          params: [tx],
+        },
+      });
+      return {
+        hash,
+      };
+    } catch (error) {
+      throw cleanEvmError(error);
+    }
   }
 
   private isNetworkAndAccountExistInSession(requestedFor: {
@@ -88,8 +100,10 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
       );
     }
 
-    // TODO: We need to make sure we are using a single format for chain ids, it should be hex or number.
-    // This is a quick fix for evm.
+    /*
+     * TODO: We need to make sure we are using a single format for chain ids, it should be hex or number.
+     * This is a quick fix for evm.
+     */
     const chainIdNumber = chainId.startsWith('0x')
       ? String(parseInt(chainId))
       : chainId;