@dolomite-exchange/zap-sdk 0.2.39 → 0.2.41

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.
Files changed (27) hide show
  1. package/dist/__tests__/lib/estimators/GmxV2GmEstimator.test.js +6 -7
  2. package/dist/__tests__/lib/estimators/GmxV2GmEstimator.test.js.map +1 -1
  3. package/dist/__tests__/specific-zaps/GmxV2Zap.test.js +0 -60
  4. package/dist/__tests__/specific-zaps/GmxV2Zap.test.js.map +1 -1
  5. package/dist/__tests__/specific-zaps/PendlePtGlpMar2024Zap.test.js +9 -60
  6. package/dist/__tests__/specific-zaps/PendlePtGlpMar2024Zap.test.js.map +1 -1
  7. package/dist/__tests__/specific-zaps/PendlePtWeEthApr2024Zap.test.js +1 -0
  8. package/dist/__tests__/specific-zaps/PendlePtWeEthApr2024Zap.test.js.map +1 -1
  9. package/dist/src/DolomiteZap.js +31 -43
  10. package/dist/src/DolomiteZap.js.map +1 -1
  11. package/dist/src/lib/ApiTypes.d.ts +0 -1
  12. package/dist/src/lib/ApiTypes.js.map +1 -1
  13. package/dist/src/lib/Constants.d.ts +2 -0
  14. package/dist/src/lib/Constants.js +25 -1
  15. package/dist/src/lib/Constants.js.map +1 -1
  16. package/dist/src/lib/estimators/GmxV2GmEstimator.js +18 -10
  17. package/dist/src/lib/estimators/GmxV2GmEstimator.js.map +1 -1
  18. package/dist/src/lib/estimators/PendlePtEstimatorV2.d.ts +1 -0
  19. package/dist/src/lib/estimators/PendlePtEstimatorV2.js +14 -2
  20. package/dist/src/lib/estimators/PendlePtEstimatorV2.js.map +1 -1
  21. package/dist/src/lib/estimators/PendlePtEstimatorV3.d.ts +3 -0
  22. package/dist/src/lib/estimators/PendlePtEstimatorV3.js +66 -10
  23. package/dist/src/lib/estimators/PendlePtEstimatorV3.js.map +1 -1
  24. package/package.json +2 -2
  25. package/dist/__tests__/specific-zaps/PendleYtMar2024Zap.test.d.ts +0 -1
  26. package/dist/__tests__/specific-zaps/PendleYtMar2024Zap.test.js +0 -224
  27. package/dist/__tests__/specific-zaps/PendleYtMar2024Zap.test.js.map +0 -1
@@ -79,19 +79,18 @@ describe('GmxV2GmEstimator', function () {
79
79
  describe('#getUnwrappedAmount', function () {
80
80
  it('should work normally', function () { return __awaiter(void 0, void 0, void 0, function () {
81
81
  var gmAmountIn, ethAmount, usdcAmount;
82
- var _a, _b, _c, _d;
83
- return __generator(this, function (_e) {
84
- switch (_e.label) {
82
+ return __generator(this, function (_a) {
83
+ switch (_a.label) {
85
84
  case 0:
86
85
  gmAmountIn = new bignumber_js_1.default((0, utils_1.parseEther)('100').toString());
87
86
  return [4 /*yield*/, estimator.getUnwrappedAmount(gmEthIsolationModeAddress, gmAmountIn, TestConstants_1.WETH_MARKET.marketId, marketsMap, config)];
88
87
  case 1:
89
- ethAmount = _e.sent();
88
+ ethAmount = _a.sent();
90
89
  return [4 /*yield*/, estimator.getUnwrappedAmount(gmEthIsolationModeAddress, gmAmountIn, TestConstants_1.NATIVE_USDC_MARKET.marketId, marketsMap, config)];
91
90
  case 2:
92
- usdcAmount = _e.sent();
93
- console.log('GM amounts amounts out [ETH]:', ethAmount.amountOut.toString(), (_b = (_a = ethAmount.extraData) === null || _a === void 0 ? void 0 : _a.totalAmountOut) === null || _b === void 0 ? void 0 : _b.toFixed());
94
- console.log('GM amounts amounts out [USDC]:', usdcAmount.amountOut.toString(), (_d = (_c = usdcAmount.extraData) === null || _c === void 0 ? void 0 : _c.totalAmountOut) === null || _d === void 0 ? void 0 : _d.toFixed());
91
+ usdcAmount = _a.sent();
92
+ console.log('GM amounts amounts out [ETH]:', ethAmount.amountOut.toString());
93
+ console.log('GM amounts amounts out [USDC]:', usdcAmount.amountOut.toString());
95
94
  return [2 /*return*/];
96
95
  }
97
96
  });
@@ -1 +1 @@
1
- {"version":3,"file":"GmxV2GmEstimator.test.js","sourceRoot":"","sources":["../../../../__tests__/lib/estimators/GmxV2GmEstimator.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GmxV2GmEstimator.test.js","sourceRoot":"","sources":["../../../../__tests__/lib/estimators/GmxV2GmEstimator.test.ts"],"names":[],"mappings":"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"}
@@ -100,66 +100,6 @@ describe('GmxV2Zap', function () {
100
100
  }); });
101
101
  describe('#getSwapExactTokensForTokensData', function () {
102
102
  describe('GM ARB/BTC/ETH/LINK', function () {
103
- it('should work when unwrapping GM', function () { return __awaiter(void 0, void 0, void 0, function () {
104
- var i, market, amountIn, minAmountOut, outputParams, outputParam0, outputParam1;
105
- return __generator(this, function (_a) {
106
- switch (_a.label) {
107
- case 0:
108
- i = 0;
109
- _a.label = 1;
110
- case 1:
111
- if (!(i < markets.length)) return [3 /*break*/, 4];
112
- market = markets[i];
113
- amountIn = new bignumber_js_1.default((0, utils_1.parseEther)('100').toString());
114
- minAmountOut = new bignumber_js_1.default('50000000');
115
- return [4 /*yield*/, zap.getSwapExactTokensForTokensParams(market, amountIn, TestConstants_1.USDC_MARKET, minAmountOut, txOrigin)];
116
- case 2:
117
- outputParams = _a.sent();
118
- expect(outputParams.length).toBe(zap.validAggregators.length * GM_POOL_ASSETS_LENGTH);
119
- outputParam0 = outputParams[0];
120
- expect(outputParam0.marketIdsPath.length).toEqual(3);
121
- expect(outputParam0.marketIdsPath[0]).toEqual(market.marketId);
122
- expect(outputParam0.marketIdsPath[1]).toEqual(TestConstants_1.NATIVE_USDC_MARKET.marketId);
123
- expect(outputParam0.marketIdsPath[2]).toEqual(TestConstants_1.USDC_MARKET.marketId);
124
- expect(outputParam0.amountWeisPath.length).toEqual(3);
125
- expect(outputParam0.amountWeisPath[0]).toEqual(amountIn);
126
- expect(outputParam0.amountWeisPath[2].isGreaterThan(minAmountOut)).toBeTruthy();
127
- expect(outputParam0.traderParams.length).toEqual(2);
128
- expect(outputParam0.traderParams[0].traderType).toEqual(src_1.GenericTraderType.IsolationModeUnwrapper);
129
- expect(outputParam0.traderParams[0].makerAccountIndex).toEqual(0);
130
- expect(outputParam0.traderParams[0].trader)
131
- .toEqual(market.isolationModeUnwrapperInfo.unwrapperAddress);
132
- expect(outputParam0.traderParams[0].tradeData.length).toEqual(130);
133
- expect(outputParam0.makerAccounts.length).toEqual(0);
134
- expect(outputParam0.expectedAmountOut.gt(outputParam0.amountWeisPath[outputParam0.amountWeisPath.length - 1]))
135
- .toBeTruthy();
136
- expect(outputParam0.originalAmountOutMin).toEqual(minAmountOut);
137
- outputParam1 = outputParams[1];
138
- expect(outputParam1.marketIdsPath.length).toEqual(3);
139
- expect(outputParam1.marketIdsPath[0]).toEqual(market.marketId);
140
- expect(outputParam1.marketIdsPath[1]).toEqual(longMarkets[i].marketId);
141
- expect(outputParam1.marketIdsPath[2]).toEqual(TestConstants_1.USDC_MARKET.marketId);
142
- expect(outputParam1.amountWeisPath.length).toEqual(3);
143
- expect(outputParam1.amountWeisPath[0]).toEqual(amountIn);
144
- expect(outputParam1.amountWeisPath[2].isGreaterThan(minAmountOut)).toBeTruthy();
145
- expect(outputParam1.traderParams.length).toEqual(2);
146
- expect(outputParam1.traderParams[0].traderType).toEqual(src_1.GenericTraderType.IsolationModeUnwrapper);
147
- expect(outputParam1.traderParams[0].makerAccountIndex).toEqual(0);
148
- expect(outputParam1.traderParams[0].trader)
149
- .toEqual(market.isolationModeUnwrapperInfo.unwrapperAddress);
150
- expect(outputParam1.traderParams[0].tradeData.length).toEqual(130);
151
- expect(outputParam1.makerAccounts.length).toEqual(0);
152
- expect(outputParam1.expectedAmountOut.gt(outputParam1.amountWeisPath[outputParam1.amountWeisPath.length - 1]))
153
- .toBeTruthy();
154
- expect(outputParam1.originalAmountOutMin).toEqual(minAmountOut);
155
- _a.label = 3;
156
- case 3:
157
- i += 1;
158
- return [3 /*break*/, 1];
159
- case 4: return [2 /*return*/];
160
- }
161
- });
162
- }); });
163
103
  it('should work when unwrapping GM with aggregator disabled', function () { return __awaiter(void 0, void 0, void 0, function () {
164
104
  var i, market, amountIn, minAmountOut, outputParamsResult0, outputParam0, outputParamsResult1, outputParam1;
165
105
  return __generator(this, function (_a) {
@@ -1 +1 @@
1
- {"version":3,"file":"GmxV2Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/GmxV2Zap.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"GmxV2Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/GmxV2Zap.test.ts"],"names":[],"mappings":"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"}
@@ -75,8 +75,8 @@ describe('PendlePtGlpMar2024Zap', function () {
75
75
  }); });
76
76
  describe('#getSwapExactTokensForTokensData', function () {
77
77
  describe('Pendle PT-GLP', function () {
78
- it('should work when unwrapping PT-GLP', function () { return __awaiter(void 0, void 0, void 0, function () {
79
- var amountIn, minAmountOut, outputParams, outputParam;
78
+ it('should work when unwrapping (matured) PT-GLP', function () { return __awaiter(void 0, void 0, void 0, function () {
79
+ var amountIn, minAmountOut, outputParams;
80
80
  return __generator(this, function (_a) {
81
81
  switch (_a.label) {
82
82
  case 0:
@@ -85,24 +85,7 @@ describe('PendlePtGlpMar2024Zap', function () {
85
85
  return [4 /*yield*/, zap.getSwapExactTokensForTokensParams(TestConstants_1.PT_GLP_MARKET, amountIn, TestConstants_1.USDC_MARKET, minAmountOut, txOrigin)];
86
86
  case 1:
87
87
  outputParams = _a.sent();
88
- expect(outputParams.length).toBe(1);
89
- outputParam = outputParams[0];
90
- expect(outputParam.marketIdsPath.length).toEqual(2);
91
- expect(outputParam.marketIdsPath[0]).toEqual(TestConstants_1.PT_GLP_MARKET.marketId);
92
- expect(outputParam.marketIdsPath[1]).toEqual(TestConstants_1.USDC_MARKET.marketId);
93
- expect(outputParam.amountWeisPath.length).toEqual(2);
94
- expect(outputParam.amountWeisPath[0]).toEqual(amountIn);
95
- expect(outputParam.amountWeisPath[1].isGreaterThan(minAmountOut)).toBeTruthy();
96
- expect(outputParam.traderParams.length).toEqual(1);
97
- expect(outputParam.traderParams[0].traderType).toEqual(src_1.GenericTraderType.IsolationModeUnwrapper);
98
- expect(outputParam.traderParams[0].makerAccountIndex).toEqual(0);
99
- expect(outputParam.traderParams[0].trader)
100
- .toEqual(deployments_json_1.default.PendlePtGLP2024IsolationModeUnwrapperTraderV4[network].address);
101
- expect(outputParam.traderParams[0].tradeData.length).toBeGreaterThan(66);
102
- expect(outputParam.makerAccounts.length).toEqual(0);
103
- expect(outputParam.expectedAmountOut.gt(outputParam.amountWeisPath[outputParam.amountWeisPath.length - 1]))
104
- .toBeTruthy();
105
- expect(outputParam.originalAmountOutMin).toEqual(minAmountOut);
88
+ expect(outputParams.length).toBe(0);
106
89
  return [2 /*return*/];
107
90
  }
108
91
  });
@@ -147,7 +130,7 @@ describe('PendlePtGlpMar2024Zap', function () {
147
130
  });
148
131
  }); });
149
132
  it('should work when wrapping PT-GLP', function () { return __awaiter(void 0, void 0, void 0, function () {
150
- var amountIn, minAmountOut, outputParams, outputParam;
133
+ var amountIn, minAmountOut, outputs;
151
134
  return __generator(this, function (_a) {
152
135
  switch (_a.label) {
153
136
  case 0:
@@ -155,31 +138,14 @@ describe('PendlePtGlpMar2024Zap', function () {
155
138
  minAmountOut = new bignumber_js_1.default('50000000000000000000');
156
139
  return [4 /*yield*/, zap.getSwapExactTokensForTokensParams(TestConstants_1.USDC_MARKET, amountIn, TestConstants_1.PT_GLP_MARKET, minAmountOut, txOrigin)];
157
140
  case 1:
158
- outputParams = _a.sent();
159
- expect(outputParams.length).toBe(1);
160
- outputParam = outputParams[0];
161
- expect(outputParam.marketIdsPath.length).toEqual(2);
162
- expect(outputParam.marketIdsPath[0]).toEqual(TestConstants_1.USDC_MARKET.marketId);
163
- expect(outputParam.marketIdsPath[1]).toEqual(TestConstants_1.PT_GLP_MARKET.marketId);
164
- expect(outputParam.amountWeisPath.length).toEqual(2);
165
- expect(outputParam.amountWeisPath[0]).toEqual(amountIn);
166
- expect(outputParam.amountWeisPath[1].isGreaterThan(minAmountOut)).toBeTruthy();
167
- expect(outputParam.traderParams.length).toEqual(1);
168
- expect(outputParam.traderParams[0].traderType).toEqual(src_1.GenericTraderType.IsolationModeWrapper);
169
- expect(outputParam.traderParams[0].makerAccountIndex).toEqual(0);
170
- expect(outputParam.traderParams[0].trader)
171
- .toEqual(deployments_json_1.default.PendlePtGLP2024IsolationModeWrapperTraderV4[network].address);
172
- expect(outputParam.traderParams[0].tradeData.length).toBeGreaterThan(66);
173
- expect(outputParam.makerAccounts.length).toEqual(0);
174
- expect(outputParam.expectedAmountOut.gt(outputParam.amountWeisPath[outputParam.amountWeisPath.length - 1]))
175
- .toBeTruthy();
176
- expect(outputParam.originalAmountOutMin).toEqual(minAmountOut);
141
+ outputs = _a.sent();
142
+ expect(outputs.length).toEqual(0);
177
143
  return [2 /*return*/];
178
144
  }
179
145
  });
180
146
  }); });
181
147
  it('should work when wrapping PT-GLP with V3', function () { return __awaiter(void 0, void 0, void 0, function () {
182
- var zapWithV3, amountIn, minAmountOut, outputParams, outputParam;
148
+ var zapWithV3, amountIn, minAmountOut, outputs;
183
149
  return __generator(this, function (_a) {
184
150
  switch (_a.label) {
185
151
  case 0:
@@ -194,25 +160,8 @@ describe('PendlePtGlpMar2024Zap', function () {
194
160
  minAmountOut = new bignumber_js_1.default('50000000000000000000');
195
161
  return [4 /*yield*/, zapWithV3.getSwapExactTokensForTokensParams(TestConstants_1.USDC_MARKET, amountIn, TestConstants_1.PT_GLP_MARKET, minAmountOut, txOrigin)];
196
162
  case 1:
197
- outputParams = _a.sent();
198
- expect(outputParams.length).toBe(1);
199
- outputParam = outputParams[0];
200
- expect(outputParam.marketIdsPath.length).toEqual(2);
201
- expect(outputParam.marketIdsPath[0]).toEqual(TestConstants_1.USDC_MARKET.marketId);
202
- expect(outputParam.marketIdsPath[1]).toEqual(TestConstants_1.PT_GLP_MARKET.marketId);
203
- expect(outputParam.amountWeisPath.length).toEqual(2);
204
- expect(outputParam.amountWeisPath[0]).toEqual(amountIn);
205
- expect(outputParam.amountWeisPath[1].isGreaterThan(minAmountOut)).toBeTruthy();
206
- expect(outputParam.traderParams.length).toEqual(1);
207
- expect(outputParam.traderParams[0].traderType).toEqual(src_1.GenericTraderType.IsolationModeWrapper);
208
- expect(outputParam.traderParams[0].makerAccountIndex).toEqual(0);
209
- expect(outputParam.traderParams[0].trader)
210
- .toEqual(deployments_json_1.default.PendlePtGLP2024IsolationModeWrapperTraderV4[network].address);
211
- expect(outputParam.traderParams[0].tradeData.length).toBeGreaterThan(66);
212
- expect(outputParam.makerAccounts.length).toEqual(0);
213
- expect(outputParam.expectedAmountOut.gt(outputParam.amountWeisPath[outputParam.amountWeisPath.length - 1]))
214
- .toBeTruthy();
215
- expect(outputParam.originalAmountOutMin).toEqual(minAmountOut);
163
+ outputs = _a.sent();
164
+ expect(outputs.length).toEqual(0);
216
165
  return [2 /*return*/];
217
166
  }
218
167
  });
@@ -1 +1 @@
1
- {"version":3,"file":"PendlePtGlpMar2024Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/PendlePtGlpMar2024Zap.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PendlePtGlpMar2024Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/PendlePtGlpMar2024Zap.test.ts"],"names":[],"mappings":"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"}
@@ -60,6 +60,7 @@ describe('PendlePtWeEthApr2024Zap', function () {
60
60
  subgraphUrl: subgraphUrl,
61
61
  web3Provider: web3Provider,
62
62
  cacheSeconds: NO_CACHE,
63
+ usePendleV3: true,
63
64
  });
64
65
  zap.setMarketsToAdd([TestConstants_1.PT_WE_ETH_APR_2024_MARKET, TestConstants_1.WE_ETH_MARKET]);
65
66
  beforeEach(function () { return __awaiter(void 0, void 0, void 0, function () {
@@ -1 +1 @@
1
- {"version":3,"file":"PendlePtWeEthApr2024Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/PendlePtWeEthApr2024Zap.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"PendlePtWeEthApr2024Zap.test.js","sourceRoot":"","sources":["../../../__tests__/specific-zaps/PendlePtWeEthApr2024Zap.test.ts"],"names":[],"mappings":"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"}
@@ -201,7 +201,7 @@ var DolomiteZap = /** @class */ (function () {
201
201
  DolomiteZap.prototype.getSwapExactTokensForTokensParams = function (tokenIn, amountIn, tokenOut, amountOutMin, txOrigin, config) {
202
202
  var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
203
203
  return __awaiter(this, void 0, void 0, function () {
204
- var actualConfig, marketsMap, marketHelpersMap, inputMarket, inputHelper, outputMarket, outputHelper, marketIdsPaths, amountsPaths, traderParamsArrays, executionFees, totalAmountOuts, effectiveInputMarketIds, effectiveOutputMarketIds, isIsolationModeUnwrapper, unwrapperInfo, unwrapperHelper, estimateResults, isIsolationModeWrapper, wrapperInfo, wrapperHelper, i, effectiveInputMarketId, _loop_1, this_1, j, tokensPaths, expectedAmountOut, minAmountOut, result, zaps;
204
+ var actualConfig, marketsMap, marketHelpersMap, inputMarket, inputHelper, outputMarket, outputHelper, marketIdsPaths, amountsPaths, traderParamsArrays, executionFees, effectiveInputMarketIds, effectiveOutputMarketIds, isIsolationModeUnwrapper, unwrapperInfo, unwrapperHelper, estimateResults, isIsolationModeWrapper, wrapperInfo, wrapperHelper, i, effectiveInputMarketId, _loop_1, this_1, j, tokensPaths, expectedAmountOut, minAmountOut, result, zaps;
205
205
  var _l;
206
206
  var _this = this;
207
207
  return __generator(this, function (_m) {
@@ -249,7 +249,6 @@ var DolomiteZap = /** @class */ (function () {
249
249
  amountsPaths = [];
250
250
  traderParamsArrays = [];
251
251
  executionFees = [];
252
- totalAmountOuts = [];
253
252
  effectiveInputMarketIds = [inputMarket.marketId];
254
253
  effectiveOutputMarketIds = [outputMarket.marketId];
255
254
  isIsolationModeUnwrapper = inputMarket.isolationModeUnwrapperInfo;
@@ -275,7 +274,7 @@ var DolomiteZap = /** @class */ (function () {
275
274
  case 3:
276
275
  estimateResults = _m.sent();
277
276
  estimateResults.forEach(function (_a, i) {
278
- var _b, _c, _d;
277
+ var _b, _c;
279
278
  var amountOut = _a.amountOut, tradeData = _a.tradeData, extraData = _a.extraData;
280
279
  marketIdsPaths[i] = marketIdsPaths[i].concat(effectiveInputMarketIds[i]);
281
280
  amountsPaths[i] = amountsPaths[i].concat(amountOut);
@@ -293,7 +292,6 @@ var DolomiteZap = /** @class */ (function () {
293
292
  },
294
293
  ];
295
294
  executionFees[i] = (_c = extraData === null || extraData === void 0 ? void 0 : extraData.executionFee) !== null && _c !== void 0 ? _c : Constants_1.INTEGERS.ZERO;
296
- totalAmountOuts[i] = (_d = extraData === null || extraData === void 0 ? void 0 : extraData.totalAmountOut) !== null && _d !== void 0 ? _d : Constants_1.INTEGERS.ZERO;
297
295
  });
298
296
  return [3 /*break*/, 5];
299
297
  case 4:
@@ -301,7 +299,6 @@ var DolomiteZap = /** @class */ (function () {
301
299
  amountsPaths[0] = [amountIn];
302
300
  traderParamsArrays[0] = [];
303
301
  executionFees[0] = Constants_1.INTEGERS.ZERO;
304
- totalAmountOuts[0] = Constants_1.INTEGERS.ZERO;
305
302
  _m.label = 5;
306
303
  case 5:
307
304
  isIsolationModeWrapper = outputMarket.isolationModeWrapperInfo;
@@ -312,21 +309,16 @@ var DolomiteZap = /** @class */ (function () {
312
309
  effectiveOutputMarketIds = wrapperInfo.inputMarketIds;
313
310
  _l = __read(effectiveOutputMarketIds.reduce(function (acc, outputMarketId) {
314
311
  marketIdsPaths.forEach(function (path, i) {
315
- var _a, _b, _c, _d;
312
+ var _a;
316
313
  if (!outputMarketId.eq(path[path.length - 1])) {
317
- acc[0].push(path.concat(outputMarketId));
318
- acc[1].push(__spreadArray([], __read(amountsPaths[i]), false));
319
- acc[2].push(__spreadArray([], __read(traderParamsArrays[i]), false));
320
- (_a = acc[3]).push.apply(_a, __spreadArray([], __read(executionFees), false));
321
- (_b = acc[4]).push.apply(_b, __spreadArray([], __read(totalAmountOuts), false));
314
+ acc[0].push(__spreadArray(__spreadArray([], __read(path), false), [outputMarketId], false));
322
315
  }
323
316
  else {
324
- acc[0].push(path);
325
- acc[1].push(__spreadArray([], __read(amountsPaths[i]), false));
326
- acc[2].push(__spreadArray([], __read(traderParamsArrays[i]), false));
327
- (_c = acc[3]).push.apply(_c, __spreadArray([], __read(executionFees), false));
328
- (_d = acc[4]).push.apply(_d, __spreadArray([], __read(totalAmountOuts), false));
317
+ acc[0].push(__spreadArray([], __read(path), false));
329
318
  }
319
+ acc[1].push(__spreadArray([], __read(amountsPaths[i]), false));
320
+ acc[2].push(__spreadArray([], __read(traderParamsArrays[i]), false));
321
+ (_a = acc[3]).push.apply(_a, __spreadArray([], __read(executionFees), false));
330
322
  });
331
323
  return acc;
332
324
  }, [
@@ -334,8 +326,7 @@ var DolomiteZap = /** @class */ (function () {
334
326
  [],
335
327
  [],
336
328
  [],
337
- [],
338
- ]), 5), marketIdsPaths = _l[0], amountsPaths = _l[1], traderParamsArrays = _l[2], executionFees = _l[3], totalAmountOuts = _l[4];
329
+ ]), 4), marketIdsPaths = _l[0], amountsPaths = _l[1], traderParamsArrays = _l[2], executionFees = _l[3];
339
330
  }
340
331
  if (effectiveInputMarketIds.length !== marketIdsPaths.length
341
332
  && effectiveOutputMarketIds.length !== marketIdsPaths.length) {
@@ -352,13 +343,13 @@ var DolomiteZap = /** @class */ (function () {
352
343
  if (!(i < effectiveInputMarketIds.length)) return [3 /*break*/, 11];
353
344
  effectiveInputMarketId = effectiveInputMarketIds[i];
354
345
  _loop_1 = function (j) {
355
- var c, effectiveOutputMarketId, effectiveInputMarket_1, effectiveOutputMarket_1, aggregatorOutputOrUndefinedList;
346
+ var effectiveOutputMarketId, c_1, effectiveInputMarket_1, effectiveOutputMarket_1, aggregatorOutputOrUndefinedList;
356
347
  return __generator(this, function (_o) {
357
348
  switch (_o.label) {
358
349
  case 0:
359
- c = i * effectiveOutputMarketIds.length + j;
360
350
  effectiveOutputMarketId = effectiveOutputMarketIds[j];
361
351
  if (!!effectiveInputMarketId.eq(effectiveOutputMarketId)) return [3 /*break*/, 2];
352
+ c_1 = i * effectiveOutputMarketIds.length + j;
362
353
  effectiveInputMarket_1 = marketsMap[effectiveInputMarketId.toFixed()];
363
354
  effectiveOutputMarket_1 = marketsMap[effectiveOutputMarketId.toFixed()];
364
355
  return [4 /*yield*/, Promise.all(this_1.validAggregators.map(function (aggregator) { return __awaiter(_this, void 0, void 0, function () {
@@ -372,7 +363,7 @@ var DolomiteZap = /** @class */ (function () {
372
363
  _a.label = 1;
373
364
  case 1:
374
365
  _a.trys.push([1, 3, , 4]);
375
- return [4 /*yield*/, aggregator.getSwapExactTokensForTokensData(effectiveInputMarket_1, amountsPaths[c][amountsPaths[c].length - 1], effectiveOutputMarket_1, Constants_1.INTEGERS.ONE, txOrigin, actualConfig)];
366
+ return [4 /*yield*/, aggregator.getSwapExactTokensForTokensData(effectiveInputMarket_1, amountsPaths[c_1][amountsPaths[c_1].length - 1], effectiveOutputMarket_1, Constants_1.INTEGERS.ONE, txOrigin, actualConfig)];
376
367
  case 2: return [2 /*return*/, _a.sent()];
377
368
  case 3:
378
369
  e_1 = _a.sent();
@@ -387,8 +378,8 @@ var DolomiteZap = /** @class */ (function () {
387
378
  aggregatorOutputOrUndefinedList.forEach(function (aggregatorOutput, aggregatorIndex) {
388
379
  var _a, _b, _c, _d, _e, _f, _g, _h;
389
380
  if (aggregatorIndex === 0) {
390
- amountsPaths[c] = amountsPaths[c].concat((_a = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.expectedAmountOut) !== null && _a !== void 0 ? _a : INVALID_ESTIMATION.amountOut);
391
- traderParamsArrays[c] = traderParamsArrays[c].concat({
381
+ amountsPaths[c_1] = amountsPaths[c_1].concat((_a = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.expectedAmountOut) !== null && _a !== void 0 ? _a : INVALID_ESTIMATION.amountOut);
382
+ traderParamsArrays[c_1] = traderParamsArrays[c_1].concat({
392
383
  traderType: ApiTypes_1.GenericTraderType.ExternalLiquidity,
393
384
  makerAccountIndex: 0,
394
385
  trader: (_b = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.traderAddress) !== null && _b !== void 0 ? _b : Constants_1.ADDRESS_ZERO,
@@ -397,17 +388,17 @@ var DolomiteZap = /** @class */ (function () {
397
388
  });
398
389
  }
399
390
  else {
400
- marketIdsPaths.push(__spreadArray([], __read(marketIdsPaths[c]), false));
401
- amountsPaths.push(__spreadArray([], __read(amountsPaths[c]), false).concat((_e = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.expectedAmountOut) !== null && _e !== void 0 ? _e : INVALID_ESTIMATION.amountOut));
402
- traderParamsArrays.push(__spreadArray([], __read(traderParamsArrays[c]), false).concat({
391
+ marketIdsPaths.push(__spreadArray([], __read(marketIdsPaths[c_1]), false));
392
+ amountsPaths.push(amountsPaths[c_1].slice(0, -1)
393
+ .concat((_e = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.expectedAmountOut) !== null && _e !== void 0 ? _e : INVALID_ESTIMATION.amountOut));
394
+ traderParamsArrays.push(traderParamsArrays[c_1].slice(0, -1).concat({
403
395
  traderType: ApiTypes_1.GenericTraderType.ExternalLiquidity,
404
396
  makerAccountIndex: 0,
405
397
  trader: (_f = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.traderAddress) !== null && _f !== void 0 ? _f : Constants_1.ADDRESS_ZERO,
406
398
  tradeData: (_g = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.tradeData) !== null && _g !== void 0 ? _g : Constants_1.BYTES_EMPTY,
407
399
  readableName: (_h = aggregatorOutput === null || aggregatorOutput === void 0 ? void 0 : aggregatorOutput.readableName) !== null && _h !== void 0 ? _h : Constants_1.INVALID_NAME,
408
400
  }));
409
- executionFees.push(executionFees[c]);
410
- totalAmountOuts.push(totalAmountOuts[c]);
401
+ executionFees.push(executionFees[c_1]);
411
402
  }
412
403
  });
413
404
  _o.label = 2;
@@ -435,9 +426,9 @@ var DolomiteZap = /** @class */ (function () {
435
426
  // Append the amounts and trader params for the wrapper
436
427
  return [4 /*yield*/, Promise.all(marketIdsPaths.map(function (marketIdsPath, i) { return __awaiter(_this, void 0, void 0, function () {
437
428
  var amountsPath, outputEstimate;
438
- var _a, _b, _c, _d, _e, _f;
439
- return __generator(this, function (_g) {
440
- switch (_g.label) {
429
+ var _a, _b;
430
+ return __generator(this, function (_c) {
431
+ switch (_c.label) {
441
432
  case 0:
442
433
  amountsPath = amountsPaths[i];
443
434
  if (!amountsPath.some(function (a) { return a.eq(INVALID_ESTIMATION.amountOut); })) return [3 /*break*/, 1];
@@ -451,8 +442,8 @@ var DolomiteZap = /** @class */ (function () {
451
442
  return INVALID_ESTIMATION;
452
443
  })];
453
444
  case 2:
454
- outputEstimate = _g.sent();
455
- _g.label = 3;
445
+ outputEstimate = _c.sent();
446
+ _c.label = 3;
456
447
  case 3:
457
448
  marketIdsPath.push(outputMarket.marketId);
458
449
  amountsPath.push(outputEstimate.amountOut);
@@ -468,10 +459,6 @@ var DolomiteZap = /** @class */ (function () {
468
459
  : wrapperInfo.readableName,
469
460
  });
470
461
  executionFees[i] = executionFees[i].plus((_b = (_a = outputEstimate.extraData) === null || _a === void 0 ? void 0 : _a.executionFee) !== null && _b !== void 0 ? _b : Constants_1.INTEGERS.ZERO);
471
- if (totalAmountOuts[i].gt(Constants_1.INTEGERS.ZERO) && ((_d = (_c = outputEstimate.extraData) === null || _c === void 0 ? void 0 : _c.totalAmountOut) === null || _d === void 0 ? void 0 : _d.gt(Constants_1.INTEGERS.ZERO))) {
472
- throw new Error("Invalid total amounts out here, found ".concat(totalAmountOuts[i].toFixed()));
473
- }
474
- totalAmountOuts[i] = (_f = (_e = outputEstimate.extraData) === null || _e === void 0 ? void 0 : _e.totalAmountOut) !== null && _f !== void 0 ? _f : Constants_1.INTEGERS.ZERO;
475
462
  return [2 /*return*/];
476
463
  }
477
464
  });
@@ -497,10 +484,8 @@ var DolomiteZap = /** @class */ (function () {
497
484
  decimals: marketsMap[marketId.toFixed()].decimals,
498
485
  }); });
499
486
  });
500
- expectedAmountOut = totalAmountOuts.reduce(function (max, current, i) {
501
- if (current.eq(Constants_1.INTEGERS.ZERO)) {
502
- current = amountsPaths[i][amountsPaths[i].length - 1];
503
- }
487
+ expectedAmountOut = amountsPaths.reduce(function (max, amountsPath) {
488
+ var current = amountsPath[amountsPath.length - 1];
504
489
  if (current.gt(max)) {
505
490
  return current;
506
491
  }
@@ -510,13 +495,14 @@ var DolomiteZap = /** @class */ (function () {
510
495
  .multipliedBy(1 - actualConfig.slippageTolerance)
511
496
  .integerValue(bignumber_js_1.default.ROUND_DOWN);
512
497
  result = marketIdsPaths.map(function (_, i) {
498
+ var expectedAmountOutBeforeOverwrite = amountsPaths[i][amountsPaths[i].length - 1];
513
499
  if (!amountsPaths[i].some(function (amount) { return amount.eq(INVALID_ESTIMATION.amountOut); })) {
514
500
  amountsPaths[i][amountsPaths[i].length - 1] = minAmountOut;
515
501
  }
516
502
  return {
517
503
  marketIdsPath: marketIdsPaths[i],
518
504
  tokensPath: tokensPaths[i],
519
- expectedAmountOut: expectedAmountOut,
505
+ expectedAmountOut: expectedAmountOutBeforeOverwrite,
520
506
  amountWeisPath: amountsPaths[i],
521
507
  traderParams: traderParamsArrays[i],
522
508
  makerAccounts: [],
@@ -524,7 +510,9 @@ var DolomiteZap = /** @class */ (function () {
524
510
  executionFee: executionFees[i].gt(Constants_1.INTEGERS.ZERO) ? executionFees[i] : undefined,
525
511
  };
526
512
  });
527
- zaps = result.filter(function (p) { return !(0, Utils_1.zapOutputParamIsInvalid)(p); });
513
+ zaps = result
514
+ .filter(function (p) { return !(0, Utils_1.zapOutputParamIsInvalid)(p); })
515
+ .sort(function (a, b) { return (a.expectedAmountOut.gt(b.expectedAmountOut) ? -1 : 1); });
528
516
  if (actualConfig.filterOutZapsWithInsufficientOutput) {
529
517
  return [2 /*return*/, zaps.filter(function (zap) { return zap.expectedAmountOut.gte(amountOutMin); })];
530
518
  }