@lifi/sdk 3.7.2 → 3.7.3
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 +6 -6
- package/src/_cjs/core/EVM/EVMStepExecutor.js +3 -3
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +8 -2
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/checkPermitSupport.js +8 -9
- package/src/_cjs/core/EVM/checkPermitSupport.js.map +1 -1
- package/src/_cjs/core/EVM/getActionWithFallback.js +23 -0
- package/src/_cjs/core/EVM/getActionWithFallback.js.map +1 -0
- package/src/_cjs/core/EVM/getAllowance.js +10 -9
- package/src/_cjs/core/EVM/getAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/getEVMBalance.js +11 -8
- package/src/_cjs/core/EVM/getEVMBalance.js.map +1 -1
- package/src/_cjs/core/EVM/parseEVMErrors.js +16 -4
- package/src/_cjs/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_cjs/core/EVM/permits/getNativePermit.js +4 -3
- package/src/_cjs/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_cjs/core/EVM/permits/getPermitTransferFromValues.js +2 -1
- package/src/_cjs/core/EVM/permits/getPermitTransferFromValues.js.map +1 -1
- package/src/_cjs/core/EVM/setAllowance.js +2 -2
- package/src/_cjs/core/EVM/setAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/utils.js +2 -1
- package/src/_cjs/core/EVM/utils.js.map +1 -1
- package/src/_cjs/core/UTXO/getUTXOPublicClient.js +6 -13
- package/src/_cjs/core/UTXO/getUTXOPublicClient.js.map +1 -1
- package/src/_cjs/core/execution.js +3 -1
- package/src/_cjs/core/execution.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +4 -4
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +8 -2
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/checkPermitSupport.js +8 -10
- package/src/_esm/core/EVM/checkPermitSupport.js.map +1 -1
- package/src/_esm/core/EVM/getActionWithFallback.js +34 -0
- package/src/_esm/core/EVM/getActionWithFallback.js.map +1 -0
- package/src/_esm/core/EVM/getAllowance.js +10 -9
- package/src/_esm/core/EVM/getAllowance.js.map +1 -1
- package/src/_esm/core/EVM/getEVMBalance.js +11 -8
- package/src/_esm/core/EVM/getEVMBalance.js.map +1 -1
- package/src/_esm/core/EVM/parseEVMErrors.js +14 -3
- package/src/_esm/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_esm/core/EVM/permits/getNativePermit.js +4 -3
- package/src/_esm/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_esm/core/EVM/permits/getPermitTransferFromValues.js +2 -1
- package/src/_esm/core/EVM/permits/getPermitTransferFromValues.js.map +1 -1
- package/src/_esm/core/EVM/setAllowance.js +2 -2
- package/src/_esm/core/EVM/setAllowance.js.map +1 -1
- package/src/_esm/core/EVM/utils.js +2 -1
- package/src/_esm/core/EVM/utils.js.map +1 -1
- package/src/_esm/core/UTXO/getUTXOPublicClient.js +7 -14
- package/src/_esm/core/UTXO/getUTXOPublicClient.js.map +1 -1
- package/src/_esm/core/execution.js +3 -1
- package/src/_esm/core/execution.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/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/checkPermitSupport.d.ts.map +1 -1
- package/src/_types/core/EVM/getActionWithFallback.d.ts +18 -0
- package/src/_types/core/EVM/getActionWithFallback.d.ts.map +1 -0
- package/src/_types/core/EVM/getAllowance.d.ts +3 -3
- package/src/_types/core/EVM/getAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/parseEVMErrors.d.ts +1 -0
- package/src/_types/core/EVM/parseEVMErrors.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/getNativePermit.d.ts +7 -1
- package/src/_types/core/EVM/permits/getNativePermit.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/getPermitTransferFromValues.d.ts.map +1 -1
- package/src/_types/core/EVM/utils.d.ts.map +1 -1
- package/src/_types/core/UTXO/getUTXOPublicClient.d.ts +21 -0
- package/src/_types/core/UTXO/getUTXOPublicClient.d.ts.map +1 -1
- package/src/_types/core/execution.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +17 -9
- package/src/core/EVM/checkAllowance.ts +11 -6
- package/src/core/EVM/checkPermitSupport.ts +12 -21
- package/src/core/EVM/getActionWithFallback.ts +58 -0
- package/src/core/EVM/getAllowance.ts +21 -13
- package/src/core/EVM/getEVMBalance.ts +13 -8
- package/src/core/EVM/parseEVMErrors.ts +22 -3
- package/src/core/EVM/permits/getNativePermit.ts +13 -6
- package/src/core/EVM/permits/getPermitTransferFromValues.ts +12 -6
- package/src/core/EVM/setAllowance.ts +2 -2
- package/src/core/EVM/utils.ts +2 -1
- package/src/core/UTXO/getUTXOPublicClient.ts +6 -14
- package/src/core/execution.ts +6 -1
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -3,17 +3,17 @@
|
|
|
3
3
|
"url": "https://github.com/lifinance/sdk/issues"
|
|
4
4
|
},
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@bigmi/core": "^0.
|
|
7
|
-
"@lifi/types": "^17.
|
|
8
|
-
"@mysten/sui": "^1.
|
|
9
|
-
"@mysten/wallet-standard": "^0.15.
|
|
6
|
+
"@bigmi/core": "^0.3.0",
|
|
7
|
+
"@lifi/types": "^17.16.0",
|
|
8
|
+
"@mysten/sui": "^1.30.1",
|
|
9
|
+
"@mysten/wallet-standard": "^0.15.2",
|
|
10
10
|
"@noble/curves": "^1.9.1",
|
|
11
11
|
"@solana/wallet-adapter-base": "^0.9.26",
|
|
12
12
|
"@solana/web3.js": "^1.98.2",
|
|
13
13
|
"bech32": "^2.0.0",
|
|
14
14
|
"bitcoinjs-lib": "^7.0.0-rc.0",
|
|
15
15
|
"bs58": "^6.0.0",
|
|
16
|
-
"viem": "^2.30.
|
|
16
|
+
"viem": "^2.30.5"
|
|
17
17
|
},
|
|
18
18
|
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
19
19
|
"exports": {
|
|
@@ -69,5 +69,5 @@
|
|
|
69
69
|
"sideEffects": false,
|
|
70
70
|
"types": "./src/_types/index.d.ts",
|
|
71
71
|
"typings": "./src/_types/index.d.ts",
|
|
72
|
-
"version": "3.7.
|
|
72
|
+
"version": "3.7.3"
|
|
73
73
|
}
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EVMStepExecutor = void 0;
|
|
4
|
-
const viem_1 = require("viem");
|
|
5
4
|
const actions_1 = require("viem/actions");
|
|
6
5
|
const utils_1 = require("viem/utils");
|
|
7
6
|
const config_js_1 = require("../../config.js");
|
|
@@ -13,6 +12,7 @@ const checkBalance_js_1 = require("../checkBalance.js");
|
|
|
13
12
|
const stepComparison_js_1 = require("../stepComparison.js");
|
|
14
13
|
const waitForDestinationChainTransaction_js_1 = require("../waitForDestinationChainTransaction.js");
|
|
15
14
|
const checkAllowance_js_1 = require("./checkAllowance.js");
|
|
15
|
+
const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
16
16
|
const isBatchingSupported_js_1 = require("./isBatchingSupported.js");
|
|
17
17
|
const parseEVMErrors_js_1 = require("./parseEVMErrors.js");
|
|
18
18
|
const encodeNativePermitData_js_1 = require("./permits/encodeNativePermitData.js");
|
|
@@ -329,7 +329,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
329
329
|
if (signedNativePermitTypedData || permit2Supported) {
|
|
330
330
|
transactionRequest.to = fromChain.permit2Proxy;
|
|
331
331
|
try {
|
|
332
|
-
const estimatedGas = await (0,
|
|
332
|
+
const estimatedGas = await (0, getActionWithFallback_js_1.getActionWithFallback)(this.client, actions_1.estimateGas, 'estimateGas', {
|
|
333
333
|
account: this.client.account,
|
|
334
334
|
to: transactionRequest.to,
|
|
335
335
|
data: transactionRequest.data,
|
|
@@ -378,7 +378,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
378
378
|
return step;
|
|
379
379
|
}
|
|
380
380
|
catch (e) {
|
|
381
|
-
if (e
|
|
381
|
+
if ((0, parseEVMErrors_js_1.isAtomicReadyWalletRejectedUpgradeError)(e) && !atomicityNotReady) {
|
|
382
382
|
step.execution = undefined;
|
|
383
383
|
return this.executeStep(step, true);
|
|
384
384
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":";;;AAUA,+BAA4D;AAC5D,0CAMqB;AACrB,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,EACjB,IAAsB,EAEtB,iBAAiB,GAAG,KAAK,EACE,EAAE;QAC7B,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;QAKxB,MAAM,iBAAiB,GACrB,iBAAiB,IAAI,IAAI,CAAC,IAAI,KAAK,UAAU;YAC3C,CAAC,CAAC,KAAK;YACP,CAAC,CAAC,MAAM,IAAA,4CAAmB,EAAC;gBACxB,MAAM,EAAE,IAAI,CAAC,MAAM;gBACnB,OAAO,EAAE,SAAS,CAAC,EAAE;aACtB,CAAC,CAAA;QAER,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;QAIhD,MAAM,qBAAqB,GACzB,IAAI,CAAC,gBAAgB,EAAE,qBAAqB,IAAI,IAAI,CAAC,IAAI,KAAK,MAAM,CAAA;QAGtE,MAAM,gBAAgB,GACpB,CAAC,CAAC,SAAS,CAAC,OAAO;YACnB,CAAC,CAAC,SAAS,CAAC,YAAY;YACxB,CAAC,iBAAiB;YAClB,CAAC,iBAAiB;YAClB,CAAC,qBAAqB;YAEtB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAA;QAEjC,MAAM,iBAAiB,GAErB,CAAC,eAAe,EAAE,MAAM;YAExB,CAAC,iBAAiB;YAElB,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAA;QAEjC,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,EAAE,EAAE,GAAG,MAAM,IAAA,iBAAS,EAC5B,IAAI,CAAC,MAAM,EACX,mBAAS,EACT,WAAW,CACZ,CAAC;oBACA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oBAC7B,KAAK;iBACN,CAAC,CAAA;gBACF,MAAM,GAAG,EAAU,CAAA;gBACnB,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;oBAEpD,kBAAkB,CAAC,EAAE,GAAG,SAAS,CAAC,YAAY,CAAA;oBAC9C,IAAI,CAAC;wBAEH,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,OAAO,CAAC,EAAE,CAAC;oBAEb,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;YAEhB,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,4CAAqC,CAAC,IAAI,EAAE,CAAC;gBACjE,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;gBAC1B,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YACrC,CAAC;YACD,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;AAvlBD,0CAulBC"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.checkAllowance = void 0;
|
|
|
4
4
|
const actions_1 = require("viem/actions");
|
|
5
5
|
const utils_1 = require("viem/utils");
|
|
6
6
|
const constants_js_1 = require("../../constants.js");
|
|
7
|
+
const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
7
8
|
const getAllowance_js_1 = require("./getAllowance.js");
|
|
8
9
|
const parseEVMErrors_js_1 = require("./parseEVMErrors.js");
|
|
9
10
|
const getNativePermit_js_1 = require("./permits/getNativePermit.js");
|
|
@@ -26,7 +27,7 @@ const checkAllowance = async ({ client, chain, step, statusManager, executionOpt
|
|
|
26
27
|
? chain.permit2
|
|
27
28
|
: step.estimate.approvalAddress;
|
|
28
29
|
const fromAmount = BigInt(step.action.fromAmount);
|
|
29
|
-
const approved = await (0, getAllowance_js_1.getAllowance)(
|
|
30
|
+
const approved = await (0, getAllowance_js_1.getAllowance)(client, step.action.fromToken.address, client.account.address, spenderAddress);
|
|
30
31
|
if (fromAmount <= approved) {
|
|
31
32
|
statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
|
|
32
33
|
return { status: 'DONE' };
|
|
@@ -38,7 +39,12 @@ const checkAllowance = async ({ client, chain, step, statusManager, executionOpt
|
|
|
38
39
|
nativePermitData = step.typedData.find((p) => p.primaryType === 'Permit');
|
|
39
40
|
}
|
|
40
41
|
else if (isNativePermitAvailable) {
|
|
41
|
-
nativePermitData = await (0,
|
|
42
|
+
nativePermitData = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, getNativePermit_js_1.getNativePermit, 'getNativePermit', {
|
|
43
|
+
chainId: chain.id,
|
|
44
|
+
tokenAddress: step.action.fromToken.address,
|
|
45
|
+
spenderAddress: chain.permit2Proxy,
|
|
46
|
+
amount: fromAmount,
|
|
47
|
+
});
|
|
42
48
|
}
|
|
43
49
|
statusManager.updateProcess(step, allowanceProcess.type, 'ACTION_REQUIRED');
|
|
44
50
|
if (!allowUserInteraction) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":";;;AAEA,0CAA4C;AAC5C,sCAAsC;AACtC,qDAA+C;AAG/C,uDAAgD;AAChD,2DAAoD;AACpD,qEAA8D;AAE9D,uDAAgD;AAChD,mDAA+C;AAE/C,iFAA0E;AA2BnE,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,MAAM,EACN,KAAK,EACL,IAAI,EACJ,aAAa,EACb,gBAAgB,EAChB,oBAAoB,GAAG,KAAK,EAC5B,iBAAiB,GAAG,KAAK,EACzB,gBAAgB,GAAG,KAAK,EACxB,qBAAqB,GAAG,KAAK,GACR,EAA4B,EAAE;IAEnD,MAAM,gBAAgB,GAAY,aAAa,CAAC,mBAAmB,CAAC;QAClE,IAAI;QACJ,IAAI,EAAE,iBAAiB;QACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;KACjC,CAAC,CAAA;IAEF,IAAI,CAAC;QAEH,IAAI,gBAAgB,CAAC,MAAM,IAAI,gBAAgB,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAClE,MAAM,0BAA0B,CAC9B,MAAM,EACN,gBAAgB,CAAC,MAAiB,EAClC,gBAAgB,CAAC,IAAI,EACrB,IAAI,EACJ,KAAK,EACL,aAAa,CACd,CAAA;YACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAA;QAC3B,CAAC;QAGD,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,gBAAgB,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAEnE,MAAM,cAAc,GAAG,gBAAgB;YACrC,CAAC,CAAC,KAAK,CAAC,OAAO;YACf,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAA;QAEjC,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC,CAAA;QAEjD,MAAM,QAAQ,GAAG,MAAM,IAAA,8BAAY,EACjC,
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.checkPermitSupport = void 0;
|
|
4
4
|
const types_1 = require("@lifi/types");
|
|
5
5
|
const config_js_1 = require("../../config.js");
|
|
6
|
+
const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
6
7
|
const getAllowance_js_1 = require("./getAllowance.js");
|
|
7
8
|
const getNativePermit_js_1 = require("./permits/getNativePermit.js");
|
|
8
9
|
const publicClient_js_1 = require("./publicClient.js");
|
|
@@ -12,17 +13,15 @@ const checkPermitSupport = async ({ chain, tokenAddress, ownerAddress, amount, }
|
|
|
12
13
|
if (!client) {
|
|
13
14
|
client = await (0, publicClient_js_1.getPublicClient)(chain.id);
|
|
14
15
|
}
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
nativePermit = await (0, getNativePermit_js_1.getNativePermit)(client, chain.id, tokenAddress, chain.permit2Proxy, amount);
|
|
22
|
-
}
|
|
16
|
+
const nativePermit = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, getNativePermit_js_1.getNativePermit, 'getNativePermit', {
|
|
17
|
+
chainId: chain.id,
|
|
18
|
+
tokenAddress,
|
|
19
|
+
spenderAddress: chain.permit2Proxy,
|
|
20
|
+
amount,
|
|
21
|
+
});
|
|
23
22
|
let permit2Allowance;
|
|
24
23
|
if (chain.permit2) {
|
|
25
|
-
permit2Allowance = await (0, getAllowance_js_1.getAllowance)(
|
|
24
|
+
permit2Allowance = await (0, getAllowance_js_1.getAllowance)(client, tokenAddress, ownerAddress, chain.permit2);
|
|
26
25
|
}
|
|
27
26
|
return {
|
|
28
27
|
nativePermitSupported: !!nativePermit,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkPermitSupport.js","sourceRoot":"","sources":["../../../core/EVM/checkPermitSupport.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,+CAAwC;AACxC,uDAAgD;AAChD,qEAA8D;
|
|
1
|
+
{"version":3,"file":"checkPermitSupport.js","sourceRoot":"","sources":["../../../core/EVM/checkPermitSupport.ts"],"names":[],"mappings":";;;AACA,uCAAuC;AAEvC,+CAAwC;AACxC,yEAAkE;AAClE,uDAAgD;AAChD,qEAA8D;AAC9D,uDAAmD;AAsB5C,MAAM,kBAAkB,GAAG,KAAK,EAAE,EACvC,KAAK,EACL,YAAY,EACZ,YAAY,EACZ,MAAM,GAMP,EAA0B,EAAE;IAC3B,MAAM,QAAQ,GAAG,kBAAM,CAAC,WAAW,CAAC,iBAAS,CAAC,GAAG,CAA4B,CAAA;IAE7E,IAAI,MAAM,GAAG,MAAM,QAAQ,EAAE,eAAe,EAAE,EAAE,CAAA;IAEhD,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,MAAM,GAAG,MAAM,IAAA,iCAAe,EAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAC1C,CAAC;IAED,MAAM,YAAY,GAAG,MAAM,IAAA,gDAAqB,EAC9C,MAAM,EACN,oCAAe,EACf,iBAAiB,EACjB;QACE,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,YAAY;QACZ,cAAc,EAAE,KAAK,CAAC,YAAuB;QAC7C,MAAM;KACP,CACF,CAAA;IAED,IAAI,gBAAoC,CAAA;IAExC,IAAI,KAAK,CAAC,OAAO,EAAE,CAAC;QAClB,gBAAgB,GAAG,MAAM,IAAA,8BAAY,EACnC,MAAM,EACN,YAAY,EACZ,YAAY,EACZ,KAAK,CAAC,OAAkB,CACzB,CAAA;IACH,CAAC;IAED,OAAO;QACL,qBAAqB,EAAE,CAAC,CAAC,YAAY;QACrC,0BAA0B,EACxB,CAAC,CAAC,gBAAgB,IAAI,gBAAgB,IAAI,MAAM;KACnD,CAAA;AACH,CAAC,CAAA;AA/CY,QAAA,kBAAkB,sBA+C9B"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.getActionWithFallback = void 0;
|
|
4
|
+
const utils_1 = require("viem/utils");
|
|
5
|
+
const publicClient_js_1 = require("./publicClient.js");
|
|
6
|
+
const getActionWithFallback = async (walletClient, actionFn, name, params) => {
|
|
7
|
+
try {
|
|
8
|
+
return await (0, utils_1.getAction)(walletClient, actionFn, name)(params);
|
|
9
|
+
}
|
|
10
|
+
catch (error) {
|
|
11
|
+
if (!walletClient.account?.address) {
|
|
12
|
+
throw error;
|
|
13
|
+
}
|
|
14
|
+
const chainId = walletClient.chain?.id;
|
|
15
|
+
if (!chainId) {
|
|
16
|
+
throw error;
|
|
17
|
+
}
|
|
18
|
+
const publicClient = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
19
|
+
return await (0, utils_1.getAction)(publicClient, actionFn, name)(params);
|
|
20
|
+
}
|
|
21
|
+
};
|
|
22
|
+
exports.getActionWithFallback = getActionWithFallback;
|
|
23
|
+
//# sourceMappingURL=getActionWithFallback.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"getActionWithFallback.js","sourceRoot":"","sources":["../../../core/EVM/getActionWithFallback.ts"],"names":[],"mappings":";;;AASA,sCAAsC;AACtC,uDAAmD;AAe5C,MAAM,qBAAqB,GAAG,KAAK,EAUxC,YAAoB,EACpB,QAA2D,EAC3D,IAA+D,EAC/D,MAAkB,EACY,EAAE;IAChC,IAAI,CAAC;QACH,OAAO,MAAM,IAAA,iBAAS,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IAC9D,CAAC;IAAC,OAAO,KAAc,EAAE,CAAC;QAGxB,IAAI,CAAC,YAAY,CAAC,OAAO,EAAE,OAAO,EAAE,CAAC;YACnC,MAAM,KAAK,CAAA;QACb,CAAC;QAED,MAAM,OAAO,GAAG,YAAY,CAAC,KAAK,EAAE,EAAE,CAAA;QACtC,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,MAAM,KAAK,CAAA;QACb,CAAC;QAED,MAAM,YAAY,GAAG,MAAM,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAA;QACnD,OAAO,MAAM,IAAA,iBAAS,EAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC,MAAM,CAAC,CAAA;IAC9D,CAAC;AACH,CAAC,CAAA;AAhCY,QAAA,qBAAqB,yBAgCjC"}
|
|
@@ -4,17 +4,17 @@ exports.getTokenAllowanceMulticall = exports.getTokenAllowance = exports.getAllo
|
|
|
4
4
|
const actions_1 = require("viem/actions");
|
|
5
5
|
const isZeroAddress_js_1 = require("../../utils/isZeroAddress.js");
|
|
6
6
|
const abi_js_1 = require("./abi.js");
|
|
7
|
+
const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
7
8
|
const publicClient_js_1 = require("./publicClient.js");
|
|
8
9
|
const utils_js_1 = require("./utils.js");
|
|
9
|
-
const getAllowance = async (
|
|
10
|
-
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
10
|
+
const getAllowance = async (client, tokenAddress, ownerAddress, spenderAddress) => {
|
|
11
11
|
try {
|
|
12
|
-
const approved =
|
|
12
|
+
const approved = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.readContract, 'readContract', {
|
|
13
13
|
address: tokenAddress,
|
|
14
14
|
abi: abi_js_1.allowanceAbi,
|
|
15
15
|
functionName: 'allowance',
|
|
16
16
|
args: [ownerAddress, spenderAddress],
|
|
17
|
-
})
|
|
17
|
+
});
|
|
18
18
|
return approved;
|
|
19
19
|
}
|
|
20
20
|
catch (_e) {
|
|
@@ -22,7 +22,7 @@ const getAllowance = async (chainId, tokenAddress, ownerAddress, spenderAddress)
|
|
|
22
22
|
}
|
|
23
23
|
};
|
|
24
24
|
exports.getAllowance = getAllowance;
|
|
25
|
-
const getAllowanceMulticall = async (chainId, tokens, ownerAddress) => {
|
|
25
|
+
const getAllowanceMulticall = async (client, chainId, tokens, ownerAddress) => {
|
|
26
26
|
if (!tokens.length) {
|
|
27
27
|
return [];
|
|
28
28
|
}
|
|
@@ -30,14 +30,13 @@ const getAllowanceMulticall = async (chainId, tokens, ownerAddress) => {
|
|
|
30
30
|
if (!multicallAddress) {
|
|
31
31
|
throw new Error(`No multicall address configured for chainId ${chainId}.`);
|
|
32
32
|
}
|
|
33
|
-
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
34
33
|
const contracts = tokens.map((token) => ({
|
|
35
34
|
address: token.token.address,
|
|
36
35
|
abi: abi_js_1.allowanceAbi,
|
|
37
36
|
functionName: 'allowance',
|
|
38
37
|
args: [ownerAddress, token.spenderAddress],
|
|
39
38
|
}));
|
|
40
|
-
const results = await (0,
|
|
39
|
+
const results = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.multicall, 'multicall', {
|
|
41
40
|
contracts,
|
|
42
41
|
multicallAddress: multicallAddress,
|
|
43
42
|
});
|
|
@@ -55,7 +54,8 @@ const getTokenAllowance = async (token, ownerAddress, spenderAddress) => {
|
|
|
55
54
|
if ((0, isZeroAddress_js_1.isNativeTokenAddress)(token.address)) {
|
|
56
55
|
return;
|
|
57
56
|
}
|
|
58
|
-
const
|
|
57
|
+
const client = await (0, publicClient_js_1.getPublicClient)(token.chainId);
|
|
58
|
+
const approved = await (0, exports.getAllowance)(client, token.address, ownerAddress, spenderAddress);
|
|
59
59
|
return approved;
|
|
60
60
|
};
|
|
61
61
|
exports.getTokenAllowance = getTokenAllowance;
|
|
@@ -70,7 +70,8 @@ const getTokenAllowanceMulticall = async (ownerAddress, tokens) => {
|
|
|
70
70
|
}
|
|
71
71
|
const chainKeys = Object.keys(tokenDataByChain).map(Number.parseInt);
|
|
72
72
|
const allowances = (await Promise.all(chainKeys.map(async (chainId) => {
|
|
73
|
-
|
|
73
|
+
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
74
|
+
return (0, exports.getAllowanceMulticall)(client, chainId, tokenDataByChain[chainId], ownerAddress);
|
|
74
75
|
}))).flat();
|
|
75
76
|
return allowances;
|
|
76
77
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllowance.js","sourceRoot":"","sources":["../../../core/EVM/getAllowance.ts"],"names":[],"mappings":";;;AAEA,0CAAsD;AACtD,mEAAmE;AACnE,qCAAuC;AACvC,uDAAmD;AAMnD,yCAAgD;AAEzC,MAAM,YAAY,GAAG,KAAK,EAC/B,
|
|
1
|
+
{"version":3,"file":"getAllowance.js","sourceRoot":"","sources":["../../../core/EVM/getAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -41,12 +41,13 @@ const getEVMBalanceMulticall = async (chainId, tokens, walletAddress, multicallA
|
|
|
41
41
|
args: [walletAddress],
|
|
42
42
|
};
|
|
43
43
|
});
|
|
44
|
-
const blockNumber = await
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
44
|
+
const [blockNumber, results] = await Promise.all([
|
|
45
|
+
(0, actions_1.getBlockNumber)(client),
|
|
46
|
+
(0, actions_1.multicall)(client, {
|
|
47
|
+
contracts,
|
|
48
|
+
multicallAddress: multicallAddress,
|
|
49
|
+
}),
|
|
50
|
+
]);
|
|
50
51
|
if (!results.length) {
|
|
51
52
|
return [];
|
|
52
53
|
}
|
|
@@ -60,7 +61,6 @@ const getEVMBalanceMulticall = async (chainId, tokens, walletAddress, multicallA
|
|
|
60
61
|
};
|
|
61
62
|
const getEVMBalanceDefault = async (chainId, tokens, walletAddress) => {
|
|
62
63
|
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
63
|
-
const blockNumber = await (0, actions_1.getBlockNumber)(client);
|
|
64
64
|
const queue = tokens.map((token) => {
|
|
65
65
|
if ((0, isZeroAddress_js_1.isZeroAddress)(token.address)) {
|
|
66
66
|
return (0, actions_1.getBalance)(client, {
|
|
@@ -74,7 +74,10 @@ const getEVMBalanceDefault = async (chainId, tokens, walletAddress) => {
|
|
|
74
74
|
args: [walletAddress],
|
|
75
75
|
});
|
|
76
76
|
});
|
|
77
|
-
const results = await Promise.
|
|
77
|
+
const [blockNumber, results] = await Promise.all([
|
|
78
|
+
(0, actions_1.getBlockNumber)(client),
|
|
79
|
+
Promise.allSettled(queue),
|
|
80
|
+
]);
|
|
78
81
|
const tokenAmounts = tokens.map((token, index) => {
|
|
79
82
|
const result = results[index];
|
|
80
83
|
if (result.status === 'rejected') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEVMBalance.js","sourceRoot":"","sources":["../../../core/EVM/getEVMBalance.ts"],"names":[],"mappings":";;;AAEA,0CAKqB;AACrB,mEAA4D;AAC5D,qCAAyD;AACzD,uDAAmD;AACnD,yCAAgD;AAEzC,MAAM,aAAa,GAAG,KAAK,EAChC,aAAsB,EACtB,MAAe,EACS,EAAE;IAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7B,KAAK,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QAC3B,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAChE,CAAC;IACH,CAAC;IAED,MAAM,gBAAgB,GAAG,MAAM,IAAA,8BAAmB,EAAC,OAAO,CAAC,CAAA;IAE3D,IAAI,gBAAgB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,sBAAsB,CAC3B,OAAO,EACP,MAAM,EACN,aAAa,EACb,gBAAgB,CACjB,CAAA;IACH,CAAC;IACD,OAAO,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;AAC7D,CAAC,CAAA;AAzBY,QAAA,aAAa,iBAyBzB;AAED,MAAM,sBAAsB,GAAG,KAAK,EAClC,OAAgB,EAChB,MAAe,EACf,aAAqB,EACrB,gBAAwB,EACA,EAAE;IAC1B,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAA;IAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACrC,IAAI,IAAA,gCAAa,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,OAAO,EAAE,gBAA2B;gBACpC,GAAG,EAAE,yBAAgB;gBACrB,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,CAAC,aAAa,CAAC;aACtB,CAAA;QACH,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,OAAkB;YACjC,GAAG,EAAE,qBAAY;YACjB,YAAY,EAAE,WAAW;YACzB,IAAI,EAAE,CAAC,aAAa,CAAC;SACtB,CAAA;IACH,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"getEVMBalance.js","sourceRoot":"","sources":["../../../core/EVM/getEVMBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.parseEVMErrors = void 0;
|
|
3
|
+
exports.isAtomicReadyWalletRejectedUpgradeError = exports.parseEVMErrors = void 0;
|
|
4
|
+
const viem_1 = require("viem");
|
|
4
5
|
const SDKError_js_1 = require("../../errors/SDKError.js");
|
|
5
6
|
const baseError_js_1 = require("../../errors/baseError.js");
|
|
6
7
|
const constants_js_1 = require("../../errors/constants.js");
|
|
@@ -17,12 +18,12 @@ const parseEVMErrors = async (e, step, process) => {
|
|
|
17
18
|
};
|
|
18
19
|
exports.parseEVMErrors = parseEVMErrors;
|
|
19
20
|
const handleSpecificErrors = async (e, step, process) => {
|
|
20
|
-
if (e.name ===
|
|
21
|
-
e.cause?.name ===
|
|
21
|
+
if (e.name === viem_1.UserRejectedRequestError.name ||
|
|
22
|
+
e.cause?.name === viem_1.UserRejectedRequestError.name) {
|
|
22
23
|
return new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.SignatureRejected, e.message, e);
|
|
23
24
|
}
|
|
24
25
|
if (e.cause?.code === -32000 ||
|
|
25
|
-
(e.name ===
|
|
26
|
+
(e.name === viem_1.TransactionExecutionError.name &&
|
|
26
27
|
e.cause?.details?.includes('rejected'))) {
|
|
27
28
|
return new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.SignatureRejected, e.message, e);
|
|
28
29
|
}
|
|
@@ -44,4 +45,15 @@ const handleSpecificErrors = async (e, step, process) => {
|
|
|
44
45
|
}
|
|
45
46
|
return new errors_js_1.UnknownError(e.message || constants_js_1.ErrorMessage.UnknownError, e);
|
|
46
47
|
};
|
|
48
|
+
const isAtomicReadyWalletRejectedUpgradeError = (e) => {
|
|
49
|
+
if (e.cause?.code === viem_1.AtomicReadyWalletRejectedUpgradeError.code) {
|
|
50
|
+
return true;
|
|
51
|
+
}
|
|
52
|
+
const details = e.cause?.details?.toLowerCase();
|
|
53
|
+
const isTransactionError = e.name === viem_1.TransactionExecutionError.name;
|
|
54
|
+
const hasRejectedUpgrade = details?.includes('rejected') && details?.includes('upgrade');
|
|
55
|
+
const has7702ErrorCode = details?.includes('7702');
|
|
56
|
+
return isTransactionError && (hasRejectedUpgrade || has7702ErrorCode);
|
|
57
|
+
};
|
|
58
|
+
exports.isAtomicReadyWalletRejectedUpgradeError = isAtomicReadyWalletRejectedUpgradeError;
|
|
47
59
|
//# sourceMappingURL=parseEVMErrors.js.map
|
|
@@ -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,
|
|
1
|
+
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":"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"}
|
|
@@ -4,6 +4,7 @@ exports.getNativePermit = void 0;
|
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
5
|
const actions_1 = require("viem/actions");
|
|
6
6
|
const abi_js_1 = require("../abi.js");
|
|
7
|
+
const getActionWithFallback_js_1 = require("../getActionWithFallback.js");
|
|
7
8
|
const utils_js_1 = require("../utils.js");
|
|
8
9
|
const EIP712_DOMAIN_TYPEHASH = '0x8b73c3c69bb8fe3d512ecc4cf759cc79239f7b179b0ffacaa9a75d522b39400f';
|
|
9
10
|
const EIP712_DOMAIN_TYPEHASH_WITH_SALT = '0x36c25de3e541d5d970f66e4210d728721220fff5c077cc6cd008b3a0c62adab7';
|
|
@@ -66,7 +67,7 @@ function validateDomainSeparator({ name, version, chainId, verifyingContract, do
|
|
|
66
67
|
domain: {},
|
|
67
68
|
};
|
|
68
69
|
}
|
|
69
|
-
const getNativePermit = async (client, chainId, tokenAddress, spenderAddress, amount) => {
|
|
70
|
+
const getNativePermit = async (client, { chainId, tokenAddress, spenderAddress, amount }) => {
|
|
70
71
|
try {
|
|
71
72
|
const multicallAddress = await (0, utils_js_1.getMulticallAddress)(chainId);
|
|
72
73
|
const contractCalls = [
|
|
@@ -94,7 +95,7 @@ const getNativePermit = async (client, chainId, tokenAddress, spenderAddress, am
|
|
|
94
95
|
];
|
|
95
96
|
if (multicallAddress) {
|
|
96
97
|
try {
|
|
97
|
-
const [nameResult, domainSeparatorResult, noncesResult, versionResult] = await (0,
|
|
98
|
+
const [nameResult, domainSeparatorResult, noncesResult, versionResult] = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.multicall, 'multicall', {
|
|
98
99
|
contracts: contractCalls,
|
|
99
100
|
multicallAddress,
|
|
100
101
|
});
|
|
@@ -133,7 +134,7 @@ const getNativePermit = async (client, chainId, tokenAddress, spenderAddress, am
|
|
|
133
134
|
catch {
|
|
134
135
|
}
|
|
135
136
|
}
|
|
136
|
-
const [nameResult, domainSeparatorResult, noncesResult, versionResult] = (await Promise.allSettled(contractCalls.map((call) => (0,
|
|
137
|
+
const [nameResult, domainSeparatorResult, noncesResult, versionResult] = (await Promise.allSettled(contractCalls.map((call) => (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.readContract, 'readContract', call))));
|
|
137
138
|
if (nameResult.status !== 'fulfilled' ||
|
|
138
139
|
domainSeparatorResult.status !== 'fulfilled' ||
|
|
139
140
|
noncesResult.status !== 'fulfilled') {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":";;;AAAA,+BAOa;AAGb,0CAAsD;AACtD,sCAAoD;AACpD,0CAAiD;AAWjD,MAAM,sBAAsB,GAC1B,oEAA2E,CAAA;AAU7E,MAAM,gCAAgC,GACpC,oEAA2E,CAAA;
|
|
1
|
+
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,8 +3,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.getPermitTransferFromValues = void 0;
|
|
4
4
|
const actions_1 = require("viem/actions");
|
|
5
5
|
const abi_js_1 = require("../abi.js");
|
|
6
|
+
const getActionWithFallback_js_1 = require("../getActionWithFallback.js");
|
|
6
7
|
const getPermitTransferFromValues = async (client, chain, tokenAddress, amount) => {
|
|
7
|
-
const nonce = await (0,
|
|
8
|
+
const nonce = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.readContract, 'readContract', {
|
|
8
9
|
address: chain.permit2Proxy,
|
|
9
10
|
abi: abi_js_1.permit2ProxyAbi,
|
|
10
11
|
functionName: 'nextNonce',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getPermitTransferFromValues.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getPermitTransferFromValues.ts"],"names":[],"mappings":";;;AAEA,0CAA2C;AAC3C,sCAA2C;
|
|
1
|
+
{"version":3,"file":"getPermitTransferFromValues.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getPermitTransferFromValues.ts"],"names":[],"mappings":";;;AAEA,0CAA2C;AAC3C,sCAA2C;AAC3C,0EAAmE;AAG5D,MAAM,2BAA2B,GAAG,KAAK,EAC9C,MAAc,EACd,KAAoB,EACpB,YAAqB,EACrB,MAAc,EACe,EAAE;IAC/B,MAAM,KAAK,GAAG,MAAM,IAAA,gDAAqB,EACvC,MAAM,EACN,sBAAY,EACZ,cAAc,EACd;QACE,OAAO,EAAE,KAAK,CAAC,YAAuB;QACtC,GAAG,EAAE,wBAAe;QACpB,YAAY,EAAE,WAAoB;QAClC,IAAI,EAAE,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO,CAAU;KACzC,CACF,CAAA;IAED,OAAO;QACL,SAAS,EAAE;YACT,KAAK,EAAE,YAAY;YACnB,MAAM,EAAE,MAAM;SACf;QACD,OAAO,EAAE,KAAK,CAAC,YAAuB;QACtC,KAAK,EAAE,KAAK;QACZ,QAAQ,EAAE,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,EAAE,CAAC;KAC1D,CAAA;AACH,CAAC,CAAA;AA3BY,QAAA,2BAA2B,+BA2BvC"}
|
|
@@ -49,7 +49,7 @@ const setTokenAllowance = async ({ walletClient, token, spenderAddress, amount,
|
|
|
49
49
|
if ((0, isZeroAddress_js_1.isNativeTokenAddress)(token.address)) {
|
|
50
50
|
return;
|
|
51
51
|
}
|
|
52
|
-
const approvedAmount = await (0, getAllowance_js_1.getAllowance)(
|
|
52
|
+
const approvedAmount = await (0, getAllowance_js_1.getAllowance)(walletClient, token.address, walletClient.account.address, spenderAddress);
|
|
53
53
|
if (amount > approvedAmount) {
|
|
54
54
|
const approveTx = await (0, exports.setAllowance)(walletClient, token.address, spenderAddress, amount);
|
|
55
55
|
return approveTx;
|
|
@@ -60,7 +60,7 @@ const revokeTokenApproval = async ({ walletClient, token, spenderAddress, }) =>
|
|
|
60
60
|
if ((0, isZeroAddress_js_1.isNativeTokenAddress)(token.address)) {
|
|
61
61
|
return;
|
|
62
62
|
}
|
|
63
|
-
const approvedAmount = await (0, getAllowance_js_1.getAllowance)(
|
|
63
|
+
const approvedAmount = await (0, getAllowance_js_1.getAllowance)(walletClient, token.address, walletClient.account.address, spenderAddress);
|
|
64
64
|
if (approvedAmount > 0) {
|
|
65
65
|
const approveTx = await (0, exports.setAllowance)(walletClient, token.address, spenderAddress, 0n);
|
|
66
66
|
return approveTx;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setAllowance.js","sourceRoot":"","sources":["../../../core/EVM/setAllowance.ts"],"names":[],"mappings":";;;AACA,+BAAyC;AACzC,0CAA8C;AAC9C,sCAAsC;AACtC,mEAAmE;AAEnE,qCAAqC;AACrC,uDAAgD;AAEhD,yCAAoD;AAE7C,MAAM,YAAY,GAAG,KAAK,EAC/B,MAAc,EACd,YAAqB,EACrB,eAAwB,EACxB,MAAc,EACd,gBAAmC,EACnC,0BAAoC,EACrB,EAAE;IACjB,MAAM,IAAI,GAAG,IAAA,yBAAkB,EAAC;QAC9B,GAAG,EAAE,mBAAU;QACf,YAAY,EAAE,SAAS;QACvB,IAAI,EAAE,CAAC,eAAe,EAAE,MAAM,CAAC;KAChC,CAAC,CAAA;IAEF,IAAI,0BAA0B,EAAE,CAAC;QAC/B,OAAO,IAAI,CAAA;IACb,CAAC;IAED,IAAI,kBAAkB,GAA0B;QAC9C,EAAE,EAAE,YAAY;QAChB,IAAI;QACJ,oBAAoB,EAClB,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,OAAO;YAC9B,CAAC,CAAC,MAAM,IAAA,kCAAuB,EAAC,MAAM,CAAC;YACvC,CAAC,CAAC,SAAS;KAChB,CAAA;IAED,IAAI,gBAAgB,EAAE,4BAA4B,EAAE,CAAC;QACnD,MAAM,4BAA4B,GAChC,MAAM,gBAAgB,CAAC,4BAA4B,CAAC;YAClD,WAAW,EAAE,SAAS;YACtB,GAAG,kBAAkB;SACtB,CAAC,CAAA;QAEJ,kBAAkB,GAAG;YACnB,GAAG,kBAAkB;YACrB,GAAG,4BAA4B;SAChC,CAAA;IACH,CAAC;IAED,OAAO,IAAA,iBAAS,EACd,MAAM,EACN,yBAAe,EACf,iBAAiB,CAClB,CAAC;QACA,EAAE,EAAE,kBAAkB,CAAC,EAAE;QACzB,OAAO,EAAE,MAAM,CAAC,OAAQ;QACxB,IAAI,EAAE,kBAAkB,CAAC,IAAI;QAC7B,GAAG,EAAE,kBAAkB,CAAC,GAAG;QAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;QACrC,YAAY,EAAE,kBAAkB,CAAC,YAAY;QAC7C,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;KACjC,CAAC,CAAA;AACjC,CAAC,CAAA;AArDY,QAAA,YAAY,gBAqDxB;AAWM,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,YAAY,EACZ,KAAK,EACL,cAAc,EACd,MAAM,GACc,EAAwB,EAAE;IAE9C,IAAI,IAAA,uCAAoB,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;QACxC,OAAM;IACR,CAAC;IACD,MAAM,cAAc,GAAG,MAAM,IAAA,8BAAY,EACvC,
|
|
1
|
+
{"version":3,"file":"setAllowance.js","sourceRoot":"","sources":["../../../core/EVM/setAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ exports.isExtendedChain = isExtendedChain;
|
|
|
5
5
|
const actions_1 = require("viem/actions");
|
|
6
6
|
const config_js_1 = require("../../config.js");
|
|
7
7
|
const median_js_1 = require("../../utils/median.js");
|
|
8
|
+
const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
8
9
|
const convertExtendedChain = (chain) => ({
|
|
9
10
|
...chain,
|
|
10
11
|
...chain.metamask,
|
|
@@ -41,7 +42,7 @@ function isExtendedChain(chain) {
|
|
|
41
42
|
chain.nativeToken !== null);
|
|
42
43
|
}
|
|
43
44
|
const getMaxPriorityFeePerGas = async (client) => {
|
|
44
|
-
const block = await (0,
|
|
45
|
+
const block = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.getBlock, 'getBlock', {
|
|
45
46
|
includeTransactions: true,
|
|
46
47
|
});
|
|
47
48
|
const maxPriorityFeePerGasList = block.transactions
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../core/EVM/utils.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../core/EVM/utils.ts"],"names":[],"mappings":"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"}
|