@lifi/sdk 3.0.0-alpha.38 → 3.0.0-alpha.39
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 +16 -15
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/switchChain.js +2 -1
- package/src/_cjs/core/EVM/switchChain.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +17 -19
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/switchChain.js +2 -1
- package/src/_esm/core/EVM/switchChain.js.map +1 -1
- package/src/_esm/core/StatusManager.js +1 -1
- package/src/_esm/version.js +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts +1 -1
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/switchChain.d.ts.map +1 -1
- package/src/_types/core/StatusManager.d.ts +1 -1
- package/src/_types/version.d.ts +1 -1
- package/src/core/EVM/EVMStepExecutor.ts +36 -56
- package/src/core/EVM/switchChain.ts +2 -1
- package/src/core/StatusManager.ts +1 -1
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -33,8 +33,12 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
33
33
|
enumerable: true,
|
|
34
34
|
configurable: true,
|
|
35
35
|
writable: true,
|
|
36
|
-
value: () => {
|
|
37
|
-
|
|
36
|
+
value: async (step) => {
|
|
37
|
+
const updatedWalletClient = await (0, switchChain_js_1.switchChain)(this.walletClient, this.statusManager, step, this.allowUserInteraction, this.executionOptions?.switchChainHook);
|
|
38
|
+
if (updatedWalletClient) {
|
|
39
|
+
this.walletClient = updatedWalletClient;
|
|
40
|
+
}
|
|
41
|
+
return updatedWalletClient;
|
|
38
42
|
}
|
|
39
43
|
});
|
|
40
44
|
Object.defineProperty(this, "executeStep", {
|
|
@@ -43,15 +47,12 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
43
47
|
writable: true,
|
|
44
48
|
value: async (step) => {
|
|
45
49
|
const recievingChainProcess = step.execution?.process.find((process) => process.type === 'RECEIVING_CHAIN');
|
|
46
|
-
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION'
|
|
47
|
-
|
|
48
|
-
const updatedWalletClient = await (0, switchChain_js_1.switchChain)(this.walletClient, this.statusManager, step, this.allowUserInteraction, this.executionOptions?.switchChainHook);
|
|
50
|
+
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION') {
|
|
51
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
49
52
|
if (!updatedWalletClient) {
|
|
50
53
|
return step;
|
|
51
54
|
}
|
|
52
|
-
this.walletClient = updatedWalletClient;
|
|
53
55
|
}
|
|
54
|
-
const client = this.walletClient.extend(viem_1.publicActions);
|
|
55
56
|
const isMultisigWalletClient = !!this.multisig?.isMultisigWalletClient;
|
|
56
57
|
const multisigBatchTransactions = [];
|
|
57
58
|
const shouldBatchTransactions = this.multisig?.shouldBatchTransactions &&
|
|
@@ -66,7 +67,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
66
67
|
!(0, index_js_1.isZeroAddress)(step.action.fromToken.address) &&
|
|
67
68
|
(shouldBatchTransactions || !isMultisigWalletClient);
|
|
68
69
|
if (checkForAllowance) {
|
|
69
|
-
const data = await (0, checkAllowance_js_1.checkAllowance)(fromChain, step,
|
|
70
|
+
const data = await (0, checkAllowance_js_1.checkAllowance)(fromChain, step, this.walletClient, this.statusManager, this.executionOptions, this.allowUserInteraction, shouldBatchTransactions);
|
|
70
71
|
if (data) {
|
|
71
72
|
const baseTransaction = {
|
|
72
73
|
to: step.action.fromToken.address,
|
|
@@ -88,16 +89,15 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
88
89
|
}
|
|
89
90
|
let txHash;
|
|
90
91
|
if (process.txHash) {
|
|
91
|
-
const updatedWalletClient = await
|
|
92
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
92
93
|
if (!updatedWalletClient) {
|
|
93
94
|
return step;
|
|
94
95
|
}
|
|
95
|
-
this.walletClient = updatedWalletClient;
|
|
96
96
|
txHash = process.txHash;
|
|
97
97
|
}
|
|
98
98
|
else {
|
|
99
99
|
process = this.statusManager.updateProcess(step, process.type, 'STARTED');
|
|
100
|
-
await (0, checkBalance_js_1.checkBalance)(
|
|
100
|
+
await (0, checkBalance_js_1.checkBalance)(this.walletClient.account.address, step);
|
|
101
101
|
if (!step.transactionRequest) {
|
|
102
102
|
const { execution, ...stepBase } = step;
|
|
103
103
|
const updatedStep = await (0, api_js_1.getStepTransaction)(stepBase);
|
|
@@ -110,11 +110,10 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
110
110
|
if (!step.transactionRequest) {
|
|
111
111
|
throw new index_js_1.TransactionError(index_js_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction.');
|
|
112
112
|
}
|
|
113
|
-
const updatedWalletClient = await
|
|
113
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
114
114
|
if (!updatedWalletClient) {
|
|
115
115
|
return step;
|
|
116
116
|
}
|
|
117
|
-
this.walletClient = updatedWalletClient;
|
|
118
117
|
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
119
118
|
if (!this.allowUserInteraction) {
|
|
120
119
|
return step;
|
|
@@ -130,7 +129,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
130
129
|
? BigInt(step.transactionRequest.gasLimit)
|
|
131
130
|
: undefined,
|
|
132
131
|
maxPriorityFeePerGas: this.walletClient.account?.type === 'local'
|
|
133
|
-
? await (0, utils_js_2.getMaxPriorityFeePerGas)(
|
|
132
|
+
? await (0, utils_js_2.getMaxPriorityFeePerGas)(this.walletClient.extend(viem_1.publicActions))
|
|
134
133
|
: step.transactionRequest.maxPriorityFeePerGas
|
|
135
134
|
? BigInt(step.transactionRequest.maxPriorityFeePerGas)
|
|
136
135
|
: undefined,
|
|
@@ -185,7 +184,9 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
185
184
|
}
|
|
186
185
|
}
|
|
187
186
|
let replacementReason;
|
|
188
|
-
const transactionReceipt = await
|
|
187
|
+
const transactionReceipt = await this.walletClient
|
|
188
|
+
.extend(viem_1.publicActions)
|
|
189
|
+
.waitForTransactionReceipt({
|
|
189
190
|
hash: txHash,
|
|
190
191
|
onReplaced: (response) => {
|
|
191
192
|
replacementReason = response.reason;
|
|
@@ -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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"}
|
|
@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.switchChain = void 0;
|
|
4
4
|
const errors_js_1 = require("../../utils/errors.js");
|
|
5
5
|
const switchChain = async (walletClient, statusManager, step, allowUserInteraction, switchChainHook) => {
|
|
6
|
-
|
|
6
|
+
const currentChainId = await walletClient.getChainId();
|
|
7
|
+
if (currentChainId === step.action.fromChainId) {
|
|
7
8
|
return walletClient;
|
|
8
9
|
}
|
|
9
10
|
step.execution = statusManager.initExecutionObject(step);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":";;;AACA,qDAAoE;AAqB7D,MAAM,WAAW,GAAG,KAAK,EAC9B,YAA0B,EAC1B,aAA4B,EAC5B,IAAsB,EACtB,oBAA6B,EAC7B,eAAiC,EACE,EAAE;IAErC,
|
|
1
|
+
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":";;;AACA,qDAAoE;AAqB7D,MAAM,WAAW,GAAG,KAAK,EAC9B,YAA0B,EAC1B,aAA4B,EAC5B,IAAsB,EACtB,oBAA6B,EAC7B,eAAiC,EACE,EAAE;IAErC,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IACtD,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,OAAO,YAAY,CAAA;IACrB,CAAC;IAGD,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACxD,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;IAEtD,IAAI,aAAa,GAAG,aAAa,CAAC,mBAAmB,CACnD,IAAI,EACJ,cAAc,EACd,iBAAiB,CAClB,CAAA;IAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,MAAM,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC5E,MAAM,cAAc,GAAG,MAAM,mBAAmB,EAAE,UAAU,EAAE,CAAA;QAC9D,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,IAAI,yBAAa,CACrB,yBAAa,CAAC,gBAAgB,EAC9B,wBAAwB,CACzB,CAAA;QACH,CAAC;QAED,aAAa,GAAG,aAAa,CAAC,aAAa,CACzC,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,MAAM,CACP,CAAA;QACD,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAC9C,OAAO,mBAAmB,CAAA;IAC5B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;YAC9D,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,IAAI,EAAE,yBAAa,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;AAtDY,QAAA,WAAW,eAsDvB"}
|
package/src/_cjs/version.js
CHANGED
|
@@ -33,8 +33,12 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
33
33
|
enumerable: true,
|
|
34
34
|
configurable: true,
|
|
35
35
|
writable: true,
|
|
36
|
-
value: () => {
|
|
37
|
-
|
|
36
|
+
value: async (step) => {
|
|
37
|
+
const updatedWalletClient = await switchChain(this.walletClient, this.statusManager, step, this.allowUserInteraction, this.executionOptions?.switchChainHook);
|
|
38
|
+
if (updatedWalletClient) {
|
|
39
|
+
this.walletClient = updatedWalletClient;
|
|
40
|
+
}
|
|
41
|
+
return updatedWalletClient;
|
|
38
42
|
}
|
|
39
43
|
});
|
|
40
44
|
Object.defineProperty(this, "executeStep", {
|
|
@@ -48,16 +52,12 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
48
52
|
// If the step is waiting for a transaction on the receiving chain, we do not switch the chain
|
|
49
53
|
// All changes are already done from the source chain
|
|
50
54
|
// Return the step
|
|
51
|
-
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION'
|
|
52
|
-
|
|
53
|
-
const updatedWalletClient = await switchChain(this.walletClient, this.statusManager, step, this.allowUserInteraction, this.executionOptions?.switchChainHook);
|
|
55
|
+
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION') {
|
|
56
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
54
57
|
if (!updatedWalletClient) {
|
|
55
|
-
// Chain switch was not successful, stop execution here
|
|
56
58
|
return step;
|
|
57
59
|
}
|
|
58
|
-
this.walletClient = updatedWalletClient;
|
|
59
60
|
}
|
|
60
|
-
const client = this.walletClient.extend(publicActions);
|
|
61
61
|
const isMultisigWalletClient = !!this.multisig?.isMultisigWalletClient;
|
|
62
62
|
const multisigBatchTransactions = [];
|
|
63
63
|
const shouldBatchTransactions = this.multisig?.shouldBatchTransactions &&
|
|
@@ -74,7 +74,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
74
74
|
!isZeroAddress(step.action.fromToken.address) &&
|
|
75
75
|
(shouldBatchTransactions || !isMultisigWalletClient);
|
|
76
76
|
if (checkForAllowance) {
|
|
77
|
-
const data = await checkAllowance(fromChain, step,
|
|
77
|
+
const data = await checkAllowance(fromChain, step, this.walletClient, this.statusManager, this.executionOptions, this.allowUserInteraction, shouldBatchTransactions);
|
|
78
78
|
if (data) {
|
|
79
79
|
// allowance doesn't need value
|
|
80
80
|
const baseTransaction = {
|
|
@@ -99,19 +99,17 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
99
99
|
let txHash;
|
|
100
100
|
if (process.txHash) {
|
|
101
101
|
// Make sure that the chain is still correct
|
|
102
|
-
const updatedWalletClient = await
|
|
102
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
103
103
|
if (!updatedWalletClient) {
|
|
104
|
-
// Chain switch was not successful, stop execution here
|
|
105
104
|
return step;
|
|
106
105
|
}
|
|
107
|
-
|
|
108
|
-
// Load exiting transaction
|
|
106
|
+
// Wait for exiting transaction
|
|
109
107
|
txHash = process.txHash;
|
|
110
108
|
}
|
|
111
109
|
else {
|
|
112
110
|
process = this.statusManager.updateProcess(step, process.type, 'STARTED');
|
|
113
111
|
// Check balance
|
|
114
|
-
await checkBalance(
|
|
112
|
+
await checkBalance(this.walletClient.account.address, step);
|
|
115
113
|
// Create new transaction
|
|
116
114
|
if (!step.transactionRequest) {
|
|
117
115
|
const { execution, ...stepBase } = step;
|
|
@@ -127,12 +125,10 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
127
125
|
}
|
|
128
126
|
// STEP 3: Send the transaction
|
|
129
127
|
// Make sure that the chain is still correct
|
|
130
|
-
const updatedWalletClient = await
|
|
128
|
+
const updatedWalletClient = await this.checkChain(step);
|
|
131
129
|
if (!updatedWalletClient) {
|
|
132
|
-
// Chain switch was not successful, stop execution here
|
|
133
130
|
return step;
|
|
134
131
|
}
|
|
135
|
-
this.walletClient = updatedWalletClient;
|
|
136
132
|
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
137
133
|
if (!this.allowUserInteraction) {
|
|
138
134
|
return step;
|
|
@@ -154,7 +150,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
154
150
|
// ? BigInt(step.transactionRequest.maxFeePerGas as string)
|
|
155
151
|
// : undefined,
|
|
156
152
|
maxPriorityFeePerGas: this.walletClient.account?.type === 'local'
|
|
157
|
-
? await getMaxPriorityFeePerGas(
|
|
153
|
+
? await getMaxPriorityFeePerGas(this.walletClient.extend(publicActions))
|
|
158
154
|
: step.transactionRequest.maxPriorityFeePerGas
|
|
159
155
|
? BigInt(step.transactionRequest.maxPriorityFeePerGas)
|
|
160
156
|
: undefined,
|
|
@@ -210,7 +206,9 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
210
206
|
}
|
|
211
207
|
}
|
|
212
208
|
let replacementReason;
|
|
213
|
-
const transactionReceipt = await
|
|
209
|
+
const transactionReceipt = await this.walletClient
|
|
210
|
+
.extend(publicActions)
|
|
211
|
+
.waitForTransactionReceipt({
|
|
214
212
|
hash: txHash,
|
|
215
213
|
onReplaced: (response) => {
|
|
216
214
|
replacementReason = response.reason;
|
|
@@ -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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"}
|
|
@@ -18,7 +18,8 @@ import { LiFiErrorCode, ProviderError } from '../../utils/errors.js';
|
|
|
18
18
|
*/
|
|
19
19
|
export const switchChain = async (walletClient, statusManager, step, allowUserInteraction, switchChainHook) => {
|
|
20
20
|
// if we are already on the correct chain we can proceed directly
|
|
21
|
-
|
|
21
|
+
const currentChainId = await walletClient.getChainId();
|
|
22
|
+
if (currentChainId === step.action.fromChainId) {
|
|
22
23
|
return walletClient;
|
|
23
24
|
}
|
|
24
25
|
// -> set status message
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAIpE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,YAA0B,EAC1B,aAA4B,EAC5B,IAAsB,EACtB,oBAA6B,EAC7B,eAAiC,EACE,EAAE;IACrC,iEAAiE;IACjE,
|
|
1
|
+
{"version":3,"file":"switchChain.js","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAIpE;;;;;;;;;;;;;;;;GAgBG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,KAAK,EAC9B,YAA0B,EAC1B,aAA4B,EAC5B,IAAsB,EACtB,oBAA6B,EAC7B,eAAiC,EACE,EAAE;IACrC,iEAAiE;IACjE,MAAM,cAAc,GAAG,MAAM,YAAY,CAAC,UAAU,EAAE,CAAA;IACtD,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;QAC/C,OAAO,YAAY,CAAA;IACrB,CAAC;IAED,wBAAwB;IACxB,IAAI,CAAC,SAAS,GAAG,aAAa,CAAC,mBAAmB,CAAC,IAAI,CAAC,CAAA;IACxD,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,iBAAiB,CAAC,CAAA;IAEtD,IAAI,aAAa,GAAG,aAAa,CAAC,mBAAmB,CACnD,IAAI,EACJ,cAAc,EACd,iBAAiB,CAClB,CAAA;IAED,IAAI,CAAC,oBAAoB,EAAE,CAAC;QAC1B,OAAM;IACR,CAAC;IAED,IAAI,CAAC;QACH,MAAM,mBAAmB,GAAG,MAAM,eAAe,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAA;QAC5E,MAAM,cAAc,GAAG,MAAM,mBAAmB,EAAE,UAAU,EAAE,CAAA;QAC9D,IAAI,cAAc,KAAK,IAAI,CAAC,MAAM,CAAC,WAAW,EAAE,CAAC;YAC/C,MAAM,IAAI,aAAa,CACrB,aAAa,CAAC,gBAAgB,EAC9B,wBAAwB,CACzB,CAAA;QACH,CAAC;QAED,aAAa,GAAG,aAAa,CAAC,aAAa,CACzC,IAAI,EACJ,aAAa,CAAC,IAAI,EAClB,MAAM,CACP,CAAA;QACD,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;QAC9C,OAAO,mBAAmB,CAAA;IAC5B,CAAC;IAAC,OAAO,KAAU,EAAE,CAAC;QACpB,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,EAAE,QAAQ,EAAE;YAC9D,KAAK,EAAE;gBACL,OAAO,EAAE,KAAK,CAAC,OAAO;gBACtB,IAAI,EAAE,aAAa,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"}
|
|
@@ -82,7 +82,7 @@ export class StatusManager {
|
|
|
82
82
|
* @param step The step where the process should be updated
|
|
83
83
|
* @param type The process type to update
|
|
84
84
|
* @param status The status the process gets.
|
|
85
|
-
* @param [params]
|
|
85
|
+
* @param [params] Additional parameters to append to the process.
|
|
86
86
|
* @returns The update process
|
|
87
87
|
*/
|
|
88
88
|
Object.defineProperty(this, "updateProcess", {
|
package/src/_esm/version.js
CHANGED
|
@@ -10,7 +10,7 @@ export declare class EVMStepExecutor extends BaseStepExecutor {
|
|
|
10
10
|
private walletClient;
|
|
11
11
|
private multisig?;
|
|
12
12
|
constructor(options: EVMStepExecutorOptions);
|
|
13
|
-
checkChain: () =>
|
|
13
|
+
checkChain: (step: LiFiStepExtended) => Promise<WalletClient | undefined>;
|
|
14
14
|
executeStep: (step: LiFiStepExtended) => Promise<LiFiStepExtended>;
|
|
15
15
|
}
|
|
16
16
|
//# sourceMappingURL=EVMStepExecutor.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAMV,YAAY,EACb,MAAM,MAAM,CAAA;AAYb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EAEpB,MAAM,aAAa,CAAA;AAMpB,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,YAAY,CAAA;AAGrE,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,YAAY,EAAE,YAAY,CAAA;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC1B;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,CAAgB;gBAErB,OAAO,EAAE,sBAAsB;IAS3C,UAAU,
|
|
1
|
+
{"version":3,"file":"EVMStepExecutor.d.ts","sourceRoot":"","sources":["../../../core/EVM/EVMStepExecutor.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAMV,YAAY,EACb,MAAM,MAAM,CAAA;AAYb,OAAO,EAAE,gBAAgB,EAAE,MAAM,wBAAwB,CAAA;AAGzD,OAAO,KAAK,EACV,gBAAgB,EAChB,mBAAmB,EAEpB,MAAM,aAAa,CAAA;AAMpB,OAAO,KAAK,EAAE,cAAc,EAAuB,MAAM,YAAY,CAAA;AAGrE,MAAM,WAAW,sBAAuB,SAAQ,mBAAmB;IACjE,YAAY,EAAE,YAAY,CAAA;IAC1B,QAAQ,CAAC,EAAE,cAAc,CAAA;CAC1B;AAED,qBAAa,eAAgB,SAAQ,gBAAgB;IACnD,OAAO,CAAC,YAAY,CAAc;IAClC,OAAO,CAAC,QAAQ,CAAC,CAAgB;gBAErB,OAAO,EAAE,sBAAsB;IAS3C,UAAU,SACF,gBAAgB,KACrB,QAAQ,YAAY,GAAG,SAAS,CAAC,CAYnC;IAED,WAAW,SAAgB,gBAAgB,KAAG,QAAQ,gBAAgB,CAAC,CA+XtE;CACF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"switchChain.d.ts","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEpE;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,WAAW,iBACR,YAAY,iBACX,aAAa,QACtB,gBAAgB,wBACA,OAAO,oBACX,eAAe,KAChC,QAAQ,YAAY,GAAG,SAAS,
|
|
1
|
+
{"version":3,"file":"switchChain.d.ts","sourceRoot":"","sources":["../../../core/EVM/switchChain.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,MAAM,CAAA;AAExC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACxD,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,aAAa,CAAA;AAEpE;;;;;;;;;;;;;;;;GAgBG;AACH,eAAO,MAAM,WAAW,iBACR,YAAY,iBACX,aAAa,QACtB,gBAAgB,wBACA,OAAO,oBACX,eAAe,KAChC,QAAQ,YAAY,GAAG,SAAS,CAgDlC,CAAA"}
|
|
@@ -47,7 +47,7 @@ export declare class StatusManager {
|
|
|
47
47
|
* @param step The step where the process should be updated
|
|
48
48
|
* @param type The process type to update
|
|
49
49
|
* @param status The status the process gets.
|
|
50
|
-
* @param [params]
|
|
50
|
+
* @param [params] Additional parameters to append to the process.
|
|
51
51
|
* @returns The update process
|
|
52
52
|
*/
|
|
53
53
|
updateProcess: (step: LiFiStepExtended, type: ProcessType, status: Status, params?: OptionalParameters) => Process;
|
package/src/_types/version.d.ts
CHANGED
|
@@ -52,8 +52,20 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
52
52
|
// TODO: add checkChain method and update wallet client inside executors
|
|
53
53
|
// This can come in handy when we execute multiple routes simultaneously and
|
|
54
54
|
// should be sure that we are on the right chain when waiting for transactions.
|
|
55
|
-
checkChain = (
|
|
56
|
-
|
|
55
|
+
checkChain = async (
|
|
56
|
+
step: LiFiStepExtended
|
|
57
|
+
): Promise<WalletClient | undefined> => {
|
|
58
|
+
const updatedWalletClient = await switchChain(
|
|
59
|
+
this.walletClient,
|
|
60
|
+
this.statusManager,
|
|
61
|
+
step,
|
|
62
|
+
this.allowUserInteraction,
|
|
63
|
+
this.executionOptions?.switchChainHook
|
|
64
|
+
)
|
|
65
|
+
if (updatedWalletClient) {
|
|
66
|
+
this.walletClient = updatedWalletClient
|
|
67
|
+
}
|
|
68
|
+
return updatedWalletClient
|
|
57
69
|
}
|
|
58
70
|
|
|
59
71
|
executeStep = async (step: LiFiStepExtended): Promise<LiFiStepExtended> => {
|
|
@@ -67,28 +79,13 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
67
79
|
// If the step is waiting for a transaction on the receiving chain, we do not switch the chain
|
|
68
80
|
// All changes are already done from the source chain
|
|
69
81
|
// Return the step
|
|
70
|
-
if (
|
|
71
|
-
|
|
72
|
-
!recievingChainProcess
|
|
73
|
-
) {
|
|
74
|
-
const updatedWalletClient = await switchChain(
|
|
75
|
-
this.walletClient,
|
|
76
|
-
this.statusManager,
|
|
77
|
-
step,
|
|
78
|
-
this.allowUserInteraction,
|
|
79
|
-
this.executionOptions?.switchChainHook
|
|
80
|
-
)
|
|
81
|
-
|
|
82
|
+
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION') {
|
|
83
|
+
const updatedWalletClient = await this.checkChain(step)
|
|
82
84
|
if (!updatedWalletClient) {
|
|
83
|
-
// Chain switch was not successful, stop execution here
|
|
84
85
|
return step
|
|
85
86
|
}
|
|
86
|
-
|
|
87
|
-
this.walletClient = updatedWalletClient
|
|
88
87
|
}
|
|
89
88
|
|
|
90
|
-
const client = this.walletClient.extend(publicActions)
|
|
91
|
-
|
|
92
89
|
const isMultisigWalletClient = !!this.multisig?.isMultisigWalletClient
|
|
93
90
|
const multisigBatchTransactions: MultisigTransaction[] = []
|
|
94
91
|
|
|
@@ -110,7 +107,6 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
110
107
|
)
|
|
111
108
|
|
|
112
109
|
// Check token approval only if fromToken is not the native token => no approval needed in that case
|
|
113
|
-
|
|
114
110
|
const checkForAllowance =
|
|
115
111
|
!existingProcess?.txHash &&
|
|
116
112
|
!isZeroAddress(step.action.fromToken.address) &&
|
|
@@ -120,7 +116,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
120
116
|
const data = await checkAllowance(
|
|
121
117
|
fromChain,
|
|
122
118
|
step,
|
|
123
|
-
|
|
119
|
+
this.walletClient,
|
|
124
120
|
this.statusManager,
|
|
125
121
|
this.executionOptions,
|
|
126
122
|
this.allowUserInteraction,
|
|
@@ -170,22 +166,12 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
170
166
|
let txHash: Hash
|
|
171
167
|
if (process.txHash) {
|
|
172
168
|
// Make sure that the chain is still correct
|
|
173
|
-
const updatedWalletClient = await
|
|
174
|
-
this.walletClient,
|
|
175
|
-
this.statusManager,
|
|
176
|
-
step,
|
|
177
|
-
this.allowUserInteraction,
|
|
178
|
-
this.executionOptions?.switchChainHook
|
|
179
|
-
)
|
|
180
|
-
|
|
169
|
+
const updatedWalletClient = await this.checkChain(step)
|
|
181
170
|
if (!updatedWalletClient) {
|
|
182
|
-
// Chain switch was not successful, stop execution here
|
|
183
171
|
return step
|
|
184
172
|
}
|
|
185
173
|
|
|
186
|
-
|
|
187
|
-
|
|
188
|
-
// Load exiting transaction
|
|
174
|
+
// Wait for exiting transaction
|
|
189
175
|
txHash = process.txHash as Hash
|
|
190
176
|
} else {
|
|
191
177
|
process = this.statusManager.updateProcess(
|
|
@@ -195,7 +181,7 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
195
181
|
)
|
|
196
182
|
|
|
197
183
|
// Check balance
|
|
198
|
-
await checkBalance(
|
|
184
|
+
await checkBalance(this.walletClient.account!.address, step)
|
|
199
185
|
|
|
200
186
|
// Create new transaction
|
|
201
187
|
if (!step.transactionRequest) {
|
|
@@ -223,21 +209,11 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
223
209
|
|
|
224
210
|
// STEP 3: Send the transaction
|
|
225
211
|
// Make sure that the chain is still correct
|
|
226
|
-
const updatedWalletClient = await
|
|
227
|
-
this.walletClient,
|
|
228
|
-
this.statusManager,
|
|
229
|
-
step,
|
|
230
|
-
this.allowUserInteraction,
|
|
231
|
-
this.executionOptions?.switchChainHook
|
|
232
|
-
)
|
|
233
|
-
|
|
212
|
+
const updatedWalletClient = await this.checkChain(step)
|
|
234
213
|
if (!updatedWalletClient) {
|
|
235
|
-
// Chain switch was not successful, stop execution here
|
|
236
214
|
return step
|
|
237
215
|
}
|
|
238
216
|
|
|
239
|
-
this.walletClient = updatedWalletClient
|
|
240
|
-
|
|
241
217
|
process = this.statusManager.updateProcess(
|
|
242
218
|
step,
|
|
243
219
|
process.type,
|
|
@@ -266,7 +242,9 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
266
242
|
// : undefined,
|
|
267
243
|
maxPriorityFeePerGas:
|
|
268
244
|
this.walletClient.account?.type === 'local'
|
|
269
|
-
? await getMaxPriorityFeePerGas(
|
|
245
|
+
? await getMaxPriorityFeePerGas(
|
|
246
|
+
this.walletClient.extend(publicActions) as PublicClient
|
|
247
|
+
)
|
|
270
248
|
: step.transactionRequest.maxPriorityFeePerGas
|
|
271
249
|
? BigInt(
|
|
272
250
|
step.transactionRequest.maxPriorityFeePerGas as string
|
|
@@ -343,16 +321,18 @@ export class EVMStepExecutor extends BaseStepExecutor {
|
|
|
343
321
|
}
|
|
344
322
|
|
|
345
323
|
let replacementReason: ReplacementReason | undefined
|
|
346
|
-
const transactionReceipt = await
|
|
347
|
-
|
|
348
|
-
|
|
349
|
-
|
|
350
|
-
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
354
|
-
|
|
355
|
-
|
|
324
|
+
const transactionReceipt = await this.walletClient
|
|
325
|
+
.extend(publicActions)
|
|
326
|
+
.waitForTransactionReceipt({
|
|
327
|
+
hash: txHash,
|
|
328
|
+
onReplaced: (response) => {
|
|
329
|
+
replacementReason = response.reason
|
|
330
|
+
this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
331
|
+
txHash: response.transaction.hash,
|
|
332
|
+
txLink: `${fromChain.metamask.blockExplorerUrls[0]}tx/${response.transaction.hash}`,
|
|
333
|
+
})
|
|
334
|
+
},
|
|
335
|
+
})
|
|
356
336
|
|
|
357
337
|
if (replacementReason === 'cancelled') {
|
|
358
338
|
throw new TransactionError(
|
|
@@ -28,7 +28,8 @@ export const switchChain = async (
|
|
|
28
28
|
switchChainHook?: SwitchChainHook
|
|
29
29
|
): Promise<WalletClient | undefined> => {
|
|
30
30
|
// if we are already on the correct chain we can proceed directly
|
|
31
|
-
|
|
31
|
+
const currentChainId = await walletClient.getChainId()
|
|
32
|
+
if (currentChainId === step.action.fromChainId) {
|
|
32
33
|
return walletClient
|
|
33
34
|
}
|
|
34
35
|
|
|
@@ -139,7 +139,7 @@ export class StatusManager {
|
|
|
139
139
|
* @param step The step where the process should be updated
|
|
140
140
|
* @param type The process type to update
|
|
141
141
|
* @param status The status the process gets.
|
|
142
|
-
* @param [params]
|
|
142
|
+
* @param [params] Additional parameters to append to the process.
|
|
143
143
|
* @returns The update process
|
|
144
144
|
*/
|
|
145
145
|
updateProcess = (
|
package/src/version.ts
CHANGED
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
export const name = '@lifi/sdk'
|
|
2
|
-
export const version = '3.0.0-alpha.
|
|
2
|
+
export const version = '3.0.0-alpha.39'
|