@rango-dev/provider-walletconnect-2 0.27.0 → 0.27.1-next.1

package/dist/provider-walletconnect-2.build.json

@@ -1 +1 @@
-{"inputs":{"src/constants.ts":{"bytes":2718,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true}],"format":"esm"},"src/session.ts":{"bytes":10497,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/utils","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/helpers.ts","kind":"import-statement","original":"./helpers"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/helpers.ts":{"bytes":6372,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/modal","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/session.ts","kind":"import-statement","original":"./session"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/helper.ts":{"bytes":2088,"imports":[{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@keplr-wallet/simple-fetch","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/mock.ts":{"bytes":102937,"imports":[],"format":"esm"},"src/signers/cosmos.ts":{"bytes":7359,"imports":[{"path":"@cosmjs/launchpad","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/signer-cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"cosmos-wallet","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"src/signers/helper.ts","kind":"import-statement","original":"./helper"},{"path":"src/signers/mock.ts","kind":"import-statement","original":"./mock"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/evm.ts":{"bytes":5135,"imports":[{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@walletconnect/encoding","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/solana.ts":{"bytes":4693,"imports":[{"path":"@rango-dev/signer-solana","kind":"import-statement","external":true},{"path":"@solana/web3.js","kind":"import-statement","external":true},{"path":"bs58","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signer.ts":{"bytes":861,"imports":[{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/signers/cosmos.ts","kind":"import-statement","original":"./signers/cosmos"},{"path":"src/signers/evm.ts","kind":"import-statement","original":"./signers/evm"},{"path":"src/signers/solana.ts","kind":"import-statement","original":"./signers/solana"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":6645,"imports":[{"path":"@rango-dev/logging-core","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/sign-client","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/helpers.ts","kind":"import-statement","original":"./helpers"},{"path":"src/session.ts","kind":"import-statement","original":"./session"},{"path":"src/signer.ts","kind":"import-statement","original":"./signer"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"dist/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":215687},"dist/index.js":{"imports":[{"path":"@rango-dev/logging-core","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/sign-client","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/modal","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/utils","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@cosmjs/launchpad","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/signer-cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"cosmos-wallet","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@keplr-wallet/simple-fetch","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@walletconnect/encoding","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"@rango-dev/signer-solana","kind":"import-statement","external":true},{"path":"@solana/web3.js","kind":"import-statement","external":true},{"path":"bs58","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true}],"exports":["canSwitchNetworkTo","config","connect","disconnect","getInstance","getSigners","getWalletInfo","init","subscribe","switchNetwork"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":2485},"src/constants.ts":{"bytesInOutput":521},"src/helpers.ts":{"bytesInOutput":2191},"src/session.ts":{"bytesInOutput":3084},"src/signer.ts":{"bytesInOutput":367},"src/signers/cosmos.ts":{"bytesInOutput":3227},"src/signers/helper.ts":{"bytesInOutput":1056},"src/signers/mock.ts":{"bytesInOutput":68018},"src/signers/evm.ts":{"bytesInOutput":2114},"src/signers/solana.ts":{"bytesInOutput":1839}},"bytes":85197}}}
+{"inputs":{"src/constants.ts":{"bytes":2718,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true}],"format":"esm"},"src/session.ts":{"bytes":10497,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/utils","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/helpers.ts","kind":"import-statement","original":"./helpers"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/helpers.ts":{"bytes":6372,"imports":[{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/modal","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/session.ts","kind":"import-statement","original":"./session"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/helper.ts":{"bytes":2088,"imports":[{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@keplr-wallet/simple-fetch","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/mock.ts":{"bytes":102937,"imports":[],"format":"esm"},"src/signers/cosmos.ts":{"bytes":7359,"imports":[{"path":"@cosmjs/launchpad","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/signer-cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"cosmos-wallet","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"src/signers/helper.ts","kind":"import-statement","original":"./helper"},{"path":"src/signers/mock.ts","kind":"import-statement","original":"./mock"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/evm.ts":{"bytes":4511,"imports":[{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@walletconnect/encoding","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signers/solana.ts":{"bytes":4693,"imports":[{"path":"@rango-dev/signer-solana","kind":"import-statement","external":true},{"path":"@solana/web3.js","kind":"import-statement","external":true},{"path":"bs58","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"../constants"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/signer.ts":{"bytes":861,"imports":[{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/signers/cosmos.ts","kind":"import-statement","original":"./signers/cosmos"},{"path":"src/signers/evm.ts","kind":"import-statement","original":"./signers/evm"},{"path":"src/signers/solana.ts","kind":"import-statement","original":"./signers/solana"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"},"src/index.ts":{"bytes":6645,"imports":[{"path":"@rango-dev/logging-core","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/sign-client","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"src/constants.ts","kind":"import-statement","original":"./constants"},{"path":"src/helpers.ts","kind":"import-statement","original":"./helpers"},{"path":"src/session.ts","kind":"import-statement","original":"./session"},{"path":"src/signer.ts","kind":"import-statement","original":"./signer"},{"path":"<runtime>","kind":"import-statement","external":true}],"format":"esm"}},"outputs":{"dist/index.js.map":{"imports":[],"exports":[],"inputs":{},"bytes":214575},"dist/index.js":{"imports":[{"path":"@rango-dev/logging-core","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/sign-client","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/modal","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"@walletconnect/utils","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@cosmjs/launchpad","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/signer-cosmos","kind":"import-statement","external":true},{"path":"@rango-dev/wallets-shared","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"cosmos-wallet","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@keplr-wallet/cosmos","kind":"import-statement","external":true},{"path":"@keplr-wallet/simple-fetch","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true},{"path":"@rango-dev/signer-evm","kind":"import-statement","external":true},{"path":"@walletconnect/encoding","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"@rango-dev/signer-solana","kind":"import-statement","external":true},{"path":"@solana/web3.js","kind":"import-statement","external":true},{"path":"bs58","kind":"import-statement","external":true},{"path":"caip","kind":"import-statement","external":true},{"path":"rango-types","kind":"import-statement","external":true}],"exports":["canSwitchNetworkTo","config","connect","disconnect","getInstance","getSigners","getWalletInfo","init","subscribe","switchNetwork"],"entryPoint":"src/index.ts","inputs":{"src/index.ts":{"bytesInOutput":2485},"src/constants.ts":{"bytesInOutput":521},"src/helpers.ts":{"bytesInOutput":2191},"src/session.ts":{"bytesInOutput":3084},"src/signer.ts":{"bytesInOutput":367},"src/signers/cosmos.ts":{"bytesInOutput":3227},"src/signers/helper.ts":{"bytesInOutput":1056},"src/signers/mock.ts":{"bytesInOutput":68018},"src/signers/evm.ts":{"bytesInOutput":1786},"src/signers/solana.ts":{"bytesInOutput":1839}},"bytes":84869}}}

package/dist/signers/evm.d.ts

@@ -6,7 +6,6 @@ declare class EVMSigner implements GenericSigner<EvmTransaction> {
     private client;
     private session;
     constructor(client: SignClient, session: SessionTypes.Struct);
-    static buildTx(evmTx: EvmTransaction, disableV2?: boolean): {};
     signMessage(msg: string, address: string, chainId: string | null): Promise<string>;
     signAndSendTx(tx: EvmTransaction, address: string, chainId: string | null): Promise<{
         hash: string;

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,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;IAK5D,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,cAAc,EAAE,SAAS,UAAQ;IAoC1C,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;IA6B5B,OAAO,CAAC,iCAAiC;CAwD1C;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;IAqC5B,OAAO,CAAC,iCAAiC;CAwD1C;AAED,eAAe,SAAS,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rango-dev/provider-walletconnect-2",
-  "version": "0.27.0",
+  "version": "0.27.1-next.1",
   "license": "MIT",
   "type": "module",
   "source": "./src/index.ts",
@@ -25,10 +25,10 @@
     "@keplr-wallet/cosmos": "^0.9.12",
     "@keplr-wallet/simple-fetch": "^0.12.14",
     "@rango-dev/logging-core": "^0.4.0",
-    "@rango-dev/signer-cosmos": "^0.26.0",
-    "@rango-dev/signer-evm": "^0.27.1",
-    "@rango-dev/signer-solana": "^0.29.0",
-    "@rango-dev/wallets-shared": "^0.34.0",
+    "@rango-dev/signer-cosmos": "^0.26.1-next.0",
+    "@rango-dev/signer-evm": "^0.27.2-next.0",
+    "@rango-dev/signer-solana": "^0.29.1-next.0",
+    "@rango-dev/wallets-shared": "^0.34.1-next.1",
     "@solana/web3.js": "^1.91.4",
     "@walletconnect/encoding": "^1.0.2",
     "@walletconnect/modal": "^2.6.2",
@@ -37,7 +37,7 @@
     "bs58": "^5.0.0",
     "caip": "^1.1.0",
     "cosmos-wallet": "^1.2.0",
-    "rango-types": "^0.1.59"
+    "rango-types": "^0.1.69"
   },
   "devDependencies": {
     "@walletconnect/types": "^2.11.2"

package/src/signers/evm.ts

@@ -2,7 +2,7 @@ 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 { cleanEvmError, DefaultEvmSigner } from '@rango-dev/signer-evm';
 import * as encoding from '@walletconnect/encoding';
 import { AccountId, ChainId } from 'caip';
 import { type GenericSigner } from 'rango-types';
@@ -20,42 +20,6 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
     this.session = session;
   }
 
-  static buildTx(evmTx: EvmTransaction, disableV2 = false) {
-    let tx = {};
-    if (evmTx.from) {
-      tx = { ...tx, from: evmTx.from };
-    }
-    if (evmTx.to) {
-      tx = { ...tx, to: evmTx.to };
-    }
-    if (evmTx.data) {
-      tx = { ...tx, data: evmTx.data };
-    }
-    if (evmTx.value) {
-      tx = { ...tx, value: evmTx.value };
-    }
-    if (evmTx.nonce) {
-      tx = { ...tx, nonce: evmTx.nonce };
-    }
-    if (evmTx.gasLimit) {
-      tx = { ...tx, gasLimit: evmTx.gasLimit };
-    }
-    if (evmTx.gasPrice) {
-      const shift = 16;
-      tx = {
-        ...tx,
-        gasPrice: '0x' + parseInt(evmTx.gasPrice).toString(shift),
-      };
-    }
-    if (evmTx.maxFeePerGas && !disableV2) {
-      tx = { ...tx, maxFeePerGas: evmTx.maxFeePerGas };
-    }
-    if (evmTx.maxPriorityFeePerGas && !disableV2) {
-      tx = { ...tx, maxPriorityFeePerGas: evmTx.maxPriorityFeePerGas };
-    }
-    return tx;
-  }
-
   public async signMessage(
     msg: string,
     address: string,
@@ -107,7 +71,7 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
       chainId,
     });
     try {
-      const transaction = EVMSigner.buildTx(tx);
+      const transaction = DefaultEvmSigner.buildTx(tx);
       const hash: string = await this.client.request({
         topic: this.session.topic,
         chainId: requestedFor.caipChainId,
@@ -125,8 +89,16 @@ class EVMSigner implements GenericSigner<EvmTransaction> {
       return {
         hash,
       };
-    } catch (error) {
-      throw cleanEvmError(error);
+    } catch (error: any) {
+      const modifiedError = cleanEvmError(error);
+      const session = this.session;
+      const context = {
+        namspaces: session?.namespaces,
+        peering: session?.peer?.metadata,
+        code: error?.code,
+      };
+      modifiedError.context = context;
+      throw modifiedError;
     }
   }