@dolomite-exchange/zap-sdk 0.1.6 → 0.1.8
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 +1 -1
- package/dist/DolomiteZap.js +20 -20
- package/dist/DolomiteZap.js.map +1 -1
- package/dist/clients/DolomiteClient.d.ts +3 -3
- package/dist/clients/DolomiteClient.js +4 -3
- package/dist/clients/DolomiteClient.js.map +1 -1
- package/dist/clients/IsolationModeClient.d.ts +5 -5
- package/dist/lib/ApiTypes.d.ts +6 -6
- package/dist/lib/Constants.d.ts +5 -5
- package/dist/lib/Constants.js +15 -15
- package/dist/lib/Constants.js.map +1 -1
- package/dist/lib/estimators/StandardEstimator.d.ts +3 -3
- package/dist/lib/estimators/StandardEstimator.js +8 -6
- package/dist/lib/estimators/StandardEstimator.js.map +1 -1
- package/package.json +2 -2
package/dist/DolomiteZap.d.ts
CHANGED
|
@@ -50,6 +50,6 @@ export declare class DolomiteZap {
|
|
|
50
50
|
* sorted by execution, with the best ones being first.
|
|
51
51
|
*/
|
|
52
52
|
getSwapExactTokensForTokensParams(tokenIn: ApiToken | MinimalApiToken, amountIn: Integer, tokenOut: ApiToken | MinimalApiToken, amountOutMin: Integer, txOrigin: Address, config?: Partial<ZapConfig>): Promise<ZapOutputParam[]>;
|
|
53
|
-
private
|
|
53
|
+
private getMarketIdToMarketMap;
|
|
54
54
|
private getMarketHelpersMap;
|
|
55
55
|
}
|
package/dist/DolomiteZap.js
CHANGED
|
@@ -130,10 +130,10 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
130
130
|
this.client.setMarketsToAdd(marketsToAdd);
|
|
131
131
|
};
|
|
132
132
|
DolomiteZap.prototype.getIsolationModeConverterByMarketId = function (marketId) {
|
|
133
|
-
return Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][marketId];
|
|
133
|
+
return Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][marketId.toFixed()];
|
|
134
134
|
};
|
|
135
135
|
DolomiteZap.prototype.getLiquidityTokenConverterByMarketId = function (marketId) {
|
|
136
|
-
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][marketId];
|
|
136
|
+
return Constants_1.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP[this.network][marketId.toFixed()];
|
|
137
137
|
};
|
|
138
138
|
/**
|
|
139
139
|
*
|
|
@@ -160,23 +160,23 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
160
160
|
blockTag: (_c = config === null || config === void 0 ? void 0 : config.blockTag) !== null && _c !== void 0 ? _c : this._defaultBlockTag,
|
|
161
161
|
filterOutZapsWithInsufficientOutput: (_d = config === null || config === void 0 ? void 0 : config.filterOutZapsWithInsufficientOutput) !== null && _d !== void 0 ? _d : true,
|
|
162
162
|
};
|
|
163
|
-
return [4 /*yield*/, this.
|
|
163
|
+
return [4 /*yield*/, this.getMarketIdToMarketMap()];
|
|
164
164
|
case 1:
|
|
165
165
|
marketsMap = _k.sent();
|
|
166
166
|
return [4 /*yield*/, this.getMarketHelpersMap(marketsMap)];
|
|
167
167
|
case 2:
|
|
168
168
|
marketHelpersMap = _k.sent();
|
|
169
|
-
inputMarket = marketsMap[tokenIn.marketId];
|
|
170
|
-
inputHelper = marketHelpersMap[tokenIn.marketId];
|
|
171
|
-
outputMarket = marketsMap[tokenOut.marketId];
|
|
172
|
-
outputHelper = marketHelpersMap[tokenOut.marketId];
|
|
169
|
+
inputMarket = marketsMap[tokenIn.marketId.toFixed()];
|
|
170
|
+
inputHelper = marketHelpersMap[tokenIn.marketId.toFixed()];
|
|
171
|
+
outputMarket = marketsMap[tokenOut.marketId.toFixed()];
|
|
172
|
+
outputHelper = marketHelpersMap[tokenOut.marketId.toFixed()];
|
|
173
173
|
if (!inputMarket) {
|
|
174
174
|
return [2 /*return*/, Promise.reject(new Error("Invalid tokenIn: ".concat(tokenIn.symbol, " / ").concat(tokenIn.marketId)))];
|
|
175
175
|
}
|
|
176
176
|
else if (!outputMarket) {
|
|
177
177
|
return [2 /*return*/, Promise.reject(new Error("Invalid tokenOut: ".concat(tokenOut.symbol, " / ").concat(tokenOut.marketId)))];
|
|
178
178
|
}
|
|
179
|
-
else if (inputMarket.marketId
|
|
179
|
+
else if (inputMarket.marketId.eq(outputMarket.marketId)) {
|
|
180
180
|
return [2 /*return*/, Promise.reject(new Error("Duplicate input and output marketId: ".concat(inputMarket.marketId)))];
|
|
181
181
|
}
|
|
182
182
|
else if (amountIn.lte(Constants_1.INTEGERS.ZERO)) {
|
|
@@ -229,16 +229,16 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
229
229
|
if (wrapperInfo) {
|
|
230
230
|
// We can't get the amount yet until we know if we need to use an aggregator in the middle
|
|
231
231
|
effectiveOutputMarketId = wrapperInfo.inputMarketId;
|
|
232
|
-
if (effectiveInputMarketId
|
|
232
|
+
if (!effectiveInputMarketId.eq(effectiveOutputMarketId)) {
|
|
233
233
|
marketIdsPath.push(wrapperInfo.inputMarketId);
|
|
234
234
|
}
|
|
235
235
|
}
|
|
236
|
-
if (
|
|
237
|
-
if (!marketIdsPath.
|
|
236
|
+
if (!!effectiveInputMarketId.eq(effectiveOutputMarketId)) return [3 /*break*/, 6];
|
|
237
|
+
if (!marketIdsPath.find(function (marketId) { return marketId.eq(effectiveOutputMarketId); })) {
|
|
238
238
|
marketIdsPath.push(effectiveOutputMarketId);
|
|
239
239
|
}
|
|
240
|
-
effectiveInputMarket_1 = marketsMap[effectiveInputMarketId];
|
|
241
|
-
effectiveOutputMarket_1 = marketsMap[effectiveOutputMarketId];
|
|
240
|
+
effectiveInputMarket_1 = marketsMap[effectiveInputMarketId.toFixed()];
|
|
241
|
+
effectiveOutputMarket_1 = marketsMap[effectiveOutputMarketId.toFixed()];
|
|
242
242
|
return [4 /*yield*/, Promise.all(this.validAggregators.map(function (aggregator, i) {
|
|
243
243
|
return aggregator.getSwapExactTokensForTokensData(effectiveInputMarket_1, amountsPaths[i][amountsPaths[i].length - 1], effectiveOutputMarket_1, Constants_1.INTEGERS.ONE, txOrigin, actualConfig);
|
|
244
244
|
}))];
|
|
@@ -294,15 +294,15 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
294
294
|
});
|
|
295
295
|
_k.label = 8;
|
|
296
296
|
case 8:
|
|
297
|
-
if (!marketIdsPath.
|
|
297
|
+
if (!marketIdsPath.find(function (marketId) { return marketId.eq(outputMarket.marketId); })) {
|
|
298
298
|
marketIdsPath.push(outputMarket.marketId);
|
|
299
299
|
}
|
|
300
300
|
tokensPath = marketIdsPath.map(function (marketId) { return ({
|
|
301
|
-
marketId:
|
|
302
|
-
symbol: marketsMap[marketId].symbol,
|
|
303
|
-
name: marketsMap[marketId].name,
|
|
304
|
-
tokenAddress: marketsMap[marketId].tokenAddress,
|
|
305
|
-
decimals: marketsMap[marketId].decimals,
|
|
301
|
+
marketId: marketId,
|
|
302
|
+
symbol: marketsMap[marketId.toFixed()].symbol,
|
|
303
|
+
name: marketsMap[marketId.toFixed()].name,
|
|
304
|
+
tokenAddress: marketsMap[marketId.toFixed()].tokenAddress,
|
|
305
|
+
decimals: marketsMap[marketId.toFixed()].decimals,
|
|
306
306
|
}); });
|
|
307
307
|
result = this.validAggregators.map(function (_, i) {
|
|
308
308
|
amountsPaths[i][0] = amountIn; // overwrite amountIn to be the real one now
|
|
@@ -330,7 +330,7 @@ var DolomiteZap = /** @class */ (function () {
|
|
|
330
330
|
});
|
|
331
331
|
});
|
|
332
332
|
};
|
|
333
|
-
DolomiteZap.prototype.
|
|
333
|
+
DolomiteZap.prototype.getMarketIdToMarketMap = function () {
|
|
334
334
|
return __awaiter(this, void 0, void 0, function () {
|
|
335
335
|
var marketsKey, cachedMarkets, marketsMap;
|
|
336
336
|
return __generator(this, function (_a) {
|
package/dist/DolomiteZap.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DolomiteZap.js","sourceRoot":"","sources":["../src/DolomiteZap.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"DolomiteZap.js","sourceRoot":"","sources":["../src/DolomiteZap.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ethers } from 'ethers';
|
|
2
|
-
import { ApiMarket, ApiMarketHelper, BlockTag,
|
|
2
|
+
import { ApiMarket, ApiMarketHelper, BlockTag, Network } from '../lib/ApiTypes';
|
|
3
3
|
export default class DolomiteClient {
|
|
4
4
|
private readonly subgraphUrl;
|
|
5
5
|
private readonly network;
|
|
@@ -7,7 +7,7 @@ export default class DolomiteClient {
|
|
|
7
7
|
private marketsToAdd;
|
|
8
8
|
constructor(subgraphUrl: string, networkId: Network, web3Provider: ethers.providers.Provider);
|
|
9
9
|
setMarketsToAdd(marketsToAdd: ApiMarket[]): void;
|
|
10
|
-
getDolomiteMarketsMap(blockTag?: BlockTag): Promise<Record<
|
|
11
|
-
getDolomiteMarketHelpers(marketsMap: Record<
|
|
10
|
+
getDolomiteMarketsMap(blockTag?: BlockTag): Promise<Record<string, ApiMarket>>;
|
|
11
|
+
getDolomiteMarketHelpers(marketsMap: Record<string, ApiMarket>): Promise<Record<string, ApiMarketHelper>>;
|
|
12
12
|
private getDolomiteMarketsWithPaging;
|
|
13
13
|
}
|
|
@@ -65,6 +65,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
65
65
|
};
|
|
66
66
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
67
67
|
var axios_1 = __importDefault(require("axios"));
|
|
68
|
+
var bignumber_js_1 = __importDefault(require("bignumber.js"));
|
|
68
69
|
var StandardEstimator_1 = require("../lib/estimators/StandardEstimator");
|
|
69
70
|
var GraphqlPageable_1 = __importDefault(require("../lib/GraphqlPageable"));
|
|
70
71
|
var Logger_1 = __importDefault(require("../lib/Logger"));
|
|
@@ -101,7 +102,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
101
102
|
case 1:
|
|
102
103
|
marketsList = _a.sent();
|
|
103
104
|
return [2 /*return*/, (marketsList.concat.apply(marketsList, __spreadArray([], __read(this.marketsToAdd), false))).reduce(function (acc, market) {
|
|
104
|
-
acc[market.marketId] = market;
|
|
105
|
+
acc[market.marketId.toFixed()] = market;
|
|
105
106
|
return acc;
|
|
106
107
|
}, {})];
|
|
107
108
|
}
|
|
@@ -165,7 +166,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
165
166
|
}); },
|
|
166
167
|
};
|
|
167
168
|
}
|
|
168
|
-
acc[market.marketId] = marketHelper;
|
|
169
|
+
acc[market.marketId.toFixed()] = marketHelper;
|
|
169
170
|
return acc;
|
|
170
171
|
}, {})];
|
|
171
172
|
});
|
|
@@ -253,7 +254,7 @@ var DolomiteClient = /** @class */ (function () {
|
|
|
253
254
|
};
|
|
254
255
|
}
|
|
255
256
|
apiMarket = {
|
|
256
|
-
marketId:
|
|
257
|
+
marketId: new bignumber_js_1.default(market.token.marketId),
|
|
257
258
|
symbol: market.token.symbol,
|
|
258
259
|
name: market.token.name,
|
|
259
260
|
tokenAddress: (0, Utils_1.toChecksumOpt)(market.token.id),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAA0B;
|
|
1
|
+
{"version":3,"file":"DolomiteClient.js","sourceRoot":"","sources":["../../src/clients/DolomiteClient.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,19 +1,19 @@
|
|
|
1
|
-
import { ApiToken, Network } from '../lib/ApiTypes';
|
|
1
|
+
import { ApiToken, MarketId, Network } from '../lib/ApiTypes';
|
|
2
2
|
import { GraphqlToken } from '../lib/graphql-types';
|
|
3
3
|
export default class IsolationModeClient {
|
|
4
4
|
readonly network: Network;
|
|
5
5
|
constructor(network: Network);
|
|
6
6
|
isIsolationModeToken(token: GraphqlToken | ApiToken): boolean;
|
|
7
|
-
getIsolationModeUnwrapperMarketIdByMarketId(token: GraphqlToken):
|
|
8
|
-
getIsolationModeWrapperMarketIdByMarketId(token: GraphqlToken):
|
|
7
|
+
getIsolationModeUnwrapperMarketIdByMarketId(token: GraphqlToken): MarketId | undefined;
|
|
8
|
+
getIsolationModeWrapperMarketIdByMarketId(token: GraphqlToken): MarketId | undefined;
|
|
9
9
|
getIsolationModeUnwrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
10
10
|
getIsolationModeUnwrapperForLiquidationByMarketId(token: GraphqlToken): string | undefined;
|
|
11
11
|
getIsolationModeWrapperByMarketId(token: GraphqlToken): string | undefined;
|
|
12
12
|
getIsolationModeUnwrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
13
13
|
getIsolationModeWrapperReadableNameByMarketId(token: GraphqlToken): string | undefined;
|
|
14
14
|
isLiquidityToken(token: GraphqlToken): boolean;
|
|
15
|
-
getLiquidityTokenUnwrapperMarketIdByToken(token: GraphqlToken):
|
|
16
|
-
getLiquidityTokenWrapperMarketIdByToken(token: GraphqlToken):
|
|
15
|
+
getLiquidityTokenUnwrapperMarketIdByToken(token: GraphqlToken): MarketId;
|
|
16
|
+
getLiquidityTokenWrapperMarketIdByToken(token: GraphqlToken): MarketId;
|
|
17
17
|
getLiquidityTokenUnwrapperByToken(token: GraphqlToken): string;
|
|
18
18
|
getLiquidityTokenWrapperByToken(token: GraphqlToken): string;
|
|
19
19
|
getLiquidityTokenUnwrapperReadableNameByToken(token: GraphqlToken): string;
|
package/dist/lib/ApiTypes.d.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import BigNumber from 'bignumber.js';
|
|
2
2
|
export type Integer = BigNumber;
|
|
3
3
|
export type Address = string;
|
|
4
|
-
export type MarketId =
|
|
4
|
+
export type MarketId = BigNumber;
|
|
5
5
|
export declare enum Network {
|
|
6
6
|
ARBITRUM_ONE = 42161,
|
|
7
7
|
ARBITRUM_GOERLI = 421613
|
|
@@ -36,12 +36,12 @@ export interface ApiMarket {
|
|
|
36
36
|
export interface ApiUnwrapperInfo {
|
|
37
37
|
unwrapperAddress: Address;
|
|
38
38
|
unwrapperForLiquidationAddress?: Address;
|
|
39
|
-
outputMarketId:
|
|
39
|
+
outputMarketId: MarketId;
|
|
40
40
|
readableName: string;
|
|
41
41
|
}
|
|
42
42
|
export interface ApiWrapperInfo {
|
|
43
43
|
wrapperAddress: Address;
|
|
44
|
-
inputMarketId:
|
|
44
|
+
inputMarketId: MarketId;
|
|
45
45
|
readableName: string;
|
|
46
46
|
}
|
|
47
47
|
export interface ApiMarketHelper {
|
|
@@ -56,10 +56,10 @@ export interface EstimateOutputResult {
|
|
|
56
56
|
tradeData: string;
|
|
57
57
|
}
|
|
58
58
|
export interface ApiUnwrapperHelper {
|
|
59
|
-
estimateOutputFunction: (amountIn: Integer, outputMarketId:
|
|
59
|
+
estimateOutputFunction: (amountIn: Integer, outputMarketId: MarketId, config: ZapConfig) => Promise<EstimateOutputResult>;
|
|
60
60
|
}
|
|
61
61
|
export interface ApiWrapperHelper {
|
|
62
|
-
estimateOutputFunction: (amountIn: Integer, inputMarketId:
|
|
62
|
+
estimateOutputFunction: (amountIn: Integer, inputMarketId: MarketId, config: ZapConfig) => Promise<EstimateOutputResult>;
|
|
63
63
|
}
|
|
64
64
|
export declare enum GenericTraderType {
|
|
65
65
|
ExternalLiquidity = 0,
|
|
@@ -106,7 +106,7 @@ export interface ZapOutputParam {
|
|
|
106
106
|
/**
|
|
107
107
|
* The sequence of market IDs used to create the zap
|
|
108
108
|
*/
|
|
109
|
-
marketIdsPath:
|
|
109
|
+
marketIdsPath: MarketId[];
|
|
110
110
|
/**
|
|
111
111
|
* The sequence of tokens used to create the zap
|
|
112
112
|
*/
|
package/dist/lib/Constants.d.ts
CHANGED
|
@@ -4,8 +4,8 @@ export interface ApiMarketConverter {
|
|
|
4
4
|
unwrapper: Address;
|
|
5
5
|
unwrapperForLiquidation?: Address;
|
|
6
6
|
wrapper: Address;
|
|
7
|
-
unwrapperMarketId:
|
|
8
|
-
wrapperMarketId:
|
|
7
|
+
unwrapperMarketId: MarketId;
|
|
8
|
+
wrapperMarketId: MarketId;
|
|
9
9
|
unwrapperReadableName: string;
|
|
10
10
|
wrapperReadableName: string;
|
|
11
11
|
}
|
|
@@ -14,11 +14,11 @@ export declare const INTEGERS: {
|
|
|
14
14
|
ONE: BigNumber;
|
|
15
15
|
};
|
|
16
16
|
export declare const BYTES_EMPTY = "0x";
|
|
17
|
-
export declare const ISOLATION_MODE_CONVERSION_MARKET_ID_MAP: Record<Network, Record<
|
|
18
|
-
export declare const LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP: Record<Network, Record<
|
|
17
|
+
export declare const ISOLATION_MODE_CONVERSION_MARKET_ID_MAP: Record<Network, Record<string, ApiMarketConverter | undefined>>;
|
|
18
|
+
export declare const LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP: Record<Network, Record<string, ApiMarketConverter>>;
|
|
19
19
|
export declare const PARASWAP_TRADER_ADDRESS_MAP: Record<Network, Address | undefined>;
|
|
20
20
|
export declare function isPtGlpToken(network: Network, tokenAddress: Address): boolean;
|
|
21
21
|
export declare function getGlpIsolationModeAddress(network: Network): Address | undefined;
|
|
22
|
-
export declare function getGlpIsolationModeMarketId(network: Network):
|
|
22
|
+
export declare function getGlpIsolationModeMarketId(network: Network): BigNumber | undefined;
|
|
23
23
|
export declare function getSGlpAddress(network: Network): Address | undefined;
|
|
24
24
|
export declare function getPendleMarketForIsolationModeToken(network: Network, isolationModeToken: Address): Address | undefined;
|
package/dist/lib/Constants.js
CHANGED
|
@@ -37,31 +37,31 @@ exports.INTEGERS = {
|
|
|
37
37
|
};
|
|
38
38
|
exports.BYTES_EMPTY = '0x';
|
|
39
39
|
var USDC_MARKET_ID_MAP = (_a = {},
|
|
40
|
-
_a[ApiTypes_1.Network.ARBITRUM_ONE] = 2,
|
|
41
|
-
_a[ApiTypes_1.Network.ARBITRUM_GOERLI] = 2,
|
|
40
|
+
_a[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(2),
|
|
41
|
+
_a[ApiTypes_1.Network.ARBITRUM_GOERLI] = new bignumber_js_1.default(2),
|
|
42
42
|
_a);
|
|
43
43
|
var ATLAS_PTSI_MARKET_ID_MAP = (_b = {},
|
|
44
|
-
_b[ApiTypes_1.Network.ARBITRUM_ONE] =
|
|
45
|
-
_b[ApiTypes_1.Network.ARBITRUM_GOERLI] =
|
|
44
|
+
_b[ApiTypes_1.Network.ARBITRUM_ONE] = undefined,
|
|
45
|
+
_b[ApiTypes_1.Network.ARBITRUM_GOERLI] = new bignumber_js_1.default(5),
|
|
46
46
|
_b);
|
|
47
47
|
var GLP_MARKET_ID_MAP = (_c = {},
|
|
48
|
-
_c[ApiTypes_1.Network.ARBITRUM_ONE] = 6,
|
|
48
|
+
_c[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(6),
|
|
49
49
|
_c[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
50
50
|
_c);
|
|
51
51
|
var MAGIC_GLP_MARKET_ID_MAP = (_d = {},
|
|
52
|
-
_d[ApiTypes_1.Network.ARBITRUM_ONE] = 8,
|
|
52
|
+
_d[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(8),
|
|
53
53
|
_d[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
54
54
|
_d);
|
|
55
55
|
var PLV_GLP_MARKET_ID_MAP = (_e = {},
|
|
56
|
-
_e[ApiTypes_1.Network.ARBITRUM_ONE] = 9,
|
|
56
|
+
_e[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(9),
|
|
57
57
|
_e[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
58
58
|
_e);
|
|
59
59
|
var JONES_USDC_MARKET_ID_MAP = (_f = {},
|
|
60
|
-
_f[ApiTypes_1.Network.ARBITRUM_ONE] = 10,
|
|
60
|
+
_f[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(10),
|
|
61
61
|
_f[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
62
62
|
_f);
|
|
63
63
|
var PENDLE_PT_GLP_MARKET_ID_MAP = (_g = {},
|
|
64
|
-
_g[ApiTypes_1.Network.ARBITRUM_ONE] = 11,
|
|
64
|
+
_g[ApiTypes_1.Network.ARBITRUM_ONE] = new bignumber_js_1.default(11),
|
|
65
65
|
_g[ApiTypes_1.Network.ARBITRUM_GOERLI] = undefined,
|
|
66
66
|
_g);
|
|
67
67
|
var GLP_ISOLATION_MODE_MAP = (_h = {},
|
|
@@ -71,7 +71,7 @@ var GLP_ISOLATION_MODE_MAP = (_h = {},
|
|
|
71
71
|
// eslint-disable-next-line max-len
|
|
72
72
|
exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
73
73
|
_j[ApiTypes_1.Network.ARBITRUM_ONE] = (_k = {},
|
|
74
|
-
_k[GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
74
|
+
_k[GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE].toFixed()] = {
|
|
75
75
|
unwrapper: Deployments.GLPIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
76
76
|
wrapper: Deployments.GLPIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
77
77
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
@@ -79,7 +79,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
79
79
|
unwrapperReadableName: 'GLP Isolation Mode Unwrapper',
|
|
80
80
|
wrapperReadableName: 'GLP Isolation Mode Wrapper',
|
|
81
81
|
},
|
|
82
|
-
_k[PLV_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
82
|
+
_k[PLV_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE].toFixed()] = {
|
|
83
83
|
unwrapper: Deployments.PlutusVaultGLPIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
84
84
|
wrapper: Deployments.PlutusVaultGLPIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
85
85
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
@@ -87,7 +87,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
87
87
|
unwrapperReadableName: 'plvGLP Isolation Mode Unwrapper',
|
|
88
88
|
wrapperReadableName: 'plvGLP Isolation Mode Wrapper',
|
|
89
89
|
},
|
|
90
|
-
_k[JONES_USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
90
|
+
_k[JONES_USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE].toFixed()] = {
|
|
91
91
|
unwrapper: Deployments.JonesUSDCIsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
92
92
|
unwrapperForLiquidation: Deployments.JonesUSDCIsolationModeUnwrapperTraderV2ForLiquidation[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
93
93
|
wrapper: Deployments.JonesUSDCIsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
@@ -96,7 +96,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
96
96
|
unwrapperReadableName: 'jUSDC Isolation Mode Unwrapper',
|
|
97
97
|
wrapperReadableName: 'jUSDC Isolation Mode Wrapper',
|
|
98
98
|
},
|
|
99
|
-
_k[PENDLE_PT_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
99
|
+
_k[PENDLE_PT_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE].toFixed()] = {
|
|
100
100
|
unwrapper: Deployments.PendlePtGLP2024IsolationModeUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
101
101
|
wrapper: Deployments.PendlePtGLP2024IsolationModeWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
102
102
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE],
|
|
@@ -106,7 +106,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
106
106
|
},
|
|
107
107
|
_k),
|
|
108
108
|
_j[ApiTypes_1.Network.ARBITRUM_GOERLI] = (_l = {},
|
|
109
|
-
_l[ATLAS_PTSI_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI]] = {
|
|
109
|
+
_l[ATLAS_PTSI_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI].toFixed()] = {
|
|
110
110
|
unwrapper: '0x000000000000000000000000000000000000dead',
|
|
111
111
|
wrapper: '0x000000000000000000000000000000000000dead',
|
|
112
112
|
unwrapperMarketId: USDC_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_GOERLI],
|
|
@@ -118,7 +118,7 @@ exports.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP = (_j = {},
|
|
|
118
118
|
_j);
|
|
119
119
|
exports.LIQUIDITY_TOKEN_CONVERSION_MARKET_ID_MAP = (_m = {},
|
|
120
120
|
_m[ApiTypes_1.Network.ARBITRUM_ONE] = (_o = {},
|
|
121
|
-
_o[MAGIC_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE]] = {
|
|
121
|
+
_o[MAGIC_GLP_MARKET_ID_MAP[ApiTypes_1.Network.ARBITRUM_ONE].toFixed()] = {
|
|
122
122
|
unwrapper: Deployments.MagicGLPUnwrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
123
123
|
wrapper: Deployments.MagicGLPWrapperTraderV2[ApiTypes_1.Network.ARBITRUM_ONE].address,
|
|
124
124
|
unwrapperMarketId: 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;AAY3C,QAAA,QAAQ,GAAG;IACtB,IAAI,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;IACtB,GAAG,EAAE,IAAI,sBAAS,CAAC,CAAC,CAAC;CACtB,CAAC;AAEW,QAAA,WAAW,GAAG,IAAI,CAAC;AAEhC,IAAM,kBAAkB;IACtB,GAAC,kBAAO,CAAC,YAAY,IAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"Constants.js","sourceRoot":"","sources":["../../src/lib/Constants.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,7 @@ export declare class StandardEstimator {
|
|
|
5
5
|
private readonly web3Provider;
|
|
6
6
|
private readonly marketsMap;
|
|
7
7
|
private readonly pendleEstimator;
|
|
8
|
-
constructor(network: Network, web3Provider: ethers.providers.Provider, marketsMap: Record<
|
|
9
|
-
getUnwrappedAmount(isolationModeTokenAddress: Address, unwrapperAddress: Address, amountIn: Integer, outputMarketId:
|
|
10
|
-
getWrappedAmount(isolationModeTokenAddress: Address, wrapperAddress: Address, amountIn: Integer, inputMarketId:
|
|
8
|
+
constructor(network: Network, web3Provider: ethers.providers.Provider, marketsMap: Record<string, ApiMarket>);
|
|
9
|
+
getUnwrappedAmount(isolationModeTokenAddress: Address, unwrapperAddress: Address, amountIn: Integer, outputMarketId: MarketId, config: ZapConfig): Promise<EstimateOutputResult>;
|
|
10
|
+
getWrappedAmount(isolationModeTokenAddress: Address, wrapperAddress: Address, amountIn: Integer, inputMarketId: MarketId, config: ZapConfig): Promise<EstimateOutputResult>;
|
|
11
11
|
}
|
|
@@ -54,17 +54,18 @@ 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, amountOut;
|
|
57
|
+
var outputMarket, contract, result, glpMarketId, estimateOutputResult, tradeData, outputAmount, amountOut;
|
|
58
58
|
return __generator(this, function (_a) {
|
|
59
59
|
switch (_a.label) {
|
|
60
60
|
case 0:
|
|
61
|
-
outputMarket = this.marketsMap[outputMarketId];
|
|
61
|
+
outputMarket = this.marketsMap[outputMarketId.toFixed()];
|
|
62
62
|
contract = new ethers_1.ethers.Contract(unwrapperAddress, IDolomiteMarginExchangeWrapper_json_1.default, this.web3Provider);
|
|
63
63
|
if (!(0, Constants_1.isPtGlpToken)(this.network, isolationModeTokenAddress)) return [3 /*break*/, 3];
|
|
64
64
|
return [4 /*yield*/, this.pendleEstimator.getUnwrappedAmount(isolationModeTokenAddress, amountIn)];
|
|
65
65
|
case 1:
|
|
66
66
|
result = _a.sent();
|
|
67
|
-
|
|
67
|
+
glpMarketId = (0, Constants_1.getGlpIsolationModeMarketId)(this.network);
|
|
68
|
+
return [4 /*yield*/, this.getUnwrappedAmount((0, Constants_1.getGlpIsolationModeAddress)(this.network), Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][glpMarketId.toFixed()].unwrapper, result.outputAmount, outputMarketId, config)];
|
|
68
69
|
case 2:
|
|
69
70
|
estimateOutputResult = _a.sent();
|
|
70
71
|
return [2 /*return*/, { tradeData: result.tradeData, amountOut: estimateOutputResult.amountOut }];
|
|
@@ -81,13 +82,14 @@ var StandardEstimator = /** @class */ (function () {
|
|
|
81
82
|
};
|
|
82
83
|
StandardEstimator.prototype.getWrappedAmount = function (isolationModeTokenAddress, wrapperAddress, amountIn, inputMarketId, config) {
|
|
83
84
|
return __awaiter(this, void 0, void 0, function () {
|
|
84
|
-
var inputMarket, estimateOutputResult, result, contract, tradeData, outputAmount, amountOut;
|
|
85
|
+
var inputMarket, glpMarketId, estimateOutputResult, result, contract, tradeData, outputAmount, amountOut;
|
|
85
86
|
return __generator(this, function (_a) {
|
|
86
87
|
switch (_a.label) {
|
|
87
88
|
case 0:
|
|
88
|
-
inputMarket = this.marketsMap[inputMarketId];
|
|
89
|
+
inputMarket = this.marketsMap[inputMarketId.toFixed()];
|
|
89
90
|
if (!(0, Constants_1.isPtGlpToken)(this.network, isolationModeTokenAddress)) return [3 /*break*/, 3];
|
|
90
|
-
|
|
91
|
+
glpMarketId = (0, Constants_1.getGlpIsolationModeMarketId)(this.network);
|
|
92
|
+
return [4 /*yield*/, this.getWrappedAmount((0, Constants_1.getGlpIsolationModeAddress)(this.network), Constants_1.ISOLATION_MODE_CONVERSION_MARKET_ID_MAP[this.network][glpMarketId.toFixed()].wrapper, amountIn, inputMarketId, config)];
|
|
91
93
|
case 1:
|
|
92
94
|
estimateOutputResult = _a.sent();
|
|
93
95
|
return [4 /*yield*/, this.pendleEstimator.getWrappedAmount(isolationModeTokenAddress, estimateOutputResult.amountOut)];
|
|
@@ -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,
|
|
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.1.
|
|
3
|
+
"version": "0.1.8",
|
|
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.6",
|
|
30
30
|
"@pendle/sdk-v2": "^2.3.4",
|
|
31
31
|
"axios": "^1.1.3",
|
|
32
32
|
"bignumber.js": "^9.1.1",
|