curvance 5.1.0 → 5.1.2
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 +9 -2
- package/dist/abis/LendingOptimizer.json +1435 -0
- package/dist/abis/OptimizerReader.json +268 -1
- package/dist/classes/CToken.d.ts +22 -3
- package/dist/classes/CToken.d.ts.map +1 -1
- package/dist/classes/CToken.js +61 -5
- package/dist/classes/CToken.js.map +1 -1
- package/dist/classes/DexAggregators/KyberSwap.d.ts.map +1 -1
- package/dist/classes/DexAggregators/KyberSwap.js +30 -2
- package/dist/classes/DexAggregators/KyberSwap.js.map +1 -1
- package/dist/classes/ERC20.js +2 -2
- package/dist/classes/ERC20.js.map +1 -1
- package/dist/classes/LendingOptimizer.d.ts +45 -0
- package/dist/classes/LendingOptimizer.d.ts.map +1 -0
- package/dist/classes/LendingOptimizer.js +125 -0
- package/dist/classes/LendingOptimizer.js.map +1 -0
- package/dist/classes/OptimizerReader.d.ts +3 -0
- package/dist/classes/OptimizerReader.d.ts.map +1 -1
- package/dist/classes/OptimizerReader.js +18 -16
- package/dist/classes/OptimizerReader.js.map +1 -1
- package/dist/classes/index.d.ts +1 -0
- package/dist/classes/index.d.ts.map +1 -1
- package/dist/classes/index.js +1 -0
- package/dist/classes/index.js.map +1 -1
- package/package.json +1 -1
|
@@ -0,0 +1,125 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
+
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
+
};
|
|
5
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
+
exports.LendingOptimizer = void 0;
|
|
7
|
+
const decimal_js_1 = __importDefault(require("decimal.js"));
|
|
8
|
+
const helpers_1 = require("../helpers");
|
|
9
|
+
const Calldata_1 = require("./Calldata");
|
|
10
|
+
const FormatConverter_1 = __importDefault(require("./FormatConverter"));
|
|
11
|
+
const LendingOptimizer_json_1 = __importDefault(require("../abis/LendingOptimizer.json"));
|
|
12
|
+
function getSetupConfig() {
|
|
13
|
+
return require("../setup").setup_config;
|
|
14
|
+
}
|
|
15
|
+
function resolveDefaultReadProvider() {
|
|
16
|
+
return getSetupConfig()?.readProvider;
|
|
17
|
+
}
|
|
18
|
+
function resolveDefaultSigner() {
|
|
19
|
+
return getSetupConfig()?.signer ?? null;
|
|
20
|
+
}
|
|
21
|
+
class LendingOptimizer extends Calldata_1.Calldata {
|
|
22
|
+
provider;
|
|
23
|
+
signer;
|
|
24
|
+
address;
|
|
25
|
+
contract;
|
|
26
|
+
asset;
|
|
27
|
+
constructor(address, asset, provider = null, signer) {
|
|
28
|
+
super();
|
|
29
|
+
const legacySigner = provider != null && "address" in provider
|
|
30
|
+
? provider
|
|
31
|
+
: null;
|
|
32
|
+
const resolvedProvider = provider == null
|
|
33
|
+
? resolveDefaultReadProvider()
|
|
34
|
+
: legacySigner == null
|
|
35
|
+
? provider
|
|
36
|
+
: (0, helpers_1.resolveReadProvider)(provider, `LendingOptimizer ${address}`);
|
|
37
|
+
if (resolvedProvider == undefined) {
|
|
38
|
+
throw new Error(`Read provider is not configured for LendingOptimizer ${address}. ` +
|
|
39
|
+
`Pass a provider explicitly or initialize setupChain() first.`);
|
|
40
|
+
}
|
|
41
|
+
this.provider = resolvedProvider;
|
|
42
|
+
this.signer = signer ?? legacySigner ?? resolveDefaultSigner();
|
|
43
|
+
this.address = address;
|
|
44
|
+
this.asset = asset;
|
|
45
|
+
this.contract = (0, helpers_1.contractSetup)(resolvedProvider, address, LendingOptimizer_json_1.default);
|
|
46
|
+
}
|
|
47
|
+
async totalAssets() {
|
|
48
|
+
return this.contract.totalAssets();
|
|
49
|
+
}
|
|
50
|
+
async balanceOf(account) {
|
|
51
|
+
return this.contract.balanceOf(account);
|
|
52
|
+
}
|
|
53
|
+
async convertToShares(assets) {
|
|
54
|
+
return this.contract.convertToShares(assets);
|
|
55
|
+
}
|
|
56
|
+
async convertToAssets(shares) {
|
|
57
|
+
return this.contract.convertToAssets(shares);
|
|
58
|
+
}
|
|
59
|
+
async maxDeposit(receiver) {
|
|
60
|
+
return this.contract.maxDeposit(receiver);
|
|
61
|
+
}
|
|
62
|
+
async maxWithdraw(owner) {
|
|
63
|
+
return this.contract.maxWithdraw(owner);
|
|
64
|
+
}
|
|
65
|
+
async deposit(amount, receiver = null) {
|
|
66
|
+
const signer = (0, helpers_1.requireSigner)(this.signer);
|
|
67
|
+
const from = signer.address;
|
|
68
|
+
receiver ??= from;
|
|
69
|
+
const decimals = this.asset.decimals ?? await this.asset.fetchDecimals();
|
|
70
|
+
const assets = FormatConverter_1.default.decimalToBigInt(new decimal_js_1.default(amount), decimals);
|
|
71
|
+
if (assets === 0n) {
|
|
72
|
+
throw new Error("LendingOptimizer.deposit: amount resolves to zero");
|
|
73
|
+
}
|
|
74
|
+
const allowance = await this.asset.allowance(from, this.address);
|
|
75
|
+
if (allowance < assets) {
|
|
76
|
+
const symbol = await this.getAssetLabel();
|
|
77
|
+
throw new Error(`Please approve the ${symbol} token for LendingOptimizer`);
|
|
78
|
+
}
|
|
79
|
+
const calldata = this.contract.interface.encodeFunctionData("deposit(uint256,address)", [assets, receiver]);
|
|
80
|
+
return this.executeCallData(calldata);
|
|
81
|
+
}
|
|
82
|
+
async withdraw(amount, receiver = null, owner = null) {
|
|
83
|
+
const signer = (0, helpers_1.requireSigner)(this.signer);
|
|
84
|
+
const from = signer.address;
|
|
85
|
+
receiver ??= from;
|
|
86
|
+
owner ??= from;
|
|
87
|
+
const decimals = this.asset.decimals ?? await this.asset.fetchDecimals();
|
|
88
|
+
const assets = FormatConverter_1.default.decimalToBigInt(new decimal_js_1.default(amount), decimals);
|
|
89
|
+
if (assets === 0n) {
|
|
90
|
+
throw new Error("LendingOptimizer.withdraw: amount resolves to zero");
|
|
91
|
+
}
|
|
92
|
+
const calldata = this.contract.interface.encodeFunctionData("withdraw(uint256,address,address)", [assets, receiver, owner]);
|
|
93
|
+
return this.executeCallData(calldata);
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Redeem shares directly. Bigint-only so callers can pass the exact
|
|
97
|
+
* on-chain share balance (e.g. from OptimizerReader.getOptimizerUserData)
|
|
98
|
+
* without any Decimal conversion rounding. This is the dust-free path
|
|
99
|
+
* for the "Max" UX.
|
|
100
|
+
*/
|
|
101
|
+
async redeem(shares, receiver = null, owner = null) {
|
|
102
|
+
const signer = (0, helpers_1.requireSigner)(this.signer);
|
|
103
|
+
const from = signer.address;
|
|
104
|
+
receiver ??= from;
|
|
105
|
+
owner ??= from;
|
|
106
|
+
if (shares === 0n) {
|
|
107
|
+
throw new Error("LendingOptimizer.redeem: shares is zero");
|
|
108
|
+
}
|
|
109
|
+
const calldata = this.contract.interface.encodeFunctionData("redeem(uint256,address,address)", [shares, receiver, owner]);
|
|
110
|
+
return this.executeCallData(calldata);
|
|
111
|
+
}
|
|
112
|
+
async getAssetLabel() {
|
|
113
|
+
if (this.asset.symbol != undefined) {
|
|
114
|
+
return this.asset.symbol;
|
|
115
|
+
}
|
|
116
|
+
try {
|
|
117
|
+
return await this.asset.fetchSymbol();
|
|
118
|
+
}
|
|
119
|
+
catch {
|
|
120
|
+
return this.asset.address;
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
exports.LendingOptimizer = LendingOptimizer;
|
|
125
|
+
//# sourceMappingURL=LendingOptimizer.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"LendingOptimizer.js","sourceRoot":"","sources":["../../src/classes/LendingOptimizer.ts"],"names":[],"mappings":"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"}
|
|
@@ -13,6 +13,8 @@ export interface OptimizerMarketData {
|
|
|
13
13
|
totalLiquidity: bigint;
|
|
14
14
|
sharePrice: bigint;
|
|
15
15
|
performanceFee: bigint;
|
|
16
|
+
/** Pre-performance-fee weighted supply APY in WAD (1e18 = 100%). */
|
|
17
|
+
apy: bigint;
|
|
16
18
|
}
|
|
17
19
|
export interface OptimizerUserData {
|
|
18
20
|
address: address;
|
|
@@ -43,6 +45,7 @@ export declare class OptimizerReader {
|
|
|
43
45
|
getOptimizerMarketData(optimizers: address[]): Promise<OptimizerMarketData[]>;
|
|
44
46
|
private shouldFallbackToViewOnlyOptimizerReads;
|
|
45
47
|
private getOptimizerMarketDataViewOnly;
|
|
48
|
+
private normalizeOptimizerMarketData;
|
|
46
49
|
getOptimizerUserData(optimizers: address[], account: address): Promise<OptimizerUserData[]>;
|
|
47
50
|
optimalRebalance(optimizer: address, slippageBps?: bigint): Promise<{
|
|
48
51
|
actions: ReallocationAction[];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptimizerReader.d.ts","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAoB3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"OptimizerReader.d.ts","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EAAE,OAAO,EAAE,sBAAsB,EAAE,MAAM,UAAU,CAAC;AAoB3D,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,eAAe,EAAE,MAAM,CAAC;IACxB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,mBAAmB;IAChC,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,EAAE,OAAO,CAAC;IACf,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,mBAAmB,EAAE,CAAC;IAC/B,cAAc,EAAE,MAAM,CAAC;IACvB,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;IACvB,oEAAoE;IACpE,GAAG,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,iBAAiB;IAC9B,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,MAAM,CAAC;CACtB;AAED,MAAM,WAAW,kBAAkB;IAC/B,MAAM,EAAE,OAAO,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,eAAe;IAC5B,MAAM,EAAE,OAAO,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC7B,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;IACrD,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9D,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;IAC9E,gBAAgB,CAAC,SAAS,EAAE,OAAO,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;CAC3E;AAiBD,qBAAa,eAAe;IACxB,QAAQ,EAAE,sBAAsB,CAAC;IACjC,OAAO,EAAE,OAAO,CAAC;IACjB,QAAQ,EAAE,QAAQ,GAAG,gBAAgB,CAAC;gBAE1B,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,EAAE,sBAAsB;IAczD,eAAe,CAAC,SAAS,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAIpD,sBAAsB,CAAC,UAAU,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,mBAAmB,EAAE,CAAC;IAanF,OAAO,CAAC,sCAAsC;YAKhC,8BAA8B;YAqC9B,4BAA4B;IAiBpC,oBAAoB,CAAC,UAAU,EAAE,OAAO,EAAE,EAAE,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,iBAAiB,EAAE,CAAC;IAS3F,gBAAgB,CAClB,SAAS,EAAE,OAAO,EAClB,WAAW,GAAE,MAAW,GACzB,OAAO,CAAC;QAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC;QAAC,MAAM,EAAE,eAAe,EAAE,CAAA;KAAE,CAAC;CAU3E"}
|
|
@@ -34,21 +34,6 @@ function normalizeAllocationBound(bound) {
|
|
|
34
34
|
maxBps: BigInt(bound.maxBps),
|
|
35
35
|
};
|
|
36
36
|
}
|
|
37
|
-
function normalizeOptimizerMarketData(opt) {
|
|
38
|
-
return {
|
|
39
|
-
address: opt._address,
|
|
40
|
-
asset: opt.asset,
|
|
41
|
-
totalAssets: BigInt(opt.totalAssets),
|
|
42
|
-
markets: opt.markets.map((m) => ({
|
|
43
|
-
address: m._address,
|
|
44
|
-
allocatedAssets: BigInt(m.allocatedAssets),
|
|
45
|
-
liquidity: BigInt(m.liquidity)
|
|
46
|
-
})),
|
|
47
|
-
totalLiquidity: BigInt(opt.totalLiquidity),
|
|
48
|
-
sharePrice: BigInt(opt.sharePrice),
|
|
49
|
-
performanceFee: BigInt(opt.performanceFee)
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
37
|
class OptimizerReader {
|
|
53
38
|
provider;
|
|
54
39
|
address;
|
|
@@ -69,7 +54,7 @@ class OptimizerReader {
|
|
|
69
54
|
async getOptimizerMarketData(optimizers) {
|
|
70
55
|
try {
|
|
71
56
|
const data = await this.contract.getOptimizerMarketData.staticCall(optimizers);
|
|
72
|
-
return data.map(normalizeOptimizerMarketData);
|
|
57
|
+
return Promise.all(data.map((opt) => this.normalizeOptimizerMarketData(opt)));
|
|
73
58
|
}
|
|
74
59
|
catch (error) {
|
|
75
60
|
if (!this.shouldFallbackToViewOnlyOptimizerReads(error)) {
|
|
@@ -112,6 +97,23 @@ class OptimizerReader {
|
|
|
112
97
|
totalLiquidity: marketRows.reduce((sum, market) => sum + market.liquidity, 0n),
|
|
113
98
|
sharePrice: BigInt(sharePrice),
|
|
114
99
|
performanceFee: BigInt(performanceFee),
|
|
100
|
+
apy: await this.getOptimizerAPY(optimizer),
|
|
101
|
+
};
|
|
102
|
+
}
|
|
103
|
+
async normalizeOptimizerMarketData(opt) {
|
|
104
|
+
return {
|
|
105
|
+
address: opt._address,
|
|
106
|
+
asset: opt.asset,
|
|
107
|
+
totalAssets: BigInt(opt.totalAssets),
|
|
108
|
+
markets: opt.markets.map((m) => ({
|
|
109
|
+
address: m._address,
|
|
110
|
+
allocatedAssets: BigInt(m.allocatedAssets),
|
|
111
|
+
liquidity: BigInt(m.liquidity)
|
|
112
|
+
})),
|
|
113
|
+
totalLiquidity: BigInt(opt.totalLiquidity),
|
|
114
|
+
sharePrice: BigInt(opt.sharePrice),
|
|
115
|
+
performanceFee: BigInt(opt.performanceFee),
|
|
116
|
+
apy: opt.apy == null ? await this.getOptimizerAPY(opt._address) : BigInt(opt.apy),
|
|
115
117
|
};
|
|
116
118
|
}
|
|
117
119
|
async getOptimizerUserData(optimizers, account) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"OptimizerReader.js","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":";;;;;;AAAA,mCAAkC;AAClC,wFAA8C;AAG9C,MAAM,kBAAkB,GAAG;IACvB,yCAAyC;IACzC,+CAA+C;IAC/C,gDAAgD;IAChD,uCAAuC;IACvC,wDAAwD;CAClD,CAAC;AAEX,MAAM,0BAA0B,GAAG;IAC/B,0DAA0D;IAC1D,iEAAiE;IACjE,8CAA8C;CACxC,CAAC;AAEX,SAAS,0BAA0B;IAC/B,OAAQ,OAAO,CAAC,UAAU,CAA+B,CAAC,YAAY,EAAE,YAAY,CAAC;AACzF,CAAC;
|
|
1
|
+
{"version":3,"file":"OptimizerReader.js","sourceRoot":"","sources":["../../src/classes/OptimizerReader.ts"],"names":[],"mappings":"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"}
|
package/dist/classes/index.d.ts
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":"AAAA,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC;AACnC,cAAc,iBAAiB,CAAC;AAChC,cAAc,UAAU,CAAC;AACzB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,YAAY,CAAC;AAC3B,cAAc,oBAAoB,CAAC;AACnC,cAAc,eAAe,CAAC;AAC9B,cAAc,mBAAmB,CAAC;AAClC,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,OAAO,IAAI,eAAe,EAAE,MAAM,mBAAmB,CAAC"}
|
package/dist/classes/index.js
CHANGED
|
@@ -20,6 +20,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
20
20
|
exports.FormatConverter = void 0;
|
|
21
21
|
__exportStar(require("./ProtocolReader"), exports);
|
|
22
22
|
__exportStar(require("./OptimizerReader"), exports);
|
|
23
|
+
__exportStar(require("./LendingOptimizer"), exports);
|
|
23
24
|
__exportStar(require("./OracleManager"), exports);
|
|
24
25
|
__exportStar(require("./Market"), exports);
|
|
25
26
|
__exportStar(require("./CToken"), exports);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,oDAAkC;AAClC,kDAAgC;AAChC,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,6CAA2B;AAC3B,6CAA2B;AAC3B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,mDAAiC;AACjC,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/classes/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,mDAAiC;AACjC,oDAAkC;AAClC,qDAAmC;AACnC,kDAAgC;AAChC,2CAAyB;AACzB,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,6CAA2B;AAC3B,6CAA2B;AAC3B,qDAAmC;AACnC,gDAA8B;AAC9B,oDAAkC;AAClC,mDAAiC;AACjC,qDAA+D;AAAtD,mIAAA,OAAO,OAAmB"}
|