@paraswap/dex-lib 4.2.33 → 4.3.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/constants.d.ts +2 -0
- package/build/constants.js +4 -1
- package/build/constants.js.map +1 -1
- package/build/dex/aave-v3-stata/aave-v3-stata.js +1 -6
- package/build/dex/aave-v3-stata/aave-v3-stata.js.map +1 -1
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js +1 -6
- package/build/dex/aave-v3-stata-v2/aave-v3-stata-v2.js.map +1 -1
- package/build/dex/bebop/bebop.js +9 -13
- package/build/dex/bebop/bebop.js.map +1 -1
- package/build/dex/curve-v1/config.js +5 -0
- package/build/dex/curve-v1/config.js.map +1 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js +24 -1
- package/build/dex/curve-v1-factory/curve-v1-factory.js.map +1 -1
- package/build/dex/gmx/gmx.d.ts +1 -0
- package/build/dex/gmx/gmx.js +30 -21
- package/build/dex/gmx/gmx.js.map +1 -1
- package/build/dex/index.js +2 -0
- package/build/dex/index.js.map +1 -1
- package/build/dex/maverick-v1/maverick-v1.d.ts +1 -0
- package/build/dex/maverick-v1/maverick-v1.js +79 -4
- package/build/dex/maverick-v1/maverick-v1.js.map +1 -1
- package/build/dex/nerve/nerve.d.ts +4 -2
- package/build/dex/nerve/nerve.js +32 -8
- package/build/dex/nerve/nerve.js.map +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.d.ts +1 -1
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js +83 -10
- package/build/dex/pancakeswap-v3/pancakeswap-v3.js.map +1 -1
- package/build/dex/solidly/config.js +5 -3
- package/build/dex/solidly/config.js.map +1 -1
- package/build/dex/solidly/forks-override/equalizer.d.ts +5 -2
- package/build/dex/solidly/forks-override/equalizer.js +31 -2
- package/build/dex/solidly/forks-override/equalizer.js.map +1 -1
- package/build/dex/solidly/forks-override/pharaohV1.d.ts +5 -2
- package/build/dex/solidly/forks-override/pharaohV1.js +35 -2
- package/build/dex/solidly/forks-override/pharaohV1.js.map +1 -1
- package/build/dex/solidly/forks-override/velocimeter.d.ts +5 -2
- package/build/dex/solidly/forks-override/velocimeter.js +31 -2
- package/build/dex/solidly/forks-override/velocimeter.js.map +1 -1
- package/build/dex/solidly/forks-override/velodromeV2.d.ts +15 -2
- package/build/dex/solidly/forks-override/velodromeV2.js +32 -2
- package/build/dex/solidly/forks-override/velodromeV2.js.map +1 -1
- package/build/dex/solidly/solidly.js +4 -4
- package/build/dex/solidly/solidly.js.map +1 -1
- package/build/dex/stader/stader.js +5 -2
- package/build/dex/stader/stader.js.map +1 -1
- package/build/dex/uniswap-v2/config.js +2 -0
- package/build/dex/uniswap-v2/config.js.map +1 -1
- package/build/dex/uniswap-v2/rpc-pool-tracker.js +1 -1
- package/build/dex/uniswap-v2/uniswap-v2.js +6 -4
- package/build/dex/uniswap-v2/uniswap-v2.js.map +1 -1
- package/build/dex/uniswap-v3/config.js +5 -2
- package/build/dex/uniswap-v3/config.js.map +1 -1
- package/build/dex/uniswap-v3/uniswap-v3.d.ts +1 -0
- package/build/dex/uniswap-v3/uniswap-v3.js +95 -8
- package/build/dex/uniswap-v3/uniswap-v3.js.map +1 -1
- package/build/dex/uniswap-v4/encoder.d.ts +5 -6
- package/build/dex/uniswap-v4/encoder.js +30 -121
- package/build/dex/uniswap-v4/encoder.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js +2 -27
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4.js +22 -25
- package/build/dex/uniswap-v4/uniswap-v4.js.map +1 -1
- package/build/dex/uniswap-v4/utils.d.ts +1 -1
- package/build/dex/usual/usual.js +12 -2
- package/build/dex/usual/usual.js.map +1 -1
- package/build/dex-helper/dummy-dex-helper.d.ts +1 -0
- package/build/dex-helper/dummy-dex-helper.js +11 -0
- package/build/dex-helper/dummy-dex-helper.js.map +1 -1
- package/build/dex-helper/icache.d.ts +1 -0
- package/build/dex-helper/idex-helper.d.ts +2 -0
- package/build/lib/decoders.js +7 -7
- package/build/lib/decoders.js.map +1 -1
- package/build/lib/multi-wrapper.js +3 -0
- package/build/lib/multi-wrapper.js.map +1 -1
- package/build/pools-helper.d.ts +1 -1
- package/build/pools-helper.js +2 -2
- package/build/pools-helper.js.map +1 -1
- package/build/types.d.ts +4 -1
- package/package.json +1 -1
|
@@ -13,14 +13,9 @@ const router_abi_json_1 = __importDefault(require("../../abi/uniswap-v4/router.a
|
|
|
13
13
|
const abi_1 = require("@ethersproject/abi");
|
|
14
14
|
const utils_1 = require("../../utils");
|
|
15
15
|
const constants_1 = require("../../constants");
|
|
16
|
-
const constants_2 = require("@paraswap/core/build/constants");
|
|
17
|
-
const bigint_constants_1 = require("../../bigint-constants");
|
|
18
16
|
const routerIface = new abi_1.Interface(router_abi_json_1.default);
|
|
19
17
|
var Commands;
|
|
20
18
|
(function (Commands) {
|
|
21
|
-
Commands[Commands["PERMIT2_TRANSFER_FROM"] = 2] = "PERMIT2_TRANSFER_FROM";
|
|
22
|
-
Commands[Commands["WRAP_ETH"] = 11] = "WRAP_ETH";
|
|
23
|
-
Commands[Commands["UNWRAP_WETH"] = 12] = "UNWRAP_WETH";
|
|
24
19
|
Commands[Commands["V4_SWAP"] = 16] = "V4_SWAP";
|
|
25
20
|
})(Commands || (Commands = {}));
|
|
26
21
|
var Actions;
|
|
@@ -50,119 +45,37 @@ var ActionConstants;
|
|
|
50
45
|
// address(2)
|
|
51
46
|
ActionConstants["ADDRESS_THIS"] = "0x0000000000000000000000000000000000000002";
|
|
52
47
|
})(ActionConstants || (ActionConstants = {}));
|
|
48
|
+
const MAX_UINT128 = 340282366920938463463374607431768211455n;
|
|
53
49
|
function encodeActions(actions) {
|
|
54
50
|
const types = actions.map(() => 'uint8');
|
|
55
51
|
return ethers_1.ethers.utils.solidityPack(types, actions);
|
|
56
52
|
}
|
|
57
|
-
function encodeInputForExecute(
|
|
58
|
-
const
|
|
59
|
-
const
|
|
60
|
-
const isEthDest = (0, utils_1.isETHAddress)(destToken);
|
|
61
|
-
const isWethSrc = srcToken.toLowerCase() === wethAddr;
|
|
62
|
-
const isWethDest = destToken.toLowerCase() === wethAddr;
|
|
63
|
-
const firstPool = data.path[0];
|
|
64
|
-
const lastPool = data.path[data.path.length - 1];
|
|
65
|
-
const isWethPoolForSrc = firstPool.tokenIn.toLowerCase() === wethAddr ||
|
|
66
|
-
firstPool.tokenOut.toLowerCase() === wethAddr;
|
|
67
|
-
const isWethPoolForDest = lastPool.tokenOut.toLowerCase() === wethAddr ||
|
|
68
|
-
lastPool.tokenIn.toLowerCase() === wethAddr;
|
|
69
|
-
const isEthPoolForSrc = firstPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
70
|
-
firstPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
71
|
-
const isEthPoolForDest = lastPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
72
|
-
lastPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
73
|
-
const input = ethers_1.ethers.utils.defaultAbiCoder.encode(['bytes', 'bytes[]'], [encodedActions, encodedActionValues]);
|
|
74
|
-
let types = ['uint8'];
|
|
75
|
-
let commands = [Commands.V4_SWAP];
|
|
76
|
-
let inputs = [input];
|
|
77
|
-
// Wrap ETH on Router for WETH pool
|
|
78
|
-
if (isEthSrc && isWethPoolForSrc) {
|
|
79
|
-
types.unshift('uint8');
|
|
80
|
-
commands.unshift(Commands.WRAP_ETH);
|
|
81
|
-
const wrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [ActionConstants.ADDRESS_THIS, amountIn]);
|
|
82
|
-
inputs.unshift(wrapInput);
|
|
83
|
-
}
|
|
84
|
-
// Unwrap WETH on Router for ETH pool
|
|
85
|
-
if (isWethSrc && isEthPoolForSrc) {
|
|
86
|
-
types.unshift('uint8');
|
|
87
|
-
commands.unshift(Commands.UNWRAP_WETH);
|
|
88
|
-
const unwrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [ActionConstants.ADDRESS_THIS, amountIn]);
|
|
89
|
-
inputs.unshift(unwrapInput);
|
|
90
|
-
// Need to make transfer before the swap to make unwrap
|
|
91
|
-
types.unshift('uint8');
|
|
92
|
-
commands.unshift(Commands.PERMIT2_TRANSFER_FROM);
|
|
93
|
-
const transferInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'uint256'], [wethAddr, ActionConstants.ADDRESS_THIS, amountIn]);
|
|
94
|
-
inputs.unshift(transferInput);
|
|
95
|
-
}
|
|
96
|
-
// Unwrap ETH on Router for WETH pool
|
|
97
|
-
if (isEthDest && isWethPoolForDest) {
|
|
98
|
-
types.push('uint8');
|
|
99
|
-
commands.push(Commands.UNWRAP_WETH);
|
|
100
|
-
const unwrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [recipient, ActionConstants.OPEN_DELTA]);
|
|
101
|
-
inputs.push(unwrapInput);
|
|
102
|
-
}
|
|
103
|
-
// Wrap ETH on Router for ETH pool
|
|
104
|
-
if (isWethDest && isEthPoolForDest) {
|
|
105
|
-
types.push('uint8');
|
|
106
|
-
commands.push(Commands.WRAP_ETH);
|
|
107
|
-
const wrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [recipient, ActionConstants.CONTRACT_BALANCE]);
|
|
108
|
-
inputs.push(wrapInput);
|
|
109
|
-
}
|
|
110
|
-
const command = ethers_1.ethers.utils.solidityPack(types, commands);
|
|
53
|
+
function encodeInputForExecute(actions, actionValues) {
|
|
54
|
+
const command = ethers_1.ethers.utils.solidityPack(['uint8'], [Commands.V4_SWAP]);
|
|
55
|
+
const input = ethers_1.ethers.utils.defaultAbiCoder.encode(['bytes', 'bytes[]'], [actions, actionValues]);
|
|
111
56
|
return routerIface.encodeFunctionData('execute(bytes,bytes[])', [
|
|
112
57
|
command,
|
|
113
|
-
|
|
58
|
+
[input],
|
|
114
59
|
]);
|
|
115
60
|
}
|
|
116
|
-
function encodeSettle(
|
|
117
|
-
const wethAddr = dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
118
|
-
const isEthSrc = (0, utils_1.isETHAddress)(srcToken);
|
|
119
|
-
const isWethSrc = srcToken.toLowerCase() === wethAddr;
|
|
120
|
-
const firstPool = data.path[0];
|
|
121
|
-
const isWethPool = firstPool.tokenIn.toLowerCase() === wethAddr ||
|
|
122
|
-
firstPool.tokenOut.toLowerCase() === wethAddr;
|
|
123
|
-
const isEthPool = firstPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
124
|
-
firstPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
61
|
+
function encodeSettle(srcToken, amountIn, takeFundsFromMsgSender) {
|
|
125
62
|
const settle = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bool'],
|
|
126
63
|
// srcToken, amountIn (`OPEN_DELTA` to settle all needed funds), takeFundsFromMsgSender (Executor in our case)
|
|
127
64
|
[
|
|
128
|
-
|
|
129
|
-
? wethAddr
|
|
130
|
-
: (isEthSrc && isEthPool) || (isWethSrc && isEthPool)
|
|
131
|
-
? constants_1.NULL_ADDRESS
|
|
132
|
-
: srcToken,
|
|
65
|
+
(0, utils_1.isETHAddress)(srcToken) ? constants_1.NULL_ADDRESS : srcToken,
|
|
133
66
|
amountIn,
|
|
134
|
-
|
|
67
|
+
takeFundsFromMsgSender,
|
|
135
68
|
]);
|
|
136
69
|
return settle;
|
|
137
70
|
}
|
|
138
|
-
function encodeTake(
|
|
139
|
-
const wethAddr = dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
140
|
-
const isEthDest = (0, utils_1.isETHAddress)(destToken);
|
|
141
|
-
const isWethDest = destToken.toLowerCase() === wethAddr;
|
|
142
|
-
const lastPool = data.path[data.path.length - 1];
|
|
143
|
-
const isWethPool = lastPool.tokenOut.toLowerCase() === wethAddr ||
|
|
144
|
-
lastPool.tokenIn.toLowerCase() === wethAddr;
|
|
145
|
-
const isEthPool = lastPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
146
|
-
lastPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
71
|
+
function encodeTake(destToken, recipient, amountOut) {
|
|
147
72
|
const take = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'uint256'],
|
|
148
73
|
// destToken, recipient, amountOut (`OPEN_DELTA` to take all funds)
|
|
149
|
-
[
|
|
150
|
-
isEthDest && isWethPool
|
|
151
|
-
? wethAddr
|
|
152
|
-
: (isWethDest && isEthPool) || (isEthDest && isEthPool)
|
|
153
|
-
? constants_1.NULL_ADDRESS
|
|
154
|
-
: destToken,
|
|
155
|
-
(isEthDest && isWethPool) || (isWethDest && isEthPool)
|
|
156
|
-
? ActionConstants.ADDRESS_THIS
|
|
157
|
-
: recipient,
|
|
158
|
-
amountOut,
|
|
159
|
-
]);
|
|
74
|
+
[(0, utils_1.isETHAddress)(destToken) ? constants_1.NULL_ADDRESS : destToken, recipient, amountOut]);
|
|
160
75
|
return take;
|
|
161
76
|
}
|
|
162
77
|
// Single hop encoding for SELL side
|
|
163
|
-
function swapExactInputSingleCalldata(srcToken, destToken,
|
|
164
|
-
const path = data.path[0];
|
|
165
|
-
const poolKey = path.pool.key;
|
|
78
|
+
function swapExactInputSingleCalldata(srcToken, destToken, poolKey, zeroForOne, amountIn, amountOutMinimum, recipient) {
|
|
166
79
|
const actions = encodeActions([
|
|
167
80
|
Actions.SWAP_EXACT_IN_SINGLE,
|
|
168
81
|
Actions.SETTLE,
|
|
@@ -170,7 +83,7 @@ function swapExactInputSingleCalldata(srcToken, destToken, data, amountIn, amoun
|
|
|
170
83
|
]);
|
|
171
84
|
const exactInputSingleParams = {
|
|
172
85
|
poolKey,
|
|
173
|
-
zeroForOne
|
|
86
|
+
zeroForOne,
|
|
174
87
|
amountIn,
|
|
175
88
|
amountOutMinimum,
|
|
176
89
|
hookData: '0x', // empty bytes
|
|
@@ -202,12 +115,12 @@ function swapExactInputSingleCalldata(srcToken, destToken, data, amountIn, amoun
|
|
|
202
115
|
exactInputSingleParams.hookData,
|
|
203
116
|
],
|
|
204
117
|
]);
|
|
205
|
-
const settle = encodeSettle(
|
|
206
|
-
const take = encodeTake(
|
|
207
|
-
return encodeInputForExecute(
|
|
118
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
119
|
+
const take = encodeTake(destToken, recipient, ActionConstants.OPEN_DELTA);
|
|
120
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
208
121
|
}
|
|
209
122
|
// Multi-hop encoding for SELL side
|
|
210
|
-
function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient
|
|
123
|
+
function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient) {
|
|
211
124
|
const actions = encodeActions([
|
|
212
125
|
Actions.SWAP_EXACT_IN,
|
|
213
126
|
Actions.SETTLE,
|
|
@@ -263,15 +176,12 @@ function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMi
|
|
|
263
176
|
amountOutMinimum: exactInputParams.amountOutMinimum,
|
|
264
177
|
},
|
|
265
178
|
]);
|
|
266
|
-
const settle = encodeSettle(
|
|
267
|
-
const take = encodeTake(
|
|
268
|
-
return encodeInputForExecute(
|
|
179
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
180
|
+
const take = encodeTake(destToken, recipient, ActionConstants.OPEN_DELTA);
|
|
181
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
269
182
|
}
|
|
270
183
|
// Single hop encoding for BUY side
|
|
271
|
-
function swapExactOutputSingleCalldata(srcToken, destToken,
|
|
272
|
-
const path = data.path[0];
|
|
273
|
-
const poolKey = path.pool.key;
|
|
274
|
-
const amountInMaximum = bigint_constants_1.BI_MAX_UINT128;
|
|
184
|
+
function swapExactOutputSingleCalldata(srcToken, destToken, poolKey, zeroForOne, amountOut, recipient) {
|
|
275
185
|
const actions = encodeActions([
|
|
276
186
|
Actions.SWAP_EXACT_OUT_SINGLE,
|
|
277
187
|
Actions.SETTLE,
|
|
@@ -279,9 +189,9 @@ function swapExactOutputSingleCalldata(srcToken, destToken, data, amountIn, amou
|
|
|
279
189
|
]);
|
|
280
190
|
const exactOutputSingleParams = {
|
|
281
191
|
poolKey,
|
|
282
|
-
zeroForOne
|
|
192
|
+
zeroForOne,
|
|
283
193
|
amountOut,
|
|
284
|
-
amountInMaximum,
|
|
194
|
+
amountInMaximum: MAX_UINT128,
|
|
285
195
|
hookData: '0x', // empty bytes
|
|
286
196
|
};
|
|
287
197
|
// encode SWAP_EXACT_OUTPUT_SINGLE
|
|
@@ -311,24 +221,23 @@ function swapExactOutputSingleCalldata(srcToken, destToken, data, amountIn, amou
|
|
|
311
221
|
exactOutputSingleParams.hookData,
|
|
312
222
|
],
|
|
313
223
|
]);
|
|
314
|
-
const settle = encodeSettle(
|
|
315
|
-
const take = encodeTake(
|
|
316
|
-
return encodeInputForExecute(
|
|
224
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
225
|
+
const take = encodeTake(destToken, recipient, ActionConstants.OPEN_DELTA);
|
|
226
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
317
227
|
}
|
|
318
228
|
// Multi-hop encoding for SELL side
|
|
319
|
-
function swapExactOutputCalldata(srcToken, destToken, data,
|
|
229
|
+
function swapExactOutputCalldata(srcToken, destToken, data, amountOut, recipient) {
|
|
320
230
|
const actions = encodeActions([
|
|
321
231
|
Actions.SWAP_EXACT_OUT,
|
|
322
232
|
Actions.SETTLE,
|
|
323
233
|
Actions.TAKE,
|
|
324
234
|
]);
|
|
325
|
-
const amountInMaximum = bigint_constants_1.BI_MAX_UINT128;
|
|
326
235
|
const exactOutputParams = {
|
|
327
236
|
currencyOut: (0, utils_1.isETHAddress)(data.path[data.path.length - 1].tokenOut)
|
|
328
237
|
? constants_1.NULL_ADDRESS
|
|
329
238
|
: data.path[data.path.length - 1].tokenOut,
|
|
330
239
|
amountOut,
|
|
331
|
-
amountInMaximum,
|
|
240
|
+
amountInMaximum: MAX_UINT128,
|
|
332
241
|
path: data.path.map(path => ({
|
|
333
242
|
intermediateCurrency: (0, utils_1.isETHAddress)(path.tokenIn)
|
|
334
243
|
? constants_1.NULL_ADDRESS
|
|
@@ -373,8 +282,8 @@ function swapExactOutputCalldata(srcToken, destToken, data, amountIn, amountOut,
|
|
|
373
282
|
amountInMaximum: exactOutputParams.amountInMaximum,
|
|
374
283
|
},
|
|
375
284
|
]);
|
|
376
|
-
const settle = encodeSettle(
|
|
377
|
-
const take = encodeTake(
|
|
378
|
-
return encodeInputForExecute(
|
|
285
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
286
|
+
const take = encodeTake(destToken, recipient, ActionConstants.OPEN_DELTA);
|
|
287
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
379
288
|
}
|
|
380
289
|
//# sourceMappingURL=encoder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/encoder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,38 +71,13 @@ class UniswapV4PoolManager extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
71
71
|
return this.eventPools[_poolId];
|
|
72
72
|
}
|
|
73
73
|
async getAvailablePoolsForPair(srcToken, destToken, blockNumber) {
|
|
74
|
-
const wethAddress = this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
75
74
|
const isEthSrc = (0, utils_2.isETHAddress)(srcToken);
|
|
76
75
|
const isEthDest = (0, utils_2.isETHAddress)(destToken);
|
|
77
|
-
const isWethSrc = srcToken.toLowerCase() === wethAddress;
|
|
78
|
-
const isWethDest = destToken.toLowerCase() === wethAddress;
|
|
79
|
-
const needCheckWeth = isEthSrc || isEthDest;
|
|
80
|
-
const needCheckETH = isWethSrc || isWethDest;
|
|
81
76
|
const _src = isEthSrc ? constants_1.NULL_ADDRESS : srcToken.toLowerCase();
|
|
82
77
|
const _dest = isEthDest ? constants_1.NULL_ADDRESS : destToken.toLowerCase();
|
|
83
78
|
return this.pools
|
|
84
|
-
.filter(pool =>
|
|
85
|
-
|
|
86
|
-
const checkToken1Dest = pool.token1.address === _dest;
|
|
87
|
-
const checkToken1Src = pool.token1.address === _src;
|
|
88
|
-
const checkToken0Dest = pool.token0.address === _dest;
|
|
89
|
-
const checkToken0Weth = needCheckWeth && pool.token0.address === wethAddress; // check token0 to discover WETH pools when ETH is src or dest
|
|
90
|
-
const checkToken0ETH = needCheckETH && pool.token0.address === constants_1.NULL_ADDRESS; // check token0 to discover ETH pools when WETH is src or dest
|
|
91
|
-
const checkToken1Weth = needCheckWeth && pool.token1.address === wethAddress; // check token1 to discover WETH pools when ETH is src or dest
|
|
92
|
-
const checkToken1ETH = needCheckETH && pool.token1.address === constants_1.NULL_ADDRESS; // check token1 to discover ETH pools when WETH is src or dest
|
|
93
|
-
return (((checkToken0Src ||
|
|
94
|
-
(isEthSrc && checkToken0Weth) ||
|
|
95
|
-
(isWethSrc && checkToken0ETH)) &&
|
|
96
|
-
(checkToken1Dest ||
|
|
97
|
-
(isEthDest && checkToken1Weth) ||
|
|
98
|
-
(isWethDest && checkToken1ETH))) ||
|
|
99
|
-
((checkToken0Dest ||
|
|
100
|
-
(isEthDest && checkToken0Weth) ||
|
|
101
|
-
(isWethDest && checkToken0ETH)) &&
|
|
102
|
-
(checkToken1Src ||
|
|
103
|
-
(isEthSrc && checkToken1Weth) ||
|
|
104
|
-
(isWethSrc && checkToken1ETH))));
|
|
105
|
-
})
|
|
79
|
+
.filter(pool => (pool.token0.address === _src && pool.token1.address === _dest) ||
|
|
80
|
+
(pool.token0.address === _dest && pool.token1.address === _src))
|
|
106
81
|
.sort((a, b) => {
|
|
107
82
|
const volumeA = parseInt(a.volumeUSD || '0');
|
|
108
83
|
const volumeB = parseInt(b.volumeUSD || '0');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4-pool-manager.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4-pool-manager.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"uniswap-v4-pool-manager.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4-pool-manager.ts"],"names":[],"mappings":"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"}
|
|
@@ -61,7 +61,6 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
61
61
|
quoterAddress;
|
|
62
62
|
poolManagerAddress;
|
|
63
63
|
hasConstantPriceLargeAmounts = false;
|
|
64
|
-
// to prevent wrap/unwrap on v6 contract level, because we are doing wrap/unwrap on UniV4 Router level, check tx encoder for details
|
|
65
64
|
needWrapNative = false;
|
|
66
65
|
logger;
|
|
67
66
|
quoterIface;
|
|
@@ -117,17 +116,13 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
117
116
|
async getPricesVolume(from, to, amounts, side, blockNumber, limitPools) {
|
|
118
117
|
const reqId = Math.floor(Math.random() * 10000);
|
|
119
118
|
// const getPricesVolumeStart = Date.now();
|
|
120
|
-
const
|
|
121
|
-
let pools = await this.poolManager.getAvailablePoolsForPair(from.address.toLowerCase(), to.address.toLowerCase(), blockNumber);
|
|
119
|
+
const pools = await this.poolManager.getAvailablePoolsForPair(from.address.toLowerCase(), to.address.toLowerCase(), blockNumber);
|
|
122
120
|
const availablePools = limitPools?.filter(t => pools.find(p => p.id === t)) ??
|
|
123
121
|
pools.map(t => t.id);
|
|
124
122
|
const pricesPromises = availablePools.map(async (poolId) => {
|
|
125
123
|
const pool = pools.find(p => p.id === poolId);
|
|
126
124
|
const zeroForOne = from.address.toLowerCase() === pool.key.currency0.toLowerCase() ||
|
|
127
|
-
((0, utils_1.isETHAddress)(from.address) && pool.key.currency0 === constants_1.NULL_ADDRESS)
|
|
128
|
-
((0, utils_1.isETHAddress)(from.address) && pool.key.currency0 === wethAddr) || // ETH is src and WETH pool
|
|
129
|
-
(from.address.toLowerCase() === wethAddr &&
|
|
130
|
-
pool.key.currency0 === constants_1.NULL_ADDRESS); // WETH is src and native ETH pool
|
|
125
|
+
((0, utils_1.isETHAddress)(from.address) && pool.key.currency0 === constants_1.NULL_ADDRESS);
|
|
131
126
|
const eventPool = await this.poolManager.getEventPool(poolId, blockNumber);
|
|
132
127
|
const poolState = (await eventPool?.getState(blockNumber)) || null;
|
|
133
128
|
let prices;
|
|
@@ -252,27 +247,29 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
252
247
|
return results.map(result => (result.success ? result.returnData : 0n));
|
|
253
248
|
}
|
|
254
249
|
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
255
|
-
let
|
|
256
|
-
if (data.path.length === 1
|
|
257
|
-
// Single
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
266
|
-
|
|
267
|
-
}
|
|
268
|
-
else if (data.path.length > 1 && side === core_1.SwapSide.BUY) {
|
|
269
|
-
// Multi-hop encoding for BUY side
|
|
270
|
-
encodingMethod = encoder_1.swapExactOutputCalldata;
|
|
250
|
+
let exchangeData;
|
|
251
|
+
if (data.path.length === 1) {
|
|
252
|
+
// Single hop
|
|
253
|
+
const path = data.path[0];
|
|
254
|
+
if (side === core_1.SwapSide.SELL) {
|
|
255
|
+
exchangeData = (0, encoder_1.swapExactInputSingleCalldata)(srcToken, destToken, path.pool.key, path.zeroForOne, BigInt(srcAmount),
|
|
256
|
+
// destMinAmount (can be 0 on dex level)
|
|
257
|
+
0n, recipient);
|
|
258
|
+
}
|
|
259
|
+
else {
|
|
260
|
+
exchangeData = (0, encoder_1.swapExactOutputSingleCalldata)(srcToken, destToken, path.pool.key, path.zeroForOne, BigInt(destAmount), recipient);
|
|
261
|
+
}
|
|
271
262
|
}
|
|
272
263
|
else {
|
|
273
|
-
|
|
264
|
+
// Multi-hop
|
|
265
|
+
exchangeData = '0x';
|
|
266
|
+
if (side === core_1.SwapSide.SELL) {
|
|
267
|
+
exchangeData = (0, encoder_1.swapExactInputCalldata)(srcToken, destToken, data, BigInt(srcAmount), 0n, recipient);
|
|
268
|
+
}
|
|
269
|
+
else {
|
|
270
|
+
exchangeData = (0, encoder_1.swapExactOutputCalldata)(srcToken, destToken, data, BigInt(destAmount), recipient);
|
|
271
|
+
}
|
|
274
272
|
}
|
|
275
|
-
const exchangeData = encodingMethod(srcToken, destToken, data, BigInt(srcAmount), side === core_1.SwapSide.SELL ? 0n : BigInt(destAmount), recipient, this.dexHelper);
|
|
276
273
|
return {
|
|
277
274
|
needWrapNative: this.needWrapNative,
|
|
278
275
|
sendEthButSupportsInsertFromAmount: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,2 +1,2 @@
|
|
|
1
1
|
import { PoolState } from './types';
|
|
2
|
-
export declare function sortPools(a: PoolState, b: PoolState): 1 |
|
|
2
|
+
export declare function sortPools(a: PoolState, b: PoolState): 1 | -1 | 0;
|
package/build/dex/usual/usual.js
CHANGED
|
@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
|
|
|
34
34
|
})();
|
|
35
35
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
36
36
|
exports.Usual = void 0;
|
|
37
|
+
const constants_1 = require("../../constants");
|
|
37
38
|
const CALLDATA_GAS_COST = __importStar(require("../../calldata-gas-cost"));
|
|
38
39
|
const simple_exchange_1 = require("../simple-exchange");
|
|
39
40
|
const bigint_constants_1 = require("../../bigint-constants");
|
|
@@ -126,9 +127,18 @@ class Usual extends simple_exchange_1.SimpleExchange {
|
|
|
126
127
|
exchange: this.dexKey,
|
|
127
128
|
address: this.config.toToken.address,
|
|
128
129
|
connectorTokens: [
|
|
129
|
-
isFromToken
|
|
130
|
+
isFromToken
|
|
131
|
+
? {
|
|
132
|
+
...this.config.toToken,
|
|
133
|
+
// specify that there's no liquidity for toToken => fromToken
|
|
134
|
+
liquidityUSD: constants_1.NO_USD_LIQUIDITY,
|
|
135
|
+
}
|
|
136
|
+
: {
|
|
137
|
+
...this.config.fromToken,
|
|
138
|
+
liquidityUSD: constants_1.UNLIMITED_USD_LIQUIDITY,
|
|
139
|
+
},
|
|
130
140
|
],
|
|
131
|
-
liquidityUSD:
|
|
141
|
+
liquidityUSD: isFromToken ? constants_1.UNLIMITED_USD_LIQUIDITY : constants_1.NO_USD_LIQUIDITY,
|
|
132
142
|
},
|
|
133
143
|
];
|
|
134
144
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usual.js","sourceRoot":"","sources":["../../../src/dex/usual/usual.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"usual.js","sourceRoot":"","sources":["../../../src/dex/usual/usual.ts"],"names":[],"mappings":"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"}
|
|
@@ -39,6 +39,7 @@ export declare class DummyDexHelper implements IDexHelper {
|
|
|
39
39
|
getLogger: LoggerConstructor;
|
|
40
40
|
web3Provider: Web3;
|
|
41
41
|
getTokenUSDPrice: (token: Token, amount: bigint) => Promise<number>;
|
|
42
|
+
getUsdTokenAmounts: (tokenAmounts: [toke: string, amount: bigint | null][]) => Promise<number[]>;
|
|
42
43
|
constructor(network: number, rpcUrl?: string);
|
|
43
44
|
replaceProviderWithRPC(rpcUrl: string): void;
|
|
44
45
|
}
|
|
@@ -104,6 +104,9 @@ class DummyCache {
|
|
|
104
104
|
async hget(mapKey, key) {
|
|
105
105
|
return this.hashStorage[mapKey]?.[key] ?? null;
|
|
106
106
|
}
|
|
107
|
+
async hlen(mapKey) {
|
|
108
|
+
return Object.keys(this.hashStorage[mapKey] ?? {}).length;
|
|
109
|
+
}
|
|
107
110
|
async hmget(mapKey, keys) {
|
|
108
111
|
return keys.map(key => this.hashStorage?.[mapKey]?.[key] ?? null);
|
|
109
112
|
}
|
|
@@ -211,6 +214,7 @@ class DummyDexHelper {
|
|
|
211
214
|
getLogger;
|
|
212
215
|
web3Provider;
|
|
213
216
|
getTokenUSDPrice;
|
|
217
|
+
getUsdTokenAmounts;
|
|
214
218
|
constructor(network, rpcUrl) {
|
|
215
219
|
this.config = new config_1.ConfigHelper(false, (0, config_1.generateConfig)(network), 'is');
|
|
216
220
|
this.cache = new DummyCache();
|
|
@@ -226,6 +230,13 @@ class DummyDexHelper {
|
|
|
226
230
|
};
|
|
227
231
|
// For testing use only full parts like 1, 2, 3 ETH, not 0.1 ETH etc
|
|
228
232
|
this.getTokenUSDPrice = async (token, amount) => Number(amount / BigInt(10 ** token.decimals));
|
|
233
|
+
// For testing use only full parts like 1, 2, 3 ETH, not 0.1 ETH etc
|
|
234
|
+
this.getUsdTokenAmounts = async (tokenAmounts) => tokenAmounts.map(([token, amount]) => {
|
|
235
|
+
if (amount === null) {
|
|
236
|
+
return 0;
|
|
237
|
+
}
|
|
238
|
+
return Number(amount / BigInt(10 ** 18));
|
|
239
|
+
});
|
|
229
240
|
this.multiWrapper = new multi_wrapper_1.MultiWrapper(this.multiContract, this.getLogger(`MultiWrapper-${network}`));
|
|
230
241
|
this.promiseScheduler = new promise_scheduler_1.PromiseScheduler(100, 5, this.getLogger(`PromiseScheduler-${network}`));
|
|
231
242
|
this.augustusApprovals = new augustus_approvals_1.AugustusApprovals(this.config, this.cache, this.multiWrapper);
|