@paraswap/dex-lib 4.7.14-multi-route.2 → 4.7.14-multi-route.3
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/executor/Executor01BytecodeBuilder.d.ts +6 -6
- package/build/executor/Executor01BytecodeBuilder.js +6 -3
- package/build/executor/Executor01BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilder.d.ts +5 -5
- package/build/executor/Executor02BytecodeBuilder.js +6 -3
- package/build/executor/Executor02BytecodeBuilder.js.map +1 -1
- package/build/executor/Executor02BytecodeBuilderMultiRoute.d.ts +91 -0
- package/build/executor/Executor02BytecodeBuilderMultiRoute.js +744 -0
- package/build/executor/Executor02BytecodeBuilderMultiRoute.js.map +1 -0
- package/build/executor/Executor03BytecodeBuilder.d.ts +6 -6
- package/build/executor/Executor03BytecodeBuilder.js +5 -3
- package/build/executor/Executor03BytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorBytecodeBuilder.d.ts +19 -7
- package/build/executor/ExecutorBytecodeBuilder.js +18 -5
- package/build/executor/ExecutorBytecodeBuilder.js.map +1 -1
- package/build/executor/ExecutorDetector.d.ts +2 -1
- package/build/executor/ExecutorDetector.js +10 -4
- package/build/executor/ExecutorDetector.js.map +1 -1
- package/build/executor/types.d.ts +13 -6
- package/build/executor/types.js +1 -0
- package/build/executor/types.js.map +1 -1
- package/build/generic-swap-transaction-builder.d.ts +2 -2
- package/build/generic-swap-transaction-builder.js +20 -10
- package/build/generic-swap-transaction-builder.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"Executor02BytecodeBuilderMultiRoute.js","sourceRoot":"","sources":["../../src/executor/Executor02BytecodeBuilderMultiRoute.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import { DexExchangeBuildParam } from '../types';
|
|
2
|
-
import { OptimalRate,
|
|
2
|
+
import { OptimalRate, OptimalSwap, OptimalSwapExchange } from '@paraswap/core';
|
|
3
3
|
import { DepositWithdrawReturn } from '../dex/weth/types';
|
|
4
|
-
import { Executors, Flag,
|
|
5
|
-
import { DexCallDataParams, ExecutorBytecodeBuilder, SingleSwapCallDataParams } from './ExecutorBytecodeBuilder';
|
|
4
|
+
import { Executors, Flag, RouteBuildSwaps } from './types';
|
|
5
|
+
import { BuildSwapFlagsParams, DexCallDataParams, ExecutorBytecodeBuilder, SingleSwapCallDataParams } from './ExecutorBytecodeBuilder';
|
|
6
6
|
export type Executor03SingleSwapCallDataParams = {
|
|
7
7
|
swap: OptimalSwap;
|
|
8
8
|
swapExchangeIndex: number;
|
|
@@ -29,17 +29,17 @@ export declare class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder<E
|
|
|
29
29
|
* case 1: check eth balance after swap
|
|
30
30
|
* case 2: check destToken balance after swap
|
|
31
31
|
*/
|
|
32
|
-
protected buildSimpleSwapFlags(
|
|
32
|
+
protected buildSimpleSwapFlags(params: BuildSwapFlagsParams): {
|
|
33
33
|
dexFlag: Flag;
|
|
34
34
|
approveFlag: Flag;
|
|
35
35
|
};
|
|
36
|
-
protected buildMultiMegaSwapFlags(
|
|
36
|
+
protected buildMultiMegaSwapFlags(params: BuildSwapFlagsParams): {
|
|
37
37
|
dexFlag: Flag;
|
|
38
38
|
approveFlag: Flag;
|
|
39
39
|
};
|
|
40
40
|
protected buildSingleSwapCallData(params: SingleSwapCallDataParams<Executor03SingleSwapCallDataParams>): string;
|
|
41
41
|
protected buildDexCallData(params: DexCallDataParams<Executor03DexCallDataParams>): string;
|
|
42
42
|
getAddress(): string;
|
|
43
|
-
buildByteCode(priceRoute: OptimalRate, routes:
|
|
43
|
+
buildByteCode(priceRoute: OptimalRate, routes: RouteBuildSwaps[], exchangeParams: DexExchangeBuildParam[], sender: string, maybeWethCallData?: DepositWithdrawReturn): string;
|
|
44
44
|
private addMetadata;
|
|
45
45
|
}
|
|
@@ -25,7 +25,8 @@ class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
25
25
|
* case 1: check eth balance after swap
|
|
26
26
|
* case 2: check destToken balance after swap
|
|
27
27
|
*/
|
|
28
|
-
buildSimpleSwapFlags(
|
|
28
|
+
buildSimpleSwapFlags(params) {
|
|
29
|
+
const { routes, exchangeParams, exchangeParamIndex, maybeWethCallData } = params;
|
|
29
30
|
const { srcToken, destToken } = routes[0].swaps[0];
|
|
30
31
|
const isEthSrc = (0, utils_1.isETHAddress)(srcToken);
|
|
31
32
|
const isEthDest = (0, utils_1.isETHAddress)(destToken);
|
|
@@ -73,7 +74,7 @@ class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
73
74
|
approveFlag,
|
|
74
75
|
};
|
|
75
76
|
}
|
|
76
|
-
buildMultiMegaSwapFlags(
|
|
77
|
+
buildMultiMegaSwapFlags(params) {
|
|
77
78
|
return {
|
|
78
79
|
dexFlag: types_1.Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, // 0
|
|
79
80
|
approveFlag: types_1.Flag.DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP, // 0
|
|
@@ -229,6 +230,7 @@ class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
229
230
|
if (routes.some(route => route.type !== 'single-route')) {
|
|
230
231
|
throw new Error(`Executor01BytecodeBuilder doesn't support multi-route`);
|
|
231
232
|
}
|
|
233
|
+
const _routes = routes.filter(r => r.type === 'single-route');
|
|
232
234
|
const swap = priceRoute.bestRoute[0].swaps[0];
|
|
233
235
|
// as path are executed in parallel, we can sort them in correct order
|
|
234
236
|
// last path should be the one with wrapping to withdraw WETH dust with `1` flag
|
|
@@ -246,7 +248,7 @@ class Executor03BytecodeBuilder extends ExecutorBytecodeBuilder_1.ExecutorByteco
|
|
|
246
248
|
...swap,
|
|
247
249
|
swapExchanges: orderedExchangeParams.map(e => e.swapExchange.swapExchange),
|
|
248
250
|
};
|
|
249
|
-
const flags = this.buildFlags(priceRoute.bestRoute, orderedExchangeParams.map(e => e.exchangeParam), priceRoute.srcToken, maybeWethCallData);
|
|
251
|
+
const flags = this.buildFlags(priceRoute.bestRoute, _routes, orderedExchangeParams.map(e => e.exchangeParam), priceRoute.srcToken, maybeWethCallData);
|
|
250
252
|
let swapsCalldata = orderedExchangeParams.reduce((acc, ep, index) => hexConcat([
|
|
251
253
|
acc,
|
|
252
254
|
this.buildSingleSwapCallData({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Executor03BytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/Executor03BytecodeBuilder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"Executor03BytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/Executor03BytecodeBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import { Interface } from '@ethersproject/abi';
|
|
|
2
2
|
import { IDexHelper } from '../dex-helper';
|
|
3
3
|
import { Address, OptimalRate, OptimalRoute, OptimalSwap } from '@paraswap/core';
|
|
4
4
|
import { DepositWithdrawReturn } from '../dex/weth/types';
|
|
5
|
-
import { Executors, Flag,
|
|
5
|
+
import { BuildSwap, BuildSwapExchange, Executors, Flag, RouteSwaps, SingleRouteBuildSwaps, SpecialDex } from './types';
|
|
6
6
|
import { DexExchangeBuildParam, DexExchangeParam } from '../types';
|
|
7
7
|
export type SingleSwapCallDataParams<T> = {
|
|
8
8
|
routes: OptimalRoute[];
|
|
@@ -17,26 +17,38 @@ export type SingleSwapCallDataParams<T> = {
|
|
|
17
17
|
maybeWethCallData?: DepositWithdrawReturn;
|
|
18
18
|
} & T;
|
|
19
19
|
export type DexCallDataParams<T> = {
|
|
20
|
-
routes: OptimalRoute[];
|
|
21
20
|
routeIndex: number;
|
|
22
21
|
swapIndex: number;
|
|
23
22
|
swapExchangeIndex: number;
|
|
24
|
-
exchangeParams: DexExchangeBuildParam[];
|
|
25
|
-
exchangeParamIndex: number;
|
|
26
23
|
isLastSwap: boolean;
|
|
27
24
|
flag: Flag;
|
|
25
|
+
routes: OptimalRoute[];
|
|
26
|
+
exchangeParams: DexExchangeBuildParam[];
|
|
27
|
+
exchangeParamIndex: number;
|
|
28
28
|
} & T;
|
|
29
|
+
export type BuildSwapFlagsParams = {
|
|
30
|
+
singleRoutes: SingleRouteBuildSwaps<BuildSwap>[];
|
|
31
|
+
routeIndex: number;
|
|
32
|
+
swapIndex: number;
|
|
33
|
+
swapExchangeIndex: number;
|
|
34
|
+
maybeWethCallData?: DepositWithdrawReturn;
|
|
35
|
+
swap: BuildSwap;
|
|
36
|
+
swapExchange: BuildSwapExchange<unknown>;
|
|
37
|
+
routes: OptimalRoute[];
|
|
38
|
+
exchangeParams: DexExchangeBuildParam[];
|
|
39
|
+
exchangeParamIndex: number;
|
|
40
|
+
};
|
|
29
41
|
export declare abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
|
|
30
42
|
protected dexHelper: IDexHelper;
|
|
31
43
|
type: Executors;
|
|
32
44
|
erc20Interface: Interface;
|
|
33
45
|
permit2Interface: Interface;
|
|
34
46
|
constructor(dexHelper: IDexHelper);
|
|
35
|
-
protected buildSimpleSwapFlags(
|
|
47
|
+
protected buildSimpleSwapFlags(params: BuildSwapFlagsParams): {
|
|
36
48
|
dexFlag: Flag;
|
|
37
49
|
approveFlag: Flag;
|
|
38
50
|
};
|
|
39
|
-
protected buildMultiMegaSwapFlags(
|
|
51
|
+
protected buildMultiMegaSwapFlags(params: BuildSwapFlagsParams): {
|
|
40
52
|
dexFlag: Flag;
|
|
41
53
|
approveFlag: Flag;
|
|
42
54
|
};
|
|
@@ -53,7 +65,7 @@ export declare abstract class ExecutorBytecodeBuilder<S = {}, D = {}> {
|
|
|
53
65
|
buildCallData(tokenAddress: string, calldata: string, fromAmountPos: number, destTokenPos: number, specialDexFlag: SpecialDex, flag: Flag, toAmountPos?: number, returnAmountPos?: number): string;
|
|
54
66
|
private buildExecutor0102CallData;
|
|
55
67
|
private buildExecutor03CallData;
|
|
56
|
-
protected buildFlags(routes: OptimalRoute[], exchangeParams: DexExchangeBuildParam[], srcToken: string, maybeWethCallData?: DepositWithdrawReturn): {
|
|
68
|
+
protected buildFlags(routes: OptimalRoute[], singleRoutes: SingleRouteBuildSwaps<BuildSwap>[], exchangeParams: DexExchangeBuildParam[], srcToken: string, maybeWethCallData?: DepositWithdrawReturn): {
|
|
57
69
|
approves: Flag[];
|
|
58
70
|
dexes: Flag[];
|
|
59
71
|
wrap: Flag;
|
|
@@ -26,13 +26,13 @@ class ExecutorBytecodeBuilder {
|
|
|
26
26
|
this.erc20Interface = new abi_1.Interface(erc20_json_1.default);
|
|
27
27
|
this.permit2Interface = new abi_1.Interface(permit2_json_1.default);
|
|
28
28
|
}
|
|
29
|
-
buildSimpleSwapFlags(
|
|
29
|
+
buildSimpleSwapFlags(params) {
|
|
30
30
|
return {
|
|
31
31
|
dexFlag: types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP,
|
|
32
32
|
approveFlag: 0,
|
|
33
33
|
};
|
|
34
34
|
}
|
|
35
|
-
buildMultiMegaSwapFlags(
|
|
35
|
+
buildMultiMegaSwapFlags(params) {
|
|
36
36
|
return {
|
|
37
37
|
dexFlag: types_1.Flag.SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP,
|
|
38
38
|
approveFlag: 0,
|
|
@@ -152,7 +152,7 @@ class ExecutorBytecodeBuilder {
|
|
|
152
152
|
calldata, // calldata
|
|
153
153
|
]);
|
|
154
154
|
}
|
|
155
|
-
buildFlags(routes, exchangeParams, srcToken, maybeWethCallData) {
|
|
155
|
+
buildFlags(routes, singleRoutes, exchangeParams, srcToken, maybeWethCallData) {
|
|
156
156
|
const isMegaSwap = routes.length > 1;
|
|
157
157
|
const isMultiSwap = !isMegaSwap && routes[0].swaps.length > 1;
|
|
158
158
|
const buildFlagsMethod = isMultiSwap || isMegaSwap
|
|
@@ -163,10 +163,23 @@ class ExecutorBytecodeBuilder {
|
|
|
163
163
|
dexes: [],
|
|
164
164
|
approves: [],
|
|
165
165
|
};
|
|
166
|
-
|
|
166
|
+
singleRoutes.map((route, routeIndex) => {
|
|
167
167
|
route.swaps.map((swap, swapIndex) => {
|
|
168
168
|
swap.swapExchanges.map((swapExchange, swapExchangeIndex) => {
|
|
169
|
-
const { dexFlag, approveFlag } = buildFlagsMethod(
|
|
169
|
+
const { dexFlag, approveFlag } = buildFlagsMethod({
|
|
170
|
+
singleRoutes,
|
|
171
|
+
routes,
|
|
172
|
+
exchangeParams,
|
|
173
|
+
routeIndex,
|
|
174
|
+
swapIndex,
|
|
175
|
+
swapExchangeIndex,
|
|
176
|
+
exchangeParamIndex, // TODO-multi: to be removed after refactoring
|
|
177
|
+
maybeWethCallData,
|
|
178
|
+
swap,
|
|
179
|
+
swapExchange,
|
|
180
|
+
});
|
|
181
|
+
swapExchange.build.dexFlag = dexFlag;
|
|
182
|
+
swapExchange.build.approveFlag = approveFlag;
|
|
170
183
|
flags.dexes.push(dexFlag);
|
|
171
184
|
flags.approves.push(approveFlag);
|
|
172
185
|
exchangeParamIndex++;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecutorBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/ExecutorBytecodeBuilder.ts"],"names":[],"mappings":";;;;;;AAAA,4CAA+C;AAE/C,mEAAyC;AACzC,uEAA6C;AAC7C,mCAAgC;AAQhC,oCAAwC;AACxC,2CAWqB;AACrB,
|
|
1
|
+
{"version":3,"file":"ExecutorBytecodeBuilder.js","sourceRoot":"","sources":["../../src/executor/ExecutorBytecodeBuilder.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,6 +6,7 @@ export declare class ExecutorDetector {
|
|
|
6
6
|
protected dexHelper: IDexHelper;
|
|
7
7
|
private executor01BytecodeBuilder;
|
|
8
8
|
private executor02BytecodeBuilder;
|
|
9
|
+
private executor02MultiRouteBytecodeBuilder;
|
|
9
10
|
private executor03BytecodeBuilder;
|
|
10
11
|
private wethBytecodeBuilder;
|
|
11
12
|
protected routeExecutionTypeToExecutorMap: Record<SwapSide, Partial<Record<RouteExecutionType, Executors>>>;
|
|
@@ -14,5 +15,5 @@ export declare class ExecutorDetector {
|
|
|
14
15
|
detectSpecialExecutor(priceRoute: OptimalRate): Executors | null;
|
|
15
16
|
getExecutorByPriceRoute(priceRoute: OptimalRate): Executors;
|
|
16
17
|
getAddress(executorName: Executors): Address;
|
|
17
|
-
getBytecodeBuilder(executorName: Executors): ExecutorBytecodeBuilder;
|
|
18
|
+
getBytecodeBuilder(executorName: Executors, hasMultiRoute?: boolean): ExecutorBytecodeBuilder;
|
|
18
19
|
}
|
|
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.ExecutorDetector = void 0;
|
|
4
4
|
const core_1 = require("@paraswap/core");
|
|
5
5
|
const Executor01BytecodeBuilder_1 = require("./Executor01BytecodeBuilder");
|
|
6
|
-
const
|
|
6
|
+
const Executor02BytecodeBuilderMultiRoute_1 = require("./Executor02BytecodeBuilderMultiRoute");
|
|
7
7
|
const types_1 = require("./types");
|
|
8
8
|
const Executor03BytecodeBuilder_1 = require("./Executor03BytecodeBuilder");
|
|
9
9
|
const WETHBytecodeBuilder_1 = require("./WETHBytecodeBuilder");
|
|
@@ -11,6 +11,7 @@ class ExecutorDetector {
|
|
|
11
11
|
dexHelper;
|
|
12
12
|
executor01BytecodeBuilder;
|
|
13
13
|
executor02BytecodeBuilder;
|
|
14
|
+
executor02MultiRouteBytecodeBuilder;
|
|
14
15
|
executor03BytecodeBuilder;
|
|
15
16
|
wethBytecodeBuilder;
|
|
16
17
|
routeExecutionTypeToExecutorMap = {
|
|
@@ -30,7 +31,10 @@ class ExecutorDetector {
|
|
|
30
31
|
constructor(dexHelper) {
|
|
31
32
|
this.dexHelper = dexHelper;
|
|
32
33
|
this.executor01BytecodeBuilder = new Executor01BytecodeBuilder_1.Executor01BytecodeBuilder(this.dexHelper);
|
|
33
|
-
this.executor02BytecodeBuilder = new
|
|
34
|
+
// this.executor02BytecodeBuilder = new Executor02BytecodeBuilder(
|
|
35
|
+
this.executor02BytecodeBuilder = new Executor02BytecodeBuilderMultiRoute_1.Executor02BytecodeBuilderMultiRoute(this.dexHelper);
|
|
36
|
+
this.executor02MultiRouteBytecodeBuilder =
|
|
37
|
+
new Executor02BytecodeBuilderMultiRoute_1.Executor02BytecodeBuilderMultiRoute(this.dexHelper);
|
|
34
38
|
this.executor03BytecodeBuilder = new Executor03BytecodeBuilder_1.Executor03BytecodeBuilder(this.dexHelper);
|
|
35
39
|
this.wethBytecodeBuilder = new WETHBytecodeBuilder_1.WETHBytecodeBuilder(this.dexHelper);
|
|
36
40
|
}
|
|
@@ -91,12 +95,14 @@ class ExecutorDetector {
|
|
|
91
95
|
}
|
|
92
96
|
return this.dexHelper.config.data.executorsAddresses[executorName];
|
|
93
97
|
}
|
|
94
|
-
getBytecodeBuilder(executorName) {
|
|
98
|
+
getBytecodeBuilder(executorName, hasMultiRoute = false) {
|
|
95
99
|
switch (executorName) {
|
|
96
100
|
case types_1.Executors.ONE:
|
|
97
101
|
return this.executor01BytecodeBuilder;
|
|
98
102
|
case types_1.Executors.TWO:
|
|
99
|
-
return
|
|
103
|
+
return hasMultiRoute
|
|
104
|
+
? this.executor02MultiRouteBytecodeBuilder
|
|
105
|
+
: this.executor02BytecodeBuilder;
|
|
100
106
|
case types_1.Executors.THREE:
|
|
101
107
|
return this.executor03BytecodeBuilder;
|
|
102
108
|
case types_1.Executors.WETH:
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ExecutorDetector.js","sourceRoot":"","sources":["../../src/executor/ExecutorDetector.ts"],"names":[],"mappings":";;;AACA,yCAAgE;AAEhE,2EAAwE;
|
|
1
|
+
{"version":3,"file":"ExecutorDetector.js","sourceRoot":"","sources":["../../src/executor/ExecutorDetector.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,8 @@ export declare enum Flag {
|
|
|
10
10
|
SEND_ETH_EQUAL_TO_FROM_AMOUNT_CHECK_SRC_TOKEN_BALANCE_AFTER_SWAP = 5,// (flag 5 mod 4) = case 1: sendEth equal to fromAmount, (flag 5 mod 3) = case 2: check "srcToken" balance after swap
|
|
11
11
|
DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP = 4,// (flag 4 mod 4) = case 0: don't insert fromAmount, (flag 4 mod 3) = case 1: check eth balance after swap
|
|
12
12
|
INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP = 3,// (flag 3 mod 4) = case 3: insert fromAmount, (flag 3 mod 3) = case 0: don't check balance after swap
|
|
13
|
-
DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP = 0
|
|
13
|
+
DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP = 0,// (flag 0 mod 4) = case 0: don't insert fromAmount, (flag 0 mod 3) = case 0: don't check balance after swap
|
|
14
|
+
DEFAULT = -1
|
|
14
15
|
}
|
|
15
16
|
export declare enum SpecialDex {
|
|
16
17
|
DEFAULT = 0,
|
|
@@ -41,21 +42,27 @@ export declare enum RouteExecutionType {
|
|
|
41
42
|
VERTICAL_BRANCH_HORIZONTAL_SEQUENCE = 4,// multiSwap, megaSwap
|
|
42
43
|
NESTED_VERTICAL_BRANCH_HORIZONTAL_SEQUENCE = 5
|
|
43
44
|
}
|
|
44
|
-
export type
|
|
45
|
+
export type SingleRouteBuildSwaps<TSwap> = {
|
|
45
46
|
type: 'single-route';
|
|
46
47
|
percent: number;
|
|
47
48
|
swaps: TSwap[];
|
|
48
|
-
}
|
|
49
|
+
};
|
|
50
|
+
export type MultiRouteBuildSwaps<TSwap> = {
|
|
49
51
|
type: 'multi-route';
|
|
50
52
|
percent: number;
|
|
51
53
|
swaps: (TSwap[] | TSwap[][])[];
|
|
52
54
|
};
|
|
55
|
+
export type GenericRouteSwaps<TSwap> = SingleRouteBuildSwaps<TSwap> | MultiRouteBuildSwaps<TSwap>;
|
|
53
56
|
export type RouteSwaps = GenericRouteSwaps<OptimalSwap>;
|
|
54
57
|
export type RouteBuildSwaps = GenericRouteSwaps<BuildSwap>;
|
|
55
58
|
export type BuildSwapExchange<T> = OptimalSwapExchange<T> & {
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
+
build: {
|
|
60
|
+
dexParams: DexExchangeBuildParam;
|
|
61
|
+
wethDeposit: bigint;
|
|
62
|
+
wethWithdraw: bigint;
|
|
63
|
+
dexFlag: Flag;
|
|
64
|
+
approveFlag: Flag;
|
|
65
|
+
};
|
|
59
66
|
};
|
|
60
67
|
export type BuildSwap = Omit<OptimalSwap, 'swapExchanges'> & {
|
|
61
68
|
swapExchanges: BuildSwapExchange<any>[];
|
package/build/executor/types.js
CHANGED
|
@@ -13,6 +13,7 @@ var Flag;
|
|
|
13
13
|
Flag[Flag["DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP"] = 4] = "DONT_INSERT_FROM_AMOUNT_CHECK_ETH_BALANCE_AFTER_SWAP";
|
|
14
14
|
Flag[Flag["INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP"] = 3] = "INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP";
|
|
15
15
|
Flag[Flag["DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP"] = 0] = "DONT_INSERT_FROM_AMOUNT_DONT_CHECK_BALANCE_AFTER_SWAP";
|
|
16
|
+
Flag[Flag["DEFAULT"] = -1] = "DEFAULT";
|
|
16
17
|
})(Flag || (exports.Flag = Flag = {}));
|
|
17
18
|
var SpecialDex;
|
|
18
19
|
(function (SpecialDex) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/executor/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../src/executor/types.ts"],"names":[],"mappings":";;;AAGA,IAAY,IAYX;AAZD,WAAY,IAAI;IACd,8LAAwF,CAAA;IACxF,wMAA6F,CAAA;IAC7F,kIAA0D,CAAA;IAC1D,6IAA+D,CAAA;IAC/D,2IAA8D,CAAA;IAC9D,qHAAmD,CAAA;IACnD,uJAAoE,CAAA;IACpE,+HAAwD,CAAA;IACxD,uHAAoD,CAAA;IACpD,iIAAyD,CAAA;IACzD,sCAAY,CAAA;AACd,CAAC,EAZW,IAAI,oBAAJ,IAAI,QAYf;AAED,IAAY,UAgBX;AAhBD,WAAY,UAAU;IACpB,iDAAW,CAAA;IACX,iFAA2B,CAAA;IAC3B,yCAAyC;IACzC,yEAAuB,CAAA;IACvB,qEAAqB,CAAA;IACrB,yDAAe,CAAA;IACf,yEAAuB,CAAA;IACvB,iFAA2B,CAAA;IAC3B,mGAAoC,CAAA;IACpC,qHAA6C,CAAA;IAC7C,2EAAwB,CAAA;IACxB,wFAA+B,CAAA;IAC/B,sEAAsB,CAAA;IACtB,kEAAoB,CAAA;IACpB,oEAAqB,CAAA;AACvB,CAAC,EAhBW,UAAU,0BAAV,UAAU,QAgBrB;AAED,IAAY,SAKX;AALD,WAAY,SAAS;IACnB,0BAAa,CAAA;IACb,+BAAkB,CAAA;IAClB,+BAAkB,CAAA;IAClB,iCAAoB,CAAA;AACtB,CAAC,EALW,SAAS,yBAAT,SAAS,QAKpB;AAED,IAAY,kBAMX;AAND,WAAY,kBAAkB;IAC5B,yEAAe,CAAA;IACf,yFAAuB,CAAA;IACvB,iFAAmB,CAAA;IACnB,yHAAuC,CAAA;IACvC,uIAA8C,CAAA;AAChD,CAAC,EANW,kBAAkB,kCAAlB,kBAAkB,QAM7B"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
1
|
import { Address, DexExchangeParamWithBooleanNeedWrapNative, OptimalRate, OptimalSwap, OptimalSwapExchange, TxObject } from './types';
|
|
2
2
|
import { AbiCoder, Interface } from '@ethersproject/abi';
|
|
3
|
-
import { DepositWithdrawReturn } from './dex/weth/types';
|
|
4
3
|
import { DexAdapterService } from './dex';
|
|
5
4
|
import { ExecutorDetector } from './executor/ExecutorDetector';
|
|
6
5
|
import { ExecutorBytecodeBuilder } from './executor/ExecutorBytecodeBuilder';
|
|
@@ -16,7 +15,8 @@ export declare class GenericSwapTransactionBuilder {
|
|
|
16
15
|
abiCoder: AbiCoder;
|
|
17
16
|
executorDetector: ExecutorDetector;
|
|
18
17
|
constructor(dexAdapterService: DexAdapterService, wExchangeNetworkToKey?: Record<number, string>);
|
|
19
|
-
protected getDepositWithdrawWethCallData(srcAmountWeth: bigint, destAmountWeth: bigint, side: SwapSide, priceRoute: OptimalRate, exchangeParams: DexExchangeParamWithBooleanNeedWrapNative[]): DepositWithdrawReturn | undefined;
|
|
18
|
+
protected getDepositWithdrawWethCallData(srcAmountWeth: bigint, destAmountWeth: bigint, side: SwapSide, priceRoute: OptimalRate, exchangeParams: DexExchangeParamWithBooleanNeedWrapNative[]): import("./dex/weth/types").DepositWithdrawReturn | undefined;
|
|
19
|
+
hasMultiRoute(priceRoute: OptimalRate): boolean;
|
|
20
20
|
buildRouteSwaps(priceRoute: OptimalRate): RouteSwaps[];
|
|
21
21
|
addRouteBuildSwaps(priceRoute: OptimalRate, routes: RouteSwaps[], minMaxAmount: string, side: SwapSide, bytecodeBuilder: ExecutorBytecodeBuilder): Promise<RouteBuildSwaps[]>;
|
|
22
22
|
buildSwapExchange(priceRoute: OptimalRate, swap: OptimalSwap, se: OptimalSwapExchange<any>, minMaxAmount: string, side: SwapSide, bytecodeBuilder: ExecutorBytecodeBuilder): Promise<BuildSwapExchange<any>>;
|
|
@@ -14,6 +14,7 @@ const erc20_json_1 = __importDefault(require("./abi/erc20.json"));
|
|
|
14
14
|
const ExecutorDetector_1 = require("./executor/ExecutorDetector");
|
|
15
15
|
const core_1 = require("@paraswap/core");
|
|
16
16
|
const utils_2 = require("./executor/utils");
|
|
17
|
+
const types_1 = require("./executor/types");
|
|
17
18
|
const { utils: { hexlify, hexConcat, hexZeroPad }, } = ethers_1.ethers;
|
|
18
19
|
class GenericSwapTransactionBuilder {
|
|
19
20
|
dexAdapterService;
|
|
@@ -46,6 +47,9 @@ class GenericSwapTransactionBuilder {
|
|
|
46
47
|
return;
|
|
47
48
|
return this.dexAdapterService.getTxBuilderDexByKey(this.wExchangeNetworkToKey[this.dexAdapterService.network]).getDepositWithdrawParam(srcAmountWeth.toString(), destAmountWeth.toString(), side, core_1.ParaSwapVersion.V6);
|
|
48
49
|
}
|
|
50
|
+
hasMultiRoute(priceRoute) {
|
|
51
|
+
return priceRoute.bestRoute.some(route => route.swaps.some(swap => swap.isMergedSwap));
|
|
52
|
+
}
|
|
49
53
|
buildRouteSwaps(priceRoute) {
|
|
50
54
|
const singleRoutes = [];
|
|
51
55
|
const multiRoutes = [];
|
|
@@ -136,9 +140,13 @@ class GenericSwapTransactionBuilder {
|
|
|
136
140
|
}
|
|
137
141
|
return {
|
|
138
142
|
...se,
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
143
|
+
build: {
|
|
144
|
+
dexParams: dexParams,
|
|
145
|
+
wethDeposit,
|
|
146
|
+
wethWithdraw,
|
|
147
|
+
dexFlag: types_1.Flag.DEFAULT,
|
|
148
|
+
approveFlag: types_1.Flag.DEFAULT,
|
|
149
|
+
},
|
|
142
150
|
};
|
|
143
151
|
}
|
|
144
152
|
async buildCalls(priceRoute, minMaxAmount, bytecodeBuilder, userAddress) {
|
|
@@ -150,22 +158,23 @@ class GenericSwapTransactionBuilder {
|
|
|
150
158
|
await this.addDexExchangeApproveParams(bytecodeBuilder, allBuildSwaps);
|
|
151
159
|
const flatSwapExchanges = allBuildSwaps.flatMap(swap => swap.swapExchanges);
|
|
152
160
|
const { srcAmountWethToDeposit, destAmountWethToWithdraw } = flatSwapExchanges.reduce((acc, se) => {
|
|
153
|
-
acc.srcAmountWethToDeposit += se.wethDeposit;
|
|
154
|
-
acc.destAmountWethToWithdraw += se.wethWithdraw;
|
|
161
|
+
acc.srcAmountWethToDeposit += se.build.wethDeposit;
|
|
162
|
+
acc.destAmountWethToWithdraw += se.build.wethWithdraw;
|
|
155
163
|
return acc;
|
|
156
164
|
}, {
|
|
157
165
|
srcAmountWethToDeposit: 0n,
|
|
158
166
|
destAmountWethToWithdraw: 0n,
|
|
159
167
|
});
|
|
160
168
|
// TODO-multi: can exchange params order be affected by this update for single-route routes??
|
|
161
|
-
const exchangeParams = flatSwapExchanges.map(se => se.dexParams);
|
|
169
|
+
const exchangeParams = flatSwapExchanges.map(se => se.build.dexParams);
|
|
162
170
|
const maybeWethCallData = this.getDepositWithdrawWethCallData(srcAmountWethToDeposit, destAmountWethToWithdraw, side, priceRoute, exchangeParams);
|
|
163
171
|
return bytecodeBuilder.buildByteCode(priceRoute, routes, exchangeParams, userAddress, maybeWethCallData);
|
|
164
172
|
}
|
|
165
173
|
async _build(priceRoute, minMaxAmount, quotedAmount, userAddress, referrerAddress, partnerAddress, partnerFeePercent, takeSurplus, isCapSurplus, isSurplusToUser, isDirectFeeTransfer, beneficiary, permit, deadline, uuid) {
|
|
166
174
|
const executorName = this.executorDetector.getExecutorByPriceRoute(priceRoute);
|
|
167
175
|
const executionContractAddress = this.getExecutionContractAddress(priceRoute);
|
|
168
|
-
const
|
|
176
|
+
const hasMultiRoute = this.hasMultiRoute(priceRoute);
|
|
177
|
+
const bytecodeBuilder = this.executorDetector.getBytecodeBuilder(executorName, hasMultiRoute);
|
|
169
178
|
const bytecode = await this.buildCalls(priceRoute, minMaxAmount, bytecodeBuilder, userAddress);
|
|
170
179
|
const side = priceRoute.side;
|
|
171
180
|
const isSell = side === core_1.SwapSide.SELL;
|
|
@@ -347,7 +356,8 @@ class GenericSwapTransactionBuilder {
|
|
|
347
356
|
if (isDirectMethod)
|
|
348
357
|
return this.augustusV6Address;
|
|
349
358
|
const executorName = this.executorDetector.getExecutorByPriceRoute(priceRoute);
|
|
350
|
-
const
|
|
359
|
+
const hasMultiRoute = this.hasMultiRoute(priceRoute);
|
|
360
|
+
const bytecodeBuilder = this.executorDetector.getBytecodeBuilder(executorName, hasMultiRoute);
|
|
351
361
|
return bytecodeBuilder.getAddress();
|
|
352
362
|
}
|
|
353
363
|
getDexCallsParams(priceRoute, routeIndex, swap, swapIndex, se, minMaxAmount, dex, executionContractAddress) {
|
|
@@ -406,7 +416,7 @@ class GenericSwapTransactionBuilder {
|
|
|
406
416
|
const tokenTargetMapping = [];
|
|
407
417
|
swaps.forEach((swap, swapI) => {
|
|
408
418
|
swap.swapExchanges.forEach((se, seI) => {
|
|
409
|
-
const curExchangeParam = se.dexParams;
|
|
419
|
+
const curExchangeParam = se.build.dexParams;
|
|
410
420
|
const approveParams = bytecodeBuilder.getApprovalTokenAndTarget(swap, curExchangeParam);
|
|
411
421
|
if (approveParams) {
|
|
412
422
|
tokenTargetMapping.push({
|
|
@@ -428,7 +438,7 @@ class GenericSwapTransactionBuilder {
|
|
|
428
438
|
const swapIndex = tokenTargetMapping[index].swapIndex;
|
|
429
439
|
const swapExchangeIndex = tokenTargetMapping[index].swapExchangeIndex;
|
|
430
440
|
if (swapIndex !== undefined && swapExchangeIndex !== undefined) {
|
|
431
|
-
swaps[swapIndex].swapExchanges[swapExchangeIndex].dexParams.approveData = {
|
|
441
|
+
swaps[swapIndex].swapExchanges[swapExchangeIndex].build.dexParams.approveData = {
|
|
432
442
|
token,
|
|
433
443
|
target,
|
|
434
444
|
};
|