@lifi/sdk 3.6.4 → 3.6.5
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/package.json +1 -1
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js +6 -0
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js +2 -5
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js.map +1 -1
- package/src/_cjs/typeguards.js +2 -3
- package/src/_cjs/typeguards.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js +6 -0
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_esm/core/EVM/waitForTransactionReceipt.js +4 -5
- package/src/_esm/core/EVM/waitForTransactionReceipt.js.map +1 -1
- package/src/_esm/typeguards.js +2 -3
- package/src/_esm/typeguards.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_types/core/EVM/waitForBatchTransactionReceipt.d.ts.map +1 -1
- package/src/_types/core/EVM/waitForTransactionReceipt.d.ts.map +1 -1
- package/src/_types/typeguards.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/waitForBatchTransactionReceipt.ts +13 -0
- package/src/core/EVM/waitForTransactionReceipt.ts +4 -5
- package/src/typeguards.ts +2 -4
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -24,6 +24,12 @@ const waitForBatchTransactionReceipt = async (client, batchHash) => {
|
|
|
24
24
|
const transactionReceipt = callsDetails.receipts.at(-1);
|
|
25
25
|
return transactionReceipt;
|
|
26
26
|
}
|
|
27
|
+
if (callsDetails.status === 400) {
|
|
28
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionCanceled, 'Transaction was canceled.');
|
|
29
|
+
}
|
|
30
|
+
if (callsDetails.status === 500) {
|
|
31
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionFailed, 'Transaction failed.');
|
|
32
|
+
}
|
|
27
33
|
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionNotFound, 'Transaction not found.');
|
|
28
34
|
}, 5000, 3, (_, error) => {
|
|
29
35
|
return !(error instanceof errors_js_1.TransactionError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":";;;AAKA,oDAAkD;AAClD,sCAAsC;AACtC,4DAAyD;AACzD,sDAAyD;AACzD,mEAA4D;AAOrD,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,OAAO,IAAA,gCAAa,EAClB,KAAK,IAAI,EAAE;QACT,MAAM,YAAY,GAAG,MAAM,IAAA,iBAAS,EAClC,MAAM,EACN,6BAAc,EACd,gBAAgB,CACjB,CAAC;YACA,EAAE,EAAE,SAAS;SACd,CAAC,CAAA;QAGF,IACE,YAAY,CAAC,MAAM,KAAK,SAAS;YACjC,YAAY,CAAC,MAAM,KAAM,GAAW,EACpC,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAGD,IAAI,YAAY,CAAC,MAAM,KAAK,WAAW,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvE,IACE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;gBAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;gBAClE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACtE,CAAC;gBACD,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;YACH,CAAC;YACD,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;YACxD,OAAO,kBAAkB,CAAA;QAC3B,CAAC;QAED,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,mBAAmB,EACjC,wBAAwB,CACzB,CAAA;IACH,CAAC,EACD,IAAI,EACJ,CAAC,EACD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACX,OAAO,CAAC,CAAC,KAAK,YAAY,4BAAgB,CAAC,CAAA;IAC7C,CAAC,CACF,CAAA;AACH,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":";;;AAKA,oDAAkD;AAClD,sCAAsC;AACtC,4DAAyD;AACzD,sDAAyD;AACzD,mEAA4D;AAOrD,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,OAAO,IAAA,gCAAa,EAClB,KAAK,IAAI,EAAE;QACT,MAAM,YAAY,GAAG,MAAM,IAAA,iBAAS,EAClC,MAAM,EACN,6BAAc,EACd,gBAAgB,CACjB,CAAC;YACA,EAAE,EAAE,SAAS;SACd,CAAC,CAAA;QAGF,IACE,YAAY,CAAC,MAAM,KAAK,SAAS;YACjC,YAAY,CAAC,MAAM,KAAM,GAAW,EACpC,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAGD,IAAI,YAAY,CAAC,MAAM,KAAK,WAAW,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvE,IACE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;gBAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;gBAClE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACtE,CAAC;gBACD,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;YACH,CAAC;YACD,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;YACxD,OAAO,kBAAkB,CAAA;QAC3B,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,mBAAmB,EACjC,2BAA2B,CAC5B,CAAA;QACH,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,qBAAqB,CACtB,CAAA;QACH,CAAC;QAED,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,mBAAmB,EACjC,wBAAwB,CACzB,CAAA;IACH,CAAC,EACD,IAAI,EACJ,CAAC,EACD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACX,OAAO,CAAC,CAAC,KAAK,YAAY,4BAAgB,CAAC,CAAA;IAC7C,CAAC,CACF,CAAA;AACH,CAAC,CAAA;AA9DY,QAAA,8BAA8B,kCA8D1C"}
|
|
@@ -5,7 +5,6 @@ const actions_1 = require("viem/actions");
|
|
|
5
5
|
const constants_js_1 = require("../../errors/constants.js");
|
|
6
6
|
const errors_js_1 = require("../../errors/errors.js");
|
|
7
7
|
const publicClient_js_1 = require("./publicClient.js");
|
|
8
|
-
const utils_js_1 = require("./utils.js");
|
|
9
8
|
async function waitForTransactionReceipt({ client, chainId, txHash, onReplaced, }) {
|
|
10
9
|
let { transactionReceipt, replacementReason } = await waitForReceipt(client, txHash, onReplaced);
|
|
11
10
|
if (!transactionReceipt?.status) {
|
|
@@ -17,8 +16,8 @@ async function waitForTransactionReceipt({ client, chainId, txHash, onReplaced,
|
|
|
17
16
|
if (transactionReceipt?.status === 'reverted') {
|
|
18
17
|
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
19
18
|
}
|
|
20
|
-
if (replacementReason === 'cancelled') {
|
|
21
|
-
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionCanceled, '
|
|
19
|
+
if (replacementReason === 'cancelled' || replacementReason === 'replaced') {
|
|
20
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionCanceled, 'Transaction was canceled or replaced.');
|
|
22
21
|
}
|
|
23
22
|
return transactionReceipt;
|
|
24
23
|
}
|
|
@@ -32,8 +31,6 @@ async function waitForReceipt(client, txHash, onReplaced) {
|
|
|
32
31
|
replacementReason = response.reason;
|
|
33
32
|
onReplaced?.(response);
|
|
34
33
|
},
|
|
35
|
-
retryCount: utils_js_1.retryCount,
|
|
36
|
-
retryDelay: utils_js_1.retryDelay,
|
|
37
34
|
});
|
|
38
35
|
}
|
|
39
36
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":";;AAqBA,8DAmCC;AA/CD,0CAA6F;AAC7F,4DAAyD;AACzD,sDAAyD;AACzD,uDAAmD;AAS5C,KAAK,UAAU,yBAAyB,CAAC,EAC9C,MAAM,EACN,OAAO,EACP,MAAM,EACN,UAAU,GACqB;IAC/B,IAAI,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,MAAM,cAAc,CAClE,MAAM,EACN,MAAM,EACN,UAAU,CACX,CAAA;IAED,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;QACrE,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAA;QAC9C,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;IAC9C,CAAC;IAED,IAAI,kBAAkB,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;IACH,CAAC;IAGD,IAAI,iBAAiB,KAAK,WAAW,IAAI,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC1E,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,mBAAmB,EACjC,uCAAuC,CACxC,CAAA;IACH,CAAC;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAc,EACd,MAAY,EACZ,UAAyE;IAKzE,IAAI,iBAAgD,CAAA;IACpD,IAAI,kBAAkD,CAAA;IAEtD,IAAI,CAAC;QACH,kBAAkB,GAAG,MAAM,IAAA,mCAAiC,EAAC,MAAM,EAAE;YACnE,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvB,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAA;gBACnC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAA;YACxB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;IAET,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC"}
|
package/src/_cjs/typeguards.js
CHANGED
|
@@ -25,14 +25,13 @@ const isStep = (step) => {
|
|
|
25
25
|
};
|
|
26
26
|
exports.isStep = isStep;
|
|
27
27
|
const isAction = (action) => {
|
|
28
|
-
const { fromChainId, fromAmount, fromToken, toChainId, toToken
|
|
28
|
+
const { fromChainId, fromAmount, fromToken, toChainId, toToken } = action;
|
|
29
29
|
return (typeof fromChainId === 'number' &&
|
|
30
30
|
typeof fromAmount === 'string' &&
|
|
31
31
|
fromAmount !== '' &&
|
|
32
32
|
(0, exports.isToken)(fromToken) &&
|
|
33
33
|
typeof toChainId === 'number' &&
|
|
34
|
-
(0, exports.isToken)(toToken)
|
|
35
|
-
typeof slippage === 'number');
|
|
34
|
+
(0, exports.isToken)(toToken));
|
|
36
35
|
};
|
|
37
36
|
const isEstimate = (estimate) => {
|
|
38
37
|
const { fromAmount, toAmount, toAmountMin, approvalAddress } = estimate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":";;;AASO,MAAM,eAAe,GAAG,CAC7B,aAA4B,EACI,EAAE;IAClC,MAAM,EACJ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,OAAO,GACR,GAAG,aAAa,CAAA;IAEjB,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,gBAAgB,KAAK,QAAQ;QACpC,gBAAgB,KAAK,EAAE;QACvB,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,cAAc,KAAK,QAAQ;QAClC,cAAc,KAAK,EAAE;QACrB,CAAC,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CACvC,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B;AAED,MAAM,eAAe,GAAG,CACtB,YAA0B,EACI,EAAE,CAChC,CAAC,YAAY,EAAE,QAAQ,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAA;AAE/D,MAAM,MAAM,GAAG,CAAC,IAAc,EAAoB,EAAE;IACzD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEjD,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QACxC,OAAO,IAAI,KAAK,QAAQ;QACxB,QAAQ,CAAC,MAAM,CAAC;QAChB,UAAU,CAAC,QAAQ,CAAC,CACrB,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,MAAM,UAUlB;AAED,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAoB,EAAE;IACpD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":";;;AASO,MAAM,eAAe,GAAG,CAC7B,aAA4B,EACI,EAAE;IAClC,MAAM,EACJ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,OAAO,GACR,GAAG,aAAa,CAAA;IAEjB,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,gBAAgB,KAAK,QAAQ;QACpC,gBAAgB,KAAK,EAAE;QACvB,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,cAAc,KAAK,QAAQ;QAClC,cAAc,KAAK,EAAE;QACrB,CAAC,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CACvC,CAAA;AACH,CAAC,CAAA;AAvBY,QAAA,eAAe,mBAuB3B;AAED,MAAM,eAAe,GAAG,CACtB,YAA0B,EACI,EAAE,CAChC,CAAC,YAAY,EAAE,QAAQ,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAA;AAE/D,MAAM,MAAM,GAAG,CAAC,IAAc,EAAoB,EAAE;IACzD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEjD,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QACxC,OAAO,IAAI,KAAK,QAAQ;QACxB,QAAQ,CAAC,MAAM,CAAC;QAChB,UAAU,CAAC,QAAQ,CAAC,CACrB,CAAA;AACH,CAAC,CAAA;AAVY,QAAA,MAAM,UAUlB;AAED,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAoB,EAAE;IACpD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAEzE,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,IAAA,eAAO,EAAC,SAAS,CAAC;QAClB,OAAO,SAAS,KAAK,QAAQ;QAC7B,IAAA,eAAO,EAAC,OAAO,CAAC,CACjB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAwB,EAAE;IAC9D,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAA;IAEvE,OAAO,CACL,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,EAAE;QACf,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,KAAK,EAAE;QAClB,OAAO,eAAe,KAAK,QAAQ,CACpC,CAAA;AACH,CAAC,CAAA;AAEM,MAAM,OAAO,GAAG,CAAC,KAAkB,EAAwB,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAE5C,OAAO,CACL,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,QAAQ,KAAK,QAAQ;QAC5B,OAAO,OAAO,KAAK,QAAQ,CAC5B,CAAA;AACH,CAAC,CAAA;AARY,QAAA,OAAO,WAQnB"}
|
package/src/_cjs/version.js
CHANGED
|
@@ -23,6 +23,12 @@ export const waitForBatchTransactionReceipt = async (client, batchHash) => {
|
|
|
23
23
|
const transactionReceipt = callsDetails.receipts.at(-1);
|
|
24
24
|
return transactionReceipt;
|
|
25
25
|
}
|
|
26
|
+
if (callsDetails.status === 400) {
|
|
27
|
+
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'Transaction was canceled.');
|
|
28
|
+
}
|
|
29
|
+
if (callsDetails.status === 500) {
|
|
30
|
+
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction failed.');
|
|
31
|
+
}
|
|
26
32
|
throw new TransactionError(LiFiErrorCode.TransactionNotFound, 'Transaction not found.');
|
|
27
33
|
}, 5000, 3, (_, error) => {
|
|
28
34
|
return !(error instanceof TransactionError);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAO5D,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,OAAO,aAAa,CAClB,KAAK,IAAI,EAAE;QACT,MAAM,YAAY,GAAG,MAAM,SAAS,CAClC,MAAM,EACN,cAAc,EACd,gBAAgB,CACjB,CAAC;YACA,EAAE,EAAE,SAAS;SACd,CAAC,CAAA;QAEF,4GAA4G;QAC5G,IACE,YAAY,CAAC,MAAM,KAAK,SAAS;YACjC,YAAY,CAAC,MAAM,KAAM,GAAW,EACpC,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,8GAA8G;QAC9G,IAAI,YAAY,CAAC,MAAM,KAAK,WAAW,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvE,IACE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;gBAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;gBAClE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACtE,CAAC;gBACD,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;YACH,CAAC;YACD,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;YACxD,OAAO,kBAAkB,CAAA;QAC3B,CAAC;QAED,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,wBAAwB,CACzB,CAAA;IACH,CAAC,EACD,IAAI,EACJ,CAAC,EACD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACX,OAAO,CAAC,CAAC,KAAK,YAAY,gBAAgB,CAAC,CAAA;IAC7C,CAAC,CACF,CAAA;AACH,CAAC,CAAA"}
|
|
1
|
+
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAA;AAClD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAA;AAO5D,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,OAAO,aAAa,CAClB,KAAK,IAAI,EAAE;QACT,MAAM,YAAY,GAAG,MAAM,SAAS,CAClC,MAAM,EACN,cAAc,EACd,gBAAgB,CACjB,CAAC;YACA,EAAE,EAAE,SAAS;SACd,CAAC,CAAA;QAEF,4GAA4G;QAC5G,IACE,YAAY,CAAC,MAAM,KAAK,SAAS;YACjC,YAAY,CAAC,MAAM,KAAM,GAAW,EACpC,CAAC;YACD,OAAO,SAAS,CAAA;QAClB,CAAC;QAED,8GAA8G;QAC9G,IAAI,YAAY,CAAC,MAAM,KAAK,WAAW,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YACvE,IACE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM;gBAC9B,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;gBAClE,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACtE,CAAC;gBACD,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;YACH,CAAC;YACD,MAAM,kBAAkB,GAAG,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;YACxD,OAAO,kBAAkB,CAAA;QAC3B,CAAC;QAED,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,2BAA2B,CAC5B,CAAA;QACH,CAAC;QACD,IAAI,YAAY,CAAC,MAAM,KAAK,GAAG,EAAE,CAAC;YAChC,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,qBAAqB,CACtB,CAAA;QACH,CAAC;QAED,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,wBAAwB,CACzB,CAAA;IACH,CAAC,EACD,IAAI,EACJ,CAAC,EACD,CAAC,CAAC,EAAE,KAAK,EAAE,EAAE;QACX,OAAO,CAAC,CAAC,KAAK,YAAY,gBAAgB,CAAC,CAAA;IAC7C,CAAC,CACF,CAAA;AACH,CAAC,CAAA"}
|
|
@@ -2,7 +2,6 @@ import { waitForTransactionReceipt as waitForTransactionReceiptInternal } from '
|
|
|
2
2
|
import { LiFiErrorCode } from '../../errors/constants.js';
|
|
3
3
|
import { TransactionError } from '../../errors/errors.js';
|
|
4
4
|
import { getPublicClient } from './publicClient.js';
|
|
5
|
-
import { retryCount, retryDelay } from './utils.js';
|
|
6
5
|
export async function waitForTransactionReceipt({ client, chainId, txHash, onReplaced, }) {
|
|
7
6
|
let { transactionReceipt, replacementReason } = await waitForReceipt(client, txHash, onReplaced);
|
|
8
7
|
if (!transactionReceipt?.status) {
|
|
@@ -14,8 +13,10 @@ export async function waitForTransactionReceipt({ client, chainId, txHash, onRep
|
|
|
14
13
|
if (transactionReceipt?.status === 'reverted') {
|
|
15
14
|
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
16
15
|
}
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
// We should only allow repriced transaction to continue the execution.
|
|
17
|
+
// Cancelled and replaced transactions should be treated as failed.
|
|
18
|
+
if (replacementReason === 'cancelled' || replacementReason === 'replaced') {
|
|
19
|
+
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'Transaction was canceled or replaced.');
|
|
19
20
|
}
|
|
20
21
|
return transactionReceipt;
|
|
21
22
|
}
|
|
@@ -29,8 +30,6 @@ async function waitForReceipt(client, txHash, onReplaced) {
|
|
|
29
30
|
replacementReason = response.reason;
|
|
30
31
|
onReplaced?.(response);
|
|
31
32
|
},
|
|
32
|
-
retryCount,
|
|
33
|
-
retryDelay,
|
|
34
33
|
});
|
|
35
34
|
}
|
|
36
35
|
catch {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,IAAI,iCAAiC,EAAE,MAAM,cAAc,CAAA;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AASA,OAAO,EAAE,yBAAyB,IAAI,iCAAiC,EAAE,MAAM,cAAc,CAAA;AAC7F,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AACzD,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AASnD,MAAM,CAAC,KAAK,UAAU,yBAAyB,CAAC,EAC9C,MAAM,EACN,OAAO,EACP,MAAM,EACN,UAAU,GACqB;IAC/B,IAAI,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,GAAG,MAAM,cAAc,CAClE,MAAM,EACN,MAAM,EACN,UAAU,CACX,CAAA;IAED,IAAI,CAAC,kBAAkB,EAAE,MAAM,EAAE,CAAC;QAChC,MAAM,YAAY,GAAG,MAAM,eAAe,CAAC,OAAO,CAAC,CAAA;QACnD,MAAM,MAAM,GAAG,MAAM,cAAc,CAAC,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;QACrE,kBAAkB,GAAG,MAAM,CAAC,kBAAkB,CAAA;QAC9C,iBAAiB,GAAG,MAAM,CAAC,iBAAiB,CAAA;IAC9C,CAAC;IAED,IAAI,kBAAkB,EAAE,MAAM,KAAK,UAAU,EAAE,CAAC;QAC9C,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;IACH,CAAC;IACD,uEAAuE;IACvE,mEAAmE;IACnE,IAAI,iBAAiB,KAAK,WAAW,IAAI,iBAAiB,KAAK,UAAU,EAAE,CAAC;QAC1E,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,uCAAuC,CACxC,CAAA;IACH,CAAC;IAED,OAAO,kBAAkB,CAAA;AAC3B,CAAC;AAED,KAAK,UAAU,cAAc,CAC3B,MAAc,EACd,MAAY,EACZ,UAAyE;IAKzE,IAAI,iBAAgD,CAAA;IACpD,IAAI,kBAAkD,CAAA;IAEtD,IAAI,CAAC;QACH,kBAAkB,GAAG,MAAM,iCAAiC,CAAC,MAAM,EAAE;YACnE,IAAI,EAAE,MAAM;YACZ,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gBACvB,iBAAiB,GAAG,QAAQ,CAAC,MAAM,CAAA;gBACnC,UAAU,EAAE,CAAC,QAAQ,CAAC,CAAA;YACxB,CAAC;SACF,CAAC,CAAA;IACJ,CAAC;IAAC,MAAM,CAAC;QACP,yFAAyF;IAC3F,CAAC;IAED,OAAO,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,CAAA;AAClD,CAAC"}
|
package/src/_esm/typeguards.js
CHANGED
|
@@ -20,14 +20,13 @@ export const isStep = (step) => {
|
|
|
20
20
|
isEstimate(estimate));
|
|
21
21
|
};
|
|
22
22
|
const isAction = (action) => {
|
|
23
|
-
const { fromChainId, fromAmount, fromToken, toChainId, toToken
|
|
23
|
+
const { fromChainId, fromAmount, fromToken, toChainId, toToken } = action;
|
|
24
24
|
return (typeof fromChainId === 'number' &&
|
|
25
25
|
typeof fromAmount === 'string' &&
|
|
26
26
|
fromAmount !== '' &&
|
|
27
27
|
isToken(fromToken) &&
|
|
28
28
|
typeof toChainId === 'number' &&
|
|
29
|
-
isToken(toToken)
|
|
30
|
-
typeof slippage === 'number');
|
|
29
|
+
isToken(toToken));
|
|
31
30
|
};
|
|
32
31
|
const isEstimate = (estimate) => {
|
|
33
32
|
const { fromAmount, toAmount, toAmountMin, approvalAddress } = estimate;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,aAA4B,EACI,EAAE;IAClC,MAAM,EACJ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,OAAO,GACR,GAAG,aAAa,CAAA;IAEjB,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,gBAAgB,KAAK,QAAQ;QACpC,gBAAgB,KAAK,EAAE;QACvB,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,cAAc,KAAK,QAAQ;QAClC,cAAc,KAAK,EAAE;QACrB,CAAC,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CACvC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,YAA0B,EACI,EAAE,CAChC,CAAC,YAAY,EAAE,QAAQ,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAA;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAc,EAAoB,EAAE;IACzD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEjD,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QACxC,OAAO,IAAI,KAAK,QAAQ;QACxB,QAAQ,CAAC,MAAM,CAAC;QAChB,UAAU,CAAC,QAAQ,CAAC,CACrB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAoB,EAAE;IACpD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":"AASA,MAAM,CAAC,MAAM,eAAe,GAAG,CAC7B,aAA4B,EACI,EAAE;IAClC,MAAM,EACJ,WAAW,EACX,UAAU,EACV,gBAAgB,EAChB,SAAS,EACT,cAAc,EACd,OAAO,GACR,GAAG,aAAa,CAAA;IAEjB,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,gBAAgB,KAAK,QAAQ;QACpC,gBAAgB,KAAK,EAAE;QACvB,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,cAAc,KAAK,QAAQ;QAClC,cAAc,KAAK,EAAE;QACrB,CAAC,CAAC,OAAO,IAAI,eAAe,CAAC,OAAO,CAAC,CAAC,CACvC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,eAAe,GAAG,CACtB,YAA0B,EACI,EAAE,CAChC,CAAC,YAAY,EAAE,QAAQ,IAAI,OAAO,YAAY,CAAC,QAAQ,KAAK,QAAQ,CAAA;AAEtE,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAc,EAAoB,EAAE;IACzD,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAA;IAEjD,OAAO,CACL,OAAO,EAAE,KAAK,QAAQ;QACtB,CAAC,MAAM,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;QACxC,OAAO,IAAI,KAAK,QAAQ;QACxB,QAAQ,CAAC,MAAM,CAAC;QAChB,UAAU,CAAC,QAAQ,CAAC,CACrB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,QAAQ,GAAG,CAAC,MAAc,EAAoB,EAAE;IACpD,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,CAAA;IAEzE,OAAO,CACL,OAAO,WAAW,KAAK,QAAQ;QAC/B,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,CAAC,SAAS,CAAC;QAClB,OAAO,SAAS,KAAK,QAAQ;QAC7B,OAAO,CAAC,OAAO,CAAC,CACjB,CAAA;AACH,CAAC,CAAA;AAED,MAAM,UAAU,GAAG,CAAC,QAAkB,EAAwB,EAAE;IAC9D,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,GAAG,QAAQ,CAAA;IAEvE,OAAO,CACL,OAAO,UAAU,KAAK,QAAQ;QAC9B,UAAU,KAAK,EAAE;QACjB,OAAO,QAAQ,KAAK,QAAQ;QAC5B,QAAQ,KAAK,EAAE;QACf,OAAO,WAAW,KAAK,QAAQ;QAC/B,WAAW,KAAK,EAAE;QAClB,OAAO,eAAe,KAAK,QAAQ,CACpC,CAAA;AACH,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,OAAO,GAAG,CAAC,KAAkB,EAAwB,EAAE;IAClE,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,KAAK,CAAA;IAE5C,OAAO,CACL,OAAO,OAAO,KAAK,QAAQ;QAC3B,OAAO,QAAQ,KAAK,QAAQ;QAC5B,OAAO,OAAO,KAAK,QAAQ,CAC5B,CAAA;AACH,CAAC,CAAA"}
|
package/src/_esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForBatchTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,IAAI,EACJ,iBAAiB,IAAI,kBAAkB,EACxC,MAAM,MAAM,CAAA;AAOb,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,CAChD,MAAM,EACN,SAAS,GAAG,UAAU,CACvB,CAAA;AAED,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,WAAW,IAAI,KACd,OAAO,CAAC,iBAAiB,
|
|
1
|
+
{"version":3,"file":"waitForBatchTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,MAAM,EACN,IAAI,EACJ,iBAAiB,IAAI,kBAAkB,EACxC,MAAM,MAAM,CAAA;AAOb,MAAM,MAAM,iBAAiB,GAAG,kBAAkB,CAChD,MAAM,EACN,SAAS,GAAG,UAAU,CACvB,CAAA;AAED,eAAO,MAAM,8BAA8B,GACzC,QAAQ,MAAM,EACd,WAAW,IAAI,KACd,OAAO,CAAC,iBAAiB,CA2D3B,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,IAAI,EAEJ,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,MAAM,CAAA;
|
|
1
|
+
{"version":3,"file":"waitForTransactionReceipt.d.ts","sourceRoot":"","sources":["../../../core/EVM/waitForTransactionReceipt.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAA;AAC1C,OAAO,KAAK,EACV,KAAK,EACL,MAAM,EACN,IAAI,EAEJ,qBAAqB,EACrB,kBAAkB,EACnB,MAAM,MAAM,CAAA;AAMb,UAAU,8BAA8B;IACtC,MAAM,EAAE,MAAM,CAAA;IACd,OAAO,EAAE,OAAO,CAAA;IAChB,MAAM,EAAE,IAAI,CAAA;IACZ,UAAU,CAAC,EAAE,CAAC,QAAQ,EAAE,qBAAqB,CAAC,KAAK,GAAG,SAAS,CAAC,KAAK,IAAI,CAAA;CAC1E;AAED,wBAAsB,yBAAyB,CAAC,EAC9C,MAAM,EACN,OAAO,EACP,MAAM,EACN,UAAU,GACX,EAAE,8BAA8B,GAAG,OAAO,CAAC,kBAAkB,GAAG,SAAS,CAAC,CA8B1E"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.d.ts","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,QAAQ,EAER,aAAa,EACb,WAAW,EACZ,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,eAAe,GAC1B,eAAe,aAAa,KAC3B,aAAa,IAAI,aAqBnB,CAAA;AAOD,eAAO,MAAM,MAAM,GAAI,MAAM,QAAQ,KAAG,IAAI,IAAI,QAU/C,CAAA;
|
|
1
|
+
{"version":3,"file":"typeguards.d.ts","sourceRoot":"","sources":["../typeguards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAGV,QAAQ,EAER,aAAa,EACb,WAAW,EACZ,MAAM,aAAa,CAAA;AAEpB,eAAO,MAAM,eAAe,GAC1B,eAAe,aAAa,KAC3B,aAAa,IAAI,aAqBnB,CAAA;AAOD,eAAO,MAAM,MAAM,GAAI,MAAM,QAAQ,KAAG,IAAI,IAAI,QAU/C,CAAA;AA6BD,eAAO,MAAM,OAAO,GAAI,OAAO,WAAW,KAAG,KAAK,IAAI,WAQrD,CAAA"}
|
package/src/_types/version.d.ts
CHANGED
|
@@ -52,6 +52,19 @@ export const waitForBatchTransactionReceipt = async (
|
|
|
52
52
|
return transactionReceipt
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
+
if (callsDetails.status === 400) {
|
|
56
|
+
throw new TransactionError(
|
|
57
|
+
LiFiErrorCode.TransactionCanceled,
|
|
58
|
+
'Transaction was canceled.'
|
|
59
|
+
)
|
|
60
|
+
}
|
|
61
|
+
if (callsDetails.status === 500) {
|
|
62
|
+
throw new TransactionError(
|
|
63
|
+
LiFiErrorCode.TransactionFailed,
|
|
64
|
+
'Transaction failed.'
|
|
65
|
+
)
|
|
66
|
+
}
|
|
67
|
+
|
|
55
68
|
throw new TransactionError(
|
|
56
69
|
LiFiErrorCode.TransactionNotFound,
|
|
57
70
|
'Transaction not found.'
|
|
@@ -11,7 +11,6 @@ import { waitForTransactionReceipt as waitForTransactionReceiptInternal } from '
|
|
|
11
11
|
import { LiFiErrorCode } from '../../errors/constants.js'
|
|
12
12
|
import { TransactionError } from '../../errors/errors.js'
|
|
13
13
|
import { getPublicClient } from './publicClient.js'
|
|
14
|
-
import { retryCount, retryDelay } from './utils.js'
|
|
15
14
|
|
|
16
15
|
interface WaitForTransactionReceiptProps {
|
|
17
16
|
client: Client
|
|
@@ -45,10 +44,12 @@ export async function waitForTransactionReceipt({
|
|
|
45
44
|
'Transaction was reverted.'
|
|
46
45
|
)
|
|
47
46
|
}
|
|
48
|
-
|
|
47
|
+
// We should only allow repriced transaction to continue the execution.
|
|
48
|
+
// Cancelled and replaced transactions should be treated as failed.
|
|
49
|
+
if (replacementReason === 'cancelled' || replacementReason === 'replaced') {
|
|
49
50
|
throw new TransactionError(
|
|
50
51
|
LiFiErrorCode.TransactionCanceled,
|
|
51
|
-
'
|
|
52
|
+
'Transaction was canceled or replaced.'
|
|
52
53
|
)
|
|
53
54
|
}
|
|
54
55
|
|
|
@@ -73,8 +74,6 @@ async function waitForReceipt(
|
|
|
73
74
|
replacementReason = response.reason
|
|
74
75
|
onReplaced?.(response)
|
|
75
76
|
},
|
|
76
|
-
retryCount,
|
|
77
|
-
retryDelay,
|
|
78
77
|
})
|
|
79
78
|
} catch {
|
|
80
79
|
// We can ignore errors from waitForTransactionReceipt as we have a status check fallback
|
package/src/typeguards.ts
CHANGED
|
@@ -50,8 +50,7 @@ export const isStep = (step: LiFiStep): step is LiFiStep => {
|
|
|
50
50
|
}
|
|
51
51
|
|
|
52
52
|
const isAction = (action: Action): action is Action => {
|
|
53
|
-
const { fromChainId, fromAmount, fromToken, toChainId, toToken
|
|
54
|
-
action
|
|
53
|
+
const { fromChainId, fromAmount, fromToken, toChainId, toToken } = action
|
|
55
54
|
|
|
56
55
|
return (
|
|
57
56
|
typeof fromChainId === 'number' &&
|
|
@@ -59,8 +58,7 @@ const isAction = (action: Action): action is Action => {
|
|
|
59
58
|
fromAmount !== '' &&
|
|
60
59
|
isToken(fromToken) &&
|
|
61
60
|
typeof toChainId === 'number' &&
|
|
62
|
-
isToken(toToken)
|
|
63
|
-
typeof slippage === 'number'
|
|
61
|
+
isToken(toToken)
|
|
64
62
|
)
|
|
65
63
|
}
|
|
66
64
|
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/sdk'
|
|
2
|
-
export const version = '3.6.
|
|
2
|
+
export const version = '3.6.5'
|