@ichidao/ichi-vaults-sdk 0.0.8 → 0.0.10
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/README.md +11 -8
- package/dist/src/__tests__/index.test.js +37 -27
- package/dist/src/__tests__/index.test.js.map +1 -1
- package/dist/src/functions/balances.js +4 -4
- package/dist/src/functions/balances.js.map +1 -1
- package/dist/src/functions/deposit.js +8 -6
- package/dist/src/functions/deposit.js.map +1 -1
- package/dist/src/functions/vault.d.ts +2 -1
- package/dist/src/functions/vault.js +66 -10
- package/dist/src/functions/vault.js.map +1 -1
- package/dist/src/functions/withdraw.js +1 -1
- package/dist/src/functions/withdraw.js.map +1 -1
- package/dist/src/index.cjs.js +1 -1
- package/dist/src/index.esm.js +1 -1
- package/dist/src/src/functions/vault.d.ts +2 -1
- package/dist/src/src/types/index.d.ts +13 -9
- package/dist/src/types/index.d.ts +13 -9
- package/dist/src/types/index.js +12 -8
- package/dist/src/types/index.js.map +1 -1
- package/dist/src/utils/config/addresses.js +15 -1
- package/dist/src/utils/config/addresses.js.map +1 -1
- package/package.json +1 -1
package/README.md
CHANGED
|
@@ -401,6 +401,7 @@ const amountsBN: [BigNumber, BigNumber] & {total0: BigNumber, total1: BigNumber}
|
|
|
401
401
|
| chain | SupportedChain | - | true
|
|
402
402
|
| dex | SupportedDex | - | true
|
|
403
403
|
| vaultAddress | string | - | true |
|
|
404
|
+
| jsonProvider | JsonRpcProvider | - | false |
|
|
404
405
|
|
|
405
406
|
<br/>
|
|
406
407
|
|
|
@@ -453,9 +454,10 @@ if (!vault) {
|
|
|
453
454
|
```typescript
|
|
454
455
|
enum SupportedChainId {
|
|
455
456
|
arbitrum = 42161,
|
|
457
|
+
bsc = 56,
|
|
458
|
+
eon = 7332,
|
|
456
459
|
mainnet = 1,
|
|
457
460
|
polygon = 137,
|
|
458
|
-
bsc = 56,
|
|
459
461
|
}
|
|
460
462
|
```
|
|
461
463
|
|
|
@@ -463,13 +465,14 @@ enum SupportedChainId {
|
|
|
463
465
|
|
|
464
466
|
```typescript
|
|
465
467
|
enum SupportedDex {
|
|
466
|
-
|
|
467
|
-
|
|
468
|
-
Pancakeswap,
|
|
469
|
-
|
|
470
|
-
|
|
471
|
-
|
|
472
|
-
|
|
468
|
+
Ascent = 'Ascent',
|
|
469
|
+
Horiza = 'Horiza',
|
|
470
|
+
Pancakeswap = 'PancakeSwap',
|
|
471
|
+
Quickswap = 'QuickSwap',
|
|
472
|
+
Ramses = 'Ramses',
|
|
473
|
+
Retro = 'Retro',
|
|
474
|
+
Thena = 'Thena',
|
|
475
|
+
UniswapV3 = 'Uniswap V3',
|
|
473
476
|
}
|
|
474
477
|
```
|
|
475
478
|
|
|
@@ -52,7 +52,10 @@ var formatBigInt_1 = __importDefault(require("../utils/formatBigInt"));
|
|
|
52
52
|
var parseBigInt_1 = __importDefault(require("../utils/parseBigInt"));
|
|
53
53
|
var hdWalletProvider = new hdwallet_provider_1.default([process.env.PRIVATE_KEY], process.env.PROVIDER_URL, 0, 1);
|
|
54
54
|
// const jsonRpcProvider = new ethers.providers.JsonRpcProvider(process.env.PROVIDER_URL);
|
|
55
|
-
var provider = new providers_1.Web3Provider(hdWalletProvider, {
|
|
55
|
+
var provider = new providers_1.Web3Provider(hdWalletProvider, {
|
|
56
|
+
chainId: types_1.SupportedChainId.hedera_testnet,
|
|
57
|
+
name: 'hedera testnet',
|
|
58
|
+
});
|
|
56
59
|
// const provider = new Web3Provider(hdWalletProvider, { chainId: SupportedChainId.arbitrum, name: 'arbitrum' });
|
|
57
60
|
// const provider = new Web3Provider(hdWalletProvider, { chainId: SupportedChainId.bsc, name: 'bsc' });
|
|
58
61
|
var account = process.env.ACCOUNT;
|
|
@@ -71,19 +74,24 @@ var account = process.env.ACCOUNT;
|
|
|
71
74
|
// chainId: SupportedChainId.bsc,
|
|
72
75
|
// dex: SupportedDex.Thena,
|
|
73
76
|
// };
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
};
|
|
77
|
+
// const vault = {
|
|
78
|
+
// address: '0x74b706767f18a360c0083854ab42c1b96e076229', // WMATIC-QUICK vault
|
|
79
|
+
// chainId: SupportedChainId.polygon,
|
|
80
|
+
// dex: SupportedDex.Quickswap,
|
|
81
|
+
// };
|
|
79
82
|
var tokens = {
|
|
80
83
|
pairedToken: '0xB5C064F955D8e7F38fE0460C556a72987494eE17',
|
|
81
84
|
depositToken: '0x0d500B1d8E8eF31E21C99d1Db9A6444d3ADf1270',
|
|
82
85
|
};
|
|
86
|
+
var vault = {
|
|
87
|
+
address: '0x1abee930ed0fed631c7b5166b7686baa2ee9d69a',
|
|
88
|
+
chainId: types_1.SupportedChainId.hedera_testnet,
|
|
89
|
+
dex: types_1.SupportedDex.SaucerSwap,
|
|
90
|
+
};
|
|
83
91
|
var iface = new ethers_1.ethers.utils.Interface(IchiVault_json_1.default);
|
|
84
|
-
var amount0 = '0
|
|
85
|
-
var amount1 = '0';
|
|
86
|
-
var sharesToWithdraw = '
|
|
92
|
+
var amount0 = '0';
|
|
93
|
+
var amount1 = '0.5';
|
|
94
|
+
var sharesToWithdraw = '1e-12';
|
|
87
95
|
var bigAmount = '1000';
|
|
88
96
|
describe('Vault', function () {
|
|
89
97
|
var share = null;
|
|
@@ -100,33 +108,33 @@ describe('Vault', function () {
|
|
|
100
108
|
});
|
|
101
109
|
}); });
|
|
102
110
|
it.skip('approve', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
103
|
-
var
|
|
111
|
+
var approve1, isApproved1;
|
|
104
112
|
return __generator(this, function (_a) {
|
|
105
113
|
switch (_a.label) {
|
|
106
114
|
case 0:
|
|
107
|
-
|
|
108
|
-
return [4 /*yield*/, (0, index_1.approveDepositToken)(account,
|
|
115
|
+
approve1 = null;
|
|
116
|
+
return [4 /*yield*/, (0, index_1.approveDepositToken)(account, 1, vault.address, provider, vault.dex, amount1)];
|
|
109
117
|
case 1:
|
|
110
|
-
|
|
111
|
-
return [4 /*yield*/,
|
|
118
|
+
approve1 = _a.sent();
|
|
119
|
+
return [4 /*yield*/, approve1.wait()];
|
|
112
120
|
case 2:
|
|
113
121
|
_a.sent();
|
|
114
|
-
return [4 /*yield*/, (0, index_1.isDepositTokenApproved)(account,
|
|
122
|
+
return [4 /*yield*/, (0, index_1.isDepositTokenApproved)(account, 1, amount1, vault.address, provider, vault.dex)];
|
|
115
123
|
case 3:
|
|
116
|
-
|
|
117
|
-
expect(
|
|
124
|
+
isApproved1 = _a.sent();
|
|
125
|
+
expect(isApproved1).toEqual(true);
|
|
118
126
|
return [2 /*return*/];
|
|
119
127
|
}
|
|
120
128
|
});
|
|
121
129
|
}); });
|
|
122
130
|
it('isDepositTokenApproved', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
123
|
-
var
|
|
131
|
+
var isApproved1;
|
|
124
132
|
return __generator(this, function (_a) {
|
|
125
133
|
switch (_a.label) {
|
|
126
|
-
case 0: return [4 /*yield*/, (0, index_1.isDepositTokenApproved)(account,
|
|
134
|
+
case 0: return [4 /*yield*/, (0, index_1.isDepositTokenApproved)(account, 1, bigAmount, vault.address, provider, vault.dex)];
|
|
127
135
|
case 1:
|
|
128
|
-
|
|
129
|
-
expect(
|
|
136
|
+
isApproved1 = _a.sent();
|
|
137
|
+
expect(isApproved1).toEqual(false);
|
|
130
138
|
return [2 /*return*/];
|
|
131
139
|
}
|
|
132
140
|
});
|
|
@@ -148,7 +156,7 @@ describe('Vault', function () {
|
|
|
148
156
|
return [4 /*yield*/, (0, index_1.getMaxDepositAmount)(1, vault.address, provider, vault.dex)];
|
|
149
157
|
case 4:
|
|
150
158
|
maxDeposit1 = _b.sent();
|
|
151
|
-
return [4 /*yield*/, (0, index_1.getIchiVaultInfo)(vault.chainId, vault.dex, vault.address)];
|
|
159
|
+
return [4 /*yield*/, (0, index_1.getIchiVaultInfo)(vault.chainId, vault.dex, vault.address, provider)];
|
|
152
160
|
case 5:
|
|
153
161
|
vaultFromQuery = _b.sent();
|
|
154
162
|
if (!vaultFromQuery)
|
|
@@ -163,7 +171,7 @@ describe('Vault', function () {
|
|
|
163
171
|
return [2 /*return*/];
|
|
164
172
|
if (!isAllowed1 && Number(amount1) > 0)
|
|
165
173
|
return [2 /*return*/];
|
|
166
|
-
if ((0, parseBigInt_1.default)(amount0, token0Decimals)
|
|
174
|
+
if ((0, parseBigInt_1.default)(amount0, token0Decimals).gt(maxDeposit0) || (0, parseBigInt_1.default)(amount1, token1Decimals).gt(maxDeposit1))
|
|
167
175
|
return [2 /*return*/];
|
|
168
176
|
return [4 /*yield*/, (0, index_1.deposit)(account, amount0, amount1, vault.address, provider, vault.dex)];
|
|
169
177
|
case 8:
|
|
@@ -208,7 +216,8 @@ describe('Vault', function () {
|
|
|
208
216
|
case 0: return [4 /*yield*/, (0, index_1.getTotalAmounts)(vault.address, provider, vault.dex)];
|
|
209
217
|
case 1:
|
|
210
218
|
amounts = _a.sent();
|
|
211
|
-
expect(Number(amounts.total0)).toBeGreaterThan(0);
|
|
219
|
+
// expect(Number(amounts.total0)).toBeGreaterThan(0);
|
|
220
|
+
expect(Number(amounts.total1)).toBeGreaterThan(0);
|
|
212
221
|
return [2 /*return*/];
|
|
213
222
|
}
|
|
214
223
|
});
|
|
@@ -220,7 +229,8 @@ describe('Vault', function () {
|
|
|
220
229
|
case 0: return [4 /*yield*/, (0, index_1.getUserAmounts)(account, vault.address, provider, vault.dex)];
|
|
221
230
|
case 1:
|
|
222
231
|
amounts = _a.sent();
|
|
223
|
-
expect(Number(amounts.amount0)).toBeGreaterThan(0);
|
|
232
|
+
// expect(Number(amounts.amount0)).toBeGreaterThan(0);
|
|
233
|
+
expect(Number(amounts.amount1)).toBeGreaterThan(0);
|
|
224
234
|
return [2 /*return*/];
|
|
225
235
|
}
|
|
226
236
|
});
|
|
@@ -259,7 +269,7 @@ describe('GraphQL', function () {
|
|
|
259
269
|
var a;
|
|
260
270
|
return __generator(this, function (_a) {
|
|
261
271
|
switch (_a.label) {
|
|
262
|
-
case 0: return [4 /*yield*/, (0, index_1.getIchiVaultInfo)(vault.chainId, vault.dex, vault.address)];
|
|
272
|
+
case 0: return [4 /*yield*/, (0, index_1.getIchiVaultInfo)(vault.chainId, vault.dex, vault.address, provider)];
|
|
263
273
|
case 1:
|
|
264
274
|
a = _a.sent();
|
|
265
275
|
expect(a).toBeTruthy();
|
|
@@ -267,7 +277,7 @@ describe('GraphQL', function () {
|
|
|
267
277
|
}
|
|
268
278
|
});
|
|
269
279
|
}); });
|
|
270
|
-
it('Get vaults by tokens', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
280
|
+
it.skip('Get vaults by tokens', function () { return __awaiter(void 0, void 0, void 0, function () {
|
|
271
281
|
var a;
|
|
272
282
|
return __generator(this, function (_a) {
|
|
273
283
|
switch (_a.label) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/__tests__/index.test.ts"],"names":[],"mappings":";AAAA,sDAAsD;AACtD,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAE7B,yBAAuB;AAEvB,iFAA0D;AAC1D,sDAAwD;AACxD,iCAAgC;AAChC,kCAA0D;AAC1D,0EAAmD;AACnD,kCAckB;AAClB,uEAAiD;AACjD,qEAA+C;AAE/C,IAAM,gBAAgB,GAAG,IAAI,2BAAgB,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,WAAY,CAAC,EAAE,OAAO,CAAC,GAAG,CAAC,YAAa,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;AAE3G,0FAA0F;AAE1F,IAAM,QAAQ,GAAG,IAAI,wBAAY,CAAC,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"index.test.js","sourceRoot":"","sources":["../../../src/__tests__/index.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -75,7 +75,7 @@ function getUserBalance(accountAddress, vaultAddress, jsonProvider, dex, raw) {
|
|
|
75
75
|
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
76
76
|
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
77
77
|
}
|
|
78
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
78
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
79
79
|
case 2:
|
|
80
80
|
vault = _a.sent();
|
|
81
81
|
if (!vault)
|
|
@@ -101,7 +101,7 @@ function getTotalAmounts(vaultAddress, jsonProvider, dex, raw) {
|
|
|
101
101
|
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
102
102
|
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
103
103
|
}
|
|
104
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
104
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
105
105
|
case 2:
|
|
106
106
|
vault = _a.sent();
|
|
107
107
|
if (!vault)
|
|
@@ -141,7 +141,7 @@ function getTotalSupply(vaultAddress, jsonProvider, dex, raw) {
|
|
|
141
141
|
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
142
142
|
throw new Error("Unsupported chainId: ".concat(chainId !== null && chainId !== void 0 ? chainId : 'undefined'));
|
|
143
143
|
}
|
|
144
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
144
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
145
145
|
case 2:
|
|
146
146
|
vault = _a.sent();
|
|
147
147
|
if (!vault)
|
|
@@ -168,7 +168,7 @@ function getUserAmounts(accountAddress, vaultAddress, jsonProvider, dex, raw) {
|
|
|
168
168
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
169
169
|
}
|
|
170
170
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
171
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
171
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
172
172
|
case 2:
|
|
173
173
|
vault = _a.sent();
|
|
174
174
|
if (!vault)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../../src/functions/balances.ts"],"names":[],"mappings":";AAAA,iCAAiC;AACjC,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAGjD,iCAAmC;AACnC,0CAAsE;AACtE,kCAQkB;AAClB,uEAAiD;AACjD,2CAA2C;AAC3C,iCAA2C;AAE3C,SAAsB,gBAAgB,CAAC,YAAoB,EAAE,YAA6B;;;;;;oBAClF,aAAa,GAAG,IAAA,4BAAgB,EAAC,YAAY,EAAE,YAAY,CAAC,CAAC;oBAC7C,qBAAM,aAAa,CAAC,QAAQ,EAAE,EAAA;;oBAA9C,aAAa,GAAG,SAA8B;oBACpD,sBAAO,aAAa,aAAb,aAAa,cAAb,aAAa,GAAI,EAAE,EAAC;;;;CAC5B;AAJD,4CAIC;AAiBD,SAAsB,cAAc,CAClC,cAAsB,EACtB,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,GAAU;;;;;wBAEU,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,CAAE,CAAC,CAAC;qBACnE;oBACa,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;
|
|
1
|
+
{"version":3,"file":"balances.js","sourceRoot":"","sources":["../../../src/functions/balances.ts"],"names":[],"mappings":"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"}
|
|
@@ -72,7 +72,7 @@ function isTokenAllowed(tokenIdx, vaultAddress, jsonProvider, dex) {
|
|
|
72
72
|
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
73
73
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
74
74
|
}
|
|
75
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
75
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
76
76
|
case 2:
|
|
77
77
|
vault = _a.sent();
|
|
78
78
|
if (!vault)
|
|
@@ -97,7 +97,7 @@ function isDepositTokenApproved(accountAddress, tokenIdx, amount, vaultAddress,
|
|
|
97
97
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
98
98
|
}
|
|
99
99
|
signer = jsonProvider.getSigner(accountAddress);
|
|
100
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
100
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
101
101
|
case 2:
|
|
102
102
|
vault = _c.sent();
|
|
103
103
|
if (!vault)
|
|
@@ -131,7 +131,7 @@ function approveDepositToken(accountAddress, tokenIdx, vaultAddress, jsonProvide
|
|
|
131
131
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
132
132
|
}
|
|
133
133
|
signer = jsonProvider.getSigner(accountAddress);
|
|
134
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
134
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
135
135
|
case 2:
|
|
136
136
|
vault = _f.sent();
|
|
137
137
|
if (!vault)
|
|
@@ -175,7 +175,7 @@ function getMaxDepositAmount(tokenIdx, vaultAddress, jsonProvider, dex) {
|
|
|
175
175
|
if (!Object.values(types_1.SupportedChainId).includes(chainId)) {
|
|
176
176
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
177
177
|
}
|
|
178
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
178
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
179
179
|
case 2:
|
|
180
180
|
vault = _a.sent();
|
|
181
181
|
if (!vault)
|
|
@@ -202,7 +202,7 @@ function deposit(accountAddress, amount0, amount1, vaultAddress, jsonProvider, d
|
|
|
202
202
|
throw new Error("Unsupported chainId: ".concat(chainId));
|
|
203
203
|
}
|
|
204
204
|
signer = jsonProvider.getSigner(accountAddress);
|
|
205
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
205
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
206
206
|
case 2:
|
|
207
207
|
vault = _h.sent();
|
|
208
208
|
if (!vault)
|
|
@@ -236,7 +236,9 @@ function deposit(accountAddress, amount0, amount1, vaultAddress, jsonProvider, d
|
|
|
236
236
|
}
|
|
237
237
|
depositGuardAddress = (_d = (_c = addresses_1.default[chainId][dex]) === null || _c === void 0 ? void 0 : _c.depositGuardAddress) !== null && _d !== void 0 ? _d : '';
|
|
238
238
|
depositGuardContract = (0, contracts_1.getDepositGuardContract)(depositGuardAddress, signer);
|
|
239
|
-
return [4 /*yield*/, depositGuardContract.callStatic.forwardDepositToICHIVault(vaultAddress, vaultDeployerAddress, depositToken, depositAmount, ethers_1.BigNumber.from(0), accountAddress
|
|
239
|
+
return [4 /*yield*/, depositGuardContract.callStatic.forwardDepositToICHIVault(vaultAddress, vaultDeployerAddress, depositToken, depositAmount, ethers_1.BigNumber.from(0), accountAddress, {
|
|
240
|
+
gasLimit: 5e6, // the deposit via guard tx should never exceed 5e6
|
|
241
|
+
})];
|
|
240
242
|
case 5:
|
|
241
243
|
lpAmount = _h.sent();
|
|
242
244
|
// reduce the estimated LP amount by an acceptable slippage %, for example 1%
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/functions/deposit.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEA,sDAAsD;AACtD,iCAAmC;AACnC,0CAA+F;AAC/F,qEAA+C;AAC/C,kCAA0D;AAC1D,mFAA6D;AAC7D,uEAAiD;AACjD,2CAA2C;AAC3C,iCAA2C;AAC3C,wEAAsD;AAEtD,SAAsB,cAAc,CAClC,QAAe,EACf,YAAoB,EACpB,YAA6B,EAC7B,GAAiB;;;;;wBAEG,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBACf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,CAAE,CAAC,CAAC;qBACpD;oBAEa,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;
|
|
1
|
+
{"version":3,"file":"deposit.js","sourceRoot":"","sources":["../../../src/functions/deposit.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
1
2
|
import { SupportedDex, SupportedChainId } from '../types';
|
|
2
3
|
import { VaultQueryData, VaultsByTokensQueryData } from '../types/vaultQueryData';
|
|
3
|
-
export declare function getIchiVaultInfo(chainId: SupportedChainId, dex: SupportedDex, vaultAddress: string): Promise<VaultQueryData['ichiVault']>;
|
|
4
|
+
export declare function getIchiVaultInfo(chainId: SupportedChainId, dex: SupportedDex, vaultAddress: string, jsonProvider?: JsonRpcProvider): Promise<VaultQueryData['ichiVault']>;
|
|
4
5
|
export declare function getVaultsByTokens(chainId: SupportedChainId, dex: SupportedDex, depositTokenAddress: string, pairedTokenAddress: string): Promise<VaultsByTokensQueryData['ichiVaults']>;
|
|
@@ -48,13 +48,15 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
|
48
48
|
}
|
|
49
49
|
return to.concat(ar || Array.prototype.slice.call(from));
|
|
50
50
|
};
|
|
51
|
-
var _a, _b, _c, _d, _e;
|
|
51
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
52
52
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
53
|
exports.getVaultsByTokens = exports.getIchiVaultInfo = void 0;
|
|
54
54
|
// eslint-disable-next-line import/no-unresolved
|
|
55
55
|
var graphql_request_1 = require("graphql-request");
|
|
56
56
|
var types_1 = require("../types");
|
|
57
|
+
var contracts_1 = require("../contracts");
|
|
57
58
|
var promises = {};
|
|
59
|
+
// 'none' indicates that graph is not enabled on that chain
|
|
58
60
|
var urls = (_a = {},
|
|
59
61
|
_a[types_1.SupportedChainId.arbitrum] = (_b = {},
|
|
60
62
|
_b[types_1.SupportedDex.UniswapV3] = 'https://api.thegraph.com/subgraphs/name/ichi-org/arbitrum-v1',
|
|
@@ -73,11 +75,52 @@ var urls = (_a = {},
|
|
|
73
75
|
_e[types_1.SupportedDex.Pancakeswap] = 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-pancakeswap',
|
|
74
76
|
_e[types_1.SupportedDex.Thena] = 'https://api.thegraph.com/subgraphs/name/ichi-org/bnb-v1-thena',
|
|
75
77
|
_e),
|
|
78
|
+
_a[types_1.SupportedChainId.eon] = (_f = {},
|
|
79
|
+
_f[types_1.SupportedDex.Ascent] = 'none',
|
|
80
|
+
_f),
|
|
81
|
+
_a[types_1.SupportedChainId.hedera_testnet] = (_g = {},
|
|
82
|
+
_g[types_1.SupportedDex.SaucerSwap] = 'none',
|
|
83
|
+
_g),
|
|
76
84
|
_a);
|
|
77
85
|
var vaultQuery = (0, graphql_request_1.gql)(templateObject_1 || (templateObject_1 = __makeTemplateObject(["\n query ($vaultAddress: String!) {\n ichiVault(id: $vaultAddress) {\n id\n tokenA\n tokenB\n allowTokenA\n allowTokenB\n }\n }\n"], ["\n query ($vaultAddress: String!) {\n ichiVault(id: $vaultAddress) {\n id\n tokenA\n tokenB\n allowTokenA\n allowTokenB\n }\n }\n"])));
|
|
78
86
|
var vaultByTokensQuery = (0, graphql_request_1.gql)(templateObject_2 || (templateObject_2 = __makeTemplateObject(["\n query ($addressTokenA: String!, $addressTokenB: String!) {\n ichiVaults(where: { tokenA: $addressTokenA, tokenB: $addressTokenB }) {\n id\n tokenA\n tokenB\n allowTokenA\n allowTokenB\n }\n }\n"], ["\n query ($addressTokenA: String!, $addressTokenB: String!) {\n ichiVaults(where: { tokenA: $addressTokenA, tokenB: $addressTokenB }) {\n id\n tokenA\n tokenB\n allowTokenA\n allowTokenB\n }\n }\n"])));
|
|
87
|
+
function getVaultInfoFromContract(vaultAddress, jsonProvider) {
|
|
88
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
89
|
+
var vault, vaultContract, _a, _b, _c, _d;
|
|
90
|
+
return __generator(this, function (_e) {
|
|
91
|
+
switch (_e.label) {
|
|
92
|
+
case 0:
|
|
93
|
+
vault = {
|
|
94
|
+
id: vaultAddress,
|
|
95
|
+
tokenA: '',
|
|
96
|
+
tokenB: '',
|
|
97
|
+
allowTokenA: false,
|
|
98
|
+
allowTokenB: false,
|
|
99
|
+
};
|
|
100
|
+
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
101
|
+
_a = vault;
|
|
102
|
+
return [4 /*yield*/, vaultContract.token0()];
|
|
103
|
+
case 1:
|
|
104
|
+
_a.tokenA = _e.sent();
|
|
105
|
+
_b = vault;
|
|
106
|
+
return [4 /*yield*/, vaultContract.token1()];
|
|
107
|
+
case 2:
|
|
108
|
+
_b.tokenB = _e.sent();
|
|
109
|
+
_c = vault;
|
|
110
|
+
return [4 /*yield*/, vaultContract.allowToken0()];
|
|
111
|
+
case 3:
|
|
112
|
+
_c.allowTokenA = _e.sent();
|
|
113
|
+
_d = vault;
|
|
114
|
+
return [4 /*yield*/, vaultContract.allowToken1()];
|
|
115
|
+
case 4:
|
|
116
|
+
_d.allowTokenB = _e.sent();
|
|
117
|
+
return [2 /*return*/, vault];
|
|
118
|
+
}
|
|
119
|
+
});
|
|
120
|
+
});
|
|
121
|
+
}
|
|
79
122
|
// eslint-disable-next-line import/prefer-default-export
|
|
80
|
-
function getIchiVaultInfo(chainId, dex, vaultAddress) {
|
|
123
|
+
function getIchiVaultInfo(chainId, dex, vaultAddress, jsonProvider) {
|
|
81
124
|
return __awaiter(this, void 0, void 0, function () {
|
|
82
125
|
var key, url;
|
|
83
126
|
return __generator(this, function (_a) {
|
|
@@ -89,14 +132,25 @@ function getIchiVaultInfo(chainId, dex, vaultAddress) {
|
|
|
89
132
|
url = urls[chainId][dex];
|
|
90
133
|
if (!url)
|
|
91
134
|
throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
}
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
|
|
99
|
-
|
|
135
|
+
if (url === 'none' && jsonProvider) {
|
|
136
|
+
promises[key] = getVaultInfoFromContract(vaultAddress, jsonProvider);
|
|
137
|
+
}
|
|
138
|
+
else {
|
|
139
|
+
promises[key] = (0, graphql_request_1.request)(url, vaultQuery, {
|
|
140
|
+
vaultAddress: vaultAddress,
|
|
141
|
+
})
|
|
142
|
+
.then(function (_a) {
|
|
143
|
+
var ichiVault = _a.ichiVault;
|
|
144
|
+
return ichiVault;
|
|
145
|
+
})
|
|
146
|
+
.catch(function (err) {
|
|
147
|
+
console.error(err);
|
|
148
|
+
if (jsonProvider) {
|
|
149
|
+
promises[key] = getVaultInfoFromContract(vaultAddress, jsonProvider);
|
|
150
|
+
}
|
|
151
|
+
})
|
|
152
|
+
.finally(function () { return setTimeout(function () { return delete promises[key]; }, 2 * 60 * 100 /* 2 mins */); });
|
|
153
|
+
}
|
|
100
154
|
return [4 /*yield*/, promises[key]];
|
|
101
155
|
case 1:
|
|
102
156
|
// eslint-disable-next-line no-return-await
|
|
@@ -115,6 +169,8 @@ function getVaultsByTokens(chainId, dex, depositTokenAddress, pairedTokenAddress
|
|
|
115
169
|
url = urls[chainId][dex];
|
|
116
170
|
if (!url)
|
|
117
171
|
throw new Error("Unsupported DEX ".concat(dex, " on chain ").concat(chainId));
|
|
172
|
+
if (url === 'none')
|
|
173
|
+
throw new Error("Function not available for DEX ".concat(dex, " on chain ").concat(chainId));
|
|
118
174
|
addressTokenA = depositTokenAddress;
|
|
119
175
|
addressTokenB = pairedTokenAddress;
|
|
120
176
|
key1 = "".concat(addressTokenA, "-").concat(addressTokenB);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/functions/vault.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,gDAAgD;AAChD,mDAA+C;
|
|
1
|
+
{"version":3,"file":"vault.js","sourceRoot":"","sources":["../../../src/functions/vault.ts"],"names":[],"mappings":"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"}
|
|
@@ -74,7 +74,7 @@ function withdraw(accountAddress, shares, vaultAddress, jsonProvider, dex, overr
|
|
|
74
74
|
}
|
|
75
75
|
signer = jsonProvider.getSigner(accountAddress);
|
|
76
76
|
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, signer);
|
|
77
|
-
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress)];
|
|
77
|
+
return [4 /*yield*/, (0, vault_1.getIchiVaultInfo)(chainId, dex, vaultAddress, jsonProvider)];
|
|
78
78
|
case 2:
|
|
79
79
|
vault = _e.sent();
|
|
80
80
|
if (!vault)
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/functions/withdraw.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjD,iCAAmC;AACnC,0CAAoD;AACpD,qEAA+C;AAC/C,kCAA0D;AAC1D,mFAA6D;AAC7D,2CAA2C;AAC3C,iCAA2C;AAE3C,SAAsB,QAAQ,CAC5B,cAAsB,EACtB,MAAmC,EACnC,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,SAAqB;;;;;;;wBAED,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBAEf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,CAAE,CAAC,CAAC;qBACnE;oBAEK,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;oBAEhD,aAAa,GAAG,IAAA,gCAAoB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;oBACnD,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,CAAC,EAAA;;
|
|
1
|
+
{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/functions/withdraw.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjD,iCAAmC;AACnC,0CAAoD;AACpD,qEAA+C;AAC/C,kCAA0D;AAC1D,mFAA6D;AAC7D,2CAA2C;AAC3C,iCAA2C;AAE3C,SAAsB,QAAQ,CAC5B,cAAsB,EACtB,MAAmC,EACnC,YAAoB,EACpB,YAA6B,EAC7B,GAAiB,EACjB,SAAqB;;;;;;;wBAED,qBAAM,YAAY,CAAC,UAAU,EAAE,EAAA;;oBAA3C,OAAO,GAAK,CAAA,SAA+B,CAAA,QAApC;oBAEf,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,wBAAgB,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;wBACtD,MAAM,IAAI,KAAK,CAAC,+BAAwB,OAAO,aAAP,OAAO,cAAP,OAAO,GAAI,WAAW,CAAE,CAAC,CAAC;qBACnE;oBAEK,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;oBAEhD,aAAa,GAAG,IAAA,gCAAoB,EAAC,YAAY,EAAE,MAAM,CAAC,CAAC;oBACnD,qBAAM,IAAA,wBAAgB,EAAC,OAAO,EAAE,GAAG,EAAE,YAAY,EAAE,YAAY,CAAC,EAAA;;oBAAxE,KAAK,GAAG,SAAgE;oBAC9E,IAAI,CAAC,KAAK;wBAAE,MAAM,IAAI,KAAK,CAAC,2BAAoB,OAAO,eAAK,YAAY,MAAG,CAAC,CAAC;oBAEvE,MAAM,GAA8C;wBACxD,MAAM,YAAY,kBAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAW,EAAC,MAAM,EAAE,EAAE,CAAC;wBAC9D,cAAc;qBACf,CAAC;gCAEe,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ;;;;oBAAI,KAAA,4BAAkB,CAAA;oBAAC,qBAAM,CAAA,KAAA,aAAa,CAAC,WAAW,CAAA,CAAC,QAAQ,WAAI,MAAM,GAAC;;oBAAtE,KAAA,kBAAmB,SAAmD,EAAC,CAAA;;;oBAAzG,QAAQ,KAAiG;oBAE/G,MAAM,CAAC,CAAC,CAAC,yBAAQ,SAAS,KAAE,QAAQ,UAAA,GAAE,CAAC;oBAEvC,sBAAO,aAAa,CAAC,QAAQ,OAAtB,aAAa,EAAa,MAAM,GAAE;;;;CAC1C;AA9BD,4BA8BC"}
|
package/dist/src/index.cjs.js
CHANGED
package/dist/src/index.esm.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
|
+
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
1
2
|
import { SupportedDex, SupportedChainId } from '../types';
|
|
2
3
|
import { VaultQueryData, VaultsByTokensQueryData } from '../types/vaultQueryData';
|
|
3
|
-
export declare function getIchiVaultInfo(chainId: SupportedChainId, dex: SupportedDex, vaultAddress: string): Promise<VaultQueryData['ichiVault']>;
|
|
4
|
+
export declare function getIchiVaultInfo(chainId: SupportedChainId, dex: SupportedDex, vaultAddress: string, jsonProvider?: JsonRpcProvider): Promise<VaultQueryData['ichiVault']>;
|
|
4
5
|
export declare function getVaultsByTokens(chainId: SupportedChainId, dex: SupportedDex, depositTokenAddress: string, pairedTokenAddress: string): Promise<VaultsByTokensQueryData['ichiVaults']>;
|
|
@@ -4,18 +4,22 @@ import { BigNumber } from 'ethers';
|
|
|
4
4
|
export type SignerOrProvider = Signer | Provider;
|
|
5
5
|
export declare enum SupportedChainId {
|
|
6
6
|
arbitrum = 42161,
|
|
7
|
+
bsc = 56,
|
|
8
|
+
eon = 7332,
|
|
9
|
+
hedera_testnet = 296,
|
|
7
10
|
mainnet = 1,
|
|
8
|
-
polygon = 137
|
|
9
|
-
bsc = 56
|
|
11
|
+
polygon = 137
|
|
10
12
|
}
|
|
11
13
|
export declare enum SupportedDex {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
Pancakeswap =
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
Ascent = "Ascent",
|
|
15
|
+
Horiza = "Horiza",
|
|
16
|
+
Pancakeswap = "PancakeSwap",
|
|
17
|
+
Quickswap = "QuickSwap",
|
|
18
|
+
Ramses = "Ramses",
|
|
19
|
+
Retro = "Retro",
|
|
20
|
+
SaucerSwap = "SaucerSwap",
|
|
21
|
+
Thena = "Thena",
|
|
22
|
+
UniswapV3 = "Uniswap V3"
|
|
19
23
|
}
|
|
20
24
|
export declare const ichiVaultDecimals = 18;
|
|
21
25
|
export type TotalAmountsBN = [BigNumber, BigNumber] & {
|
|
@@ -4,18 +4,22 @@ import { BigNumber } from 'ethers';
|
|
|
4
4
|
export type SignerOrProvider = Signer | Provider;
|
|
5
5
|
export declare enum SupportedChainId {
|
|
6
6
|
arbitrum = 42161,
|
|
7
|
+
bsc = 56,
|
|
8
|
+
eon = 7332,
|
|
9
|
+
hedera_testnet = 296,
|
|
7
10
|
mainnet = 1,
|
|
8
|
-
polygon = 137
|
|
9
|
-
bsc = 56
|
|
11
|
+
polygon = 137
|
|
10
12
|
}
|
|
11
13
|
export declare enum SupportedDex {
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
Pancakeswap =
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
14
|
+
Ascent = "Ascent",
|
|
15
|
+
Horiza = "Horiza",
|
|
16
|
+
Pancakeswap = "PancakeSwap",
|
|
17
|
+
Quickswap = "QuickSwap",
|
|
18
|
+
Ramses = "Ramses",
|
|
19
|
+
Retro = "Retro",
|
|
20
|
+
SaucerSwap = "SaucerSwap",
|
|
21
|
+
Thena = "Thena",
|
|
22
|
+
UniswapV3 = "Uniswap V3"
|
|
19
23
|
}
|
|
20
24
|
export declare const ichiVaultDecimals = 18;
|
|
21
25
|
export type TotalAmountsBN = [BigNumber, BigNumber] & {
|
package/dist/src/types/index.js
CHANGED
|
@@ -4,19 +4,23 @@ exports.ichiVaultDecimals = exports.SupportedDex = exports.SupportedChainId = vo
|
|
|
4
4
|
var SupportedChainId;
|
|
5
5
|
(function (SupportedChainId) {
|
|
6
6
|
SupportedChainId[SupportedChainId["arbitrum"] = 42161] = "arbitrum";
|
|
7
|
+
SupportedChainId[SupportedChainId["bsc"] = 56] = "bsc";
|
|
8
|
+
SupportedChainId[SupportedChainId["eon"] = 7332] = "eon";
|
|
9
|
+
SupportedChainId[SupportedChainId["hedera_testnet"] = 296] = "hedera_testnet";
|
|
7
10
|
SupportedChainId[SupportedChainId["mainnet"] = 1] = "mainnet";
|
|
8
11
|
SupportedChainId[SupportedChainId["polygon"] = 137] = "polygon";
|
|
9
|
-
SupportedChainId[SupportedChainId["bsc"] = 56] = "bsc";
|
|
10
12
|
})(SupportedChainId = exports.SupportedChainId || (exports.SupportedChainId = {}));
|
|
11
13
|
var SupportedDex;
|
|
12
14
|
(function (SupportedDex) {
|
|
13
|
-
SupportedDex[
|
|
14
|
-
SupportedDex[
|
|
15
|
-
SupportedDex[
|
|
16
|
-
SupportedDex[
|
|
17
|
-
SupportedDex[
|
|
18
|
-
SupportedDex[
|
|
19
|
-
SupportedDex[
|
|
15
|
+
SupportedDex["Ascent"] = "Ascent";
|
|
16
|
+
SupportedDex["Horiza"] = "Horiza";
|
|
17
|
+
SupportedDex["Pancakeswap"] = "PancakeSwap";
|
|
18
|
+
SupportedDex["Quickswap"] = "QuickSwap";
|
|
19
|
+
SupportedDex["Ramses"] = "Ramses";
|
|
20
|
+
SupportedDex["Retro"] = "Retro";
|
|
21
|
+
SupportedDex["SaucerSwap"] = "SaucerSwap";
|
|
22
|
+
SupportedDex["Thena"] = "Thena";
|
|
23
|
+
SupportedDex["UniswapV3"] = "Uniswap V3";
|
|
20
24
|
})(SupportedDex = exports.SupportedDex || (exports.SupportedDex = {}));
|
|
21
25
|
exports.ichiVaultDecimals = 18;
|
|
22
26
|
//# sourceMappingURL=index.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/types/index.ts"],"names":[],"mappings":";;;AAQA,IAAY,gBAOX;AAPD,WAAY,gBAAgB;IAC1B,mEAAgB,CAAA;IAChB,sDAAQ,CAAA;IACR,wDAAU,CAAA;IACV,6EAAoB,CAAA;IACpB,6DAAW,CAAA;IACX,+DAAa,CAAA;AACf,CAAC,EAPW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAO3B;AAED,IAAY,YAUX;AAVD,WAAY,YAAY;IACtB,iCAAiB,CAAA;IACjB,iCAAiB,CAAA;IACjB,2CAA2B,CAAA;IAC3B,uCAAuB,CAAA;IACvB,iCAAiB,CAAA;IACjB,+BAAe,CAAA;IACf,yCAAyB,CAAA;IACzB,+BAAe,CAAA;IACf,wCAAwB,CAAA;AAC1B,CAAC,EAVW,YAAY,GAAZ,oBAAY,KAAZ,oBAAY,QAUvB;AAEY,QAAA,iBAAiB,GAAG,EAAE,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
var _a, _b, _c, _d, _e;
|
|
2
|
+
var _a, _b, _c, _d, _e, _f, _g;
|
|
3
3
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
4
4
|
var types_1 = require("../../types");
|
|
5
5
|
var addressConfig = (_a = {},
|
|
@@ -56,6 +56,20 @@ var addressConfig = (_a = {},
|
|
|
56
56
|
vaultDeployerAddress: '0x05cC3CA6E768a68A7f86b09e3ceE754437bd5f12',
|
|
57
57
|
},
|
|
58
58
|
_e),
|
|
59
|
+
_a[types_1.SupportedChainId.eon] = (_f = {},
|
|
60
|
+
_f[types_1.SupportedDex.Ascent] = {
|
|
61
|
+
factoryAddress: '0x242cd12579467983dc521D8aC46EB13936ab65De',
|
|
62
|
+
depositGuardAddress: '0xaBe5B5AC472Ead17B4B4CaC7fAF42430748ab3b3',
|
|
63
|
+
vaultDeployerAddress: '0xB9200A707f11357D3B1cBDEbd51c8dDA84960Bde',
|
|
64
|
+
},
|
|
65
|
+
_f),
|
|
66
|
+
_a[types_1.SupportedChainId.hedera_testnet] = (_g = {},
|
|
67
|
+
_g[types_1.SupportedDex.SaucerSwap] = {
|
|
68
|
+
factoryAddress: '0x1F91CE23502473C501EA498DbC7CA1Eef9Bbc4B6',
|
|
69
|
+
depositGuardAddress: '0x0B0C5E6c39195301D8922C89b873836b206A0d1e',
|
|
70
|
+
vaultDeployerAddress: '0xEc7428cB95cD92e7556172FfBe735c6D48f6DEB7',
|
|
71
|
+
},
|
|
72
|
+
_g),
|
|
59
73
|
_a);
|
|
60
74
|
exports.default = addressConfig;
|
|
61
75
|
//# sourceMappingURL=addresses.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../../src/utils/config/addresses.ts"],"names":[],"mappings":";;;AAAA,qCAA6D;AAY7D,IAAM,aAAa;IACjB,GAAC,wBAAgB,CAAC,QAAQ;QACxB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,WAAW,IAAG;YAC1B,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;OACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|
|
1
|
+
{"version":3,"file":"addresses.js","sourceRoot":"","sources":["../../../../src/utils/config/addresses.ts"],"names":[],"mappings":";;;AAAA,qCAA6D;AAY7D,IAAM,aAAa;IACjB,GAAC,wBAAgB,CAAC,QAAQ;QACxB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,OAAO;QACvB,GAAC,oBAAY,CAAC,SAAS,IAAG;YACxB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,WAAW,IAAG;YAC1B,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;QACD,GAAC,oBAAY,CAAC,KAAK,IAAG;YACpB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,GAAG;QACnB,GAAC,oBAAY,CAAC,MAAM,IAAG;YACrB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;IACD,GAAC,wBAAgB,CAAC,cAAc;QAC9B,GAAC,oBAAY,CAAC,UAAU,IAAG;YACzB,cAAc,EAAE,4CAA4C;YAC5D,mBAAmB,EAAE,4CAA4C;YACjE,oBAAoB,EAAE,4CAA4C;SACnE;WACF;OACF,CAAC;AAEF,kBAAe,aAAa,CAAC"}
|