@across-protocol/sdk 4.3.160 → 4.3.162

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -43,7 +43,7 @@ class QuorumFallbackSolanaRpcFactory extends baseRpcFactories_1.SolanaBaseRpcFac
43
43
  throw error;
44
44
  }
45
45
  if (quorumThreshold === 1 && (0, utils_2.shouldFailImmediate)(method, error)) {
46
- throw new Error(`RPC provider reverted for method ${method}`, { cause: error });
46
+ throw error;
47
47
  }
48
48
  const currentFactory = factory.rpcFactory.clusterUrl;
49
49
  const nextFactory = fallbackFactories.shift();
@@ -63,6 +63,10 @@ class QuorumFallbackSolanaRpcFactory extends baseRpcFactories_1.SolanaBaseRpcFac
63
63
  return errors.map(([factory, errorText]) => `Provider ${factory.clusterUrl} failed to call ${method} with error ${errorText}`);
64
64
  };
65
65
  if (!results.every(TypeGuards_1.isPromiseFulfilled)) {
66
+ const rejections = results.filter(TypeGuards_1.isPromiseRejected);
67
+ if (rejections.length > 0 && rejections.every(({ reason }) => (0, utils_2.shouldFailImmediate)(method, reason))) {
68
+ throw rejections[0].reason;
69
+ }
66
70
  const errorTexts = getErrorStrings();
67
71
  const successfulProviderUrls = results.filter(TypeGuards_1.isPromiseFulfilled).map((result) => result.value[0].clusterUrl);
68
72
  throw (0, utils_1.createSendErrorWithMessage)(`Not enough providers succeeded on ${method} call. Errors:\n${errorTexts.join("\n")}\n` +
@@ -1 +1 @@
1
- {"version":3,"file":"quorumFallbackRpcFactory.js","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quorumFallbackRpcFactory.js","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"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"}
@@ -10,6 +10,8 @@ const FormattingUtils_1 = require("./FormattingUtils");
10
10
  const NetworkUtils_1 = require("./NetworkUtils");
11
11
  const TypeGuards_1 = require("./TypeGuards");
12
12
  const bs58_1 = tslib_1.__importDefault(require("bs58"));
13
+ const tronweb_1 = require("tronweb");
14
+ const AddressUtils_1 = require("./AddressUtils");
13
15
  function blockExplorerLink(txHashOrAddress, chainId) {
14
16
  return _createBlockExplorerLinkMarkdown(txHashOrAddress, Number(chainId)) ?? "<>";
15
17
  }
@@ -40,8 +42,14 @@ function _createBlockExplorerLinkMarkdown(addr, chainId = 1) {
40
42
  const txIdForUrl = txHexNoPrefix.toLowerCase();
41
43
  return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
42
44
  }
43
- if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addr)) {
44
- return `<${constructURL(explorerDomain, ["#", "address", addr])} | ${shortURLString}>`;
45
+ try {
46
+ const addressTvm = tronweb_1.TronWeb.isAddress(addr) ? addr : AddressUtils_1.TvmAddress.from(addr).toNative();
47
+ if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
48
+ return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
49
+ }
50
+ }
51
+ catch {
52
+ return null;
45
53
  }
46
54
  return null;
47
55
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
@@ -45,9 +45,10 @@ export class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
45
45
  if (fallbackFactories.length === 0) {
46
46
  throw error;
47
47
  }
48
- // If one RPC provider reverted, others likely will too. Skip them.
48
+ // If one RPC provider reverted, others likely will too. Skip them and preserve the
49
+ // original error so callers can branch on `isSolanaError(...)`.
49
50
  if (quorumThreshold === 1 && shouldFailImmediate(method, error)) {
50
- throw new Error(`RPC provider reverted for method ${method}`, { cause: error });
51
+ throw error;
51
52
  }
52
53
  const currentFactory = factory.rpcFactory.clusterUrl;
53
54
  const nextFactory = fallbackFactories.shift();
@@ -67,6 +68,12 @@ export class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
67
68
  return errors.map(([factory, errorText]) => `Provider ${factory.clusterUrl} failed to call ${method} with error ${errorText}`);
68
69
  };
69
70
  if (!results.every(isPromiseFulfilled)) {
71
+ // If every rejection is shouldFailImmediate, rethrow the original so callers can branch
72
+ // on `isSolanaError(...)` rather than seeing a wrapped Error.
73
+ const rejections = results.filter(isPromiseRejected);
74
+ if (rejections.length > 0 && rejections.every(({ reason }) => shouldFailImmediate(method, reason))) {
75
+ throw rejections[0].reason;
76
+ }
70
77
  // Format the error so that it's very clear which providers failed and succeeded.
71
78
  const errorTexts = getErrorStrings();
72
79
  const successfulProviderUrls = results.filter(isPromiseFulfilled).map((result) => result.value[0].clusterUrl);
@@ -1 +1 @@
1
- {"version":3,"file":"quorumFallbackRpcFactory.js","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"quorumFallbackRpcFactory.js","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"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"}
@@ -4,6 +4,8 @@ import { createShortenedString } from "./FormattingUtils";
4
4
  import { chainIsEvm, chainIsTvm } from "./NetworkUtils";
5
5
  import { isDefined } from "./TypeGuards";
6
6
  import bs58 from "bs58";
7
+ import { TronWeb } from "tronweb";
8
+ import { TvmAddress } from "./AddressUtils";
7
9
  /**
8
10
  * Creates a block explorer link for a transaction or address on a given network.
9
11
  * @param txHashOrAddress The transaction hash or address to link to.
@@ -70,8 +72,14 @@ function _createBlockExplorerLinkMarkdown(addr, chainId = 1) {
70
72
  const txIdForUrl = txHexNoPrefix.toLowerCase();
71
73
  return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
72
74
  }
73
- if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addr)) {
74
- return `<${constructURL(explorerDomain, ["#", "address", addr])} | ${shortURLString}>`;
75
+ try {
76
+ const addressTvm = TronWeb.isAddress(addr) ? addr : TvmAddress.from(addr).toNative();
77
+ if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
78
+ return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
79
+ }
80
+ }
81
+ catch {
82
+ return null;
75
83
  }
76
84
  return null;
77
85
  }
@@ -1 +1 @@
1
- {"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"BlockExplorerUtils.js","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"quorumFallbackRpcFactory.d.ts","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAe,YAAY,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAGrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAA2B,MAAM,oBAAoB,CAAC;AAMnF,qBAAa,8BAA+B,SAAQ,oBAAoB;IASpE,QAAQ,CAAC,mBAAmB,EAAE,MAAM;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM;IATzB,QAAQ,CAAC,YAAY,EAAE;QACrB,SAAS,EAAE,YAAY,CAAC;QACxB,SAAS,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;QACnF,UAAU,EAAE,sBAAsB,CAAC;KACpC,EAAE,CAAM;gBAGP,wBAAwB,EAAE,qBAAqB,CAAC,OAAO,sBAAsB,CAAC,EAAE,EACvE,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM;IAkBlB,eAAe,IAAI,YAAY;IAuMtC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM;CAY5D"}
1
+ {"version":3,"file":"quorumFallbackRpcFactory.d.ts","sourceRoot":"","sources":["../../../../../src/providers/solana/quorumFallbackRpcFactory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,SAAS,CAAC;AACjC,OAAO,EAAE,gBAAgB,EAAe,YAAY,EAAE,yBAAyB,EAAE,MAAM,aAAa,CAAC;AAGrG,OAAO,EAAE,sBAAsB,EAAE,MAAM,oBAAoB,CAAC;AAC5D,OAAO,EAAE,oBAAoB,EAA2B,MAAM,oBAAoB,CAAC;AAMnF,qBAAa,8BAA+B,SAAQ,oBAAoB;IASpE,QAAQ,CAAC,mBAAmB,EAAE,MAAM;IACpC,QAAQ,CAAC,MAAM,EAAE,MAAM;IATzB,QAAQ,CAAC,YAAY,EAAE;QACrB,SAAS,EAAE,YAAY,CAAC;QACxB,SAAS,EAAE,gBAAgB,CAAC,yBAAyB,CAAC,YAAY,CAAC,EAAE,YAAY,CAAC,CAAC;QACnF,UAAU,EAAE,sBAAsB,CAAC;KACpC,EAAE,CAAM;gBAGP,wBAAwB,EAAE,qBAAqB,CAAC,OAAO,sBAAsB,CAAC,EAAE,EACvE,mBAAmB,EAAE,MAAM,EAC3B,MAAM,EAAE,MAAM;IAkBlB,eAAe,IAAI,YAAY;IA+MtC,UAAU,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,MAAM;CAY5D"}
@@ -1 +1 @@
1
- {"version":3,"file":"BlockExplorerUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"AAOA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE3F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhF;AA2ED;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAElG"}
1
+ {"version":3,"file":"BlockExplorerUtils.d.ts","sourceRoot":"","sources":["../../../../src/utils/BlockExplorerUtils.ts"],"names":[],"mappings":"AASA;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,eAAe,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAE3F;AAED;;;;GAIG;AACH,wBAAgB,0BAA0B,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAEhF;AAgFD;;;;;;GAMG;AACH,wBAAgB,kBAAkB,CAAC,mBAAmB,EAAE,MAAM,EAAE,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,MAAM,CAElG"}
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@across-protocol/sdk",
3
3
  "author": "UMA Team",
4
- "version": "4.3.160",
4
+ "version": "4.3.162",
5
5
  "license": "AGPL-3.0",
6
6
  "homepage": "https://docs.across.to/reference/sdk",
7
7
  "repository": {
@@ -66,9 +66,10 @@ export class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
66
66
  throw error;
67
67
  }
68
68
 
69
- // If one RPC provider reverted, others likely will too. Skip them.
69
+ // If one RPC provider reverted, others likely will too. Skip them and preserve the
70
+ // original error so callers can branch on `isSolanaError(...)`.
70
71
  if (quorumThreshold === 1 && shouldFailImmediate(method, error)) {
71
- throw new Error(`RPC provider reverted for method ${method}`, { cause: error });
72
+ throw error;
72
73
  }
73
74
 
74
75
  const currentFactory = factory.rpcFactory.clusterUrl;
@@ -95,6 +96,13 @@ export class QuorumFallbackSolanaRpcFactory extends SolanaBaseRpcFactory {
95
96
  };
96
97
 
97
98
  if (!results.every(isPromiseFulfilled)) {
99
+ // If every rejection is shouldFailImmediate, rethrow the original so callers can branch
100
+ // on `isSolanaError(...)` rather than seeing a wrapped Error.
101
+ const rejections = results.filter(isPromiseRejected);
102
+ if (rejections.length > 0 && rejections.every(({ reason }) => shouldFailImmediate(method, reason))) {
103
+ throw rejections[0].reason;
104
+ }
105
+
98
106
  // Format the error so that it's very clear which providers failed and succeeded.
99
107
  const errorTexts = getErrorStrings();
100
108
  const successfulProviderUrls = results.filter(isPromiseFulfilled).map((result) => result.value[0].clusterUrl);
@@ -4,6 +4,8 @@ import { createShortenedString } from "./FormattingUtils";
4
4
  import { chainIsEvm, chainIsTvm } from "./NetworkUtils";
5
5
  import { isDefined } from "./TypeGuards";
6
6
  import bs58 from "bs58";
7
+ import { TronWeb } from "tronweb";
8
+ import { TvmAddress } from "./AddressUtils";
7
9
 
8
10
  /**
9
11
  * Creates a block explorer link for a transaction or address on a given network.
@@ -74,8 +76,13 @@ function _createBlockExplorerLinkMarkdown(addr: string, chainId = 1): string | n
74
76
  const txIdForUrl = txHexNoPrefix.toLowerCase();
75
77
  return `<${constructURL(explorerDomain, ["#", "transaction", txIdForUrl])} | ${shortURLString}>`;
76
78
  }
77
- if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addr)) {
78
- return `<${constructURL(explorerDomain, ["#", "address", addr])} | ${shortURLString}>`;
79
+ try {
80
+ const addressTvm = TronWeb.isAddress(addr) ? addr : TvmAddress.from(addr).toNative();
81
+ if (/^T[1-9A-HJ-NP-Za-km-z]{33}$/.test(addressTvm)) {
82
+ return `<${constructURL(explorerDomain, ["#", "address", addressTvm])} | ${shortURLString}>`;
83
+ }
84
+ } catch {
85
+ return null;
79
86
  }
80
87
  return null;
81
88
  } else if (chainIsEvm(chainId)) {