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

package/dist/signer.d.ts

@@ -1,4 +1,4 @@
-import { SignerFactory } from 'rango-types';
-import { WCInstance } from './types';
+import type { WCInstance } from './types';
+import type { SignerFactory } from 'rango-types';
 export default function getSigners(instance: WCInstance): SignerFactory;
 //# sourceMappingURL=signer.d.ts.map

package/dist/signer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,aAAa,EAEd,MAAM,aAAa,CAAC;AAErB,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAKrC,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,EAAE,UAAU,GAAG,aAAa,CAoBtE"}
+{"version":3,"file":"signer.d.ts","sourceRoot":"","sources":["../src/signer.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAC1C,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAQjD,MAAM,CAAC,OAAO,UAAU,UAAU,CAAC,QAAQ,EAAE,UAAU,GAAG,aAAa,CAoBtE"}

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/dist/signers/helper.d.ts

@@ -1,3 +1,3 @@
-import { BlockchainMeta } from 'rango-types';
+import type { BlockchainMeta } from 'rango-types';
 export declare function sendTx(chainId: string, tx: unknown, mode: 'async' | 'sync' | 'block', supportedChains: BlockchainMeta[]): Promise<Uint8Array>;
 //# sourceMappingURL=helper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../src/signers/helper.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAqB,MAAM,aAAa,CAAC;AAChE,wBAAsB,MAAM,CAC1B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,OAAO,EACX,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,EAChC,eAAe,EAAE,cAAc,EAAE,GAChC,OAAO,CAAC,UAAU,CAAC,CAgErB"}
+{"version":3,"file":"helper.d.ts","sourceRoot":"","sources":["../../src/signers/helper.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAMlD,wBAAsB,MAAM,CAC1B,OAAO,EAAE,MAAM,EACf,EAAE,EAAE,OAAO,EACX,IAAI,EAAE,OAAO,GAAG,MAAM,GAAG,OAAO,EAChC,eAAe,EAAE,cAAc,EAAE,GAChC,OAAO,CAAC,UAAU,CAAC,CAiErB"}

package/dist/signers/mock.d.ts

@@ -1,3 +1,3 @@
-import { BlockchainMeta } from 'rango-types';
+import type { BlockchainMeta } from 'rango-types';
 export declare const supportedChains: BlockchainMeta[];
 //# sourceMappingURL=mock.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../../src/signers/mock.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAE7C,eAAO,MAAM,eAAe,EAAE,cAAc,EAwlH3C,CAAC"}
+{"version":3,"file":"mock.d.ts","sourceRoot":"","sources":["../../src/signers/mock.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,aAAa,CAAC;AAElD,eAAO,MAAM,eAAe,EAAE,cAAc,EAwlH3C,CAAC"}

package/dist/signers/solana.d.ts

@@ -1,5 +1,5 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
 import type { GenericSigner, SolanaTransaction } from 'rango-types';
 declare class SOLANASigner implements GenericSigner<SolanaTransaction> {
     private client;

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

@@ -1 +1 @@
-{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/signers/solana.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,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAWpE,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,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IAkCZ,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;IAgC5B,OAAO,CAAC,iCAAiC;CAuD1C;AAED,eAAe,YAAY,CAAC"}
+{"version":3,"file":"solana.d.ts","sourceRoot":"","sources":["../../src/signers/solana.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,8CAA8C,CAAC;AAC/E,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,sBAAsB,CAAC;AACzD,OAAO,KAAK,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAWpE,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,CACtB,GAAG,EAAE,MAAM,EACX,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,MAAM,GAAG,IAAI,GACrB,OAAO,CAAC,MAAM,CAAC;IAkCZ,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;IAgC5B,OAAO,CAAC,iCAAiC;CA2D1C;AAED,eAAe,YAAY,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.8.1-next.2",
+  "version": "0.8.1-next.4",
   "license": "MIT",
   "type": "module",
   "module": "./dist/index.js",
@@ -23,10 +23,10 @@
     "@cosmjs/launchpad": "^0.27.1",
     "@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-solana": "^0.15.0",
-    "@rango-dev/wallets-shared": "^0.15.1-next.1",
+    "@rango-dev/signer-cosmos": "^0.15.1-next.0",
+    "@rango-dev/signer-evm": "^0.15.1-next.1",
+    "@rango-dev/signer-solana": "^0.15.1-next.0",
+    "@rango-dev/wallets-shared": "^0.15.1-next.2",
     "@solana/web3.js": "^1.67.2",
     "@walletconnect/encoding": "^1.0.2",
     "@walletconnect/modal": "^2.6.1",

package/src/index.ts

@@ -187,7 +187,7 @@ export const getWalletInfo: (allBlockChains: BlockchainMeta[]) => WalletInfo = (
   const evms = evmBlockchains(allBlockChains);
   return {
     name: 'WalletConnect',
-    img: 'https://raw.githubusercontent.com/rango-exchange/rango-assets/main/wallets/walletconnect/icon.svg',
+    img: 'https://raw.githubusercontent.com/rango-exchange/assets/main/wallets/walletconnect/icon.svg',
     installLink: '',
     color: '#b2dbff',
     supportedChains: evms,

package/src/signer.ts

@@ -1,12 +1,10 @@
-import {
-  DefaultSignerFactory,
-  SignerFactory,
-  TransactionType as TxType,
-} from 'rango-types';
+import type { WCInstance } from './types';
+import type { SignerFactory } from 'rango-types';
+
+import { DefaultSignerFactory, TransactionType as TxType } from 'rango-types';
 
-import { WCInstance } from './types';
-import EVMSigner from './signers/evm';
 import COSMOSSigner from './signers/cosmos';
+import EVMSigner from './signers/evm';
 import SOLANASigner from './signers/solana';
 
 export default function getSigners(instance: WCInstance): SignerFactory {

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;

package/src/signers/helper.ts

@@ -1,6 +1,9 @@
+import type { BlockchainMeta } from 'rango-types';
+
 import { TendermintTxTracer } from '@keplr-wallet/cosmos';
 import { simpleFetch } from '@keplr-wallet/simple-fetch';
-import { BlockchainMeta, cosmosBlockchains } from 'rango-types';
+import { cosmosBlockchains } from 'rango-types';
+
 export async function sendTx(
   chainId: string,
   tx: unknown,
@@ -16,7 +19,7 @@ export async function sendTx(
   console.log({ chainInfo, isProtoTx });
 
   if (!chainInfo) {
-    throw 'Chain info is undefined from server';
+    throw new Error('Chain info is undefined from server');
   }
   const params = isProtoTx
     ? {
@@ -61,6 +64,7 @@ export async function sendTx(
     const txHash = Buffer.from(txResponse.txhash, 'hex');
 
     const txTracer = new TendermintTxTracer(chainInfo.rpc, '/websocket');
+    // eslint-disable-next-line @typescript-eslint/no-floating-promises
     txTracer.traceTx(txHash).then(() => {
       txTracer.close();
     });

package/src/signers/mock.ts

@@ -1,4 +1,4 @@
-import { BlockchainMeta } from 'rango-types';
+import type { BlockchainMeta } from 'rango-types';
 
 export const supportedChains: BlockchainMeta[] = [
   {

package/src/signers/solana.ts

@@ -1,15 +1,16 @@
-import { SignClient } from '@walletconnect/sign-client/dist/types/client';
-import { SessionTypes } from '@walletconnect/types';
-import { AccountId, ChainId } from 'caip';
+import type { SolanaWeb3Signer } from '@rango-dev/signer-solana';
+import type { Transaction, VersionedTransaction } from '@solana/web3.js';
+import type { SignClient } from '@walletconnect/sign-client/dist/types/client';
+import type { SessionTypes } from '@walletconnect/types';
 import type { GenericSigner, SolanaTransaction } from 'rango-types';
+
+import { generalSolanaTransactionExecutor } from '@rango-dev/signer-solana';
+import { PublicKey } from '@solana/web3.js';
+import base58 from 'bs58';
+import { AccountId, ChainId } from 'caip';
 import { SignerError, SignerErrorCode } from 'rango-types';
+
 import { NAMESPACES, SolanaRPCMethods } from '../constants';
-import {
-  SolanaWeb3Signer,
-  generalSolanaTransactionExecutor,
-} from '@rango-dev/signer-solana';
-import { PublicKey, Transaction, VersionedTransaction } from '@solana/web3.js';
-import base58 from 'bs58';
 
 const NAMESPACE_NAME = NAMESPACES.SOLANA;
 class SOLANASigner implements GenericSigner<SolanaTransaction> {
@@ -101,15 +102,19 @@ class SOLANASigner implements GenericSigner<SolanaTransaction> {
   }) {
     const { address, chainId } = requestedFor;
 
-    // TODO: solana chain id in supported blockchains("mainnet-beta") is different from solana chain id is here ("5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")
-    //# Solana Mainnet
-    // solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvd
-    // refrence: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+    /*
+     *  TODO: solana chain id in supported blockchains("mainnet-beta") is different from solana chain id is here ("5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp")
+     * # Solana Mainnet
+     *  solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvd
+     *  refrence: https://github.com/ChainAgnostic/namespaces/blob/main/solana/caip2.md
+     */
 
     let solana_chain_id = chainId;
     this.session.namespaces[NAMESPACE_NAME]?.accounts.map((account) => {
       const sol_account = account.split(':');
-      if (sol_account[2] === address) solana_chain_id = sol_account[1];
+      if (sol_account[2] === address) {
+        solana_chain_id = sol_account[1];
+      }
     });
 
     if (!solana_chain_id) {