@dolomite-exchange/zap-sdk 0.0.13 → 0.1.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/dist/DolomiteZap.d.ts +20 -5
- package/dist/DolomiteZap.js +83 -30
- package/dist/DolomiteZap.js.map +1 -1
- package/dist/clients/AggregatorClient.d.ts +2 -2
- package/dist/clients/AggregatorClient.js.map +1 -1
- package/dist/clients/DolomiteClient.js +18 -5
- package/dist/clients/DolomiteClient.js.map +1 -1
- package/dist/clients/IsolationModeClient.d.ts +1 -0
- package/dist/clients/IsolationModeClient.js +4 -0
- package/dist/clients/IsolationModeClient.js.map +1 -1
- package/dist/clients/ParaswapAggregator.d.ts +2 -2
- package/dist/clients/ParaswapAggregator.js +5 -3
- package/dist/clients/ParaswapAggregator.js.map +1 -1
- package/dist/lib/ApiTypes.d.ts +11 -4
- package/dist/lib/ApiTypes.js.map +1 -1
- package/dist/lib/Constants.d.ts +1 -0
- package/dist/lib/Constants.js +1 -0
- package/dist/lib/Constants.js.map +1 -1
- package/dist/lib/estimators/PendlePtEstimator.js +8 -4
- package/dist/lib/estimators/PendlePtEstimator.js.map +1 -1
- package/dist/lib/estimators/StandardEstimator.js +8 -4
- package/dist/lib/estimators/StandardEstimator.js.map +1 -1
- package/package.json +2 -2
package/dist/DolomiteZap.d.ts
CHANGED
|
@@ -5,16 +5,31 @@ export declare class DolomiteZap {
|
|
|
5
5
|
readonly network: Network;
|
|
6
6
|
readonly subgraphUrl: string;
|
|
7
7
|
readonly web3Provider: ethers.providers.Provider;
|
|
8
|
-
private
|
|
8
|
+
private readonly _defaultIsLiquidation;
|
|
9
|
+
private _defaultSlippageTolerance;
|
|
10
|
+
private _defaultBlockTag;
|
|
9
11
|
private client;
|
|
10
12
|
private paraswapAggregator;
|
|
11
13
|
private marketsCache;
|
|
12
14
|
private marketHelpersCache;
|
|
13
15
|
private validAggregators;
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
16
|
+
/**
|
|
17
|
+
* @param network The network on which this instance of the Dolomite Zap is running.
|
|
18
|
+
* @param subgraphUrl The URL of the subgraph to use for fetching market data.
|
|
19
|
+
* @param web3Provider The web3 provider to use for fetching on-chain data.
|
|
20
|
+
* @param cacheSeconds The number of seconds to cache market data for. Defaults to 1 hour (3600s).
|
|
21
|
+
* @param defaultIsLiquidation True if these zaps are for processing liquidations or false for ordinary zaps.
|
|
22
|
+
* @param defaultSlippageTolerance The default slippage tolerance to use when estimating output. Defaults to 0.3%
|
|
23
|
+
* (0.003).
|
|
24
|
+
* @param defaultBlockTag The default block tag to use when fetching on-chain data. Defaults to 'latest'.
|
|
25
|
+
* @param partnerAddress The address of the partner to use for aggregators that allow referral addresses.
|
|
26
|
+
* Defaults to undefined.
|
|
27
|
+
*/
|
|
28
|
+
constructor(network: Network, subgraphUrl: string, web3Provider: ethers.providers.Provider, cacheSeconds?: number, defaultIsLiquidation?: boolean, defaultSlippageTolerance?: number, defaultBlockTag?: BlockTag, partnerAddress?: Address | undefined);
|
|
29
|
+
get defaultIsLiquidation(): boolean;
|
|
17
30
|
get defaultSlippageTolerance(): number;
|
|
31
|
+
get defaultBlockTag(): BlockTag;
|
|
32
|
+
private static removeSlippageFromAmount;
|
|
18
33
|
setDefaultSlippageTolerance(slippageTolerance: number): void;
|
|
19
34
|
setDefaultBlockTag(blockTag: BlockTag): void;
|
|
20
35
|
setMarketsToAdd(marketsToAdd: ApiMarket[]): void;
|
|
@@ -31,7 +46,7 @@ export declare class DolomiteZap {
|
|
|
31
46
|
* @return {Promise<ZapOutputParam[]>} A list of outputs that can be used to execute the trade. The outputs are
|
|
32
47
|
* sorted by execution, with the best ones being first.
|
|
33
48
|
*/
|
|
34
|
-
getSwapExactTokensForTokensParams(tokenIn: ApiToken | MinimalApiToken, amountIn: Integer, tokenOut: ApiToken | MinimalApiToken, amountOutMin: Integer, txOrigin: Address, config?: ZapConfig): Promise<ZapOutputParam[]>;
|
|
49
|
+
getSwapExactTokensForTokensParams(tokenIn: ApiToken | MinimalApiToken, amountIn: Integer, tokenOut: ApiToken | MinimalApiToken, amountOutMin: Integer, txOrigin: Address, config?: Partial<ZapConfig>): Promise<ZapOutputParam[]>;
|
|
35
50
|
private getMarketsMap;
|
|
36
51
|
private getMarketHelpersMap;
|
|
37
52
|
}
|
package/dist/DolomiteZap.js
CHANGED
|
@@ -49,15 +49,29 @@ var Utils_1 = require("./lib/Utils");
|
|
|
49
49
|
var ONE_HOUR = 60 * 60;
|
|
50
50
|
var THIRTY_BASIS_POINTS = 0.003;
|
|
51
51
|
var DolomiteZap = /** @class */ (function () {
|
|
52
|
-
|
|
52
|
+
/**
|
|
53
|
+
* @param network The network on which this instance of the Dolomite Zap is running.
|
|
54
|
+
* @param subgraphUrl The URL of the subgraph to use for fetching market data.
|
|
55
|
+
* @param web3Provider The web3 provider to use for fetching on-chain data.
|
|
56
|
+
* @param cacheSeconds The number of seconds to cache market data for. Defaults to 1 hour (3600s).
|
|
57
|
+
* @param defaultIsLiquidation True if these zaps are for processing liquidations or false for ordinary zaps.
|
|
58
|
+
* @param defaultSlippageTolerance The default slippage tolerance to use when estimating output. Defaults to 0.3%
|
|
59
|
+
* (0.003).
|
|
60
|
+
* @param defaultBlockTag The default block tag to use when fetching on-chain data. Defaults to 'latest'.
|
|
61
|
+
* @param partnerAddress The address of the partner to use for aggregators that allow referral addresses.
|
|
62
|
+
* Defaults to undefined.
|
|
63
|
+
*/
|
|
64
|
+
function DolomiteZap(network, subgraphUrl, web3Provider, cacheSeconds, defaultIsLiquidation, defaultSlippageTolerance, defaultBlockTag, partnerAddress) {
|
|
53
65
|
if (cacheSeconds === void 0) { cacheSeconds = ONE_HOUR; }
|
|
66
|
+
if (defaultIsLiquidation === void 0) { defaultIsLiquidation = false; }
|
|
54
67
|
if (defaultSlippageTolerance === void 0) { defaultSlippageTolerance = THIRTY_BASIS_POINTS; }
|
|
55
68
|
if (defaultBlockTag === void 0) { defaultBlockTag = 'latest'; }
|
|
56
69
|
if (partnerAddress === void 0) { partnerAddress = undefined; }
|
|
57
70
|
this.network = network;
|
|
58
71
|
this.subgraphUrl = subgraphUrl;
|
|
59
72
|
this.web3Provider = web3Provider;
|
|
60
|
-
this.
|
|
73
|
+
this._defaultIsLiquidation = defaultIsLiquidation;
|
|
74
|
+
this._defaultSlippageTolerance = defaultSlippageTolerance;
|
|
61
75
|
this._defaultBlockTag = defaultBlockTag;
|
|
62
76
|
this.client = new DolomiteClient_1.default(subgraphUrl, network, web3Provider);
|
|
63
77
|
this.paraswapAggregator = new ParaswapAggregator_1.default(network, partnerAddress);
|
|
@@ -65,22 +79,34 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
65
79
|
this.marketHelpersCache = new LocalCache_1.LocalCache(cacheSeconds);
|
|
66
80
|
this.validAggregators = [this.paraswapAggregator].filter(function (aggregator) { return aggregator.isValidForNetwork(); });
|
|
67
81
|
}
|
|
68
|
-
Object.defineProperty(DolomiteZap.prototype, "
|
|
82
|
+
Object.defineProperty(DolomiteZap.prototype, "defaultIsLiquidation", {
|
|
69
83
|
get: function () {
|
|
70
|
-
return this.
|
|
84
|
+
return this._defaultIsLiquidation;
|
|
71
85
|
},
|
|
72
86
|
enumerable: false,
|
|
73
87
|
configurable: true
|
|
74
88
|
});
|
|
75
89
|
Object.defineProperty(DolomiteZap.prototype, "defaultSlippageTolerance", {
|
|
76
90
|
get: function () {
|
|
77
|
-
return this.
|
|
91
|
+
return this._defaultSlippageTolerance;
|
|
78
92
|
},
|
|
79
93
|
enumerable: false,
|
|
80
94
|
configurable: true
|
|
81
95
|
});
|
|
96
|
+
Object.defineProperty(DolomiteZap.prototype, "defaultBlockTag", {
|
|
97
|
+
get: function () {
|
|
98
|
+
return this._defaultBlockTag;
|
|
99
|
+
},
|
|
100
|
+
enumerable: false,
|
|
101
|
+
configurable: true
|
|
102
|
+
});
|
|
103
|
+
DolomiteZap.removeSlippageFromAmount = function (amountWithSlippage, traderParams, config) {
|
|
104
|
+
return traderParams.reduce(function (memo) {
|
|
105
|
+
return memo.dividedToIntegerBy(1 - config.slippageTolerance);
|
|
106
|
+
}, amountWithSlippage);
|
|
107
|
+
};
|
|
82
108
|
DolomiteZap.prototype.setDefaultSlippageTolerance = function (slippageTolerance) {
|
|
83
|
-
this.
|
|
109
|
+
this._defaultSlippageTolerance = slippageTolerance;
|
|
84
110
|
};
|
|
85
111
|
DolomiteZap.prototype.setDefaultBlockTag = function (blockTag) {
|
|
86
112
|
this._defaultBlockTag = blockTag;
|
|
@@ -106,19 +132,25 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
106
132
|
* sorted by execution, with the best ones being first.
|
|
107
133
|
*/
|
|
108
134
|
DolomiteZap.prototype.getSwapExactTokensForTokensParams = function (tokenIn, amountIn, tokenOut, amountOutMin, txOrigin, config) {
|
|
109
|
-
var _a, _b, _c, _d;
|
|
110
|
-
if (config === void 0) { config = { slippageTolerance: this.defaultSlippageTolerance, blockTag: this._defaultBlockTag }; }
|
|
135
|
+
var _a, _b, _c, _d, _e, _f, _g, _h;
|
|
111
136
|
return __awaiter(this, void 0, void 0, function () {
|
|
112
|
-
var marketsMap, marketHelpersMap, inputMarket, inputHelper, outputMarket, outputHelper, marketIdsPath, amountsPaths, traderParamsArrays, effectiveInputMarketId, effectiveOutputMarketId, isIsolationModeUnwrapper, unwrapperInfo, unwrapperHelper,
|
|
137
|
+
var actualConfig, marketsMap, marketHelpersMap, inputMarket, inputHelper, outputMarket, outputHelper, marketIdsPath, amountsPaths, traderParamsArrays, effectiveInputMarketId, effectiveOutputMarketId, isIsolationModeUnwrapper, unwrapperInfo, unwrapperHelper, _j, amountOut_1, tradeData_1, isIsolationModeWrapper, wrapperInfo, wrapperHelper, effectiveInputMarket_1, effectiveOutputMarket_1, aggregatorOutputOrUndefinedList, aggregatorOutputs_1, amountsAndTraderParams_1, result, zaps;
|
|
113
138
|
var _this = this;
|
|
114
|
-
return __generator(this, function (
|
|
115
|
-
switch (
|
|
116
|
-
case 0:
|
|
139
|
+
return __generator(this, function (_k) {
|
|
140
|
+
switch (_k.label) {
|
|
141
|
+
case 0:
|
|
142
|
+
actualConfig = {
|
|
143
|
+
isLiquidation: (_a = config === null || config === void 0 ? void 0 : config.isLiquidation) !== null && _a !== void 0 ? _a : this.defaultIsLiquidation,
|
|
144
|
+
slippageTolerance: (_b = config === null || config === void 0 ? void 0 : config.slippageTolerance) !== null && _b !== void 0 ? _b : this.defaultSlippageTolerance,
|
|
145
|
+
blockTag: (_c = config === null || config === void 0 ? void 0 : config.blockTag) !== null && _c !== void 0 ? _c : this._defaultBlockTag,
|
|
146
|
+
filterOutZapsWithInsufficientOutput: (_d = config === null || config === void 0 ? void 0 : config.filterOutZapsWithInsufficientOutput) !== null && _d !== void 0 ? _d : true,
|
|
147
|
+
};
|
|
148
|
+
return [4 /*yield*/, this.getMarketsMap()];
|
|
117
149
|
case 1:
|
|
118
|
-
marketsMap =
|
|
150
|
+
marketsMap = _k.sent();
|
|
119
151
|
return [4 /*yield*/, this.getMarketHelpersMap(marketsMap)];
|
|
120
152
|
case 2:
|
|
121
|
-
marketHelpersMap =
|
|
153
|
+
marketHelpersMap = _k.sent();
|
|
122
154
|
inputMarket = marketsMap[tokenIn.marketId];
|
|
123
155
|
inputHelper = marketHelpersMap[tokenIn.marketId];
|
|
124
156
|
outputMarket = marketsMap[tokenOut.marketId];
|
|
@@ -129,6 +161,9 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
129
161
|
else if (!outputMarket) {
|
|
130
162
|
return [2 /*return*/, Promise.reject(new Error("Invalid tokenOut: ".concat(tokenOut.symbol, " / ").concat(tokenOut.marketId)))];
|
|
131
163
|
}
|
|
164
|
+
else if (inputMarket.marketId === outputMarket.marketId) {
|
|
165
|
+
return [2 /*return*/, Promise.reject(new Error("Duplicate input and output marketId: ".concat(inputMarket.marketId)))];
|
|
166
|
+
}
|
|
132
167
|
else if (amountIn.lte(Constants_1.INTEGERS.ZERO)) {
|
|
133
168
|
return [2 /*return*/, Promise.reject(new Error('Invalid amountIn. Must be greater than 0'))];
|
|
134
169
|
}
|
|
@@ -138,37 +173,43 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
138
173
|
else if (!(0, Utils_1.toChecksumOpt)(txOrigin)) {
|
|
139
174
|
return [2 /*return*/, Promise.reject(new Error('Invalid address for txOrigin'))];
|
|
140
175
|
}
|
|
176
|
+
else if (actualConfig.slippageTolerance < 0 || actualConfig.slippageTolerance > 0.1) {
|
|
177
|
+
return [2 /*return*/, Promise.reject(new Error('Invalid slippageTolerance. Must be between 0 and 0.1 (10%)'))];
|
|
178
|
+
}
|
|
141
179
|
marketIdsPath = [inputMarket.marketId];
|
|
142
180
|
amountsPaths = new Array(this.validAggregators.length).fill([amountIn]);
|
|
143
181
|
traderParamsArrays = new Array(this.validAggregators.length).fill([]);
|
|
144
182
|
effectiveInputMarketId = inputMarket.marketId;
|
|
145
183
|
effectiveOutputMarketId = outputMarket.marketId;
|
|
146
184
|
isIsolationModeUnwrapper = inputMarket.isolationModeUnwrapperInfo;
|
|
147
|
-
unwrapperInfo = (
|
|
148
|
-
unwrapperHelper = (
|
|
185
|
+
unwrapperInfo = (_e = inputMarket.isolationModeUnwrapperInfo) !== null && _e !== void 0 ? _e : inputMarket.liquidityTokenUnwrapperInfo;
|
|
186
|
+
unwrapperHelper = (_f = inputHelper.isolationModeUnwrapperHelper) !== null && _f !== void 0 ? _f : inputHelper.liquidityTokenUnwrapperHelper;
|
|
149
187
|
if (!(unwrapperInfo && unwrapperHelper)) return [3 /*break*/, 4];
|
|
150
188
|
effectiveInputMarketId = unwrapperInfo.outputMarketId;
|
|
151
189
|
marketIdsPath.push(effectiveInputMarketId);
|
|
152
|
-
return [4 /*yield*/, unwrapperHelper.estimateOutputFunction(amountIn, unwrapperInfo.outputMarketId,
|
|
190
|
+
return [4 /*yield*/, unwrapperHelper.estimateOutputFunction(amountIn, unwrapperInfo.outputMarketId, actualConfig)];
|
|
153
191
|
case 3:
|
|
154
|
-
|
|
192
|
+
_j = _k.sent(), amountOut_1 = _j.amountOut, tradeData_1 = _j.tradeData;
|
|
155
193
|
amountsPaths.forEach(function (amountsPath) { return amountsPath.push(amountOut_1); });
|
|
156
194
|
traderParamsArrays.forEach(function (traderParams) {
|
|
195
|
+
var _a;
|
|
157
196
|
traderParams.push({
|
|
158
197
|
traderType: isIsolationModeUnwrapper
|
|
159
198
|
? ApiTypes_1.GenericTraderType.IsolationModeUnwrapper
|
|
160
199
|
: ApiTypes_1.GenericTraderType.ExternalLiquidity,
|
|
161
200
|
makerAccountIndex: 0,
|
|
162
|
-
trader:
|
|
201
|
+
trader: actualConfig.isLiquidation
|
|
202
|
+
? ((_a = unwrapperInfo.unwrapperForLiquidationAddress) !== null && _a !== void 0 ? _a : unwrapperInfo.unwrapperAddress)
|
|
203
|
+
: unwrapperInfo.unwrapperAddress,
|
|
163
204
|
tradeData: tradeData_1,
|
|
164
205
|
readableName: unwrapperInfo.readableName,
|
|
165
206
|
});
|
|
166
207
|
});
|
|
167
|
-
|
|
208
|
+
_k.label = 4;
|
|
168
209
|
case 4:
|
|
169
210
|
isIsolationModeWrapper = outputMarket.isolationModeWrapperInfo;
|
|
170
|
-
wrapperInfo = (
|
|
171
|
-
wrapperHelper = (
|
|
211
|
+
wrapperInfo = (_g = outputMarket.isolationModeWrapperInfo) !== null && _g !== void 0 ? _g : outputMarket.liquidityTokenWrapperInfo;
|
|
212
|
+
wrapperHelper = (_h = outputHelper.isolationModeWrapperHelper) !== null && _h !== void 0 ? _h : outputHelper.liquidityTokenWrapperHelper;
|
|
172
213
|
if (wrapperInfo) {
|
|
173
214
|
// We can't get the amount yet until we know if we need to use an aggregator in the middle
|
|
174
215
|
effectiveOutputMarketId = wrapperInfo.inputMarketId;
|
|
@@ -183,10 +224,10 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
183
224
|
effectiveInputMarket_1 = marketsMap[effectiveInputMarketId];
|
|
184
225
|
effectiveOutputMarket_1 = marketsMap[effectiveOutputMarketId];
|
|
185
226
|
return [4 /*yield*/, Promise.all(this.validAggregators.map(function (aggregator, i) {
|
|
186
|
-
return aggregator.getSwapExactTokensForTokensData(effectiveInputMarket_1, amountsPaths[i][amountsPaths[i].length - 1], effectiveOutputMarket_1, Constants_1.INTEGERS.ONE, txOrigin);
|
|
227
|
+
return aggregator.getSwapExactTokensForTokensData(effectiveInputMarket_1, amountsPaths[i][amountsPaths[i].length - 1], effectiveOutputMarket_1, Constants_1.INTEGERS.ONE, txOrigin, actualConfig);
|
|
187
228
|
}))];
|
|
188
229
|
case 5:
|
|
189
|
-
aggregatorOutputOrUndefinedList =
|
|
230
|
+
aggregatorOutputOrUndefinedList = _k.sent();
|
|
190
231
|
aggregatorOutputs_1 = aggregatorOutputOrUndefinedList.filter(function (trader) { return !!trader; });
|
|
191
232
|
if (aggregatorOutputs_1.length !== this.validAggregators.length) {
|
|
192
233
|
throw new Error('Invalid aggregator outputs length');
|
|
@@ -201,7 +242,7 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
201
242
|
readableName: aggregatorOutputs_1[i].readableName,
|
|
202
243
|
});
|
|
203
244
|
});
|
|
204
|
-
|
|
245
|
+
_k.label = 6;
|
|
205
246
|
case 6:
|
|
206
247
|
if (!(wrapperInfo && wrapperHelper)) return [3 /*break*/, 8];
|
|
207
248
|
return [4 /*yield*/, Promise.all(amountsPaths.map(function (amountsPath) { return __awaiter(_this, void 0, void 0, function () {
|
|
@@ -210,7 +251,7 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
210
251
|
switch (_a.label) {
|
|
211
252
|
case 0:
|
|
212
253
|
amountInForEstimation = amountsPath[amountsPath.length - 1];
|
|
213
|
-
return [4 /*yield*/, wrapperHelper.estimateOutputFunction(amountInForEstimation, wrapperInfo.inputMarketId,
|
|
254
|
+
return [4 /*yield*/, wrapperHelper.estimateOutputFunction(amountInForEstimation, wrapperInfo.inputMarketId, actualConfig)];
|
|
214
255
|
case 1:
|
|
215
256
|
outputEstimate = _a.sent();
|
|
216
257
|
traderParam = {
|
|
@@ -230,26 +271,38 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
230
271
|
});
|
|
231
272
|
}); }))];
|
|
232
273
|
case 7:
|
|
233
|
-
amountsAndTraderParams_1 =
|
|
274
|
+
amountsAndTraderParams_1 = _k.sent();
|
|
234
275
|
amountsPaths.forEach(function (amountsPath, i) {
|
|
235
276
|
amountsPath.push(amountsAndTraderParams_1[i].amountOut);
|
|
236
277
|
traderParamsArrays[i].push(amountsAndTraderParams_1[i].traderParam);
|
|
237
278
|
});
|
|
238
|
-
|
|
279
|
+
_k.label = 8;
|
|
239
280
|
case 8:
|
|
240
281
|
if (!marketIdsPath.includes(outputMarket.marketId)) {
|
|
241
282
|
marketIdsPath.push(outputMarket.marketId);
|
|
242
283
|
}
|
|
243
284
|
result = this.validAggregators.map(function (_, i) {
|
|
285
|
+
var expectedAmountOut = DolomiteZap.removeSlippageFromAmount(amountsPaths[i][amountsPaths[i].length - 1], traderParamsArrays[i], actualConfig);
|
|
286
|
+
amountsPaths[i][amountsPaths[i].length - 1] = expectedAmountOut
|
|
287
|
+
.times(1 - actualConfig.slippageTolerance)
|
|
288
|
+
.integerValue();
|
|
244
289
|
return {
|
|
245
290
|
marketIdsPath: marketIdsPath,
|
|
291
|
+
expectedAmountOut: expectedAmountOut,
|
|
246
292
|
amountWeisPath: amountsPaths[i],
|
|
247
293
|
traderParams: traderParamsArrays[i],
|
|
248
294
|
makerAccounts: [],
|
|
249
|
-
|
|
295
|
+
originalAmountOutMin: amountOutMin,
|
|
250
296
|
};
|
|
251
297
|
});
|
|
252
|
-
|
|
298
|
+
zaps = (0, Utils_1.removeDuplicates)(result, Utils_1.zapOutputParamToJson);
|
|
299
|
+
if (actualConfig.filterOutZapsWithInsufficientOutput) {
|
|
300
|
+
return [2 /*return*/, zaps.filter(function (zap) { return zap.expectedAmountOut.gte(amountOutMin); })];
|
|
301
|
+
}
|
|
302
|
+
else {
|
|
303
|
+
return [2 /*return*/, zaps];
|
|
304
|
+
}
|
|
305
|
+
return [2 /*return*/];
|
|
253
306
|
}
|
|
254
307
|
});
|
|
255
308
|
});
|
package/dist/DolomiteZap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DolomiteZap.js","sourceRoot":"","sources":["../src/DolomiteZap.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,4EAAsD;AACtD,oFAA8D;AAC9D,2CAewB;AACxB,6CAKyB;AACzB,+CAA8C;AAC9C,qCAAoF;AAEpF,IAAM,QAAQ,GAAG,EAAE,GAAG,EAAE,CAAC;AAEzB,IAAM,mBAAmB,GAAG,KAAK,CAAC;AAElC;
|
|
1
|
+
{"version":3,"file":"DolomiteZap.js","sourceRoot":"","sources":["../src/DolomiteZap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
|
-
import { Address, AggregatorOutput, ApiMarket, ApiToken, Integer, Network } from '../lib/ApiTypes';
|
|
1
|
+
import { Address, AggregatorOutput, ApiMarket, ApiToken, Integer, Network, ZapConfig } from '../lib/ApiTypes';
|
|
2
2
|
export default abstract class AggregatorClient {
|
|
3
3
|
readonly network: Network;
|
|
4
4
|
protected constructor(network: Network);
|
|
5
5
|
abstract isValidForNetwork(): boolean;
|
|
6
|
-
abstract getSwapExactTokensForTokensData(inputMarket: ApiMarket | ApiToken, inputAmountWei: Integer, outputMarket: ApiMarket | ApiToken, minOutputAmountWei: Integer, txOrigin: Address): Promise<AggregatorOutput | undefined>;
|
|
6
|
+
abstract getSwapExactTokensForTokensData(inputMarket: ApiMarket | ApiToken, inputAmountWei: Integer, outputMarket: ApiMarket | ApiToken, minOutputAmountWei: Integer, txOrigin: Address, config: ZapConfig): Promise<AggregatorOutput | undefined>;
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"AggregatorClient.js","sourceRoot":"","sources":["../../src/clients/AggregatorClient.ts"],"names":[],"mappings":";;AAEA;IAGE,0BAAsB,OAAgB;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;
|
|
1
|
+
{"version":3,"file":"AggregatorClient.js","sourceRoot":"","sources":["../../src/clients/AggregatorClient.ts"],"names":[],"mappings":";;AAEA;IAGE,0BAAsB,OAAgB;QACpC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAYH,uBAAC;AAAD,CAAC,AAjBD,IAiBC"}
|
|
@@ -115,6 +115,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
115
115
|
return __generator(this, function (_a) {
|
|
116
116
|
standardEstimator = new StandardEstimator_1.StandardEstimator(this.network, this.web3Provider, marketsMap);
|
|
117
117
|
return [2 /*return*/, Object.values(marketsMap).reduce(function (acc, market) {
|
|
118
|
+
var _a, _b;
|
|
118
119
|
var marketHelper = {
|
|
119
120
|
marketId: market.marketId,
|
|
120
121
|
isolationModeUnwrapperHelper: undefined,
|
|
@@ -124,20 +125,22 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
124
125
|
};
|
|
125
126
|
var isolationModeUnwrapper = market.isolationModeUnwrapperInfo;
|
|
126
127
|
if (isolationModeUnwrapper) {
|
|
128
|
+
var unwrapperForLiquidationAddress_1 = (_a = isolationModeUnwrapper.unwrapperForLiquidationAddress) !== null && _a !== void 0 ? _a : isolationModeUnwrapper.unwrapperAddress;
|
|
127
129
|
marketHelper.isolationModeUnwrapperHelper = {
|
|
128
130
|
estimateOutputFunction: function (amountIn, outputMarketId, config) { return __awaiter(_this, void 0, void 0, function () {
|
|
129
131
|
return __generator(this, function (_a) {
|
|
130
|
-
return [2 /*return*/, standardEstimator.getUnwrappedAmount(market.tokenAddress, isolationModeUnwrapper.unwrapperAddress, amountIn, outputMarketId, config)];
|
|
132
|
+
return [2 /*return*/, standardEstimator.getUnwrappedAmount(market.tokenAddress, config.isLiquidation ? unwrapperForLiquidationAddress_1 : isolationModeUnwrapper.unwrapperAddress, amountIn, outputMarketId, config)];
|
|
131
133
|
});
|
|
132
134
|
}); },
|
|
133
135
|
};
|
|
134
136
|
}
|
|
135
137
|
var liquidityTokenUnwrapper = market.liquidityTokenUnwrapperInfo;
|
|
136
138
|
if (liquidityTokenUnwrapper) {
|
|
139
|
+
var unwrapperForLiquidationAddress_2 = (_b = liquidityTokenUnwrapper.unwrapperForLiquidationAddress) !== null && _b !== void 0 ? _b : liquidityTokenUnwrapper.unwrapperAddress;
|
|
137
140
|
marketHelper.liquidityTokenUnwrapperHelper = {
|
|
138
141
|
estimateOutputFunction: function (amountIn, outputMarketId, config) { return __awaiter(_this, void 0, void 0, function () {
|
|
139
142
|
return __generator(this, function (_a) {
|
|
140
|
-
return [2 /*return*/, standardEstimator.getUnwrappedAmount(market.tokenAddress, liquidityTokenUnwrapper.unwrapperAddress, amountIn, outputMarketId, config)];
|
|
143
|
+
return [2 /*return*/, standardEstimator.getUnwrappedAmount(market.tokenAddress, config.isLiquidation ? unwrapperForLiquidationAddress_2 : liquidityTokenUnwrapper.unwrapperAddress, amountIn, outputMarketId, config)];
|
|
141
144
|
});
|
|
142
145
|
}); },
|
|
143
146
|
};
|
|
@@ -200,11 +203,12 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
200
203
|
return [2 /*return*/, Promise.reject(result.errors[0])];
|
|
201
204
|
}
|
|
202
205
|
marketPromises = result.data.marketRiskInfos.map(function (market) { return __awaiter(_this, void 0, void 0, function () {
|
|
203
|
-
var isolationModeClient, isolationModeUnwrapperInfo, isolationModeWrapperInfo, unwrapperAddress, outputMarketId, wrapperAddress, inputMarketId, unwrapperReadableName, wrapperReadableName, liquidityTokenUnwrapperInfo, liquidityTokenWrapperInfo, apiMarket;
|
|
206
|
+
var isolationModeClient, isolationModeUnwrapperInfo, isolationModeWrapperInfo, unwrapperAddress, unwrapperForLiquidationAddress, outputMarketId, wrapperAddress, inputMarketId, unwrapperReadableName, wrapperReadableName, liquidityTokenUnwrapperInfo, liquidityTokenWrapperInfo, apiMarket;
|
|
204
207
|
return __generator(this, function (_a) {
|
|
205
208
|
isolationModeClient = new IsolationModeClient_1.default(this.network);
|
|
206
209
|
if (isolationModeClient.isIsolationModeToken(market.token)) {
|
|
207
210
|
unwrapperAddress = isolationModeClient.getIsolationModeUnwrapperByMarketId(market.token);
|
|
211
|
+
unwrapperForLiquidationAddress = isolationModeClient.getIsolationModeUnwrapperForLiquidationByMarketId(market.token);
|
|
208
212
|
outputMarketId = isolationModeClient.getIsolationModeUnwrapperMarketIdByMarketId(market.token);
|
|
209
213
|
wrapperAddress = isolationModeClient.getIsolationModeWrapperByMarketId(market.token);
|
|
210
214
|
inputMarketId = isolationModeClient.getIsolationModeWrapperMarketIdByMarketId(market.token);
|
|
@@ -224,8 +228,17 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
224
228
|
});
|
|
225
229
|
return [2 /*return*/, undefined];
|
|
226
230
|
}
|
|
227
|
-
isolationModeUnwrapperInfo = {
|
|
228
|
-
|
|
231
|
+
isolationModeUnwrapperInfo = {
|
|
232
|
+
unwrapperAddress: unwrapperAddress,
|
|
233
|
+
unwrapperForLiquidationAddress: unwrapperForLiquidationAddress,
|
|
234
|
+
outputMarketId: outputMarketId,
|
|
235
|
+
readableName: unwrapperReadableName,
|
|
236
|
+
};
|
|
237
|
+
isolationModeWrapperInfo = {
|
|
238
|
+
wrapperAddress: wrapperAddress,
|
|
239
|
+
inputMarketId: inputMarketId,
|
|
240
|
+
readableName: wrapperReadableName,
|
|
241
|
+
};
|
|
229
242
|
}
|
|
230
243
|
if (isolationModeClient.isLiquidityToken(market.token)) {
|
|
231
244
|
liquidityTokenUnwrapperInfo = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAW1B,yEAAwE;AAExE,2EAAqD;AACrD,yDAAmC;AACnC,sCAA6C;AAC7C,8EAAwD;AAExD,IAAM,kBAAkB,GAAG;IACzB,OAAO,EAAE,EAAE,iBAAiB,EAAE,uBAAuB,EAAE;CACxD,CAAC;AAEF;IAME,wBACE,WAAmB,EACnB,SAAkB,EAClB,YAAuC;QAEvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,wCAAe,GAAtB,UACE,YAAyB;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/C,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBACxD,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,0BAA0B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE;oBAC5F,MAAM,IAAI,KAAK,CAAC,iDAA0C,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC,CAAC;iBACvF;aACF;SACF;QACD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEY,8CAAqB,GAAlC,UACE,QAA6B;QAA7B,yBAAA,EAAA,mBAA6B;;;;;;4BAET,qBAAM,yBAAe,CAAC,iBAAiB,CAAC,UAAC,SAAS,IAAK,OAAA,KAAI,CAAC,4BAA4B,CAC1G,QAAQ,EACR,SAAS,CACV,EAH0E,CAG1E,CAAC,EAAA;;wBAHI,WAAW,GAAG,SAGlB;wBACF,sBAAO,CAAC,WAAW,CAAC,MAAM,OAAlB,WAAW,2BAAW,IAAI,CAAC,YAAY,WAAE,CAAC,MAAM,CAA8B,UAAC,GAAG,EAAE,MAAM;gCAChG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gCAC9B,OAAO,GAAG,CAAC;4BACb,CAAC,EAAE,EAAE,CAAC,EAAC;;;;KACR;IAEY,iDAAwB,GAArC,UACE,UAAuC;;;;;gBAEjC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBAC7F,sBAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAoC,UAAC,GAAG,EAAE,MAAM
|
|
1
|
+
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAW1B,yEAAwE;AAExE,2EAAqD;AACrD,yDAAmC;AACnC,sCAA6C;AAC7C,8EAAwD;AAExD,IAAM,kBAAkB,GAAG;IACzB,OAAO,EAAE,EAAE,iBAAiB,EAAE,uBAAuB,EAAE;CACxD,CAAC;AAEF;IAME,wBACE,WAAmB,EACnB,SAAkB,EAClB,YAAuC;QAEvC,IAAI,CAAC,WAAW,GAAG,WAAW,CAAC;QAC/B,IAAI,CAAC,OAAO,GAAG,SAAS,CAAC;QACzB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,YAAY,GAAG,EAAE,CAAC;IACzB,CAAC;IAEM,wCAAe,GAAtB,UACE,YAAyB;QAEzB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,YAAY,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,EAAE;YAC/C,IAAI,YAAY,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,EAAE;gBACxD,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,0BAA0B,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,wBAAwB,EAAE;oBAC5F,MAAM,IAAI,KAAK,CAAC,iDAA0C,YAAY,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAE,CAAC,CAAC;iBACvF;aACF;SACF;QACD,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;IACnC,CAAC;IAEY,8CAAqB,GAAlC,UACE,QAA6B;QAA7B,yBAAA,EAAA,mBAA6B;;;;;;4BAET,qBAAM,yBAAe,CAAC,iBAAiB,CAAC,UAAC,SAAS,IAAK,OAAA,KAAI,CAAC,4BAA4B,CAC1G,QAAQ,EACR,SAAS,CACV,EAH0E,CAG1E,CAAC,EAAA;;wBAHI,WAAW,GAAG,SAGlB;wBACF,sBAAO,CAAC,WAAW,CAAC,MAAM,OAAlB,WAAW,2BAAW,IAAI,CAAC,YAAY,WAAE,CAAC,MAAM,CAA8B,UAAC,GAAG,EAAE,MAAM;gCAChG,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC;gCAC9B,OAAO,GAAG,CAAC;4BACb,CAAC,EAAE,EAAE,CAAC,EAAC;;;;KACR;IAEY,iDAAwB,GAArC,UACE,UAAuC;;;;;gBAEjC,iBAAiB,GAAG,IAAI,qCAAiB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC;gBAC7F,sBAAO,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,CAAoC,UAAC,GAAG,EAAE,MAAM;;wBACrF,IAAM,YAAY,GAAoB;4BACpC,QAAQ,EAAE,MAAM,CAAC,QAAQ;4BACzB,4BAA4B,EAAE,SAAS;4BACvC,6BAA6B,EAAE,SAAS;4BACxC,0BAA0B,EAAE,SAAS;4BACrC,2BAA2B,EAAE,SAAS;yBACvC,CAAC;wBAEF,IAAM,sBAAsB,GAAG,MAAM,CAAC,0BAA0B,CAAC;wBACjE,IAAI,sBAAsB,EAAE;4BAC1B,IAAM,gCAA8B,GAAG,MAAA,sBAAsB,CAAC,8BAA8B,mCACvF,sBAAsB,CAAC,gBAAgB,CAAC;4BAC7C,YAAY,CAAC,4BAA4B,GAAG;gCAC1C,sBAAsB,EAAE,UACtB,QAAQ,EACR,cAAc,EACd,MAAM;;wCACH,sBAAA,iBAAiB,CAAC,kBAAkB,CACvC,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,gCAA8B,CAAC,CAAC,CAAC,sBAAsB,CAAC,gBAAgB,EAC/F,QAAQ,EACR,cAAc,EACd,MAAM,CACP,EAAA;;qCAAA;6BACF,CAAC;yBACH;wBACD,IAAM,uBAAuB,GAAG,MAAM,CAAC,2BAA2B,CAAC;wBACnE,IAAI,uBAAuB,EAAE;4BAC3B,IAAM,gCAA8B,GAAG,MAAA,uBAAuB,CAAC,8BAA8B,mCACxF,uBAAuB,CAAC,gBAAgB,CAAC;4BAC9C,YAAY,CAAC,6BAA6B,GAAG;gCAC3C,sBAAsB,EAAE,UACtB,QAAQ,EACR,cAAc,EACd,MAAM;;wCACH,sBAAA,iBAAiB,CAAC,kBAAkB,CACvC,MAAM,CAAC,YAAY,EACnB,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,gCAA8B,CAAC,CAAC,CAAC,uBAAuB,CAAC,gBAAgB,EAChG,QAAQ,EACR,cAAc,EACd,MAAM,CACP,EAAA;;qCAAA;6BACF,CAAC;yBACH;wBACD,IAAM,oBAAoB,GAAG,MAAM,CAAC,wBAAwB,CAAC;wBAC7D,IAAI,oBAAoB,EAAE;4BACxB,YAAY,CAAC,0BAA0B,GAAG;gCACxC,sBAAsB,EAAE,UACtB,QAAQ,EACR,aAAa,EACb,MAAM;;wCACH,sBAAA,iBAAiB,CAAC,gBAAgB,CACrC,MAAM,CAAC,YAAY,EACnB,oBAAoB,CAAC,cAAc,EACnC,QAAQ,EACR,aAAa,EACb,MAAM,CACP,EAAA;;qCAAA;6BACF,CAAC;yBACH;wBACD,IAAM,qBAAqB,GAAG,MAAM,CAAC,yBAAyB,CAAC;wBAC/D,IAAI,qBAAqB,EAAE;4BACzB,YAAY,CAAC,2BAA2B,GAAG;gCACzC,sBAAsB,EAAE,UACtB,QAAQ,EACR,aAAa,EACb,MAAM;;wCACH,sBAAA,iBAAiB,CAAC,gBAAgB,CACrC,MAAM,CAAC,YAAY,EACnB,qBAAqB,CAAC,cAAc,EACpC,QAAQ,EACR,aAAa,EACb,MAAM,CACP,EAAA;;qCAAA;6BACF,CAAC;yBACH;wBAED,GAAG,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,YAAY,CAAC;wBACpC,OAAO,GAAG,CAAC;oBACb,CAAC,EAAE,EAAE,CAAC,EAAC;;;KACR;IAEa,qDAA4B,GAA1C,UACE,QAA6B,EAC7B,SAAqB;QADrB,yBAAA,EAAA,mBAA6B;QAC7B,0BAAA,EAAA,aAAqB;;;;;;;wBAGrB,IAAI,QAAQ,KAAK,QAAQ,EAAE;4BACzB,iCAAiC;4BACjC,KAAK,GAAG,yFAC2B,yBAAe,CAAC,aAAa,wQAUtD,CAAC;yBACZ;6BAAM;4BACL,KAAK,GAAG,4IAC2D,yBAAe,CAAC,aAAa,wQAUtF,CAAC;yBACZ;wBACmC,qBAAM,eAAK,CAAC,IAAI,CAChD,IAAI,CAAC,WAAW,EAChB;gCACE,KAAK,OAAA;gCACL,SAAS,EAAE;oCACT,WAAW,EAAE,QAAQ,KAAK,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ;oCACzD,IAAI,EAAE,SAAS,GAAG,yBAAe,CAAC,aAAa;iCAChD;6BACF,EACD,kBAAkB,CACnB;iCACA,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,QAAQ,CAAC,IAAI,EAAb,CAAa,CAAC;iCAC/B,IAAI,CAAC,UAAA,IAAI,IAAI,OAAA,IAA2B,EAA3B,CAA2B,CAAC,EAAA;;wBAZtC,MAAM,GAAwB,SAYQ;wBAE5C,IAAI,MAAM,CAAC,MAAM,IAAI,OAAO,MAAM,CAAC,MAAM,KAAK,QAAQ,EAAE;4BACtD,iEAAiE;4BACjE,sBAAO,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,EAAC;yBACzC;wBAEK,cAAc,GAAqC,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,GAAG,CAAC,UAAO,MAAM;;;gCAC9F,mBAAmB,GAAG,IAAI,6BAAmB,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gCAGlE,IAAI,mBAAmB,CAAC,oBAAoB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oCACpD,gBAAgB,GAAG,mBAAmB,CAAC,mCAAmC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACzF,8BAA8B,GAAG,mBAAmB,CAAC,iDAAiD,CAC1G,MAAM,CAAC,KAAK,CAAC,CAAC;oCACV,cAAc,GAAG,mBAAmB,CAAC,2CAA2C,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCAC/F,cAAc,GAAG,mBAAmB,CAAC,iCAAiC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCACrF,aAAa,GAAG,mBAAmB,CAAC,yCAAyC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCAC5F,qBAAqB,GAAG,mBAAmB,CAAC,+CAA+C,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCAC1G,mBAAmB,GAAG,mBAAmB,CAAC,6CAA6C,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;oCAE5G,IAAI,CAAC,gBAAgB,IAAI,OAAO,cAAc,KAAK,WAAW,IAAI,CAAC,qBAAqB,EAAE;wCACxF,gBAAM,CAAC,IAAI,CAAC;4CACV,OAAO,EAAE,kDAAkD;4CAC3D,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;yCAChC,CAAC,CAAC;wCACH,sBAAO,SAAS,EAAC;qCAClB;yCAAM,IAAI,CAAC,cAAc,IAAI,OAAO,aAAa,KAAK,WAAW,IAAI,CAAC,mBAAmB,EAAE;wCAC1F,gBAAM,CAAC,IAAI,CAAC;4CACV,OAAO,EAAE,gDAAgD;4CACzD,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC,QAAQ;yCAChC,CAAC,CAAC;wCACH,sBAAO,SAAS,EAAC;qCAClB;oCAED,0BAA0B,GAAG;wCAC3B,gBAAgB,kBAAA;wCAChB,8BAA8B,gCAAA;wCAC9B,cAAc,gBAAA;wCACd,YAAY,EAAE,qBAAqB;qCACpC,CAAC;oCACF,wBAAwB,GAAG;wCACzB,cAAc,gBAAA;wCACd,aAAa,eAAA;wCACb,YAAY,EAAE,mBAAmB;qCAClC,CAAC;iCACH;gCAID,IAAI,mBAAmB,CAAC,gBAAgB,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE;oCACtD,2BAA2B,GAAG;wCAC5B,gBAAgB,EAAE,mBAAmB,CAAC,iCAAiC,CAAC,MAAM,CAAC,KAAK,CAAC;wCACrF,cAAc,EAAE,mBAAmB,CAAC,yCAAyC,CAAC,MAAM,CAAC,KAAK,CAAC;wCAC3F,YAAY,EAAE,mBAAmB,CAAC,6CAA6C,CAAC,MAAM,CAAC,KAAK,CAAC;qCAC9F,CAAC;oCACF,yBAAyB,GAAG;wCAC1B,cAAc,EAAE,mBAAmB,CAAC,+BAA+B,CAAC,MAAM,CAAC,KAAK,CAAC;wCACjF,aAAa,EAAE,mBAAmB,CAAC,uCAAuC,CAAC,MAAM,CAAC,KAAK,CAAC;wCACxF,YAAY,EAAE,mBAAmB,CAAC,2CAA2C,CAAC,MAAM,CAAC,KAAK,CAAC;qCAC5F,CAAC;iCACH;gCAEK,SAAS,GAAc;oCAC3B,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;oCACvC,MAAM,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM;oCAC3B,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI;oCACvB,YAAY,EAAE,IAAA,qBAAa,EAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAAE;oCAC7C,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC;oCACvC,0BAA0B,4BAAA;oCAC1B,wBAAwB,0BAAA;oCACxB,2BAA2B,6BAAA;oCAC3B,yBAAyB,2BAAA;iCAC1B,CAAC;gCACF,sBAAO,SAAS,EAAC;;6BAClB,CAAC,CAAC;wBAEK,qBAAM,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,EAAA;4BAAzC,sBAAO,CAAC,SAAiC,CAAC,CAAC,MAAM,CAAC,UAAA,MAAM,IAAI,OAAA,CAAC,CAAC,MAAM,EAAR,CAAQ,CAAgB,EAAC;;;;KACtF;IACH,qBAAC;AAAD,CAAC,AA9PD,IA8PC"}
|
|
@@ -7,6 +7,7 @@ export default class IsolationModeClient {
|
|
|
7
7
|
getIsolationModeUnwrapperMarketIdByMarketId(token: GraphqlToken): number | undefined;
|
|
8
8
|
getIsolationModeWrapperMarketIdByMarketId(token: GraphqlToken): number | undefined;
|
|
9
9
|
getIsolationModeUnwrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
10
|
+
getIsolationModeUnwrapperForLiquidationByMarketId(token: GraphqlToken): string | undefined;
|
|
10
11
|
getIsolationModeWrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
11
12
|
getIsolationModeUnwrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
12
13
|
getIsolationModeWrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
@@ -21,6 +21,10 @@ var IsolationModeClient = /** @class */ (function () {
|
|
|
21
21
|
var _a;
|
|
22
22
|
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.unwrapper;
|
|
23
23
|
};
|
|
24
|
+
IsolationModeClient.prototype.getIsolationModeUnwrapperForLiquidationByMarketId = function (token) {
|
|
25
|
+
var _a;
|
|
26
|
+
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.unwrapperForLiquidation;
|
|
27
|
+
};
|
|
24
28
|
IsolationModeClient.prototype.getIsolationModeWrapperByMarketId = function (token) {
|
|
25
29
|
var _a;
|
|
26
30
|
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.wrapper;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"IsolationModeClient.js","sourceRoot":"","sources":["../../src/clients/IsolationModeClient.ts"],"names":[],"mappings":";;AACA,8CAAqH;AAGrH;IAGE,6BAAY,OAAgB;QAC1B,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IACzB,CAAC;IAED,mEAAmE;IAE5D,kDAAoB,GAA3B,UAA4B,KAA8B;QACxD,OAAO,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,qBAAqB,CAAC,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC;IACjF,CAAC;IAEM,yEAA2C,GAAlD,UAAmD,KAAmB;;QACpE,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,iBAAiB,CAAC;IAClG,CAAC;IAEM,uEAAyC,GAAhD,UAAiD,KAAmB;;QAClE,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,eAAe,CAAC;IAChG,CAAC;IAEM,iEAAmC,GAA1C,UAA2C,KAAmB;;QAC5D,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,SAAS,CAAC;IAC1F,CAAC;IAEM,+DAAiC,GAAxC,UAAyC,KAAmB;;QAC1D,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,OAAO,CAAC;IACxF,CAAC;IAEM,6EAA+C,GAAtD,UAAuD,KAAmB;;QACxE,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,qBAAqB,CAAC;IACtG,CAAC;IAEM,2EAA6C,GAApD,UAAqD,KAAmB;;QACtE,OAAO,MAAA,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,0CAAE,mBAAmB,CAAC;IACpG,CAAC;IAED,oEAAoE;IAE7D,8CAAgB,GAAvB,UAAwB,KAAmB;QACzC,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,KAAK,SAAS,CAAC;IAC9F,CAAC;IAEM,uEAAyC,GAAhD,UAAiD,KAAmB;QAClE,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,iBAAiB,CAAC;IAClG,CAAC;IAEM,qEAAuC,GAA9C,UAA+C,KAAmB;QAChE,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,eAAe,CAAC;IAChG,CAAC;IAEM,+DAAiC,GAAxC,UAAyC,KAAmB;QAC1D,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,SAAS,CAAC;IAC1F,CAAC;IAEM,6DAA+B,GAAtC,UAAuC,KAAmB;QACxD,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC;IACxF,CAAC;IAEM,2EAA6C,GAApD,UAAqD,KAAmB;QACtE,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,qBAAqB,CAAC;IACtG,CAAC;IAEM,yEAA2C,GAAlD,UAAmD,KAAmB;QACpE,OAAO,oDAAwC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,mBAAmB,CAAC;IACpG,CAAC;IACH,0BAAC;AAAD,CAAC,
|
|
1
|
+
{"version":3,"file":"IsolationModeClient.js","sourceRoot":"","sources":["../../src/clients/IsolationModeClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { Address, AggregatorOutput, ApiMarket, ApiToken, Integer, Network } from '../lib/ApiTypes';
|
|
1
|
+
import { Address, AggregatorOutput, ApiMarket, ApiToken, Integer, Network, ZapConfig } from '../lib/ApiTypes';
|
|
2
2
|
import AggregatorClient from './AggregatorClient';
|
|
3
3
|
export default class ParaswapAggregator extends AggregatorClient {
|
|
4
4
|
private readonly partnerAddress;
|
|
5
5
|
constructor(network: Network, partnerAddress: Address | undefined);
|
|
6
6
|
isValidForNetwork(): boolean;
|
|
7
|
-
getSwapExactTokensForTokensData(inputMarket: ApiMarket | ApiToken, inputAmountWei: Integer, outputMarket: ApiMarket | ApiToken, minOutputAmountWei: Integer, txOrigin: Address): Promise<AggregatorOutput | undefined>;
|
|
7
|
+
getSwapExactTokensForTokensData(inputMarket: ApiMarket | ApiToken, inputAmountWei: Integer, outputMarket: ApiMarket | ApiToken, minOutputAmountWei: Integer, txOrigin: Address, config: ZapConfig): Promise<AggregatorOutput | undefined>;
|
|
8
8
|
}
|
|
@@ -70,10 +70,10 @@ var ParaswapAggregator = /** @class */ (function (_super) {
|
|
|
70
70
|
ParaswapAggregator.prototype.isValidForNetwork = function () {
|
|
71
71
|
return !!Constants_1.PARASWAP_TRADER_ADDRESS_MAP[this.network];
|
|
72
72
|
};
|
|
73
|
-
ParaswapAggregator.prototype.getSwapExactTokensForTokensData = function (inputMarket, inputAmountWei, outputMarket, minOutputAmountWei, txOrigin) {
|
|
73
|
+
ParaswapAggregator.prototype.getSwapExactTokensForTokensData = function (inputMarket, inputAmountWei, outputMarket, minOutputAmountWei, txOrigin, config) {
|
|
74
74
|
var _a;
|
|
75
75
|
return __awaiter(this, void 0, void 0, function () {
|
|
76
|
-
var traderAddress, pricesQueryParams, priceRouteResponse, transactionsQueryParams, result;
|
|
76
|
+
var traderAddress, pricesQueryParams, priceRouteResponse, transactionsQueryParams, result, expectedAmountOutSansSlippage, expectedAmountOut;
|
|
77
77
|
return __generator(this, function (_b) {
|
|
78
78
|
switch (_b.label) {
|
|
79
79
|
case 0:
|
|
@@ -139,10 +139,12 @@ var ParaswapAggregator = /** @class */ (function (_super) {
|
|
|
139
139
|
// GUARD: If we don't have the result, we can't execute the trade
|
|
140
140
|
return [2 /*return*/, undefined];
|
|
141
141
|
}
|
|
142
|
+
expectedAmountOutSansSlippage = new bignumber_js_1.default((_a = priceRouteResponse === null || priceRouteResponse === void 0 ? void 0 : priceRouteResponse.priceRoute) === null || _a === void 0 ? void 0 : _a.destAmount);
|
|
143
|
+
expectedAmountOut = expectedAmountOutSansSlippage.times(1 - config.slippageTolerance).integerValue();
|
|
142
144
|
return [2 /*return*/, {
|
|
143
145
|
traderAddress: traderAddress,
|
|
144
146
|
tradeData: result.data,
|
|
145
|
-
expectedAmountOut:
|
|
147
|
+
expectedAmountOut: expectedAmountOut,
|
|
146
148
|
readableName: 'Paraswap',
|
|
147
149
|
}];
|
|
148
150
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ParaswapAggregator.js","sourceRoot":"","sources":["../../src/clients/ParaswapAggregator.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"ParaswapAggregator.js","sourceRoot":"","sources":["../../src/clients/ParaswapAggregator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;AAC1B,8DAAqC;AAErC,8CAA+D;AAC/D,yDAAmC;AACnC,wEAAkD;AAElD,IAAM,OAAO,GAAG,2BAA2B,CAAC;AAE5C;IAAgD,sCAAgB;IAE9D,4BAAmB,OAAgB,EAAE,cAAmC;QAAxE,YACE,kBAAM,OAAO,CAAC,SAEf;QADC,KAAI,CAAC,cAAc,GAAG,cAAc,CAAC;;IACvC,CAAC;IAEM,8CAAiB,GAAxB;QACE,OAAO,CAAC,CAAC,uCAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACrD,CAAC;IAEY,4DAA+B,GAA5C,UACE,WAAiC,EACjC,cAAuB,EACvB,YAAkC,EAClC,kBAA2B,EAC3B,QAAiB,EACjB,MAAiB;;;;;;;wBAEX,aAAa,GAAG,uCAA2B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;wBAChE,IAAI,CAAC,aAAa,EAAE;4BAClB,sBAAO,SAAS,EAAC;yBAClB;wBAEK,iBAAiB,GAAG,IAAI,eAAe,CAAC;4BAC5C,OAAO,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,EAAE;4BAChC,QAAQ,EAAE,WAAW,CAAC,YAAY;4BAClC,WAAW,EAAE,WAAW,CAAC,QAAQ,CAAC,QAAQ,EAAE;4BAC5C,SAAS,EAAE,YAAY,CAAC,YAAY;4BACpC,YAAY,EAAE,YAAY,CAAC,QAAQ,CAAC,QAAQ,EAAE;4BAC9C,MAAM,EAAE,cAAc,CAAC,OAAO,EAAE;4BAChC,sBAAsB,EAAE,+BAA+B;yBACxD,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACa,qBAAM,eAAK,CAAC,GAAG,CAAC,UAAG,OAAO,qBAAW,iBAAiB,CAAE,CAAC;iCACjF,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,QAAQ,CAAC,IAAI,EAAb,CAAa,CAAC;iCAC/B,KAAK,CAAC,UAAC,KAAK;gCACX,gBAAM,CAAC,KAAK,CAAC;oCACX,OAAO,EAAE,gCAAgC;oCACzC,KAAK,OAAA;iCACN,CAAC,CAAC;gCACH,OAAO,SAAS,CAAC;4BACnB,CAAC,CAAC,EAAA;;wBARE,kBAAkB,GAAG,SAQvB;wBACJ,IAAI,CAAC,kBAAkB,EAAE;4BACvB,oEAAoE;4BACpE,sBAAO,SAAS,EAAC;yBAClB;wBAEK,uBAAuB,GAAG,IAAI,eAAe,CAAC;4BAClD,YAAY,EAAE,MAAM;4BACpB,iBAAiB,EAAE,MAAM;4BACzB,UAAU,EAAE,OAAO;yBACpB,CAAC,CAAC,QAAQ,EAAE,CAAC;wBACC,qBAAM,eAAK,CAAC,IAAI,CAAC,UAAG,OAAO,2BAAiB,IAAI,CAAC,OAAO,cAAI,uBAAuB,CAAE,EAAE;gCACpG,QAAQ,UAAA;gCACR,UAAU,EAAE,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU;gCAC1C,QAAQ,EAAE,WAAW,CAAC,YAAY;gCAClC,WAAW,EAAE,WAAW,CAAC,QAAQ;gCACjC,SAAS,EAAE,YAAY,CAAC,YAAY;gCACpC,YAAY,EAAE,YAAY,CAAC,QAAQ;gCACnC,SAAS,EAAE,cAAc,CAAC,OAAO,EAAE;gCACnC,UAAU,EAAE,kBAAkB,CAAC,OAAO,EAAE;gCACxC,WAAW,EAAE,aAAa;gCAC1B,QAAQ,EAAE,aAAa;gCACvB,cAAc,EAAE,IAAI,CAAC,cAAc;gCACnC,sBAAsB,EAAE,CAAC,IAAI,CAAC,cAAc,EAAE,oEAAoE;6BACnH,CAAC;iCACC,IAAI,CAAC,UAAA,QAAQ,IAAI,OAAA,QAAQ,CAAC,IAAI,EAAb,CAAa,CAAC;iCAC/B,KAAK,CAAC,UAAA,KAAK;gCACV,gBAAM,CAAC,KAAK,CAAC;oCACX,OAAO,EAAE,sCAAsC;oCAC/C,YAAY,EAAE,KAAK,CAAC,OAAO;oCAC3B,IAAI,EAAE,KAAK,CAAC,IAAI;iCACjB,CAAC,CAAC;gCAEH,OAAO,SAAS,CAAC;4BACnB,CAAC,CAAC,EAAA;;wBAvBE,MAAM,GAAG,SAuBX;wBACJ,IAAI,CAAC,MAAM,EAAE;4BACX,iEAAiE;4BACjE,sBAAO,SAAS,EAAC;yBAClB;wBAEK,6BAA6B,GAAG,IAAI,sBAAS,CAAC,MAAA,kBAAkB,aAAlB,kBAAkB,uBAAlB,kBAAkB,CAAE,UAAU,0CAAE,UAAU,CAAC,CAAC;wBAC1F,iBAAiB,GAAG,6BAA6B,CAAC,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,YAAY,EAAE,CAAC;wBAC3G,sBAAO;gCACL,aAAa,eAAA;gCACb,SAAS,EAAE,MAAM,CAAC,IAAI;gCACtB,iBAAiB,mBAAA;gCACjB,YAAY,EAAE,UAAU;6BACzB,EAAC;;;;KACH;IACH,yBAAC;AAAD,CAAC,AA1FD,CAAgD,0BAAgB,GA0F/D"}
|
package/dist/lib/ApiTypes.d.ts
CHANGED
|
@@ -35,6 +35,7 @@ export interface ApiMarket {
|
|
|
35
35
|
}
|
|
36
36
|
export interface ApiUnwrapperInfo {
|
|
37
37
|
unwrapperAddress: Address;
|
|
38
|
+
unwrapperForLiquidationAddress?: Address;
|
|
38
39
|
outputMarketId: number;
|
|
39
40
|
readableName: string;
|
|
40
41
|
}
|
|
@@ -96,8 +97,10 @@ export interface AggregatorOutput {
|
|
|
96
97
|
readableName: string;
|
|
97
98
|
}
|
|
98
99
|
export interface ZapConfig {
|
|
100
|
+
isLiquidation: boolean;
|
|
99
101
|
slippageTolerance: number;
|
|
100
102
|
blockTag: BlockTag;
|
|
103
|
+
filterOutZapsWithInsufficientOutput: boolean;
|
|
101
104
|
}
|
|
102
105
|
export interface ZapOutputParam {
|
|
103
106
|
/**
|
|
@@ -105,7 +108,7 @@ export interface ZapOutputParam {
|
|
|
105
108
|
*/
|
|
106
109
|
marketIdsPath: number[];
|
|
107
110
|
/**
|
|
108
|
-
* The expected output amounts for each market in the path
|
|
111
|
+
* The expected output amounts for each market in the path, including slippage
|
|
109
112
|
*/
|
|
110
113
|
amountWeisPath: Integer[];
|
|
111
114
|
/**
|
|
@@ -117,8 +120,12 @@ export interface ZapOutputParam {
|
|
|
117
120
|
*/
|
|
118
121
|
makerAccounts: AccountInfo[];
|
|
119
122
|
/**
|
|
120
|
-
* The
|
|
121
|
-
* amountWeisPath[amountWeisPath.length - 1] (since the last amount is the `expected` amount out)
|
|
123
|
+
* The expected amount out, not including slippage
|
|
122
124
|
*/
|
|
123
|
-
|
|
125
|
+
expectedAmountOut: Integer;
|
|
126
|
+
/**
|
|
127
|
+
* The minimum output amount that was inputted into the Zap function. This is not the same as
|
|
128
|
+
* amountWeisPath[amountWeisPath.length - 1] (since the last amount is the `expected` amount out including slippage)
|
|
129
|
+
*/
|
|
130
|
+
originalAmountOutMin: Integer;
|
|
124
131
|
}
|
package/dist/lib/ApiTypes.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ApiTypes.js","sourceRoot":"","sources":["../../src/lib/ApiTypes.ts"],"names":[],"mappings":";;;AAMA,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,yDAAoB,CAAA;IACpB,gEAAwB,CAAA;AAC1B,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;
|
|
1
|
+
{"version":3,"file":"ApiTypes.js","sourceRoot":"","sources":["../../src/lib/ApiTypes.ts"],"names":[],"mappings":";;;AAMA,IAAY,OAGX;AAHD,WAAY,OAAO;IACjB,yDAAoB,CAAA;IACpB,gEAAwB,CAAA;AAC1B,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;AA4ED,IAAY,iBAKX;AALD,WAAY,iBAAiB;IAC3B,mFAAqB,CAAA;IACrB,mFAAqB,CAAA;IACrB,6FAA0B,CAAA;IAC1B,yFAAwB,CAAA;AAC1B,CAAC,EALW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAK5B"}
|
package/dist/lib/Constants.d.ts
CHANGED
|
@@ -2,6 +2,7 @@ import BigNumber from 'bignumber.js';
|
|
|
2
2
|
import { Address, MarketId, Network } from './ApiTypes';
|
|
3
3
|
export interface ApiMarketConverter {
|
|
4
4
|
unwrapper: Address;
|
|
5
|
+
unwrapperForLiquidation?: Address;
|
|
5
6
|
wrapper: Address;
|
|
6
7
|
unwrapperMarketId: number;
|
|
7
8
|
wrapperMarketId: number;
|
package/dist/lib/Constants.js
CHANGED
|
@@ -89,6 +89,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
89
89
|
},
|
|
90
90
|
_k[JONES_USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
91
91
|
unwrapper: Deployments.JonesUSDCIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
92
|
+
unwrapperForLiquidation: Deployments.JonesUSDCIsolationModeUnwrapperTraderV2ForLiquidation[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
92
93
|
wrapper: Deployments.JonesUSDCIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
93
94
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
94
95
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../src/lib/Constants.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,+GAAmG;AACnG,8DAAqC;AACrC,uCAAwD;
|
|
1
|
+
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../src/lib/Constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -71,7 +71,7 @@ var PendlePtEstimator = /** @class */ (function () {
|
|
|
71
71
|
}
|
|
72
72
|
PendlePtEstimator.prototype.getUnwrappedAmount = function (isolationModeToken, amountInPt, config) {
|
|
73
73
|
return __awaiter(this, void 0, void 0, function () {
|
|
74
|
-
var _a, tokenOutput, tradeData;
|
|
74
|
+
var _a, tokenOutput, tradeData, outputAmountWithSlippage, outputAmount;
|
|
75
75
|
return __generator(this, function (_b) {
|
|
76
76
|
switch (_b.label) {
|
|
77
77
|
case 0: return [4 /*yield*/, this.pendleRouter.swapExactPtForToken((0, Constants_1.getPendleMarketForIsolationModeToken)(this.network, isolationModeToken), amountInPt.toFixed(), (0, Constants_1.getSGlpAddress)(this.network), config.slippageTolerance, { method: 'extractParams' })];
|
|
@@ -92,14 +92,16 @@ var PendlePtEstimator = /** @class */ (function () {
|
|
|
92
92
|
],
|
|
93
93
|
],
|
|
94
94
|
]);
|
|
95
|
-
|
|
95
|
+
outputAmountWithSlippage = new bignumber_js_1.default(tokenOutput.minTokenOut.toString());
|
|
96
|
+
outputAmount = outputAmountWithSlippage.dividedToIntegerBy(1 - config.slippageTolerance).minus(1);
|
|
97
|
+
return [2 /*return*/, { tradeData: tradeData, outputAmount: outputAmount }];
|
|
96
98
|
}
|
|
97
99
|
});
|
|
98
100
|
});
|
|
99
101
|
};
|
|
100
102
|
PendlePtEstimator.prototype.getWrappedAmount = function (isolationModeToken, inputAmount, config) {
|
|
101
103
|
return __awaiter(this, void 0, void 0, function () {
|
|
102
|
-
var _a, approxParams, tokenInput, approxParamsType, tokenInputType, tradeData;
|
|
104
|
+
var _a, approxParams, tokenInput, approxParamsType, tokenInputType, tradeData, ptAmountOutWithSlippage, ptAmountOut;
|
|
103
105
|
return __generator(this, function (_b) {
|
|
104
106
|
switch (_b.label) {
|
|
105
107
|
case 0: return [4 /*yield*/, this.pendleRouter.swapExactTokenForPt((0, Constants_1.getPendleMarketForIsolationModeToken)(this.network, isolationModeToken), (0, Constants_1.getSGlpAddress)(this.network), inputAmount.toFixed(), config.slippageTolerance, { method: 'extractParams' })];
|
|
@@ -129,7 +131,9 @@ var PendlePtEstimator = /** @class */ (function () {
|
|
|
129
131
|
],
|
|
130
132
|
],
|
|
131
133
|
]);
|
|
132
|
-
|
|
134
|
+
ptAmountOutWithSlippage = new bignumber_js_1.default(approxParams.guessOffchain.toString());
|
|
135
|
+
ptAmountOut = ptAmountOutWithSlippage.dividedToIntegerBy(1 - config.slippageTolerance).minus(1);
|
|
136
|
+
return [2 /*return*/, { tradeData: tradeData, ptAmountOut: ptAmountOut }];
|
|
133
137
|
}
|
|
134
138
|
});
|
|
135
139
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"PendlePtEstimator.js","sourceRoot":"","sources":["../../../src/lib/estimators/PendlePtEstimator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA0F;AAC1F,8DAAqC;AACrC,iCAAgC;AAEhC,0CAAoF;AAEpF;IAIE,2BACE,OAAgB,EAChB,YAAuC;QAEvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,eAAkB,CAAC,SAAS,CAAC;YAC/C,OAAO,EAAE,OAAc;YACvB,QAAQ,EAAE,YAAY;YACtB,MAAM,EAAE,IAAI,eAAM,CAAC,UAAU,CAAC,4CAA4C,EAAE,YAAY,CAAC;SAC1F,CAAC,CAAC;IACL,CAAC;IAEY,8CAAkB,GAA/B,UACE,kBAA2B,EAC3B,UAAmB,EACnB,MAAiB;;;;;4BAEW,qBAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CACrE,IAAA,gDAAoC,EAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAQ,EAC7E,UAAU,CAAC,OAAO,EAAE,EACpB,IAAA,0BAAc,EAAC,IAAI,CAAC,OAAO,CAAQ,EACnC,MAAM,CAAC,iBAAiB,EACxB,EAAE,MAAM,EAAE,eAAe,EAAE,CAC5B,EAAA;;wBANK,KAAA,sBAAsB,SAM3B,KAAA,EANY,WAAW,QAAA;wBAQlB,SAAS,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACnD,CAAC,gFAAgF,CAAC,EAClF;4BACE;gCACE,WAAW,CAAC,QAAQ;gCACpB,WAAW,CAAC,WAAW;gCACvB,WAAW,CAAC,aAAa;gCACzB,WAAW,CAAC,IAAI;gCAChB,WAAW,CAAC,UAAU;gCACtB;oCACE,WAAW,CAAC,QAAQ,CAAC,QAAQ;oCAC7B,WAAW,CAAC,QAAQ,CAAC,SAAS;oCAC9B,WAAW,CAAC,QAAQ,CAAC,WAAW;oCAChC,WAAW,CAAC,QAAQ,CAAC,SAAS;iCAC/B;6BACF;yBACF,CACF,CAAC;
|
|
1
|
+
{"version":3,"file":"PendlePtEstimator.js","sourceRoot":"","sources":["../../../src/lib/estimators/PendlePtEstimator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yCAA0F;AAC1F,8DAAqC;AACrC,iCAAgC;AAEhC,0CAAoF;AAEpF;IAIE,2BACE,OAAgB,EAChB,YAAuC;QAEvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,eAAkB,CAAC,SAAS,CAAC;YAC/C,OAAO,EAAE,OAAc;YACvB,QAAQ,EAAE,YAAY;YACtB,MAAM,EAAE,IAAI,eAAM,CAAC,UAAU,CAAC,4CAA4C,EAAE,YAAY,CAAC;SAC1F,CAAC,CAAC;IACL,CAAC;IAEY,8CAAkB,GAA/B,UACE,kBAA2B,EAC3B,UAAmB,EACnB,MAAiB;;;;;4BAEW,qBAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CACrE,IAAA,gDAAoC,EAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAQ,EAC7E,UAAU,CAAC,OAAO,EAAE,EACpB,IAAA,0BAAc,EAAC,IAAI,CAAC,OAAO,CAAQ,EACnC,MAAM,CAAC,iBAAiB,EACxB,EAAE,MAAM,EAAE,eAAe,EAAE,CAC5B,EAAA;;wBANK,KAAA,sBAAsB,SAM3B,KAAA,EANY,WAAW,QAAA;wBAQlB,SAAS,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACnD,CAAC,gFAAgF,CAAC,EAClF;4BACE;gCACE,WAAW,CAAC,QAAQ;gCACpB,WAAW,CAAC,WAAW;gCACvB,WAAW,CAAC,aAAa;gCACzB,WAAW,CAAC,IAAI;gCAChB,WAAW,CAAC,UAAU;gCACtB;oCACE,WAAW,CAAC,QAAQ,CAAC,QAAQ;oCAC7B,WAAW,CAAC,QAAQ,CAAC,SAAS;oCAC9B,WAAW,CAAC,QAAQ,CAAC,WAAW;oCAChC,WAAW,CAAC,QAAQ,CAAC,SAAS;iCAC/B;6BACF;yBACF,CACF,CAAC;wBAGI,wBAAwB,GAAG,IAAI,sBAAS,CAAC,WAAW,CAAC,WAAW,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAC7E,YAAY,GAAG,wBAAwB,CAAC,kBAAkB,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACxG,sBAAO,EAAE,SAAS,WAAA,EAAE,YAAY,cAAA,EAAE,EAAC;;;;KACpC;IAEY,4CAAgB,GAA7B,UACE,kBAA2B,EAC3B,WAAoB,EACpB,MAAiB;;;;;4BAEwB,qBAAM,IAAI,CAAC,YAAY,CAAC,mBAAmB,CAClF,IAAA,gDAAoC,EAAC,IAAI,CAAC,OAAO,EAAE,kBAAkB,CAAQ,EAC7E,IAAA,0BAAc,EAAC,IAAI,CAAC,OAAO,CAAQ,EACnC,WAAW,CAAC,OAAO,EAAE,EACrB,MAAM,CAAC,iBAAiB,EACxB,EAAE,MAAM,EAAE,eAAe,EAAE,CAC5B,EAAA;;wBANK,KAAA,sBAAmC,SAMxC,KAAA,EANY,YAAY,QAAA,EAAE,UAAU,QAAA;wBAQ/B,gBAAgB,GAAG,gDAAgD,CAAC;wBACpE,cAAc,GAAG,gFAAgF,CAAC;wBAClG,SAAS,GAAG,eAAM,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CACnD,CAAC,gBAAgB,EAAE,cAAc,CAAC,EAClC;4BACE;gCACE,YAAY,CAAC,QAAQ;gCACrB,YAAY,CAAC,QAAQ;gCACrB,YAAY,CAAC,aAAa;gCAC1B,YAAY,CAAC,YAAY;gCACzB,YAAY,CAAC,GAAG;6BACjB;4BACD;gCACE,UAAU,CAAC,OAAO;gCAClB,UAAU,CAAC,UAAU;gCACrB,UAAU,CAAC,WAAW;gCACtB,UAAU,CAAC,IAAI;gCACf,UAAU,CAAC,UAAU;gCACrB;oCACE,UAAU,CAAC,QAAQ,CAAC,QAAQ;oCAC5B,UAAU,CAAC,QAAQ,CAAC,SAAS;oCAC7B,UAAU,CAAC,QAAQ,CAAC,WAAW;oCAC/B,UAAU,CAAC,QAAQ,CAAC,SAAS;iCAC9B;6BACF;yBACF,CACF,CAAC;wBAGI,uBAAuB,GAAG,IAAI,sBAAS,CAAC,YAAY,CAAC,aAAa,CAAC,QAAQ,EAAE,CAAC,CAAC;wBAC/E,WAAW,GAAG,uBAAuB,CAAC,kBAAkB,CAAC,CAAC,GAAG,MAAM,CAAC,iBAAiB,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;wBACtG,sBAAO,EAAE,SAAS,WAAA,EAAE,WAAW,aAAA,EAAE,EAAC;;;;KACnC;IACH,wBAAC;AAAD,CAAC,AApGD,IAoGC;AApGY,8CAAiB"}
|
|
@@ -54,7 +54,7 @@ var StandardEstimator = /** @class */ (function () {
|
|
|
54
54
|
}
|
|
55
55
|
StandardEstimator.prototype.getUnwrappedAmount = function (isolationModeTokenAddress, unwrapperAddress, amountIn, outputMarketId, config) {
|
|
56
56
|
return __awaiter(this, void 0, void 0, function () {
|
|
57
|
-
var outputMarket, contract, result, estimateOutputResult, tradeData, outputAmount;
|
|
57
|
+
var outputMarket, contract, result, estimateOutputResult, tradeData, outputAmount, amountOutSansSlippage, amountOut;
|
|
58
58
|
return __generator(this, function (_a) {
|
|
59
59
|
switch (_a.label) {
|
|
60
60
|
case 0:
|
|
@@ -73,14 +73,16 @@ var StandardEstimator = /** @class */ (function () {
|
|
|
73
73
|
return [4 /*yield*/, contract.getExchangeCost(isolationModeTokenAddress, outputMarket.tokenAddress, amountIn.toFixed(), tradeData)];
|
|
74
74
|
case 4:
|
|
75
75
|
outputAmount = _a.sent();
|
|
76
|
-
|
|
76
|
+
amountOutSansSlippage = new bignumber_js_1.default(outputAmount.toString());
|
|
77
|
+
amountOut = amountOutSansSlippage.times(1 - config.slippageTolerance).integerValue();
|
|
78
|
+
return [2 /*return*/, { amountOut: amountOut, tradeData: tradeData }];
|
|
77
79
|
}
|
|
78
80
|
});
|
|
79
81
|
});
|
|
80
82
|
};
|
|
81
83
|
StandardEstimator.prototype.getWrappedAmount = function (isolationModeTokenAddress, wrapperAddress, amountIn, inputMarketId, config) {
|
|
82
84
|
return __awaiter(this, void 0, void 0, function () {
|
|
83
|
-
var inputMarket, estimateOutputResult, result, contract, tradeData, outputAmount;
|
|
85
|
+
var inputMarket, estimateOutputResult, result, contract, tradeData, outputAmount, amountOutSansSlippage, amountOut;
|
|
84
86
|
return __generator(this, function (_a) {
|
|
85
87
|
switch (_a.label) {
|
|
86
88
|
case 0:
|
|
@@ -99,7 +101,9 @@ var StandardEstimator = /** @class */ (function () {
|
|
|
99
101
|
return [4 /*yield*/, contract.getExchangeCost(inputMarket.tokenAddress, isolationModeTokenAddress, amountIn.toFixed(), tradeData)];
|
|
100
102
|
case 4:
|
|
101
103
|
outputAmount = _a.sent();
|
|
102
|
-
|
|
104
|
+
amountOutSansSlippage = new bignumber_js_1.default(outputAmount.toString());
|
|
105
|
+
amountOut = amountOutSansSlippage.times(1 - config.slippageTolerance).integerValue();
|
|
106
|
+
return [2 /*return*/, { amountOut: amountOut, tradeData: tradeData }];
|
|
103
107
|
}
|
|
104
108
|
});
|
|
105
109
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"StandardEstimator.js","sourceRoot":"","sources":["../../../src/lib/estimators/StandardEstimator.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAqC;AACrC,iCAAgC;AAChC,uHAA4F;AAE5F,0CAMsB;AACtB,yDAAwD;AAExD;IAME,2BACE,OAAgB,EAChB,YAAuC,EACvC,UAAuC;QAEvC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;QACvB,IAAI,CAAC,YAAY,GAAG,YAAY,CAAC;QACjC,IAAI,CAAC,UAAU,GAAG,UAAU,CAAC;QAC7B,IAAI,CAAC,eAAe,GAAG,IAAI,qCAAiB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAC;IACtE,CAAC;IAEY,8CAAkB,GAA/B,UACE,yBAAkC,EAClC,gBAAyB,EACzB,QAAiB,EACjB,cAAsB,EACtB,MAAiB;;;;;;wBAEX,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;wBAC/C,QAAQ,GAAG,IAAI,eAAM,CAAC,QAAQ,CAAC,gBAAgB,EAAE,6CAA8B,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;6BAEtG,IAAA,wBAAY,EAAC,IAAI,CAAC,OAAO,EAAE,yBAAyB,CAAC,EAArD,wBAAqD;wBACxC,qBAAM,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAC1D,yBAAyB,EACzB,QAAQ,EACR,MAAM,CACP,EAAA;;wBAJK,MAAM,GAAG,SAId;wBAC4B,qBAAM,IAAI,CAAC,kBAAkB,CACxD,IAAA,sCAA0B,EAAC,IAAI,CAAC,OAAO,CAAE,EACzC,mDAAuC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAA,uCAA2B,EAAC,IAAI,CAAC,OAAO,CAAE,CAAE,CAAC,SAAS,EAC5G,MAAM,CAAC,YAAY,EACnB,cAAc,EACd,MAAM,CACP,EAAA;;wBANK,oBAAoB,GAAG,SAM5B;wBACD,sBAAO,EAAE,SAAS,EAAE,MAAM,CAAC,SAAS,EAAE,SAAS,EAAE,oBAAoB,CAAC,SAAS,EAAE,EAAC;;wBAG5E,SAAS,GAAG,uBAAW,CAAC;wBACT,qBAAM,QAAQ,CAAC,eAAe,CACjD,yBAAyB,EACzB,YAAY,CAAC,YAAY,EACzB,QAAQ,CAAC,OAAO,EAAE,EAClB,SAAS,CACV,EAAA;;wBALK,YAAY,GAAG,SAKpB;
|
|
1
|
+
{"version":3,"file":"StandardEstimator.js","sourceRoot":"","sources":["../../../src/lib/estimators/StandardEstimator.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dolomite-exchange/zap-sdk",
|
|
3
|
-
"version": "0.0
|
|
3
|
+
"version": "0.1.0",
|
|
4
4
|
"description": "SDK for zapping any asset to any asset on Dolomite.",
|
|
5
5
|
"scripts": {
|
|
6
6
|
"test": "NODE_ENV=test jest --runInBand",
|
|
@@ -26,7 +26,7 @@
|
|
|
26
26
|
"main": "dist/index.js",
|
|
27
27
|
"types": "dist/index.d.ts",
|
|
28
28
|
"dependencies": {
|
|
29
|
-
"@dolomite-exchange/dolomite-margin-modules": "0.0.
|
|
29
|
+
"@dolomite-exchange/dolomite-margin-modules": "0.0.4",
|
|
30
30
|
"@pendle/sdk-v2": "^2.3.4",
|
|
31
31
|
"axios": "^1.1.3",
|
|
32
32
|
"bignumber.js": "^9.1.1",
|