thirdweb 5.102.3 → 5.102.4-nightly-de297e4c9787982f0d66d3898f32a45768a68bc9-20250603000531
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.
- package/dist/cjs/analytics/track/helpers.js +41 -0
- package/dist/cjs/analytics/track/helpers.js.map +1 -0
- package/dist/cjs/analytics/track/transaction.js +25 -0
- package/dist/cjs/analytics/track/transaction.js.map +1 -1
- package/dist/cjs/insight/get-tokens.js +5 -6
- package/dist/cjs/insight/get-tokens.js.map +1 -1
- package/dist/cjs/react/core/hooks/transaction/useSendTransaction.js +13 -0
- package/dist/cjs/react/core/hooks/transaction/useSendTransaction.js.map +1 -1
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.js +28 -8
- package/dist/cjs/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.js.map +1 -1
- package/dist/cjs/transaction/actions/estimate-gas.js +2 -0
- package/dist/cjs/transaction/actions/estimate-gas.js.map +1 -1
- package/dist/cjs/transaction/actions/simulate.js +1 -0
- package/dist/cjs/transaction/actions/simulate.js.map +1 -1
- package/dist/cjs/transaction/extract-error.js +13 -1
- package/dist/cjs/transaction/extract-error.js.map +1 -1
- package/dist/cjs/version.js +1 -1
- package/dist/cjs/version.js.map +1 -1
- package/dist/cjs/wallets/injected/index.js +35 -17
- package/dist/cjs/wallets/injected/index.js.map +1 -1
- package/dist/cjs/wallets/smart/index.js +16 -0
- package/dist/cjs/wallets/smart/index.js.map +1 -1
- package/dist/esm/analytics/track/helpers.js +37 -0
- package/dist/esm/analytics/track/helpers.js.map +1 -0
- package/dist/esm/analytics/track/transaction.js +24 -0
- package/dist/esm/analytics/track/transaction.js.map +1 -1
- package/dist/esm/insight/get-tokens.js +5 -6
- package/dist/esm/insight/get-tokens.js.map +1 -1
- package/dist/esm/react/core/hooks/transaction/useSendTransaction.js +13 -0
- package/dist/esm/react/core/hooks/transaction/useSendTransaction.js.map +1 -1
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.js +28 -8
- package/dist/esm/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.js.map +1 -1
- package/dist/esm/transaction/actions/estimate-gas.js +2 -0
- package/dist/esm/transaction/actions/estimate-gas.js.map +1 -1
- package/dist/esm/transaction/actions/simulate.js +1 -0
- package/dist/esm/transaction/actions/simulate.js.map +1 -1
- package/dist/esm/transaction/extract-error.js +13 -1
- package/dist/esm/transaction/extract-error.js.map +1 -1
- package/dist/esm/version.js +1 -1
- package/dist/esm/version.js.map +1 -1
- package/dist/esm/wallets/injected/index.js +35 -17
- package/dist/esm/wallets/injected/index.js.map +1 -1
- package/dist/esm/wallets/smart/index.js +16 -0
- package/dist/esm/wallets/smart/index.js.map +1 -1
- package/dist/types/analytics/track/helpers.d.ts +12 -0
- package/dist/types/analytics/track/helpers.d.ts.map +1 -0
- package/dist/types/analytics/track/transaction.d.ts +15 -0
- package/dist/types/analytics/track/transaction.d.ts.map +1 -1
- package/dist/types/insight/get-tokens.d.ts +2 -2
- package/dist/types/insight/get-tokens.d.ts.map +1 -1
- package/dist/types/react/core/hooks/transaction/useSendTransaction.d.ts.map +1 -1
- package/dist/types/transaction/actions/estimate-gas.d.ts.map +1 -1
- package/dist/types/transaction/actions/simulate.d.ts.map +1 -1
- package/dist/types/transaction/extract-error.d.ts +1 -0
- package/dist/types/transaction/extract-error.d.ts.map +1 -1
- package/dist/types/version.d.ts +1 -1
- package/dist/types/version.d.ts.map +1 -1
- package/dist/types/wallets/injected/index.d.ts.map +1 -1
- package/dist/types/wallets/smart/index.d.ts.map +1 -1
- package/package.json +1 -1
- package/src/analytics/track/helpers.test.ts +109 -0
- package/src/analytics/track/helpers.ts +49 -0
- package/src/analytics/track/transaction.test.ts +110 -1
- package/src/analytics/track/transaction.ts +37 -0
- package/src/insight/get-tokens.ts +13 -11
- package/src/react/core/hooks/transaction/useSendTransaction.ts +14 -0
- package/src/react/web/ui/ConnectWallet/screens/Buy/swap/fetchBalancesForWallet.tsx +32 -8
- package/src/transaction/actions/estimate-gas.ts +2 -0
- package/src/transaction/actions/simulate.ts +1 -0
- package/src/transaction/extract-error.ts +16 -1
- package/src/version.ts +1 -1
- package/src/wallets/injected/index.ts +36 -18
- package/src/wallets/smart/index.ts +16 -0
@@ -20,5 +20,20 @@ type TransactionEvent = {
|
|
20
20
|
* @internal
|
21
21
|
*/
|
22
22
|
export declare function trackTransaction(args: TransactionEvent): Promise<void | Response>;
|
23
|
+
/**
|
24
|
+
* @internal
|
25
|
+
*/
|
26
|
+
export declare function trackInsufficientFundsError(args: {
|
27
|
+
client: ThirdwebClient;
|
28
|
+
ecosystem?: Ecosystem;
|
29
|
+
error: Error | unknown;
|
30
|
+
walletAddress?: string;
|
31
|
+
chainId?: number;
|
32
|
+
contractAddress?: string;
|
33
|
+
functionName?: string;
|
34
|
+
transactionValue?: bigint;
|
35
|
+
requiredAmount?: bigint;
|
36
|
+
userBalance?: bigint;
|
37
|
+
}): Promise<void | Response>;
|
23
38
|
export {};
|
24
39
|
//# sourceMappingURL=transaction.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../../src/analytics/track/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
1
|
+
{"version":3,"file":"transaction.d.ts","sourceRoot":"","sources":["../../../../src/analytics/track/transaction.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAE7D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,2CAA2C,CAAC;AAC3E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAI9D,KAAK,gBAAgB,GAAG;IACtB,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,UAAU,CAAC,EAAE,QAAQ,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IACtC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,KAAK,CAAC,EAAE;QACN,OAAO,EAAE,MAAM,CAAC;QAChB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC;CACH,CAAC;AAEF;;GAEG;AACH,wBAAsB,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,4BAK5D;AA4BD;;GAEG;AACH,wBAAsB,2BAA2B,CAAC,IAAI,EAAE;IACtD,MAAM,EAAE,cAAc,CAAC;IACvB,SAAS,CAAC,EAAE,SAAS,CAAC;IACtB,KAAK,EAAE,KAAK,GAAG,OAAO,CAAC;IACvB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,4BAoBA"}
|
@@ -1,4 +1,4 @@
|
|
1
|
-
import type {
|
1
|
+
import type { GetV1TokensData } from "@thirdweb-dev/insight";
|
2
2
|
import type { Chain } from "../chains/types.js";
|
3
3
|
import type { ThirdwebClient } from "../client/client.js";
|
4
4
|
import type { GetWalletBalanceResult } from "../wallets/utils/getWalletBalance.js";
|
@@ -20,6 +20,6 @@ export declare function getOwnedTokens(args: {
|
|
20
20
|
client: ThirdwebClient;
|
21
21
|
chains: Chain[];
|
22
22
|
ownerAddress: string;
|
23
|
-
queryOptions?:
|
23
|
+
queryOptions?: Omit<GetV1TokensData["query"], "owner_address" | "chain_id" | "chain">;
|
24
24
|
}): Promise<GetWalletBalanceResult[]>;
|
25
25
|
//# sourceMappingURL=get-tokens.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"get-tokens.d.ts","sourceRoot":"","sources":["../../../src/insight/get-tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,
|
1
|
+
{"version":3,"file":"get-tokens.d.ts","sourceRoot":"","sources":["../../../src/insight/get-tokens.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,eAAe,EAEhB,MAAM,uBAAuB,CAAC;AAC/B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAChD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAC1D,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,sCAAsC,CAAC;AAInF;;;;;;;;;;;;;GAaG;AACH,wBAAsB,cAAc,CAAC,IAAI,EAAE;IACzC,MAAM,EAAE,cAAc,CAAC;IACvB,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,YAAY,EAAE,MAAM,CAAC;IACrB,YAAY,CAAC,EAAE,IAAI,CACjB,eAAe,CAAC,OAAO,CAAC,EACxB,eAAe,GAAG,UAAU,GAAG,OAAO,CACvC,CAAC;CACH,GAAG,OAAO,CAAC,sBAAsB,EAAE,CAAC,CA4CpC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"useSendTransaction.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/transaction/useSendTransaction.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAe,MAAM,uBAAuB,CAAC;
|
1
|
+
{"version":3,"file":"useSendTransaction.d.ts","sourceRoot":"","sources":["../../../../../../src/react/core/hooks/transaction/useSendTransaction.ts"],"names":[],"mappings":"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"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"estimate-gas.d.ts","sourceRoot":"","sources":["../../../../src/transaction/actions/estimate-gas.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACvC;IACE;;OAEG;IAGH,WAAW,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;CACvC,GAAG,CACA;IACE;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,GACD;IACE,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACzB,CACJ,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAOvC;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,
|
1
|
+
{"version":3,"file":"estimate-gas.d.ts","sourceRoot":"","sources":["../../../../src/transaction/actions/estimate-gas.ts"],"names":[],"mappings":"AAMA,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAErE,MAAM,MAAM,kBAAkB,GAAG,QAAQ,CACvC;IACE;;OAEG;IAGH,WAAW,EAAE,mBAAmB,CAAC,GAAG,CAAC,CAAC;CACvC,GAAG,CACA;IACE;;;;OAIG;IACH,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,GACD;IACE,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB;;OAEG;IACH,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC;CACzB,CACJ,CACF,CAAC;AAEF,MAAM,MAAM,iBAAiB,GAAG,MAAM,CAAC;AAOvC;;;;;;;;;;;;;GAaG;AACH,wBAAsB,WAAW,CAC/B,OAAO,EAAE,kBAAkB,GAC1B,OAAO,CAAC,iBAAiB,CAAC,CAiG5B"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"simulate.d.ts","sourceRoot":"","sources":["../../../../src/transaction/actions/simulate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIrE,MAAM,MAAM,eAAe,CACzB,GAAG,SAAS,GAAG,EACf,KAAK,SAAS,WAAW,IACvB,QAAQ,CACV;IACE,WAAW,EAAE,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;CAC9C,GAAG,CACA;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,GACD;IACE,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CACJ,CACF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,CAAC,GAAG,SAAS,GAAG,EACrB,KAAK,CAAC,KAAK,SAAS,WAAW,EAC/B,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,
|
1
|
+
{"version":3,"file":"simulate.d.ts","sourceRoot":"","sources":["../../../../src/transaction/actions/simulate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AAOhD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,2BAA2B,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oCAAoC,CAAC;AAElE,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,2BAA2B,CAAC;AAIrE,MAAM,MAAM,eAAe,CACzB,GAAG,SAAS,GAAG,EACf,KAAK,SAAS,WAAW,IACvB,QAAQ,CACV;IACE,WAAW,EAAE,mBAAmB,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;CAC9C,GAAG,CACA;IACE,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,CAAC,EAAE,KAAK,CAAC;CACd,GACD;IACE,OAAO,CAAC,EAAE,KAAK,CAAC;IAChB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CACJ,CACF,CAAC;AAEF;;;;;;;;;;;;GAYG;AACH,wBAAsB,mBAAmB,CACvC,KAAK,CAAC,GAAG,SAAS,GAAG,EACrB,KAAK,CAAC,KAAK,SAAS,WAAW,EAC/B,OAAO,EAAE,eAAe,CAAC,GAAG,EAAE,KAAK,CAAC,gBA8CrC"}
|
@@ -6,6 +6,7 @@ import type { ThirdwebContract } from "../contract/contract.js";
|
|
6
6
|
export declare function extractError<abi extends Abi>(args: {
|
7
7
|
error: unknown;
|
8
8
|
contract?: ThirdwebContract<abi>;
|
9
|
+
fromAddress?: string;
|
9
10
|
}): Promise<unknown>;
|
10
11
|
export declare function extractErrorResult<abi extends Abi>(args: {
|
11
12
|
error: unknown;
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"extract-error.d.ts","sourceRoot":"","sources":["../../../src/transaction/extract-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;
|
1
|
+
{"version":3,"file":"extract-error.d.ts","sourceRoot":"","sources":["../../../src/transaction/extract-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,SAAS,CAAC;AAKnC,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,yBAAyB,CAAC;AAIhE;;GAEG;AACH,wBAAsB,YAAY,CAAC,GAAG,SAAS,GAAG,EAAE,IAAI,EAAE;IACxD,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC;IACjC,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,oBAmBA;AAED,wBAAsB,kBAAkB,CAAC,GAAG,SAAS,GAAG,EAAE,IAAI,EAAE;IAC9D,KAAK,EAAE,OAAO,CAAC;IACf,QAAQ,CAAC,EAAE,gBAAgB,CAAC,GAAG,CAAC,CAAC;CAClC,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAwB9B"}
|
package/dist/types/version.d.ts
CHANGED
@@ -1,2 +1,2 @@
|
|
1
|
-
export declare const version = "5.102.
|
1
|
+
export declare const version = "5.102.4-nightly-de297e4c9787982f0d66d3898f32a45768a68bc9-20250603000531";
|
2
2
|
//# sourceMappingURL=version.d.ts.map
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,
|
1
|
+
{"version":3,"file":"version.d.ts","sourceRoot":"","sources":["../../src/version.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,OAAO,4EAA4E,CAAC"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/injected/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAC;AAU5C,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAS7D,OAAO,KAAK,EAAE,0BAA0B,EAAE,MAAM,gCAAgC,CAAC;AACjF,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAC9E,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,aAAa,CAAC;AAG/D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAInD,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,QAAQ,gDAOrD;AAED;;GAEG;AACH,wBAAsB,oBAAoB,CAAC,EACzC,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,EAAE,EAAE,0BAA0B,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,eAAe,CAAC;IAC1B,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;IACd,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;CACpD,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CA4DxC;AAED;;GAEG;AACH,wBAAsB,wBAAwB,CAAC,EAC7C,EAAE,EACF,QAAQ,EACR,OAAO,EACP,MAAM,EACN,KAAK,GACN,EAAE;IACD,EAAE,EAAE,0BAA0B,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;IAC/C,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnD,MAAM,EAAE,cAAc,CAAC;IACvB,KAAK,CAAC,EAAE,KAAK,CAAC;CACf,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,CA8BxC;AA+ID;;;GAGG;AACH,iBAAe,SAAS,CAAC,EACvB,QAAQ,EACR,OAAO,EACP,KAAK,EACL,OAAO,EACP,MAAM,EACN,EAAE,GACH,EAAE;IACD,QAAQ,EAAE,eAAe,CAAC;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,OAAO,EAAE,aAAa,CAAC,0BAA0B,CAAC,CAAC;IACnD,MAAM,EAAE,cAAc,CAAC;IACvB,EAAE,EAAE,QAAQ,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC,CAAC;CAC9B,GAAG,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,EAAE,YAAY,EAAE,aAAa,CAAC,CAAC,CA8CzD"}
|
@@ -1 +1 @@
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/wallets/smart/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,uBAAuB,CAAC;AAEnD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAuB7D,OAAO,KAAK,EAAE,OAAO,EAAyB,MAAM,yBAAyB,CAAC;AAuB9E,OAAO,KAAK,EAIV,4BAA4B,EAC5B,kBAAkB,EAInB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,MAAM,sBAAsB,CAAC;AAUrD;;GAEG;AACH,wBAAsB,mBAAmB,CACvC,iBAAiB,EAAE,4BAA4B,EAC/C,eAAe,EAAE,kBAAkB,GAClC,OAAO,CAAC,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAqH3B;AAED;;GAEG;AACH,wBAAsB,sBAAsB,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,CAQ5E;AAuXD,wBAAsB,wBAAwB,CAC5C,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,cAAc,EACtB,KAAK,EAAE,KAAK,+BAgBb"}
|
package/package.json
CHANGED
@@ -0,0 +1,109 @@
|
|
1
|
+
import { describe, expect, it } from "vitest";
|
2
|
+
import { getErrorDetails, isInsufficientFundsError } from "./helpers.js";
|
3
|
+
|
4
|
+
describe("isInsufficientFundsError", () => {
|
5
|
+
it("should detect basic insufficient funds error message", () => {
|
6
|
+
const error = new Error("insufficient funds");
|
7
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
8
|
+
});
|
9
|
+
|
10
|
+
it("should detect insufficient funds for gas error", () => {
|
11
|
+
const error = new Error("Insufficient funds for gas * price + value");
|
12
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
13
|
+
});
|
14
|
+
|
15
|
+
it("should detect insufficient funds for intrinsic transaction cost", () => {
|
16
|
+
const error = new Error(
|
17
|
+
"insufficient funds for intrinsic transaction cost",
|
18
|
+
);
|
19
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
20
|
+
});
|
21
|
+
|
22
|
+
it("should detect insufficient balance error", () => {
|
23
|
+
const error = new Error("insufficient balance");
|
24
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
25
|
+
});
|
26
|
+
|
27
|
+
it("should detect insufficient native funds error", () => {
|
28
|
+
const error = new Error("Insufficient Native Funds");
|
29
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
30
|
+
});
|
31
|
+
|
32
|
+
it("should detect INSUFFICIENT_FUNDS error code", () => {
|
33
|
+
const error = { code: "INSUFFICIENT_FUNDS", message: "Transaction failed" };
|
34
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
35
|
+
});
|
36
|
+
|
37
|
+
it("should detect reason field", () => {
|
38
|
+
const error = {
|
39
|
+
reason: "insufficient funds",
|
40
|
+
message: "Transaction failed",
|
41
|
+
};
|
42
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
43
|
+
});
|
44
|
+
|
45
|
+
it("should detect error in nested data.message", () => {
|
46
|
+
const error = { data: { message: "insufficient funds for gas" } };
|
47
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
48
|
+
});
|
49
|
+
|
50
|
+
it("should handle string errors", () => {
|
51
|
+
expect(isInsufficientFundsError("insufficient funds")).toBe(true);
|
52
|
+
});
|
53
|
+
|
54
|
+
it("should return false for non-insufficient funds errors", () => {
|
55
|
+
const error = new Error("User rejected transaction");
|
56
|
+
expect(isInsufficientFundsError(error)).toBe(false);
|
57
|
+
});
|
58
|
+
|
59
|
+
it("should return false for null/undefined", () => {
|
60
|
+
expect(isInsufficientFundsError(null)).toBe(false);
|
61
|
+
expect(isInsufficientFundsError(undefined)).toBe(false);
|
62
|
+
});
|
63
|
+
|
64
|
+
it("should be case insensitive", () => {
|
65
|
+
const error = new Error("INSUFFICIENT FUNDS FOR GAS");
|
66
|
+
expect(isInsufficientFundsError(error)).toBe(true);
|
67
|
+
});
|
68
|
+
});
|
69
|
+
|
70
|
+
describe("getErrorDetails", () => {
|
71
|
+
it("should extract message and code from Error object", () => {
|
72
|
+
const error = new Error("Test error message");
|
73
|
+
const details = getErrorDetails(error);
|
74
|
+
expect(details.message).toBe("Test error message");
|
75
|
+
expect(details.code).toBeUndefined();
|
76
|
+
});
|
77
|
+
|
78
|
+
it("should extract message and code from error object", () => {
|
79
|
+
const error = { message: "Test message", code: "TEST_CODE" };
|
80
|
+
const details = getErrorDetails(error);
|
81
|
+
expect(details.message).toBe("Test message");
|
82
|
+
expect(details.code).toBe("TEST_CODE");
|
83
|
+
});
|
84
|
+
|
85
|
+
it("should extract message from nested data", () => {
|
86
|
+
const error = { data: { message: "Nested error message" } };
|
87
|
+
const details = getErrorDetails(error);
|
88
|
+
expect(details.message).toBe("Nested error message");
|
89
|
+
});
|
90
|
+
|
91
|
+
it("should handle string errors", () => {
|
92
|
+
const details = getErrorDetails("String error");
|
93
|
+
expect(details.message).toBe("String error");
|
94
|
+
expect(details.code).toBeUndefined();
|
95
|
+
});
|
96
|
+
|
97
|
+
it("should handle null/undefined", () => {
|
98
|
+
const details = getErrorDetails(null);
|
99
|
+
expect(details.message).toBe("Unknown error");
|
100
|
+
expect(details.code).toBeUndefined();
|
101
|
+
});
|
102
|
+
|
103
|
+
it("should extract reason as code", () => {
|
104
|
+
const error = { message: "Test message", reason: "test_reason" };
|
105
|
+
const details = getErrorDetails(error);
|
106
|
+
expect(details.message).toBe("Test message");
|
107
|
+
expect(details.code).toBe("test_reason");
|
108
|
+
});
|
109
|
+
});
|
@@ -0,0 +1,49 @@
|
|
1
|
+
/**
|
2
|
+
* @internal
|
3
|
+
*/
|
4
|
+
export function isInsufficientFundsError(error: Error | unknown): boolean {
|
5
|
+
if (!error) return false;
|
6
|
+
|
7
|
+
const errorMessage =
|
8
|
+
typeof error === "string"
|
9
|
+
? error
|
10
|
+
: (error as Error)?.message ||
|
11
|
+
(error as { data?: { message?: string } })?.data?.message ||
|
12
|
+
"";
|
13
|
+
|
14
|
+
const message = errorMessage.toLowerCase();
|
15
|
+
|
16
|
+
// Common patterns for insufficient funds errors
|
17
|
+
return (
|
18
|
+
message.includes("insufficient funds") ||
|
19
|
+
message.includes("insufficient balance") ||
|
20
|
+
(message.includes("insufficient") &&
|
21
|
+
(message.includes("native") || message.includes("gas"))) ||
|
22
|
+
// Common error codes from various wallets/providers
|
23
|
+
(error as { code?: string | number })?.code === "INSUFFICIENT_FUNDS" ||
|
24
|
+
(error as { reason?: string })?.reason === "insufficient funds"
|
25
|
+
);
|
26
|
+
}
|
27
|
+
|
28
|
+
/**
|
29
|
+
* @internal
|
30
|
+
*/
|
31
|
+
export function getErrorDetails(error: Error | unknown): {
|
32
|
+
message: string;
|
33
|
+
code?: string | number;
|
34
|
+
} {
|
35
|
+
if (!error) return { message: "Unknown error" };
|
36
|
+
|
37
|
+
const message =
|
38
|
+
typeof error === "string"
|
39
|
+
? error
|
40
|
+
: (error as Error)?.message ||
|
41
|
+
(error as { data?: { message?: string } })?.data?.message ||
|
42
|
+
String(error);
|
43
|
+
|
44
|
+
const code =
|
45
|
+
(error as { code?: string | number })?.code ||
|
46
|
+
(error as { reason?: string })?.reason;
|
47
|
+
|
48
|
+
return { message, code };
|
49
|
+
}
|
@@ -2,7 +2,10 @@ import { http, HttpResponse } from "msw";
|
|
2
2
|
import { setupServer } from "msw/node";
|
3
3
|
import { afterAll, afterEach, beforeAll, describe, expect, it } from "vitest";
|
4
4
|
import type { ThirdwebClient } from "../../client/client.js";
|
5
|
-
import {
|
5
|
+
import {
|
6
|
+
trackInsufficientFundsError,
|
7
|
+
trackTransaction,
|
8
|
+
} from "./transaction.js";
|
6
9
|
|
7
10
|
const server = setupServer(
|
8
11
|
http.post("https://c.thirdweb.com/event", () => {
|
@@ -127,4 +130,110 @@ describe("transaction tracking", () => {
|
|
127
130
|
"test-partner-id",
|
128
131
|
);
|
129
132
|
});
|
133
|
+
|
134
|
+
it("should track insufficient funds error with correct data", async () => {
|
135
|
+
const mockClient: ThirdwebClient = {
|
136
|
+
clientId: "test-client-id",
|
137
|
+
secretKey: undefined,
|
138
|
+
};
|
139
|
+
|
140
|
+
let requestBody: unknown;
|
141
|
+
server.use(
|
142
|
+
http.post("https://c.thirdweb.com/event", async (handler) => {
|
143
|
+
requestBody = await handler.request.json();
|
144
|
+
return HttpResponse.json({});
|
145
|
+
}),
|
146
|
+
);
|
147
|
+
|
148
|
+
const mockError = new Error("Insufficient funds for gas * price + value");
|
149
|
+
|
150
|
+
await trackInsufficientFundsError({
|
151
|
+
client: mockClient,
|
152
|
+
error: mockError,
|
153
|
+
walletAddress: "0x1234567890123456789012345678901234567890",
|
154
|
+
chainId: 1,
|
155
|
+
contractAddress: "0xcontract",
|
156
|
+
transactionValue: 1000000000000000000n,
|
157
|
+
});
|
158
|
+
|
159
|
+
expect(requestBody).toEqual({
|
160
|
+
source: "sdk",
|
161
|
+
action: "transaction:insufficient_funds",
|
162
|
+
clientId: "test-client-id",
|
163
|
+
chainId: 1,
|
164
|
+
walletAddress: "0x1234567890123456789012345678901234567890",
|
165
|
+
contractAddress: "0xcontract",
|
166
|
+
transactionValue: "1000000000000000000",
|
167
|
+
requiredAmount: undefined,
|
168
|
+
userBalance: undefined,
|
169
|
+
errorMessage: "Insufficient funds for gas * price + value",
|
170
|
+
errorCode: undefined,
|
171
|
+
});
|
172
|
+
});
|
173
|
+
|
174
|
+
it("should not throw an error if insufficient funds tracking request fails", async () => {
|
175
|
+
const mockClient: ThirdwebClient = {
|
176
|
+
clientId: "test-client-id",
|
177
|
+
secretKey: undefined,
|
178
|
+
};
|
179
|
+
|
180
|
+
server.use(
|
181
|
+
http.post("https://c.thirdweb.com/event", () => {
|
182
|
+
return HttpResponse.error();
|
183
|
+
}),
|
184
|
+
);
|
185
|
+
|
186
|
+
const mockError = new Error("insufficient funds");
|
187
|
+
|
188
|
+
expect(() =>
|
189
|
+
trackInsufficientFundsError({
|
190
|
+
client: mockClient,
|
191
|
+
error: mockError,
|
192
|
+
walletAddress: "0x1234567890123456789012345678901234567890",
|
193
|
+
chainId: 137,
|
194
|
+
}),
|
195
|
+
).not.toThrowError();
|
196
|
+
|
197
|
+
// Wait for the asynchronous POST request to complete
|
198
|
+
await new Promise((resolve) => setTimeout(resolve, 100));
|
199
|
+
});
|
200
|
+
|
201
|
+
it("should track insufficient funds error during transaction preparation", async () => {
|
202
|
+
const mockClient: ThirdwebClient = {
|
203
|
+
clientId: "test-client-id",
|
204
|
+
secretKey: undefined,
|
205
|
+
};
|
206
|
+
|
207
|
+
let requestBody: unknown;
|
208
|
+
server.use(
|
209
|
+
http.post("https://c.thirdweb.com/event", async (handler) => {
|
210
|
+
requestBody = await handler.request.json();
|
211
|
+
return HttpResponse.json({});
|
212
|
+
}),
|
213
|
+
);
|
214
|
+
|
215
|
+
const mockError = new Error("insufficient funds for gas");
|
216
|
+
|
217
|
+
await trackInsufficientFundsError({
|
218
|
+
client: mockClient,
|
219
|
+
error: mockError,
|
220
|
+
walletAddress: "0xabcdef1234567890abcdef1234567890abcdef12",
|
221
|
+
chainId: 42,
|
222
|
+
contractAddress: "0x0987654321098765432109876543210987654321",
|
223
|
+
});
|
224
|
+
|
225
|
+
expect(requestBody).toEqual({
|
226
|
+
source: "sdk",
|
227
|
+
action: "transaction:insufficient_funds",
|
228
|
+
clientId: "test-client-id",
|
229
|
+
chainId: 42,
|
230
|
+
walletAddress: "0xabcdef1234567890abcdef1234567890abcdef12",
|
231
|
+
contractAddress: "0x0987654321098765432109876543210987654321",
|
232
|
+
transactionValue: undefined,
|
233
|
+
requiredAmount: undefined,
|
234
|
+
userBalance: undefined,
|
235
|
+
errorMessage: "insufficient funds for gas",
|
236
|
+
errorCode: undefined,
|
237
|
+
});
|
238
|
+
});
|
130
239
|
});
|
@@ -2,6 +2,7 @@ import type { ThirdwebClient } from "../../client/client.js";
|
|
2
2
|
import { stringify } from "../../utils/json.js";
|
3
3
|
import type { Ecosystem } from "../../wallets/in-app/core/wallet/types.js";
|
4
4
|
import type { WalletId } from "../../wallets/wallet-types.js";
|
5
|
+
import { getErrorDetails } from "./helpers.js";
|
5
6
|
import { track } from "./index.js";
|
6
7
|
|
7
8
|
type TransactionEvent = {
|
@@ -55,3 +56,39 @@ function trackTransactionEvent(
|
|
55
56
|
},
|
56
57
|
});
|
57
58
|
}
|
59
|
+
|
60
|
+
/**
|
61
|
+
* @internal
|
62
|
+
*/
|
63
|
+
export async function trackInsufficientFundsError(args: {
|
64
|
+
client: ThirdwebClient;
|
65
|
+
ecosystem?: Ecosystem;
|
66
|
+
error: Error | unknown;
|
67
|
+
walletAddress?: string;
|
68
|
+
chainId?: number;
|
69
|
+
contractAddress?: string;
|
70
|
+
functionName?: string;
|
71
|
+
transactionValue?: bigint;
|
72
|
+
requiredAmount?: bigint;
|
73
|
+
userBalance?: bigint;
|
74
|
+
}) {
|
75
|
+
const errorDetails = getErrorDetails(args.error);
|
76
|
+
|
77
|
+
return track({
|
78
|
+
client: args.client,
|
79
|
+
ecosystem: args.ecosystem,
|
80
|
+
data: {
|
81
|
+
action: "transaction:insufficient_funds",
|
82
|
+
clientId: args.client.clientId,
|
83
|
+
chainId: args.chainId,
|
84
|
+
walletAddress: args.walletAddress,
|
85
|
+
contractAddress: args.contractAddress,
|
86
|
+
functionName: args.functionName,
|
87
|
+
transactionValue: args.transactionValue?.toString(),
|
88
|
+
requiredAmount: args.requiredAmount?.toString(),
|
89
|
+
userBalance: args.userBalance?.toString(),
|
90
|
+
errorMessage: errorDetails.message,
|
91
|
+
errorCode: errorDetails.code ? stringify(errorDetails.code) : undefined,
|
92
|
+
},
|
93
|
+
});
|
94
|
+
}
|
@@ -1,12 +1,12 @@
|
|
1
1
|
import type {
|
2
|
-
|
3
|
-
|
2
|
+
GetV1TokensData,
|
3
|
+
GetV1TokensResponse,
|
4
4
|
} from "@thirdweb-dev/insight";
|
5
5
|
import type { Chain } from "../chains/types.js";
|
6
6
|
import type { ThirdwebClient } from "../client/client.js";
|
7
7
|
import type { GetWalletBalanceResult } from "../wallets/utils/getWalletBalance.js";
|
8
8
|
|
9
|
-
type OwnedToken =
|
9
|
+
type OwnedToken = GetV1TokensResponse["data"][number];
|
10
10
|
|
11
11
|
/**
|
12
12
|
* Get ERC20 tokens owned by an address
|
@@ -26,10 +26,13 @@ export async function getOwnedTokens(args: {
|
|
26
26
|
client: ThirdwebClient;
|
27
27
|
chains: Chain[];
|
28
28
|
ownerAddress: string;
|
29
|
-
queryOptions?:
|
29
|
+
queryOptions?: Omit<
|
30
|
+
GetV1TokensData["query"],
|
31
|
+
"owner_address" | "chain_id" | "chain"
|
32
|
+
>;
|
30
33
|
}): Promise<GetWalletBalanceResult[]> {
|
31
34
|
const [
|
32
|
-
{
|
35
|
+
{ getV1Tokens },
|
33
36
|
{ getThirdwebDomains },
|
34
37
|
{ getClientFetch },
|
35
38
|
{ assertInsightEnabled },
|
@@ -46,19 +49,18 @@ export async function getOwnedTokens(args: {
|
|
46
49
|
|
47
50
|
await assertInsightEnabled(chains);
|
48
51
|
|
49
|
-
const defaultQueryOptions:
|
50
|
-
|
52
|
+
const defaultQueryOptions: GetV1TokensData["query"] = {
|
53
|
+
owner_address: ownerAddress,
|
54
|
+
chain_id: chains.map((chain) => chain.id),
|
55
|
+
include_native: "true",
|
51
56
|
include_spam: "false",
|
52
57
|
metadata: "true",
|
53
58
|
limit: 50,
|
54
59
|
};
|
55
60
|
|
56
|
-
const result = await
|
61
|
+
const result = await getV1Tokens({
|
57
62
|
baseUrl: `https://${getThirdwebDomains().insight}`,
|
58
63
|
fetch: getClientFetch(client),
|
59
|
-
path: {
|
60
|
-
ownerAddress: ownerAddress,
|
61
|
-
},
|
62
64
|
query: {
|
63
65
|
...defaultQueryOptions,
|
64
66
|
...queryOptions,
|
@@ -1,5 +1,7 @@
|
|
1
1
|
import { type UseMutationResult, useMutation } from "@tanstack/react-query";
|
2
|
+
import { isInsufficientFundsError } from "../../../../analytics/track/helpers.js";
|
2
3
|
import { trackPayEvent } from "../../../../analytics/track/pay.js";
|
4
|
+
import { trackInsufficientFundsError } from "../../../../analytics/track/transaction.js";
|
3
5
|
import * as Bridge from "../../../../bridge/index.js";
|
4
6
|
import type { Chain } from "../../../../chains/types.js";
|
5
7
|
import type { BuyWithCryptoStatus } from "../../../../pay/buyWithCrypto/getStatus.js";
|
@@ -174,6 +176,18 @@ export function useSendTransactionCore(args: {
|
|
174
176
|
|
175
177
|
resolve(res);
|
176
178
|
} catch (e) {
|
179
|
+
// Track insufficient funds errors specifically
|
180
|
+
if (isInsufficientFundsError(e)) {
|
181
|
+
trackInsufficientFundsError({
|
182
|
+
client: tx.client,
|
183
|
+
error: e,
|
184
|
+
walletAddress: account.address,
|
185
|
+
chainId: tx.chain.id,
|
186
|
+
contractAddress: await resolvePromisedValue(tx.to ?? undefined),
|
187
|
+
transactionValue: await resolvePromisedValue(tx.value),
|
188
|
+
});
|
189
|
+
}
|
190
|
+
|
177
191
|
reject(e);
|
178
192
|
}
|
179
193
|
};
|
@@ -141,17 +141,37 @@ async function fetchBalancesForWallet({
|
|
141
141
|
const insightChunks = chunkChains(insightEnabledChains);
|
142
142
|
await Promise.all(
|
143
143
|
insightChunks.map(async (chunk) => {
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
144
|
+
let owned: GetWalletBalanceResult[] = [];
|
145
|
+
let page = 0;
|
146
|
+
const limit = 100;
|
147
|
+
|
148
|
+
while (true) {
|
149
|
+
const batch = await getOwnedTokens({
|
150
|
+
ownerAddress: account.address,
|
151
|
+
chains: chunk,
|
152
|
+
client,
|
153
|
+
queryOptions: {
|
154
|
+
limit,
|
155
|
+
page,
|
156
|
+
},
|
157
|
+
}).catch((err) => {
|
158
|
+
console.error("error fetching balances from insight", err);
|
159
|
+
return [];
|
160
|
+
});
|
161
|
+
|
162
|
+
if (batch.length === 0) {
|
163
|
+
break;
|
164
|
+
}
|
165
|
+
|
166
|
+
owned = [...owned, ...batch];
|
167
|
+
page += 1;
|
168
|
+
}
|
149
169
|
|
150
170
|
for (const b of owned) {
|
151
171
|
const matching = sourceSupportedTokens[b.chainId]?.find(
|
152
172
|
(t) => t.address.toLowerCase() === b.tokenAddress.toLowerCase(),
|
153
173
|
);
|
154
|
-
if (matching) {
|
174
|
+
if (matching && b.value > 0n) {
|
155
175
|
balances.push({
|
156
176
|
balance: b,
|
157
177
|
chain: getCachedChain(b.chainId),
|
@@ -187,6 +207,10 @@ async function fetchBalancesForWallet({
|
|
187
207
|
const chainId = Number(chainIdStr);
|
188
208
|
const chain = getCachedChain(chainId);
|
189
209
|
|
210
|
+
if (insightEnabledChains.some((c) => c.id === chainId)) {
|
211
|
+
continue;
|
212
|
+
}
|
213
|
+
|
190
214
|
for (const token of tokens) {
|
191
215
|
const isNative = isNativeToken(token);
|
192
216
|
const isAlreadyFetched = balances.some(
|
@@ -194,7 +218,7 @@ async function fetchBalancesForWallet({
|
|
194
218
|
b.chain.id === chainId &&
|
195
219
|
b.token.address.toLowerCase() === token.address.toLowerCase(),
|
196
220
|
);
|
197
|
-
if (isAlreadyFetched
|
221
|
+
if (isAlreadyFetched) {
|
198
222
|
// ERC20 on insight-enabled chain already handled by insight call
|
199
223
|
continue;
|
200
224
|
}
|
@@ -222,7 +246,7 @@ async function fetchBalancesForWallet({
|
|
222
246
|
}
|
223
247
|
} catch (err) {
|
224
248
|
console.warn(
|
225
|
-
`Failed to fetch balance for ${token.symbol} on chain ${chainId}`,
|
249
|
+
`Failed to fetch RPC balance for ${token.symbol} on chain ${chainId}`,
|
226
250
|
err,
|
227
251
|
);
|
228
252
|
}
|
@@ -94,6 +94,7 @@ export async function estimateGas(
|
|
94
94
|
throw await extractError({
|
95
95
|
error,
|
96
96
|
contract: options.transaction.__contract,
|
97
|
+
fromAddress,
|
97
98
|
});
|
98
99
|
}
|
99
100
|
}
|
@@ -150,6 +151,7 @@ export async function estimateGas(
|
|
150
151
|
throw await extractError({
|
151
152
|
error,
|
152
153
|
contract: options.transaction.__contract,
|
154
|
+
fromAddress,
|
153
155
|
});
|
154
156
|
}
|
155
157
|
})();
|