@lifi/sdk 3.6.6 → 3.6.7
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 +2 -2
- package/src/_cjs/core/EVM/EVMStepExecutor.js +3 -6
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/parseEVMErrors.js +3 -1
- package/src/_cjs/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js +17 -27
- package/src/_cjs/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +3 -8
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/parseEVMErrors.js +4 -1
- package/src/_esm/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js +19 -30
- package/src/_esm/core/EVM/waitForBatchTransactionReceipt.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/waitForBatchTransactionReceipt.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +3 -8
- package/src/core/EVM/parseEVMErrors.ts +6 -1
- package/src/core/EVM/waitForBatchTransactionReceipt.ts +33 -55
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"bech32": "^2.0.0",
|
|
12
12
|
"bitcoinjs-lib": "^7.0.0-rc.0",
|
|
13
13
|
"bs58": "^6.0.0",
|
|
14
|
-
"viem": "^2.
|
|
14
|
+
"viem": "^2.26.0"
|
|
15
15
|
},
|
|
16
16
|
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
17
17
|
"exports": {
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"sideEffects": false,
|
|
68
68
|
"types": "./src/_types/index.d.ts",
|
|
69
69
|
"typings": "./src/_types/index.d.ts",
|
|
70
|
-
"version": "3.6.
|
|
70
|
+
"version": "3.6.7"
|
|
71
71
|
}
|
|
@@ -257,14 +257,11 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
257
257
|
value: transactionRequest.value,
|
|
258
258
|
};
|
|
259
259
|
calls.push(transferCall);
|
|
260
|
-
const
|
|
260
|
+
const { id } = await (0, utils_1.getAction)(this.client, experimental_1.sendCalls, 'sendCalls')({
|
|
261
261
|
account: this.client.account,
|
|
262
262
|
calls,
|
|
263
|
-
})
|
|
264
|
-
txHash =
|
|
265
|
-
typeof sendCallsResult === 'object'
|
|
266
|
-
? sendCallsResult?.id
|
|
267
|
-
: sendCallsResult;
|
|
263
|
+
});
|
|
264
|
+
txHash = id;
|
|
268
265
|
txType = 'batched';
|
|
269
266
|
}
|
|
270
267
|
else if (isRelayerTransaction) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":";;;AAUA,0CAKqB;AACrB,oDAA6C;AAC7C,sCAAsC;AACtC,+CAAwC;AACxC,4DAAyD;AACzD,sDAAyD;AACzD,kDAI8B;AAC9B,gEAAyD;AACzD,wDAAiD;AACjD,4DAAqD;AAOrD,oGAA6F;AAC7F,2DAAoD;AACpD,qEAA8D;AAC9D,2DAAoD;AACpD,mFAA4E;AAC5E,yEAAkE;AAClE,2EAAoE;AACpE,qDAA8C;AAC9C,mDAA+C;AAE/C,yCAA0E;AAC1E,2FAG4C;AAC5C,+FAAwF;AACxF,iFAA0E;AAM1E,MAAa,eAAgB,SAAQ,sCAAgB;IAC3C,MAAM,CAAQ;IAEtB,YAAY,OAA+B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;QACd,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC9B,CAAC;IAGD,WAAW,GAAG,KAAK,EAAE,IAAsB,EAAE,OAAiB,EAAE,EAAE;QAChE,MAAM,aAAa,GAAG,MAAM,IAAA,4BAAW,EACrC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,gBAAgB,EAAE,eAAe,CACvC,CAAA;QACD,IAAI,aAAa,EAAE,CAAC;YAClB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAA;QAC7B,CAAC;QAGD,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAA;QACjD,IAAI,CAAC,cAAc,EAAE,CAAC;YACpB,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,iBAAS,EACvC,IAAI,CAAC,MAAM,EACX,sBAAY,EACZ,cAAc,CACf,CAAC,SAAS,CAAC,CAA2B,CAAA;YACvC,cAAc,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAA;QACxC,CAAC;QACD,IACE,cAAc,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,EAAE,EACxE,CAAC;YACD,IAAI,eAAe,GAAG,OAAO,CAAA;YAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;gBAErB,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;oBACvD,IAAI;oBACJ,IAAI,EAAE,aAAa;iBACpB,CAAC,CAAA;YACJ,CAAC;YACD,MAAM,YAAY,GAChB,mHAAmH,CAAA;YACrH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE;gBACrE,KAAK,EAAE;oBACL,IAAI,EAAE,4BAAa,CAAC,4BAA4B;oBAChD,OAAO,EAAE,YAAY;iBACtB;aACF,CAAC,CAAA;YACF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YAClD,MAAM,MAAM,IAAA,kCAAc,EACxB,IAAI,4BAAgB,CAClB,4BAAa,CAAC,4BAA4B,EAC1C,YAAY,CACb,EACD,IAAI,EACJ,OAAO,CACR,CAAA;QACH,CAAC;QACD,OAAO,aAAa,CAAA;IACtB,CAAC,CAAA;IAED,kBAAkB,GAAG,KAAK,EAAE,EAC1B,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,MAAM,EACN,MAAM,EACN,iBAAiB,GASlB,EAAE,EAAE;QACH,IAAI,kBAAsE,CAAA;QAE1E,QAAQ,MAAM,EAAE,CAAC;YACf,KAAK,SAAS;gBACZ,kBAAkB,GAAG,MAAM,IAAA,kEAA8B,EACvD,IAAI,CAAC,MAAM,EACX,MAAM,CACP,CAAA;gBACD,MAAK;YACP,KAAK,SAAS;gBACZ,kBAAkB,GAAG,MAAM,IAAA,sEAAgC,EACzD,MAAM,EACN,IAAI,CACL,CAAA;gBACD,MAAK;YACP;gBACE,kBAAkB,GAAG,MAAM,IAAA,wDAAyB,EAAC;oBACnD,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,OAAO,EAAE,SAAS,CAAC,EAAE;oBACrB,MAAM;oBACN,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;wBACvB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE;4BAC9D,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI;4BACjC,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;yBACpF,CAAC,CAAA;oBACJ,CAAC;iBACF,CAAC,CAAA;QACN,CAAC;QAID,IACE,kBAAkB,EAAE,eAAe;YACnC,kBAAkB,CAAC,eAAe,KAAK,MAAM,EAC7C,CAAC;YACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT;gBACE,MAAM,EAAE,kBAAkB,CAAC,eAAe;gBAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,eAAe,EAAE;aAC7F,CACF,CAAA;QACH,CAAC;QAED,IAAI,iBAAiB,EAAE,CAAC;YACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;QACxE,CAAC;QAED,MAAM,IAAA,0EAAkC,EACtC,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,IAAI,CAAC,aAAa,CACnB,CAAA;IACH,CAAC,CAAA;IAED,WAAW,GAAG,KAAK,EAAE,IAAsB,EAA6B,EAAE;QACxE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;QAG7D,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAChD,CAAA;QAMD,IAAI,uBAAuB,EAAE,SAAS,KAAK,8BAA8B,EAAE,CAAC;YAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;YAClD,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,MAAM,SAAS,GAAG,MAAM,kBAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QACpE,MAAM,OAAO,GAAG,MAAM,kBAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;QAGhE,MAAM,KAAK,GAAW,EAAE,CAAA;QACxB,MAAM,iBAAiB,GAAG,MAAM,IAAA,4CAAmB,EAAC;YAClD,MAAM,EAAE,IAAI,CAAC,MAAM;YACnB,OAAO,EAAE,SAAS,CAAC,EAAE;SACtB,CAAC,CAAA;QAEF,MAAM,iBAAiB,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAA;QACrD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAA;QAGrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CACrC,CAAA;QAED,MAAM,iBAAiB,GACrB,SAAS,CAAC,WAAW,CAAC,OAAO,KAAK,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAA;QAGjE,MAAM,oBAAoB,GAAG,IAAA,6BAAa,EAAC,IAAI,CAAC,CAAA;QAGhD,MAAM,qBAAqB,GAAG,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,CAAA;QAG1E,MAAM,gBAAgB,GACpB,CAAC,CAAC,SAAS,CAAC,OAAO;YACnB,CAAC,CAAC,SAAS,CAAC,YAAY;YACxB,CAAC,iBAAiB;YAClB,CAAC,iBAAiB;YAClB,CAAC,qBAAqB,CAAA;QAExB,MAAM,iBAAiB,GAErB,CAAC,eAAe,EAAE,MAAM;YAExB,CAAC,iBAAiB,CAAA;QAEpB,IAAI,2BAAwD,CAAA;QAC5D,IAAI,iBAAiB,EAAE,CAAC;YAEtB,MAAM,eAAe,GAAG,MAAM,IAAA,kCAAc,EAAC;gBAC3C,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,KAAK,EAAE,SAAS;gBAChB,IAAI;gBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;gBACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;gBAC/C,iBAAiB;gBACjB,gBAAgB;gBAChB,qBAAqB;aACtB,CAAC,CAAA;YAEF,IAAI,eAAe,CAAC,MAAM,KAAK,gBAAgB,EAAE,CAAC;gBAGhD,IAAI,iBAAiB,EAAE,CAAC;oBACtB,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,CAAA;gBAClC,CAAC;YACH,CAAC;YACD,IAAI,eAAe,CAAC,MAAM,KAAK,eAAe,EAAE,CAAC;gBAC/C,2BAA2B,GAAG,eAAe,CAAC,IAAI,CAAA;YACpD,CAAC;YACD,IACE,eAAe,CAAC,MAAM,KAAK,iBAAiB;gBAC5C,CAAC,IAAI,CAAC,oBAAoB,EAC1B,CAAC;gBACD,OAAO,IAAI,CAAA;YACb,CAAC;QACH,CAAC;QAED,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,WAAW,CAAC,IAAI,EAAE,kBAAkB,CAAC,CAAA;QAEtE,IAAI,OAAO,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;YAC/B,MAAM,IAAA,0EAAkC,EACtC,IAAI,EACJ,OAAO,EACP,SAAS,EACT,OAAO,EACP,IAAI,CAAC,aAAa,CACnB,CAAA;YAED,OAAO,IAAI,CAAA;QACb,CAAC;QAED,IAAI,CAAC;YACH,IAAI,OAAO,EAAE,MAAM,EAAE,CAAC;gBAEpB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;gBAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;oBACnB,OAAO,IAAI,CAAA;gBACb,CAAC;gBAGD,MAAM,MAAM,GAAG,OAAO,CAAC,MAAc,CAAA;gBACrC,MAAM,MAAM,GAAG,OAAO,CAAC,MAA+B,CAAA;gBAEtD,MAAM,IAAI,CAAC,kBAAkB,CAAC;oBAC5B,IAAI;oBACJ,OAAO;oBACP,SAAS;oBACT,OAAO;oBACP,MAAM;oBACN,MAAM;oBACN,iBAAiB;iBAClB,CAAC,CAAA;gBAEF,OAAO,IAAI,CAAA;YACb,CAAC;YAED,MAAM,cAAc,GAClB,CAAC,iBAAiB,IAAI,CAAC,2BAA2B,IAAI,gBAAgB,CAAA;YACxE,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;gBAC/C,IAAI;gBACJ,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,kBAAkB;gBACpD,MAAM,EAAE,SAAS;gBACjB,OAAO,EAAE,SAAS,CAAC,EAAE;aACtB,CAAC,CAAA;YAGF,MAAM,IAAA,8BAAY,EAAC,IAAI,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;YAGtD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAA;gBACvC,IAAI,WAAqB,CAAA;gBACzB,IAAI,oBAAoB,EAAE,CAAC;oBACzB,MAAM,kBAAkB,GAAG,MAAM,IAAA,wBAAe,EAAC;wBAC/C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW;wBACtC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;wBAC5C,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAY;wBACzC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU;wBACtC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wBAClC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;wBACxC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;wBAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wBACpC,YAAY,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;qBAC9B,CAAC,CAAA;oBACF,WAAW,GAAG;wBACZ,GAAG,kBAAkB;wBACrB,EAAE,EAAE,QAAQ,CAAC,EAAE;qBAChB,CAAA;gBACH,CAAC;qBAAM,CAAC;oBACN,WAAW,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAAA;gBAClD,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,IAAA,kCAAc,EACvC,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,gBAAgB,CACtB,CAAA;gBACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;oBAClB,GAAG,YAAY;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS;iBAC1B,CAAC,CAAA;YACJ,CAAC;YAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gBAC7B,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,qBAAqB,EACnC,gCAAgC,CACjC,CAAA;YACH,CAAC;YAED,IAAI,kBAAkB,GAA0B;gBAC9C,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE;gBAC9B,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gBAClC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gBAClC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;oBAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;oBACvC,CAAC,CAAC,SAAS;gBACb,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ;oBACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oBAC1C,CAAC,CAAC,SAAS;gBAOb,oBAAoB,EAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,OAAO;oBACnC,CAAC,CAAC,MAAM,IAAA,kCAAuB,EAAC,IAAI,CAAC,MAAM,CAAC;oBAC5C,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB;wBAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;wBACtD,CAAC,CAAC,SAAS;aAClB,CAAA;YAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,4BAA4B,EAAE,CAAC;gBACxD,MAAM,4BAA4B,GAChC,MAAM,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CAAC;oBACvD,WAAW,EAAE,aAAa;oBAC1B,GAAG,kBAAkB;iBACtB,CAAC,CAAA;gBAEJ,kBAAkB,GAAG;oBACnB,GAAG,kBAAkB;oBACrB,GAAG,4BAA4B;iBAChC,CAAA;YACH,CAAC;YAGD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;YAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;gBACnB,OAAO,IAAI,CAAA;YACb,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAA;YAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gBAC/B,OAAO,IAAI,CAAA;YACb,CAAC;YAED,IAAI,MAAY,CAAA;YAChB,IAAI,MAAM,GAA0B,UAAU,CAAA;YAE9C,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,YAAY,GAAS;oBACzB,OAAO,EAAE,SAAS,CAAC,EAAE;oBACrB,IAAI,EAAE,kBAAkB,CAAC,IAAW;oBACpC,EAAE,EAAE,kBAAkB,CAAC,EAAa;oBACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;iBAChC,CAAA;gBAED,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAExB,MAAM,eAAe,GAAG,CAAC,MAAM,IAAA,iBAAS,EACtC,IAAI,CAAC,MAAM,EACX,wBAAS,EACT,WAAW,CACZ,CAAC;oBACA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oBAC7B,KAAK;iBACN,CAAC,CAAY,CAAA;gBAGd,MAAM;oBACJ,OAAO,eAAe,KAAK,QAAQ;wBACjC,CAAC,CAAE,eAAgC,EAAE,EAAE;wBACvC,CAAC,CAAC,eAAe,CAAA;gBACrB,MAAM,GAAG,SAAS,CAAA;YACpB,CAAC;iBAAM,IAAI,oBAAoB,EAAE,CAAC;gBAChC,MAAM,gBAAgB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAC1C,CAAC,CAAC,EAAE,EAAE,CACJ,CAAC,CAAC,WAAW,KAAK,2BAA2B;oBAC7C,CAAC,CAAC,WAAW,KAAK,OAAO,CAC5B,CAAA;gBAED,IAAI,CAAC,gBAAgB,EAAE,CAAC;oBACtB,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,qBAAqB,EACnC,sEAAsE,CACvE,CAAA;gBACH,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,IAAA,iBAAS,EAC/B,IAAI,CAAC,MAAM,EACX,uBAAa,EACb,eAAe,CAChB,CAAC;oBACA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oBAC7B,WAAW,EAAE,gBAAgB,CAAC,WAAW;oBACzC,MAAM,EAAE,gBAAgB,CAAC,MAAM;oBAC/B,KAAK,EAAE,gBAAgB,CAAC,KAAK;oBAC7B,OAAO,EAAE,gBAAgB,CAAC,OAAO;iBAClC,CAAC,CAAA;gBAEF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;gBAE5D,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;oBAC/C,IAAI;oBACJ,IAAI,EAAE,kBAAkB;oBACxB,MAAM,EAAE,SAAS;oBACjB,OAAO,EAAE,SAAS,CAAC,EAAE;iBACtB,CAAC,CAAA;gBAEF,MAAM,eAAe,GAAsB;oBACzC;wBACE,GAAG,gBAAgB;wBACnB,SAAS,EAAE,SAAS;qBACrB;iBACF,CAAA;gBAED,IAAI,2BAA2B,EAAE,CAAC;oBAChC,eAAe,CAAC,OAAO,CAAC,2BAA2B,CAAC,CAAA;gBACtD,CAAC;gBACD,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAA;gBACvC,MAAM,kBAAkB,GAAG,MAAM,IAAA,yBAAgB,EAAC;oBAChD,GAAG,QAAQ;oBACX,SAAS,EAAE,eAAe;iBAC3B,CAAC,CAAA;gBACF,MAAM,GAAG,kBAAkB,CAAC,MAAc,CAAA;gBAC1C,MAAM,GAAG,SAAS,CAAA;YACpB,CAAC;iBAAM,CAAC;gBACN,IAAI,2BAA2B,EAAE,CAAC;oBAChC,kBAAkB,CAAC,IAAI,GAAG,IAAA,kDAAsB,EAC9C,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,EACxC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAC9B,2BAA2B,CAAC,OAAO,CAAC,QAAQ,EAC5C,2BAA2B,CAAC,SAAS,EACrC,kBAAkB,CAAC,IAAW,CAC/B,CAAA;gBACH,CAAC;qBAAM,IAAI,gBAAgB,EAAE,CAAC;oBAC5B,MAAM,gBAAgB,GAAG,MAAM,IAAA,0CAAkB,EAAC;wBAChD,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,KAAK,EAAE,SAAS;wBAChB,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;wBACtD,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;wBACtC,IAAI,EAAE,kBAAkB,CAAC,IAAW;qBACrC,CAAC,CAAA;oBACF,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;oBAE5D,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;wBAC/C,IAAI;wBACJ,IAAI,EAAE,kBAAkB;wBACxB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,SAAS,CAAC,EAAE;qBACtB,CAAC,CAAA;oBACF,kBAAkB,CAAC,IAAI,GAAG,IAAA,wCAAiB,EACzC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,EACxC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,EAC9B,gBAAgB,CAAC,OAAO,CAAC,KAAK,EAC9B,gBAAgB,CAAC,OAAO,CAAC,QAAQ,EACjC,kBAAkB,CAAC,IAAW,EAC9B,gBAAgB,CAAC,SAAS,CAC3B,CAAA;gBACH,CAAC;gBAED,IAAI,2BAA2B,IAAI,gBAAgB,EAAE,CAAC;oBACpD,IAAI,CAAC;wBAEH,kBAAkB,CAAC,EAAE,GAAG,SAAS,CAAC,YAAY,CAAA;wBAE9C,MAAM,YAAY,GAAG,MAAM,IAAA,qBAAW,EAAC,IAAI,CAAC,MAAM,EAAE;4BAClD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;4BAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAa;4BACpC,IAAI,EAAE,kBAAkB,CAAC,IAAW;4BACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;yBAChC,CAAC,CAAA;wBACF,kBAAkB,CAAC,GAAG;4BACpB,kBAAkB,CAAC,GAAG,IAAI,kBAAkB,CAAC,GAAG,GAAG,YAAY;gCAC7D,CAAC,CAAC,kBAAkB,CAAC,GAAG;gCACxB,CAAC,CAAC,YAAY,CAAA;oBACpB,CAAC;oBAAC,MAAM,CAAC;wBAEP,kBAAkB,CAAC,GAAG,GAAG,SAAS,CAAA;oBACpC,CAAC;4BAAS,CAAC;wBACT,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;oBAC9D,CAAC;gBACH,CAAC;gBACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAA;gBACD,MAAM,GAAG,MAAM,IAAA,iBAAS,EACtB,IAAI,CAAC,MAAM,EACX,yBAAe,EACf,iBAAiB,CAClB,CAAC;oBACA,EAAE,EAAE,kBAAkB,CAAC,EAAa;oBACpC,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oBAC7B,IAAI,EAAE,kBAAkB,CAAC,IAAW;oBACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;oBAC/B,GAAG,EAAE,kBAAkB,CAAC,GAAG;oBAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;oBACrC,YAAY,EAAE,kBAAkB,CAAC,YAAY;oBAC7C,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;oBAC7D,KAAK,EAAE,IAAA,+BAAoB,EAAC,SAAS,CAAC;iBACV,CAAC,CAAA;YACjC,CAAC;YAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EAET;gBACE,MAAM;gBACN,MAAM;gBACN,MAAM,EACJ,MAAM,KAAK,UAAU;oBACnB,CAAC,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE;oBAC1D,CAAC,CAAC,SAAS;aAChB,CACF,CAAA;YAED,MAAM,IAAI,CAAC,kBAAkB,CAAC;gBAC5B,IAAI;gBACJ,OAAO;gBACP,SAAS;gBACT,OAAO;gBACP,MAAM;gBACN,MAAM;gBACN,iBAAiB;aAClB,CAAC,CAAA;YAGF,OAAO,IAAI,CAAA;QACb,CAAC;QAAC,OAAO,CAAM,EAAE,CAAC;YAChB,MAAM,KAAK,GAAG,MAAM,IAAA,kCAAc,EAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;YACpD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,EAAE,IAAI,IAAI,kBAAkB,EACnC,QAAQ,EACR;gBACE,KAAK,EAAE;oBACL,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;oBAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;iBACjB;aACF,CACF,CAAA;YACD,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;YAElD,MAAM,KAAK,CAAA;QACb,CAAC;IACH,CAAC,CAAA;CACF;AAvkBD,0CAukBC"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,7 +21,9 @@ const handleSpecificErrors = async (e, step, process) => {
|
|
|
21
21
|
e.cause?.name === 'UserRejectedRequestError') {
|
|
22
22
|
return new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.SignatureRejected, e.message, e);
|
|
23
23
|
}
|
|
24
|
-
if (e.cause?.code === -32000
|
|
24
|
+
if (e.cause?.code === -32000 ||
|
|
25
|
+
(e.name === 'TransactionExecutionError' &&
|
|
26
|
+
e.cause?.details?.includes('rejected'))) {
|
|
25
27
|
return new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.SignatureRejected, e.message, e);
|
|
26
28
|
}
|
|
27
29
|
if (e.cause?.code === -32603) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":";;;AACA,0DAAmD;AACnD,4DAAqD;AACrD,4DAAuE;AACvE,sDAAuE;AACvE,+EAAwE;AAGjE,MAAM,cAAc,GAAG,KAAK,EACjC,CAAQ,EACR,IAAe,EACf,OAAiB,EACE,EAAE;IACrB,IAAI,CAAC,YAAY,sBAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,OAAO,CAAA;QAChC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAE9D,OAAO,IAAI,sBAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B;AAED,MAAM,oBAAoB,GAAG,KAAK,EAChC,CAAM,EACN,IAAe,EACf,OAAiB,EACjB,EAAE;IACF,IACE,CAAC,CAAC,IAAI,KAAK,0BAA0B;QACrC,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,0BAA0B,EAC5C,CAAC;QACD,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAMD,
|
|
1
|
+
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":";;;AACA,0DAAmD;AACnD,4DAAqD;AACrD,4DAAuE;AACvE,sDAAuE;AACvE,+EAAwE;AAGjE,MAAM,cAAc,GAAG,KAAK,EACjC,CAAQ,EACR,IAAe,EACf,OAAiB,EACE,EAAE;IACrB,IAAI,CAAC,YAAY,sBAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,OAAO,CAAA;QAChC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAE9D,OAAO,IAAI,sBAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B;AAED,MAAM,oBAAoB,GAAG,KAAK,EAChC,CAAM,EACN,IAAe,EACf,OAAiB,EACjB,EAAE;IACF,IACE,CAAC,CAAC,IAAI,KAAK,0BAA0B;QACrC,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,0BAA0B,EAC5C,CAAC;QACD,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAMD,IACE,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK;QAExB,CAAC,CAAC,CAAC,IAAI,KAAK,2BAA2B;YACrC,CAAC,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,UAAU,CAAC,CAAC,EACzC,CAAC;QACD,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAOD,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,mBAAmB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC9E,CAAC;IAED,IACE,IAAI;QACJ,OAAO,EAAE,MAAM;QACf,CAAC,CAAC,IAAI,KAAK,4BAAa,CAAC,iBAAiB;QAC1C,CAAC,CAAC,OAAO,KAAK,2BAAY,CAAC,mBAAmB,EAC9C,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,4CAAmB,EACxC,OAAO,CAAC,MAAM,EACd,IAAI,CAAC,MAAM,CAAC,WAAW,CACxB,CAAA;QAED,MAAM,YAAY,GAAG,QAAQ,EAAE,aAAa,CAAA;QAE5C,IAAI,YAAY,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,4BAAgB,CACzB,4BAAa,CAAC,aAAa,EAC3B,2BAAY,CAAC,WAAW,EACxB,CAAC,CACF,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,YAAY,wBAAS,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,IAAI,wBAAY,CAAC,CAAC,CAAC,OAAO,IAAI,2BAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA"}
|
|
@@ -5,35 +5,25 @@ const experimental_1 = require("viem/experimental");
|
|
|
5
5
|
const utils_1 = require("viem/utils");
|
|
6
6
|
const constants_js_1 = require("../../errors/constants.js");
|
|
7
7
|
const errors_js_1 = require("../../errors/errors.js");
|
|
8
|
-
const waitForResult_js_1 = require("../../utils/waitForResult.js");
|
|
9
8
|
const waitForBatchTransactionReceipt = async (client, batchHash) => {
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
});
|
|
14
|
-
if (callsDetails.status === 'PENDING' ||
|
|
15
|
-
callsDetails.status === 100) {
|
|
16
|
-
return undefined;
|
|
17
|
-
}
|
|
18
|
-
if (callsDetails.status === 'CONFIRMED' || callsDetails.status === 200) {
|
|
19
|
-
if (!callsDetails.receipts?.length ||
|
|
20
|
-
!callsDetails.receipts.every((receipt) => receipt.transactionHash) ||
|
|
21
|
-
callsDetails.receipts.some((receipt) => receipt.status === 'reverted')) {
|
|
22
|
-
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
23
|
-
}
|
|
24
|
-
const transactionReceipt = callsDetails.receipts.at(-1);
|
|
25
|
-
return transactionReceipt;
|
|
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
|
-
}
|
|
33
|
-
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionNotFound, 'Transaction not found.');
|
|
34
|
-
}, 5000, 3, (_, error) => {
|
|
35
|
-
return !(error instanceof errors_js_1.TransactionError);
|
|
9
|
+
const { receipts, status, statusCode } = await (0, utils_1.getAction)(client, experimental_1.waitForCallsStatus, 'waitForCallsStatus')({
|
|
10
|
+
id: batchHash,
|
|
11
|
+
timeout: 300_000,
|
|
36
12
|
});
|
|
13
|
+
if (status === 'success' ||
|
|
14
|
+
status === 'CONFIRMED') {
|
|
15
|
+
if (!receipts?.length ||
|
|
16
|
+
!receipts.every((receipt) => receipt.transactionHash) ||
|
|
17
|
+
receipts.some((receipt) => receipt.status === 'reverted')) {
|
|
18
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
19
|
+
}
|
|
20
|
+
const transactionReceipt = receipts.at(-1);
|
|
21
|
+
return transactionReceipt;
|
|
22
|
+
}
|
|
23
|
+
if (statusCode >= 400 && statusCode < 500) {
|
|
24
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionCanceled, 'Transaction was canceled.');
|
|
25
|
+
}
|
|
26
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionFailed, 'Transaction failed.');
|
|
37
27
|
};
|
|
38
28
|
exports.waitForBatchTransactionReceipt = waitForBatchTransactionReceipt;
|
|
39
29
|
//# sourceMappingURL=waitForBatchTransactionReceipt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":";;;AAKA,
|
|
1
|
+
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":";;;AAKA,oDAAsD;AACtD,sCAAsC;AACtC,4DAAyD;AACzD,sDAAyD;AAOlD,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,IAAA,iBAAS,EACtD,MAAM,EACN,iCAAkB,EAClB,oBAAoB,CACrB,CAAC;QACA,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,OAAO;KACjB,CAAC,CAAA;IAEF,IACE,MAAM,KAAK,SAAS;QAEpB,MAAM,KAAK,WAAW,EACtB,CAAC;QACD,IACE,CAAC,QAAQ,EAAE,MAAM;YACjB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;YACrD,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACzD,CAAC;YACD,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;QACH,CAAC;QACD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;QAC3C,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IACD,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QAC1C,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,mBAAmB,EACjC,2BAA2B,CAC5B,CAAA;IACH,CAAC;IACD,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,iBAAiB,EAC/B,qBAAqB,CACtB,CAAA;AACH,CAAC,CAAA;AAzCY,QAAA,8BAA8B,kCAyC1C"}
|
package/src/_cjs/version.js
CHANGED
|
@@ -286,16 +286,11 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
286
286
|
value: transactionRequest.value,
|
|
287
287
|
};
|
|
288
288
|
calls.push(transferCall);
|
|
289
|
-
const
|
|
289
|
+
const { id } = await getAction(this.client, sendCalls, 'sendCalls')({
|
|
290
290
|
account: this.client.account,
|
|
291
291
|
calls,
|
|
292
|
-
})
|
|
293
|
-
|
|
294
|
-
// This check allows backwards compatibility during transition period
|
|
295
|
-
txHash =
|
|
296
|
-
typeof sendCallsResult === 'object'
|
|
297
|
-
? sendCallsResult?.id
|
|
298
|
-
: sendCallsResult;
|
|
292
|
+
});
|
|
293
|
+
txHash = id;
|
|
299
294
|
txType = 'batched';
|
|
300
295
|
}
|
|
301
296
|
else if (isRelayerTransaction) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -22,7 +22,10 @@ const handleSpecificErrors = async (e, step, process) => {
|
|
|
22
22
|
// code: -32000,
|
|
23
23
|
// message: 'User rejected transaction',
|
|
24
24
|
// }
|
|
25
|
-
if (e.cause?.code === -32000
|
|
25
|
+
if (e.cause?.code === -32000 ||
|
|
26
|
+
// Safe doesn't return proper code, but the error details includes 'rejected'
|
|
27
|
+
(e.name === 'TransactionExecutionError' &&
|
|
28
|
+
e.cause?.details?.includes('rejected'))) {
|
|
26
29
|
return new TransactionError(LiFiErrorCode.SignatureRejected, e.message, e);
|
|
27
30
|
}
|
|
28
31
|
// Some wallets reject transactions sometimes with this code because of internal and JSON-RPC errors, e.g.:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAA;AACnD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACvE,OAAO,EAAE,gBAAgB,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAA;AACvE,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAA;AAGxE,MAAM,CAAC,MAAM,cAAc,GAAG,KAAK,EACjC,CAAQ,EACR,IAAe,EACf,OAAiB,EACE,EAAE;IACrB,IAAI,CAAC,YAAY,QAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,OAAO,CAAA;QAChC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAE9D,OAAO,IAAI,QAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAED,MAAM,oBAAoB,GAAG,KAAK,EAChC,CAAM,EACN,IAAe,EACf,OAAiB,EACjB,EAAE;IACF,IACE,CAAC,CAAC,IAAI,KAAK,0BAA0B;QACrC,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,0BAA0B,EAC5C,CAAC;QACD,OAAO,IAAI,gBAAgB,CAAC,aAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IACD,oFAAoF;IACpF,IAAI;IACJ,kBAAkB;IAClB,0CAA0C;IAC1C,IAAI;IACJ,
|
|
1
|
+
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,37 +1,26 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { waitForCallsStatus } from 'viem/experimental';
|
|
2
2
|
import { getAction } from 'viem/utils';
|
|
3
3
|
import { LiFiErrorCode } from '../../errors/constants.js';
|
|
4
4
|
import { TransactionError } from '../../errors/errors.js';
|
|
5
|
-
import { waitForResult } from '../../utils/waitForResult.js';
|
|
6
5
|
export const waitForBatchTransactionReceipt = async (client, batchHash) => {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
});
|
|
11
|
-
// EIP-5792 specs was updated to return 100 for pending transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
12
|
-
if (callsDetails.status === 'PENDING' ||
|
|
13
|
-
callsDetails.status === 100) {
|
|
14
|
-
return undefined;
|
|
15
|
-
}
|
|
16
|
-
// EIP-5792 specs was updated to return 200 for confirmed transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
17
|
-
if (callsDetails.status === 'CONFIRMED' || callsDetails.status === 200) {
|
|
18
|
-
if (!callsDetails.receipts?.length ||
|
|
19
|
-
!callsDetails.receipts.every((receipt) => receipt.transactionHash) ||
|
|
20
|
-
callsDetails.receipts.some((receipt) => receipt.status === 'reverted')) {
|
|
21
|
-
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
22
|
-
}
|
|
23
|
-
const transactionReceipt = callsDetails.receipts.at(-1);
|
|
24
|
-
return transactionReceipt;
|
|
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
|
-
}
|
|
32
|
-
throw new TransactionError(LiFiErrorCode.TransactionNotFound, 'Transaction not found.');
|
|
33
|
-
}, 5000, 3, (_, error) => {
|
|
34
|
-
return !(error instanceof TransactionError);
|
|
6
|
+
const { receipts, status, statusCode } = await getAction(client, waitForCallsStatus, 'waitForCallsStatus')({
|
|
7
|
+
id: batchHash,
|
|
8
|
+
timeout: 300_000,
|
|
35
9
|
});
|
|
10
|
+
if (status === 'success' ||
|
|
11
|
+
// @ts-expect-error: for backwards compatibility
|
|
12
|
+
status === 'CONFIRMED') {
|
|
13
|
+
if (!receipts?.length ||
|
|
14
|
+
!receipts.every((receipt) => receipt.transactionHash) ||
|
|
15
|
+
receipts.some((receipt) => receipt.status === 'reverted')) {
|
|
16
|
+
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction was reverted.');
|
|
17
|
+
}
|
|
18
|
+
const transactionReceipt = receipts.at(-1);
|
|
19
|
+
return transactionReceipt;
|
|
20
|
+
}
|
|
21
|
+
if (statusCode >= 400 && statusCode < 500) {
|
|
22
|
+
throw new TransactionError(LiFiErrorCode.TransactionCanceled, 'Transaction was canceled.');
|
|
23
|
+
}
|
|
24
|
+
throw new TransactionError(LiFiErrorCode.TransactionFailed, 'Transaction failed.');
|
|
36
25
|
};
|
|
37
26
|
//# sourceMappingURL=waitForBatchTransactionReceipt.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"waitForBatchTransactionReceipt.js","sourceRoot":"","sources":["../../../core/EVM/waitForBatchTransactionReceipt.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAA;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAOzD,MAAM,CAAC,MAAM,8BAA8B,GAAG,KAAK,EACjD,MAAc,EACd,SAAe,EACa,EAAE;IAC9B,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,SAAS,CACtD,MAAM,EACN,kBAAkB,EAClB,oBAAoB,CACrB,CAAC;QACA,EAAE,EAAE,SAAS;QACb,OAAO,EAAE,OAAO;KACjB,CAAC,CAAA;IAEF,IACE,MAAM,KAAK,SAAS;QACpB,gDAAgD;QAChD,MAAM,KAAK,WAAW,EACtB,CAAC;QACD,IACE,CAAC,QAAQ,EAAE,MAAM;YACjB,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,eAAe,CAAC;YACrD,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,KAAK,UAAU,CAAC,EACzD,CAAC;YACD,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,2BAA2B,CAC5B,CAAA;QACH,CAAC;QACD,MAAM,kBAAkB,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC,CAAE,CAAA;QAC3C,OAAO,kBAAkB,CAAA;IAC3B,CAAC;IACD,IAAI,UAAU,IAAI,GAAG,IAAI,UAAU,GAAG,GAAG,EAAE,CAAC;QAC1C,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,mBAAmB,EACjC,2BAA2B,CAC5B,CAAA;IACH,CAAC;IACD,MAAM,IAAI,gBAAgB,CACxB,aAAa,CAAC,iBAAiB,EAC/B,qBAAqB,CACtB,CAAA;AACH,CAAC,CAAA"}
|
package/src/_esm/version.js
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAA;AAC3E,OAAO,KAAK,EAEV,MAAM,EAEN,IAAI,EAIL,MAAM,MAAM,CAAA;AAiBb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACP,mBAAmB,EAEpB,MAAM,aAAa,CAAA;AAUpB,OAAO,KAAK,EAAQ,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAS7D,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,sBAAsB;IAM3C,WAAW,GAAU,MAAM,gBAAgB,EAAE,UAAU,OAAO,iCAoD7D;IAED,kBAAkB,GAAU,2EAQzB;QACD,IAAI,EAAE,gBAAgB,CAAA;QACtB,OAAO,EAAE,OAAO,CAAA;QAChB,SAAS,EAAE,aAAa,CAAA;QACxB,OAAO,EAAE,aAAa,CAAA;QACtB,MAAM,EAAE,qBAAqB,CAAA;QAC7B,MAAM,EAAE,IAAI,CAAA;QACZ,iBAAiB,EAAE,OAAO,CAAA;KAC3B,mBA0DA;IAED,WAAW,GAAU,MAAM,gBAAgB,KAAG,OAAO,CAAC,gBAAgB,CAAC,
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAA6B,MAAM,aAAa,CAAA;AAC3E,OAAO,KAAK,EAEV,MAAM,EAEN,IAAI,EAIL,MAAM,MAAM,CAAA;AAiBb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACP,mBAAmB,EAEpB,MAAM,aAAa,CAAA;AAUpB,OAAO,KAAK,EAAQ,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAS7D,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,sBAAsB;IAM3C,WAAW,GAAU,MAAM,gBAAgB,EAAE,UAAU,OAAO,iCAoD7D;IAED,kBAAkB,GAAU,2EAQzB;QACD,IAAI,EAAE,gBAAgB,CAAA;QACtB,OAAO,EAAE,OAAO,CAAA;QAChB,SAAS,EAAE,aAAa,CAAA;QACxB,OAAO,EAAE,aAAa,CAAA;QACtB,MAAM,EAAE,qBAAqB,CAAA;QAC7B,MAAM,EAAE,IAAI,CAAA;QACZ,iBAAiB,EAAE,OAAO,CAAA;KAC3B,mBA0DA;IAED,WAAW,GAAU,MAAM,gBAAgB,KAAG,OAAO,CAAC,gBAAgB,CAAC,CAsbtE;CACF"}
|
|
@@ -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;
|
|
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;AAMb,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,CAsC3B,CAAA"}
|
package/src/_types/version.d.ts
CHANGED
|
@@ -447,20 +447,15 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
447
447
|
|
|
448
448
|
calls.push(transferCall)
|
|
449
449
|
|
|
450
|
-
const
|
|
450
|
+
const { id } = await getAction(
|
|
451
451
|
this.client,
|
|
452
452
|
sendCalls,
|
|
453
453
|
'sendCalls'
|
|
454
454
|
)({
|
|
455
455
|
account: this.client.account!,
|
|
456
456
|
calls,
|
|
457
|
-
})
|
|
458
|
-
|
|
459
|
-
// This check allows backwards compatibility during transition period
|
|
460
|
-
txHash =
|
|
461
|
-
typeof sendCallsResult === 'object'
|
|
462
|
-
? (sendCallsResult as { id: Hash })?.id
|
|
463
|
-
: sendCallsResult
|
|
457
|
+
})
|
|
458
|
+
txHash = id as Hash
|
|
464
459
|
txType = 'batched'
|
|
465
460
|
} else if (isRelayerTransaction) {
|
|
466
461
|
const relayerTypedData = step.typedData.find(
|
|
@@ -38,7 +38,12 @@ const handleSpecificErrors = async (
|
|
|
38
38
|
// code: -32000,
|
|
39
39
|
// message: 'User rejected transaction',
|
|
40
40
|
// }
|
|
41
|
-
if (
|
|
41
|
+
if (
|
|
42
|
+
e.cause?.code === -32000 ||
|
|
43
|
+
// Safe doesn't return proper code, but the error details includes 'rejected'
|
|
44
|
+
(e.name === 'TransactionExecutionError' &&
|
|
45
|
+
e.cause?.details?.includes('rejected'))
|
|
46
|
+
) {
|
|
42
47
|
return new TransactionError(LiFiErrorCode.SignatureRejected, e.message, e)
|
|
43
48
|
}
|
|
44
49
|
// Some wallets reject transactions sometimes with this code because of internal and JSON-RPC errors, e.g.:
|
|
@@ -3,11 +3,10 @@ import type {
|
|
|
3
3
|
Hash,
|
|
4
4
|
WalletCallReceipt as _WalletCallReceipt,
|
|
5
5
|
} from 'viem'
|
|
6
|
-
import {
|
|
6
|
+
import { waitForCallsStatus } from 'viem/experimental'
|
|
7
7
|
import { getAction } from 'viem/utils'
|
|
8
8
|
import { LiFiErrorCode } from '../../errors/constants.js'
|
|
9
9
|
import { TransactionError } from '../../errors/errors.js'
|
|
10
|
-
import { waitForResult } from '../../utils/waitForResult.js'
|
|
11
10
|
|
|
12
11
|
export type WalletCallReceipt = _WalletCallReceipt<
|
|
13
12
|
bigint,
|
|
@@ -18,62 +17,41 @@ export const waitForBatchTransactionReceipt = async (
|
|
|
18
17
|
client: Client,
|
|
19
18
|
batchHash: Hash
|
|
20
19
|
): Promise<WalletCallReceipt> => {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
})
|
|
30
|
-
|
|
31
|
-
// EIP-5792 specs was updated to return 100 for pending transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
32
|
-
if (
|
|
33
|
-
callsDetails.status === 'PENDING' ||
|
|
34
|
-
callsDetails.status === (100 as any)
|
|
35
|
-
) {
|
|
36
|
-
return undefined
|
|
37
|
-
}
|
|
38
|
-
|
|
39
|
-
// EIP-5792 specs was updated to return 200 for confirmed transactions https://eips.ethereum.org/EIPS/eip-5792
|
|
40
|
-
if (callsDetails.status === 'CONFIRMED' || callsDetails.status === 200) {
|
|
41
|
-
if (
|
|
42
|
-
!callsDetails.receipts?.length ||
|
|
43
|
-
!callsDetails.receipts.every((receipt) => receipt.transactionHash) ||
|
|
44
|
-
callsDetails.receipts.some((receipt) => receipt.status === 'reverted')
|
|
45
|
-
) {
|
|
46
|
-
throw new TransactionError(
|
|
47
|
-
LiFiErrorCode.TransactionFailed,
|
|
48
|
-
'Transaction was reverted.'
|
|
49
|
-
)
|
|
50
|
-
}
|
|
51
|
-
const transactionReceipt = callsDetails.receipts.at(-1)!
|
|
52
|
-
return transactionReceipt
|
|
53
|
-
}
|
|
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
|
-
}
|
|
20
|
+
const { receipts, status, statusCode } = await getAction(
|
|
21
|
+
client,
|
|
22
|
+
waitForCallsStatus,
|
|
23
|
+
'waitForCallsStatus'
|
|
24
|
+
)({
|
|
25
|
+
id: batchHash,
|
|
26
|
+
timeout: 300_000,
|
|
27
|
+
})
|
|
67
28
|
|
|
29
|
+
if (
|
|
30
|
+
status === 'success' ||
|
|
31
|
+
// @ts-expect-error: for backwards compatibility
|
|
32
|
+
status === 'CONFIRMED'
|
|
33
|
+
) {
|
|
34
|
+
if (
|
|
35
|
+
!receipts?.length ||
|
|
36
|
+
!receipts.every((receipt) => receipt.transactionHash) ||
|
|
37
|
+
receipts.some((receipt) => receipt.status === 'reverted')
|
|
38
|
+
) {
|
|
68
39
|
throw new TransactionError(
|
|
69
|
-
LiFiErrorCode.
|
|
70
|
-
'Transaction
|
|
40
|
+
LiFiErrorCode.TransactionFailed,
|
|
41
|
+
'Transaction was reverted.'
|
|
71
42
|
)
|
|
72
|
-
},
|
|
73
|
-
5000,
|
|
74
|
-
3,
|
|
75
|
-
(_, error) => {
|
|
76
|
-
return !(error instanceof TransactionError)
|
|
77
43
|
}
|
|
44
|
+
const transactionReceipt = receipts.at(-1)!
|
|
45
|
+
return transactionReceipt
|
|
46
|
+
}
|
|
47
|
+
if (statusCode >= 400 && statusCode < 500) {
|
|
48
|
+
throw new TransactionError(
|
|
49
|
+
LiFiErrorCode.TransactionCanceled,
|
|
50
|
+
'Transaction was canceled.'
|
|
51
|
+
)
|
|
52
|
+
}
|
|
53
|
+
throw new TransactionError(
|
|
54
|
+
LiFiErrorCode.TransactionFailed,
|
|
55
|
+
'Transaction failed.'
|
|
78
56
|
)
|
|
79
57
|
}
|
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.7'
|