@strkfarm/sdk 1.0.57 → 1.0.58
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.
|
@@ -73416,7 +73416,9 @@ ${indent}}` : "}";
|
|
|
73416
73416
|
const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
|
|
73417
73417
|
const leg1AUM = await vesuAdapter1.getPositions(this.config);
|
|
73418
73418
|
const leg2AUM = await vesuAdapter2.getPositions(this.config);
|
|
73419
|
-
const
|
|
73419
|
+
const balance = await new ERC20(this.config).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
|
|
73420
|
+
logger.verbose(`${this.getTag()} unused balance: ${balance}`);
|
|
73421
|
+
const aumToken = leg1AUM[0].amount.plus(leg2AUM[0].usdValue / token1Price.price).minus(leg1AUM[1].usdValue / token1Price.price).minus(leg2AUM[1].amount).plus(balance);
|
|
73420
73422
|
logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
|
|
73421
73423
|
const netAPY = await this.netAPY();
|
|
73422
73424
|
const defispringAPY = netAPY.splits.find((s) => s.id === "defispring")?.apy || 0;
|
|
@@ -73738,6 +73740,7 @@ ${indent}}` : "}";
|
|
|
73738
73740
|
manager: ContractAddr.from("0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07"),
|
|
73739
73741
|
vaultAllocator: ContractAddr.from("0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba"),
|
|
73740
73742
|
redeemRequestNFT: ContractAddr.from("0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda"),
|
|
73743
|
+
aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
|
|
73741
73744
|
leafAdapters: [],
|
|
73742
73745
|
adapters: [],
|
|
73743
73746
|
targetHealthFactor: 1.3,
|
|
@@ -73747,6 +73750,7 @@ ${indent}}` : "}";
|
|
|
73747
73750
|
manager: ContractAddr.from("0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34"),
|
|
73748
73751
|
vaultAllocator: ContractAddr.from("0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735"),
|
|
73749
73752
|
redeemRequestNFT: ContractAddr.from("0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2"),
|
|
73753
|
+
aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
|
|
73750
73754
|
leafAdapters: [],
|
|
73751
73755
|
adapters: [],
|
|
73752
73756
|
targetHealthFactor: 1.3,
|
package/dist/index.browser.mjs
CHANGED
|
@@ -25474,7 +25474,9 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
|
|
|
25474
25474
|
const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
|
|
25475
25475
|
const leg1AUM = await vesuAdapter1.getPositions(this.config);
|
|
25476
25476
|
const leg2AUM = await vesuAdapter2.getPositions(this.config);
|
|
25477
|
-
const
|
|
25477
|
+
const balance = await new ERC20(this.config).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
|
|
25478
|
+
logger.verbose(`${this.getTag()} unused balance: ${balance}`);
|
|
25479
|
+
const aumToken = leg1AUM[0].amount.plus(leg2AUM[0].usdValue / token1Price.price).minus(leg1AUM[1].usdValue / token1Price.price).minus(leg2AUM[1].amount).plus(balance);
|
|
25478
25480
|
logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
|
|
25479
25481
|
const netAPY = await this.netAPY();
|
|
25480
25482
|
const defispringAPY = netAPY.splits.find((s) => s.id === "defispring")?.apy || 0;
|
|
@@ -25796,6 +25798,7 @@ var usdcVaultSettings = {
|
|
|
25796
25798
|
manager: ContractAddr.from("0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07"),
|
|
25797
25799
|
vaultAllocator: ContractAddr.from("0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba"),
|
|
25798
25800
|
redeemRequestNFT: ContractAddr.from("0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda"),
|
|
25801
|
+
aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
|
|
25799
25802
|
leafAdapters: [],
|
|
25800
25803
|
adapters: [],
|
|
25801
25804
|
targetHealthFactor: 1.3,
|
|
@@ -25805,6 +25808,7 @@ var wbtcVaultSettings = {
|
|
|
25805
25808
|
manager: ContractAddr.from("0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34"),
|
|
25806
25809
|
vaultAllocator: ContractAddr.from("0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735"),
|
|
25807
25810
|
redeemRequestNFT: ContractAddr.from("0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2"),
|
|
25811
|
+
aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
|
|
25808
25812
|
leafAdapters: [],
|
|
25809
25813
|
adapters: [],
|
|
25810
25814
|
targetHealthFactor: 1.3,
|
package/dist/index.d.ts
CHANGED
package/dist/index.js
CHANGED
|
@@ -25600,7 +25600,9 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
|
|
|
25600
25600
|
const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
|
|
25601
25601
|
const leg1AUM = await vesuAdapter1.getPositions(this.config);
|
|
25602
25602
|
const leg2AUM = await vesuAdapter2.getPositions(this.config);
|
|
25603
|
-
const
|
|
25603
|
+
const balance = await new ERC20(this.config).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
|
|
25604
|
+
logger.verbose(`${this.getTag()} unused balance: ${balance}`);
|
|
25605
|
+
const aumToken = leg1AUM[0].amount.plus(leg2AUM[0].usdValue / token1Price.price).minus(leg1AUM[1].usdValue / token1Price.price).minus(leg2AUM[1].amount).plus(balance);
|
|
25604
25606
|
logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
|
|
25605
25607
|
const netAPY = await this.netAPY();
|
|
25606
25608
|
const defispringAPY = netAPY.splits.find((s) => s.id === "defispring")?.apy || 0;
|
|
@@ -25922,6 +25924,7 @@ var usdcVaultSettings = {
|
|
|
25922
25924
|
manager: ContractAddr.from("0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07"),
|
|
25923
25925
|
vaultAllocator: ContractAddr.from("0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba"),
|
|
25924
25926
|
redeemRequestNFT: ContractAddr.from("0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda"),
|
|
25927
|
+
aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
|
|
25925
25928
|
leafAdapters: [],
|
|
25926
25929
|
adapters: [],
|
|
25927
25930
|
targetHealthFactor: 1.3,
|
|
@@ -25931,6 +25934,7 @@ var wbtcVaultSettings = {
|
|
|
25931
25934
|
manager: ContractAddr.from("0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34"),
|
|
25932
25935
|
vaultAllocator: ContractAddr.from("0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735"),
|
|
25933
25936
|
redeemRequestNFT: ContractAddr.from("0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2"),
|
|
25937
|
+
aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
|
|
25934
25938
|
leafAdapters: [],
|
|
25935
25939
|
adapters: [],
|
|
25936
25940
|
targetHealthFactor: 1.3,
|
|
@@ -26264,7 +26268,7 @@ function getAccount(accountKey, config, password = process.env.ACCOUNT_SECURE_PA
|
|
|
26264
26268
|
...storeConfig,
|
|
26265
26269
|
PASSWORD: password
|
|
26266
26270
|
});
|
|
26267
|
-
return store.getAccount(accountKey);
|
|
26271
|
+
return store.getAccount(accountKey, "0x3");
|
|
26268
26272
|
}
|
|
26269
26273
|
async function myDeclare(contract_name, package_name = "strkfarm", config, acc) {
|
|
26270
26274
|
const provider2 = config.provider;
|
package/dist/index.mjs
CHANGED
|
@@ -25524,7 +25524,9 @@ var UniversalStrategy = class _UniversalStrategy extends BaseStrategy {
|
|
|
25524
25524
|
const [vesuAdapter1, vesuAdapter2] = this.getVesuAdapters();
|
|
25525
25525
|
const leg1AUM = await vesuAdapter1.getPositions(this.config);
|
|
25526
25526
|
const leg2AUM = await vesuAdapter2.getPositions(this.config);
|
|
25527
|
-
const
|
|
25527
|
+
const balance = await new ERC20(this.config).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
|
|
25528
|
+
logger.verbose(`${this.getTag()} unused balance: ${balance}`);
|
|
25529
|
+
const aumToken = leg1AUM[0].amount.plus(leg2AUM[0].usdValue / token1Price.price).minus(leg1AUM[1].usdValue / token1Price.price).minus(leg2AUM[1].amount).plus(balance);
|
|
25528
25530
|
logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
|
|
25529
25531
|
const netAPY = await this.netAPY();
|
|
25530
25532
|
const defispringAPY = netAPY.splits.find((s) => s.id === "defispring")?.apy || 0;
|
|
@@ -25846,6 +25848,7 @@ var usdcVaultSettings = {
|
|
|
25846
25848
|
manager: ContractAddr.from("0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07"),
|
|
25847
25849
|
vaultAllocator: ContractAddr.from("0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba"),
|
|
25848
25850
|
redeemRequestNFT: ContractAddr.from("0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda"),
|
|
25851
|
+
aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
|
|
25849
25852
|
leafAdapters: [],
|
|
25850
25853
|
adapters: [],
|
|
25851
25854
|
targetHealthFactor: 1.3,
|
|
@@ -25855,6 +25858,7 @@ var wbtcVaultSettings = {
|
|
|
25855
25858
|
manager: ContractAddr.from("0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34"),
|
|
25856
25859
|
vaultAllocator: ContractAddr.from("0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735"),
|
|
25857
25860
|
redeemRequestNFT: ContractAddr.from("0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2"),
|
|
25861
|
+
aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
|
|
25858
25862
|
leafAdapters: [],
|
|
25859
25863
|
adapters: [],
|
|
25860
25864
|
targetHealthFactor: 1.3,
|
|
@@ -26188,7 +26192,7 @@ function getAccount(accountKey, config, password = process.env.ACCOUNT_SECURE_PA
|
|
|
26188
26192
|
...storeConfig,
|
|
26189
26193
|
PASSWORD: password
|
|
26190
26194
|
});
|
|
26191
|
-
return store.getAccount(accountKey);
|
|
26195
|
+
return store.getAccount(accountKey, "0x3");
|
|
26192
26196
|
}
|
|
26193
26197
|
async function myDeclare(contract_name, package_name = "strkfarm", config, acc) {
|
|
26194
26198
|
const provider2 = config.provider;
|
package/package.json
CHANGED
package/src/node/deployer.ts
CHANGED
|
@@ -36,7 +36,7 @@ function getAccount(
|
|
|
36
36
|
PASSWORD: password
|
|
37
37
|
});
|
|
38
38
|
|
|
39
|
-
return store.getAccount(accountKey);
|
|
39
|
+
return store.getAccount(accountKey, '0x3');
|
|
40
40
|
}
|
|
41
41
|
|
|
42
42
|
async function myDeclare(contract_name: string, package_name: string = 'strkfarm', config: IConfig, acc: Account) {
|
|
@@ -9,11 +9,13 @@ import UniversalVaultAbi from '../data/universal-vault.abi.json';
|
|
|
9
9
|
import ManagerAbi from '../data/vault-manager.abi.json';
|
|
10
10
|
import { ApproveCallParams, BaseAdapter, CommonAdapter, FlashloanCallParams, GenerateCallFn, LeafAdapterFn, ManageCall, VesuAdapter, VesuModifyPositionCallParams, VesuPools } from "./universal-adapters";
|
|
11
11
|
import { Global } from "@/global";
|
|
12
|
+
import { ERC20 } from "@/modules";
|
|
12
13
|
|
|
13
14
|
export interface UniversalStrategySettings {
|
|
14
15
|
manager: ContractAddr,
|
|
15
16
|
vaultAllocator: ContractAddr,
|
|
16
17
|
redeemRequestNFT: ContractAddr,
|
|
18
|
+
aumOracle: ContractAddr,
|
|
17
19
|
leafAdapters: LeafAdapterFn<any>[],
|
|
18
20
|
adapters: {id: string, adapter: BaseAdapter}[],
|
|
19
21
|
targetHealthFactor: number,
|
|
@@ -244,10 +246,13 @@ export class UniversalStrategy<
|
|
|
244
246
|
const leg1AUM = await vesuAdapter1.getPositions(this.config);
|
|
245
247
|
const leg2AUM = await vesuAdapter2.getPositions(this.config);
|
|
246
248
|
|
|
249
|
+
const balance = await (new ERC20(this.config)).balanceOf(this.asset().address, this.metadata.additionalInfo.vaultAllocator, this.asset().decimals);
|
|
250
|
+
logger.verbose(`${this.getTag()} unused balance: ${balance}`);
|
|
251
|
+
|
|
247
252
|
const aumToken = leg1AUM[0].amount
|
|
248
253
|
.plus(leg2AUM[0].usdValue / token1Price.price)
|
|
249
254
|
.minus(leg1AUM[1].usdValue / token1Price.price)
|
|
250
|
-
.minus(leg2AUM[1].amount);
|
|
255
|
+
.minus(leg2AUM[1].amount).plus(balance);
|
|
251
256
|
logger.verbose(`${this.getTag()} Actual AUM: ${aumToken}`);
|
|
252
257
|
|
|
253
258
|
// calculate estimated growth from strk rewards
|
|
@@ -632,6 +637,7 @@ const usdcVaultSettings: UniversalStrategySettings = {
|
|
|
632
637
|
manager: ContractAddr.from('0xf41a2b1f498a7f9629db0b8519259e66e964260a23d20003f3e42bb1997a07'),
|
|
633
638
|
vaultAllocator: ContractAddr.from('0x228cca1005d3f2b55cbaba27cb291dacf1b9a92d1d6b1638195fbd3d0c1e3ba'),
|
|
634
639
|
redeemRequestNFT: ContractAddr.from('0x906d03590010868cbf7590ad47043959d7af8e782089a605d9b22567b64fda'),
|
|
640
|
+
aumOracle: ContractAddr.from("0x6faf45ed185dec13ef723c9ead4266cab98d06f2cb237e331b1fa5c2aa79afe"),
|
|
635
641
|
leafAdapters: [],
|
|
636
642
|
adapters: [],
|
|
637
643
|
targetHealthFactor: 1.3,
|
|
@@ -642,6 +648,7 @@ const wbtcVaultSettings: UniversalStrategySettings = {
|
|
|
642
648
|
manager: ContractAddr.from('0xef8a664ffcfe46a6af550766d27c28937bf1b77fb4ab54d8553e92bca5ba34'),
|
|
643
649
|
vaultAllocator: ContractAddr.from('0x1e01c25f0d9494570226ad28a7fa856c0640505e809c366a9fab4903320e735'),
|
|
644
650
|
redeemRequestNFT: ContractAddr.from('0x4fec59a12f8424281c1e65a80b5de51b4e754625c60cddfcd00d46941ec37b2'),
|
|
651
|
+
aumOracle: ContractAddr.from("0x2edf4edbed3f839e7f07dcd913e92299898ff4cf0ba532f8c572c66c5b331b2"),
|
|
645
652
|
leafAdapters: [],
|
|
646
653
|
adapters: [],
|
|
647
654
|
targetHealthFactor: 1.3,
|