@lifi/sdk 3.10.0 → 3.11.0-beta.0
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 +122 -131
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/abi.js +1 -0
- package/src/_cjs/core/EVM/abi.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +126 -44
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/permits/getNativePermit.js +123 -16
- package/src/_cjs/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_cjs/core/EVM/permits/isNativePermitValid.js +34 -0
- package/src/_cjs/core/EVM/permits/isNativePermitValid.js.map +1 -0
- package/src/_cjs/core/EVM/switchChain.js +8 -14
- package/src/_cjs/core/EVM/switchChain.js.map +1 -1
- package/src/_cjs/core/EVM/utils.js +10 -1
- package/src/_cjs/core/EVM/utils.js.map +1 -1
- package/src/_cjs/core/execution.js +1 -1
- package/src/_cjs/core/execution.js.map +1 -1
- package/src/_cjs/core/prepareRestart.js +5 -2
- package/src/_cjs/core/prepareRestart.js.map +1 -1
- package/src/_cjs/core/processMessages.js +4 -8
- package/src/_cjs/core/processMessages.js.map +1 -1
- package/src/_cjs/index.js +2 -1
- package/src/_cjs/index.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_cjs/version.js.map +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +136 -148
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/abi.js +2 -0
- package/src/_esm/core/EVM/abi.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +141 -45
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/permits/getNativePermit.js +144 -21
- package/src/_esm/core/EVM/permits/getNativePermit.js.map +1 -1
- package/src/_esm/core/EVM/permits/isNativePermitValid.js +41 -0
- package/src/_esm/core/EVM/permits/isNativePermitValid.js.map +1 -0
- package/src/_esm/core/EVM/switchChain.js +8 -15
- package/src/_esm/core/EVM/switchChain.js.map +1 -1
- package/src/_esm/core/EVM/utils.js +12 -0
- package/src/_esm/core/EVM/utils.js.map +1 -1
- package/src/_esm/core/execution.js +1 -1
- package/src/_esm/core/execution.js.map +1 -1
- package/src/_esm/core/prepareRestart.js +6 -3
- package/src/_esm/core/prepareRestart.js.map +1 -1
- package/src/_esm/core/processMessages.js +4 -8
- package/src/_esm/core/processMessages.js.map +1 -1
- package/src/_esm/index.js +1 -1
- package/src/_esm/index.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_esm/version.js.map +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts +3 -2
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/abi.d.ts +20 -0
- package/src/_types/core/EVM/abi.d.ts.map +1 -1
- package/src/_types/core/EVM/checkAllowance.d.ts +10 -7
- package/src/_types/core/EVM/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/getNativePermit.d.ts +2 -2
- package/src/_types/core/EVM/permits/getNativePermit.d.ts.map +1 -1
- package/src/_types/core/EVM/permits/isNativePermitValid.d.ts +6 -0
- package/src/_types/core/EVM/permits/isNativePermitValid.d.ts.map +1 -0
- package/src/_types/core/EVM/switchChain.d.ts +2 -2
- package/src/_types/core/EVM/switchChain.d.ts.map +1 -1
- package/src/_types/core/EVM/utils.d.ts +6 -1
- package/src/_types/core/EVM/utils.d.ts.map +1 -1
- package/src/_types/core/prepareRestart.d.ts +1 -1
- package/src/_types/core/prepareRestart.d.ts.map +1 -1
- package/src/_types/core/processMessages.d.ts.map +1 -1
- package/src/_types/core/types.d.ts +2 -2
- package/src/_types/core/types.d.ts.map +1 -1
- package/src/_types/index.d.ts +1 -1
- package/src/_types/index.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/_types/version.d.ts.map +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +203 -197
- package/src/core/EVM/abi.ts +2 -0
- package/src/core/EVM/checkAllowance.ts +206 -63
- package/src/core/EVM/permits/getNativePermit.ts +189 -22
- package/src/core/EVM/permits/isNativePermitValid.ts +57 -0
- package/src/core/EVM/switchChain.ts +14 -22
- package/src/core/EVM/utils.ts +17 -1
- package/src/core/execution.ts +1 -1
- package/src/core/prepareRestart.ts +6 -3
- package/src/core/processMessages.ts +4 -8
- package/src/core/types.ts +1 -2
- package/src/index.ts +1 -0
- package/src/version.ts +1 -1
|
@@ -8,84 +8,166 @@ const getActionWithFallback_js_1 = require("./getActionWithFallback.js");
|
|
|
8
8
|
const getAllowance_js_1 = require("./getAllowance.js");
|
|
9
9
|
const parseEVMErrors_js_1 = require("./parseEVMErrors.js");
|
|
10
10
|
const getNativePermit_js_1 = require("./permits/getNativePermit.js");
|
|
11
|
+
const isNativePermitValid_js_1 = require("./permits/isNativePermitValid.js");
|
|
11
12
|
const setAllowance_js_1 = require("./setAllowance.js");
|
|
12
|
-
const typeguards_js_1 = require("./typeguards.js");
|
|
13
13
|
const waitForTransactionReceipt_js_1 = require("./waitForTransactionReceipt.js");
|
|
14
|
-
const checkAllowance = async ({
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
type: 'TOKEN_ALLOWANCE',
|
|
18
|
-
chainId: step.action.fromChainId,
|
|
19
|
-
});
|
|
14
|
+
const checkAllowance = async ({ checkClient, chain, step, statusManager, executionOptions, allowUserInteraction = false, batchingSupported = false, permit2Supported = false, disableMessageSigning = false, }) => {
|
|
15
|
+
let sharedProcess;
|
|
16
|
+
let signedTypedData = [];
|
|
20
17
|
try {
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
18
|
+
const permitTypedData = step.typedData?.filter((typedData) => typedData.primaryType === 'Permit');
|
|
19
|
+
if (!disableMessageSigning && permitTypedData?.length) {
|
|
20
|
+
sharedProcess = statusManager.findOrCreateProcess({
|
|
21
|
+
step,
|
|
22
|
+
type: 'PERMIT',
|
|
23
|
+
chainId: step.action.fromChainId,
|
|
24
|
+
});
|
|
25
|
+
signedTypedData = sharedProcess.signedTypedData ?? signedTypedData;
|
|
26
|
+
for (const typedData of permitTypedData) {
|
|
27
|
+
const permitChainId = typedData.domain.chainId;
|
|
28
|
+
const signedTypedDataForChain = signedTypedData.find((signedTypedData) => signedTypedData.domain.chainId === permitChainId);
|
|
29
|
+
const existingValidPermit = signedTypedDataForChain &&
|
|
30
|
+
(0, isNativePermitValid_js_1.isNativePermitValid)(signedTypedDataForChain, typedData);
|
|
31
|
+
if (existingValidPermit) {
|
|
32
|
+
continue;
|
|
33
|
+
}
|
|
34
|
+
sharedProcess = statusManager.updateProcess(step, sharedProcess.type, 'ACTION_REQUIRED');
|
|
35
|
+
if (!allowUserInteraction) {
|
|
36
|
+
return { status: 'ACTION_REQUIRED' };
|
|
37
|
+
}
|
|
38
|
+
const permitClient = await checkClient(step, sharedProcess, permitChainId);
|
|
39
|
+
if (!permitClient) {
|
|
40
|
+
return { status: 'ACTION_REQUIRED' };
|
|
41
|
+
}
|
|
42
|
+
const signature = await (0, utils_1.getAction)(permitClient, actions_1.signTypedData, 'signTypedData')({
|
|
43
|
+
account: permitClient.account,
|
|
44
|
+
domain: typedData.domain,
|
|
45
|
+
types: typedData.types,
|
|
46
|
+
primaryType: 'Permit',
|
|
47
|
+
message: typedData.message,
|
|
48
|
+
});
|
|
49
|
+
const signedPermit = {
|
|
50
|
+
...typedData,
|
|
51
|
+
signature,
|
|
52
|
+
};
|
|
53
|
+
signedTypedData.push(signedPermit);
|
|
54
|
+
sharedProcess = statusManager.updateProcess(step, sharedProcess.type, 'ACTION_REQUIRED', {
|
|
55
|
+
signedTypedData,
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
statusManager.updateProcess(step, sharedProcess.type, 'DONE', {
|
|
59
|
+
signedTypedData,
|
|
60
|
+
});
|
|
61
|
+
const matchingPermit = signedTypedData.find((signedTypedData) => signedTypedData.domain.chainId === chain.id);
|
|
62
|
+
if (matchingPermit) {
|
|
63
|
+
return {
|
|
64
|
+
status: 'NATIVE_PERMIT',
|
|
65
|
+
data: signedTypedData,
|
|
66
|
+
};
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
sharedProcess = statusManager.findOrCreateProcess({
|
|
70
|
+
step,
|
|
71
|
+
type: 'TOKEN_ALLOWANCE',
|
|
72
|
+
chainId: step.action.fromChainId,
|
|
73
|
+
});
|
|
74
|
+
const updatedClient = await checkClient(step, sharedProcess);
|
|
75
|
+
if (!updatedClient) {
|
|
76
|
+
return { status: 'ACTION_REQUIRED' };
|
|
77
|
+
}
|
|
78
|
+
if (sharedProcess.txHash && sharedProcess.status !== 'DONE') {
|
|
79
|
+
await waitForApprovalTransaction(updatedClient, sharedProcess.txHash, sharedProcess.type, step, chain, statusManager);
|
|
80
|
+
return { status: 'DONE', data: signedTypedData };
|
|
24
81
|
}
|
|
25
|
-
statusManager.updateProcess(step,
|
|
82
|
+
statusManager.updateProcess(step, sharedProcess.type, 'STARTED');
|
|
26
83
|
const spenderAddress = permit2Supported
|
|
27
84
|
? chain.permit2
|
|
28
85
|
: step.estimate.approvalAddress;
|
|
29
86
|
const fromAmount = BigInt(step.action.fromAmount);
|
|
30
|
-
const approved = await (0, getAllowance_js_1.getAllowance)(
|
|
87
|
+
const approved = await (0, getAllowance_js_1.getAllowance)(updatedClient, step.action.fromToken.address, updatedClient.account.address, spenderAddress);
|
|
31
88
|
if (fromAmount <= approved) {
|
|
32
|
-
statusManager.updateProcess(step,
|
|
33
|
-
return { status: 'DONE' };
|
|
89
|
+
statusManager.updateProcess(step, sharedProcess.type, 'DONE');
|
|
90
|
+
return { status: 'DONE', data: signedTypedData };
|
|
34
91
|
}
|
|
35
|
-
const isRelayerTransaction = (0, typeguards_js_1.isRelayerStep)(step);
|
|
36
92
|
const isNativePermitAvailable = !!chain.permit2Proxy && !batchingSupported && !disableMessageSigning;
|
|
37
93
|
let nativePermitData;
|
|
38
|
-
if (
|
|
39
|
-
nativePermitData =
|
|
40
|
-
}
|
|
41
|
-
else if (isNativePermitAvailable) {
|
|
42
|
-
nativePermitData = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, getNativePermit_js_1.getNativePermit, 'getNativePermit', {
|
|
94
|
+
if (isNativePermitAvailable) {
|
|
95
|
+
nativePermitData = await (0, getActionWithFallback_js_1.getActionWithFallback)(updatedClient, getNativePermit_js_1.getNativePermit, 'getNativePermit', {
|
|
43
96
|
chainId: chain.id,
|
|
44
97
|
tokenAddress: step.action.fromToken.address,
|
|
45
98
|
spenderAddress: chain.permit2Proxy,
|
|
46
99
|
amount: fromAmount,
|
|
47
100
|
});
|
|
48
101
|
}
|
|
49
|
-
statusManager.updateProcess(step, allowanceProcess.type, 'ACTION_REQUIRED');
|
|
50
|
-
if (!allowUserInteraction) {
|
|
51
|
-
return { status: 'ACTION_REQUIRED' };
|
|
52
|
-
}
|
|
53
102
|
if (isNativePermitAvailable && nativePermitData) {
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
103
|
+
signedTypedData = signedTypedData.length
|
|
104
|
+
? signedTypedData
|
|
105
|
+
: sharedProcess.signedTypedData || [];
|
|
106
|
+
const signedTypedDataForChain = signedTypedData.find((signedTypedData) => signedTypedData.domain.chainId === nativePermitData.domain.chainId);
|
|
107
|
+
const existingValidPermit = signedTypedDataForChain &&
|
|
108
|
+
(0, isNativePermitValid_js_1.isNativePermitValid)(signedTypedDataForChain, nativePermitData);
|
|
109
|
+
if (!existingValidPermit) {
|
|
110
|
+
statusManager.updateProcess(step, sharedProcess.type, 'ACTION_REQUIRED');
|
|
111
|
+
if (!allowUserInteraction) {
|
|
112
|
+
return { status: 'ACTION_REQUIRED' };
|
|
113
|
+
}
|
|
114
|
+
const signature = await (0, utils_1.getAction)(updatedClient, actions_1.signTypedData, 'signTypedData')({
|
|
115
|
+
account: updatedClient.account,
|
|
116
|
+
domain: nativePermitData.domain,
|
|
117
|
+
types: nativePermitData.types,
|
|
118
|
+
primaryType: 'Permit',
|
|
119
|
+
message: nativePermitData.message,
|
|
120
|
+
});
|
|
121
|
+
const signedPermit = {
|
|
122
|
+
...nativePermitData,
|
|
123
|
+
signature,
|
|
124
|
+
};
|
|
125
|
+
signedTypedData.push(signedPermit);
|
|
126
|
+
}
|
|
127
|
+
statusManager.updateProcess(step, sharedProcess.type, 'DONE', {
|
|
128
|
+
signedTypedData,
|
|
60
129
|
});
|
|
61
|
-
statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
|
|
62
130
|
return {
|
|
63
131
|
status: 'NATIVE_PERMIT',
|
|
64
|
-
data:
|
|
65
|
-
...nativePermitData,
|
|
66
|
-
signature,
|
|
67
|
-
},
|
|
132
|
+
data: signedTypedData,
|
|
68
133
|
};
|
|
69
134
|
}
|
|
135
|
+
statusManager.updateProcess(step, sharedProcess.type, 'ACTION_REQUIRED', {
|
|
136
|
+
txHash: undefined,
|
|
137
|
+
txLink: undefined,
|
|
138
|
+
});
|
|
139
|
+
if (!allowUserInteraction) {
|
|
140
|
+
return { status: 'ACTION_REQUIRED' };
|
|
141
|
+
}
|
|
70
142
|
const approveAmount = permit2Supported ? constants_js_1.MaxUint256 : fromAmount;
|
|
71
|
-
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(
|
|
143
|
+
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(updatedClient, step.action.fromToken.address, spenderAddress, approveAmount, executionOptions, batchingSupported);
|
|
72
144
|
if (batchingSupported) {
|
|
73
|
-
statusManager.updateProcess(step,
|
|
145
|
+
statusManager.updateProcess(step, sharedProcess.type, 'DONE');
|
|
74
146
|
return {
|
|
75
147
|
status: 'BATCH_APPROVAL',
|
|
76
148
|
data: {
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
149
|
+
call: {
|
|
150
|
+
to: step.action.fromToken.address,
|
|
151
|
+
data: approveTxHash,
|
|
152
|
+
chainId: step.action.fromToken.chainId,
|
|
153
|
+
},
|
|
154
|
+
signedTypedData,
|
|
80
155
|
},
|
|
81
156
|
};
|
|
82
157
|
}
|
|
83
|
-
await waitForApprovalTransaction(
|
|
84
|
-
return { status: 'DONE' };
|
|
158
|
+
await waitForApprovalTransaction(updatedClient, approveTxHash, sharedProcess.type, step, chain, statusManager);
|
|
159
|
+
return { status: 'DONE', data: signedTypedData };
|
|
85
160
|
}
|
|
86
161
|
catch (e) {
|
|
87
|
-
|
|
88
|
-
|
|
162
|
+
if (!sharedProcess) {
|
|
163
|
+
sharedProcess = statusManager.findOrCreateProcess({
|
|
164
|
+
step,
|
|
165
|
+
type: 'TOKEN_ALLOWANCE',
|
|
166
|
+
chainId: step.action.fromChainId,
|
|
167
|
+
});
|
|
168
|
+
}
|
|
169
|
+
const error = await (0, parseEVMErrors_js_1.parseEVMErrors)(e, step, sharedProcess);
|
|
170
|
+
statusManager.updateProcess(step, sharedProcess.type, 'FAILED', {
|
|
89
171
|
error: {
|
|
90
172
|
message: error.cause.message,
|
|
91
173
|
code: error.code,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":";;;AAEA,0CAA4C;AAC5C,sCAAsC;AACtC,qDAA+C;
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -66,8 +66,106 @@ function validateDomainSeparator({ name, version, chainId, verifyingContract, do
|
|
|
66
66
|
domain: {},
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
|
+
const getEIP712DomainData = async (client, chainId, tokenAddress) => {
|
|
70
|
+
try {
|
|
71
|
+
const multicallAddress = await (0, utils_js_1.getMulticallAddress)(chainId);
|
|
72
|
+
const contractCalls = [
|
|
73
|
+
{
|
|
74
|
+
address: tokenAddress,
|
|
75
|
+
abi: abi_js_1.eip2612Abi,
|
|
76
|
+
functionName: 'eip712Domain',
|
|
77
|
+
},
|
|
78
|
+
{
|
|
79
|
+
address: tokenAddress,
|
|
80
|
+
abi: abi_js_1.eip2612Abi,
|
|
81
|
+
functionName: 'nonces',
|
|
82
|
+
args: [client.account.address],
|
|
83
|
+
},
|
|
84
|
+
];
|
|
85
|
+
if (multicallAddress) {
|
|
86
|
+
try {
|
|
87
|
+
const [eip712DomainResult, noncesResult] = await (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.multicall, 'multicall', {
|
|
88
|
+
contracts: contractCalls,
|
|
89
|
+
multicallAddress,
|
|
90
|
+
});
|
|
91
|
+
if (eip712DomainResult.status !== 'success' ||
|
|
92
|
+
noncesResult.status !== 'success' ||
|
|
93
|
+
!eip712DomainResult.result ||
|
|
94
|
+
noncesResult.result === undefined) {
|
|
95
|
+
throw new Error('EIP-5267 multicall failed');
|
|
96
|
+
}
|
|
97
|
+
const [, name, version, tokenChainId, verifyingContract, salt] = eip712DomainResult.result;
|
|
98
|
+
if (Number(tokenChainId) !== chainId ||
|
|
99
|
+
verifyingContract.toLowerCase() !== tokenAddress.toLowerCase()) {
|
|
100
|
+
return undefined;
|
|
101
|
+
}
|
|
102
|
+
const hasSalt = salt !== viem_1.zeroHash;
|
|
103
|
+
const domain = hasSalt
|
|
104
|
+
? {
|
|
105
|
+
name,
|
|
106
|
+
version,
|
|
107
|
+
verifyingContract: tokenAddress,
|
|
108
|
+
salt,
|
|
109
|
+
}
|
|
110
|
+
: {
|
|
111
|
+
name,
|
|
112
|
+
version,
|
|
113
|
+
chainId,
|
|
114
|
+
verifyingContract: tokenAddress,
|
|
115
|
+
};
|
|
116
|
+
return {
|
|
117
|
+
name,
|
|
118
|
+
version,
|
|
119
|
+
domain,
|
|
120
|
+
permitTypehash: undefined,
|
|
121
|
+
nonce: noncesResult.result,
|
|
122
|
+
};
|
|
123
|
+
}
|
|
124
|
+
catch {
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
const [eip712DomainResult, noncesResult] = (await Promise.allSettled(contractCalls.map((call) => (0, getActionWithFallback_js_1.getActionWithFallback)(client, actions_1.readContract, 'readContract', call))));
|
|
128
|
+
if (eip712DomainResult.status !== 'fulfilled' ||
|
|
129
|
+
noncesResult.status !== 'fulfilled') {
|
|
130
|
+
return undefined;
|
|
131
|
+
}
|
|
132
|
+
const [, name, version, tokenChainId, verifyingContract, salt] = eip712DomainResult.value;
|
|
133
|
+
if (Number(tokenChainId) !== chainId ||
|
|
134
|
+
verifyingContract.toLowerCase() !== tokenAddress.toLowerCase()) {
|
|
135
|
+
return undefined;
|
|
136
|
+
}
|
|
137
|
+
const hasSalt = salt !== viem_1.zeroHash;
|
|
138
|
+
const domain = hasSalt
|
|
139
|
+
? {
|
|
140
|
+
name,
|
|
141
|
+
version,
|
|
142
|
+
verifyingContract: tokenAddress,
|
|
143
|
+
salt,
|
|
144
|
+
}
|
|
145
|
+
: {
|
|
146
|
+
name,
|
|
147
|
+
version,
|
|
148
|
+
chainId,
|
|
149
|
+
verifyingContract: tokenAddress,
|
|
150
|
+
};
|
|
151
|
+
return {
|
|
152
|
+
name,
|
|
153
|
+
version,
|
|
154
|
+
domain,
|
|
155
|
+
permitTypehash: undefined,
|
|
156
|
+
nonce: noncesResult.value,
|
|
157
|
+
};
|
|
158
|
+
}
|
|
159
|
+
catch {
|
|
160
|
+
return undefined;
|
|
161
|
+
}
|
|
162
|
+
};
|
|
69
163
|
const getContractData = async (client, chainId, tokenAddress) => {
|
|
70
164
|
try {
|
|
165
|
+
const eip5267Data = await getEIP712DomainData(client, chainId, tokenAddress);
|
|
166
|
+
if (eip5267Data) {
|
|
167
|
+
return eip5267Data;
|
|
168
|
+
}
|
|
71
169
|
const multicallAddress = await (0, utils_js_1.getMulticallAddress)(chainId);
|
|
72
170
|
const contractCalls = [
|
|
73
171
|
{
|
|
@@ -111,9 +209,19 @@ const getContractData = async (client, chainId, tokenAddress) => {
|
|
|
111
209
|
noncesResult.result === undefined) {
|
|
112
210
|
throw new Error('Multicall failed');
|
|
113
211
|
}
|
|
114
|
-
|
|
212
|
+
const { isValid, domain } = validateDomainSeparator({
|
|
115
213
|
name: nameResult.result,
|
|
214
|
+
version: versionResult.result ?? '1',
|
|
215
|
+
chainId,
|
|
216
|
+
verifyingContract: tokenAddress,
|
|
116
217
|
domainSeparator: domainSeparatorResult.result,
|
|
218
|
+
});
|
|
219
|
+
if (!isValid) {
|
|
220
|
+
return undefined;
|
|
221
|
+
}
|
|
222
|
+
return {
|
|
223
|
+
name: nameResult.result,
|
|
224
|
+
domain,
|
|
117
225
|
permitTypehash: permitTypehashResult.result,
|
|
118
226
|
nonce: noncesResult.result,
|
|
119
227
|
version: versionResult.result ?? '1',
|
|
@@ -130,9 +238,19 @@ const getContractData = async (client, chainId, tokenAddress) => {
|
|
|
130
238
|
}
|
|
131
239
|
const name = nameResult.value;
|
|
132
240
|
const version = versionResult.status === 'fulfilled' ? versionResult.value : '1';
|
|
133
|
-
|
|
241
|
+
const { isValid, domain } = validateDomainSeparator({
|
|
134
242
|
name,
|
|
243
|
+
version,
|
|
244
|
+
chainId,
|
|
245
|
+
verifyingContract: tokenAddress,
|
|
135
246
|
domainSeparator: domainSeparatorResult.value,
|
|
247
|
+
});
|
|
248
|
+
if (!isValid) {
|
|
249
|
+
return undefined;
|
|
250
|
+
}
|
|
251
|
+
return {
|
|
252
|
+
name,
|
|
253
|
+
domain,
|
|
136
254
|
permitTypehash: permitTypehashResult.status === 'fulfilled'
|
|
137
255
|
? permitTypehashResult.value
|
|
138
256
|
: undefined,
|
|
@@ -150,18 +268,7 @@ const getNativePermit = async (client, { chainId, tokenAddress, spenderAddress,
|
|
|
150
268
|
if (!contractData) {
|
|
151
269
|
return undefined;
|
|
152
270
|
}
|
|
153
|
-
|
|
154
|
-
if (permitTypehash === constants_js_1.DAI_LIKE_PERMIT_TYPEHASH) {
|
|
155
|
-
return undefined;
|
|
156
|
-
}
|
|
157
|
-
const { isValid, domain } = validateDomainSeparator({
|
|
158
|
-
name,
|
|
159
|
-
version,
|
|
160
|
-
chainId,
|
|
161
|
-
verifyingContract: tokenAddress,
|
|
162
|
-
domainSeparator,
|
|
163
|
-
});
|
|
164
|
-
if (!isValid) {
|
|
271
|
+
if (contractData.permitTypehash === constants_js_1.DAI_LIKE_PERMIT_TYPEHASH) {
|
|
165
272
|
return undefined;
|
|
166
273
|
}
|
|
167
274
|
const deadline = BigInt(Math.floor(Date.now() / 1000) + 30 * 60).toString();
|
|
@@ -169,12 +276,12 @@ const getNativePermit = async (client, { chainId, tokenAddress, spenderAddress,
|
|
|
169
276
|
owner: client.account.address,
|
|
170
277
|
spender: spenderAddress,
|
|
171
278
|
value: amount.toString(),
|
|
172
|
-
nonce: nonce.toString(),
|
|
279
|
+
nonce: contractData.nonce.toString(),
|
|
173
280
|
deadline,
|
|
174
281
|
};
|
|
175
282
|
return {
|
|
176
283
|
primaryType: 'Permit',
|
|
177
|
-
domain,
|
|
284
|
+
domain: contractData.domain,
|
|
178
285
|
types: constants_js_1.eip2612Types,
|
|
179
286
|
message,
|
|
180
287
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":";;;AACA,+
|
|
1
|
+
{"version":3,"file":"getNativePermit.js","sourceRoot":"","sources":["../../../../core/EVM/permits/getNativePermit.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.isNativePermitValid = void 0;
|
|
4
|
+
const isNativePermitValid = (permit, typedData) => {
|
|
5
|
+
if (permit.primaryType !== 'Permit') {
|
|
6
|
+
return false;
|
|
7
|
+
}
|
|
8
|
+
if (permit.domain.chainId !== typedData.domain.chainId ||
|
|
9
|
+
(permit.domain.salt && permit.domain.salt !== typedData.domain.salt)) {
|
|
10
|
+
return false;
|
|
11
|
+
}
|
|
12
|
+
const message = permit.message;
|
|
13
|
+
if (!message) {
|
|
14
|
+
return false;
|
|
15
|
+
}
|
|
16
|
+
if (message.spender?.toLowerCase() !== typedData.message.spender?.toLowerCase()) {
|
|
17
|
+
return false;
|
|
18
|
+
}
|
|
19
|
+
if (message.owner?.toLowerCase() !== typedData.message.owner?.toLowerCase()) {
|
|
20
|
+
return false;
|
|
21
|
+
}
|
|
22
|
+
const permitAmount = BigInt(message.value || 0);
|
|
23
|
+
if (permitAmount < BigInt(typedData.message.value || 0)) {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
const deadlineTimestamp = parseInt(message.deadline || 0, 10);
|
|
27
|
+
const allowedTimestamp = Math.floor(Date.now() / 1000) + 5 * 60;
|
|
28
|
+
if (deadlineTimestamp <= allowedTimestamp) {
|
|
29
|
+
return false;
|
|
30
|
+
}
|
|
31
|
+
return true;
|
|
32
|
+
};
|
|
33
|
+
exports.isNativePermitValid = isNativePermitValid;
|
|
34
|
+
//# sourceMappingURL=isNativePermitValid.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"isNativePermitValid.js","sourceRoot":"","sources":["../../../../core/EVM/permits/isNativePermitValid.ts"],"names":[],"mappings":";;;AAKO,MAAM,mBAAmB,GAAG,CACjC,MAAuB,EACvB,SAAoB,EACX,EAAE;IAEX,IAAI,MAAM,CAAC,WAAW,KAAK,QAAQ,EAAE,CAAC;QACpC,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,IACE,MAAM,CAAC,MAAM,CAAC,OAAO,KAAK,SAAS,CAAC,MAAM,CAAC,OAAO;QAClD,CAAC,MAAM,CAAC,MAAM,CAAC,IAAI,IAAI,MAAM,CAAC,MAAM,CAAC,IAAI,KAAK,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EACpE,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,MAAM,OAAO,GAAG,MAAM,CAAC,OAAc,CAAA;IACrC,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,IACE,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,KAAK,SAAS,CAAC,OAAO,CAAC,OAAO,EAAE,WAAW,EAAE,EAC3E,CAAC;QACD,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,IAAI,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,KAAK,SAAS,CAAC,OAAO,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE,CAAC;QAC5E,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,MAAM,YAAY,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,CAAA;IAC/C,IAAI,YAAY,GAAG,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,KAAK,IAAI,CAAC,CAAC,EAAE,CAAC;QACxD,OAAO,KAAK,CAAA;IACd,CAAC;IAGD,MAAM,iBAAiB,GAAG,QAAQ,CAAC,OAAO,CAAC,QAAQ,IAAI,CAAC,EAAE,EAAE,CAAC,CAAA;IAE7D,MAAM,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAA;IAE/D,IAAI,iBAAiB,IAAI,gBAAgB,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAA;IACd,CAAC;IAED,OAAO,IAAI,CAAA;AACb,CAAC,CAAA;AAnDY,QAAA,mBAAmB,uBAmD/B"}
|
|
@@ -5,36 +5,30 @@ const actions_1 = require("viem/actions");
|
|
|
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 switchChain = async (client, statusManager, step, allowUserInteraction,
|
|
8
|
+
const switchChain = async (client, statusManager, step, process, targetChainId, allowUserInteraction, executionOptions) => {
|
|
9
9
|
const currentChainId = (await (0, utils_1.getAction)(client, actions_1.getChainId, 'getChainId')(undefined));
|
|
10
|
-
if (currentChainId ===
|
|
10
|
+
if (currentChainId === targetChainId) {
|
|
11
11
|
return client;
|
|
12
12
|
}
|
|
13
|
-
step.execution = statusManager.initExecutionObject(step);
|
|
14
|
-
statusManager.updateExecution(step, 'ACTION_REQUIRED');
|
|
15
|
-
let switchProcess = statusManager.findOrCreateProcess({
|
|
16
|
-
step,
|
|
17
|
-
type: 'SWITCH_CHAIN',
|
|
18
|
-
status: 'ACTION_REQUIRED',
|
|
19
|
-
});
|
|
20
13
|
if (!allowUserInteraction) {
|
|
21
14
|
return;
|
|
22
15
|
}
|
|
23
16
|
try {
|
|
24
|
-
|
|
17
|
+
if (!executionOptions?.switchChainHook) {
|
|
18
|
+
throw new errors_js_1.ProviderError(constants_js_1.LiFiErrorCode.ChainSwitchError, 'Chain switch hook is not provided.');
|
|
19
|
+
}
|
|
20
|
+
const updatedClient = await executionOptions.switchChainHook(targetChainId);
|
|
25
21
|
let updatedChainId;
|
|
26
22
|
if (updatedClient) {
|
|
27
23
|
updatedChainId = (await (0, utils_1.getAction)(updatedClient, actions_1.getChainId, 'getChainId')(undefined));
|
|
28
24
|
}
|
|
29
|
-
if (updatedChainId !==
|
|
25
|
+
if (updatedChainId !== targetChainId) {
|
|
30
26
|
throw new errors_js_1.ProviderError(constants_js_1.LiFiErrorCode.ChainSwitchError, 'Chain switch required.');
|
|
31
27
|
}
|
|
32
|
-
switchProcess = statusManager.updateProcess(step, switchProcess.type, 'DONE');
|
|
33
|
-
statusManager.updateExecution(step, 'PENDING');
|
|
34
28
|
return updatedClient;
|
|
35
29
|
}
|
|
36
30
|
catch (error) {
|
|
37
|
-
statusManager.updateProcess(step,
|
|
31
|
+
statusManager.updateProcess(step, process.type, 'FAILED', {
|
|
38
32
|
error: {
|
|
39
33
|
message: error.message,
|
|
40
34
|
code: constants_js_1.LiFiErrorCode.ChainSwitchError,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,sCAAsC;AACtC,4DAAyD;AACzD,sDAAsD;AAqB/C,MAAM,WAAW,GAAG,KAAK,EAC9B,MAAc,EACd,aAA4B,EAC5B,IAAsB,EACtB,oBAA6B,EAC7B,
|
|
1
|
+
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":";;;AACA,0CAAyC;AACzC,sCAAsC;AACtC,4DAAyD;AACzD,sDAAsD;AAqB/C,MAAM,WAAW,GAAG,KAAK,EAC9B,MAAc,EACd,aAA4B,EAC5B,IAAsB,EACtB,OAAgB,EAChB,aAAqB,EACrB,oBAA6B,EAC7B,gBAAmC,EACN,EAAE;IAE/B,MAAM,cAAc,GAAG,CAAC,MAAM,IAAA,iBAAS,EACrC,MAAM,EACN,oBAAU,EACV,YAAY,CACb,CAAC,SAAS,CAAC,CAAyB,CAAA;IACrC,IAAI,cAAc,KAAK,aAAa,EAAE,CAAC;QACrC,OAAO,MAAM,CAAA;IACf,CAAC;IAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,IAAI,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC;YACvC,MAAM,IAAI,yBAAa,CACrB,4BAAa,CAAC,gBAAgB,EAC9B,oCAAoC,CACrC,CAAA;QACH,CAAC;QACD,MAAM,aAAa,GAAG,MAAM,gBAAgB,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;QAC3E,IAAI,cAAkC,CAAA;QACtC,IAAI,aAAa,EAAE,CAAC;YAClB,cAAc,GAAG,CAAC,MAAM,IAAA,iBAAS,EAC/B,aAAa,EACb,oBAAU,EACV,YAAY,CACb,CAAC,SAAS,CAAC,CAAyB,CAAA;QACvC,CAAC;QACD,IAAI,cAAc,KAAK,aAAa,EAAE,CAAC;YACrC,MAAM,IAAI,yBAAa,CACrB,4BAAa,CAAC,gBAAgB,EAC9B,wBAAwB,CACzB,CAAA;QACH,CAAC;QAED,OAAO,aAAa,CAAA;IACtB,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE;YACxD,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,IAAI,EAAE,4BAAa,CAAC,gBAAgB;aACrC;SACF,CAAC,CAAA;QACF,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;QAC7C,MAAM,KAAK,CAAA;IACb,CAAC;AACH,CAAC,CAAA;AAzDY,QAAA,WAAW,eAyDvB"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.retryCount = exports.retryDelay = exports.getMulticallAddress = exports.getMaxPriorityFeePerGas = exports.convertExtendedChain = void 0;
|
|
3
|
+
exports.isSaltMatchingChainId = exports.retryCount = exports.retryDelay = exports.getMulticallAddress = exports.getMaxPriorityFeePerGas = exports.convertExtendedChain = void 0;
|
|
4
4
|
exports.isExtendedChain = isExtendedChain;
|
|
5
|
+
const viem_1 = require("viem");
|
|
5
6
|
const actions_1 = require("viem/actions");
|
|
6
7
|
const config_js_1 = require("../../config.js");
|
|
7
8
|
const median_js_1 = require("../../utils/median.js");
|
|
@@ -71,4 +72,12 @@ exports.getMulticallAddress = getMulticallAddress;
|
|
|
71
72
|
const retryDelay = ({ count }) => Math.min(~~(1 << count) * 200, 3000);
|
|
72
73
|
exports.retryDelay = retryDelay;
|
|
73
74
|
exports.retryCount = 30;
|
|
75
|
+
const isSaltMatchingChainId = (salt, chainId) => {
|
|
76
|
+
if (!salt) {
|
|
77
|
+
return false;
|
|
78
|
+
}
|
|
79
|
+
const paddedChainId = (0, viem_1.pad)((0, viem_1.toHex)(chainId), { size: 32 });
|
|
80
|
+
return salt.toLowerCase() === paddedChainId.toLowerCase();
|
|
81
|
+
};
|
|
82
|
+
exports.isSaltMatchingChainId = isSaltMatchingChainId;
|
|
74
83
|
//# sourceMappingURL=utils.js.map
|
|
@@ -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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"}
|
|
@@ -35,7 +35,7 @@ const resumeRoute = async (route, executionOptions) => {
|
|
|
35
35
|
return execution.promise;
|
|
36
36
|
}
|
|
37
37
|
}
|
|
38
|
-
|
|
38
|
+
(0, prepareRestart_js_1.prepareRestart)(route);
|
|
39
39
|
return (0, exports.executeRoute)(route, executionOptions);
|
|
40
40
|
};
|
|
41
41
|
exports.resumeRoute = resumeRoute;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../core/execution.ts"],"names":[],"mappings":";;;AACA,4CAAqC;AACrC,yDAAsD;AACtD,mDAAmD;AACnD,2DAAoD;AACpD,2DAAoD;AAU7C,MAAM,YAAY,GAAG,KAAK,EAC/B,KAAY,EACZ,gBAAmC,EACX,EAAE;IAE1B,MAAM,WAAW,GAAG,eAAe,CAAQ,KAAK,CAAC,CAAA;IAEjD,IAAI,gBAAgB,GAAG,kCAAc,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,OAAO,CAAA;IAElE,IAAI,gBAAgB,EAAE,CAAC;QACrB,OAAO,gBAAgB,CAAA;IACzB,CAAC;IAED,kCAAc,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,WAAW,EAAE,gBAAgB,EAAE,CAAC,CAAA;IAC/D,gBAAgB,GAAG,YAAY,CAAC,WAAW,CAAC,CAAA;IAC5C,kCAAc,CAAC,MAAM,CAAC;QACpB,KAAK,EAAE,WAAW;QAClB,OAAO,EAAE,gBAAgB;KAC1B,CAAC,CAAA;IAEF,OAAO,gBAAgB,CAAA;AACzB,CAAC,CAAA;AArBY,QAAA,YAAY,gBAqBxB;AASM,MAAM,WAAW,GAAG,KAAK,EAC9B,KAAY,EACZ,gBAAmC,EACX,EAAE;IAC1B,MAAM,SAAS,GAAG,kCAAc,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;IAE9C,IAAI,SAAS,EAAE,CAAC;QACd,MAAM,eAAe,GAAG,SAAS,CAAC,SAAS,CAAC,IAAI,CAC9C,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,QAAQ,CAAC,cAAc,CACvC,CAAA;QACD,IAAI,CAAC,eAAe,EAAE,CAAC;YAErB,IAAA,4BAAoB,EAAC,KAAK,EAAE;gBAC1B,mBAAmB,EAAE,gBAAgB,EAAE,mBAAmB;aAC3D,CAAC,CAAA;YACF,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;gBAEvB,MAAM,IAAI,KAAK,CAAC,oCAAoC,CAAC,CAAA;YACvD,CAAC;YACD,OAAO,SAAS,CAAC,OAAO,CAAA;QAC1B,CAAC;IACH,CAAC;IAED,
|
|
1
|
+
{"version":3,"file":"execution.js","sourceRoot":"","sources":["../../core/execution.ts"],"names":[],"mappings":"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"}
|