@ichidao/ichi-vaults-sdk 0.1.40 → 0.1.41
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +205 -0
- package/dist/abis/types/DepositGuardWithHtsWrapping.d.ts +339 -0
- package/dist/abis/types/DepositGuardWithHtsWrapping.js +3 -0
- package/dist/abis/types/DepositGuardWithHtsWrapping.js.map +1 -0
- package/dist/abis/types/ERC20Wrapper.d.ts +171 -0
- package/dist/abis/types/ERC20Wrapper.js +3 -0
- package/dist/abis/types/ERC20Wrapper.js.map +1 -0
- package/dist/abis/types/factories/DepositGuardWithHtsWrapping__factory.d.ts +410 -0
- package/dist/abis/types/factories/DepositGuardWithHtsWrapping__factory.js +540 -0
- package/dist/abis/types/factories/DepositGuardWithHtsWrapping__factory.js.map +1 -0
- package/dist/abis/types/factories/ERC20Wrapper__factory.d.ts +168 -0
- package/dist/abis/types/factories/ERC20Wrapper__factory.js +235 -0
- package/dist/abis/types/factories/ERC20Wrapper__factory.js.map +1 -0
- package/dist/abis/types/factories/index.d.ts +2 -0
- package/dist/abis/types/factories/index.js +5 -1
- package/dist/abis/types/factories/index.js.map +1 -1
- package/dist/abis/types/index.d.ts +4 -0
- package/dist/abis/types/index.js +5 -1
- package/dist/abis/types/index.js.map +1 -1
- package/dist/src/__tests__/index.test.js +112 -15
- package/dist/src/__tests__/index.test.js.map +1 -1
- package/dist/src/abis/types/DepositGuardWithHtsWrapping.d.ts +339 -0
- package/dist/src/abis/types/ERC20Wrapper.d.ts +171 -0
- package/dist/src/abis/types/factories/DepositGuardWithHtsWrapping__factory.d.ts +410 -0
- package/dist/src/abis/types/factories/ERC20Wrapper__factory.d.ts +168 -0
- package/dist/src/abis/types/factories/index.d.ts +2 -0
- package/dist/src/abis/types/index.d.ts +4 -0
- package/dist/src/contracts/index.d.ts +3 -1
- package/dist/src/contracts/index.js +11 -1
- package/dist/src/contracts/index.js.map +1 -1
- package/dist/src/functions/_withdrawHelpers.d.ts +4 -0
- package/dist/src/functions/_withdrawHelpers.js +72 -0
- package/dist/src/functions/_withdrawHelpers.js.map +1 -0
- package/dist/src/functions/depositWithHtsWrapping.d.ts +8 -0
- package/dist/src/functions/depositWithHtsWrapping.js +243 -0
- package/dist/src/functions/depositWithHtsWrapping.js.map +1 -0
- package/dist/src/functions/withdraw.js +4 -26
- package/dist/src/functions/withdraw.js.map +1 -1
- package/dist/src/functions/withdrawWithErc20Wrapping.d.ts +5 -0
- package/dist/src/functions/withdrawWithErc20Wrapping.js +137 -0
- package/dist/src/functions/withdrawWithErc20Wrapping.js.map +1 -0
- package/dist/src/index.cjs.js +3 -1
- package/dist/src/index.d.ts +2 -0
- package/dist/src/index.esm.js +3 -1
- package/dist/src/index.js +2 -0
- package/dist/src/index.js.map +1 -1
- package/dist/src/src/contracts/index.d.ts +3 -1
- package/dist/src/src/functions/_withdrawHelpers.d.ts +4 -0
- package/dist/src/src/functions/depositWithHtsWrapping.d.ts +8 -0
- package/dist/src/src/functions/withdrawWithErc20Wrapping.d.ts +5 -0
- package/dist/src/src/index.d.ts +2 -0
- package/dist/src/src/utils/config/addresses.d.ts +1 -0
- package/dist/src/src/utils/multicallUtils.d.ts +1 -1
- package/dist/src/utils/config/addresses.d.ts +1 -0
- package/dist/src/utils/config/addresses.js +4 -2
- package/dist/src/utils/config/addresses.js.map +1 -1
- package/dist/src/utils/multicallUtils.d.ts +1 -1
- package/dist/src/utils/multicallUtils.js +26 -2
- package/dist/src/utils/multicallUtils.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,72 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
+
});
|
|
10
|
+
};
|
|
11
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
+
function step(op) {
|
|
16
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
+
switch (op[0]) {
|
|
21
|
+
case 0: case 1: t = op; break;
|
|
22
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
+
default:
|
|
26
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
+
if (t[2]) _.ops.pop();
|
|
31
|
+
_.trys.pop(); continue;
|
|
32
|
+
}
|
|
33
|
+
op = body.call(thisArg, _);
|
|
34
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
+
}
|
|
37
|
+
};
|
|
38
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
+
};
|
|
41
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
|
+
exports._isVaultTokenApproved = void 0;
|
|
43
|
+
var ethers_1 = require("ethers");
|
|
44
|
+
var contracts_1 = require("../contracts");
|
|
45
|
+
var parseBigInt_1 = __importDefault(require("../utils/parseBigInt"));
|
|
46
|
+
var types_1 = require("../types");
|
|
47
|
+
var addresses_1 = require("../utils/config/addresses");
|
|
48
|
+
// eslint-disable-next-line no-underscore-dangle
|
|
49
|
+
function _isVaultTokenApproved(accountAddress, shares, vault, chainId, jsonProvider, dex) {
|
|
50
|
+
var _a;
|
|
51
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
52
|
+
var signer, vaultTokenContract, depositGuardAddress, currentAllowanceBN, sharesBN;
|
|
53
|
+
return __generator(this, function (_b) {
|
|
54
|
+
switch (_b.label) {
|
|
55
|
+
case 0:
|
|
56
|
+
signer = jsonProvider.getSigner(accountAddress);
|
|
57
|
+
vaultTokenContract = (0, contracts_1.getERC20Contract)(vault.id, signer);
|
|
58
|
+
depositGuardAddress = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address;
|
|
59
|
+
if (!depositGuardAddress) {
|
|
60
|
+
throw new Error("Deposit Guard for vault ".concat(vault.id, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
61
|
+
}
|
|
62
|
+
return [4 /*yield*/, vaultTokenContract.allowance(accountAddress, depositGuardAddress)];
|
|
63
|
+
case 1:
|
|
64
|
+
currentAllowanceBN = _b.sent();
|
|
65
|
+
sharesBN = shares instanceof ethers_1.BigNumber ? shares : (0, parseBigInt_1.default)(shares, types_1.ichiVaultDecimals);
|
|
66
|
+
return [2 /*return*/, currentAllowanceBN.gt(ethers_1.BigNumber.from(0)) && currentAllowanceBN.gte(sharesBN)];
|
|
67
|
+
}
|
|
68
|
+
});
|
|
69
|
+
});
|
|
70
|
+
}
|
|
71
|
+
exports._isVaultTokenApproved = _isVaultTokenApproved;
|
|
72
|
+
//# sourceMappingURL=_withdrawHelpers.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"_withdrawHelpers.js","sourceRoot":"","sources":["../../../src/functions/_withdrawHelpers.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,iCAAmC;AACnC,0CAAgD;AAChD,qEAA+C;AAC/C,kCAAwF;AACxF,uDAA0D;AAE1D,gDAAgD;AAChD,SAAsB,qBAAqB,CACzC,cAAsB,EACtB,MAAmC,EACnC,KAAgB,EAChB,OAAyB,EACzB,YAA6B,EAC7B,GAAiB;;;;;;;oBAEX,MAAM,GAAG,YAAY,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC;oBAEhD,kBAAkB,GAAG,IAAA,4BAAgB,EAAC,KAAK,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;oBACxD,mBAAmB,GAAG,MAAA,yBAAa,CAAC,OAA2B,CAAE,CAAC,GAAG,CAAC,0CAAE,YAAY,CAAC,OAAO,CAAC;oBACnG,IAAI,CAAC,mBAAmB,EAAE;wBACxB,MAAM,IAAI,KAAK,CAAC,kCAA2B,KAAK,CAAC,EAAE,iCAAuB,OAAO,sBAAY,GAAG,CAAE,CAAC,CAAC;qBACrG;oBAC0B,qBAAM,kBAAkB,CAAC,SAAS,CAAC,cAAc,EAAE,mBAAmB,CAAC,EAAA;;oBAA5F,kBAAkB,GAAG,SAAuE;oBAE5F,QAAQ,GAAG,MAAM,YAAY,kBAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,IAAA,qBAAW,EAAC,MAAM,EAAE,yBAAiB,CAAC,CAAC;oBAE/F,sBAAO,kBAAkB,CAAC,EAAE,CAAC,kBAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,kBAAkB,CAAC,GAAG,CAAC,QAAQ,CAAC,EAAC;;;;CACrF;AApBD,sDAoBC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { ContractTransaction, Overrides } from '@ethersproject/contracts';
|
|
2
|
+
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
3
|
+
import { BigNumber } from 'ethers';
|
|
4
|
+
import { SupportedDex } from '../types';
|
|
5
|
+
export declare function isTokenApproved(accountAddress: string, tokenAddress: string, amount: string | number | BigNumber, vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex): Promise<boolean>;
|
|
6
|
+
export declare function approveToken(accountAddress: string, tokenAddress: string, vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, amount?: string | number | BigNumber, overrides?: Overrides): Promise<ContractTransaction>;
|
|
7
|
+
export declare function getActualDepositToken(depositToken: string, jsonProvider: JsonRpcProvider): Promise<string>;
|
|
8
|
+
export declare function depositWithHtsWrapping(accountAddress: string, amount0: string | number | BigNumber, amount1: string | number | BigNumber, vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, percentSlippage?: number, overrides?: Overrides): Promise<ContractTransaction>;
|
|
@@ -0,0 +1,243 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
52
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
+
exports.depositWithHtsWrapping = exports.getActualDepositToken = exports.approveToken = exports.isTokenApproved = void 0;
|
|
54
|
+
var constants_1 = require("@ethersproject/constants");
|
|
55
|
+
var ethers_1 = require("ethers");
|
|
56
|
+
var contracts_1 = require("../contracts");
|
|
57
|
+
var parseBigInt_1 = __importDefault(require("../utils/parseBigInt"));
|
|
58
|
+
var types_1 = require("../types");
|
|
59
|
+
var calculateGasMargin_1 = require("../types/calculateGasMargin");
|
|
60
|
+
// eslint-disable-next-line import/no-cycle
|
|
61
|
+
var vault_1 = require("./vault");
|
|
62
|
+
var addresses_1 = require("../utils/config/addresses");
|
|
63
|
+
var vaultBasics_1 = __importDefault(require("./vaultBasics"));
|
|
64
|
+
var _totalBalances_1 = require("./_totalBalances");
|
|
65
|
+
function isTokenApproved(accountAddress, tokenAddress, amount, vaultAddress, jsonProvider, dex) {
|
|
66
|
+
var _a, _b;
|
|
67
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
68
|
+
var chainId, tokenContract, depositGuardAddress, currentAllowanceBN, tokenDecimals, amountBN;
|
|
69
|
+
return __generator(this, function (_c) {
|
|
70
|
+
switch (_c.label) {
|
|
71
|
+
case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
|
|
72
|
+
case 1:
|
|
73
|
+
chainId = (_c.sent()).chainId;
|
|
74
|
+
tokenContract = (0, contracts_1.getERC20Contract)(tokenAddress, jsonProvider);
|
|
75
|
+
depositGuardAddress = (_b = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address) !== null && _b !== void 0 ? _b : '';
|
|
76
|
+
return [4 /*yield*/, tokenContract.allowance(accountAddress, depositGuardAddress)];
|
|
77
|
+
case 2:
|
|
78
|
+
currentAllowanceBN = _c.sent();
|
|
79
|
+
return [4 /*yield*/, tokenContract.decimals()];
|
|
80
|
+
case 3:
|
|
81
|
+
tokenDecimals = _c.sent();
|
|
82
|
+
amountBN = amount instanceof ethers_1.BigNumber ? amount : (0, parseBigInt_1.default)(amount, tokenDecimals);
|
|
83
|
+
return [2 /*return*/, currentAllowanceBN.gt(ethers_1.BigNumber.from(0)) && currentAllowanceBN.gte(amountBN)];
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
exports.isTokenApproved = isTokenApproved;
|
|
89
|
+
function approveToken(accountAddress, tokenAddress, vaultAddress, jsonProvider, dex, amount, overrides) {
|
|
90
|
+
var _a, _b, _c;
|
|
91
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
92
|
+
var chainId, signer, tokenContract, tokenDecimals, amountBN, depositGuardAddress, gasLimit, _d, _e;
|
|
93
|
+
return __generator(this, function (_f) {
|
|
94
|
+
switch (_f.label) {
|
|
95
|
+
case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
|
|
96
|
+
case 1:
|
|
97
|
+
chainId = (_f.sent()).chainId;
|
|
98
|
+
signer = jsonProvider.getSigner(accountAddress);
|
|
99
|
+
tokenContract = (0, contracts_1.getERC20Contract)(tokenAddress, signer);
|
|
100
|
+
return [4 /*yield*/, tokenContract.decimals()];
|
|
101
|
+
case 2:
|
|
102
|
+
tokenDecimals = _f.sent();
|
|
103
|
+
amountBN = amount
|
|
104
|
+
? amount instanceof ethers_1.BigNumber
|
|
105
|
+
? amount
|
|
106
|
+
: (0, parseBigInt_1.default)(amount, +tokenDecimals || 18)
|
|
107
|
+
: constants_1.MaxUint256;
|
|
108
|
+
depositGuardAddress = (_b = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address) !== null && _b !== void 0 ? _b : '';
|
|
109
|
+
if (!((_c = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _c !== void 0)) return [3 /*break*/, 3];
|
|
110
|
+
_d = _c;
|
|
111
|
+
return [3 /*break*/, 5];
|
|
112
|
+
case 3:
|
|
113
|
+
_e = calculateGasMargin_1.calculateGasMargin;
|
|
114
|
+
return [4 /*yield*/, tokenContract.estimateGas.approve(depositGuardAddress, amountBN)];
|
|
115
|
+
case 4:
|
|
116
|
+
_d = _e.apply(void 0, [_f.sent()]);
|
|
117
|
+
_f.label = 5;
|
|
118
|
+
case 5:
|
|
119
|
+
gasLimit = _d;
|
|
120
|
+
return [2 /*return*/, tokenContract.approve(depositGuardAddress, amountBN, { gasLimit: gasLimit })];
|
|
121
|
+
}
|
|
122
|
+
});
|
|
123
|
+
});
|
|
124
|
+
}
|
|
125
|
+
exports.approveToken = approveToken;
|
|
126
|
+
function getActualDepositToken(depositToken, jsonProvider) {
|
|
127
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
128
|
+
var erc20WrapperContract, erc20Counterpart;
|
|
129
|
+
return __generator(this, function (_a) {
|
|
130
|
+
switch (_a.label) {
|
|
131
|
+
case 0:
|
|
132
|
+
erc20WrapperContract = (0, contracts_1.getERC20WrapperContract)(addresses_1.ERC20_WRAPPER_ADDRESS, jsonProvider);
|
|
133
|
+
return [4 /*yield*/, erc20WrapperContract.erc20Counterpart(depositToken)];
|
|
134
|
+
case 1:
|
|
135
|
+
erc20Counterpart = _a.sent();
|
|
136
|
+
// If there's a valid ERC20 counterpart (non-zero address), return it; otherwise return original token
|
|
137
|
+
return [2 /*return*/, erc20Counterpart !== '0x0000000000000000000000000000000000000000' ? erc20Counterpart : depositToken];
|
|
138
|
+
}
|
|
139
|
+
});
|
|
140
|
+
});
|
|
141
|
+
}
|
|
142
|
+
exports.getActualDepositToken = getActualDepositToken;
|
|
143
|
+
function depositWithHtsWrapping(accountAddress, amount0, amount1, vaultAddress, jsonProvider, dex, percentSlippage, overrides) {
|
|
144
|
+
var _a, _b, _c;
|
|
145
|
+
if (percentSlippage === void 0) { percentSlippage = 1; }
|
|
146
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
147
|
+
var _d, chainId, vault, signer, vaultDeployerAddress, token0, token1, isToken0Allowed, isToken1Allowed, token0Decimals, token1Decimals, amount0BN, amount1BN, depositAmount, depositToken, actualDepositToken, isApproved, tokenContract, userTokenBalance, vaultContract, maxDeposit0, maxDeposit1, depositGuardAddress, depositGuardContract, maxGasLimit, lpAmount, gasLimit, _e, _f, tx;
|
|
148
|
+
return __generator(this, function (_g) {
|
|
149
|
+
switch (_g.label) {
|
|
150
|
+
case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
|
|
151
|
+
case 1:
|
|
152
|
+
_d = _g.sent(), chainId = _d.chainId, vault = _d.vault;
|
|
153
|
+
// This function is only applicable for BONZO vaults on Hedera
|
|
154
|
+
if (dex !== types_1.SupportedDex.Bonzo || chainId !== types_1.SupportedChainId.hedera) {
|
|
155
|
+
throw new Error("depositWithHtsWrapping is only supported for Bonzo vaults on Hedera. Got dex: ".concat(dex, ", chainId: ").concat(chainId));
|
|
156
|
+
}
|
|
157
|
+
signer = jsonProvider.getSigner(accountAddress);
|
|
158
|
+
vaultDeployerAddress = (0, vaultBasics_1.default)(vaultAddress, chainId, dex);
|
|
159
|
+
token0 = vault.tokenA;
|
|
160
|
+
token1 = vault.tokenB;
|
|
161
|
+
isToken0Allowed = vault.allowTokenA;
|
|
162
|
+
isToken1Allowed = vault.allowTokenB;
|
|
163
|
+
return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(token0, jsonProvider, chainId)];
|
|
164
|
+
case 2:
|
|
165
|
+
token0Decimals = _g.sent();
|
|
166
|
+
return [4 /*yield*/, (0, _totalBalances_1.getTokenDecimals)(token1, jsonProvider, chainId)];
|
|
167
|
+
case 3:
|
|
168
|
+
token1Decimals = _g.sent();
|
|
169
|
+
amount0BN = amount0 instanceof ethers_1.BigNumber ? amount0 : (0, parseBigInt_1.default)(amount0, +token0Decimals);
|
|
170
|
+
amount1BN = amount1 instanceof ethers_1.BigNumber ? amount1 : (0, parseBigInt_1.default)(amount1, +token1Decimals);
|
|
171
|
+
if (!isToken0Allowed && amount0BN.gt(ethers_1.BigNumber.from(0))) {
|
|
172
|
+
throw new Error("Deposit of token0 is not allowed: ".concat(chainId, ", ").concat(vaultAddress));
|
|
173
|
+
}
|
|
174
|
+
if (!isToken1Allowed && amount1BN.gt(ethers_1.BigNumber.from(0))) {
|
|
175
|
+
throw new Error("Deposit of token1 is not allowed: chain ".concat(chainId, ", vault ").concat(vaultAddress));
|
|
176
|
+
}
|
|
177
|
+
depositAmount = amount0BN;
|
|
178
|
+
depositToken = token0;
|
|
179
|
+
if (amount1BN.gt(ethers_1.BigNumber.from(0))) {
|
|
180
|
+
depositAmount = amount1BN;
|
|
181
|
+
depositToken = token1;
|
|
182
|
+
}
|
|
183
|
+
return [4 /*yield*/, getActualDepositToken(depositToken, jsonProvider)];
|
|
184
|
+
case 4:
|
|
185
|
+
actualDepositToken = _g.sent();
|
|
186
|
+
return [4 /*yield*/, isTokenApproved(accountAddress, actualDepositToken, depositAmount, vaultAddress, jsonProvider, dex)];
|
|
187
|
+
case 5:
|
|
188
|
+
isApproved = _g.sent();
|
|
189
|
+
if (!isApproved) {
|
|
190
|
+
throw new Error("Deposit is not approved for token: ".concat(actualDepositToken, ", chain ").concat(chainId, ", vault ").concat(vaultAddress));
|
|
191
|
+
}
|
|
192
|
+
tokenContract = (0, contracts_1.getERC20Contract)(actualDepositToken, jsonProvider);
|
|
193
|
+
return [4 /*yield*/, tokenContract.balanceOf(accountAddress)];
|
|
194
|
+
case 6:
|
|
195
|
+
userTokenBalance = _g.sent();
|
|
196
|
+
if (userTokenBalance.lt(depositAmount)) {
|
|
197
|
+
throw new Error("Deposit amount exceeds user token amount for token: ".concat(actualDepositToken, ", chain ").concat(chainId));
|
|
198
|
+
}
|
|
199
|
+
vaultContract = (0, contracts_1.getIchiVaultContract)(vaultAddress, jsonProvider);
|
|
200
|
+
return [4 /*yield*/, vaultContract.deposit0Max()];
|
|
201
|
+
case 7:
|
|
202
|
+
maxDeposit0 = _g.sent();
|
|
203
|
+
return [4 /*yield*/, vaultContract.deposit1Max()];
|
|
204
|
+
case 8:
|
|
205
|
+
maxDeposit1 = _g.sent();
|
|
206
|
+
if (amount0BN.gt(maxDeposit0) || amount1BN.gt(maxDeposit1)) {
|
|
207
|
+
throw new Error("Deposit amount exceeds max deposit amount: vault ".concat(vaultAddress, ", chain ").concat(chainId));
|
|
208
|
+
}
|
|
209
|
+
depositGuardAddress = (_b = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address) !== null && _b !== void 0 ? _b : '';
|
|
210
|
+
depositGuardContract = (0, contracts_1.getDepositGuardWithHtsWrappingContract)(depositGuardAddress, signer);
|
|
211
|
+
maxGasLimit = (0, calculateGasMargin_1.getGasLimit)(chainId);
|
|
212
|
+
return [4 /*yield*/, depositGuardContract.callStatic.depositToICHIVaultAndTryWrapToHTS(vaultAddress, vaultDeployerAddress, actualDepositToken, depositAmount, ethers_1.BigNumber.from(0), accountAddress, {
|
|
213
|
+
gasLimit: maxGasLimit,
|
|
214
|
+
})];
|
|
215
|
+
case 9:
|
|
216
|
+
lpAmount = _g.sent();
|
|
217
|
+
// reduce the estimated LP amount by an acceptable slippage %, for example 1%
|
|
218
|
+
if (percentSlippage < 0.01)
|
|
219
|
+
throw new Error('Slippage parameter is less than 0.01%.');
|
|
220
|
+
if (percentSlippage > 100)
|
|
221
|
+
throw new Error('Slippage parameter is more than 100%.');
|
|
222
|
+
lpAmount = lpAmount.mul(Math.floor((100 - percentSlippage) * 1000)).div(100000);
|
|
223
|
+
if (!((_c = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _c !== void 0)) return [3 /*break*/, 10];
|
|
224
|
+
_e = _c;
|
|
225
|
+
return [3 /*break*/, 12];
|
|
226
|
+
case 10:
|
|
227
|
+
_f = calculateGasMargin_1.calculateGasMargin;
|
|
228
|
+
return [4 /*yield*/, depositGuardContract.estimateGas.depositToICHIVaultAndTryWrapToHTS(vaultAddress, vaultDeployerAddress, actualDepositToken, depositAmount, lpAmount, accountAddress)];
|
|
229
|
+
case 11:
|
|
230
|
+
_e = _f.apply(void 0, [_g.sent()]);
|
|
231
|
+
_g.label = 12;
|
|
232
|
+
case 12:
|
|
233
|
+
gasLimit = _e;
|
|
234
|
+
return [4 /*yield*/, depositGuardContract.depositToICHIVaultAndTryWrapToHTS(vaultAddress, vaultDeployerAddress, actualDepositToken, depositAmount, lpAmount, accountAddress, __assign(__assign({}, overrides), { gasLimit: gasLimit }))];
|
|
235
|
+
case 13:
|
|
236
|
+
tx = _g.sent();
|
|
237
|
+
return [2 /*return*/, tx];
|
|
238
|
+
}
|
|
239
|
+
});
|
|
240
|
+
});
|
|
241
|
+
}
|
|
242
|
+
exports.depositWithHtsWrapping = depositWithHtsWrapping;
|
|
243
|
+
//# sourceMappingURL=depositWithHtsWrapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"depositWithHtsWrapping.js","sourceRoot":"","sources":["../../../src/functions/depositWithHtsWrapping.ts"],"names":[],"mappings":"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"}
|
|
@@ -57,6 +57,7 @@ var constants_1 = require("@ethersproject/constants");
|
|
|
57
57
|
var contracts_1 = require("../contracts");
|
|
58
58
|
var parseBigInt_1 = __importDefault(require("../utils/parseBigInt"));
|
|
59
59
|
var types_1 = require("../types");
|
|
60
|
+
var _withdrawHelpers_1 = require("./_withdrawHelpers");
|
|
60
61
|
var calculateGasMargin_1 = require("../types/calculateGasMargin");
|
|
61
62
|
// eslint-disable-next-line import/no-cycle
|
|
62
63
|
var vault_1 = require("./vault");
|
|
@@ -101,29 +102,6 @@ function approveVaultToken(accountAddress, vaultAddress, jsonProvider, dex, shar
|
|
|
101
102
|
});
|
|
102
103
|
}
|
|
103
104
|
exports.approveVaultToken = approveVaultToken;
|
|
104
|
-
// eslint-disable-next-line no-underscore-dangle
|
|
105
|
-
function _isVaultTokenApproved(accountAddress, shares, vault, chainId, jsonProvider, dex) {
|
|
106
|
-
var _a;
|
|
107
|
-
return __awaiter(this, void 0, void 0, function () {
|
|
108
|
-
var signer, vaultTokenContract, depositGuardAddress, currentAllowanceBN, sharesBN;
|
|
109
|
-
return __generator(this, function (_b) {
|
|
110
|
-
switch (_b.label) {
|
|
111
|
-
case 0:
|
|
112
|
-
signer = jsonProvider.getSigner(accountAddress);
|
|
113
|
-
vaultTokenContract = (0, contracts_1.getERC20Contract)(vault.id, signer);
|
|
114
|
-
depositGuardAddress = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address;
|
|
115
|
-
if (!depositGuardAddress) {
|
|
116
|
-
throw new Error("Deposit Guard for vault ".concat(vault.id, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
117
|
-
}
|
|
118
|
-
return [4 /*yield*/, vaultTokenContract.allowance(accountAddress, depositGuardAddress)];
|
|
119
|
-
case 1:
|
|
120
|
-
currentAllowanceBN = _b.sent();
|
|
121
|
-
sharesBN = shares instanceof ethers_1.BigNumber ? shares : (0, parseBigInt_1.default)(shares, types_1.ichiVaultDecimals);
|
|
122
|
-
return [2 /*return*/, currentAllowanceBN.gt(ethers_1.BigNumber.from(0)) && currentAllowanceBN.gte(sharesBN)];
|
|
123
|
-
}
|
|
124
|
-
});
|
|
125
|
-
});
|
|
126
|
-
}
|
|
127
105
|
function isVaultTokenApproved(accountAddress, shares, vaultAddress, jsonProvider, dex) {
|
|
128
106
|
return __awaiter(this, void 0, void 0, function () {
|
|
129
107
|
var _a, chainId, vault;
|
|
@@ -132,7 +110,7 @@ function isVaultTokenApproved(accountAddress, shares, vaultAddress, jsonProvider
|
|
|
132
110
|
case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
|
|
133
111
|
case 1:
|
|
134
112
|
_a = _b.sent(), chainId = _a.chainId, vault = _a.vault;
|
|
135
|
-
return [2 /*return*/, _isVaultTokenApproved(accountAddress, shares, vault, chainId, jsonProvider, dex)];
|
|
113
|
+
return [2 /*return*/, (0, _withdrawHelpers_1._isVaultTokenApproved)(accountAddress, shares, vault, chainId, jsonProvider, dex)];
|
|
136
114
|
}
|
|
137
115
|
});
|
|
138
116
|
});
|
|
@@ -205,7 +183,7 @@ function withdrawWithSlippage(accountAddress, shares, vaultAddress, jsonProvider
|
|
|
205
183
|
if ((_g.sent()).lt(withdrawShares)) {
|
|
206
184
|
throw new Error("Withdraw amount exceeds user shares amount in vault ".concat(vaultAddress, " on chain ").concat(chainId, " and dex ").concat(dex));
|
|
207
185
|
}
|
|
208
|
-
return [4 /*yield*/, _isVaultTokenApproved(accountAddress, withdrawShares, vault, chainId, jsonProvider, dex)];
|
|
186
|
+
return [4 /*yield*/, (0, _withdrawHelpers_1._isVaultTokenApproved)(accountAddress, withdrawShares, vault, chainId, jsonProvider, dex)];
|
|
209
187
|
case 3:
|
|
210
188
|
isApproved = _g.sent();
|
|
211
189
|
if (!isApproved) {
|
|
@@ -274,7 +252,7 @@ function withdrawNativeToken(accountAddress, shares, vaultAddress, jsonProvider,
|
|
|
274
252
|
if ((_h.sent()).lt(withdrawShares)) {
|
|
275
253
|
throw new Error("Withdraw amount exceeds user shares amount in vault ".concat(vaultAddress, " on chain ").concat(chainId, " and dex ").concat(dex));
|
|
276
254
|
}
|
|
277
|
-
return [4 /*yield*/, _isVaultTokenApproved(accountAddress, withdrawShares, vault, chainId, jsonProvider, dex)];
|
|
255
|
+
return [4 /*yield*/, (0, _withdrawHelpers_1._isVaultTokenApproved)(accountAddress, withdrawShares, vault, chainId, jsonProvider, dex)];
|
|
278
256
|
case 3:
|
|
279
257
|
isApproved = _h.sent();
|
|
280
258
|
if (!isApproved) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/functions/withdraw.ts"],"names":[],"mappings":";AAAA,iDAAiD;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAIjD,iCAAmC;AACnC,sDAAsD;AACtD,0CAA+F;AAC/F,qEAA+C;AAC/C,
|
|
1
|
+
{"version":3,"file":"withdraw.js","sourceRoot":"","sources":["../../../src/functions/withdraw.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { ContractTransaction, Overrides } from '@ethersproject/contracts';
|
|
2
|
+
import { JsonRpcProvider } from '@ethersproject/providers';
|
|
3
|
+
import { BigNumber } from 'ethers';
|
|
4
|
+
import { SupportedDex } from '../types';
|
|
5
|
+
export declare function withdrawWithErc20Wrapping(accountAddress: string, shares: string | number | BigNumber, vaultAddress: string, jsonProvider: JsonRpcProvider, dex: SupportedDex, percentSlippage?: number, overrides?: Overrides): Promise<ContractTransaction>;
|
|
@@ -0,0 +1,137 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __assign = (this && this.__assign) || function () {
|
|
3
|
+
__assign = Object.assign || function(t) {
|
|
4
|
+
for (var s, i = 1, n = arguments.length; i < n; i++) {
|
|
5
|
+
s = arguments[i];
|
|
6
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
|
|
7
|
+
t[p] = s[p];
|
|
8
|
+
}
|
|
9
|
+
return t;
|
|
10
|
+
};
|
|
11
|
+
return __assign.apply(this, arguments);
|
|
12
|
+
};
|
|
13
|
+
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
14
|
+
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
15
|
+
return new (P || (P = Promise))(function (resolve, reject) {
|
|
16
|
+
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
17
|
+
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
18
|
+
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
19
|
+
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
20
|
+
});
|
|
21
|
+
};
|
|
22
|
+
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
23
|
+
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
24
|
+
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
25
|
+
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
26
|
+
function step(op) {
|
|
27
|
+
if (f) throw new TypeError("Generator is already executing.");
|
|
28
|
+
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
29
|
+
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
30
|
+
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
31
|
+
switch (op[0]) {
|
|
32
|
+
case 0: case 1: t = op; break;
|
|
33
|
+
case 4: _.label++; return { value: op[1], done: false };
|
|
34
|
+
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
35
|
+
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
36
|
+
default:
|
|
37
|
+
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
38
|
+
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
39
|
+
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
40
|
+
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
41
|
+
if (t[2]) _.ops.pop();
|
|
42
|
+
_.trys.pop(); continue;
|
|
43
|
+
}
|
|
44
|
+
op = body.call(thisArg, _);
|
|
45
|
+
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
46
|
+
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
47
|
+
}
|
|
48
|
+
};
|
|
49
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
50
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
51
|
+
};
|
|
52
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
53
|
+
exports.withdrawWithErc20Wrapping = void 0;
|
|
54
|
+
var ethers_1 = require("ethers");
|
|
55
|
+
var contracts_1 = require("../contracts");
|
|
56
|
+
var parseBigInt_1 = __importDefault(require("../utils/parseBigInt"));
|
|
57
|
+
var types_1 = require("../types");
|
|
58
|
+
var calculateGasMargin_1 = require("../types/calculateGasMargin");
|
|
59
|
+
// eslint-disable-next-line import/no-cycle
|
|
60
|
+
var vault_1 = require("./vault");
|
|
61
|
+
var addresses_1 = require("../utils/config/addresses");
|
|
62
|
+
var amountWithSlippage_1 = __importDefault(require("../utils/amountWithSlippage"));
|
|
63
|
+
var userBalances_1 = require("./userBalances");
|
|
64
|
+
var vaultBasics_1 = __importDefault(require("./vaultBasics"));
|
|
65
|
+
var _withdrawHelpers_1 = require("./_withdrawHelpers");
|
|
66
|
+
function withdrawWithErc20Wrapping(accountAddress, shares, vaultAddress, jsonProvider, dex, percentSlippage, overrides) {
|
|
67
|
+
var _a, _b;
|
|
68
|
+
if (percentSlippage === void 0) { percentSlippage = 1; }
|
|
69
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
70
|
+
var _c, chainId, vault, signer, vaultDeployerAddress, userShares, withdrawShares, isApproved, depositGuardAddress, depositGuardContract, maxGasLimit, amounts, gasLimit, _d, _e, tx;
|
|
71
|
+
return __generator(this, function (_f) {
|
|
72
|
+
switch (_f.label) {
|
|
73
|
+
case 0: return [4 /*yield*/, (0, vault_1.validateVaultData)(vaultAddress, jsonProvider, dex)];
|
|
74
|
+
case 1:
|
|
75
|
+
_c = _f.sent(), chainId = _c.chainId, vault = _c.vault;
|
|
76
|
+
// This function is only applicable for BONZO vaults on Hedera
|
|
77
|
+
if (dex !== types_1.SupportedDex.Bonzo || chainId !== types_1.SupportedChainId.hedera) {
|
|
78
|
+
throw new Error("withdrawWithErc20Wrapping is only supported for Bonzo vaults on Hedera. Got dex: ".concat(dex, ", chainId: ").concat(chainId));
|
|
79
|
+
}
|
|
80
|
+
signer = jsonProvider.getSigner(accountAddress);
|
|
81
|
+
vaultDeployerAddress = (0, vaultBasics_1.default)(vaultAddress, chainId, dex);
|
|
82
|
+
userShares = (0, userBalances_1.getUserBalance)(accountAddress, vaultAddress, jsonProvider, dex, true);
|
|
83
|
+
withdrawShares = shares instanceof ethers_1.BigNumber ? shares : (0, parseBigInt_1.default)(shares, 18);
|
|
84
|
+
return [4 /*yield*/, userShares];
|
|
85
|
+
case 2:
|
|
86
|
+
if ((_f.sent()).lt(withdrawShares)) {
|
|
87
|
+
throw new Error("Withdraw amount exceeds user shares amount in vault ".concat(vaultAddress, " on chain ").concat(chainId, " and dex ").concat(dex));
|
|
88
|
+
}
|
|
89
|
+
return [4 /*yield*/, (0, _withdrawHelpers_1._isVaultTokenApproved)(accountAddress, withdrawShares, vault, chainId, jsonProvider, dex)];
|
|
90
|
+
case 3:
|
|
91
|
+
isApproved = _f.sent();
|
|
92
|
+
if (!isApproved) {
|
|
93
|
+
throw new Error("Vault token transfer is not approved for vault ".concat(vaultAddress, " on chain ").concat(chainId, " and dex ").concat(dex));
|
|
94
|
+
}
|
|
95
|
+
depositGuardAddress = (_a = addresses_1.addressConfig[chainId][dex]) === null || _a === void 0 ? void 0 : _a.depositGuard.address;
|
|
96
|
+
if (!depositGuardAddress) {
|
|
97
|
+
throw new Error("Deposit Guard for vault ".concat(vaultAddress, " not found on chain ").concat(chainId, " and dex ").concat(dex));
|
|
98
|
+
}
|
|
99
|
+
depositGuardContract = (0, contracts_1.getDepositGuardWithHtsWrappingContract)(depositGuardAddress, signer);
|
|
100
|
+
maxGasLimit = (0, calculateGasMargin_1.getGasLimit)(chainId);
|
|
101
|
+
return [4 /*yield*/, depositGuardContract.callStatic.withdrawFromICHIVaultAndTryUnwrapToERC20(vaultAddress, vaultDeployerAddress, withdrawShares, accountAddress, ethers_1.BigNumber.from(0), ethers_1.BigNumber.from(0), {
|
|
102
|
+
gasLimit: maxGasLimit,
|
|
103
|
+
})];
|
|
104
|
+
case 4:
|
|
105
|
+
amounts = _f.sent();
|
|
106
|
+
// reduce the estimated amounts by an acceptable slippage %, default - 1%
|
|
107
|
+
if (percentSlippage < 0.01)
|
|
108
|
+
throw new Error('Slippage parameter is less than 0.01%.');
|
|
109
|
+
if (percentSlippage > 100)
|
|
110
|
+
throw new Error('Slippage parameter is more than 100%.');
|
|
111
|
+
amounts = {
|
|
112
|
+
0: (0, amountWithSlippage_1.default)(amounts[0], percentSlippage),
|
|
113
|
+
1: (0, amountWithSlippage_1.default)(amounts[1], percentSlippage),
|
|
114
|
+
amount0: (0, amountWithSlippage_1.default)(amounts[0], percentSlippage),
|
|
115
|
+
amount1: (0, amountWithSlippage_1.default)(amounts[1], percentSlippage),
|
|
116
|
+
};
|
|
117
|
+
if (!((_b = overrides === null || overrides === void 0 ? void 0 : overrides.gasLimit) !== null && _b !== void 0)) return [3 /*break*/, 5];
|
|
118
|
+
_d = _b;
|
|
119
|
+
return [3 /*break*/, 7];
|
|
120
|
+
case 5:
|
|
121
|
+
_e = calculateGasMargin_1.calculateGasMargin;
|
|
122
|
+
return [4 /*yield*/, depositGuardContract.estimateGas.withdrawFromICHIVaultAndTryUnwrapToERC20(vaultAddress, vaultDeployerAddress, withdrawShares, accountAddress, amounts[0], amounts[1])];
|
|
123
|
+
case 6:
|
|
124
|
+
_d = _e.apply(void 0, [_f.sent()]);
|
|
125
|
+
_f.label = 7;
|
|
126
|
+
case 7:
|
|
127
|
+
gasLimit = _d;
|
|
128
|
+
return [4 /*yield*/, depositGuardContract.withdrawFromICHIVaultAndTryUnwrapToERC20(vaultAddress, vaultDeployerAddress, withdrawShares, accountAddress, amounts[0], amounts[1], __assign(__assign({}, overrides), { gasLimit: gasLimit }))];
|
|
129
|
+
case 8:
|
|
130
|
+
tx = _f.sent();
|
|
131
|
+
return [2 /*return*/, tx];
|
|
132
|
+
}
|
|
133
|
+
});
|
|
134
|
+
});
|
|
135
|
+
}
|
|
136
|
+
exports.withdrawWithErc20Wrapping = withdrawWithErc20Wrapping;
|
|
137
|
+
//# sourceMappingURL=withdrawWithErc20Wrapping.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"withdrawWithErc20Wrapping.js","sourceRoot":"","sources":["../../../src/functions/withdrawWithErc20Wrapping.ts"],"names":[],"mappings":"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"}
|
package/dist/src/index.cjs.js
CHANGED
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
/**
|
|
3
3
|
* @license
|
|
4
4
|
* author: ICHI DAO <core@ichi.org>
|
|
5
|
-
* ichi-vaults-sdk.js v0.1.
|
|
5
|
+
* ichi-vaults-sdk.js v0.1.41
|
|
6
6
|
* Released under the MIT license.
|
|
7
7
|
*/
|
|
8
8
|
|
|
@@ -14,7 +14,9 @@ var tslib_1 = require("tslib");
|
|
|
14
14
|
tslib_1.__exportStar(require("./functions/totalBalances"), exports);
|
|
15
15
|
tslib_1.__exportStar(require("./functions/userBalances"), exports);
|
|
16
16
|
tslib_1.__exportStar(require("./functions/deposit"), exports);
|
|
17
|
+
tslib_1.__exportStar(require("./functions/depositWithHtsWrapping"), exports);
|
|
17
18
|
tslib_1.__exportStar(require("./functions/withdraw"), exports);
|
|
19
|
+
tslib_1.__exportStar(require("./functions/withdrawWithErc20Wrapping"), exports);
|
|
18
20
|
tslib_1.__exportStar(require("./functions/vault"), exports);
|
|
19
21
|
tslib_1.__exportStar(require("./functions/calculateFees"), exports);
|
|
20
22
|
tslib_1.__exportStar(require("./functions/calculateDtr"), exports);
|