@dolomite-exchange/zap-sdk 0.0.10 → 0.0.12
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 +5 -5
- package/dist/DolomiteZap.js +23 -18
- package/dist/DolomiteZap.js.map +1 -1
- package/dist/clients/DolomiteClient.js +12 -8
- package/dist/clients/DolomiteClient.js.map +1 -1
- package/dist/clients/IsolationModeClient.d.ts +4 -0
- package/dist/clients/IsolationModeClient.js +14 -0
- package/dist/clients/IsolationModeClient.js.map +1 -1
- package/dist/clients/ParaswapAggregator.d.ts +2 -1
- package/dist/clients/ParaswapAggregator.js +7 -2
- package/dist/clients/ParaswapAggregator.js.map +1 -1
- package/dist/lib/ApiTypes.d.ts +14 -7
- package/dist/lib/ApiTypes.js.map +1 -1
- package/dist/lib/Constants.d.ts +2 -0
- package/dist/lib/Constants.js +15 -2
- package/dist/lib/Constants.js.map +1 -1
- package/package.json +1 -1
package/dist/DolomiteZap.d.ts
CHANGED
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { ethers } from 'ethers';
|
|
2
|
-
import { Address, ApiMarket, ApiToken, BlockTag, Integer, MarketId, Network, ZapConfig, ZapOutputParam } from './lib/ApiTypes';
|
|
2
|
+
import { Address, ApiMarket, ApiToken, BlockTag, Integer, MarketId, MinimalApiToken, Network, ZapConfig, ZapOutputParam } from './lib/ApiTypes';
|
|
3
3
|
import { ApiMarketConverter } from './lib/Constants';
|
|
4
4
|
export declare class DolomiteZap {
|
|
5
5
|
readonly network: Network;
|
|
6
6
|
readonly subgraphUrl: string;
|
|
7
7
|
readonly web3Provider: ethers.providers.Provider;
|
|
8
8
|
private _defaultSlippageTollerance;
|
|
9
|
-
private _defaultBlockTag;
|
|
10
9
|
private client;
|
|
11
10
|
private paraswapAggregator;
|
|
12
11
|
private marketsCache;
|
|
13
12
|
private marketHelpersCache;
|
|
14
13
|
private validAggregators;
|
|
15
|
-
constructor(network: Network, subgraphUrl: string, web3Provider: ethers.providers.Provider, cacheSeconds?: number, defaultSlippageTolerance?: number, defaultBlockTag?: BlockTag);
|
|
14
|
+
constructor(network: Network, subgraphUrl: string, web3Provider: ethers.providers.Provider, cacheSeconds?: number, defaultSlippageTolerance?: number, defaultBlockTag?: BlockTag, partnerAddress?: Address | undefined);
|
|
15
|
+
private _defaultBlockTag;
|
|
16
|
+
get defaultBlockTag(): BlockTag;
|
|
16
17
|
get defaultSlippageTolerance(): number;
|
|
17
18
|
setDefaultSlippageTolerance(slippageTolerance: number): void;
|
|
18
|
-
get defaultBlockTag(): BlockTag;
|
|
19
19
|
setDefaultBlockTag(blockTag: BlockTag): void;
|
|
20
20
|
setMarketsToAdd(marketsToAdd: ApiMarket[]): void;
|
|
21
21
|
getIsolationModeConverterByMarketId(marketId: MarketId): ApiMarketConverter | undefined;
|
|
@@ -31,7 +31,7 @@ export declare class DolomiteZap {
|
|
|
31
31
|
* @return {Promise<ZapOutputParam[]>} A list of outputs that can be used to execute the trade. The outputs are
|
|
32
32
|
* sorted by execution, with the best ones being first.
|
|
33
33
|
*/
|
|
34
|
-
getSwapExactTokensForTokensParams(tokenIn: ApiToken, amountIn: Integer, tokenOut: ApiToken, amountOutMin: Integer, txOrigin: Address, config?: ZapConfig): Promise<ZapOutputParam[]>;
|
|
34
|
+
getSwapExactTokensForTokensParams(tokenIn: ApiToken | MinimalApiToken, amountIn: Integer, tokenOut: ApiToken | MinimalApiToken, amountOutMin: Integer, txOrigin: Address, config?: ZapConfig): Promise<ZapOutputParam[]>;
|
|
35
35
|
private getMarketsMap;
|
|
36
36
|
private getMarketHelpersMap;
|
|
37
37
|
}
|
package/dist/DolomiteZap.js
CHANGED
|
@@ -49,38 +49,39 @@ 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
|
-
function DolomiteZap(network, subgraphUrl, web3Provider, cacheSeconds, defaultSlippageTolerance, defaultBlockTag) {
|
|
52
|
+
function DolomiteZap(network, subgraphUrl, web3Provider, cacheSeconds, defaultSlippageTolerance, defaultBlockTag, partnerAddress) {
|
|
53
53
|
if (cacheSeconds === void 0) { cacheSeconds = ONE_HOUR; }
|
|
54
54
|
if (defaultSlippageTolerance === void 0) { defaultSlippageTolerance = THIRTY_BASIS_POINTS; }
|
|
55
55
|
if (defaultBlockTag === void 0) { defaultBlockTag = 'latest'; }
|
|
56
|
+
if (partnerAddress === void 0) { partnerAddress = undefined; }
|
|
56
57
|
this.network = network;
|
|
57
58
|
this.subgraphUrl = subgraphUrl;
|
|
58
59
|
this.web3Provider = web3Provider;
|
|
59
60
|
this._defaultSlippageTollerance = defaultSlippageTolerance;
|
|
60
61
|
this._defaultBlockTag = defaultBlockTag;
|
|
61
62
|
this.client = new DolomiteClient_1.default(subgraphUrl, network, web3Provider);
|
|
62
|
-
this.paraswapAggregator = new ParaswapAggregator_1.default(network);
|
|
63
|
+
this.paraswapAggregator = new ParaswapAggregator_1.default(network, partnerAddress);
|
|
63
64
|
this.marketsCache = new LocalCache_1.LocalCache(cacheSeconds);
|
|
64
65
|
this.marketHelpersCache = new LocalCache_1.LocalCache(cacheSeconds);
|
|
65
66
|
this.validAggregators = [this.paraswapAggregator].filter(function (aggregator) { return aggregator.isValidForNetwork(); });
|
|
66
67
|
}
|
|
67
|
-
Object.defineProperty(DolomiteZap.prototype, "
|
|
68
|
+
Object.defineProperty(DolomiteZap.prototype, "defaultBlockTag", {
|
|
68
69
|
get: function () {
|
|
69
|
-
return this.
|
|
70
|
+
return this._defaultBlockTag;
|
|
70
71
|
},
|
|
71
72
|
enumerable: false,
|
|
72
73
|
configurable: true
|
|
73
74
|
});
|
|
74
|
-
DolomiteZap.prototype
|
|
75
|
-
this._defaultSlippageTollerance = slippageTolerance;
|
|
76
|
-
};
|
|
77
|
-
Object.defineProperty(DolomiteZap.prototype, "defaultBlockTag", {
|
|
75
|
+
Object.defineProperty(DolomiteZap.prototype, "defaultSlippageTolerance", {
|
|
78
76
|
get: function () {
|
|
79
|
-
return this.
|
|
77
|
+
return this._defaultSlippageTollerance;
|
|
80
78
|
},
|
|
81
79
|
enumerable: false,
|
|
82
80
|
configurable: true
|
|
83
81
|
});
|
|
82
|
+
DolomiteZap.prototype.setDefaultSlippageTolerance = function (slippageTolerance) {
|
|
83
|
+
this._defaultSlippageTollerance = slippageTolerance;
|
|
84
|
+
};
|
|
84
85
|
DolomiteZap.prototype.setDefaultBlockTag = function (blockTag) {
|
|
85
86
|
this._defaultBlockTag = blockTag;
|
|
86
87
|
};
|
|
@@ -160,6 +161,7 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
160
161
|
makerAccountIndex: 0,
|
|
161
162
|
trader: unwrapperInfo.unwrapperAddress,
|
|
162
163
|
tradeData: tradeData_1,
|
|
164
|
+
readableName: unwrapperInfo.readableName,
|
|
163
165
|
});
|
|
164
166
|
});
|
|
165
167
|
_f.label = 4;
|
|
@@ -196,13 +198,14 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
196
198
|
makerAccountIndex: 0,
|
|
197
199
|
trader: aggregatorOutputs_1[i].traderAddress,
|
|
198
200
|
tradeData: aggregatorOutputs_1[i].tradeData,
|
|
201
|
+
readableName: aggregatorOutputs_1[i].readableName,
|
|
199
202
|
});
|
|
200
203
|
});
|
|
201
204
|
_f.label = 6;
|
|
202
205
|
case 6:
|
|
203
206
|
if (!(wrapperInfo && wrapperHelper)) return [3 /*break*/, 8];
|
|
204
207
|
return [4 /*yield*/, Promise.all(amountsPaths.map(function (amountsPath) { return __awaiter(_this, void 0, void 0, function () {
|
|
205
|
-
var amountInForEstimation, outputEstimate;
|
|
208
|
+
var amountInForEstimation, outputEstimate, traderParam;
|
|
206
209
|
return __generator(this, function (_a) {
|
|
207
210
|
switch (_a.label) {
|
|
208
211
|
case 0:
|
|
@@ -210,16 +213,18 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
210
213
|
return [4 /*yield*/, wrapperHelper.estimateOutputFunction(amountInForEstimation, wrapperInfo.inputMarketId, config)];
|
|
211
214
|
case 1:
|
|
212
215
|
outputEstimate = _a.sent();
|
|
216
|
+
traderParam = {
|
|
217
|
+
traderType: isIsolationModeWrapper
|
|
218
|
+
? ApiTypes_1.GenericTraderType.IsolationModeWrapper
|
|
219
|
+
: ApiTypes_1.GenericTraderType.ExternalLiquidity,
|
|
220
|
+
makerAccountIndex: 0,
|
|
221
|
+
trader: wrapperInfo.wrapperAddress,
|
|
222
|
+
tradeData: outputEstimate.tradeData,
|
|
223
|
+
readableName: wrapperInfo.readableName,
|
|
224
|
+
};
|
|
213
225
|
return [2 /*return*/, {
|
|
214
226
|
amountOut: outputEstimate.amountOut,
|
|
215
|
-
traderParam:
|
|
216
|
-
traderType: isIsolationModeWrapper
|
|
217
|
-
? ApiTypes_1.GenericTraderType.IsolationModeWrapper
|
|
218
|
-
: ApiTypes_1.GenericTraderType.ExternalLiquidity,
|
|
219
|
-
makerAccountIndex: 0,
|
|
220
|
-
trader: wrapperInfo.wrapperAddress,
|
|
221
|
-
tradeData: outputEstimate.tradeData,
|
|
222
|
-
},
|
|
227
|
+
traderParam: traderParam,
|
|
223
228
|
}];
|
|
224
229
|
}
|
|
225
230
|
});
|
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,
|
|
1
|
+
{"version":3,"file":"DolomiteZap.js","sourceRoot":"","sources":["../src/DolomiteZap.ts"],"names":[],"mappings":"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"}
|
|
@@ -172,7 +172,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
172
172
|
if (blockTag === void 0) { blockTag = 'latest'; }
|
|
173
173
|
if (pageIndex === void 0) { pageIndex = 0; }
|
|
174
174
|
return __awaiter(this, void 0, void 0, function () {
|
|
175
|
-
var query, result,
|
|
175
|
+
var query, result, marketPromises;
|
|
176
176
|
var _this = this;
|
|
177
177
|
return __generator(this, function (_a) {
|
|
178
178
|
switch (_a.label) {
|
|
@@ -199,8 +199,8 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
199
199
|
// noinspection JSPotentiallyInvalidTargetOfIndexedPropertyAccess
|
|
200
200
|
return [2 /*return*/, Promise.reject(result.errors[0])];
|
|
201
201
|
}
|
|
202
|
-
|
|
203
|
-
var isolationModeClient, isolationModeUnwrapperInfo, isolationModeWrapperInfo, unwrapperAddress, outputMarketId, wrapperAddress, inputMarketId, liquidityTokenUnwrapperInfo, liquidityTokenWrapperInfo, apiMarket;
|
|
202
|
+
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;
|
|
204
204
|
return __generator(this, function (_a) {
|
|
205
205
|
isolationModeClient = new IsolationModeClient_1.default(this.network);
|
|
206
206
|
if (isolationModeClient.isIsolationModeToken(market.token)) {
|
|
@@ -208,31 +208,35 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
208
208
|
outputMarketId = isolationModeClient.getIsolationModeUnwrapperMarketIdByMarketId(market.token);
|
|
209
209
|
wrapperAddress = isolationModeClient.getIsolationModeWrapperByMarketId(market.token);
|
|
210
210
|
inputMarketId = isolationModeClient.getIsolationModeWrapperMarketIdByMarketId(market.token);
|
|
211
|
-
|
|
211
|
+
unwrapperReadableName = isolationModeClient.getIsolationModeUnwrapperReadableNameByMarketId(market.token);
|
|
212
|
+
wrapperReadableName = isolationModeClient.getIsolationModeWrapperReadableNameByMarketId(market.token);
|
|
213
|
+
if (!unwrapperAddress || typeof outputMarketId === 'undefined' || !unwrapperReadableName) {
|
|
212
214
|
Logger_1.default.warn({
|
|
213
215
|
message: 'Isolation Mode token cannot find unwrapper info!',
|
|
214
216
|
marketId: market.token.marketId,
|
|
215
217
|
});
|
|
216
218
|
return [2 /*return*/, undefined];
|
|
217
219
|
}
|
|
218
|
-
else if (!wrapperAddress || typeof inputMarketId === 'undefined') {
|
|
220
|
+
else if (!wrapperAddress || typeof inputMarketId === 'undefined' || !wrapperReadableName) {
|
|
219
221
|
Logger_1.default.warn({
|
|
220
222
|
message: 'Isolation Mode token cannot find wrapper info!',
|
|
221
223
|
marketId: market.token.marketId,
|
|
222
224
|
});
|
|
223
225
|
return [2 /*return*/, undefined];
|
|
224
226
|
}
|
|
225
|
-
isolationModeUnwrapperInfo = { unwrapperAddress: unwrapperAddress, outputMarketId: outputMarketId };
|
|
226
|
-
isolationModeWrapperInfo = { wrapperAddress: wrapperAddress, inputMarketId: inputMarketId };
|
|
227
|
+
isolationModeUnwrapperInfo = { unwrapperAddress: unwrapperAddress, outputMarketId: outputMarketId, readableName: unwrapperReadableName };
|
|
228
|
+
isolationModeWrapperInfo = { wrapperAddress: wrapperAddress, inputMarketId: inputMarketId, readableName: wrapperReadableName };
|
|
227
229
|
}
|
|
228
230
|
if (isolationModeClient.isLiquidityToken(market.token)) {
|
|
229
231
|
liquidityTokenUnwrapperInfo = {
|
|
230
232
|
unwrapperAddress: isolationModeClient.getLiquidityTokenUnwrapperByToken(market.token),
|
|
231
233
|
outputMarketId: isolationModeClient.getLiquidityTokenUnwrapperMarketIdByToken(market.token),
|
|
234
|
+
readableName: isolationModeClient.getLiquidityTokenUnwrapperReadableNameByToken(market.token),
|
|
232
235
|
};
|
|
233
236
|
liquidityTokenWrapperInfo = {
|
|
234
237
|
wrapperAddress: isolationModeClient.getLiquidityTokenWrapperByToken(market.token),
|
|
235
238
|
inputMarketId: isolationModeClient.getLiquidityTokenWrapperMarketIdByToken(market.token),
|
|
239
|
+
readableName: isolationModeClient.getLiquidityTokenWrapperReadableNameByToken(market.token),
|
|
236
240
|
};
|
|
237
241
|
}
|
|
238
242
|
apiMarket = {
|
|
@@ -249,7 +253,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
249
253
|
return [2 /*return*/, apiMarket];
|
|
250
254
|
});
|
|
251
255
|
}); });
|
|
252
|
-
return [4 /*yield*/, Promise.all(
|
|
256
|
+
return [4 /*yield*/, Promise.all(marketPromises)];
|
|
253
257
|
case 2: return [2 /*return*/, (_a.sent()).filter(function (market) { return !!market; })];
|
|
254
258
|
}
|
|
255
259
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -8,9 +8,13 @@ export default class IsolationModeClient {
|
|
|
8
8
|
getIsolationModeWrapperMarketIdByMarketId(token: GraphqlToken): number | undefined;
|
|
9
9
|
getIsolationModeUnwrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
10
10
|
getIsolationModeWrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
11
|
+
getIsolationModeUnwrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
12
|
+
getIsolationModeWrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
11
13
|
isLiquidityToken(token: GraphqlToken): boolean;
|
|
12
14
|
getLiquidityTokenUnwrapperMarketIdByToken(token: GraphqlToken): number;
|
|
13
15
|
getLiquidityTokenWrapperMarketIdByToken(token: GraphqlToken): number;
|
|
14
16
|
getLiquidityTokenUnwrapperByToken(token: GraphqlToken): string;
|
|
15
17
|
getLiquidityTokenWrapperByToken(token: GraphqlToken): string;
|
|
18
|
+
getLiquidityTokenUnwrapperReadableNameByToken(token: GraphqlToken): string;
|
|
19
|
+
getLiquidityTokenWrapperReadableNameByToken(token: GraphqlToken): string;
|
|
16
20
|
}
|
|
@@ -25,6 +25,14 @@ var IsolationModeClient = /** @class */ (function () {
|
|
|
25
25
|
var _a;
|
|
26
26
|
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.wrapper;
|
|
27
27
|
};
|
|
28
|
+
IsolationModeClient.prototype.getIsolationModeUnwrapperReadableNameByMarketId = function (token) {
|
|
29
|
+
var _a;
|
|
30
|
+
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.unwrapperReadableName;
|
|
31
|
+
};
|
|
32
|
+
IsolationModeClient.prototype.getIsolationModeWrapperReadableNameByMarketId = function (token) {
|
|
33
|
+
var _a;
|
|
34
|
+
return (_a = Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][token.marketId]) === null || _a === void 0 ? void 0 : _a.wrapperReadableName;
|
|
35
|
+
};
|
|
28
36
|
// ==================== Liquidity Token Getters ====================
|
|
29
37
|
IsolationModeClient.prototype.isLiquidityToken = function (token) {
|
|
30
38
|
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][token.marketId] !== undefined;
|
|
@@ -41,6 +49,12 @@ var IsolationModeClient = /** @class */ (function () {
|
|
|
41
49
|
IsolationModeClient.prototype.getLiquidityTokenWrapperByToken = function (token) {
|
|
42
50
|
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][token.marketId].wrapper;
|
|
43
51
|
};
|
|
52
|
+
IsolationModeClient.prototype.getLiquidityTokenUnwrapperReadableNameByToken = function (token) {
|
|
53
|
+
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][token.marketId].unwrapperReadableName;
|
|
54
|
+
};
|
|
55
|
+
IsolationModeClient.prototype.getLiquidityTokenWrapperReadableNameByToken = function (token) {
|
|
56
|
+
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][token.marketId].wrapperReadableName;
|
|
57
|
+
};
|
|
44
58
|
return IsolationModeClient;
|
|
45
59
|
}());
|
|
46
60
|
exports.default = IsolationModeClient;
|
|
@@ -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;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;IACH,0BAAC;AAAD,CAAC,
|
|
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,AAlED,IAkEC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Address, AggregatorOutput, ApiMarket, ApiToken, Integer, Network } from '../lib/ApiTypes';
|
|
2
2
|
import AggregatorClient from './AggregatorClient';
|
|
3
3
|
export default class ParaswapAggregator extends AggregatorClient {
|
|
4
|
-
|
|
4
|
+
private readonly partnerAddress;
|
|
5
|
+
constructor(network: Network, partnerAddress: Address | undefined);
|
|
5
6
|
isValidForNetwork(): boolean;
|
|
6
7
|
getSwapExactTokensForTokensData(inputMarket: ApiMarket | ApiToken, inputAmountWei: Integer, outputMarket: ApiMarket | ApiToken, minOutputAmountWei: Integer, txOrigin: Address): Promise<AggregatorOutput | undefined>;
|
|
7
8
|
}
|
|
@@ -62,8 +62,10 @@ var AggregatorClient_1 = __importDefault(require("./AggregatorClient"));
|
|
|
62
62
|
var API_URL = 'https://apiv5.paraswap.io';
|
|
63
63
|
var ParaswapAggregator = /** @class */ (function (_super) {
|
|
64
64
|
__extends(ParaswapAggregator, _super);
|
|
65
|
-
function ParaswapAggregator(network) {
|
|
66
|
-
|
|
65
|
+
function ParaswapAggregator(network, partnerAddress) {
|
|
66
|
+
var _this = _super.call(this, network) || this;
|
|
67
|
+
_this.partnerAddress = partnerAddress;
|
|
68
|
+
return _this;
|
|
67
69
|
}
|
|
68
70
|
ParaswapAggregator.prototype.isValidForNetwork = function () {
|
|
69
71
|
return !!Constants_1.PARASWAP_TRADER_ADDRESS_MAP[this.network];
|
|
@@ -119,6 +121,8 @@ var ParaswapAggregator = /** @class */ (function (_super) {
|
|
|
119
121
|
destAmount: minOutputAmountWei.toFixed(),
|
|
120
122
|
userAddress: traderAddress,
|
|
121
123
|
receiver: traderAddress,
|
|
124
|
+
partnerAddress: this.partnerAddress,
|
|
125
|
+
positiveSlippageToUser: !this.partnerAddress, // if there's no partner address, positive slippage goes to the user
|
|
122
126
|
})
|
|
123
127
|
.then(function (response) { return response.data; })
|
|
124
128
|
.catch(function (error) {
|
|
@@ -139,6 +143,7 @@ var ParaswapAggregator = /** @class */ (function (_super) {
|
|
|
139
143
|
traderAddress: traderAddress,
|
|
140
144
|
tradeData: result.data,
|
|
141
145
|
expectedAmountOut: new bignumber_js_1.default((_a = priceRouteResponse === null || priceRouteResponse === void 0 ? void 0 : priceRouteResponse.priceRoute) === null || _a === void 0 ? void 0 : _a.destAmount),
|
|
146
|
+
readableName: 'Paraswap',
|
|
142
147
|
}];
|
|
143
148
|
}
|
|
144
149
|
});
|
|
@@ -1 +1 @@
|
|
|
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;
|
|
1
|
+
{"version":3,"file":"ParaswapAggregator.js","sourceRoot":"","sources":["../../src/clients/ParaswapAggregator.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/ApiTypes.d.ts
CHANGED
|
@@ -18,6 +18,10 @@ export interface ApiToken {
|
|
|
18
18
|
tokenAddress: Address;
|
|
19
19
|
decimals: number;
|
|
20
20
|
}
|
|
21
|
+
export interface MinimalApiToken {
|
|
22
|
+
marketId: MarketId;
|
|
23
|
+
symbol: string;
|
|
24
|
+
}
|
|
21
25
|
export interface ApiMarket {
|
|
22
26
|
marketId: MarketId;
|
|
23
27
|
symbol: string;
|
|
@@ -32,10 +36,12 @@ export interface ApiMarket {
|
|
|
32
36
|
export interface ApiUnwrapperInfo {
|
|
33
37
|
unwrapperAddress: Address;
|
|
34
38
|
outputMarketId: number;
|
|
39
|
+
readableName: string;
|
|
35
40
|
}
|
|
36
41
|
export interface ApiWrapperInfo {
|
|
37
42
|
wrapperAddress: Address;
|
|
38
43
|
inputMarketId: number;
|
|
44
|
+
readableName: string;
|
|
39
45
|
}
|
|
40
46
|
export interface ApiMarketHelper {
|
|
41
47
|
marketId: MarketId;
|
|
@@ -74,19 +80,20 @@ export interface GenericTraderParam {
|
|
|
74
80
|
*/
|
|
75
81
|
trader: Address;
|
|
76
82
|
/**
|
|
77
|
-
*
|
|
83
|
+
* Hexadecimal bytes that can be passed to the trader contract.
|
|
78
84
|
*/
|
|
79
85
|
tradeData: string;
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
86
|
+
/**
|
|
87
|
+
* A descriptor that can be used in the UI to describe what this trader is (IE "Paraswap", "GLP Isolation Mode
|
|
88
|
+
* Unwrapper", etc.)
|
|
89
|
+
*/
|
|
90
|
+
readableName: string;
|
|
85
91
|
}
|
|
86
92
|
export interface AggregatorOutput {
|
|
87
93
|
traderAddress: Address;
|
|
88
94
|
tradeData: string;
|
|
89
95
|
expectedAmountOut: Integer;
|
|
96
|
+
readableName: string;
|
|
90
97
|
}
|
|
91
98
|
export interface ZapConfig {
|
|
92
99
|
slippageTolerance: number;
|
|
@@ -111,7 +118,7 @@ export interface ZapOutputParam {
|
|
|
111
118
|
makerAccounts: AccountInfo[];
|
|
112
119
|
/**
|
|
113
120
|
* The minimum output amount that was inputted into the Zap function. Not the same as
|
|
114
|
-
* amountWeisPath[amountWeisPath.length - 1]
|
|
121
|
+
* amountWeisPath[amountWeisPath.length - 1] (since the last amount is the `expected` amount out)
|
|
115
122
|
*/
|
|
116
123
|
amountOutMin: Integer;
|
|
117
124
|
}
|
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;AA2ED,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
package/dist/lib/Constants.js
CHANGED
|
@@ -68,6 +68,7 @@ var GLP_ISOLATION_MODE_MAP = (_h = {},
|
|
|
68
68
|
_h[ApiTypes_1.Network.ARBITRUM_ONE] = Deployments.GLPIsolationModeVaultFactory[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
69
69
|
_h[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
70
70
|
_h);
|
|
71
|
+
// eslint-disable-next-line max-len
|
|
71
72
|
exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
72
73
|
_j[ApiTypes_1.Network.ARBITRUM_ONE] = (_k = {},
|
|
73
74
|
_k[GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
@@ -75,32 +76,42 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
75
76
|
wrapper: Deployments.GLPIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
76
77
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
77
78
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
79
|
+
unwrapperReadableName: 'GLP Isolation Mode Unwrapper',
|
|
80
|
+
wrapperReadableName: 'GLP Isolation Mode Wrapper',
|
|
78
81
|
},
|
|
79
82
|
_k[PLV_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
80
83
|
unwrapper: Deployments.PlutusVaultGLPIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
81
84
|
wrapper: Deployments.PlutusVaultGLPIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
82
85
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
83
86
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
87
|
+
unwrapperReadableName: 'plvGLP Isolation Mode Unwrapper',
|
|
88
|
+
wrapperReadableName: 'plvGLP Isolation Mode Wrapper',
|
|
84
89
|
},
|
|
85
90
|
_k[JONES_USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
86
91
|
unwrapper: Deployments.JonesUSDCIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
87
92
|
wrapper: Deployments.JonesUSDCIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
88
93
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
89
94
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
95
|
+
unwrapperReadableName: 'jUSDC Isolation Mode Unwrapper',
|
|
96
|
+
wrapperReadableName: 'jUSDC Isolation Mode Wrapper',
|
|
90
97
|
},
|
|
91
98
|
_k[PENDLE_PT_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
92
99
|
unwrapper: Deployments.PendlePtGLP2024IsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
93
100
|
wrapper: Deployments.PendlePtGLP2024IsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
94
101
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
95
102
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
103
|
+
unwrapperReadableName: 'PT-GLP Isolation Mode Unwrapper',
|
|
104
|
+
wrapperReadableName: 'PT-GLP Isolation Mode Wrapper',
|
|
96
105
|
},
|
|
97
106
|
_k),
|
|
98
107
|
_j[ApiTypes_1.Network.ARBITRUM_GOERLI] = (_l = {},
|
|
99
108
|
_l[ATLAS_PTSI_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI]] = {
|
|
100
|
-
unwrapper: '',
|
|
101
|
-
wrapper: '',
|
|
109
|
+
unwrapper: '0x000000000000000000000000000000000000dead',
|
|
110
|
+
wrapper: '0x000000000000000000000000000000000000dead',
|
|
102
111
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI],
|
|
103
112
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI],
|
|
113
|
+
unwrapperReadableName: 'PTSI Isolation Mode Unwrapper',
|
|
114
|
+
wrapperReadableName: 'PTSI Isolation Mode Wrapper',
|
|
104
115
|
},
|
|
105
116
|
_l),
|
|
106
117
|
_j);
|
|
@@ -111,6 +122,8 @@ exports.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP = (_m = {},
|
|
|
111
122
|
wrapper: Deployments.MagicGLPWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
112
123
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
113
124
|
wrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
125
|
+
unwrapperReadableName: 'magicGLP Unwrapper',
|
|
126
|
+
wrapperReadableName: 'magicGLP Wrapper',
|
|
114
127
|
},
|
|
115
128
|
_o),
|
|
116
129
|
_m[ApiTypes_1.Network.ARBITRUM_GOERLI] = {},
|
|
@@ -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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"}
|