@paraswap/dex-lib 4.2.9 → 4.2.10-univ4-multihop.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/dex/balancer-v2/optimizer.js +0 -1
- package/build/dex/balancer-v2/optimizer.js.map +1 -1
- package/build/dex/index.js +2 -0
- package/build/dex/index.js.map +1 -1
- package/build/dex/uniswap-v4/encoder.d.ts +3 -1
- package/build/dex/uniswap-v4/encoder.js +159 -39
- package/build/dex/uniswap-v4/encoder.js.map +1 -1
- package/build/dex/uniswap-v4/types.d.ts +6 -3
- package/build/dex/uniswap-v4/uniswap-v4.js +43 -13
- package/build/dex/uniswap-v4/uniswap-v4.js.map +1 -1
- package/package.json +1 -1
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.balancerV2Merge = balancerV2Merge;
|
|
4
4
|
const constants_1 = require("../../constants");
|
|
5
5
|
const config_1 = require("./config");
|
|
6
|
-
const MAX_UINT256 = '115792089237316195423570985008687907853269984665640564039457584007913129639935';
|
|
7
6
|
const AllBalancerV2Forks = Object.keys(config_1.BalancerConfig);
|
|
8
7
|
function balancerV2Merge(or) {
|
|
9
8
|
const fixSwap = (rawSwap, side) => {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["../../../src/dex/balancer-v2/optimizer.ts"],"names":[],"mappings":";;
|
|
1
|
+
{"version":3,"file":"optimizer.js","sourceRoot":"","sources":["../../../src/dex/balancer-v2/optimizer.ts"],"names":[],"mappings":"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"}
|
package/build/dex/index.js
CHANGED
|
@@ -109,6 +109,7 @@ const wrapped_m_m_1 = require("./usual/wrapped-m-m");
|
|
|
109
109
|
const usual_pp_1 = require("./usual-pp/usual-pp");
|
|
110
110
|
const ekubo_1 = require("./ekubo/ekubo");
|
|
111
111
|
const uniswap_v4_1 = require("./uniswap-v4/uniswap-v4");
|
|
112
|
+
const optimizer_6 = require("./uniswap-v4/optimizer");
|
|
112
113
|
const LegacyDexes = [
|
|
113
114
|
curve_v2_1.CurveV2,
|
|
114
115
|
stable_pool_1.StablePool,
|
|
@@ -229,6 +230,7 @@ class DexAdapterService {
|
|
|
229
230
|
optimizer_5.balancerV3Merge,
|
|
230
231
|
optimizer_2.uniswapMerge,
|
|
231
232
|
optimizer_4.curveV1Merge,
|
|
233
|
+
optimizer_6.uniswapV4Merge,
|
|
232
234
|
];
|
|
233
235
|
constructor(dexHelper, network, sellAdapters = {}, buyAdapters = {}) {
|
|
234
236
|
this.dexHelper = dexHelper;
|
package/build/dex/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":";;;;;;AAAA,oDAAuB;AAEvB,kDAA8C;AAE9C,qDAAiD;AACjD,2DAAuD;AACvD,sCAAmC;AACnC,0EAAsE;AACtE,wDAAoD;AACpD,2DAAuD;AACvD,uDAA0D;AAC1D,wDAAoD;AACpD,sDAAwD;AACxD,sDAAsD;AACtD,gDAA6C;AAC7C,4CAAyC;AACzC,4CAAyC;AACzC,4CAAyC;AACzC,kDAA+C;AAC/C,+CAA2C;AAC3C,+CAA2C;AAC3C,kDAA8C;AAC9C,+CAA2C;AAC3C,uCAAmC;AACnC,+CAA4C;AAC5C,yCAAsC;AAEtC,4CAAwC;AAExC,sCAAmC;AACnC,sDAAmD;AACnD,qDAAiD;AACjD,kDAA+C;AAC/C,mCAAgC;AAChC,qDAAgD;AAChD,yFAAoF;AACpF,iDAAkD;AAClD,+CAA4C;AAC5C,wDAAoD;AACpD,4DAAyD;AACzD,0DAAuD;AACvD,8DAA2D;AAC3D,kEAA+D;AAC/D,sEAAmE;AACnE,kEAA+D;AAC/D,wEAAqE;AACrE,qDAAkD;AAClD,0DAAuD;AACvD,kEAA+D;AAC/D,sEAAmE;AACnE,2DAAuD;AACvD,uDAA0D;AAC1D,kDAA8C;AAC9C,0EAAqE;AACrE,2DAAwD;AACxD,0EAAqE;AACrE,gFAA0E;AAC1E,4DAA4D;AAC5D,2DAAuD;AACvD,4CAAyC;AACzC,+CAA4C;AAC5C,+CAA4C;AAC5C,kDAA+C;AAC/C,kDAA+C;AAC/C,iEAA6D;AAC7D,2DAAuD;AACvD,2DAAuD;AACvD,2DAAuD;AACvD,2DAAuD;AACvD,kDAA8C;AAC9C,uEAAiE;AACjE,uEAAiE;AACjE,oEAAgE;AAChE,+CAA4C;AAC5C,0EAAsE;AACtE,mFAA8E;AAC9E,2DAAuD;AACvD,0DAAsD;AACtD,+CAA4C;AAC5C,yCAAsC;AACtC,4CAAyC;AACzC,yCAAsC;AACtC,kEAA+D;AAC/D,uCAAoC;AACpC,yCAAsC;AACtC,iDAA6C;AAC7C,uGAAmG;AACnG,iEAA4D;AAC5D,0EAAoE;AACpE,yCAAsC;AACtC,qDAAiD;AACjD,gFAA4E;AAC5E,0EAAqE;AACrE,kDAA8C;AAC9C,kDAA8C;AAC9C,4CAAyC;AACzC,2DAAuD;AACvD,uDAA0D;AAC1D,iEAA6D;AAC7D,4CAAyC;AACzC,4CAAyC;AACzC,mDAA+C;AAC/C,iEAA2D;AAC3D,uDAAkD;AAClD,qDAAgD;AAChD,qDAAgD;AAChD,kDAA8C;AAC9C,yCAAsC;AACtC,wDAAoD;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/dex/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { PoolKey } from './types';
|
|
1
|
+
import { PoolKey, UniswapV4Data } from './types';
|
|
2
2
|
import { Address } from '../../types';
|
|
3
3
|
export declare enum Actions {
|
|
4
4
|
SWAP_EXACT_IN_SINGLE = 6,// 0x06 -> 6
|
|
@@ -14,4 +14,6 @@ export declare enum Actions {
|
|
|
14
14
|
TAKE_PAIR = 17
|
|
15
15
|
}
|
|
16
16
|
export declare function swapExactInputSingleCalldata(srcToken: Address, destToken: Address, poolKey: PoolKey, zeroForOne: boolean, amountIn: bigint, amountOutMinimum: bigint, recipient: Address): string;
|
|
17
|
+
export declare function swapExactInputCalldata(srcToken: Address, destToken: Address, data: UniswapV4Data, amountIn: bigint, amountOutMinimum: bigint, recipient: Address): string;
|
|
17
18
|
export declare function swapExactOutputSingleCalldata(srcToken: Address, destToken: Address, poolKey: PoolKey, zeroForOne: boolean, amountOut: bigint, recipient: Address): string;
|
|
19
|
+
export declare function swapExactOutputCalldata(srcToken: Address, destToken: Address, data: UniswapV4Data, amountOut: bigint, recipient: Address): string;
|
|
@@ -5,7 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.Actions = void 0;
|
|
7
7
|
exports.swapExactInputSingleCalldata = swapExactInputSingleCalldata;
|
|
8
|
+
exports.swapExactInputCalldata = swapExactInputCalldata;
|
|
8
9
|
exports.swapExactOutputSingleCalldata = swapExactOutputSingleCalldata;
|
|
10
|
+
exports.swapExactOutputCalldata = swapExactOutputCalldata;
|
|
9
11
|
const ethers_1 = require("ethers");
|
|
10
12
|
const router_abi_json_1 = __importDefault(require("../../abi/uniswap-v4/router.abi.json"));
|
|
11
13
|
const abi_1 = require("@ethersproject/abi");
|
|
@@ -43,9 +45,42 @@ var ActionConstants;
|
|
|
43
45
|
// address(2)
|
|
44
46
|
ActionConstants["ADDRESS_THIS"] = "0x0000000000000000000000000000000000000002";
|
|
45
47
|
})(ActionConstants || (ActionConstants = {}));
|
|
46
|
-
|
|
48
|
+
const MAX_UINT128 = 340282366920938463463374607431768211455n;
|
|
49
|
+
function encodeActions(actions) {
|
|
50
|
+
const types = actions.map(() => 'uint8');
|
|
51
|
+
return ethers_1.ethers.utils.solidityPack(types, actions);
|
|
52
|
+
}
|
|
53
|
+
function encodeInputForExecute(actions, actionValues) {
|
|
47
54
|
const command = ethers_1.ethers.utils.solidityPack(['uint8'], [Commands.V4_SWAP]);
|
|
48
|
-
const
|
|
55
|
+
const input = ethers_1.ethers.utils.defaultAbiCoder.encode(['bytes', 'bytes[]'], [actions, actionValues]);
|
|
56
|
+
return routerIface.encodeFunctionData('execute(bytes,bytes[])', [
|
|
57
|
+
command,
|
|
58
|
+
[input],
|
|
59
|
+
]);
|
|
60
|
+
}
|
|
61
|
+
function encodeSettle(srcToken, amountIn, takeFundsFromMsgSender) {
|
|
62
|
+
const settle = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bool'],
|
|
63
|
+
// srcToken, amountIn (`OPEN_DELTA` to settle all needed funds), takeFundsFromMsgSender (Executor in our case)
|
|
64
|
+
[
|
|
65
|
+
(0, utils_1.isETHAddress)(srcToken) ? constants_1.NULL_ADDRESS : srcToken,
|
|
66
|
+
amountIn,
|
|
67
|
+
takeFundsFromMsgSender,
|
|
68
|
+
]);
|
|
69
|
+
return settle;
|
|
70
|
+
}
|
|
71
|
+
function encodeTake(destToken, recipient, amountOut) {
|
|
72
|
+
const take = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'uint256'],
|
|
73
|
+
// destToken, recipient, amountOut (`OPEN_DELTA` to take all funds)
|
|
74
|
+
[(0, utils_1.isETHAddress)(destToken) ? constants_1.NULL_ADDRESS : destToken, recipient, amountOut]);
|
|
75
|
+
return take;
|
|
76
|
+
}
|
|
77
|
+
// Single hop encoding for SELL side
|
|
78
|
+
function swapExactInputSingleCalldata(srcToken, destToken, poolKey, zeroForOne, amountIn, amountOutMinimum, recipient) {
|
|
79
|
+
const actions = encodeActions([
|
|
80
|
+
Actions.SWAP_EXACT_IN_SINGLE,
|
|
81
|
+
Actions.SETTLE,
|
|
82
|
+
Actions.TAKE,
|
|
83
|
+
]);
|
|
49
84
|
const exactInputSingleParams = {
|
|
50
85
|
poolKey,
|
|
51
86
|
zeroForOne,
|
|
@@ -80,32 +115,74 @@ function swapExactInputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
80
115
|
exactInputSingleParams.hookData,
|
|
81
116
|
],
|
|
82
117
|
]);
|
|
83
|
-
|
|
84
|
-
const
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
88
|
-
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
// destToken, recipient, amountOut (`OPEN_DELTA` to take all funds)
|
|
94
|
-
[
|
|
95
|
-
(0, utils_1.isETHAddress)(destToken) ? constants_1.NULL_ADDRESS : destToken,
|
|
96
|
-
recipient,
|
|
97
|
-
ActionConstants.OPEN_DELTA,
|
|
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]);
|
|
121
|
+
}
|
|
122
|
+
// Multi-hop encoding for SELL side
|
|
123
|
+
function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient) {
|
|
124
|
+
const actions = encodeActions([
|
|
125
|
+
Actions.SWAP_EXACT_IN,
|
|
126
|
+
Actions.SETTLE,
|
|
127
|
+
Actions.TAKE,
|
|
98
128
|
]);
|
|
99
|
-
const
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
129
|
+
const exactInputParams = {
|
|
130
|
+
currencyIn: data.path[0].tokenIn,
|
|
131
|
+
amountIn,
|
|
132
|
+
amountOutMinimum,
|
|
133
|
+
path: data.path.map(path => ({
|
|
134
|
+
intermediateCurrency: path.tokenOut,
|
|
135
|
+
fee: BigInt(path.pool.key.fee),
|
|
136
|
+
tickSpacing: BigInt(path.pool.key.tickSpacing),
|
|
137
|
+
hooks: constants_1.NULL_ADDRESS,
|
|
138
|
+
hookData: '0x',
|
|
139
|
+
})),
|
|
140
|
+
};
|
|
141
|
+
// encode SWAP_EXACT_IN
|
|
142
|
+
const swap = ethers_1.ethers.utils.defaultAbiCoder.encode([
|
|
143
|
+
/*
|
|
144
|
+
PathKey {
|
|
145
|
+
Currency intermediateCurrency;
|
|
146
|
+
uint24 fee;
|
|
147
|
+
int24 tickSpacing;
|
|
148
|
+
IHooks hooks;
|
|
149
|
+
bytes hookData;
|
|
150
|
+
}
|
|
151
|
+
ExactInputParams {
|
|
152
|
+
address currencyIn;
|
|
153
|
+
PathKey[] path;
|
|
154
|
+
uint128 amountIn;
|
|
155
|
+
uint128 amountOutMinimum;
|
|
156
|
+
}
|
|
157
|
+
*/
|
|
158
|
+
'tuple(address currencyIn, (address,uint24,int24,address,bytes)[] path, uint128 amountIn, uint128 amountOutMinimum)',
|
|
159
|
+
], [
|
|
160
|
+
{
|
|
161
|
+
currencyIn: exactInputParams.currencyIn,
|
|
162
|
+
path: exactInputParams.path.map(pathKey => {
|
|
163
|
+
return [
|
|
164
|
+
pathKey.intermediateCurrency,
|
|
165
|
+
pathKey.fee,
|
|
166
|
+
pathKey.tickSpacing,
|
|
167
|
+
pathKey.hooks,
|
|
168
|
+
pathKey.hookData,
|
|
169
|
+
];
|
|
170
|
+
}),
|
|
171
|
+
amountIn: exactInputParams.amountIn,
|
|
172
|
+
amountOutMinimum: exactInputParams.amountOutMinimum,
|
|
173
|
+
},
|
|
103
174
|
]);
|
|
175
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
176
|
+
const take = encodeTake(destToken, recipient, ActionConstants.OPEN_DELTA);
|
|
177
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
104
178
|
}
|
|
179
|
+
// Single hop encoding for BUY side
|
|
105
180
|
function swapExactOutputSingleCalldata(srcToken, destToken, poolKey, zeroForOne, amountOut, recipient) {
|
|
106
|
-
const
|
|
107
|
-
|
|
108
|
-
|
|
181
|
+
const actions = encodeActions([
|
|
182
|
+
Actions.SWAP_EXACT_OUT,
|
|
183
|
+
Actions.SETTLE,
|
|
184
|
+
Actions.TAKE,
|
|
185
|
+
]);
|
|
109
186
|
const exactOutputSingleParams = {
|
|
110
187
|
poolKey,
|
|
111
188
|
zeroForOne,
|
|
@@ -140,22 +217,65 @@ function swapExactOutputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
140
217
|
exactOutputSingleParams.hookData,
|
|
141
218
|
],
|
|
142
219
|
]);
|
|
143
|
-
|
|
144
|
-
const
|
|
145
|
-
|
|
146
|
-
|
|
147
|
-
|
|
148
|
-
|
|
149
|
-
|
|
220
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
221
|
+
const take = encodeTake(destToken, recipient, amountOut);
|
|
222
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
223
|
+
}
|
|
224
|
+
// Multi-hop encoding for SELL side
|
|
225
|
+
function swapExactOutputCalldata(srcToken, destToken, data, amountOut, recipient) {
|
|
226
|
+
const actions = encodeActions([
|
|
227
|
+
Actions.SWAP_EXACT_OUT,
|
|
228
|
+
Actions.SETTLE,
|
|
229
|
+
Actions.TAKE,
|
|
150
230
|
]);
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
231
|
+
const exactOutputParams = {
|
|
232
|
+
currencyOut: data.path[data.path.length - 1].tokenOut,
|
|
233
|
+
amountOut,
|
|
234
|
+
amountInMaximum: MAX_UINT128,
|
|
235
|
+
path: data.path.reverse().map(path => ({
|
|
236
|
+
intermediateCurrency: path.tokenIn,
|
|
237
|
+
fee: BigInt(path.pool.key.fee),
|
|
238
|
+
tickSpacing: BigInt(path.pool.key.tickSpacing),
|
|
239
|
+
hooks: constants_1.NULL_ADDRESS,
|
|
240
|
+
hookData: '0x',
|
|
241
|
+
})),
|
|
242
|
+
};
|
|
243
|
+
// encode SWAP_EXACT_OUTPUT
|
|
244
|
+
const swap = ethers_1.ethers.utils.defaultAbiCoder.encode([
|
|
245
|
+
/*
|
|
246
|
+
PathKey {
|
|
247
|
+
Currency intermediateCurrency;
|
|
248
|
+
uint24 fee;
|
|
249
|
+
int24 tickSpacing;
|
|
250
|
+
IHooks hooks;
|
|
251
|
+
bytes hookData;
|
|
252
|
+
}
|
|
253
|
+
ExactOutputParams {
|
|
254
|
+
address currencyOut;
|
|
255
|
+
PathKey[] path;
|
|
256
|
+
uint128 amountOut;
|
|
257
|
+
uint128 amountInMaximum;
|
|
258
|
+
}
|
|
259
|
+
*/
|
|
260
|
+
'tuple(address currencyOut, (address,uint24,int24,address,bytes)[] path, uint128 amountOut, uint128 amountInMaximum)',
|
|
261
|
+
], [
|
|
262
|
+
{
|
|
263
|
+
currencyOut: exactOutputParams.currencyOut,
|
|
264
|
+
path: exactOutputParams.path.map(pathKey => {
|
|
265
|
+
return [
|
|
266
|
+
pathKey.intermediateCurrency,
|
|
267
|
+
pathKey.fee,
|
|
268
|
+
pathKey.tickSpacing,
|
|
269
|
+
pathKey.hooks,
|
|
270
|
+
pathKey.hookData,
|
|
271
|
+
];
|
|
272
|
+
}),
|
|
273
|
+
amountOut: exactOutputParams.amountOut,
|
|
274
|
+
amountInMaximum: exactOutputParams.amountInMaximum,
|
|
275
|
+
},
|
|
159
276
|
]);
|
|
277
|
+
const settle = encodeSettle(srcToken, ActionConstants.OPEN_DELTA, true);
|
|
278
|
+
const take = encodeTake(destToken, recipient, amountOut);
|
|
279
|
+
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
160
280
|
}
|
|
161
281
|
//# sourceMappingURL=encoder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/encoder.ts"],"names":[],"mappings":";;;;;;
|
|
1
|
+
{"version":3,"file":"encoder.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/encoder.ts"],"names":[],"mappings":"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"}
|
|
@@ -48,9 +48,12 @@ export type PoolPairsInfo = {
|
|
|
48
48
|
poolId: string;
|
|
49
49
|
};
|
|
50
50
|
export type UniswapV4Data = {
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
51
|
+
path: {
|
|
52
|
+
tokenIn: Address;
|
|
53
|
+
tokenOut: Address;
|
|
54
|
+
zeroForOne: boolean;
|
|
55
|
+
pool: Pool;
|
|
56
|
+
}[];
|
|
54
57
|
};
|
|
55
58
|
export type Pool = {
|
|
56
59
|
id: string;
|
|
@@ -145,12 +145,17 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
145
145
|
unit: bigint_constants_1.BI_POWS[to.decimals],
|
|
146
146
|
prices,
|
|
147
147
|
data: {
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
148
|
+
path: [
|
|
149
|
+
{
|
|
150
|
+
pool: {
|
|
151
|
+
id: pool.id,
|
|
152
|
+
key: pool.key,
|
|
153
|
+
},
|
|
154
|
+
tokenIn: zeroForOne ? pool.key.currency0 : pool.key.currency1,
|
|
155
|
+
tokenOut: zeroForOne ? pool.key.currency1 : pool.key.currency0,
|
|
156
|
+
zeroForOne,
|
|
157
|
+
},
|
|
158
|
+
],
|
|
154
159
|
},
|
|
155
160
|
poolAddresses: [this.poolManagerAddress],
|
|
156
161
|
exchange: this.dexKey,
|
|
@@ -233,14 +238,40 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
233
238
|
}
|
|
234
239
|
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
235
240
|
let exchangeData;
|
|
241
|
+
// if (data.path.length === 1) {
|
|
242
|
+
// // Single hop
|
|
243
|
+
// const path = data.path[0];
|
|
244
|
+
// if (side === SwapSide.SELL) {
|
|
245
|
+
// exchangeData = swapExactInputSingleCalldata(
|
|
246
|
+
// srcToken,
|
|
247
|
+
// destToken,
|
|
248
|
+
// path.pool.key,
|
|
249
|
+
// path.zeroForOne,
|
|
250
|
+
// BigInt(srcAmount),
|
|
251
|
+
// // destMinAmount (can be 0 on dex level)
|
|
252
|
+
// 0n,
|
|
253
|
+
// recipient,
|
|
254
|
+
// );
|
|
255
|
+
// } else {
|
|
256
|
+
// exchangeData = swapExactOutputSingleCalldata(
|
|
257
|
+
// srcToken,
|
|
258
|
+
// destToken,
|
|
259
|
+
// path.pool.key,
|
|
260
|
+
// path.zeroForOne,
|
|
261
|
+
// BigInt(destAmount),
|
|
262
|
+
// recipient,
|
|
263
|
+
// );
|
|
264
|
+
// }
|
|
265
|
+
// } else {
|
|
266
|
+
// Multi-hop
|
|
267
|
+
exchangeData = '0x';
|
|
236
268
|
if (side === core_1.SwapSide.SELL) {
|
|
237
|
-
exchangeData = (0, encoder_1.
|
|
238
|
-
// destMinAmount (can be 0 on dex level)
|
|
239
|
-
0n, recipient);
|
|
269
|
+
exchangeData = (0, encoder_1.swapExactInputCalldata)(srcToken, destToken, data, BigInt(srcAmount), 0n, recipient);
|
|
240
270
|
}
|
|
241
271
|
else {
|
|
242
|
-
exchangeData = (0, encoder_1.
|
|
272
|
+
exchangeData = (0, encoder_1.swapExactOutputCalldata)(srcToken, destToken, data, BigInt(destAmount), recipient);
|
|
243
273
|
}
|
|
274
|
+
// }
|
|
244
275
|
return {
|
|
245
276
|
needWrapNative: this.needWrapNative,
|
|
246
277
|
sendEthButSupportsInsertFromAmount: true,
|
|
@@ -252,10 +283,9 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
252
283
|
};
|
|
253
284
|
}
|
|
254
285
|
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
255
|
-
const
|
|
256
|
-
const payload = '';
|
|
286
|
+
const payload = '0x';
|
|
257
287
|
return {
|
|
258
|
-
targetExchange:
|
|
288
|
+
targetExchange: this.routerAddress,
|
|
259
289
|
payload,
|
|
260
290
|
networkFee: '0',
|
|
261
291
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAWA,+CAAuE;AAEvE,uCAAkE;AAElE,wDAAoD;AACpD,qCAA2C;AAG3C,2EAA6D;AAC7D,2FAA6D;AAC7D,6DAAiD;AACjD,4CAA+C;AAC/C,iDAAoD;AAEpD,
|
|
1
|
+
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|