@lifi/sdk 3.15.2 → 3.15.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 +1 -1
- package/src/_cjs/core/EVM/EVMStepExecutor.js +10 -9
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +4 -1
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/typeguards.js +2 -1
- package/src/_cjs/core/EVM/typeguards.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +11 -10
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +4 -1
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/typeguards.js +2 -1
- package/src/_esm/core/EVM/typeguards.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/typeguards.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +13 -12
- package/src/core/EVM/checkAllowance.ts +4 -1
- package/src/core/EVM/typeguards.ts +2 -1
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -255,11 +255,10 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
255
255
|
isRelayerTransaction: (0, typeguards_js_1.isRelayerStep)(updatedStep),
|
|
256
256
|
};
|
|
257
257
|
};
|
|
258
|
-
estimateTransactionRequest = async (
|
|
259
|
-
transactionRequest.to = fromChain.permit2Proxy;
|
|
258
|
+
estimateTransactionRequest = async (client, transactionRequest) => {
|
|
260
259
|
try {
|
|
261
|
-
const estimatedGas = await (0, getActionWithFallback_js_1.getActionWithFallback)(
|
|
262
|
-
account:
|
|
260
|
+
const estimatedGas = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.estimateGas, 'estimateGas', {
|
|
261
|
+
account: client.account,
|
|
263
262
|
to: transactionRequest.to,
|
|
264
263
|
data: transactionRequest.data,
|
|
265
264
|
value: transactionRequest.value,
|
|
@@ -308,7 +307,8 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
308
307
|
!isFromNativeToken &&
|
|
309
308
|
!disableMessageSigning &&
|
|
310
309
|
!!step.estimate.approvalAddress &&
|
|
311
|
-
!step.estimate.skipApproval
|
|
310
|
+
!step.estimate.skipApproval &&
|
|
311
|
+
!step.estimate.skipPermit;
|
|
312
312
|
const checkForAllowance = !existingProcess?.txHash &&
|
|
313
313
|
!existingProcess?.taskId &&
|
|
314
314
|
!isFromNativeToken &&
|
|
@@ -456,7 +456,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
456
456
|
else if (permit2Supported) {
|
|
457
457
|
this.statusManager.updateProcess(step, process.type, 'MESSAGE_REQUIRED');
|
|
458
458
|
const permit2Signature = await (0, signPermit2Message_js_1.signPermit2Message)({
|
|
459
|
-
client:
|
|
459
|
+
client: updatedClient,
|
|
460
460
|
chain: fromChain,
|
|
461
461
|
tokenAddress: step.action.fromToken.address,
|
|
462
462
|
amount: BigInt(step.action.fromAmount),
|
|
@@ -466,11 +466,12 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
466
466
|
this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
467
467
|
}
|
|
468
468
|
if (signedNativePermitTypedData || permit2Supported) {
|
|
469
|
-
transactionRequest =
|
|
469
|
+
transactionRequest.to = fromChain.permit2Proxy;
|
|
470
|
+
transactionRequest = await this.estimateTransactionRequest(updatedClient, transactionRequest);
|
|
470
471
|
}
|
|
471
|
-
txHash = await (0, utils_1.getAction)(
|
|
472
|
+
txHash = await (0, utils_1.getAction)(updatedClient, actions_1.sendTransaction, 'sendTransaction')({
|
|
472
473
|
to: transactionRequest.to,
|
|
473
|
-
account:
|
|
474
|
+
account: updatedClient.account,
|
|
474
475
|
data: transactionRequest.data,
|
|
475
476
|
value: transactionRequest.value,
|
|
476
477
|
gas: transactionRequest.gas,
|
|
@@ -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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"}
|
|
@@ -88,7 +88,10 @@ const checkAllowance = async ({ checkClient, chain, step, statusManager, executi
|
|
|
88
88
|
statusManager.updateProcess(step, sharedProcess.type, 'DONE');
|
|
89
89
|
return { status: 'DONE', data: signedTypedData };
|
|
90
90
|
}
|
|
91
|
-
const isNativePermitAvailable = !!chain.permit2Proxy &&
|
|
91
|
+
const isNativePermitAvailable = !!chain.permit2Proxy &&
|
|
92
|
+
!batchingSupported &&
|
|
93
|
+
!disableMessageSigning &&
|
|
94
|
+
!step.estimate.skipPermit;
|
|
92
95
|
let nativePermitData;
|
|
93
96
|
if (isNativePermitAvailable) {
|
|
94
97
|
nativePermitData = await (0, getActionWithFallback_js_1.getActionWithFallback)(updatedClient, getNativePermit_js_1.getNativePermit, 'getNativePermit', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":";;;AAEA,0CAA4C;AAC5C,sCAAsC;AACtC,qDAA+C;AAQ/C,yEAAkE;AAClE,uDAAgD;AAChD,2DAAoD;AACpD,qEAA8D;AAC9D,6EAAsE;AAEtE,uDAAgD;AAEhD,yCAA6C;AAC7C,iFAA0E;AA+BnE,MAAM,cAAc,GAAG,KAAK,EAAE,EACnC,WAAW,EACX,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;IACnD,IAAI,aAAkC,CAAA;IACtC,IAAI,eAAe,GAAsB,EAAE,CAAA;IAC3C,IAAI,CAAC;QAEH,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,EAAE,MAAM,CAC5C,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,WAAW,KAAK,QAAQ,CAClD,CAAA;QACD,IAAI,CAAC,qBAAqB,IAAI,eAAe,EAAE,MAAM,EAAE,CAAC;YACtD,aAAa,GAAG,aAAa,CAAC,mBAAmB,CAAC;gBAChD,IAAI;gBACJ,IAAI,EAAE,QAAQ;gBACd,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;aACjC,CAAC,CAAA;YACF,eAAe,GAAG,aAAa,CAAC,eAAe,IAAI,eAAe,CAAA;YAClE,KAAK,MAAM,SAAS,IAAI,eAAe,EAAE,CAAC;gBAExC,MAAM,uBAAuB,GAAG,eAAe,CAAC,IAAI,CAClD,CAAC,eAAe,EAAE,EAAE,CAAC,IAAA,4CAAmB,EAAC,eAAe,EAAE,SAAS,CAAC,CACrE,CAAA;gBAED,IAAI,uBAAuB,EAAE,CAAC;oBAE5B,SAAQ;gBACV,CAAC;gBAED,aAAa,GAAG,aAAa,CAAC,aAAa,CACzC,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,iBAAiB,CAClB,CAAA;gBACD,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC1B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;gBACtC,CAAC;gBAED,MAAM,gBAAgB,GACpB,IAAA,2BAAgB,EAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,MAAM,CAAC,WAAW,CAAA;gBAE/D,MAAM,YAAY,GAAG,MAAM,WAAW,CACpC,IAAI,EACJ,aAAa,EACb,gBAAgB,CACjB,CAAA;gBACD,IAAI,CAAC,YAAY,EAAE,CAAC;oBAClB,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;gBACtC,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,IAAA,iBAAS,EAC/B,YAAY,EACZ,uBAAa,EACb,eAAe,CAChB,CAAC;oBACA,OAAO,EAAE,YAAY,CAAC,OAAQ;oBAC9B,MAAM,EAAE,SAAS,CAAC,MAAM;oBACxB,KAAK,EAAE,SAAS,CAAC,KAAK;oBACtB,WAAW,EAAE,SAAS,CAAC,WAAW;oBAClC,OAAO,EAAE,SAAS,CAAC,OAAO;iBAC3B,CAAC,CAAA;gBACF,MAAM,YAAY,GAAoB;oBACpC,GAAG,SAAS;oBACZ,SAAS;iBACV,CAAA;gBACD,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gBAClC,aAAa,GAAG,aAAa,CAAC,aAAa,CACzC,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,iBAAiB,EACjB;oBACE,eAAe;iBAChB,CACF,CAAA;YACH,CAAC;YAED,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE;gBAC5D,eAAe;aAChB,CAAC,CAAA;YAEF,MAAM,cAAc,GAAG,eAAe,CAAC,IAAI,CACzC,CAAC,eAAe,EAAE,EAAE,CAClB,IAAA,2BAAgB,EAAC,eAAe,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,CACvE,CAAA;YACD,IAAI,cAAc,EAAE,CAAC;gBACnB,OAAO;oBACL,MAAM,EAAE,eAAe;oBACvB,IAAI,EAAE,eAAe;iBACtB,CAAA;YACH,CAAC;QACH,CAAC;QAGD,aAAa,GAAG,aAAa,CAAC,mBAAmB,CAAC;YAChD,IAAI;YACJ,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;SACjC,CAAC,CAAA;QAEF,MAAM,aAAa,GAAG,MAAM,WAAW,CAAC,IAAI,EAAE,aAAa,CAAC,CAAA;QAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;QACtC,CAAC;QAGD,IAAI,aAAa,CAAC,MAAM,IAAI,aAAa,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;YAC5D,MAAM,0BAA0B,CAC9B,aAAa,EACb,aAAa,CAAC,MAAiB,EAC/B,aAAa,CAAC,IAAI,EAClB,IAAI,EACJ,KAAK,EACL,aAAa,CACd,CAAA;YACD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;QAClD,CAAC;QAGD,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAEhE,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,aAAa,EACb,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,EACxC,aAAa,CAAC,OAAQ,CAAC,OAAO,EAC9B,cAAyB,CAC1B,CAAA;QAGD,IAAI,UAAU,IAAI,QAAQ,EAAE,CAAC;YAC3B,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAC7D,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;QAClD,CAAC;QAGD,MAAM,uBAAuB,GAC3B,CAAC,CAAC,KAAK,CAAC,YAAY;YACpB,CAAC,iBAAiB;YAClB,CAAC,qBAAqB;YACtB,CAAC,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAA;QAE3B,IAAI,gBAA8C,CAAA;QAClD,IAAI,uBAAuB,EAAE,CAAC;YAC5B,gBAAgB,GAAG,MAAM,IAAA,gDAAqB,EAC5C,aAAa,EACb,oCAAe,EACf,iBAAiB,EACjB;gBACE,OAAO,EAAE,KAAK,CAAC,EAAE;gBACjB,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;gBACtD,cAAc,EAAE,KAAK,CAAC,YAAuB;gBAC7C,MAAM,EAAE,UAAU;aACnB,CACF,CAAA;QACH,CAAC;QAED,IAAI,uBAAuB,IAAI,gBAAgB,EAAE,CAAC;YAChD,eAAe,GAAG,eAAe,CAAC,MAAM;gBACtC,CAAC,CAAC,eAAe;gBACjB,CAAC,CAAC,aAAa,CAAC,eAAe,IAAI,EAAE,CAAA;YAEvC,MAAM,uBAAuB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC,eAAe,EAAE,EAAE,CACvE,IAAA,4CAAmB,EAAC,eAAe,EAAE,gBAAgB,CAAC,CACvD,CAAA;YAED,IAAI,CAAC,uBAAuB,EAAE,CAAC;gBAC7B,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;gBAExE,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC1B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;gBACtC,CAAC;gBAGD,MAAM,SAAS,GAAG,MAAM,IAAA,iBAAS,EAC/B,aAAa,EACb,uBAAa,EACb,eAAe,CAChB,CAAC;oBACA,OAAO,EAAE,aAAa,CAAC,OAAQ;oBAC/B,MAAM,EAAE,gBAAgB,CAAC,MAAM;oBAC/B,KAAK,EAAE,gBAAgB,CAAC,KAAK;oBAC7B,WAAW,EAAE,gBAAgB,CAAC,WAAW;oBACzC,OAAO,EAAE,gBAAgB,CAAC,OAAO;iBAClC,CAAC,CAAA;gBAGF,MAAM,YAAY,GAAoB;oBACpC,GAAG,gBAAgB;oBACnB,SAAS;iBACV,CAAA;gBACD,eAAe,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;YACpC,CAAC;YAED,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE;gBAC5D,eAAe;aAChB,CAAC,CAAA;YACF,OAAO;gBACL,MAAM,EAAE,eAAe;gBACvB,IAAI,EAAE,eAAe;aACtB,CAAA;QACH,CAAC;QAED,MAAM,mBAAmB,GAAG,IAAI,CAAC,QAAQ,CAAC,aAAa,IAAI,QAAQ,GAAG,EAAE,CAAA;QACxE,MAAM,mBAAmB,GAAG,mBAAmB;YAC7C,CAAC,CAAC,gBAAgB;YAClB,CAAC,CAAC,iBAAiB,CAAA;QAGrB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,mBAAmB,EAAE;YACzE,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS;SAClB,CAAC,CAAA;QAEF,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC1B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;QACtC,CAAC;QAGD,IAAI,mBAAqC,CAAA;QACzC,IAAI,mBAAmB,EAAE,CAAC;YACxB,mBAAmB,GAAG,MAAM,IAAA,8BAAY,EACtC,aAAa,EACb,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,EACxC,cAAyB,EACzB,EAAE,EACF,gBAAgB,EAChB,iBAAiB,CAClB,CAAA;YAGD,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,MAAM,0BAA0B,CAC9B,aAAa,EACb,mBAAmB,EACnB,aAAa,CAAC,IAAI,EAClB,IAAI,EACJ,KAAK,EACL,aAAa,CACd,CAAA;gBAED,aAAa,CAAC,aAAa,CACzB,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,iBAAiB,EACjB;oBACE,MAAM,EAAE,SAAS;oBACjB,MAAM,EAAE,SAAS;iBAClB,CACF,CAAA;gBAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;oBAC1B,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,CAAA;gBACtC,CAAC;YACH,CAAC;QACH,CAAC;QAGD,MAAM,aAAa,GAAG,gBAAgB,CAAC,CAAC,CAAC,yBAAU,CAAC,CAAC,CAAC,UAAU,CAAA;QAChE,MAAM,aAAa,GAAG,MAAM,IAAA,8BAAY,EACtC,aAAa,EACb,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,EACxC,cAAyB,EACzB,aAAa,EACb,gBAAgB,EAGhB,iBAAiB,CAClB,CAAA;QAID,IAAI,iBAAiB,EAAE,CAAC;YACtB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;YAC7D,MAAM,KAAK,GAAW,EAAE,CAAA;YAGxB,IAAI,mBAAmB,IAAI,mBAAmB,EAAE,CAAC;gBAC/C,KAAK,CAAC,IAAI,CAAC;oBACT,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;oBAC5C,IAAI,EAAE,mBAAmB;oBACzB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;iBACvC,CAAC,CAAA;YACJ,CAAC;YAGD,KAAK,CAAC,IAAI,CAAC;gBACT,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;gBAC5C,IAAI,EAAE,aAAa;gBACnB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;aACvC,CAAC,CAAA;YAEF,OAAO;gBACL,MAAM,EAAE,gBAAgB;gBACxB,IAAI,EAAE;oBACJ,KAAK;oBACL,eAAe;iBAChB;aACF,CAAA;QACH,CAAC;QAED,MAAM,0BAA0B,CAC9B,aAAa,EACb,aAAa,EACb,aAAa,CAAC,IAAI,EAClB,IAAI,EACJ,KAAK,EACL,aAAa,CACd,CAAA;QAED,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,eAAe,EAAE,CAAA;IAClD,CAAC;IAAC,OAAO,CAAM,EAAE,CAAC;QAChB,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,aAAa,GAAG,aAAa,CAAC,mBAAmB,CAAC;gBAChD,IAAI;gBACJ,IAAI,EAAE,iBAAiB;gBACvB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,WAAW;aACjC,CAAC,CAAA;QACJ,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,IAAA,kCAAc,EAAC,CAAC,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAC1D,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;YAC9D,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;gBAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;aACjB;SACF,CAAC,CAAA;QACF,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7C,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AApVY,QAAA,cAAc,kBAoV1B;AAED,MAAM,0BAA0B,GAAG,KAAK,EACtC,MAAc,EACd,MAAY,EACZ,WAAwB,EACxB,IAAc,EACd,KAAoB,EACpB,aAA4B,EAC5B,gBAAyB,KAAK,EAC9B,EAAE;IACF,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAA;IAC3D,MAAM,SAAS,GAAG,CAAC,IAAU,EAAE,EAAE,CAAC,GAAG,eAAe,MAAM,IAAI,EAAE,CAAA;IAEhE,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE;QACxD,MAAM;QACN,MAAM,EAAE,SAAS,CAAC,MAAM,CAAC;KAC1B,CAAC,CAAA;IAEF,MAAM,kBAAkB,GAAG,MAAM,IAAA,wDAAyB,EAAC;QACzD,MAAM;QACN,OAAO,EAAE,KAAK,CAAC,EAAE;QACjB,MAAM;QACN,UAAU,CAAC,QAAQ;YACjB,MAAM,OAAO,GAAG,QAAQ,CAAC,WAAW,CAAC,IAAI,CAAA;YACzC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,SAAS,EAAE;gBACxD,MAAM,EAAE,OAAO;gBACf,MAAM,EAAE,SAAS,CAAC,OAAO,CAAC;aAC3B,CAAC,CAAA;QACJ,CAAC;KACF,CAAC,CAAA;IAEF,MAAM,SAAS,GAAG,kBAAkB,EAAE,eAAe,IAAI,MAAM,CAAA;IAC/D,IAAI,CAAC,aAAa,EAAE,CAAC;QACnB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE;YACrD,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,SAAS,CAAC,SAAS,CAAC;SAC7B,CAAC,CAAA;IACJ,CAAC;AACH,CAAC,CAAA"}
|
|
@@ -8,7 +8,8 @@ function isRelayerStep(step) {
|
|
|
8
8
|
}
|
|
9
9
|
function isGaslessStep(step, chain) {
|
|
10
10
|
return (!!step.typedData?.some((p) => p.primaryType === 'PermitWitnessTransferFrom') ||
|
|
11
|
-
!!(chain &&
|
|
11
|
+
!!(chain?.permit2 &&
|
|
12
|
+
step.typedData?.some((p) => p.message.spender === chain.permit2)));
|
|
12
13
|
}
|
|
13
14
|
function isContractCallStep(step) {
|
|
14
15
|
return step.includedSteps.some((s) => s.type === 'custom');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":";;AAOA,sCAIC;AAED,
|
|
1
|
+
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":";;AAOA,sCAIC;AAED,sCAaC;AAED,gDAEC;AAvBD,SAAgB,aAAa,CAC3B,IAAiC;IAEjC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;AACtD,CAAC;AAED,SAAgB,aAAa,CAC3B,IAAiC,EACjC,KAAqB;IAErB,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,2BAA2B,CACrD;QACD,CAAC,CAAC,CACA,KAAK,EAAE,OAAO;YACd,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,CACjE,CACF,CAAA;AACH,CAAC;AAED,SAAgB,kBAAkB,CAAC,IAAiC;IAClE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;AAC5D,CAAC"}
|
package/src/_cjs/version.js
CHANGED
|
@@ -276,13 +276,11 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
276
276
|
isRelayerTransaction: isRelayerStep(updatedStep),
|
|
277
277
|
};
|
|
278
278
|
};
|
|
279
|
-
estimateTransactionRequest = async (
|
|
280
|
-
// Target address should be the Permit2 proxy contract in case of native permit or Permit2
|
|
281
|
-
transactionRequest.to = fromChain.permit2Proxy;
|
|
279
|
+
estimateTransactionRequest = async (client, transactionRequest) => {
|
|
282
280
|
try {
|
|
283
281
|
// Try to re-estimate the gas due to additional Permit data
|
|
284
|
-
const estimatedGas = await getActionWithFallback(
|
|
285
|
-
account:
|
|
282
|
+
const estimatedGas = await getActionWithFallback(client, estimateGas, 'estimateGas', {
|
|
283
|
+
account: client.account,
|
|
286
284
|
to: transactionRequest.to,
|
|
287
285
|
data: transactionRequest.data,
|
|
288
286
|
value: transactionRequest.value,
|
|
@@ -350,7 +348,8 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
350
348
|
!disableMessageSigning &&
|
|
351
349
|
// Approval address is not required for Permit2 per se, but we use it to skip allowance checks for direct transfers
|
|
352
350
|
!!step.estimate.approvalAddress &&
|
|
353
|
-
!step.estimate.skipApproval
|
|
351
|
+
!step.estimate.skipApproval &&
|
|
352
|
+
!step.estimate.skipPermit;
|
|
354
353
|
const checkForAllowance =
|
|
355
354
|
// No existing swap/bridge transaction is pending
|
|
356
355
|
!existingProcess?.txHash &&
|
|
@@ -510,7 +509,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
510
509
|
else if (permit2Supported) {
|
|
511
510
|
this.statusManager.updateProcess(step, process.type, 'MESSAGE_REQUIRED');
|
|
512
511
|
const permit2Signature = await signPermit2Message({
|
|
513
|
-
client:
|
|
512
|
+
client: updatedClient,
|
|
514
513
|
chain: fromChain,
|
|
515
514
|
tokenAddress: step.action.fromToken.address,
|
|
516
515
|
amount: BigInt(step.action.fromAmount),
|
|
@@ -520,11 +519,13 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
520
519
|
this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
521
520
|
}
|
|
522
521
|
if (signedNativePermitTypedData || permit2Supported) {
|
|
523
|
-
|
|
522
|
+
// Target address should be the Permit2 proxy contract in case of native permit or Permit2
|
|
523
|
+
transactionRequest.to = fromChain.permit2Proxy;
|
|
524
|
+
transactionRequest = await this.estimateTransactionRequest(updatedClient, transactionRequest);
|
|
524
525
|
}
|
|
525
|
-
txHash = await getAction(
|
|
526
|
+
txHash = await getAction(updatedClient, sendTransaction, 'sendTransaction')({
|
|
526
527
|
to: transactionRequest.to,
|
|
527
|
-
account:
|
|
528
|
+
account: updatedClient.account,
|
|
528
529
|
data: transactionRequest.data,
|
|
529
530
|
value: transactionRequest.value,
|
|
530
531
|
gas: transactionRequest.gas,
|
|
@@ -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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"}
|
|
@@ -95,7 +95,10 @@ export const checkAllowance = async ({ checkClient, chain, step, statusManager,
|
|
|
95
95
|
return { status: 'DONE', data: signedTypedData };
|
|
96
96
|
}
|
|
97
97
|
// Check if proxy contract is available and message signing is not disabled, also not available for atomic batch
|
|
98
|
-
const isNativePermitAvailable = !!chain.permit2Proxy &&
|
|
98
|
+
const isNativePermitAvailable = !!chain.permit2Proxy &&
|
|
99
|
+
!batchingSupported &&
|
|
100
|
+
!disableMessageSigning &&
|
|
101
|
+
!step.estimate.skipPermit;
|
|
99
102
|
let nativePermitData;
|
|
100
103
|
if (isNativePermitAvailable) {
|
|
101
104
|
nativePermitData = await getActionWithFallback(updatedClient, getNativePermit, 'getNativePermit', {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,8 @@ export function isRelayerStep(step) {
|
|
|
3
3
|
}
|
|
4
4
|
export function isGaslessStep(step, chain) {
|
|
5
5
|
return (!!step.typedData?.some((p) => p.primaryType === 'PermitWitnessTransferFrom') ||
|
|
6
|
-
!!(chain &&
|
|
6
|
+
!!(chain?.permit2 &&
|
|
7
|
+
step.typedData?.some((p) => p.message.spender === chain.permit2)));
|
|
7
8
|
}
|
|
8
9
|
export function isContractCallStep(step) {
|
|
9
10
|
return step.includedSteps.some((s) => s.type === 'custom');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,aAAa,CAC3B,IAAiC;IAEjC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAAiC,EACjC,KAAqB;IAErB,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,2BAA2B,CACrD;QACD,CAAC,CAAC,CACA,KAAK,
|
|
1
|
+
{"version":3,"file":"typeguards.js","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,aAAa,CAC3B,IAAiC;IAEjC,OAAO,CAAC,CAAC,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAA;AACtD,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,IAAiC,EACjC,KAAqB;IAErB,OAAO,CACL,CAAC,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,CACpB,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,WAAW,KAAK,2BAA2B,CACrD;QACD,CAAC,CAAC,CACA,KAAK,EAAE,OAAO;YACd,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,KAAK,KAAK,CAAC,OAAO,CAAC,CACjE,CACF,CAAA;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,IAAiC;IAClE,OAAO,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,QAAQ,CAAC,CAAA;AAC5D,CAAC"}
|
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,EAMP,MAAM,MAAM,CAAA;AAsBb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACP,mBAAmB,EAGpB,MAAM,aAAa,CAAA;AA6BpB,UAAU,sBAAuB,SAAQ,mBAAmB;IAC1D,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,sBAAsB;IAM3C,WAAW,GACT,MAAM,gBAAgB,EACtB,SAAS,OAAO,EAChB,gBAAgB,MAAM,iCA+CvB;IAED,kBAAkB,GAAU,2DAMzB;QACD,IAAI,EAAE,gBAAgB,CAAA;QACtB,OAAO,EAAE,OAAO,CAAA;QAChB,SAAS,EAAE,aAAa,CAAA;QACxB,OAAO,EAAE,aAAa,CAAA;QACtB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,mBAkFA;IAED,OAAO,CAAC,kBAAkB,CA2MzB;IAED,OAAO,CAAC,0BAA0B,
|
|
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,EAMP,MAAM,MAAM,CAAA;AAsBb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,OAAO,EACP,mBAAmB,EAGpB,MAAM,aAAa,CAAA;AA6BpB,UAAU,sBAAuB,SAAQ,mBAAmB;IAC1D,MAAM,EAAE,MAAM,CAAA;CACf;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,MAAM,CAAQ;gBAEV,OAAO,EAAE,sBAAsB;IAM3C,WAAW,GACT,MAAM,gBAAgB,EACtB,SAAS,OAAO,EAChB,gBAAgB,MAAM,iCA+CvB;IAED,kBAAkB,GAAU,2DAMzB;QACD,IAAI,EAAE,gBAAgB,CAAA;QACtB,OAAO,EAAE,OAAO,CAAA;QAChB,SAAS,EAAE,aAAa,CAAA;QACxB,OAAO,EAAE,aAAa,CAAA;QACtB,iBAAiB,EAAE,OAAO,CAAA;KAC3B,mBAkFA;IAED,OAAO,CAAC,kBAAkB,CA2MzB;IAED,OAAO,CAAC,0BAA0B,CA6BjC;IAED,WAAW,GACT,MAAM,gBAAgB,EAEtB,2BAAyB,KACxB,OAAO,CAAC,gBAAgB,CAAC,CA0Y3B;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.d.ts","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC3E,OAAO,KAAK,EAAW,MAAM,EAAQ,MAAM,MAAM,CAAA;AAIjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EAER,MAAM,aAAa,CAAA;AAQpB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,KAAK,oBAAoB,GAAG;IAC1B,WAAW,CACT,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC9B,KAAK,EAAE,aAAa,CAAA;IACpB,IAAI,EAAE,QAAQ,CAAA;IACd,aAAa,EAAE,aAAa,CAAA;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,KAAK,eAAe,GAChB;IACE,MAAM,EAAE,iBAAiB,CAAA;CAC1B,GACD;IACE,MAAM,EAAE,gBAAgB,CAAA;IACxB,IAAI,EAAE;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,eAAe,EAAE,eAAe,EAAE,CAAA;KAAE,CAAA;CAC5D,GACD;IACE,MAAM,EAAE,eAAe,GAAG,MAAM,CAAA;IAChC,IAAI,EAAE,eAAe,EAAE,CAAA;CACxB,CAAA;AAEL,eAAO,MAAM,cAAc,GAAU,kJAUlC,oBAAoB,KAAG,OAAO,CAAC,eAAe,
|
|
1
|
+
{"version":3,"file":"checkAllowance.d.ts","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAC3E,OAAO,KAAK,EAAW,MAAM,EAAQ,MAAM,MAAM,CAAA;AAIjD,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EACV,gBAAgB,EAChB,gBAAgB,EAChB,OAAO,EAER,MAAM,aAAa,CAAA;AAQpB,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,YAAY,CAAA;AAItC,KAAK,oBAAoB,GAAG;IAC1B,WAAW,CACT,IAAI,EAAE,gBAAgB,EACtB,OAAO,EAAE,OAAO,EAChB,aAAa,CAAC,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAA;IAC9B,KAAK,EAAE,aAAa,CAAA;IACpB,IAAI,EAAE,QAAQ,CAAA;IACd,aAAa,EAAE,aAAa,CAAA;IAC5B,gBAAgB,CAAC,EAAE,gBAAgB,CAAA;IACnC,oBAAoB,CAAC,EAAE,OAAO,CAAA;IAC9B,iBAAiB,CAAC,EAAE,OAAO,CAAA;IAC3B,gBAAgB,CAAC,EAAE,OAAO,CAAA;IAC1B,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,KAAK,eAAe,GAChB;IACE,MAAM,EAAE,iBAAiB,CAAA;CAC1B,GACD;IACE,MAAM,EAAE,gBAAgB,CAAA;IACxB,IAAI,EAAE;QAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAAC,eAAe,EAAE,eAAe,EAAE,CAAA;KAAE,CAAA;CAC5D,GACD;IACE,MAAM,EAAE,eAAe,GAAG,MAAM,CAAA;IAChC,IAAI,EAAE,eAAe,EAAE,CAAA;CACxB,CAAA;AAEL,eAAO,MAAM,cAAc,GAAU,kJAUlC,oBAAoB,KAAG,OAAO,CAAC,eAAe,CA0UhD,CAAA"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typeguards.d.ts","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,KAAK,WAAW,GAAG,CAAC,gBAAgB,GAAG,QAAQ,CAAC,GAAG;IACjD,SAAS,EAAE,WAAW,CAAC,CAAC,gBAAgB,GAAG,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;CACnE,CAAA;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,gBAAgB,GAAG,QAAQ,GAChC,IAAI,IAAI,WAAW,CAErB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,gBAAgB,GAAG,QAAQ,EACjC,KAAK,CAAC,EAAE,aAAa,GACpB,IAAI,IAAI,WAAW,
|
|
1
|
+
{"version":3,"file":"typeguards.d.ts","sourceRoot":"","sources":["../../../core/EVM/typeguards.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,aAAa,CAAA;AAC1D,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAEnD,KAAK,WAAW,GAAG,CAAC,gBAAgB,GAAG,QAAQ,CAAC,GAAG;IACjD,SAAS,EAAE,WAAW,CAAC,CAAC,gBAAgB,GAAG,QAAQ,CAAC,CAAC,WAAW,CAAC,CAAC,CAAA;CACnE,CAAA;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,gBAAgB,GAAG,QAAQ,GAChC,IAAI,IAAI,WAAW,CAErB;AAED,wBAAgB,aAAa,CAC3B,IAAI,EAAE,gBAAgB,GAAG,QAAQ,EACjC,KAAK,CAAC,EAAE,aAAa,GACpB,IAAI,IAAI,WAAW,CAUrB;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,GAAG,QAAQ,GAAG,OAAO,CAE7E"}
|
package/src/_types/version.d.ts
CHANGED
|
@@ -434,19 +434,17 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
434
434
|
}
|
|
435
435
|
|
|
436
436
|
private estimateTransactionRequest = async (
|
|
437
|
-
|
|
438
|
-
|
|
437
|
+
client: Client,
|
|
438
|
+
transactionRequest: TransactionParameters
|
|
439
439
|
) => {
|
|
440
|
-
// Target address should be the Permit2 proxy contract in case of native permit or Permit2
|
|
441
|
-
transactionRequest.to = fromChain.permit2Proxy
|
|
442
440
|
try {
|
|
443
441
|
// Try to re-estimate the gas due to additional Permit data
|
|
444
442
|
const estimatedGas = await getActionWithFallback(
|
|
445
|
-
|
|
443
|
+
client,
|
|
446
444
|
estimateGas,
|
|
447
445
|
'estimateGas',
|
|
448
446
|
{
|
|
449
|
-
account:
|
|
447
|
+
account: client.account!,
|
|
450
448
|
to: transactionRequest.to as Address,
|
|
451
449
|
data: transactionRequest.data as Hex,
|
|
452
450
|
value: transactionRequest.value,
|
|
@@ -541,7 +539,8 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
541
539
|
!disableMessageSigning &&
|
|
542
540
|
// Approval address is not required for Permit2 per se, but we use it to skip allowance checks for direct transfers
|
|
543
541
|
!!step.estimate.approvalAddress &&
|
|
544
|
-
!step.estimate.skipApproval
|
|
542
|
+
!step.estimate.skipApproval &&
|
|
543
|
+
!step.estimate.skipPermit
|
|
545
544
|
|
|
546
545
|
const checkForAllowance =
|
|
547
546
|
// No existing swap/bridge transaction is pending
|
|
@@ -768,7 +767,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
768
767
|
'MESSAGE_REQUIRED'
|
|
769
768
|
)
|
|
770
769
|
const permit2Signature = await signPermit2Message({
|
|
771
|
-
client:
|
|
770
|
+
client: updatedClient,
|
|
772
771
|
chain: fromChain,
|
|
773
772
|
tokenAddress: step.action.fromToken.address as Address,
|
|
774
773
|
amount: BigInt(step.action.fromAmount),
|
|
@@ -790,19 +789,21 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
790
789
|
}
|
|
791
790
|
|
|
792
791
|
if (signedNativePermitTypedData || permit2Supported) {
|
|
792
|
+
// Target address should be the Permit2 proxy contract in case of native permit or Permit2
|
|
793
|
+
transactionRequest.to = fromChain.permit2Proxy as Address
|
|
793
794
|
transactionRequest = await this.estimateTransactionRequest(
|
|
794
|
-
|
|
795
|
-
|
|
795
|
+
updatedClient,
|
|
796
|
+
transactionRequest
|
|
796
797
|
)
|
|
797
798
|
}
|
|
798
799
|
|
|
799
800
|
txHash = await getAction(
|
|
800
|
-
|
|
801
|
+
updatedClient,
|
|
801
802
|
sendTransaction,
|
|
802
803
|
'sendTransaction'
|
|
803
804
|
)({
|
|
804
805
|
to: transactionRequest.to as Address,
|
|
805
|
-
account:
|
|
806
|
+
account: updatedClient.account!,
|
|
806
807
|
data: transactionRequest.data as Hex,
|
|
807
808
|
value: transactionRequest.value,
|
|
808
809
|
gas: transactionRequest.gas,
|
|
@@ -198,7 +198,10 @@ export const checkAllowance = async ({
|
|
|
198
198
|
|
|
199
199
|
// Check if proxy contract is available and message signing is not disabled, also not available for atomic batch
|
|
200
200
|
const isNativePermitAvailable =
|
|
201
|
-
!!chain.permit2Proxy &&
|
|
201
|
+
!!chain.permit2Proxy &&
|
|
202
|
+
!batchingSupported &&
|
|
203
|
+
!disableMessageSigning &&
|
|
204
|
+
!step.estimate.skipPermit
|
|
202
205
|
|
|
203
206
|
let nativePermitData: NativePermitData | undefined
|
|
204
207
|
if (isNativePermitAvailable) {
|
|
@@ -20,7 +20,8 @@ export function isGaslessStep(
|
|
|
20
20
|
(p) => p.primaryType === 'PermitWitnessTransferFrom'
|
|
21
21
|
) ||
|
|
22
22
|
!!(
|
|
23
|
-
chain &&
|
|
23
|
+
chain?.permit2 &&
|
|
24
|
+
step.typedData?.some((p) => p.message.spender === chain.permit2)
|
|
24
25
|
)
|
|
25
26
|
)
|
|
26
27
|
}
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/sdk'
|
|
2
|
-
export const version = '3.15.
|
|
2
|
+
export const version = '3.15.3'
|