@paraswap/dex-lib 3.3.1-return-amount-pos.0 → 3.3.1-return-amount-pos.2
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/angle-staked-stable/angle-staked-stable.js +0 -4
- package/build/dex/angle-staked-stable/angle-staked-stable.js.map +1 -1
- package/build/dex/idex.d.ts +1 -1
- package/build/dex/swaap-v2/swaap-v2.js +4 -1
- package/build/dex/swaap-v2/swaap-v2.js.map +1 -1
- package/build/router/simpleswap.js +6 -3
- package/build/router/simpleswap.js.map +1 -1
- package/dex-template/__DexName__-e2e.test.ts.template +2 -9
- package/dex-template/__DexName__.ts.template +2 -29
- package/funding.json +5 -0
- package/package.json +1 -1
- package/src/dex/angle-staked-stable/angle-staked-stable.ts +0 -4
- package/src/dex/idex.ts +5 -3
- package/src/dex/swaap-v2/swaap-v2.ts +9 -1
- package/src/router/simpleswap.ts +7 -3
|
@@ -139,10 +139,6 @@ class AngleStakedStable extends simple_exchange_1.SimpleExchange {
|
|
|
139
139
|
networkFee: '0',
|
|
140
140
|
};
|
|
141
141
|
}
|
|
142
|
-
// Encode call data used by simpleSwap like routers
|
|
143
|
-
// Used for simpleSwap & simpleBuy
|
|
144
|
-
// Hint: this.buildSimpleParamWithoutWETHConversion
|
|
145
|
-
// could be useful
|
|
146
142
|
async getSimpleParam(srcToken, destToken, srcAmount, destAmount, data, side) {
|
|
147
143
|
const { exchange } = data;
|
|
148
144
|
// Encode here the transaction arguments
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"angle-staked-stable.js","sourceRoot":"","sources":["../../../src/dex/angle-staked-stable/angle-staked-stable.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"angle-staked-stable.js","sourceRoot":"","sources":["../../../src/dex/angle-staked-stable/angle-staked-stable.ts"],"names":[],"mappings":"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"}
|
package/build/dex/idex.d.ts
CHANGED
|
@@ -14,7 +14,7 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
|
|
|
14
14
|
getTokenFromAddress?(address: Address): Token;
|
|
15
15
|
getAdapterParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, // required for buy case
|
|
16
16
|
data: ExchangeData, side: SwapSide): AdapterExchangeParam;
|
|
17
|
-
getSimpleParam(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: ExchangeData, side: SwapSide): AsyncOrSync<SimpleExchangeParam>;
|
|
17
|
+
getSimpleParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, data: ExchangeData, side: SwapSide): AsyncOrSync<SimpleExchangeParam>;
|
|
18
18
|
getDexParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, recipient: Address, data: ExchangeData, side: SwapSide, context: Context, executorAddress: Address): AsyncOrSync<DexExchangeParam>;
|
|
19
19
|
getDirectParam?(srcToken: Address, destToken: Address, srcAmount: NumberAsString, destAmount: NumberAsString, expectedAmount: NumberAsString, data: ExchangeData, side: SwapSide, permit: string, uuid: string, feePercent: NumberAsString, deadline: NumberAsString, partner: string, beneficiary: string, contractMethod?: string): TxInfo<DirectParam>;
|
|
20
20
|
getDirectParamV6?(srcToken: Address, destToken: Address, fromAmount: NumberAsString, toAmount: NumberAsString, quotedAmount: NumberAsString, data: ExchangeData, side: SwapSide, permit: string, uuid: string, partnerAndFee: string, beneficiary: string, blockNumber: number, contractMethod?: string): TxInfo<DirectParam>;
|
|
@@ -44,6 +44,7 @@ const utils_3 = require("./utils");
|
|
|
44
44
|
const types_2 = require("../generic-rfq/types");
|
|
45
45
|
const bigint_constants_1 = require("../../bigint-constants");
|
|
46
46
|
const types_3 = require("../../executor/types");
|
|
47
|
+
const utils_4 = require("../../executor/utils");
|
|
47
48
|
const BLACKLISTED = 'blacklisted';
|
|
48
49
|
class SwaapV2 extends simple_exchange_1.SimpleExchange {
|
|
49
50
|
constructor(network, dexKey, dexHelper, adapters = config_1.Adapters[network] || {}, routerInterface = new utils_2.Interface(vault_json_1.default)) {
|
|
@@ -284,7 +285,9 @@ class SwaapV2 extends simple_exchange_1.SimpleExchange {
|
|
|
284
285
|
exchangeData: callData,
|
|
285
286
|
specialDexFlag: types_3.SpecialDex.SWAP_ON_SWAAP_V2_SINGLE,
|
|
286
287
|
targetExchange: router,
|
|
287
|
-
returnAmountPos:
|
|
288
|
+
returnAmountPos: side === constants_1.SwapSide.SELL
|
|
289
|
+
? (0, utils_4.extractReturnAmountPosition)(this.routerInterface, 'swap', 'amountCalculated')
|
|
290
|
+
: undefined,
|
|
288
291
|
};
|
|
289
292
|
}
|
|
290
293
|
async preProcessTransaction(optimalSwapExchange, srcToken, destToken, side, options) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"swaap-v2.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/swaap-v2.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"swaap-v2.js","sourceRoot":"","sources":["../../../src/dex/swaap-v2/swaap-v2.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,17 +86,20 @@ class SimpleRouterBase {
|
|
|
86
86
|
wethWithdraw = BigInt(_destAmount);
|
|
87
87
|
}
|
|
88
88
|
}
|
|
89
|
-
const simpleParams = await dex.getSimpleParam(_src, _dest, _srcAmount, _destAmount, se.data, this.side);
|
|
89
|
+
const simpleParams = await dex.getSimpleParam?.(_src, _dest, _srcAmount, _destAmount, se.data, this.side);
|
|
90
90
|
return {
|
|
91
91
|
simpleParams,
|
|
92
92
|
wethDeposit,
|
|
93
93
|
wethWithdraw,
|
|
94
94
|
};
|
|
95
95
|
})));
|
|
96
|
-
const { simpleExchangeDataList, srcAmountWethToDeposit, destAmountWethToWithdraw, } =
|
|
96
|
+
const { simpleExchangeDataList, srcAmountWethToDeposit, destAmountWethToWithdraw, } = rawSimpleParams.reduce((acc, se) => {
|
|
97
97
|
acc.srcAmountWethToDeposit += BigInt(se.wethDeposit);
|
|
98
98
|
acc.destAmountWethToWithdraw += BigInt(se.wethWithdraw);
|
|
99
|
-
|
|
99
|
+
// V6 doesn't have simpleParams
|
|
100
|
+
if (se.simpleParams) {
|
|
101
|
+
acc.simpleExchangeDataList.push(se.simpleParams);
|
|
102
|
+
}
|
|
100
103
|
return acc;
|
|
101
104
|
}, {
|
|
102
105
|
simpleExchangeDataList: [],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"simpleswap.js","sourceRoot":"","sources":["../../src/router/simpleswap.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"simpleswap.js","sourceRoot":"","sources":["../../src/router/simpleswap.ts"],"names":[],"mappings":"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"}
|
|
@@ -70,16 +70,9 @@ function testForNetwork(
|
|
|
70
70
|
|
|
71
71
|
// TODO: Add any direct swap contractMethod name if it exists
|
|
72
72
|
const sideToContractMethods = new Map([
|
|
73
|
-
[
|
|
74
|
-
SwapSide.SELL,
|
|
75
|
-
[
|
|
76
|
-
ContractMethod.simpleSwap,
|
|
77
|
-
ContractMethod.multiSwap,
|
|
78
|
-
ContractMethod.megaSwap,
|
|
79
|
-
],
|
|
80
|
-
],
|
|
73
|
+
[SwapSide.SELL, [ContractMethod.swapExactAmountIn]],
|
|
81
74
|
// TODO: If buy is not supported remove the buy contract methods
|
|
82
|
-
[SwapSide.BUY, [ContractMethod.
|
|
75
|
+
[SwapSide.BUY, [ContractMethod.swapExactAmountOut]],
|
|
83
76
|
]);
|
|
84
77
|
|
|
85
78
|
describe(`${network}`, () => {
|
|
@@ -105,7 +105,8 @@ export class __DexName__
|
|
|
105
105
|
}
|
|
106
106
|
|
|
107
107
|
// Encode params required by the exchange adapter
|
|
108
|
-
// Used for multiSwap, buy & megaSwap
|
|
108
|
+
// V5: Used for multiSwap, buy & megaSwap
|
|
109
|
+
// V6: Not used, can be left blank
|
|
109
110
|
// Hint: abiCoder.encodeParameter() could be useful
|
|
110
111
|
getAdapterParam(
|
|
111
112
|
srcToken: string,
|
|
@@ -128,34 +129,6 @@ export class __DexName__
|
|
|
128
129
|
};
|
|
129
130
|
}
|
|
130
131
|
|
|
131
|
-
// Encode call data used by simpleSwap like routers
|
|
132
|
-
// Used for simpleSwap & simpleBuy
|
|
133
|
-
// Hint: this.buildSimpleParamWithoutWETHConversion
|
|
134
|
-
// could be useful
|
|
135
|
-
async getSimpleParam(
|
|
136
|
-
srcToken: string,
|
|
137
|
-
destToken: string,
|
|
138
|
-
srcAmount: string,
|
|
139
|
-
destAmount: string,
|
|
140
|
-
data: __DexName__Data,
|
|
141
|
-
side: SwapSide,
|
|
142
|
-
): Promise<SimpleExchangeParam> {
|
|
143
|
-
// TODO: complete me!
|
|
144
|
-
const { exchange } = data;
|
|
145
|
-
|
|
146
|
-
// Encode here the transaction arguments
|
|
147
|
-
const swapData = '';
|
|
148
|
-
|
|
149
|
-
return this.buildSimpleParamWithoutWETHConversion(
|
|
150
|
-
srcToken,
|
|
151
|
-
srcAmount,
|
|
152
|
-
destToken,
|
|
153
|
-
destAmount,
|
|
154
|
-
swapData,
|
|
155
|
-
exchange,
|
|
156
|
-
);
|
|
157
|
-
}
|
|
158
|
-
|
|
159
132
|
// This is called once before getTopPoolsForToken is
|
|
160
133
|
// called for multiple tokens. This can be helpful to
|
|
161
134
|
// update common state required for calculating
|
package/funding.json
ADDED
package/package.json
CHANGED
|
@@ -187,10 +187,6 @@ export class AngleStakedStable
|
|
|
187
187
|
};
|
|
188
188
|
}
|
|
189
189
|
|
|
190
|
-
// Encode call data used by simpleSwap like routers
|
|
191
|
-
// Used for simpleSwap & simpleBuy
|
|
192
|
-
// Hint: this.buildSimpleParamWithoutWETHConversion
|
|
193
|
-
// could be useful
|
|
194
190
|
async getSimpleParam(
|
|
195
191
|
srcToken: string,
|
|
196
192
|
destToken: string,
|
package/src/dex/idex.ts
CHANGED
|
@@ -53,7 +53,8 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
|
|
|
53
53
|
getTokenFromAddress?(address: Address): Token;
|
|
54
54
|
|
|
55
55
|
// Encode params required by the exchange adapter
|
|
56
|
-
// Used for multiSwap, buy & megaSwap
|
|
56
|
+
// V5: Used for multiSwap, buy & megaSwap
|
|
57
|
+
// V6: NOT used, pass a placeholder
|
|
57
58
|
getAdapterParam(
|
|
58
59
|
srcToken: Address,
|
|
59
60
|
destToken: Address,
|
|
@@ -64,8 +65,9 @@ export interface IDexTxBuilder<ExchangeData, DirectParam = null> {
|
|
|
64
65
|
): AdapterExchangeParam;
|
|
65
66
|
|
|
66
67
|
// Encode call data used by simpleSwap like routers
|
|
67
|
-
// Used for simpleSwap & simpleBuy
|
|
68
|
-
|
|
68
|
+
// V5: Used for simpleSwap & simpleBuy
|
|
69
|
+
// V6: NOT used, don't implement
|
|
70
|
+
getSimpleParam?(
|
|
69
71
|
srcToken: Address,
|
|
70
72
|
destToken: Address,
|
|
71
73
|
srcAmount: NumberAsString,
|
|
@@ -77,6 +77,7 @@ import {
|
|
|
77
77
|
} from '../generic-rfq/types';
|
|
78
78
|
import { BI_MAX_UINT256 } from '../../bigint-constants';
|
|
79
79
|
import { SpecialDex } from '../../executor/types';
|
|
80
|
+
import { extractReturnAmountPosition } from '../../executor/utils';
|
|
80
81
|
|
|
81
82
|
const BLACKLISTED = 'blacklisted';
|
|
82
83
|
|
|
@@ -476,7 +477,14 @@ export class SwaapV2 extends SimpleExchange implements IDex<SwaapV2Data> {
|
|
|
476
477
|
exchangeData: callData,
|
|
477
478
|
specialDexFlag: SpecialDex.SWAP_ON_SWAAP_V2_SINGLE,
|
|
478
479
|
targetExchange: router,
|
|
479
|
-
returnAmountPos:
|
|
480
|
+
returnAmountPos:
|
|
481
|
+
side === SwapSide.SELL
|
|
482
|
+
? extractReturnAmountPosition(
|
|
483
|
+
this.routerInterface,
|
|
484
|
+
'swap',
|
|
485
|
+
'amountCalculated',
|
|
486
|
+
)
|
|
487
|
+
: undefined,
|
|
480
488
|
};
|
|
481
489
|
}
|
|
482
490
|
|
package/src/router/simpleswap.ts
CHANGED
|
@@ -135,7 +135,7 @@ export abstract class SimpleRouterBase<RouterParam>
|
|
|
135
135
|
}
|
|
136
136
|
}
|
|
137
137
|
|
|
138
|
-
const simpleParams = await dex.getSimpleParam(
|
|
138
|
+
const simpleParams = await dex.getSimpleParam?.(
|
|
139
139
|
_src,
|
|
140
140
|
_dest,
|
|
141
141
|
_srcAmount,
|
|
@@ -157,7 +157,7 @@ export abstract class SimpleRouterBase<RouterParam>
|
|
|
157
157
|
simpleExchangeDataList,
|
|
158
158
|
srcAmountWethToDeposit,
|
|
159
159
|
destAmountWethToWithdraw,
|
|
160
|
-
} =
|
|
160
|
+
} = rawSimpleParams.reduce<{
|
|
161
161
|
simpleExchangeDataList: SimpleExchangeParam[];
|
|
162
162
|
srcAmountWethToDeposit: bigint;
|
|
163
163
|
destAmountWethToWithdraw: bigint;
|
|
@@ -165,7 +165,11 @@ export abstract class SimpleRouterBase<RouterParam>
|
|
|
165
165
|
(acc, se) => {
|
|
166
166
|
acc.srcAmountWethToDeposit += BigInt(se.wethDeposit);
|
|
167
167
|
acc.destAmountWethToWithdraw += BigInt(se.wethWithdraw);
|
|
168
|
-
|
|
168
|
+
// V6 doesn't have simpleParams
|
|
169
|
+
if (se.simpleParams) {
|
|
170
|
+
acc.simpleExchangeDataList.push(se.simpleParams);
|
|
171
|
+
}
|
|
172
|
+
|
|
169
173
|
return acc;
|
|
170
174
|
},
|
|
171
175
|
{
|