@paraswap/dex-lib 4.3.9 → 4.3.11
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/abi/synthetix/CombinedSynthetix.abi.json +20 -0
- package/build/dex/miro-migrator/constants.d.ts +1 -1
- package/build/dex/miro-migrator/constants.js +1 -1
- package/build/dex/miro-migrator/miro-migrator-pool.d.ts +1 -0
- package/build/dex/miro-migrator/miro-migrator-pool.js +1 -0
- package/build/dex/miro-migrator/miro-migrator-pool.js.map +1 -1
- package/build/dex/miro-migrator/miro-migrator.js +1 -0
- package/build/dex/miro-migrator/miro-migrator.js.map +1 -1
- package/build/dex/synthetix/synthetix-state.js +50 -12
- package/build/dex/synthetix/synthetix-state.js.map +1 -1
- package/build/dex/synthetix/synthetix.js +12 -7
- package/build/dex/synthetix/synthetix.js.map +1 -1
- package/build/dex/synthetix/types.d.ts +5 -0
- package/build/dex/synthetix/utils.d.ts +1 -0
- package/build/dex/synthetix/utils.js +4 -0
- package/build/dex/synthetix/utils.js.map +1 -1
- package/build/dex/uniswap-v4/encoder.d.ts +5 -5
- package/build/dex/uniswap-v4/encoder.js +142 -31
- package/build/dex/uniswap-v4/encoder.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.d.ts +1 -0
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js +33 -9
- package/build/dex/uniswap-v4/uniswap-v4-pool-manager.js.map +1 -1
- package/build/dex/uniswap-v4/uniswap-v4.d.ts +1 -0
- package/build/dex/uniswap-v4/uniswap-v4.js +37 -23
- package/build/dex/uniswap-v4/uniswap-v4.js.map +1 -1
- package/build/executor/Executor01BytecodeBuilder.js +7 -3
- package/build/executor/Executor01BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilder.js +7 -3
- package/build/executor/Executor02BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor03BytecodeBuilder.js +14 -3
- package/build/executor/Executor03BytecodeBuilder.js.map +1 -1
- package/package.json +1 -1
- package/build/abi/BProtocol.json +0 -1155
- package/build/abi/Jarvis.json +0 -1172
- package/build/abi/MStableAsset.json +0 -1545
- package/build/abi/OneInchLp.json +0 -1304
- package/build/abi/Onebit.json +0 -736
- package/build/abi/Shell.json +0 -1294
- package/build/abi/TraderJoeV2Router.json +0 -50
- package/build/abi/algebra-integral/Quoter.abi.json +0 -231
- package/build/abi/algebra-integral/SwapRouter.abi.json +0 -810
- package/build/abi/wUSDM.json +0 -757
- package/build/abi/zrx.v2.json +0 -1967
- package/build/abi/zrx.v3.json +0 -3454
- package/build/abi/zrx.v4.json +0 -2193
- package/build/dex/OneInchLp.d.ts +0 -24
- package/build/dex/OneInchLp.js +0 -43
- package/build/dex/OneInchLp.js.map +0 -1
- package/build/dex/algebra-integral/algebra-integral.d.ts +0 -43
- package/build/dex/algebra-integral/algebra-integral.js +0 -446
- package/build/dex/algebra-integral/algebra-integral.js.map +0 -1
- package/build/dex/algebra-integral/config.d.ts +0 -3
- package/build/dex/algebra-integral/config.js +0 -17
- package/build/dex/algebra-integral/config.js.map +0 -1
- package/build/dex/algebra-integral/types.d.ts +0 -33
- package/build/dex/algebra-integral/types.js +0 -10
- package/build/dex/algebra-integral/types.js.map +0 -1
- package/build/dex/bProtocol/bProtocol.d.ts +0 -15
- package/build/dex/bProtocol/bProtocol.js +0 -56
- package/build/dex/bProtocol/bProtocol.js.map +0 -1
- package/build/dex/bProtocol/types.d.ts +0 -11
- package/build/dex/bProtocol/types.js +0 -8
- package/build/dex/bProtocol/types.js.map +0 -1
- package/build/dex/jarvis.d.ts +0 -56
- package/build/dex/jarvis.js +0 -163
- package/build/dex/jarvis.js.map +0 -1
- package/build/dex/mStable.d.ts +0 -44
- package/build/dex/mStable.js +0 -75
- package/build/dex/mStable.js.map +0 -1
- package/build/dex/onebit/onebit.d.ts +0 -16
- package/build/dex/onebit/onebit.js +0 -61
- package/build/dex/onebit/onebit.js.map +0 -1
- package/build/dex/onebit/types.d.ts +0 -14
- package/build/dex/onebit/types.js +0 -8
- package/build/dex/onebit/types.js.map +0 -1
- package/build/dex/shell.d.ts +0 -25
- package/build/dex/shell.js +0 -41
- package/build/dex/shell.js.map +0 -1
- package/build/dex/trader-joe-v2.d.ts +0 -40
- package/build/dex/trader-joe-v2.js +0 -74
- package/build/dex/trader-joe-v2.js.map +0 -1
- package/build/dex/uniswap-v3/uniswap-v3-new.d.ts +0 -94
- package/build/dex/uniswap-v3/uniswap-v3-new.js +0 -923
- package/build/dex/uniswap-v3/uniswap-v3-new.js.map +0 -1
- package/build/dex/usual-bond/config.d.ts +0 -3
- package/build/dex/usual-bond/config.js +0 -13
- package/build/dex/usual-bond/config.js.map +0 -1
- package/build/dex/usual-bond/types.d.ts +0 -7
- package/build/dex/usual-bond/types.js +0 -3
- package/build/dex/usual-bond/types.js.map +0 -1
- package/build/dex/usual-bond/usual-bond.d.ts +0 -35
- package/build/dex/usual-bond/usual-bond.js +0 -176
- package/build/dex/usual-bond/usual-bond.js.map +0 -1
- package/build/dex/wusdm/config.d.ts +0 -3
- package/build/dex/wusdm/config.js +0 -43
- package/build/dex/wusdm/config.js.map +0 -1
- package/build/dex/wusdm/constants.d.ts +0 -2
- package/build/dex/wusdm/constants.js +0 -6
- package/build/dex/wusdm/constants.js.map +0 -1
- package/build/dex/wusdm/types.d.ts +0 -18
- package/build/dex/wusdm/types.js +0 -11
- package/build/dex/wusdm/types.js.map +0 -1
- package/build/dex/wusdm/wusdm-pool.d.ts +0 -21
- package/build/dex/wusdm/wusdm-pool.js +0 -74
- package/build/dex/wusdm/wusdm-pool.js.map +0 -1
- package/build/dex/wusdm/wusdm.d.ts +0 -46
- package/build/dex/wusdm/wusdm.js +0 -243
- package/build/dex/wusdm/wusdm.js.map +0 -1
- package/build/dex/zerox/config.d.ts +0 -2
- package/build/dex/zerox/config.js +0 -33
- package/build/dex/zerox/config.js.map +0 -1
- package/build/dex/zerox/index.d.ts +0 -22
- package/build/dex/zerox/index.js +0 -225
- package/build/dex/zerox/index.js.map +0 -1
- package/build/dex/zerox/order.d.ts +0 -88
- package/build/dex/zerox/order.js +0 -53
- package/build/dex/zerox/order.js.map +0 -1
- package/build/dex/zerox/types.d.ts +0 -73
- package/build/dex/zerox/types.js +0 -21
- package/build/dex/zerox/types.js.map +0 -1
|
@@ -13,9 +13,15 @@ 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");
|
|
16
18
|
const routerIface = new abi_1.Interface(router_abi_json_1.default);
|
|
17
19
|
var Commands;
|
|
18
20
|
(function (Commands) {
|
|
21
|
+
Commands[Commands["PERMIT2_TRANSFER_FROM"] = 2] = "PERMIT2_TRANSFER_FROM";
|
|
22
|
+
Commands[Commands["SWEEP"] = 4] = "SWEEP";
|
|
23
|
+
Commands[Commands["WRAP_ETH"] = 11] = "WRAP_ETH";
|
|
24
|
+
Commands[Commands["UNWRAP_WETH"] = 12] = "UNWRAP_WETH";
|
|
19
25
|
Commands[Commands["V4_SWAP"] = 16] = "V4_SWAP";
|
|
20
26
|
})(Commands || (Commands = {}));
|
|
21
27
|
var Actions;
|
|
@@ -45,37 +51,138 @@ var ActionConstants;
|
|
|
45
51
|
// address(2)
|
|
46
52
|
ActionConstants["ADDRESS_THIS"] = "0x0000000000000000000000000000000000000002";
|
|
47
53
|
})(ActionConstants || (ActionConstants = {}));
|
|
48
|
-
const MAX_UINT128 = 340282366920938463463374607431768211455n;
|
|
49
54
|
function encodeActions(actions) {
|
|
50
55
|
const types = actions.map(() => 'uint8');
|
|
51
56
|
return ethers_1.ethers.utils.solidityPack(types, actions);
|
|
52
57
|
}
|
|
53
|
-
function encodeInputForExecute(
|
|
54
|
-
const
|
|
55
|
-
const
|
|
58
|
+
function encodeInputForExecute(srcToken, destToken, data, side, amountIn, amountOut, recipient, encodedActions, encodedActionValues, wethAddr) {
|
|
59
|
+
const isEthSrc = (0, utils_1.isETHAddress)(srcToken);
|
|
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, ActionConstants.CONTRACT_BALANCE]);
|
|
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'],
|
|
89
|
+
// as all available balance will be unwrapped, set minAmount to 0
|
|
90
|
+
[ActionConstants.ADDRESS_THIS, 0]);
|
|
91
|
+
inputs.unshift(unwrapInput);
|
|
92
|
+
}
|
|
93
|
+
// Unwrap ETH on Router for WETH pool
|
|
94
|
+
if (isEthDest && isWethPoolForDest) {
|
|
95
|
+
types.push('uint8');
|
|
96
|
+
commands.push(Commands.UNWRAP_WETH);
|
|
97
|
+
const unwrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [recipient, 0]);
|
|
98
|
+
inputs.push(unwrapInput);
|
|
99
|
+
}
|
|
100
|
+
// Wrap ETH on Router for ETH pool
|
|
101
|
+
if (isWethDest && isEthPoolForDest) {
|
|
102
|
+
types.push('uint8');
|
|
103
|
+
commands.push(Commands.WRAP_ETH);
|
|
104
|
+
const wrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [recipient, ActionConstants.CONTRACT_BALANCE]);
|
|
105
|
+
inputs.push(wrapInput);
|
|
106
|
+
}
|
|
107
|
+
// take srcToken leftovers after BUY
|
|
108
|
+
if (side === constants_2.SwapSide.BUY) {
|
|
109
|
+
// unwrap if src token was wrapped
|
|
110
|
+
if (isEthSrc && isWethPoolForSrc) {
|
|
111
|
+
types.push('uint8');
|
|
112
|
+
commands.push(Commands.UNWRAP_WETH);
|
|
113
|
+
const unwrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'],
|
|
114
|
+
// as all available balance will be unwrapped, set minAmount to 0
|
|
115
|
+
[ActionConstants.ADDRESS_THIS, 0]);
|
|
116
|
+
inputs.push(unwrapInput);
|
|
117
|
+
}
|
|
118
|
+
// wrap if src token was unwrapped
|
|
119
|
+
if (isWethSrc && isEthPoolForSrc) {
|
|
120
|
+
types.push('uint8');
|
|
121
|
+
commands.push(Commands.WRAP_ETH);
|
|
122
|
+
const wrapInput = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256'], [ActionConstants.ADDRESS_THIS, ActionConstants.CONTRACT_BALANCE]);
|
|
123
|
+
inputs.push(wrapInput);
|
|
124
|
+
}
|
|
125
|
+
types.push('uint8');
|
|
126
|
+
commands.push(Commands.SWEEP);
|
|
127
|
+
const sweepInput = ethers_1.ethers.utils.defaultAbiCoder.encode(
|
|
128
|
+
// token, recipient, minAmount
|
|
129
|
+
['address', 'address', 'uint256'], [(0, utils_1.isETHAddress)(srcToken) ? constants_1.NULL_ADDRESS : srcToken, recipient, 0]);
|
|
130
|
+
inputs.push(sweepInput);
|
|
131
|
+
}
|
|
132
|
+
const command = ethers_1.ethers.utils.solidityPack(types, commands);
|
|
56
133
|
return routerIface.encodeFunctionData('execute(bytes,bytes[])', [
|
|
57
134
|
command,
|
|
58
|
-
|
|
135
|
+
inputs,
|
|
59
136
|
]);
|
|
60
137
|
}
|
|
61
|
-
function encodeSettle(srcToken,
|
|
138
|
+
function encodeSettle(srcToken, data, wethAddr) {
|
|
139
|
+
const isEthSrc = (0, utils_1.isETHAddress)(srcToken);
|
|
140
|
+
const isWethSrc = srcToken.toLowerCase() === wethAddr;
|
|
141
|
+
const firstPool = data.path[0];
|
|
142
|
+
const isWethPool = firstPool.tokenIn.toLowerCase() === wethAddr ||
|
|
143
|
+
firstPool.tokenOut.toLowerCase() === wethAddr;
|
|
144
|
+
const isEthPool = firstPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
145
|
+
firstPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
62
146
|
const settle = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'uint256', 'bool'],
|
|
63
147
|
// srcToken, amountIn (`OPEN_DELTA` to settle all needed funds), takeFundsFromMsgSender (Executor in our case)
|
|
64
148
|
[
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
149
|
+
isEthSrc && isWethPool
|
|
150
|
+
? wethAddr
|
|
151
|
+
: (isEthSrc && isEthPool) || (isWethSrc && isEthPool)
|
|
152
|
+
? constants_1.NULL_ADDRESS
|
|
153
|
+
: srcToken,
|
|
154
|
+
ActionConstants.OPEN_DELTA,
|
|
155
|
+
false, // we rely on srcToken transfer before swap, so no need to take funds from msg.sender
|
|
68
156
|
]);
|
|
69
157
|
return settle;
|
|
70
158
|
}
|
|
71
|
-
function encodeTake(destToken, recipient,
|
|
159
|
+
function encodeTake(destToken, data, recipient, wethAddr) {
|
|
160
|
+
const isEthDest = (0, utils_1.isETHAddress)(destToken);
|
|
161
|
+
const isWethDest = destToken.toLowerCase() === wethAddr;
|
|
162
|
+
const lastPool = data.path[data.path.length - 1];
|
|
163
|
+
const isWethPool = lastPool.tokenOut.toLowerCase() === wethAddr ||
|
|
164
|
+
lastPool.tokenIn.toLowerCase() === wethAddr;
|
|
165
|
+
const isEthPool = lastPool.tokenOut.toLowerCase() === constants_1.NULL_ADDRESS ||
|
|
166
|
+
lastPool.tokenIn.toLowerCase() === constants_1.NULL_ADDRESS;
|
|
72
167
|
const take = ethers_1.ethers.utils.defaultAbiCoder.encode(['address', 'address', 'uint256'],
|
|
73
168
|
// destToken, recipient, amountOut (`OPEN_DELTA` to take all funds)
|
|
74
|
-
[
|
|
169
|
+
[
|
|
170
|
+
isEthDest && isWethPool
|
|
171
|
+
? wethAddr
|
|
172
|
+
: (isWethDest && isEthPool) || (isEthDest && isEthPool)
|
|
173
|
+
? constants_1.NULL_ADDRESS
|
|
174
|
+
: destToken,
|
|
175
|
+
(isEthDest && isWethPool) || (isWethDest && isEthPool)
|
|
176
|
+
? ActionConstants.ADDRESS_THIS
|
|
177
|
+
: recipient,
|
|
178
|
+
ActionConstants.OPEN_DELTA,
|
|
179
|
+
]);
|
|
75
180
|
return take;
|
|
76
181
|
}
|
|
77
182
|
// Single hop encoding for SELL side
|
|
78
|
-
function swapExactInputSingleCalldata(srcToken, destToken,
|
|
183
|
+
function swapExactInputSingleCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient, weth) {
|
|
184
|
+
const path = data.path[0];
|
|
185
|
+
const poolKey = path.pool.key;
|
|
79
186
|
const actions = encodeActions([
|
|
80
187
|
Actions.SWAP_EXACT_IN_SINGLE,
|
|
81
188
|
Actions.SETTLE,
|
|
@@ -83,7 +190,7 @@ function swapExactInputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
83
190
|
]);
|
|
84
191
|
const exactInputSingleParams = {
|
|
85
192
|
poolKey,
|
|
86
|
-
zeroForOne,
|
|
193
|
+
zeroForOne: path.zeroForOne,
|
|
87
194
|
amountIn,
|
|
88
195
|
amountOutMinimum,
|
|
89
196
|
hookData: '0x', // empty bytes
|
|
@@ -115,12 +222,12 @@ function swapExactInputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
115
222
|
exactInputSingleParams.hookData,
|
|
116
223
|
],
|
|
117
224
|
]);
|
|
118
|
-
const settle = encodeSettle(srcToken,
|
|
119
|
-
const take = encodeTake(destToken, recipient,
|
|
120
|
-
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
225
|
+
const settle = encodeSettle(srcToken, data, weth);
|
|
226
|
+
const take = encodeTake(destToken, data, recipient, weth);
|
|
227
|
+
return encodeInputForExecute(srcToken, destToken, data, constants_2.SwapSide.SELL, amountIn, amountOutMinimum, recipient, actions, [swap, settle, take], weth);
|
|
121
228
|
}
|
|
122
229
|
// Multi-hop encoding for SELL side
|
|
123
|
-
function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient) {
|
|
230
|
+
function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMinimum, recipient, weth) {
|
|
124
231
|
const actions = encodeActions([
|
|
125
232
|
Actions.SWAP_EXACT_IN,
|
|
126
233
|
Actions.SETTLE,
|
|
@@ -176,12 +283,15 @@ function swapExactInputCalldata(srcToken, destToken, data, amountIn, amountOutMi
|
|
|
176
283
|
amountOutMinimum: exactInputParams.amountOutMinimum,
|
|
177
284
|
},
|
|
178
285
|
]);
|
|
179
|
-
const settle = encodeSettle(srcToken,
|
|
180
|
-
const take = encodeTake(destToken, recipient,
|
|
181
|
-
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
286
|
+
const settle = encodeSettle(srcToken, data, weth);
|
|
287
|
+
const take = encodeTake(destToken, data, recipient, weth);
|
|
288
|
+
return encodeInputForExecute(srcToken, destToken, data, constants_2.SwapSide.SELL, amountIn, amountOutMinimum, recipient, actions, [swap, settle, take], weth);
|
|
182
289
|
}
|
|
183
290
|
// Single hop encoding for BUY side
|
|
184
|
-
function swapExactOutputSingleCalldata(srcToken, destToken,
|
|
291
|
+
function swapExactOutputSingleCalldata(srcToken, destToken, data, amountIn, amountOut, recipient, weth) {
|
|
292
|
+
const path = data.path[0];
|
|
293
|
+
const poolKey = path.pool.key;
|
|
294
|
+
const amountInMaximum = bigint_constants_1.BI_MAX_UINT128;
|
|
185
295
|
const actions = encodeActions([
|
|
186
296
|
Actions.SWAP_EXACT_OUT_SINGLE,
|
|
187
297
|
Actions.SETTLE,
|
|
@@ -189,9 +299,9 @@ function swapExactOutputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
189
299
|
]);
|
|
190
300
|
const exactOutputSingleParams = {
|
|
191
301
|
poolKey,
|
|
192
|
-
zeroForOne,
|
|
302
|
+
zeroForOne: path.zeroForOne,
|
|
193
303
|
amountOut,
|
|
194
|
-
amountInMaximum
|
|
304
|
+
amountInMaximum,
|
|
195
305
|
hookData: '0x', // empty bytes
|
|
196
306
|
};
|
|
197
307
|
// encode SWAP_EXACT_OUTPUT_SINGLE
|
|
@@ -221,23 +331,24 @@ function swapExactOutputSingleCalldata(srcToken, destToken, poolKey, zeroForOne,
|
|
|
221
331
|
exactOutputSingleParams.hookData,
|
|
222
332
|
],
|
|
223
333
|
]);
|
|
224
|
-
const settle = encodeSettle(srcToken,
|
|
225
|
-
const take = encodeTake(destToken, recipient,
|
|
226
|
-
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
334
|
+
const settle = encodeSettle(srcToken, data, weth);
|
|
335
|
+
const take = encodeTake(destToken, data, recipient, weth);
|
|
336
|
+
return encodeInputForExecute(srcToken, destToken, data, constants_2.SwapSide.BUY, amountIn, amountOut, recipient, actions, [swap, settle, take], weth);
|
|
227
337
|
}
|
|
228
338
|
// Multi-hop encoding for SELL side
|
|
229
|
-
function swapExactOutputCalldata(srcToken, destToken, data, amountOut, recipient) {
|
|
339
|
+
function swapExactOutputCalldata(srcToken, destToken, data, amountIn, amountOut, recipient, weth) {
|
|
230
340
|
const actions = encodeActions([
|
|
231
341
|
Actions.SWAP_EXACT_OUT,
|
|
232
342
|
Actions.SETTLE,
|
|
233
343
|
Actions.TAKE,
|
|
234
344
|
]);
|
|
345
|
+
const amountInMaximum = bigint_constants_1.BI_MAX_UINT128;
|
|
235
346
|
const exactOutputParams = {
|
|
236
347
|
currencyOut: (0, utils_1.isETHAddress)(data.path[data.path.length - 1].tokenOut)
|
|
237
348
|
? constants_1.NULL_ADDRESS
|
|
238
349
|
: data.path[data.path.length - 1].tokenOut,
|
|
239
350
|
amountOut,
|
|
240
|
-
amountInMaximum
|
|
351
|
+
amountInMaximum,
|
|
241
352
|
path: data.path.map(path => ({
|
|
242
353
|
intermediateCurrency: (0, utils_1.isETHAddress)(path.tokenIn)
|
|
243
354
|
? constants_1.NULL_ADDRESS
|
|
@@ -282,8 +393,8 @@ function swapExactOutputCalldata(srcToken, destToken, data, amountOut, recipient
|
|
|
282
393
|
amountInMaximum: exactOutputParams.amountInMaximum,
|
|
283
394
|
},
|
|
284
395
|
]);
|
|
285
|
-
const settle = encodeSettle(srcToken,
|
|
286
|
-
const take = encodeTake(destToken, recipient,
|
|
287
|
-
return encodeInputForExecute(actions, [swap, settle, take]);
|
|
396
|
+
const settle = encodeSettle(srcToken, data, weth);
|
|
397
|
+
const take = encodeTake(destToken, data, recipient, weth);
|
|
398
|
+
return encodeInputForExecute(srcToken, destToken, data, constants_2.SwapSide.BUY, amountIn, amountOut, recipient, actions, [swap, settle, take], weth);
|
|
288
399
|
}
|
|
289
400
|
//# 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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"}
|
|
@@ -20,6 +20,7 @@ export declare class UniswapV4PoolManager extends StatefulEventSubscriber<PoolMa
|
|
|
20
20
|
logDecoder: (log: Log) => any;
|
|
21
21
|
stateViewIface: Interface;
|
|
22
22
|
poolManagerIface: Interface;
|
|
23
|
+
private wethAddress;
|
|
23
24
|
private poolsCacheKey;
|
|
24
25
|
constructor(dexHelper: IDexHelper, parentName: string, network: number, config: DexParams, logger: Logger, mapKey?: string);
|
|
25
26
|
initialize(blockNumber: number, options?: InitializeStateOptions<PoolManagerState>): Promise<void>;
|
|
@@ -24,6 +24,7 @@ class UniswapV4PoolManager extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
24
24
|
logDecoder;
|
|
25
25
|
stateViewIface;
|
|
26
26
|
poolManagerIface;
|
|
27
|
+
wethAddress;
|
|
27
28
|
poolsCacheKey = 'pools_cache';
|
|
28
29
|
constructor(dexHelper, parentName, network, config, logger, mapKey = '') {
|
|
29
30
|
super(parentName, `${parentName} PoolManager`, dexHelper, logger, false, mapKey);
|
|
@@ -34,6 +35,8 @@ class UniswapV4PoolManager extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
34
35
|
this.stateViewIface = new utils_1.Interface(state_view_abi_json_1.default);
|
|
35
36
|
this.poolManagerIface = new utils_1.Interface(pool_manager_abi_json_1.default);
|
|
36
37
|
this.addressesSubscribed = [this.config.poolManager];
|
|
38
|
+
this.wethAddress =
|
|
39
|
+
this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
37
40
|
this.logDecoder = (log) => this.poolManagerIface.parseLog(log);
|
|
38
41
|
// Add handlers
|
|
39
42
|
this.handlers['Initialize'] = this.handleInitializeEvent.bind(this);
|
|
@@ -73,19 +76,39 @@ class UniswapV4PoolManager extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
73
76
|
async getAvailablePoolsForPair(srcToken, destToken, blockNumber) {
|
|
74
77
|
const isEthSrc = (0, utils_2.isETHAddress)(srcToken);
|
|
75
78
|
const isEthDest = (0, utils_2.isETHAddress)(destToken);
|
|
79
|
+
const isWethSrc = srcToken.toLowerCase() === this.wethAddress;
|
|
80
|
+
const isWethDest = destToken.toLowerCase() === this.wethAddress;
|
|
76
81
|
const _src = isEthSrc ? constants_1.NULL_ADDRESS : srcToken.toLowerCase();
|
|
77
82
|
const _dest = isEthDest ? constants_1.NULL_ADDRESS : destToken.toLowerCase();
|
|
83
|
+
const matchesSrcToken = (poolToken) => {
|
|
84
|
+
return (poolToken === _src ||
|
|
85
|
+
(isEthSrc && poolToken === this.wethAddress) ||
|
|
86
|
+
(isWethSrc && poolToken === constants_1.NULL_ADDRESS));
|
|
87
|
+
};
|
|
88
|
+
const matchesDestToken = (poolToken) => {
|
|
89
|
+
return (poolToken === _dest ||
|
|
90
|
+
(isEthDest && poolToken === this.wethAddress) ||
|
|
91
|
+
(isWethDest && poolToken === constants_1.NULL_ADDRESS));
|
|
92
|
+
};
|
|
78
93
|
return this.pools
|
|
79
|
-
.filter(pool =>
|
|
80
|
-
|
|
81
|
-
.
|
|
82
|
-
const
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
|
|
86
|
-
|
|
87
|
-
|
|
94
|
+
.filter(pool => {
|
|
95
|
+
// TODO: temporary, should be used for tests only
|
|
96
|
+
const token0 = pool.token0.address.toLowerCase();
|
|
97
|
+
const token1 = pool.token1.address.toLowerCase();
|
|
98
|
+
// force weth pools
|
|
99
|
+
// return token0 !== NULL_ADDRESS && token1 !== NULL_ADDRESS;
|
|
100
|
+
// force eth pools
|
|
101
|
+
// return token0 === NULL_ADDRESS || token1 === NULL_ADDRESS;
|
|
102
|
+
// all pools
|
|
103
|
+
return true;
|
|
88
104
|
})
|
|
105
|
+
.filter(pool => {
|
|
106
|
+
const token0 = pool.token0.address;
|
|
107
|
+
const token1 = pool.token1.address;
|
|
108
|
+
return ((matchesSrcToken(token0) && matchesDestToken(token1)) ||
|
|
109
|
+
(matchesSrcToken(token1) && matchesDestToken(token0)));
|
|
110
|
+
})
|
|
111
|
+
.sort((a, b) => parseFloat(b.volumeUSD || '0') - parseFloat(a.volumeUSD || '0'))
|
|
89
112
|
.map(pool => ({
|
|
90
113
|
id: pool.id,
|
|
91
114
|
key: {
|
|
@@ -129,6 +152,7 @@ class UniswapV4PoolManager extends stateful_event_subscriber_1.StatefulEventSubs
|
|
|
129
152
|
this.logger.warn(`Pool ${id} has hooks ${hooks}, which is not supported yet. Skipping.`);
|
|
130
153
|
return {};
|
|
131
154
|
}
|
|
155
|
+
this.logger.info(`Initializing pool ${id} with fee ${fee} and tick spacing ${tickSpacing} on ${this.parentName} `);
|
|
132
156
|
this.pools.push({
|
|
133
157
|
id,
|
|
134
158
|
fee,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"uniswap-v4-pool-manager.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4-pool-manager.ts"],"names":[],"mappings":";;;;;;AAAA,+EAGyC;AAGzC,mGAA6E;AAC7E,uGAAiF;AACjF,4CAA6C;AAI7C,yCAA0E;AAC1E,uCAA2C;AAC3C,+CAA+C;AAC/C,2CAA0D;AAE1D,uDAAkD;AAElD,MAAa,oBAAqB,SAAQ,mDAAyC;
|
|
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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"}
|
|
@@ -24,6 +24,7 @@ export declare class UniswapV4 extends SimpleExchange implements IDex<UniswapV4D
|
|
|
24
24
|
key: string;
|
|
25
25
|
networks: Network[];
|
|
26
26
|
}[];
|
|
27
|
+
private wethAddress;
|
|
27
28
|
constructor(network: Network, dexKey: string, dexHelper: IDexHelper, routerAddress?: string, quoterAddress?: string, poolManagerAddress?: string);
|
|
28
29
|
initializePricing(blockNumber: number): Promise<void>;
|
|
29
30
|
addMasterPool(poolKey: string, blockNumber: number): Promise<boolean>;
|
|
@@ -61,11 +61,13 @@ 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
|
|
64
65
|
needWrapNative = false;
|
|
65
66
|
logger;
|
|
66
67
|
quoterIface;
|
|
67
68
|
poolManager;
|
|
68
69
|
static dexKeysWithNetwork = (0, utils_1.getDexKeysWithNetwork)(config_1.UniswapV4Config);
|
|
70
|
+
wethAddress;
|
|
69
71
|
constructor(network, dexKey, dexHelper, routerAddress = config_1.UniswapV4Config[dexKey][network].router, quoterAddress = config_1.UniswapV4Config[dexKey][network].quoter, poolManagerAddress = config_1.UniswapV4Config[dexKey][network].poolManager) {
|
|
70
72
|
super(dexHelper, dexKey);
|
|
71
73
|
this.network = network;
|
|
@@ -75,6 +77,8 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
75
77
|
this.poolManagerAddress = poolManagerAddress;
|
|
76
78
|
this.logger = dexHelper.getLogger(dexKey);
|
|
77
79
|
this.quoterIface = new abi_1.Interface(quoter_abi_json_1.default);
|
|
80
|
+
this.wethAddress =
|
|
81
|
+
this.dexHelper.config.data.wrappedNativeTokenAddress.toLowerCase();
|
|
78
82
|
this.poolManager = new uniswap_v4_pool_manager_1.UniswapV4PoolManager(dexHelper, dexKey, network, config_1.UniswapV4Config[dexKey][network], this.logger, this.cacheStateKey);
|
|
79
83
|
}
|
|
80
84
|
async initializePricing(blockNumber) {
|
|
@@ -121,8 +125,17 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
121
125
|
pools.map(t => t.id);
|
|
122
126
|
const pricesPromises = availablePools.map(async (poolId) => {
|
|
123
127
|
const pool = pools.find(p => p.id === poolId);
|
|
124
|
-
const
|
|
125
|
-
|
|
128
|
+
const fromAddress = from.address.toLowerCase();
|
|
129
|
+
const poolCurrency0 = pool.key.currency0;
|
|
130
|
+
const isFromEth = (0, utils_1.isETHAddress)(fromAddress);
|
|
131
|
+
const isFromWeth = fromAddress === this.wethAddress;
|
|
132
|
+
const currency0IsEth = poolCurrency0 === constants_1.NULL_ADDRESS;
|
|
133
|
+
const currency0IsWeth = poolCurrency0 === this.wethAddress;
|
|
134
|
+
const zeroForOne = fromAddress === poolCurrency0 ||
|
|
135
|
+
(isFromEth && currency0IsEth) || // ETH is src and native ETH pool
|
|
136
|
+
(isFromEth && currency0IsWeth) || // ETH is src and WETH pool
|
|
137
|
+
(isFromWeth && currency0IsEth); // WETH is src and native ETH pool
|
|
138
|
+
// WETH is src and WETH pool is handled in fromAddress === poolCurrency0 case
|
|
126
139
|
const eventPool = await this.poolManager.getEventPool(poolId, blockNumber);
|
|
127
140
|
const poolState = (await eventPool?.getState(blockNumber)) || null;
|
|
128
141
|
let prices;
|
|
@@ -247,37 +260,38 @@ class UniswapV4 extends simple_exchange_1.SimpleExchange {
|
|
|
247
260
|
return results.map(result => (result.success ? result.returnData : 0n));
|
|
248
261
|
}
|
|
249
262
|
getDexParam(srcToken, destToken, srcAmount, destAmount, recipient, data, side) {
|
|
250
|
-
let
|
|
251
|
-
if (data.path.length === 1) {
|
|
252
|
-
// Single
|
|
253
|
-
|
|
254
|
-
|
|
255
|
-
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
|
|
259
|
-
|
|
260
|
-
|
|
261
|
-
|
|
263
|
+
let encodingMethod;
|
|
264
|
+
if (data.path.length === 1 && side === core_1.SwapSide.SELL) {
|
|
265
|
+
// Single-hop encoding for SELL side
|
|
266
|
+
encodingMethod = encoder_1.swapExactInputSingleCalldata;
|
|
267
|
+
}
|
|
268
|
+
else if (data.path.length === 1 && side === core_1.SwapSide.BUY) {
|
|
269
|
+
// Single-hop encoding for BUY side
|
|
270
|
+
encodingMethod = encoder_1.swapExactOutputSingleCalldata;
|
|
271
|
+
}
|
|
272
|
+
else if (data.path.length > 1 && side === core_1.SwapSide.SELL) {
|
|
273
|
+
// Multi-hop encoding for SELL side
|
|
274
|
+
encodingMethod = encoder_1.swapExactInputCalldata;
|
|
275
|
+
}
|
|
276
|
+
else if (data.path.length > 1 && side === core_1.SwapSide.BUY) {
|
|
277
|
+
// Multi-hop encoding for BUY side
|
|
278
|
+
encodingMethod = encoder_1.swapExactOutputCalldata;
|
|
262
279
|
}
|
|
263
280
|
else {
|
|
264
|
-
|
|
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
|
-
}
|
|
281
|
+
throw new Error(`${this.dexKey}-${this.network}: Logic error for side: ${side}, data.path.length: ${data.path.length}`);
|
|
272
282
|
}
|
|
283
|
+
const exchangeData = encodingMethod(srcToken, destToken, data, BigInt(srcAmount), side === core_1.SwapSide.SELL ? 0n : BigInt(destAmount), recipient, this.wethAddress);
|
|
273
284
|
return {
|
|
274
285
|
needWrapNative: this.needWrapNative,
|
|
275
286
|
sendEthButSupportsInsertFromAmount: true,
|
|
276
287
|
dexFuncHasRecipient: true,
|
|
277
288
|
exchangeData,
|
|
278
289
|
targetExchange: this.routerAddress,
|
|
279
|
-
permit2Approval: true,
|
|
280
290
|
returnAmountPos: undefined,
|
|
291
|
+
transferSrcTokenBeforeSwap: (0, utils_1.isETHAddress)(srcToken)
|
|
292
|
+
? undefined
|
|
293
|
+
: this.routerAddress,
|
|
294
|
+
skipApproval: true,
|
|
281
295
|
};
|
|
282
296
|
}
|
|
283
297
|
getAdapterParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
@@ -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,uCAKmB;AACnB,uEAAiE;AAGjE,+EAAyE;AACzE,yCAA0C;AAC1C,yCAAyD;AACzD,oDAAuB;AACvB,2CAA0D;AAC1D,yDAAgE;AAEhE,MAAa,SAAU,SAAQ,gCAAc;IAa/B;IAEA;IACA;IACA;IACA;IAjBH,4BAA4B,GAAG,KAAK,CAAC;IAC9C,cAAc,GAAG,KAAK,CAAC;IAEvB,MAAM,CAAS;IACL,WAAW,CAAY;IAEzB,WAAW,CAAuB;IAEnC,MAAM,CAAC,kBAAkB,GAC9B,IAAA,6BAAqB,EAAC,wBAAe,CAAC,CAAC;IAEzC,YACY,OAAgB,EAC1B,MAAc,EACJ,SAAqB,EACrB,gBAAgB,wBAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EACvD,gBAAgB,wBAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,MAAM,EACvD,qBAAqB,wBAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,WAAW;QAE3E,KAAK,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;QAPf,YAAO,GAAP,OAAO,CAAS;QAEhB,cAAS,GAAT,SAAS,CAAY;QACrB,kBAAa,GAAb,aAAa,CAA0C;QACvD,kBAAa,GAAb,aAAa,CAA0C;QACvD,uBAAkB,GAAlB,kBAAkB,CAA+C;QAG3E,IAAI,CAAC,MAAM,GAAG,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QAC1C,IAAI,CAAC,WAAW,GAAG,IAAI,eAAS,CAAC,yBAAS,CAAC,CAAC;QAE5C,IAAI,CAAC,WAAW,GAAG,IAAI,8CAAoB,CACzC,SAAS,EACT,MAAM,EACN,OAAO,EACP,wBAAe,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,EAChC,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,aAAa,CACnB,CAAC;IACJ,CAAC;IAED,KAAK,CAAC,iBAAiB,CAAC,WAAmB;QACzC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;IACjD,CAAC;IAED,KAAK,CAAC,aAAa,CAAC,OAAe,EAAE,WAAmB;QACtD,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAC5C,iCAAoB,EACpB,GAAG,IAAI,CAAC,aAAa,IAAI,OAAO,EAAE,CACnC,CAAC;QACF,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,MAAM,wCAAwC,iCAAoB,IAAI,IAAI,CAAC,aAAa,IAAI,OAAO,EAAE,CAC9G,CAAC;YACF,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,QAAQ,GAAkB,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACnD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CAC9C,QAAQ,CAAC,MAAM,EACf,WAAW,CACZ,CAAC;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,OAAO,KAAK,CAAC;QACf,CAAC;QAED,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,kBAAkB,CACtB,IAAW,EACX,EAAS,EACT,IAAc,EACd,WAAmB;QAEnB,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CAC3D,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAC1B,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EACxB,WAAW,CACZ,CAAC;QAEF,MAAM,UAAU,GAAG,CACjB,MAAM,OAAO,CAAC,GAAG,CACf,KAAK,CAAC,GAAG,CAAC,KAAK,EAAC,IAAI,EAAC,EAAE,CACrB,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,EAAE,EAAE,WAAW,CAAC,CACpD,CACF,CACF,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,CAAC;QAEhC,OAAO,UAAU,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAU,CAAC,MAAM,CAAC,CAAC;IACxD,CAAC;IAES,WAAW,CACnB,IAAU,EACV,KAA8B,EAC9B,OAAiB,EACjB,UAAmB,EACnB,IAAc,EACd,KAAa;QAEb,IAAI,CAAC;YACH,MAAM,aAAa,GAAG,wCAAiB,CAAC,YAAY,CAClD,IAAI,EACJ,KAAK,EACL,OAAO,EACP,UAAU,EACV,IAAI,EACJ,IAAI,CAAC,MAAM,EACX,KAAK,CACN,CAAC;YAEF,IACE,aAAa,KAAK,IAAI;gBACtB,IAAI,KAAK,eAAQ,CAAC,GAAG;gBACrB,aAAa,CAAC,aAAa,EAAE,MAAM,GAAG,CAAC,CAAC,KAAK,EAAE,EAC/C,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO,aAAa,CAAC;QACvB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,GAAG,IAAI,CAAC,MAAM,2DAA2D,EACzE,CAAC,CACF,CAAC;YACF,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;IAED,KAAK,CAAC,eAAe,CACnB,IAAW,EACX,EAAS,EACT,OAAiB,EACjB,IAAc,EACd,WAAmB,EACnB,UAAqB;QAErB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC;QAChD,2CAA2C;QAE3C,MAAM,KAAK,GAAW,MAAM,IAAI,CAAC,WAAW,CAAC,wBAAwB,CACnE,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,EAC1B,EAAE,CAAC,OAAO,CAAC,WAAW,EAAE,EACxB,WAAW,CACZ,CAAC;QAEF,MAAM,cAAc,GAClB,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;YACpD,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAEvB,MAAM,cAAc,GAAG,cAAc,CAAC,GAAG,CAAC,KAAK,EAAC,MAAM,EAAC,EAAE;YACvD,MAAM,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,MAAM,CAAE,CAAC;YAE/C,MAAM,UAAU,GACd,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE;gBAC/D,CAAC,IAAA,oBAAY,EAAC,IAAI,CAAC,OAAO,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,SAAS,KAAK,wBAAY,CAAC,CAAC;YAEtE,MAAM,SAAS,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,YAAY,CACnD,MAAM,EACN,WAAW,CACZ,CAAC;YAEF,MAAM,SAAS,GAAG,CAAC,MAAM,SAAS,EAAE,QAAQ,CAAC,WAAW,CAAC,CAAC,IAAI,IAAI,CAAC;YAEnE,IAAI,MAAuB,CAAC;YAC5B,IAAI,SAAS,KAAK,IAAI,IAAI,SAAS,CAAC,OAAO,EAAE,CAAC;gBAC5C,sCAAsC;gBACtC,MAAM,GAAG,IAAI,CAAC,WAAW,CACvB,IAAI,EACJ,SAAS,EACT,OAAO,EACP,UAAU,EACV,IAAI,EACJ,KAAK,CACN,CAAC;gBAEF,oBAAoB;gBACpB,yCAAyC;gBACzC,mCAAmC;gBACnC,yCAAyC;gBACzC,iBAAiB;gBACjB,8CAA8C;gBAC9C,KAAK;YACP,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,IAAI,CACd,GAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,OAAO,UAAU,MAAM,4CAA4C,CAC3F,CAAC;gBACF,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CACnC,UAAU,EACV,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,WAAW,CACZ,CAAC;YACJ,CAAC;YAED,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;gBACpB,OAAO,IAAI,CAAC;YACd,CAAC;YAED,IAAI,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,KAAK,EAAE,IAAI,KAAK,KAAK,EAAE,CAAC,EAAE,CAAC;gBACzD,OAAO,IAAI,CAAC;YACd,CAAC;YAED,OAAO;gBACL,IAAI,EAAE,0BAAO,CAAC,EAAE,CAAC,QAAQ,CAAC;gBAC1B,MAAM;gBACN,IAAI,EAAE;oBACJ,IAAI,EAAE;wBACJ;4BACE,IAAI,EAAE;gCACJ,EAAE,EAAE,IAAI,CAAC,EAAE;gCACX,GAAG,EAAE,IAAI,CAAC,GAAG;6BACd;4BACD,OAAO,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS;4BAC7D,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,SAAS;4BAC9D,UAAU;yBACX;qBACF;iBACF;gBACD,aAAa,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC;gBACxC,QAAQ,EAAE,IAAI,CAAC,MAAM;gBACrB,OAAO,EAAE,OAAO;gBAChB,cAAc,EAAE,MAAM;aACvB,CAAC;QACJ,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QACjD,oBAAoB;QACpB,gEAAgE;QAChE,wCAAwC;QACxC,WAAW;QACX,KAAK;QACL,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,IAAI,CAAC,CAAC;IAC5C,CAAC;IAED,mEAAmE;IACnE,kBAAkB,CAAC,UAAqC;QACtD,OAAO,iBAAiB,CAAC,cAAc,CAAC;IAC1C,CAAC;IAED,WAAW,CAAC,IAAc;QACxB,OAAO,IAAI,CAAC;IACd,CAAC;IAED,KAAK,CAAC,mBAAmB,CACvB,YAAqB,EACrB,KAAa;QAEb,IAAI,aAAa,GAAG,YAAY,CAAC,WAAW,EAAE,CAAC;QAC/C,IAAI,IAAA,oBAAY,EAAC,aAAa,CAAC;YAAE,aAAa,GAAG,wBAAY,CAAC;QAE9D,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAA,sCAA2B,EAC1D,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,MAAM,EACX,IAAI,CAAC,MAAM,EACX,wBAAe,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,WAAW,EACtD,aAAa,EACb,KAAK,CACN,CAAC;QAEF,IAAI,CAAC,CAAC,MAAM,IAAI,MAAM,CAAC,EAAE,CAAC;YACxB,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,SAAS,IAAI,CAAC,MAAM,uDAAuD,CAC5E,CAAC;YACF,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,WAAW,GAAoB,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,OAAO,EAAE,IAAI,CAAC,kBAAkB;YAChC,eAAe,EAAE;gBACf;oBACE,OAAO,EACL,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,wBAAY;wBAChD,CAAC,CAAC,yBAAa;wBACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;oBACvC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;iBACzC;aACF;YACD,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,uCAA2B;SACvE,CAAC,CAAC,CAAC;QAEJ,MAAM,WAAW,GAAoB,gBAAC,CAAC,GAAG,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,MAAM;YACrB,OAAO,EAAE,IAAI,CAAC,kBAAkB;YAChC,eAAe,EAAE;gBACf;oBACE,OAAO,EACL,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,wBAAY;wBAChD,CAAC,CAAC,yBAAa;wBACf,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,WAAW,EAAE;oBACvC,QAAQ,EAAE,QAAQ,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC;iBACzC;aACF;YACD,YAAY,EAAE,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,GAAG,uCAA2B;SACvE,CAAC,CAAC,CAAC;QAEJ,MAAM,KAAK,GAAoB,gBAAC,CAAC,KAAK,CACpC,gBAAC,CAAC,MAAM,CAAC,gBAAC,CAAC,MAAM,CAAC,WAAW,EAAE,WAAW,CAAC,EAAE;YAC3C,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,YAAY;SAC/B,CAAC,EACF,CAAC,EACD,KAAK,CACN,CAAC;QAEF,OAAO,KAAK,CAAC;IACf,CAAC;IAED,KAAK,CAAC,iBAAiB,CACrB,UAAmB,EACnB,OAAiB,EACjB,IAAU,EACV,IAAc,EACd,WAAmB;QAEnB,MAAM,QAAQ,GACZ,IAAI,KAAK,eAAQ,CAAC,IAAI;YACpB,CAAC,CAAC,uBAAuB;YACzB,CAAC,CAAC,wBAAwB,CAAC;QAE/B,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YACnC,MAAM,EAAE,IAAI,CAAC,aAAa;YAC1B,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,kBAAkB,CAAC,QAAQ,EAAE;gBACtD;oBACE,OAAO,EAAE,IAAI,CAAC,GAAG;oBACjB,UAAU;oBACV,WAAW,EAAE,MAAM,CAAC,QAAQ,EAAE;oBAC9B,QAAQ,EAAE,IAAI;iBACf;aACF,CAAC;YACF,cAAc,EAAE,CAAC,MAA0C,EAAU,EAAE;gBACrE,yBAAyB;gBACzB,OAAO,IAAA,yBAAc,EAAC,MAAM,EAAE,CAAC,SAAS,EAAE,SAAS,CAAC,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,CAChE,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE,CAAC,CAC5B,CAAC;YACJ,CAAC;SACF,CAAC,CAAC,CAAC;QAEJ,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,YAAa,CAAC,YAAY,CAC7D,KAAK,EACL,KAAK,EACL,WAAW,CACZ,CAAC;QACF,OAAO,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAC1E,CAAC;IAED,WAAW,CACT,QAAiB,EACjB,SAAkB,EAClB,SAAyB,EACzB,UAA0B,EAC1B,SAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,IAAI,YAAoB,CAAC;QAEzB,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC3B,aAAa;YACb,MAAM,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,IAAI,KAAK,eAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3B,YAAY,GAAG,IAAA,sCAA4B,EACzC,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,GAAG,EACb,IAAI,CAAC,UAAU,EACf,MAAM,CAAC,SAAS,CAAC;gBACjB,wCAAwC;gBACxC,EAAE,EACF,SAAS,CACV,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,IAAA,uCAA6B,EAC1C,QAAQ,EACR,SAAS,EACT,IAAI,CAAC,IAAI,CAAC,GAAG,EACb,IAAI,CAAC,UAAU,EACf,MAAM,CAAC,UAAU,CAAC,EAClB,SAAS,CACV,CAAC;YACJ,CAAC;QACH,CAAC;aAAM,CAAC;YACN,YAAY;YACZ,YAAY,GAAG,IAAI,CAAC;YAEpB,IAAI,IAAI,KAAK,eAAQ,CAAC,IAAI,EAAE,CAAC;gBAC3B,YAAY,GAAG,IAAA,gCAAsB,EACnC,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,MAAM,CAAC,SAAS,CAAC,EACjB,EAAE,EACF,SAAS,CACV,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,YAAY,GAAG,IAAA,iCAAuB,EACpC,QAAQ,EACR,SAAS,EACT,IAAI,EACJ,MAAM,CAAC,UAAU,CAAC,EAClB,SAAS,CACV,CAAC;YACJ,CAAC;QACH,CAAC;QAED,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,kCAAkC,EAAE,IAAI;YACxC,mBAAmB,EAAE,IAAI;YACzB,YAAY;YACZ,cAAc,EAAE,IAAI,CAAC,aAAa;YAClC,eAAe,EAAE,IAAI;YACrB,eAAe,EAAE,SAAS;SAC3B,CAAC;IACJ,CAAC;IAED,eAAe,CACb,QAAgB,EAChB,SAAiB,EACjB,SAAiB,EACjB,UAAkB,EAClB,IAAmB,EACnB,IAAc;QAEd,MAAM,OAAO,GAAG,IAAI,CAAC;QAErB,OAAO;YACL,cAAc,EAAE,IAAI,CAAC,aAAa;YAClC,OAAO;YACP,UAAU,EAAE,GAAG;SAChB,CAAC;IACJ,CAAC;;AA1aH,8BA2aC"}
|
|
1
|
+
{"version":3,"file":"uniswap-v4.js","sourceRoot":"","sources":["../../../src/dex/uniswap-v4/uniswap-v4.ts"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
30
30
|
const isEthSrc = (0, utils_1.isETHAddress)(srcToken);
|
|
31
31
|
const isEthDest = (0, utils_1.isETHAddress)(destToken);
|
|
32
32
|
const exchangeParam = exchangeParams[exchangeParamIndex];
|
|
33
|
-
const { dexFuncHasRecipient, needWrapNative, specialDexFlag, specialDexSupportsInsertFromAmount, swappedAmountNotPresentInExchangeData, preSwapUnwrapCalldata, } = exchangeParam;
|
|
33
|
+
const { dexFuncHasRecipient, needWrapNative, specialDexFlag, specialDexSupportsInsertFromAmount, swappedAmountNotPresentInExchangeData, preSwapUnwrapCalldata, sendEthButSupportsInsertFromAmount, } = exchangeParam;
|
|
34
34
|
const needWrap = needWrapNative && isEthSrc && maybeWethCallData?.deposit;
|
|
35
35
|
const needUnwrap = needWrapNative && isEthDest && maybeWethCallData?.withdraw;
|
|
36
36
|
const isSpecialDex = specialDexFlag !== undefined && specialDexFlag !== types_1.SpecialDex.DEFAULT;
|
|
@@ -42,8 +42,12 @@ class Executor01BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
42
42
|
let approveFlag = types_1.Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 0
|
|
43
43
|
if (isEthSrc && !needWrap) {
|
|
44
44
|
dexFlag = dexFuncHasRecipient
|
|
45
|
-
?
|
|
46
|
-
|
|
45
|
+
? !sendEthButSupportsInsertFromAmount
|
|
46
|
+
? types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP // 9
|
|
47
|
+
: types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_PLUS_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP // 18
|
|
48
|
+
: !sendEthButSupportsInsertFromAmount
|
|
49
|
+
? types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP // 5
|
|
50
|
+
: types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_PLUS_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP; // 18
|
|
47
51
|
}
|
|
48
52
|
else if (isEthDest && !needUnwrap) {
|
|
49
53
|
dexFlag = forcePreventInsertFromAmount
|