@lifi/sdk 3.1.5 → 3.2.0-alpha.1
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 +29 -29
- package/src/_cjs/core/EVM/EVM.js +2 -2
- package/src/_cjs/core/EVM/EVM.js.map +1 -1
- package/src/_cjs/core/EVM/EVMStepExecutor.js +29 -29
- package/src/_cjs/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_cjs/core/EVM/checkAllowance.js +8 -8
- package/src/_cjs/core/EVM/checkAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/getAllowance.js +8 -11
- package/src/_cjs/core/EVM/getAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/getENSAddress.js +1 -1
- package/src/_cjs/core/EVM/getENSAddress.js.map +1 -1
- package/src/_cjs/core/EVM/getEVMBalance.js +6 -5
- package/src/_cjs/core/EVM/getEVMBalance.js.map +1 -1
- package/src/_cjs/core/EVM/publicClient.js +1 -1
- package/src/_cjs/core/EVM/publicClient.js.map +1 -1
- package/src/_cjs/core/EVM/setAllowance.js +5 -5
- package/src/_cjs/core/EVM/setAllowance.js.map +1 -1
- package/src/_cjs/core/EVM/switchChain.js +10 -6
- package/src/_cjs/core/EVM/switchChain.js.map +1 -1
- package/src/_cjs/core/EVM/utils.js +2 -1
- package/src/_cjs/core/EVM/utils.js.map +1 -1
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js +4 -4
- package/src/_cjs/core/EVM/waitForTransactionReceipt.js.map +1 -1
- package/src/_cjs/version.js +1 -1
- package/src/_cjs/version.js.map +1 -1
- package/src/_esm/core/EVM/EVM.js +2 -2
- package/src/_esm/core/EVM/EVM.js.map +1 -1
- package/src/_esm/core/EVM/EVMStepExecutor.js +29 -29
- package/src/_esm/core/EVM/EVMStepExecutor.js.map +1 -1
- package/src/_esm/core/EVM/checkAllowance.js +8 -8
- package/src/_esm/core/EVM/checkAllowance.js.map +1 -1
- package/src/_esm/core/EVM/getAllowance.js +8 -11
- package/src/_esm/core/EVM/getAllowance.js.map +1 -1
- package/src/_esm/core/EVM/getENSAddress.js +2 -2
- package/src/_esm/core/EVM/getENSAddress.js.map +1 -1
- package/src/_esm/core/EVM/getEVMBalance.js +6 -5
- package/src/_esm/core/EVM/getEVMBalance.js.map +1 -1
- package/src/_esm/core/EVM/publicClient.js +2 -2
- package/src/_esm/core/EVM/publicClient.js.map +1 -1
- package/src/_esm/core/EVM/setAllowance.js +6 -6
- package/src/_esm/core/EVM/setAllowance.js.map +1 -1
- package/src/_esm/core/EVM/switchChain.js +14 -10
- package/src/_esm/core/EVM/switchChain.js.map +1 -1
- package/src/_esm/core/EVM/utils.js +2 -1
- package/src/_esm/core/EVM/utils.js.map +1 -1
- package/src/_esm/core/EVM/waitForTransactionReceipt.js +4 -4
- package/src/_esm/core/EVM/waitForTransactionReceipt.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 +4 -4
- package/src/_types/core/EVM/EVMStepExecutor.d.ts.map +1 -1
- package/src/_types/core/EVM/checkAllowance.d.ts +2 -2
- package/src/_types/core/EVM/checkAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/getAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/getEVMBalance.d.ts.map +1 -1
- package/src/_types/core/EVM/publicClient.d.ts +2 -2
- package/src/_types/core/EVM/publicClient.d.ts.map +1 -1
- package/src/_types/core/EVM/setAllowance.d.ts +2 -2
- package/src/_types/core/EVM/setAllowance.d.ts.map +1 -1
- package/src/_types/core/EVM/switchChain.d.ts +6 -6
- package/src/_types/core/EVM/switchChain.d.ts.map +1 -1
- package/src/_types/core/EVM/types.d.ts +5 -5
- package/src/_types/core/EVM/types.d.ts.map +1 -1
- package/src/_types/core/EVM/utils.d.ts +2 -2
- package/src/_types/core/EVM/utils.d.ts.map +1 -1
- package/src/_types/core/EVM/waitForTransactionReceipt.d.ts +3 -3
- package/src/_types/core/EVM/waitForTransactionReceipt.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/version.d.ts +1 -1
- package/src/_types/version.d.ts.map +1 -1
- package/src/core/EVM/EVM.ts +2 -2
- package/src/core/EVM/EVMStepExecutor.ts +33 -46
- package/src/core/EVM/checkAllowance.ts +9 -9
- package/src/core/EVM/getAllowance.ts +8 -12
- package/src/core/EVM/getENSAddress.ts +2 -2
- package/src/core/EVM/getEVMBalance.ts +11 -5
- package/src/core/EVM/publicClient.ts +5 -7
- package/src/core/EVM/setAllowance.ts +8 -13
- package/src/core/EVM/switchChain.ts +16 -12
- package/src/core/EVM/types.ts +5 -5
- package/src/core/EVM/utils.ts +4 -3
- package/src/core/EVM/waitForTransactionReceipt.ts +7 -10
- package/src/core/types.ts +2 -4
- package/src/version.ts +1 -1
package/package.json
CHANGED
|
@@ -1,19 +1,19 @@
|
|
|
1
1
|
{
|
|
2
|
-
"name": "@lifi/sdk",
|
|
3
|
-
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
4
2
|
"dependencies": {
|
|
5
|
-
"@lifi/types": "^15.
|
|
3
|
+
"@lifi/types": "^15.3.0",
|
|
6
4
|
"@solana/wallet-adapter-base": "^0.9.23",
|
|
7
5
|
"@solana/web3.js": "^1.95.2",
|
|
8
|
-
"
|
|
9
|
-
"viem": "^2.19.3"
|
|
6
|
+
"viem": "^2.19.4"
|
|
10
7
|
},
|
|
11
|
-
"
|
|
12
|
-
|
|
13
|
-
"
|
|
14
|
-
|
|
8
|
+
"description": "LI.FI Any-to-Any Cross-Chain-Swap SDK",
|
|
9
|
+
"exports": {
|
|
10
|
+
".": {
|
|
11
|
+
"types": "./src/_types/index.d.ts",
|
|
12
|
+
"import": "./src/_esm/index.js",
|
|
13
|
+
"default": "./src/_cjs/index.js"
|
|
14
|
+
},
|
|
15
|
+
"./package.json": "./package.json"
|
|
15
16
|
},
|
|
16
|
-
"version": "3.1.5",
|
|
17
17
|
"files": [
|
|
18
18
|
"src",
|
|
19
19
|
"!src/**/*.test.ts",
|
|
@@ -22,24 +22,7 @@
|
|
|
22
22
|
"!src/**/*.handlers.ts",
|
|
23
23
|
"!src/**/*.tsbuildinfo"
|
|
24
24
|
],
|
|
25
|
-
"
|
|
26
|
-
".": {
|
|
27
|
-
"types": "./src/_types/index.d.ts",
|
|
28
|
-
"import": "./src/_esm/index.js",
|
|
29
|
-
"default": "./src/_cjs/index.js"
|
|
30
|
-
},
|
|
31
|
-
"./package.json": "./package.json"
|
|
32
|
-
},
|
|
33
|
-
"main": "./src/_cjs/index.js",
|
|
34
|
-
"module": "./src/_esm/index.js",
|
|
35
|
-
"types": "./src/_types/index.d.ts",
|
|
36
|
-
"typings": "./src/_types/index.d.ts",
|
|
37
|
-
"sideEffects": false,
|
|
38
|
-
"license": "Apache-2.0",
|
|
39
|
-
"repository": {
|
|
40
|
-
"type": "git",
|
|
41
|
-
"url": "git+ssh://git@github.com/lifinance/sdk.git"
|
|
42
|
-
},
|
|
25
|
+
"homepage": "https://github.com/lifinance/sdk",
|
|
43
26
|
"keywords": [
|
|
44
27
|
"bridge",
|
|
45
28
|
"bridge-aggregation",
|
|
@@ -59,5 +42,22 @@
|
|
|
59
42
|
"wagmi",
|
|
60
43
|
"web3",
|
|
61
44
|
"web3-react"
|
|
62
|
-
]
|
|
45
|
+
],
|
|
46
|
+
"license": "Apache-2.0",
|
|
47
|
+
"main": "./src/_cjs/index.js",
|
|
48
|
+
"module": "./src/_esm/index.js",
|
|
49
|
+
"name": "@lifi/sdk",
|
|
50
|
+
"peerDependencies": {
|
|
51
|
+
"@solana/wallet-adapter-base": "^0.9.0",
|
|
52
|
+
"@solana/web3.js": "^1.93.0",
|
|
53
|
+
"viem": "^2.16.0"
|
|
54
|
+
},
|
|
55
|
+
"repository": {
|
|
56
|
+
"type": "git",
|
|
57
|
+
"url": "git+ssh://git@github.com/lifinance/sdk.git"
|
|
58
|
+
},
|
|
59
|
+
"sideEffects": false,
|
|
60
|
+
"types": "./src/_types/index.d.ts",
|
|
61
|
+
"typings": "./src/_types/index.d.ts",
|
|
62
|
+
"version": "3.2.0-alpha.1"
|
|
63
63
|
}
|
package/src/_cjs/core/EVM/EVM.js
CHANGED
|
@@ -20,11 +20,11 @@ function EVM(options) {
|
|
|
20
20
|
getBalance: getEVMBalance_js_1.getEVMBalance,
|
|
21
21
|
async getStepExecutor(options) {
|
|
22
22
|
if (!_options.getWalletClient) {
|
|
23
|
-
throw new Error(`
|
|
23
|
+
throw new Error(`Client is not provided.`);
|
|
24
24
|
}
|
|
25
25
|
const walletClient = await _options.getWalletClient();
|
|
26
26
|
const executor = new EVMStepExecutor_js_1.EVMStepExecutor({
|
|
27
|
-
walletClient,
|
|
27
|
+
client: walletClient,
|
|
28
28
|
multisig: _options.multisig,
|
|
29
29
|
routeId: options.routeId,
|
|
30
30
|
executionOptions: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"EVM.js","sourceRoot":"","sources":["../../../core/EVM/EVM.ts"],"names":[],"mappings":";;AAQA,kBAsCC;AA9CD,uCAAuC;AACvC,+BAAgC;AAEhC,6DAAsD;AACtD,yDAAkD;AAClD,yDAAkD;AAGlD,SAAgB,GAAG,CAAC,OAA4B;IAC9C,MAAM,QAAQ,GAAuB,OAAO,IAAI,EAAE,CAAA;IAClD,OAAO;QACL,IAAI,IAAI;YACN,OAAO,iBAAS,CAAC,GAAG,CAAA;QACtB,CAAC;QACD,IAAI,QAAQ;YACV,OAAO,QAAQ,CAAC,QAAQ,CAAA;QAC1B,CAAC;QACD,SAAS,EAAT,gBAAS;QACT,cAAc,EAAE,gCAAa;QAC7B,UAAU,EAAE,gCAAa;QACzB,KAAK,CAAC,eAAe,CACnB,OAA4B;YAE5B,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"EVM.js","sourceRoot":"","sources":["../../../core/EVM/EVM.ts"],"names":[],"mappings":";;AAQA,kBAsCC;AA9CD,uCAAuC;AACvC,+BAAgC;AAEhC,6DAAsD;AACtD,yDAAkD;AAClD,yDAAkD;AAGlD,SAAgB,GAAG,CAAC,OAA4B;IAC9C,MAAM,QAAQ,GAAuB,OAAO,IAAI,EAAE,CAAA;IAClD,OAAO;QACL,IAAI,IAAI;YACN,OAAO,iBAAS,CAAC,GAAG,CAAA;QACtB,CAAC;QACD,IAAI,QAAQ;YACV,OAAO,QAAQ,CAAC,QAAQ,CAAA;QAC1B,CAAC;QACD,SAAS,EAAT,gBAAS;QACT,cAAc,EAAE,gCAAa;QAC7B,UAAU,EAAE,gCAAa;QACzB,KAAK,CAAC,eAAe,CACnB,OAA4B;YAE5B,IAAI,CAAC,QAAQ,CAAC,eAAe,EAAE,CAAC;gBAC9B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAA;YAC5C,CAAC;YAED,MAAM,YAAY,GAAG,MAAM,QAAQ,CAAC,eAAe,EAAE,CAAA;YAErD,MAAM,QAAQ,GAAG,IAAI,oCAAe,CAAC;gBACnC,MAAM,EAAE,YAAY;gBACpB,QAAQ,EAAE,QAAQ,CAAC,QAAQ;gBAC3B,OAAO,EAAE,OAAO,CAAC,OAAO;gBACxB,gBAAgB,EAAE;oBAChB,GAAG,OAAO,CAAC,gBAAgB;oBAC3B,eAAe,EACb,QAAQ,CAAC,WAAW,IAAI,OAAO,CAAC,gBAAgB,EAAE,eAAe;iBACpE;aACF,CAAC,CAAA;YAEF,OAAO,QAAQ,CAAA;QACjB,CAAC;QACD,UAAU,CAAC,OAA2B;YACpC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;QAClC,CAAC;KACF,CAAA;AACH,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.EVMStepExecutor = void 0;
|
|
4
|
-
const
|
|
4
|
+
const actions_1 = require("viem/actions");
|
|
5
5
|
const config_js_1 = require("../../config.js");
|
|
6
6
|
const constants_js_1 = require("../../errors/constants.js");
|
|
7
7
|
const errors_js_1 = require("../../errors/errors.js");
|
|
@@ -21,7 +21,7 @@ const waitForTransactionReceipt_js_1 = require("./waitForTransactionReceipt.js")
|
|
|
21
21
|
class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
22
22
|
constructor(options) {
|
|
23
23
|
super(options);
|
|
24
|
-
Object.defineProperty(this, "
|
|
24
|
+
Object.defineProperty(this, "client", {
|
|
25
25
|
enumerable: true,
|
|
26
26
|
configurable: true,
|
|
27
27
|
writable: true,
|
|
@@ -33,18 +33,18 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
33
33
|
writable: true,
|
|
34
34
|
value: void 0
|
|
35
35
|
});
|
|
36
|
-
Object.defineProperty(this, "
|
|
36
|
+
Object.defineProperty(this, "checkClient", {
|
|
37
37
|
enumerable: true,
|
|
38
38
|
configurable: true,
|
|
39
39
|
writable: true,
|
|
40
40
|
value: async (step, process) => {
|
|
41
|
-
const
|
|
42
|
-
if (
|
|
43
|
-
this.
|
|
41
|
+
const updatedClient = await (0, switchChain_js_1.switchChain)(this.client, this.statusManager, step, this.allowUserInteraction, this.executionOptions?.switchChainHook);
|
|
42
|
+
if (updatedClient) {
|
|
43
|
+
this.client = updatedClient;
|
|
44
44
|
}
|
|
45
|
-
let accountAddress = this.
|
|
45
|
+
let accountAddress = this.client.account?.address;
|
|
46
46
|
if (!accountAddress) {
|
|
47
|
-
const accountAddresses = await
|
|
47
|
+
const accountAddresses = await (0, actions_1.getAddresses)(this.client);
|
|
48
48
|
accountAddress = accountAddresses?.[0];
|
|
49
49
|
}
|
|
50
50
|
if (accountAddress !== step.action.fromAddress) {
|
|
@@ -62,7 +62,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
62
62
|
this.statusManager.updateExecution(step, 'FAILED');
|
|
63
63
|
throw await (0, parseEVMErrors_js_1.parseEVMErrors)(new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.WalletChangedDuringExecution, errorMessage), step, process);
|
|
64
64
|
}
|
|
65
|
-
return
|
|
65
|
+
return updatedClient;
|
|
66
66
|
}
|
|
67
67
|
});
|
|
68
68
|
Object.defineProperty(this, "executeStep", {
|
|
@@ -73,12 +73,12 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
73
73
|
step.execution = this.statusManager.initExecutionObject(step);
|
|
74
74
|
const recievingChainProcess = step.execution?.process.find((process) => process.type === 'RECEIVING_CHAIN');
|
|
75
75
|
if (recievingChainProcess?.substatus !== 'WAIT_DESTINATION_TRANSACTION') {
|
|
76
|
-
const
|
|
77
|
-
if (!
|
|
76
|
+
const updatedClient = await this.checkClient(step);
|
|
77
|
+
if (!updatedClient) {
|
|
78
78
|
return step;
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
|
-
const
|
|
81
|
+
const isMultisigClient = !!this.multisig?.isMultisigClient;
|
|
82
82
|
const multisigBatchTransactions = [];
|
|
83
83
|
const shouldBatchTransactions = this.multisig?.shouldBatchTransactions &&
|
|
84
84
|
!!this.multisig.sendBatchTransaction;
|
|
@@ -89,9 +89,9 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
89
89
|
const existingProcess = step.execution.process.find((p) => p.type === currentProcessType);
|
|
90
90
|
const checkForAllowance = !existingProcess?.txHash &&
|
|
91
91
|
!(0, index_js_1.isZeroAddress)(step.action.fromToken.address) &&
|
|
92
|
-
(shouldBatchTransactions || !
|
|
92
|
+
(shouldBatchTransactions || !isMultisigClient);
|
|
93
93
|
if (checkForAllowance) {
|
|
94
|
-
const data = await (0, checkAllowance_js_1.checkAllowance)(fromChain, step, this.
|
|
94
|
+
const data = await (0, checkAllowance_js_1.checkAllowance)(this.client, fromChain, step, this.statusManager, this.executionOptions, this.allowUserInteraction, shouldBatchTransactions);
|
|
95
95
|
if (data) {
|
|
96
96
|
const baseTransaction = {
|
|
97
97
|
to: step.action.fromToken.address,
|
|
@@ -104,7 +104,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
104
104
|
if (process.status !== 'DONE') {
|
|
105
105
|
const multisigProcess = step.execution.process.find((p) => !!p.multisigTxHash);
|
|
106
106
|
try {
|
|
107
|
-
if (
|
|
107
|
+
if (isMultisigClient && multisigProcess) {
|
|
108
108
|
const multisigTxHash = multisigProcess.multisigTxHash;
|
|
109
109
|
if (!multisigTxHash) {
|
|
110
110
|
throw new errors_js_1.ValidationError('Multisig internal transaction hash is undefined.');
|
|
@@ -113,15 +113,15 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
113
113
|
}
|
|
114
114
|
let txHash;
|
|
115
115
|
if (process.txHash) {
|
|
116
|
-
const
|
|
117
|
-
if (!
|
|
116
|
+
const updatedClient = await this.checkClient(step, process);
|
|
117
|
+
if (!updatedClient) {
|
|
118
118
|
return step;
|
|
119
119
|
}
|
|
120
120
|
txHash = process.txHash;
|
|
121
121
|
}
|
|
122
122
|
else {
|
|
123
123
|
process = this.statusManager.updateProcess(step, process.type, 'STARTED');
|
|
124
|
-
await (0, checkBalance_js_1.checkBalance)(this.
|
|
124
|
+
await (0, checkBalance_js_1.checkBalance)(this.client.account.address, step);
|
|
125
125
|
if (!step.transactionRequest) {
|
|
126
126
|
const { execution, ...stepBase } = step;
|
|
127
127
|
const updatedStep = await (0, api_js_1.getStepTransaction)(stepBase);
|
|
@@ -134,8 +134,8 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
134
134
|
if (!step.transactionRequest) {
|
|
135
135
|
throw new errors_js_1.TransactionError(constants_js_1.LiFiErrorCode.TransactionUnprepared, 'Unable to prepare transaction.');
|
|
136
136
|
}
|
|
137
|
-
const
|
|
138
|
-
if (!
|
|
137
|
+
const updatedClient = await this.checkClient(step, process);
|
|
138
|
+
if (!updatedClient) {
|
|
139
139
|
return step;
|
|
140
140
|
}
|
|
141
141
|
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED');
|
|
@@ -152,8 +152,8 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
152
152
|
gas: step.transactionRequest.gasLimit
|
|
153
153
|
? BigInt(step.transactionRequest.gasLimit)
|
|
154
154
|
: undefined,
|
|
155
|
-
maxPriorityFeePerGas: this.
|
|
156
|
-
? await (0, utils_js_1.getMaxPriorityFeePerGas)(this.
|
|
155
|
+
maxPriorityFeePerGas: this.client.account?.type === 'local'
|
|
156
|
+
? await (0, utils_js_1.getMaxPriorityFeePerGas)(this.client)
|
|
157
157
|
: step.transactionRequest.maxPriorityFeePerGas
|
|
158
158
|
? BigInt(step.transactionRequest.maxPriorityFeePerGas)
|
|
159
159
|
: undefined,
|
|
@@ -183,9 +183,9 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
183
183
|
}
|
|
184
184
|
}
|
|
185
185
|
else {
|
|
186
|
-
txHash = await
|
|
186
|
+
txHash = await (0, actions_1.sendTransaction)(this.client, {
|
|
187
187
|
to: transactionRequest.to,
|
|
188
|
-
account: this.
|
|
188
|
+
account: this.client.account,
|
|
189
189
|
data: transactionRequest.data,
|
|
190
190
|
value: transactionRequest.value,
|
|
191
191
|
gas: transactionRequest.gas,
|
|
@@ -195,7 +195,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
195
195
|
chain: null,
|
|
196
196
|
});
|
|
197
197
|
}
|
|
198
|
-
if (
|
|
198
|
+
if (isMultisigClient) {
|
|
199
199
|
process = this.statusManager.updateProcess(step, process.type, 'ACTION_REQUIRED', {
|
|
200
200
|
multisigTxHash: txHash,
|
|
201
201
|
});
|
|
@@ -208,7 +208,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
208
208
|
}
|
|
209
209
|
}
|
|
210
210
|
const transactionReceipt = await (0, waitForTransactionReceipt_js_1.waitForTransactionReceipt)({
|
|
211
|
-
|
|
211
|
+
client: this.client,
|
|
212
212
|
chainId: fromChain.id,
|
|
213
213
|
txHash,
|
|
214
214
|
onReplaced: (response) => {
|
|
@@ -218,10 +218,10 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
218
218
|
});
|
|
219
219
|
},
|
|
220
220
|
});
|
|
221
|
-
if (
|
|
221
|
+
if (isMultisigClient && process.status === 'ACTION_REQUIRED') {
|
|
222
222
|
await (0, multisig_js_1.updateMultisigRouteProcess)(transactionReceipt?.transactionHash || txHash, step, process.type, fromChain, this.statusManager, this.multisig);
|
|
223
223
|
}
|
|
224
|
-
if (!
|
|
224
|
+
if (!isMultisigClient &&
|
|
225
225
|
transactionReceipt?.transactionHash &&
|
|
226
226
|
transactionReceipt.transactionHash !== txHash) {
|
|
227
227
|
process = this.statusManager.updateProcess(step, process.type, 'PENDING', {
|
|
@@ -295,7 +295,7 @@ class EVMStepExecutor extends BaseStepExecutor_js_1.BaseStepExecutor {
|
|
|
295
295
|
return step;
|
|
296
296
|
}
|
|
297
297
|
});
|
|
298
|
-
this.
|
|
298
|
+
this.client = options.client;
|
|
299
299
|
this.multisig = options.multisig;
|
|
300
300
|
}
|
|
301
301
|
}
|
|
@@ -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":";;;AAMA,0CAA4D;AAC5D,+CAAwC;AACxC,4DAAyD;AACzD,sDAA0E;AAC1E,kDAA0D;AAC1D,mDAG6B;AAC7B,gEAAyD;AACzD,wDAAiD;AACjD,8DAA2D;AAC3D,4DAAqD;AAMrD,sFAA+E;AAC/E,2DAAoD;AACpD,+CAA0D;AAC1D,2DAAoD;AACpD,qDAA8C;AAE9C,yCAAoD;AACpD,iFAA0E;AAO1E,MAAa,eAAgB,SAAQ,sCAAgB;IAInD,YAAY,OAA+B;QACzC,KAAK,CAAC,OAAO,CAAC,CAAA;QAJR;;;;;WAAc;QACd;;;;;WAAyB;QASjC;;;;mBAAc,KAAK,EACjB,IAAsB,EACtB,OAAiB,EACY,EAAE;gBAC/B,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,MAAM,IAAA,sBAAY,EAAC,IAAI,CAAC,MAAM,CAAC,CAAA;oBACxD,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,CACtD,IAAI,EACJ,aAAa,CACd,CAAA;oBACH,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,qBAAqB,GAAG,IAAI,CAAC,SAAS,EAAE,OAAO,CAAC,IAAI,CACxD,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,KAAK,iBAAiB,CAChD,CAAA;gBAMD,IAAI,qBAAqB,EAAE,SAAS,KAAK,8BAA8B,EAAE,CAAC;oBACxE,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,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,QAAQ,EAAE,gBAAgB,CAAA;gBAC1D,MAAM,yBAAyB,GAA0B,EAAE,CAAA;gBAE3D,MAAM,uBAAuB,GAC3B,IAAI,CAAC,QAAQ,EAAE,uBAAuB;oBACtC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,oBAAoB,CAAA;gBAEtC,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,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,iBAAiB,GACrB,CAAC,eAAe,EAAE,MAAM;oBACxB,CAAC,IAAA,wBAAa,EAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC;oBAC7C,CAAC,uBAAuB,IAAI,CAAC,gBAAgB,CAAC,CAAA;gBAEhD,IAAI,iBAAiB,EAAE,CAAC;oBACtB,MAAM,IAAI,GAAG,MAAM,IAAA,kCAAc,EAC/B,IAAI,CAAC,MAAM,EACX,SAAS,EACT,IAAI,EACJ,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,oBAAoB,EACzB,uBAAuB,CACxB,CAAA;oBAED,IAAI,IAAI,EAAE,CAAC;wBAET,MAAM,eAAe,GAAwB;4BAC3C,EAAE,EAAE,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO;4BACjC,IAAI;yBACL,CAAA;wBAED,yBAAyB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;oBACjD,CAAC;gBACH,CAAC;gBAGD,IAAI,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAClD,IAAI,EACJ,kBAAkB,CACnB,CAAA;gBAED,IAAI,OAAO,CAAC,MAAM,KAAK,MAAM,EAAE,CAAC;oBAC9B,MAAM,eAAe,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,IAAI,CACjD,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,cAAc,CAC1B,CAAA;oBAED,IAAI,CAAC;wBACH,IAAI,gBAAgB,IAAI,eAAe,EAAE,CAAC;4BACxC,MAAM,cAAc,GAAG,eAAe,CAAC,cAAsB,CAAA;4BAC7D,IAAI,CAAC,cAAc,EAAE,CAAC;gCACpB,MAAM,IAAI,2BAAe,CACvB,kDAAkD,CACnD,CAAA;4BACH,CAAC;4BACD,MAAM,IAAA,wCAA0B,EAC9B,cAAc,EACd,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,QAAQ,CACd,CAAA;wBACH,CAAC;wBAED,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,MAAM,WAAW,GAAG,MAAM,IAAA,2BAAkB,EAAC,QAAQ,CAAC,CAAA;gCACtD,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,IAAI,GAAG;oCACL,GAAG,YAAY;oCACf,SAAS,EAAE,IAAI,CAAC,SAAS;iCAC1B,CAAA;4BACH,CAAC;4BAED,IAAI,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC;gCAC7B,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,qBAAqB,EACnC,gCAAgC,CACjC,CAAA;4BACH,CAAC;4BAID,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,iBAAiB,CAClB,CAAA;4BAED,IAAI,CAAC,IAAI,CAAC,oBAAoB,EAAE,CAAC;gCAC/B,OAAO,IAAI,CAAA;4BACb,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;4BAED,IAAI,uBAAuB,IAAI,IAAI,CAAC,QAAQ,EAAE,oBAAoB,EAAE,CAAC;gCACnE,IAAI,kBAAkB,CAAC,EAAE,IAAI,kBAAkB,CAAC,IAAI,EAAE,CAAC;oCACrD,MAAM,oBAAoB,GAAwB;wCAChD,KAAK,EAAE,kBAAkB,CAAC,KAAK;wCAC/B,EAAE,EAAE,kBAAkB,CAAC,EAAE;wCACzB,IAAI,EAAE,kBAAkB,CAAC,IAAI;qCAC9B,CAAA;oCACD,yBAAyB,CAAC,IAAI,CAAC,oBAAoB,CAAC,CAAA;oCAEpD,MAAM,GAAG,MAAM,IAAI,CAAC,QAAQ,EAAE,oBAAoB,CAChD,yBAAyB,CAC1B,CAAA;gCACH,CAAC;qCAAM,CAAC;oCACN,MAAM,IAAI,4BAAgB,CACxB,4BAAa,CAAC,qBAAqB,EACnC,gCAAgC,CACjC,CAAA;gCACH,CAAC;4BACH,CAAC;iCAAM,CAAC;gCACN,MAAM,GAAG,MAAM,IAAA,yBAAe,EAAC,IAAI,CAAC,MAAM,EAAE;oCAC1C,EAAE,EAAE,kBAAkB,CAAC,EAAE;oCACzB,OAAO,EAAE,IAAI,CAAC,MAAM,CAAC,OAAQ;oCAC7B,IAAI,EAAE,kBAAkB,CAAC,IAAI;oCAC7B,KAAK,EAAE,kBAAkB,CAAC,KAAK;oCAC/B,GAAG,EAAE,kBAAkB,CAAC,GAAG;oCAC3B,QAAQ,EAAE,kBAAkB,CAAC,QAAQ;oCACrC,YAAY,EAAE,kBAAkB,CAAC,YAAY;oCAC7C,oBAAoB,EAAE,kBAAkB,CAAC,oBAAoB;oCAC7D,KAAK,EAAE,IAAI;iCACiB,CAAC,CAAA;4BACjC,CAAC;4BAGD,IAAI,gBAAgB,EAAE,CAAC;gCACrB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,iBAAiB,EACjB;oCACE,cAAc,EAAE,MAAM;iCACvB,CACF,CAAA;4BACH,CAAC;iCAAM,CAAC;gCACN,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CACxC,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT;oCACE,MAAM,EAAE,MAAM;oCACd,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,MAAM,EAAE;iCACjE,CACF,CAAA;4BACH,CAAC;wBACH,CAAC;wBAED,MAAM,kBAAkB,GAAG,MAAM,IAAA,wDAAyB,EAAC;4BACzD,MAAM,EAAE,IAAI,CAAC,MAAM;4BACnB,OAAO,EAAE,SAAS,CAAC,EAAE;4BACrB,MAAM;4BACN,UAAU,EAAE,CAAC,QAAQ,EAAE,EAAE;gCACvB,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,SAAS,EAAE;oCAC9D,MAAM,EAAE,QAAQ,CAAC,WAAW,CAAC,IAAI;oCACjC,MAAM,EAAE,GAAG,SAAS,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,QAAQ,CAAC,WAAW,CAAC,IAAI,EAAE;iCACpF,CAAC,CAAA;4BACJ,CAAC;yBACF,CAAC,CAAA;wBAIF,IAAI,gBAAgB,IAAI,OAAO,CAAC,MAAM,KAAK,iBAAiB,EAAE,CAAC;4BAC7D,MAAM,IAAA,wCAA0B,EAC9B,kBAAkB,EAAE,eAAe,IAAI,MAAM,EAC7C,IAAI,EACJ,OAAO,CAAC,IAAI,EACZ,SAAS,EACT,IAAI,CAAC,aAAa,EAClB,IAAI,CAAC,QAAQ,CACd,CAAA;wBACH,CAAC;wBAID,IACE,CAAC,gBAAgB;4BACjB,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,aAAa,GAAG,OAAO,CAAC,MAAM,CAAA;gBACpC,IAAI,iBAAiB,EAAE,CAAC;oBACtB,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,mBAAmB,CAC9C,IAAI,EACJ,iBAAiB,EACjB,SAAS,CACV,CAAA;gBACH,CAAC;gBACD,IAAI,cAA8B,CAAA;gBAElC,IAAI,CAAC;oBACH,IAAI,CAAC,aAAa,EAAE,CAAC;wBACnB,MAAM,IAAI,KAAK,CAAC,gCAAgC,CAAC,CAAA;oBACnD,CAAC;oBACD,cAAc,GAAG,CAAC,MAAM,IAAA,4DAA2B,EACjD,aAAa,EACb,IAAI,CAAC,aAAa,EAClB,OAAO,CAAC,IAAI,EACZ,IAAI,CACL,CAAmB,CAAA;oBAEpB,MAAM,eAAe,GACnB,cAAc,CAAC,SAAoC,CAAA;oBAErD,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE;wBACrE,SAAS,EAAE,cAAc,CAAC,SAAS;wBACnC,gBAAgB,EACd,cAAc,CAAC,gBAAgB;4BAC/B,IAAA,wCAAmB,EAAC,cAAc,CAAC,MAAM,EAAE,cAAc,CAAC,SAAS,CAAC;wBACtE,MAAM,EAAE,eAAe,EAAE,MAAM;wBAC/B,MAAM,EAAE,GAAG,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC,MAAM,eAAe,EAAE,MAAM,EAAE;qBAChF,CAAC,CAAA;oBAEF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE;wBAC/C,UAAU,EAAE,cAAc,CAAC,OAAO,CAAC,MAAM;wBACzC,QAAQ,EAAE,eAAe,EAAE,MAAM;wBACjC,OAAO,EAAE,eAAe,EAAE,KAAK;wBAC/B,QAAQ,EAAE;4BACR;gCACE,MAAM,EAAE,cAAc,CAAC,OAAO,CAAC,SAAS;gCACxC,SAAS,EAAE,cAAc,CAAC,OAAO,CAAC,YAAY;gCAC9C,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,QAAQ;gCACtC,QAAQ,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO;gCACxC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,OAAO;gCACrC,KAAK,EAAE,cAAc,CAAC,OAAO,CAAC,QAAQ;gCACtC,IAAI,EAAE,MAAM;6BACb;yBACF;qBACF,CAAC,CAAA;gBACJ,CAAC;gBAAC,OAAO,CAAU,EAAE,CAAC;oBACpB,MAAM,WAAW,GAAG,MAAM,IAAA,sCAA2B,EACnD,IAAI,EACJ,OAAO,CAAC,MAAM,CACf,CAAA;oBAED,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,aAAa,CAAC,IAAI,EAAE,OAAO,CAAC,IAAI,EAAE,QAAQ,EAAE;wBACvE,KAAK,EAAE;4BACL,IAAI,EAAE,4BAAa,CAAC,iBAAiB;4BACrC,OAAO,EAAE,2CAA2C;4BACpD,WAAW;yBACZ;qBACF,CAAC,CAAA;oBACF,IAAI,CAAC,aAAa,CAAC,eAAe,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAA;oBAClD,MAAM,MAAM,IAAA,kCAAc,EAAC,CAAU,EAAE,IAAI,EAAE,OAAO,CAAC,CAAA;gBACvD,CAAC;gBAGD,OAAO,IAAI,CAAA;YACb,CAAC;WAAA;QArbC,IAAI,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;QAC5B,IAAI,CAAC,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IAClC,CAAC;CAobF;AA5bD,0CA4bC"}
|
|
@@ -5,27 +5,27 @@ const getAllowance_js_1 = require("./getAllowance.js");
|
|
|
5
5
|
const parseEVMErrors_js_1 = require("./parseEVMErrors.js");
|
|
6
6
|
const setAllowance_js_1 = require("./setAllowance.js");
|
|
7
7
|
const waitForTransactionReceipt_js_1 = require("./waitForTransactionReceipt.js");
|
|
8
|
-
const checkAllowance = async (chain, step,
|
|
8
|
+
const checkAllowance = async (client, chain, step, statusManager, settings, allowUserInteraction = false, shouldBatchTransactions = false) => {
|
|
9
9
|
let allowanceProcess = statusManager.findOrCreateProcess(step, 'TOKEN_ALLOWANCE');
|
|
10
10
|
try {
|
|
11
11
|
if (allowanceProcess.txHash && allowanceProcess.status !== 'DONE') {
|
|
12
|
-
await waitForApprovalTransaction(
|
|
12
|
+
await waitForApprovalTransaction(client, allowanceProcess.txHash, allowanceProcess.type, step, chain, statusManager);
|
|
13
13
|
}
|
|
14
14
|
else {
|
|
15
15
|
allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'STARTED');
|
|
16
|
-
const approved = await (0, getAllowance_js_1.getAllowance)(chain.id, step.action.fromToken.address,
|
|
16
|
+
const approved = await (0, getAllowance_js_1.getAllowance)(chain.id, step.action.fromToken.address, client.account.address, step.estimate.approvalAddress);
|
|
17
17
|
const fromAmount = BigInt(step.action.fromAmount);
|
|
18
18
|
if (fromAmount > approved) {
|
|
19
19
|
if (!allowUserInteraction) {
|
|
20
20
|
return;
|
|
21
21
|
}
|
|
22
22
|
if (shouldBatchTransactions) {
|
|
23
|
-
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(
|
|
23
|
+
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(client, step.action.fromToken.address, step.estimate.approvalAddress, fromAmount, settings, true);
|
|
24
24
|
allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
|
|
25
25
|
return approveTxHash;
|
|
26
26
|
}
|
|
27
|
-
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(
|
|
28
|
-
await waitForApprovalTransaction(
|
|
27
|
+
const approveTxHash = await (0, setAllowance_js_1.setAllowance)(client, step.action.fromToken.address, step.estimate.approvalAddress, fromAmount);
|
|
28
|
+
await waitForApprovalTransaction(client, approveTxHash, allowanceProcess.type, step, chain, statusManager);
|
|
29
29
|
}
|
|
30
30
|
else {
|
|
31
31
|
allowanceProcess = statusManager.updateProcess(step, allowanceProcess.type, 'DONE');
|
|
@@ -45,13 +45,13 @@ const checkAllowance = async (chain, step, walletClient, statusManager, settings
|
|
|
45
45
|
}
|
|
46
46
|
};
|
|
47
47
|
exports.checkAllowance = checkAllowance;
|
|
48
|
-
const waitForApprovalTransaction = async (
|
|
48
|
+
const waitForApprovalTransaction = async (client, txHash, processType, step, chain, statusManager) => {
|
|
49
49
|
statusManager.updateProcess(step, processType, 'PENDING', {
|
|
50
50
|
txHash,
|
|
51
51
|
txLink: `${chain.metamask.blockExplorerUrls[0]}tx/${txHash}`,
|
|
52
52
|
});
|
|
53
53
|
const transactionReceipt = await (0, waitForTransactionReceipt_js_1.waitForTransactionReceipt)({
|
|
54
|
-
|
|
54
|
+
client: client,
|
|
55
55
|
chainId: chain.id,
|
|
56
56
|
txHash: txHash,
|
|
57
57
|
onReplaced(response) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":";;;AAIA,uDAAgD;AAChD,2DAAoD;AACpD,uDAAgD;AAChD,iFAA0E;AAEnE,MAAM,cAAc,GAAG,KAAK,EACjC,KAAY,EACZ,IAAc,EACd,
|
|
1
|
+
{"version":3,"file":"checkAllowance.js","sourceRoot":"","sources":["../../../core/EVM/checkAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,23 +1,20 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getTokenAllowanceMulticall = exports.getTokenAllowance = exports.getAllowanceMulticall = exports.getAllowance = void 0;
|
|
4
|
-
const
|
|
4
|
+
const actions_1 = require("viem/actions");
|
|
5
5
|
const utils_js_1 = require("../../utils/utils.js");
|
|
6
6
|
const abi_js_1 = require("./abi.js");
|
|
7
7
|
const publicClient_js_1 = require("./publicClient.js");
|
|
8
8
|
const utils_js_2 = require("./utils.js");
|
|
9
9
|
const getAllowance = async (chainId, tokenAddress, ownerAddress, spenderAddress) => {
|
|
10
10
|
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
11
|
-
const contract = (0, viem_1.getContract)({
|
|
12
|
-
address: tokenAddress,
|
|
13
|
-
abi: abi_js_1.allowanceAbi,
|
|
14
|
-
client: client,
|
|
15
|
-
});
|
|
16
11
|
try {
|
|
17
|
-
const approved = (await
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
12
|
+
const approved = (await (0, actions_1.readContract)(client, {
|
|
13
|
+
address: tokenAddress,
|
|
14
|
+
abi: abi_js_1.allowanceAbi,
|
|
15
|
+
functionName: 'allowance',
|
|
16
|
+
args: [ownerAddress, spenderAddress],
|
|
17
|
+
}));
|
|
21
18
|
return approved;
|
|
22
19
|
}
|
|
23
20
|
catch (e) {
|
|
@@ -40,7 +37,7 @@ const getAllowanceMulticall = async (chainId, tokens, ownerAddress) => {
|
|
|
40
37
|
functionName: 'allowance',
|
|
41
38
|
args: [ownerAddress, token.spenderAddress],
|
|
42
39
|
}));
|
|
43
|
-
const results = await
|
|
40
|
+
const results = await (0, actions_1.multicall)(client, {
|
|
44
41
|
contracts,
|
|
45
42
|
multicallAddress: multicallAddress,
|
|
46
43
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getAllowance.js","sourceRoot":"","sources":["../../../core/EVM/getAllowance.ts"],"names":[],"mappings":";;;AAEA
|
|
1
|
+
{"version":3,"file":"getAllowance.js","sourceRoot":"","sources":["../../../core/EVM/getAllowance.ts"],"names":[],"mappings":"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"}
|
|
@@ -7,7 +7,7 @@ const publicClient_js_1 = require("./publicClient.js");
|
|
|
7
7
|
const getENSAddress = async (name) => {
|
|
8
8
|
try {
|
|
9
9
|
const client = await (0, publicClient_js_1.getPublicClient)(types_1.ChainId.ETH);
|
|
10
|
-
const address = await
|
|
10
|
+
const address = await (0, ens_1.getEnsAddress)(client, {
|
|
11
11
|
name: (0, ens_1.normalize)(name),
|
|
12
12
|
});
|
|
13
13
|
return address;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getENSAddress.js","sourceRoot":"","sources":["../../../core/EVM/getENSAddress.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,
|
|
1
|
+
{"version":3,"file":"getENSAddress.js","sourceRoot":"","sources":["../../../core/EVM/getENSAddress.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AACrC,kCAAmD;AACnD,uDAAmD;AAE5C,MAAM,aAAa,GAAG,KAAK,EAChC,IAAY,EACiB,EAAE;IAC/B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAe,EAAC,eAAO,CAAC,GAAG,CAAC,CAAA;QACjD,MAAM,OAAO,GAAG,MAAM,IAAA,mBAAa,EAAC,MAAM,EAAE;YAC1C,IAAI,EAAE,IAAA,eAAS,EAAC,IAAI,CAAC;SACtB,CAAC,CAAA;QACF,OAAO,OAA6B,CAAA;IACtC,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;QAEX,OAAM;IACR,CAAC;AACH,CAAC,CAAA;AAbY,QAAA,aAAa,iBAazB"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.getEVMBalance = void 0;
|
|
4
|
+
const actions_1 = require("viem/actions");
|
|
4
5
|
const utils_js_1 = require("../../utils/utils.js");
|
|
5
6
|
const abi_js_1 = require("./abi.js");
|
|
6
7
|
const publicClient_js_1 = require("./publicClient.js");
|
|
@@ -42,8 +43,8 @@ const getEVMBalanceMulticall = async (chainId, tokens, walletAddress, multicallA
|
|
|
42
43
|
args: [walletAddress],
|
|
43
44
|
};
|
|
44
45
|
});
|
|
45
|
-
const blockNumber = await
|
|
46
|
-
const results = await
|
|
46
|
+
const blockNumber = await (0, actions_1.getBlockNumber)(client);
|
|
47
|
+
const results = await (0, actions_1.multicall)(client, {
|
|
47
48
|
contracts,
|
|
48
49
|
multicallAddress: multicallAddress,
|
|
49
50
|
blockNumber,
|
|
@@ -61,14 +62,14 @@ const getEVMBalanceMulticall = async (chainId, tokens, walletAddress, multicallA
|
|
|
61
62
|
};
|
|
62
63
|
const getEVMBalanceDefault = async (chainId, tokens, walletAddress) => {
|
|
63
64
|
const client = await (0, publicClient_js_1.getPublicClient)(chainId);
|
|
64
|
-
const blockNumber = await
|
|
65
|
+
const blockNumber = await (0, actions_1.getBlockNumber)(client);
|
|
65
66
|
const queue = tokens.map((token) => {
|
|
66
67
|
if ((0, utils_js_1.isZeroAddress)(token.address)) {
|
|
67
|
-
return
|
|
68
|
+
return (0, actions_1.getBalance)(client, {
|
|
68
69
|
address: walletAddress,
|
|
69
70
|
});
|
|
70
71
|
}
|
|
71
|
-
return
|
|
72
|
+
return (0, actions_1.readContract)(client, {
|
|
72
73
|
address: token.address,
|
|
73
74
|
abi: abi_js_1.balanceOfAbi,
|
|
74
75
|
functionName: 'balanceOf',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getEVMBalance.js","sourceRoot":"","sources":["../../../core/EVM/getEVMBalance.ts"],"names":[],"mappings":";;;AAEA,mDAAoD;AACpD,qCAAyD;AACzD,uDAAmD;AACnD,yCAAgD;AAEzC,MAAM,aAAa,GAAG,KAAK,EAChC,aAAqB,EACrB,MAAe,EACS,EAAE;IAC1B,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QACxB,OAAO,EAAE,CAAA;IACX,CAAC;IACD,MAAM,EAAE,OAAO,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC,CAAA;IAC7B,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,KAAK,CAAC,OAAO,KAAK,OAAO,EAAE,CAAC;YAC9B,OAAO,CAAC,IAAI,CAAC,gDAAgD,CAAC,CAAA;QAChE,CAAC;IACH,CAAC,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAG,MAAM,IAAA,8BAAmB,EAAC,OAAO,CAAC,CAAA;IAE3D,IAAI,gBAAgB,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QAC1C,OAAO,sBAAsB,CAC3B,OAAO,EACP,MAAM,EACN,aAAa,EACb,gBAAgB,CACjB,CAAA;IACH,CAAC;SAAM,CAAC;QACN,OAAO,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,CAAC,CAAA;IAC7D,CAAC;AACH,CAAC,CAAA;AA1BY,QAAA,aAAa,iBA0BzB;AAED,MAAM,sBAAsB,GAAG,KAAK,EAClC,OAAgB,EAChB,MAAe,EACf,aAAqB,EACrB,gBAAwB,EACA,EAAE;IAC1B,MAAM,MAAM,GAAG,MAAM,IAAA,iCAAe,EAAC,OAAO,CAAC,CAAA;IAE7C,MAAM,SAAS,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;QACrC,IAAI,IAAA,wBAAa,EAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC;YACjC,OAAO;gBACL,OAAO,EAAE,gBAA2B;gBACpC,GAAG,EAAE,yBAAgB;gBACrB,YAAY,EAAE,eAAe;gBAC7B,IAAI,EAAE,CAAC,aAAa,CAAC;aACtB,CAAA;QACH,CAAC;QACD,OAAO;YACL,OAAO,EAAE,KAAK,CAAC,OAAkB;YACjC,GAAG,EAAE,qBAAY;YACjB,YAAY,EAAE,WAAW;YACzB,IAAI,EAAE,CAAC,aAAa,CAAC;SACtB,CAAA;IACH,CAAC,CAAC,CAAA;IACF,MAAM,WAAW,GAAG,MAAM,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"getEVMBalance.js","sourceRoot":"","sources":["../../../core/EVM/getEVMBalance.ts"],"names":[],"mappings":"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"}
|
|
@@ -33,7 +33,7 @@ const getPublicClient = async (chainId) => {
|
|
|
33
33
|
...chain.contracts,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
-
publicClients[chainId] = (0, viem_1.
|
|
36
|
+
publicClients[chainId] = (0, viem_1.createClient)({
|
|
37
37
|
chain: chain,
|
|
38
38
|
transport: (0, viem_1.fallback)(fallbackTransports),
|
|
39
39
|
batch: {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"publicClient.js","sourceRoot":"","sources":["../../../core/EVM/publicClient.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,+
|
|
1
|
+
{"version":3,"file":"publicClient.js","sourceRoot":"","sources":["../../../core/EVM/publicClient.ts"],"names":[],"mappings":";;;AAAA,uCAAqC;AAErC,+BAA8D;AAC9D,wCAAiD;AACjD,+CAAwC;AACxC,sCAAsC;AAGtC,MAAM,aAAa,GAA2B,EAAE,CAAA;AAOzC,MAAM,eAAe,GAAG,KAAK,EAAE,OAAe,EAAmB,EAAE;IACxE,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,GAAG,MAAM,IAAA,mBAAU,EAAC,OAAO,CAAC,CAAA;QACtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAC1C,GAAG,CAAC,UAAU,CAAC,KAAK,CAAC;YACnB,CAAC,CAAC,IAAA,gBAAS,EAAC,GAAG,CAAC;YAChB,CAAC,CAAC,IAAA,WAAI,EAAC,GAAG,EAAE;gBACR,KAAK,EAAE;oBACL,SAAS,EAAE,EAAE;iBACd;aACF,CAAC,CACP,CAAA;QACD,MAAM,MAAM,GAAG,MAAM,kBAAM,CAAC,YAAY,CAAC,OAAO,CAAC,CAAA;QACjD,MAAM,KAAK,GAAU;YACnB,GAAG,MAAM;YACT,GAAG,MAAM,CAAC,QAAQ;YAClB,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,SAAS;YAC/B,OAAO,EAAE;gBACP,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;gBAC1C,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,QAAQ,CAAC,OAAO,EAAE;aAC1C;SACF,CAAA;QAED,IAAI,KAAK,CAAC,EAAE,KAAK,eAAO,CAAC,GAAG,EAAE,CAAC;YAC7B,KAAK,CAAC,SAAS,GAAG;gBAChB,GAAG,gBAAO,CAAC,SAAS;gBACpB,GAAG,KAAK,CAAC,SAAS;aACnB,CAAA;QACH,CAAC;QACD,aAAa,CAAC,OAAO,CAAC,GAAG,IAAA,mBAAY,EAAC;YACpC,KAAK,EAAE,KAAK;YACZ,SAAS,EAAE,IAAA,eAAQ,EAAC,kBAAkB,CAAC;YACvC,KAAK,EAAE;gBACL,SAAS,EAAE,IAAI;aAChB;SACF,CAAC,CAAA;IACJ,CAAC;IAED,IAAI,CAAC,aAAa,CAAC,OAAO,CAAC,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,EAAE,CAAC,CAAA;IACtE,CAAC;IAED,OAAO,aAAa,CAAC,OAAO,CAAC,CAAA;AAC/B,CAAC,CAAA;AA3CY,QAAA,eAAe,mBA2C3B"}
|
|
@@ -2,11 +2,12 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.revokeTokenApproval = exports.setTokenAllowance = exports.setAllowance = void 0;
|
|
4
4
|
const viem_1 = require("viem");
|
|
5
|
+
const actions_1 = require("viem/actions");
|
|
5
6
|
const utils_js_1 = require("../../utils/utils.js");
|
|
6
7
|
const abi_js_1 = require("./abi.js");
|
|
7
8
|
const getAllowance_js_1 = require("./getAllowance.js");
|
|
8
9
|
const utils_js_2 = require("./utils.js");
|
|
9
|
-
const setAllowance = async (
|
|
10
|
+
const setAllowance = async (client, tokenAddress, contractAddress, amount, settings, returnPopulatedTransaction) => {
|
|
10
11
|
const data = (0, viem_1.encodeFunctionData)({
|
|
11
12
|
abi: abi_js_1.approveAbi,
|
|
12
13
|
functionName: 'approve',
|
|
@@ -15,11 +16,10 @@ const setAllowance = async (walletClient, tokenAddress, contractAddress, amount,
|
|
|
15
16
|
if (returnPopulatedTransaction) {
|
|
16
17
|
return data;
|
|
17
18
|
}
|
|
18
|
-
const client = walletClient.extend(viem_1.publicActions);
|
|
19
19
|
let transactionRequest = {
|
|
20
20
|
to: tokenAddress,
|
|
21
21
|
data,
|
|
22
|
-
maxPriorityFeePerGas:
|
|
22
|
+
maxPriorityFeePerGas: client.account?.type === 'local'
|
|
23
23
|
? await (0, utils_js_2.getMaxPriorityFeePerGas)(client)
|
|
24
24
|
: undefined,
|
|
25
25
|
};
|
|
@@ -33,9 +33,9 @@ const setAllowance = async (walletClient, tokenAddress, contractAddress, amount,
|
|
|
33
33
|
...customizedTransactionRequest,
|
|
34
34
|
};
|
|
35
35
|
}
|
|
36
|
-
return
|
|
36
|
+
return (0, actions_1.sendTransaction)(client, {
|
|
37
37
|
to: transactionRequest.to,
|
|
38
|
-
account:
|
|
38
|
+
account: client.account,
|
|
39
39
|
data: transactionRequest.data,
|
|
40
40
|
gas: transactionRequest.gas,
|
|
41
41
|
gasPrice: transactionRequest.gasPrice,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"setAllowance.js","sourceRoot":"","sources":["../../../core/EVM/setAllowance.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"setAllowance.js","sourceRoot":"","sources":["../../../core/EVM/setAllowance.ts"],"names":[],"mappings":"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"}
|