@lifi/sdk 3.6.0-beta.3 → 3.6.0-beta.4
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 +4 -4
- package/src/_cjs/core/EVM/EVMStepExecutor.js +250 -220
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/parseEVMErrors.js +2 -1
- package/src/_cjs/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_cjs/core/EVM/typeguards.js +2 -2
- package/src/_cjs/core/EVM/typeguards.js.map +1 -1
- package/src/_cjs/core/Solana/SolanaStepExecutor.js +1 -13
- package/src/_cjs/core/Solana/SolanaStepExecutor.js.map +1 -1
- package/src/_cjs/core/Solana/parseSolanaErrors.js.map +1 -1
- package/src/_cjs/core/StatusManager.js +13 -9
- package/src/_cjs/core/StatusManager.js.map +1 -1
- package/src/_cjs/core/UTXO/UTXOStepExecutor.js +1 -13
- package/src/_cjs/core/UTXO/UTXOStepExecutor.js.map +1 -1
- package/src/_cjs/core/UTXO/parseUTXOErrors.js.map +1 -1
- package/src/_cjs/core/processMessages.js +22 -15
- package/src/_cjs/core/processMessages.js.map +1 -1
- package/src/_cjs/core/waitForDestinationChainTransaction.js +16 -1
- package/src/_cjs/core/waitForDestinationChainTransaction.js.map +1 -1
- package/src/_cjs/core/waitForTransactionStatus.js.map +1 -1
- package/src/_cjs/errors/SDKError.js.map +1 -1
- package/src/_cjs/index.js +2 -2
- package/src/_cjs/index.js.map +1 -1
- package/src/_cjs/utils/getTransactionMessage.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +273 -242
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/parseEVMErrors.js +2 -1
- package/src/_esm/core/EVM/parseEVMErrors.js.map +1 -1
- package/src/_esm/core/EVM/typeguards.js +1 -1
- package/src/_esm/core/EVM/typeguards.js.map +1 -1
- package/src/_esm/core/Solana/SolanaStepExecutor.js +1 -14
- package/src/_esm/core/Solana/SolanaStepExecutor.js.map +1 -1
- package/src/_esm/core/Solana/parseSolanaErrors.js.map +1 -1
- package/src/_esm/core/StatusManager.js +24 -18
- package/src/_esm/core/StatusManager.js.map +1 -1
- package/src/_esm/core/UTXO/UTXOStepExecutor.js +1 -14
- package/src/_esm/core/UTXO/UTXOStepExecutor.js.map +1 -1
- package/src/_esm/core/UTXO/parseUTXOErrors.js.map +1 -1
- package/src/_esm/core/processMessages.js +22 -15
- package/src/_esm/core/processMessages.js.map +1 -1
- package/src/_esm/core/waitForDestinationChainTransaction.js +17 -1
- package/src/_esm/core/waitForDestinationChainTransaction.js.map +1 -1
- package/src/_esm/core/waitForTransactionStatus.js.map +1 -1
- package/src/_esm/errors/SDKError.js.map +1 -1
- package/src/_esm/index.js +1 -1
- package/src/_esm/index.js.map +1 -1
- package/src/_esm/utils/getTransactionMessage.js.map +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts +13 -3
- 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/parseEVMErrors.d.ts +2 -1
- package/src/_types/core/EVM/parseEVMErrors.d.ts.map +1 -1
- package/src/_types/core/EVM/typeguards.d.ts +1 -1
- package/src/_types/core/EVM/typeguards.d.ts.map +1 -1
- package/src/_types/core/Solana/SolanaStepExecutor.d.ts.map +1 -1
- package/src/_types/core/Solana/parseSolanaErrors.d.ts +2 -1
- package/src/_types/core/Solana/parseSolanaErrors.d.ts.map +1 -1
- package/src/_types/core/StatusManager.d.ts +14 -11
- package/src/_types/core/StatusManager.d.ts.map +1 -1
- package/src/_types/core/UTXO/UTXOStepExecutor.d.ts.map +1 -1
- package/src/_types/core/UTXO/parseUTXOErrors.d.ts +2 -1
- package/src/_types/core/UTXO/parseUTXOErrors.d.ts.map +1 -1
- package/src/_types/core/processMessages.d.ts +3 -1
- package/src/_types/core/processMessages.d.ts.map +1 -1
- package/src/_types/core/types.d.ts +32 -1
- package/src/_types/core/types.d.ts.map +1 -1
- package/src/_types/core/waitForDestinationChainTransaction.d.ts +3 -3
- package/src/_types/core/waitForDestinationChainTransaction.d.ts.map +1 -1
- package/src/_types/core/waitForTransactionStatus.d.ts +2 -1
- package/src/_types/core/waitForTransactionStatus.d.ts.map +1 -1
- package/src/_types/errors/SDKError.d.ts +2 -1
- package/src/_types/errors/SDKError.d.ts.map +1 -1
- package/src/_types/index.d.ts +2 -2
- package/src/_types/index.d.ts.map +1 -1
- package/src/_types/utils/getTransactionMessage.d.ts +2 -1
- package/src/_types/utils/getTransactionMessage.d.ts.map +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +352 -301
- package/src/core/EVM/checkAllowance.ts +2 -2
- package/src/core/EVM/parseEVMErrors.ts +6 -2
- package/src/core/EVM/typeguards.ts +1 -1
- package/src/core/Solana/SolanaStepExecutor.ts +2 -16
- package/src/core/Solana/parseSolanaErrors.ts +2 -1
- package/src/core/StatusManager.ts +38 -26
- package/src/core/UTXO/UTXOStepExecutor.ts +2 -16
- package/src/core/UTXO/parseUTXOErrors.ts +2 -1
- package/src/core/processMessages.ts +25 -21
- package/src/core/types.ts +54 -1
- package/src/core/waitForDestinationChainTransaction.ts +21 -4
- package/src/core/waitForTransactionStatus.ts +2 -6
- package/src/errors/SDKError.ts +2 -1
- package/src/index.ts +6 -1
- package/src/utils/getTransactionMessage.ts +2 -1
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -4,14 +4,14 @@
|
|
|
4
4
|
},
|
|
5
5
|
"dependencies": {
|
|
6
6
|
"@bigmi/core": "^0.1.0",
|
|
7
|
-
"@lifi/types": "^16.
|
|
8
|
-
"@noble/curves": "^1.8.
|
|
7
|
+
"@lifi/types": "^16.6.0",
|
|
8
|
+
"@noble/curves": "^1.8.1",
|
|
9
9
|
"@solana/wallet-adapter-base": "^0.9.23",
|
|
10
10
|
"@solana/web3.js": "^1.98.0",
|
|
11
11
|
"bech32": "^2.0.0",
|
|
12
12
|
"bitcoinjs-lib": "^7.0.0-rc.0",
|
|
13
13
|
"bs58": "^6.0.0",
|
|
14
|
-
"viem": "^2.22.
|
|
14
|
+
"viem": "^2.22.15"
|
|
15
15
|
},
|
|
16
16
|
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
17
17
|
"exports": {
|
|
@@ -67,5 +67,5 @@
|
|
|
67
67
|
"sideEffects": false,
|
|
68
68
|
"types": "./src/_types/index.d.ts",
|
|
69
69
|
"typings": "./src/_types/index.d.ts",
|
|
70
|
-
"version": "3.6.0-beta.
|
|
70
|
+
"version": "3.6.0-beta.4"
|
|
71
71
|
}
|
|
@@ -8,7 +8,6 @@ const config_js_1 = require("../../config.js");
|
|
|
8
8
|
const constants_js_1 = require("../../errors/constants.js");
|
|
9
9
|
const errors_js_1 = require("../../errors/errors.js");
|
|
10
10
|
const api_js_1 = require("../../services/api.js");
|
|
11
|
-
const isZeroAddress_js_1 = require("../../utils/isZeroAddress.js");
|
|
12
11
|
const BaseStepExecutor_js_1 = require("../BaseStepExecutor.js");
|
|
13
12
|
const checkBalance_js_1 = require("../checkBalance.js");
|
|
14
13
|
const stepComparison_js_1 = require("../stepComparison.js");
|
|
@@ -67,6 +66,44 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
67
66
|
return updatedClient;
|
|
68
67
|
}
|
|
69
68
|
});
|
|
69
|
+
Object.defineProperty(this, "waitForTransaction", {
|
|
70
|
+
enumerable: true,
|
|
71
|
+
configurable: true,
|
|
72
|
+
writable: true,
|
|
73
|
+
value: async ({ step, process, fromChain, toChain, atomicBatchSupported, isRelayerTransaction, txHash, isBridgeExecution, }) => {
|
|
74
|
+
let transactionReceipt;
|
|
75
|
+
if (atomicBatchSupported) {
|
|
76
|
+
transactionReceipt = await (0, waitForBatchTransactionReceipt_js_1.waitForBatchTransactionReceipt)(this.client, txHash);
|
|
77
|
+
}
|
|
78
|
+
else if (isRelayerTransaction) {
|
|
79
|
+
transactionReceipt = await (0, waitForRelayedTransactionReceipt_js_1.waitForRelayedTransactionReceipt)(txHash);
|
|
80
|
+
}
|
|
81
|
+
else {
|
|
82
|
+
transactionReceipt = await (0, waitForTransactionReceipt_js_1.waitForTransactionReceipt)({
|
|
83
|
+
client: this.client,
|
|
84
|
+
chainId: fromChain.id,
|
|
85
|
+
txHash,
|
|
86
|
+
onReplaced: (response) => {
|
|
87
|
+
this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
88
|
+
txHash: response.transaction.hash,
|
|
89
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
90
|
+
});
|
|
91
|
+
},
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
if (transactionReceipt?.transactionHash &&
|
|
95
|
+
transactionReceipt.transactionHash !== txHash) {
|
|
96
|
+
process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
97
|
+
txHash: transactionReceipt.transactionHash,
|
|
98
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${transactionReceipt.transactionHash}`,
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
if (isBridgeExecution) {
|
|
102
|
+
process = this.statusManager.updateProcess(step, process.type, 'DONE');
|
|
103
|
+
}
|
|
104
|
+
await (0, waitForDestinationChainTransaction_js_1.waitForDestinationChainTransaction)(step, process, fromChain, toChain, this.statusManager);
|
|
105
|
+
}
|
|
106
|
+
});
|
|
70
107
|
Object.defineProperty(this, "executeStep", {
|
|
71
108
|
enumerable: true,
|
|
72
109
|
configurable: true,
|
|
@@ -82,6 +119,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
82
119
|
}
|
|
83
120
|
const fromChain = await config_js_1.config.getChainById(step.action.fromChainId);
|
|
84
121
|
const toChain = await config_js_1.config.getChainById(step.action.toChainId);
|
|
122
|
+
const calls = [];
|
|
85
123
|
let atomicBatchSupported = false;
|
|
86
124
|
try {
|
|
87
125
|
const capabilities = (await (0, utils_1.getAction)(this.client, experimental_1.getCapabilities, 'getCapabilities')(undefined));
|
|
@@ -89,20 +127,24 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
89
127
|
}
|
|
90
128
|
catch {
|
|
91
129
|
}
|
|
92
|
-
const calls = [];
|
|
93
130
|
const isBridgeExecution = fromChain.id !== toChain.id;
|
|
94
131
|
const currentProcessType = isBridgeExecution ? 'CROSS_CHAIN' : 'SWAP';
|
|
95
132
|
const existingProcess = step.execution.process.find((p) => p.type === currentProcessType);
|
|
96
|
-
const
|
|
133
|
+
const isFromNativeToken = fromChain.nativeToken.address === step.action.fromToken.address;
|
|
134
|
+
const isRelayerTransaction = (0, typeguards_js_1.isRelayerStep)(step);
|
|
97
135
|
const nativePermit = await (0, getNativePermit_js_1.getNativePermit)(this.client, fromChain, step.action.fromToken.address);
|
|
98
|
-
const nativePermitSupported =
|
|
99
|
-
|
|
136
|
+
const nativePermitSupported = nativePermit.supported &&
|
|
137
|
+
!!fromChain.permit2Proxy &&
|
|
100
138
|
!atomicBatchSupported &&
|
|
101
|
-
!
|
|
102
|
-
|
|
139
|
+
!isRelayerTransaction &&
|
|
140
|
+
!isFromNativeToken;
|
|
141
|
+
const permit2Supported = !!fromChain.permit2 &&
|
|
142
|
+
!!fromChain.permit2Proxy &&
|
|
143
|
+
!atomicBatchSupported &&
|
|
144
|
+
!isFromNativeToken;
|
|
103
145
|
const permitSupported = permit2Supported || nativePermitSupported;
|
|
104
146
|
const checkForAllowance = !existingProcess?.txHash &&
|
|
105
|
-
!
|
|
147
|
+
!isFromNativeToken &&
|
|
106
148
|
!nativePermitSupported;
|
|
107
149
|
if (checkForAllowance) {
|
|
108
150
|
const data = await (0, checkAllowance_js_1.checkAllowance)({
|
|
@@ -125,232 +167,220 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
125
167
|
}
|
|
126
168
|
}
|
|
127
169
|
}
|
|
128
|
-
let process = this.statusManager.
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
}
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
if (
|
|
137
|
-
|
|
138
|
-
if (!updatedClient) {
|
|
139
|
-
return step;
|
|
140
|
-
}
|
|
141
|
-
txHash = process.txHash;
|
|
170
|
+
let process = this.statusManager.findProcess(step, currentProcessType);
|
|
171
|
+
if (process?.status === 'DONE') {
|
|
172
|
+
await (0, waitForDestinationChainTransaction_js_1.waitForDestinationChainTransaction)(step, process, fromChain, toChain, this.statusManager);
|
|
173
|
+
return step;
|
|
174
|
+
}
|
|
175
|
+
try {
|
|
176
|
+
if (process?.txHash) {
|
|
177
|
+
const updatedClient = await this.checkClient(step, process);
|
|
178
|
+
if (!updatedClient) {
|
|
179
|
+
return step;
|
|
142
180
|
}
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
from: step.transactionRequest.from,
|
|
182
|
-
data: step.transactionRequest.data,
|
|
183
|
-
value: step.transactionRequest.value
|
|
184
|
-
? BigInt(step.transactionRequest.value)
|
|
185
|
-
: undefined,
|
|
186
|
-
gas: step.transactionRequest.gasLimit
|
|
187
|
-
? BigInt(step.transactionRequest.gasLimit)
|
|
188
|
-
: undefined,
|
|
189
|
-
maxPriorityFeePerGas: this.client.account?.type === 'local'
|
|
190
|
-
? await (0, utils_js_1.getMaxPriorityFeePerGas)(this.client)
|
|
191
|
-
: step.transactionRequest.maxPriorityFeePerGas
|
|
192
|
-
? BigInt(step.transactionRequest.maxPriorityFeePerGas)
|
|
193
|
-
: undefined,
|
|
181
|
+
const txHash = process.txHash;
|
|
182
|
+
await this.waitForTransaction({
|
|
183
|
+
step,
|
|
184
|
+
process,
|
|
185
|
+
fromChain,
|
|
186
|
+
toChain,
|
|
187
|
+
atomicBatchSupported,
|
|
188
|
+
isRelayerTransaction,
|
|
189
|
+
txHash,
|
|
190
|
+
isBridgeExecution,
|
|
191
|
+
});
|
|
192
|
+
return step;
|
|
193
|
+
}
|
|
194
|
+
process = this.statusManager.findOrCreateProcess({
|
|
195
|
+
step,
|
|
196
|
+
type: permitSupported ? 'PERMIT' : currentProcessType,
|
|
197
|
+
status: 'STARTED',
|
|
198
|
+
});
|
|
199
|
+
await (0, checkBalance_js_1.checkBalance)(this.client.account.address, step);
|
|
200
|
+
if (!step.transactionRequest) {
|
|
201
|
+
const { execution, ...stepBase } = step;
|
|
202
|
+
let updatedStep;
|
|
203
|
+
if (isRelayerTransaction) {
|
|
204
|
+
const updatedRelayedStep = await (0, api_js_1.getRelayerQuote)({
|
|
205
|
+
fromChain: stepBase.action.fromChainId,
|
|
206
|
+
fromToken: stepBase.action.fromToken.address,
|
|
207
|
+
fromAddress: stepBase.action.fromAddress,
|
|
208
|
+
fromAmount: stepBase.action.fromAmount,
|
|
209
|
+
toChain: stepBase.action.toChainId,
|
|
210
|
+
toToken: stepBase.action.toToken.address,
|
|
211
|
+
slippage: stepBase.action.slippage,
|
|
212
|
+
toAddress: stepBase.action.toAddress,
|
|
213
|
+
allowBridges: [stepBase.tool],
|
|
214
|
+
});
|
|
215
|
+
updatedStep = {
|
|
216
|
+
...updatedRelayedStep.data.quote.step,
|
|
217
|
+
...updatedRelayedStep.data.quote,
|
|
218
|
+
id: stepBase.id,
|
|
194
219
|
};
|
|
195
|
-
if (this.executionOptions?.updateTransactionRequestHook) {
|
|
196
|
-
const customizedTransactionRequest = await this.executionOptions.updateTransactionRequestHook({
|
|
197
|
-
requestType: 'transaction',
|
|
198
|
-
...transactionRequest,
|
|
199
|
-
});
|
|
200
|
-
transactionRequest = {
|
|
201
|
-
...transactionRequest,
|
|
202
|
-
...customizedTransactionRequest,
|
|
203
|
-
};
|
|
204
|
-
}
|
|
205
|
-
const updatedClient = await this.checkClient(step, process);
|
|
206
|
-
if (!updatedClient) {
|
|
207
|
-
return step;
|
|
208
|
-
}
|
|
209
|
-
process = this.statusManager.updateProcess(step, process.type, permitSupported ? 'PERMIT_REQUIRED' : 'ACTION_REQUIRED');
|
|
210
|
-
if (!this.allowUserInteraction) {
|
|
211
|
-
return step;
|
|
212
|
-
}
|
|
213
|
-
let isTransactionRelayed = false;
|
|
214
|
-
if (atomicBatchSupported) {
|
|
215
|
-
const transferCall = {
|
|
216
|
-
chainId: fromChain.id,
|
|
217
|
-
data: transactionRequest.data,
|
|
218
|
-
to: transactionRequest.to,
|
|
219
|
-
value: transactionRequest.value,
|
|
220
|
-
};
|
|
221
|
-
calls.push(transferCall);
|
|
222
|
-
txHash = (await (0, utils_1.getAction)(this.client, experimental_1.sendCalls, 'sendCalls')({
|
|
223
|
-
account: this.client.account,
|
|
224
|
-
calls,
|
|
225
|
-
}));
|
|
226
|
-
}
|
|
227
|
-
else {
|
|
228
|
-
let permitSignature;
|
|
229
|
-
if (permitSupported) {
|
|
230
|
-
permitSignature = await (0, signPermitMessage_js_1.signPermitMessage)(this.client, {
|
|
231
|
-
transactionRequest,
|
|
232
|
-
chain: fromChain,
|
|
233
|
-
tokenAddress: step.action.fromToken.address,
|
|
234
|
-
amount: BigInt(step.action.fromAmount),
|
|
235
|
-
nativePermit,
|
|
236
|
-
permitData: isPermitStep ? step.permitData : undefined,
|
|
237
|
-
useWitness: isPermitStep,
|
|
238
|
-
});
|
|
239
|
-
transactionRequest.to = fromChain.permit2Proxy;
|
|
240
|
-
}
|
|
241
|
-
if (isPermitStep && permitSignature) {
|
|
242
|
-
const relayedTransaction = await (0, api_js_1.relayTransaction)({
|
|
243
|
-
tokenOwner: this.client.account.address,
|
|
244
|
-
chainId: fromChain.id,
|
|
245
|
-
permit: step.permit,
|
|
246
|
-
witness: step.witness,
|
|
247
|
-
signedPermitData: permitSignature.signature,
|
|
248
|
-
callData: transactionRequest.data,
|
|
249
|
-
});
|
|
250
|
-
txHash = relayedTransaction.data.taskId;
|
|
251
|
-
isTransactionRelayed = true;
|
|
252
|
-
}
|
|
253
|
-
else {
|
|
254
|
-
if (permitSignature) {
|
|
255
|
-
transactionRequest.data = permitSignature.data;
|
|
256
|
-
try {
|
|
257
|
-
const estimatedGas = await (0, actions_1.estimateGas)(this.client, {
|
|
258
|
-
account: this.client.account,
|
|
259
|
-
to: transactionRequest.to,
|
|
260
|
-
data: transactionRequest.data,
|
|
261
|
-
value: transactionRequest.value,
|
|
262
|
-
});
|
|
263
|
-
transactionRequest.gas =
|
|
264
|
-
transactionRequest.gas &&
|
|
265
|
-
transactionRequest.gas > estimatedGas
|
|
266
|
-
? transactionRequest.gas
|
|
267
|
-
: estimatedGas;
|
|
268
|
-
}
|
|
269
|
-
catch {
|
|
270
|
-
transactionRequest.gas = undefined;
|
|
271
|
-
}
|
|
272
|
-
}
|
|
273
|
-
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
274
|
-
txHash = await (0, utils_1.getAction)(this.client, actions_1.sendTransaction, 'sendTransaction')({
|
|
275
|
-
to: transactionRequest.to,
|
|
276
|
-
account: this.client.account,
|
|
277
|
-
data: transactionRequest.data,
|
|
278
|
-
value: transactionRequest.value,
|
|
279
|
-
gas: transactionRequest.gas,
|
|
280
|
-
gasPrice: transactionRequest.gasPrice,
|
|
281
|
-
maxFeePerGas: transactionRequest.maxFeePerGas,
|
|
282
|
-
maxPriorityFeePerGas: transactionRequest.maxPriorityFeePerGas,
|
|
283
|
-
});
|
|
284
|
-
}
|
|
285
|
-
}
|
|
286
|
-
process = this.statusManager.updateProcess(step, process.type, 'PENDING', atomicBatchSupported
|
|
287
|
-
? {
|
|
288
|
-
atomicBatchSupported,
|
|
289
|
-
}
|
|
290
|
-
: isTransactionRelayed
|
|
291
|
-
? undefined
|
|
292
|
-
: {
|
|
293
|
-
txHash: txHash,
|
|
294
|
-
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
295
|
-
});
|
|
296
220
|
}
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
transactionReceipt = await (0, waitForBatchTransactionReceipt_js_1.waitForBatchTransactionReceipt)(this.client, txHash);
|
|
221
|
+
else {
|
|
222
|
+
updatedStep = await (0, api_js_1.getStepTransaction)(stepBase);
|
|
300
223
|
}
|
|
301
|
-
|
|
302
|
-
|
|
224
|
+
const comparedStep = await (0, stepComparison_js_1.stepComparison)(this.statusManager, step, updatedStep, this.allowUserInteraction, this.executionOptions);
|
|
225
|
+
Object.assign(step, {
|
|
226
|
+
...comparedStep,
|
|
227
|
+
execution: step.execution,
|
|
228
|
+
});
|
|
229
|
+
}
|
|
230
|
+
if (!step.transactionRequest) {
|
|
231
|
+
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction.');
|
|
232
|
+
}
|
|
233
|
+
let transactionRequest = {
|
|
234
|
+
to: step.transactionRequest.to,
|
|
235
|
+
from: step.transactionRequest.from,
|
|
236
|
+
data: step.transactionRequest.data,
|
|
237
|
+
value: step.transactionRequest.value
|
|
238
|
+
? BigInt(step.transactionRequest.value)
|
|
239
|
+
: undefined,
|
|
240
|
+
gas: step.transactionRequest.gasLimit
|
|
241
|
+
? BigInt(step.transactionRequest.gasLimit)
|
|
242
|
+
: undefined,
|
|
243
|
+
maxPriorityFeePerGas: this.client.account?.type === 'local'
|
|
244
|
+
? await (0, utils_js_1.getMaxPriorityFeePerGas)(this.client)
|
|
245
|
+
: step.transactionRequest.maxPriorityFeePerGas
|
|
246
|
+
? BigInt(step.transactionRequest.maxPriorityFeePerGas)
|
|
247
|
+
: undefined,
|
|
248
|
+
};
|
|
249
|
+
if (this.executionOptions?.updateTransactionRequestHook) {
|
|
250
|
+
const customizedTransactionRequest = await this.executionOptions.updateTransactionRequestHook({
|
|
251
|
+
requestType: 'transaction',
|
|
252
|
+
...transactionRequest,
|
|
253
|
+
});
|
|
254
|
+
transactionRequest = {
|
|
255
|
+
...transactionRequest,
|
|
256
|
+
...customizedTransactionRequest,
|
|
257
|
+
};
|
|
258
|
+
}
|
|
259
|
+
const updatedClient = await this.checkClient(step, process);
|
|
260
|
+
if (!updatedClient) {
|
|
261
|
+
return step;
|
|
262
|
+
}
|
|
263
|
+
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
264
|
+
if (!this.allowUserInteraction) {
|
|
265
|
+
return step;
|
|
266
|
+
}
|
|
267
|
+
let txHash;
|
|
268
|
+
let isTransactionRelayed = false;
|
|
269
|
+
if (atomicBatchSupported) {
|
|
270
|
+
const transferCall = {
|
|
271
|
+
chainId: fromChain.id,
|
|
272
|
+
data: transactionRequest.data,
|
|
273
|
+
to: transactionRequest.to,
|
|
274
|
+
value: transactionRequest.value,
|
|
275
|
+
};
|
|
276
|
+
calls.push(transferCall);
|
|
277
|
+
txHash = (await (0, utils_1.getAction)(this.client, experimental_1.sendCalls, 'sendCalls')({
|
|
278
|
+
account: this.client.account,
|
|
279
|
+
calls,
|
|
280
|
+
}));
|
|
281
|
+
}
|
|
282
|
+
else {
|
|
283
|
+
let permitSignature;
|
|
284
|
+
if (permitSupported) {
|
|
285
|
+
permitSignature = await (0, signPermitMessage_js_1.signPermitMessage)(this.client, {
|
|
286
|
+
transactionRequest,
|
|
287
|
+
chain: fromChain,
|
|
288
|
+
tokenAddress: step.action.fromToken.address,
|
|
289
|
+
amount: BigInt(step.action.fromAmount),
|
|
290
|
+
nativePermit,
|
|
291
|
+
permitData: isRelayerTransaction ? step.permitData : undefined,
|
|
292
|
+
useWitness: isRelayerTransaction,
|
|
293
|
+
});
|
|
294
|
+
transactionRequest.to = fromChain.permit2Proxy;
|
|
295
|
+
this.statusManager.updateProcess(step, process.type, 'DONE');
|
|
303
296
|
}
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
|
|
297
|
+
if (isRelayerTransaction && permitSignature) {
|
|
298
|
+
process = this.statusManager.findOrCreateProcess({
|
|
299
|
+
step,
|
|
300
|
+
type: currentProcessType,
|
|
301
|
+
status: 'PENDING',
|
|
302
|
+
});
|
|
303
|
+
const relayedTransaction = await (0, api_js_1.relayTransaction)({
|
|
304
|
+
tokenOwner: this.client.account.address,
|
|
307
305
|
chainId: fromChain.id,
|
|
308
|
-
|
|
309
|
-
|
|
310
|
-
|
|
311
|
-
|
|
312
|
-
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
313
|
-
});
|
|
314
|
-
},
|
|
306
|
+
permit: step.permit,
|
|
307
|
+
witness: step.witness,
|
|
308
|
+
signedPermitData: permitSignature.signature,
|
|
309
|
+
callData: transactionRequest.data,
|
|
315
310
|
});
|
|
311
|
+
txHash = relayedTransaction.data.taskId;
|
|
312
|
+
isTransactionRelayed = true;
|
|
316
313
|
}
|
|
317
|
-
|
|
318
|
-
|
|
319
|
-
|
|
320
|
-
|
|
321
|
-
|
|
314
|
+
else {
|
|
315
|
+
process = this.statusManager.findOrCreateProcess({
|
|
316
|
+
step,
|
|
317
|
+
type: currentProcessType,
|
|
318
|
+
status: 'STARTED',
|
|
319
|
+
});
|
|
320
|
+
if (permitSignature) {
|
|
321
|
+
transactionRequest.data = permitSignature.data;
|
|
322
|
+
try {
|
|
323
|
+
const estimatedGas = await (0, actions_1.estimateGas)(this.client, {
|
|
324
|
+
account: this.client.account,
|
|
325
|
+
to: transactionRequest.to,
|
|
326
|
+
data: transactionRequest.data,
|
|
327
|
+
value: transactionRequest.value,
|
|
328
|
+
});
|
|
329
|
+
transactionRequest.gas =
|
|
330
|
+
transactionRequest.gas && transactionRequest.gas > estimatedGas
|
|
331
|
+
? transactionRequest.gas
|
|
332
|
+
: estimatedGas;
|
|
333
|
+
}
|
|
334
|
+
catch {
|
|
335
|
+
transactionRequest.gas = undefined;
|
|
336
|
+
}
|
|
337
|
+
}
|
|
338
|
+
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
339
|
+
txHash = await (0, utils_1.getAction)(this.client, actions_1.sendTransaction, 'sendTransaction')({
|
|
340
|
+
to: transactionRequest.to,
|
|
341
|
+
account: this.client.account,
|
|
342
|
+
data: transactionRequest.data,
|
|
343
|
+
value: transactionRequest.value,
|
|
344
|
+
gas: transactionRequest.gas,
|
|
345
|
+
gasPrice: transactionRequest.gasPrice,
|
|
346
|
+
maxFeePerGas: transactionRequest.maxFeePerGas,
|
|
347
|
+
maxPriorityFeePerGas: transactionRequest.maxPriorityFeePerGas,
|
|
322
348
|
});
|
|
323
|
-
}
|
|
324
|
-
if (isBridgeExecution) {
|
|
325
|
-
process = this.statusManager.updateProcess(step, process.type, 'DONE');
|
|
326
349
|
}
|
|
327
350
|
}
|
|
328
|
-
|
|
329
|
-
|
|
330
|
-
|
|
331
|
-
|
|
332
|
-
|
|
333
|
-
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
337
|
-
|
|
338
|
-
|
|
339
|
-
}
|
|
340
|
-
const transactionHash = process.txHash;
|
|
341
|
-
if (!transactionHash) {
|
|
342
|
-
throw new Error('Transaction hash is undefined.');
|
|
343
|
-
}
|
|
344
|
-
if (isBridgeExecution) {
|
|
345
|
-
process = this.statusManager.findOrCreateProcess({
|
|
351
|
+
process = this.statusManager.updateProcess(step, process.type, 'PENDING', atomicBatchSupported
|
|
352
|
+
? {
|
|
353
|
+
atomicBatchSupported,
|
|
354
|
+
}
|
|
355
|
+
: isTransactionRelayed
|
|
356
|
+
? undefined
|
|
357
|
+
: {
|
|
358
|
+
txHash: txHash,
|
|
359
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
360
|
+
});
|
|
361
|
+
await this.waitForTransaction({
|
|
346
362
|
step,
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
363
|
+
process,
|
|
364
|
+
fromChain,
|
|
365
|
+
toChain,
|
|
366
|
+
atomicBatchSupported,
|
|
367
|
+
isRelayerTransaction,
|
|
368
|
+
txHash,
|
|
369
|
+
isBridgeExecution,
|
|
350
370
|
});
|
|
371
|
+
return step;
|
|
372
|
+
}
|
|
373
|
+
catch (e) {
|
|
374
|
+
const error = await (0, parseEVMErrors_js_1.parseEVMErrors)(e, step, process);
|
|
375
|
+
process = this.statusManager.updateProcess(step, process?.type || currentProcessType, 'FAILED', {
|
|
376
|
+
error: {
|
|
377
|
+
message: error.cause.message,
|
|
378
|
+
code: error.code,
|
|
379
|
+
},
|
|
380
|
+
});
|
|
381
|
+
this.statusManager.updateExecution(step, 'FAILED');
|
|
382
|
+
throw error;
|
|
351
383
|
}
|
|
352
|
-
await (0, waitForDestinationChainTransaction_js_1.waitForDestinationChainTransaction)(step, process.type, transactionHash, toChain, this.statusManager);
|
|
353
|
-
return step;
|
|
354
384
|
}
|
|
355
385
|
});
|
|
356
386
|
this.client = options.client;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":";;;AAUA,0CAAyE;AAEzE,oDAA8D;AAC9D,sCAAsC;AACtC,+CAAwC;AACxC,4DAAyD;AACzD,sDAAyD;AACzD,kDAI8B;AAC9B,mEAA4D;AAC5D,gEAAyD;AACzD,wDAAiD;AACjD,4DAAqD;AAMrD,oGAA6F;AAC7F,2DAAoD;AACpD,6DAAsD;AACtD,2DAAoD;AACpD,iEAAgF;AAChF,qDAA8C;AAC9C,mDAAiD;AACjD,yCAAoD;AACpD,2FAG4C;AAC5C,+FAAwF;AACxF,iFAA0E;AAa1E,MAAa,eAAgB,SAAQ,sCAAgB;IAGnD,YAAY,OAA+B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;QAHR;;;;;WAAc;QAQtB;;;;mBAAc,KAAK,EAAE,IAAsB,EAAE,OAAiB,EAAE,EAAE;gBAChE,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;gBACD,IAAI,aAAa,EAAE,CAAC;oBAClB,IAAI,CAAC,MAAM,GAAG,aAAa,CAAA;gBAC7B,CAAC;gBAGD,IAAI,cAAc,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAA;gBACjD,IAAI,CAAC,cAAc,EAAE,CAAC;oBACpB,MAAM,gBAAgB,GAAG,CAAC,MAAM,IAAA,iBAAS,EACvC,IAAI,CAAC,MAAM,EACX,sBAAY,EACZ,cAAc,CACf,CAAC,SAAS,CAAC,CAA2B,CAAA;oBACvC,cAAc,GAAG,gBAAgB,EAAE,CAAC,CAAC,CAAC,CAAA;gBACxC,CAAC;gBACD,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;oBAC/C,IAAI,eAAe,GAAG,OAAO,CAAA;oBAC7B,IAAI,CAAC,eAAe,EAAE,CAAC;wBAErB,eAAe,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;4BACvD,IAAI;4BACJ,IAAI,EAAE,aAAa;yBACpB,CAAC,CAAA;oBACJ,CAAC;oBACD,MAAM,YAAY,GAChB,mHAAmH,CAAA;oBACrH,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,QAAQ,EAAE;wBACrE,KAAK,EAAE;4BACL,IAAI,EAAE,4BAAa,CAAC,4BAA4B;4BAChD,OAAO,EAAE,YAAY;yBACtB;qBACF,CAAC,CAAA;oBACF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;oBAClD,MAAM,MAAM,IAAA,kCAAc,EACxB,IAAI,4BAAgB,CAClB,4BAAa,CAAC,4BAA4B,EAC1C,YAAY,CACb,EACD,IAAI,EACJ,OAAO,CACR,CAAA;gBACH,CAAC;gBACD,OAAO,aAAa,CAAA;YACtB,CAAC;WAAA;QAED;;;;mBAAc,KAAK,EAAE,IAAsB,EAA6B,EAAE;gBACxE,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;gBAG7D,MAAM,uBAAuB,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CAC1D,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAChD,CAAA;gBAMD,IAAI,uBAAuB,EAAE,SAAS,KAAK,8BAA8B,EAAE,CAAC;oBAC1E,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;oBAClD,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,OAAO,IAAI,CAAA;oBACb,CAAC;gBACH,CAAC;gBAED,MAAM,SAAS,GAAG,MAAM,kBAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;gBACpE,MAAM,OAAO,GAAG,MAAM,kBAAM,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;gBAEhE,IAAI,oBAAoB,GAAG,KAAK,CAAA;gBAChC,IAAI,CAAC;oBACH,MAAM,YAAY,GAAG,CAAC,MAAM,IAAA,iBAAS,EACnC,IAAI,CAAC,MAAM,EACX,8BAAe,EACf,iBAAiB,CAClB,CAAC,SAAS,CAAC,CAA8B,CAAA;oBAC1C,oBAAoB,GAAG,YAAY,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,WAAW,EAAE,SAAS,CAAA;gBAC3E,CAAC;gBAAC,MAAM,CAAC;gBAET,CAAC;gBAED,MAAM,KAAK,GAAW,EAAE,CAAA;gBAExB,MAAM,iBAAiB,GAAG,SAAS,CAAC,EAAE,KAAK,OAAO,CAAC,EAAE,CAAA;gBACrD,MAAM,kBAAkB,GAAG,iBAAiB,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,MAAM,CAAA;gBAGrE,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,kBAAkB,CACrC,CAAA;gBAGD,MAAM,YAAY,GAAG,IAAA,+BAAe,EAAC,IAAI,CAAC,CAAA;gBAQ1C,MAAM,YAAY,GAAG,MAAM,IAAA,oCAAe,EACxC,IAAI,CAAC,MAAM,EACX,SAAS,EACT,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB,CACzC,CAAA;gBAED,MAAM,qBAAqB,GACzB,CAAC,CAAC,SAAS,CAAC,YAAY;oBACxB,YAAY,CAAC,SAAS;oBACtB,CAAC,oBAAoB;oBACrB,CAAC,YAAY,CAAA;gBAEf,MAAM,gBAAgB,GACpB,CAAC,CAAC,SAAS,CAAC,OAAO,IAAI,CAAC,CAAC,SAAS,CAAC,YAAY,IAAI,CAAC,oBAAoB,CAAA;gBAE1E,MAAM,eAAe,GAAG,gBAAgB,IAAI,qBAAqB,CAAA;gBAEjE,MAAM,iBAAiB,GAErB,CAAC,eAAe,EAAE,MAAM;oBAExB,CAAC,IAAA,gCAAa,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;oBAE7C,CAAC,qBAAqB,CAAA;gBAExB,IAAI,iBAAiB,EAAE,CAAC;oBAEtB,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAc,EAAC;wBAChC,MAAM,EAAE,IAAI,CAAC,MAAM;wBACnB,KAAK,EAAE,SAAS;wBAChB,IAAI;wBACJ,aAAa,EAAE,IAAI,CAAC,aAAa;wBACjC,gBAAgB,EAAE,IAAI,CAAC,gBAAgB;wBACvC,oBAAoB,EAAE,IAAI,CAAC,oBAAoB;wBAC/C,oBAAoB;wBACpB,gBAAgB;qBACjB,CAAC,CAAA;oBAEF,IAAI,IAAI,EAAE,CAAC;wBAGT,IAAI,oBAAoB,EAAE,CAAC;4BACzB,KAAK,CAAC,IAAI,CAAC;gCACT,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;gCACtC,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;gCAC5C,IAAI;6BACL,CAAC,CAAA;wBACJ,CAAC;oBACH,CAAC;gBACH,CAAC;gBAED,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;oBACnD,IAAI;oBACJ,IAAI,EAAE,kBAAkB;oBACxB,OAAO,EAAE,SAAS,CAAC,EAAE;iBACtB,CAAC,CAAA;gBAEF,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBAC9B,IAAI,CAAC;wBACH,IAAI,MAAY,CAAA;wBAChB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;4BAEnB,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;4BAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;gCACnB,OAAO,IAAI,CAAA;4BACb,CAAC;4BAGD,MAAM,GAAG,OAAO,CAAC,MAAc,CAAA;wBACjC,CAAC;6BAAM,CAAC;4BACN,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,CACV,CAAA;4BAGD,MAAM,IAAA,8BAAY,EAAC,IAAI,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;4BAGtD,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,MAAM,EAAE,SAAS,EAAE,GAAG,QAAQ,EAAE,GAAG,IAAI,CAAA;gCACvC,IAAI,WAAqB,CAAA;gCACzB,IAAI,YAAY,EAAE,CAAC;oCACjB,MAAM,kBAAkB,GAAG,MAAM,IAAA,wBAAe,EAAC;wCAC/C,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAW;wCACtC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;wCAC5C,WAAW,EAAE,QAAQ,CAAC,MAAM,CAAC,WAAY;wCACzC,UAAU,EAAE,QAAQ,CAAC,MAAM,CAAC,UAAU;wCACtC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wCAClC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO;wCACxC,QAAQ,EAAE,QAAQ,CAAC,MAAM,CAAC,QAAQ;wCAClC,SAAS,EAAE,QAAQ,CAAC,MAAM,CAAC,SAAS;wCACpC,YAAY,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC;qCAC9B,CAAC,CAAA;oCACF,WAAW,GAAG;wCACZ,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;wCACrC,GAAG,kBAAkB,CAAC,IAAI,CAAC,KAAK;wCAChC,EAAE,EAAE,QAAQ,CAAC,EAAE;qCAChB,CAAA;gCACH,CAAC;qCAAM,CAAC;oCACN,WAAW,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAAA;gCAClD,CAAC;gCACD,MAAM,YAAY,GAAG,MAAM,IAAA,kCAAc,EACvC,IAAI,CAAC,aAAa,EAClB,IAAI,EACJ,WAAW,EACX,IAAI,CAAC,oBAAoB,EACzB,IAAI,CAAC,gBAAgB,CACtB,CAAA;gCACD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE;oCAClB,GAAG,YAAY;oCACf,SAAS,EAAE,IAAI,CAAC,SAAS;iCAC1B,CAAC,CAAA;4BACJ,CAAC;4BAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,qBAAqB,EACnC,gCAAgC,CACjC,CAAA;4BACH,CAAC;4BAED,IAAI,kBAAkB,GAA0B;gCAC9C,EAAE,EAAE,IAAI,CAAC,kBAAkB,CAAC,EAAE;gCAC9B,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gCAClC,IAAI,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI;gCAClC,KAAK,EAAE,IAAI,CAAC,kBAAkB,CAAC,KAAK;oCAClC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;oCACvC,CAAC,CAAC,SAAS;gCACb,GAAG,EAAE,IAAI,CAAC,kBAAkB,CAAC,QAAQ;oCACnC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC;oCAC1C,CAAC,CAAC,SAAS;gCAOb,oBAAoB,EAClB,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,KAAK,OAAO;oCACnC,CAAC,CAAC,MAAM,IAAA,kCAAuB,EAAC,IAAI,CAAC,MAAM,CAAC;oCAC5C,CAAC,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB;wCAC5C,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC;wCACtD,CAAC,CAAC,SAAS;6BAClB,CAAA;4BAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,4BAA4B,EAAE,CAAC;gCACxD,MAAM,4BAA4B,GAChC,MAAM,IAAI,CAAC,gBAAgB,CAAC,4BAA4B,CAAC;oCACvD,WAAW,EAAE,aAAa;oCAC1B,GAAG,kBAAkB;iCACtB,CAAC,CAAA;gCAEJ,kBAAkB,GAAG;oCACnB,GAAG,kBAAkB;oCACrB,GAAG,4BAA4B;iCAChC,CAAA;4BACH,CAAC;4BAGD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;4BAC3D,IAAI,CAAC,aAAa,EAAE,CAAC;gCACnB,OAAO,IAAI,CAAA;4BACb,CAAC;4BAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CACxD,CAAA;4BAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gCAC/B,OAAO,IAAI,CAAA;4BACb,CAAC;4BAED,IAAI,oBAAoB,GAAG,KAAK,CAAA;4BAEhC,IAAI,oBAAoB,EAAE,CAAC;gCACzB,MAAM,YAAY,GAAS;oCACzB,OAAO,EAAE,SAAS,CAAC,EAAE;oCACrB,IAAI,EAAE,kBAAkB,CAAC,IAAW;oCACpC,EAAE,EAAE,kBAAkB,CAAC,EAAa;oCACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;iCAChC,CAAA;gCAED,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,CAAA;gCAExB,MAAM,GAAG,CAAC,MAAM,IAAA,iBAAS,EACvB,IAAI,CAAC,MAAM,EACX,wBAAS,EACT,WAAW,CACZ,CAAC;oCACA,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oCAC7B,KAAK;iCACN,CAAC,CAAY,CAAA;4BAChB,CAAC;iCAAM,CAAC;gCACN,IAAI,eAA4C,CAAA;gCAChD,IAAI,eAAe,EAAE,CAAC;oCACpB,eAAe,GAAG,MAAM,IAAA,wCAAiB,EAAC,IAAI,CAAC,MAAM,EAAE;wCACrD,kBAAkB;wCAClB,KAAK,EAAE,SAAS;wCAChB,YAAY,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAkB;wCACtD,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;wCACtC,YAAY;wCACZ,UAAU,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,SAAS;wCACtD,UAAU,EAAE,YAAY;qCACzB,CAAC,CAAA;oCACF,kBAAkB,CAAC,EAAE,GAAG,SAAS,CAAC,YAAY,CAAA;gCAChD,CAAC;gCACD,IAAI,YAAY,IAAI,eAAe,EAAE,CAAC;oCACpC,MAAM,kBAAkB,GAAG,MAAM,IAAA,yBAAgB,EAAC;wCAChD,UAAU,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ,CAAC,OAAO;wCACxC,OAAO,EAAE,SAAS,CAAC,EAAE;wCACrB,MAAM,EAAE,IAAI,CAAC,MAAM;wCACnB,OAAO,EAAE,IAAI,CAAC,OAAO;wCACrB,gBAAgB,EAAE,eAAe,CAAC,SAAS;wCAC3C,QAAQ,EAAE,kBAAkB,CAAC,IAAK;qCACnC,CAAC,CAAA;oCACF,MAAM,GAAG,kBAAkB,CAAC,IAAI,CAAC,MAAM,CAAA;oCACvC,oBAAoB,GAAG,IAAI,CAAA;gCAC7B,CAAC;qCAAM,CAAC;oCACN,IAAI,eAAe,EAAE,CAAC;wCAEpB,kBAAkB,CAAC,IAAI,GAAG,eAAe,CAAC,IAAI,CAAA;wCAC9C,IAAI,CAAC;4CAEH,MAAM,YAAY,GAAG,MAAM,IAAA,qBAAW,EAAC,IAAI,CAAC,MAAM,EAAE;gDAClD,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;gDAC7B,EAAE,EAAE,kBAAkB,CAAC,EAAa;gDACpC,IAAI,EAAE,kBAAkB,CAAC,IAAW;gDACpC,KAAK,EAAE,kBAAkB,CAAC,KAAK;6CAChC,CAAC,CAAA;4CACF,kBAAkB,CAAC,GAAG;gDACpB,kBAAkB,CAAC,GAAG;oDACtB,kBAAkB,CAAC,GAAG,GAAG,YAAY;oDACnC,CAAC,CAAC,kBAAkB,CAAC,GAAG;oDACxB,CAAC,CAAC,YAAY,CAAA;wCACpB,CAAC;wCAAC,MAAM,CAAC;4CAEP,kBAAkB,CAAC,GAAG,GAAG,SAAS,CAAA;wCACpC,CAAC;oCACH,CAAC;oCACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,iBAAiB,CAClB,CAAA;oCACD,MAAM,GAAG,MAAM,IAAA,iBAAS,EACtB,IAAI,CAAC,MAAM,EACX,yBAAe,EACf,iBAAiB,CAClB,CAAC;wCACA,EAAE,EAAE,kBAAkB,CAAC,EAAE;wCACzB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;wCAC7B,IAAI,EAAE,kBAAkB,CAAC,IAAI;wCAC7B,KAAK,EAAE,kBAAkB,CAAC,KAAK;wCAC/B,GAAG,EAAE,kBAAkB,CAAC,GAAG;wCAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;wCACrC,YAAY,EAAE,kBAAkB,CAAC,YAAY;wCAC7C,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;qCACjC,CAAC,CAAA;gCACjC,CAAC;4BACH,CAAC;4BACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EAET,oBAAoB;gCAClB,CAAC,CAAC;oCACE,oBAAoB;iCACrB;gCACH,CAAC,CAAC,oBAAoB;oCACpB,CAAC,CAAC,SAAS;oCACX,CAAC,CAAC;wCACE,MAAM,EAAE,MAAM;wCACd,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE;qCACjE,CACR,CAAA;wBACH,CAAC;wBAED,IAAI,kBAGS,CAAA;wBAEb,IAAI,oBAAoB,EAAE,CAAC;4BACzB,kBAAkB,GAAG,MAAM,IAAA,kEAA8B,EACvD,IAAI,CAAC,MAAM,EACX,MAAM,CACP,CAAA;wBACH,CAAC;6BAAM,IAAI,YAAY,EAAE,CAAC;4BACxB,kBAAkB,GAAG,MAAM,IAAA,sEAAgC,EAAC,MAAM,CAAC,CAAA;wBACrE,CAAC;6BAAM,CAAC;4BACN,kBAAkB,GAAG,MAAM,IAAA,wDAAyB,EAAC;gCACnD,MAAM,EAAE,IAAI,CAAC,MAAM;gCACnB,OAAO,EAAE,SAAS,CAAC,EAAE;gCACrB,MAAM;gCACN,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;oCACvB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE;wCAC9D,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI;wCACjC,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;qCACpF,CAAC,CAAA;gCACJ,CAAC;6BACF,CAAC,CAAA;wBACJ,CAAC;wBAID,IACE,kBAAkB,EAAE,eAAe;4BACnC,kBAAkB,CAAC,eAAe,KAAK,MAAM,EAC7C,CAAC;4BACD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT;gCACE,MAAM,EAAE,kBAAkB,CAAC,eAAe;gCAC1C,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,kBAAkB,CAAC,eAAe,EAAE;6BAC7F,CACF,CAAA;wBACH,CAAC;wBAED,IAAI,iBAAiB,EAAE,CAAC;4BACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAA;wBACxE,CAAC;oBACH,CAAC;oBAAC,OAAO,CAAM,EAAE,CAAC;wBAChB,MAAM,KAAK,GAAG,MAAM,IAAA,kCAAc,EAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;wBACpD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,QAAQ,EACR;4BACE,KAAK,EAAE;gCACL,OAAO,EAAE,KAAK,CAAC,KAAK,CAAC,OAAO;gCAC5B,IAAI,EAAE,KAAK,CAAC,IAAI;6BACjB;yBACF,CACF,CAAA;wBACD,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;wBAElD,MAAM,KAAK,CAAA;oBACb,CAAC;gBACH,CAAC;gBAGD,MAAM,eAAe,GAAG,OAAO,CAAC,MAAM,CAAA;gBACtC,IAAI,CAAC,eAAe,EAAE,CAAC;oBACrB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;gBACnD,CAAC;gBACD,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAAC;wBAC/C,IAAI;wBACJ,IAAI,EAAE,iBAAiB;wBACvB,MAAM,EAAE,SAAS;wBACjB,OAAO,EAAE,OAAO,CAAC,EAAE;qBACpB,CAAC,CAAA;gBACJ,CAAC;gBAED,MAAM,IAAA,0EAAkC,EACtC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,eAAe,EACf,OAAO,EACP,IAAI,CAAC,aAAa,CACnB,CAAA;gBAGD,OAAO,IAAI,CAAA;YACb,CAAC;WAAA;QAheC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC9B,CAAC;CAgeF;AAteD,0CAseC"}
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.js","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"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"}
|
|
@@ -17,7 +17,8 @@ const parseEVMErrors = async (e, step, process) => {
|
|
|
17
17
|
};
|
|
18
18
|
exports.parseEVMErrors = parseEVMErrors;
|
|
19
19
|
const handleSpecificErrors = async (e, step, process) => {
|
|
20
|
-
if (e.
|
|
20
|
+
if (e.name === 'UserRejectedRequestError' ||
|
|
21
|
+
e.cause?.name === 'UserRejectedRequestError') {
|
|
21
22
|
return new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.SignatureRejected, e.message, e);
|
|
22
23
|
}
|
|
23
24
|
if (e.cause?.code === -32000) {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"parseEVMErrors.js","sourceRoot":"","sources":["../../../core/EVM/parseEVMErrors.ts"],"names":[],"mappings":";;;AACA,0DAAmD;AACnD,4DAAqD;AACrD,4DAAuE;AACvE,sDAAuE;AACvE,+EAAwE;AAGjE,MAAM,cAAc,GAAG,KAAK,EACjC,CAAQ,EACR,IAAe,EACf,OAAiB,EACE,EAAE;IACrB,IAAI,CAAC,YAAY,sBAAQ,EAAE,CAAC;QAC1B,CAAC,CAAC,IAAI,GAAG,CAAC,CAAC,IAAI,IAAI,IAAI,CAAA;QACvB,CAAC,CAAC,OAAO,GAAG,CAAC,CAAC,OAAO,IAAI,OAAO,CAAA;QAChC,OAAO,CAAC,CAAA;IACV,CAAC;IAED,MAAM,SAAS,GAAG,MAAM,oBAAoB,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;IAE9D,OAAO,IAAI,sBAAQ,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;AAC/C,CAAC,CAAA;AAdY,QAAA,cAAc,kBAc1B;AAED,MAAM,oBAAoB,GAAG,KAAK,EAChC,CAAM,EACN,IAAe,EACf,OAAiB,EACjB,EAAE;IACF,IACE,CAAC,CAAC,IAAI,KAAK,0BAA0B;QACrC,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,0BAA0B,EAC5C,CAAC;QACD,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAMD,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;QAC7B,OAAO,IAAI,4BAAgB,CAAC,4BAAa,CAAC,iBAAiB,EAAE,CAAC,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;IAC5E,CAAC;IAED,IACE,IAAI;QACJ,OAAO,EAAE,MAAM;QACf,CAAC,CAAC,IAAI,KAAK,4BAAa,CAAC,iBAAiB;QAC1C,CAAC,CAAC,OAAO,KAAK,2BAAY,CAAC,mBAAmB,EAC9C,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAA,4CAAmB,EACxC,OAAO,CAAC,MAAM,EACd,IAAI,CAAC,MAAM,CAAC,WAAW,CACxB,CAAA;QAED,MAAM,YAAY,GAAG,QAAQ,EAAE,aAAa,CAAA;QAE5C,IAAI,YAAY,EAAE,WAAW,EAAE,CAAC,QAAQ,CAAC,YAAY,CAAC,EAAE,CAAC;YACvD,OAAO,IAAI,4BAAgB,CACzB,4BAAa,CAAC,aAAa,EAC3B,2BAAY,CAAC,WAAW,EACxB,CAAC,CACF,CAAA;QACH,CAAC;IACH,CAAC;IAED,IAAI,CAAC,YAAY,wBAAS,EAAE,CAAC;QAC3B,OAAO,CAAC,CAAA;IACV,CAAC;IAED,OAAO,IAAI,wBAAY,CAAC,CAAC,CAAC,OAAO,IAAI,2BAAY,CAAC,YAAY,EAAE,CAAC,CAAC,CAAA;AACpE,CAAC,CAAA"}
|