@affluent-org/sdk 0.0.4 → 0.0.5

package/dist/services/strategy-vault/query.d.ts

@@ -4,7 +4,7 @@ import { AddressInput, AddressLike } from "../../contracts/common/type";
 import { JettonWallet } from "../../contracts/jetton/jetton-wallet";
 import { RFQAuction } from "../../contracts/rfq/rfq_auction";
 import { StrategyVault } from "../../contracts/vault/strategy-vault";
-import { PoolState } from "../../contracts/core/pool/type";
+import { VaultNativeAmountDecomposedContext, VaultNativeValueDecomposedContext, VaultStateContext } from "../../common/transform";
 export declare function getVault(ctx: AffluentContext, strategyVaultAddress: AddressInput): OpenedContract<StrategyVault>;
 export declare function getVaultData(ctx: AffluentContext, strategyVaultAddress: AddressLike): Promise<{
     globalDepositValueCap: bigint;
@@ -137,149 +137,20 @@ export declare function splitPureAndVaultAsset(ctx: AffluentContext, addresses:
     vaultAssetAddresses: string[];
     pureAssetAddresses: string[];
 }>;
-export declare function getPoolDataForStrategyVault(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<Record<string, PoolState>>;
-export declare function getPoolPositionsForStrategyVault(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<Record<string, Record<string, {
-    supplyShare: bigint;
-    supplyAmount: bigint;
-    borrowShare: bigint;
-    borrowAmount: bigint;
-}>>>;
-export declare function getValuationContext(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<{
-    storage: {
-        globalDepositValueCap: bigint;
-        withdrawFeeRate: number;
-        queueWithdrawFeeRate: number;
-        depositQueueManager: import("../../contracts/vault/strategy-vault").QueueManager;
-        withdrawQueueManager: import("../../contracts/vault/strategy-vault").QueueManager;
-        interactiveVaultDict: Record<string, import("../../contracts/vault/strategy-vault").InteractiveVaultConfigItem>;
-        xchainConnectorAddress: Address | null;
-        xchainConfig: Record<string, {
-            connected: boolean;
-            xchainAccountAddress: bigint;
-            oftConfig: Map<string, {
-                destinationAddress: Address;
-                forwardGas: bigint;
-                forwardPayload?: import("@ton/core").Cell | null;
-                lzTransferFeeRate?: bigint;
-            }> | null;
-            strategyConfig: Map<bigint, {
-                isExecutable: boolean;
-            }> | null;
-            afterStrategyConfig: Map<bigint, {
-                isExecutable: boolean;
-            }> | null;
-            lzGasFee: bigint;
-        }>;
-        xchainUpdateHash: bigint;
-        owner: Address;
-        manager: Address;
-        assets: Record<string, import("../../contracts/vault/strategy-vault").AssetV2>;
-        factorialPools: Record<string, import("../../contracts/vault/strategy-vault").FactorialPool>;
-        aggregatorIndex: bigint;
-        content: import("@ton/core").Cell;
-        totalSupply: bigint;
-        oracleConfig: import("@ton/core").Cell | import("../../contracts/oracle/redstone-onchain-oracle/type").RedstoneOnchainOracleConfig | import("../../contracts/oracle/redstone-oracle/type").RedstonOracleConfig;
-        rfqConfig: {
-            priceDeviationTolerance: number;
-            rfqEventEmitterAddress: string | null;
-        } | null;
-        gasConfig: Record<string, bigint> | null;
-        isPrivateVault: boolean;
-        depositCloseTimestamp: number;
-        withdrawOpenTimestamp: number;
-        whitelistedMinters: import("@ton/core").Dictionary<Address, Boolean>;
-        lastCollectTime: number;
-        managementFeeRatePerYear: number;
-        protocolFeeRatePerYear: number;
-        collectedManagementFee: bigint;
-        collectedProtocolFee: bigint;
-        rfqCode: import("@ton/core").Cell;
-        walletCode: import("@ton/core").Cell;
-        dataAggregatorCode: import("@ton/core").Cell;
-        protocolFeeManagerAddress: Address;
-        rfqIndex: bigint;
-        isExecutingStrategy: boolean;
-        maxLeverageRatio: number;
-        assetWalletDict: Record<string, string>;
-        walletAssetDict: Record<string, string>;
-        managementFeeRecipientAddress: Address | null;
-        guardianAddress: Address | null;
-        timelock: bigint;
-        pendingOwnerActionIndex: bigint;
-        pendingOwnerActionCount: bigint;
-        pendingOwnerAction: any;
-        getFactorialPoolAsset: (poolAddress: Address, assetAddress: Address) => import("../../contracts/vault/strategy-vault").FactorialPoolShare;
-        getAsset: (assetAddress: Address) => import("../../contracts/vault/strategy-vault").AssetV2;
-        version: string;
-        address: Address;
-        balance: bigint;
-        code: import("@ton/core").Cell;
-    } | {
-        globalDepositValueCap: bigint;
-        withdrawFeeRate: number;
-        queueWithdrawFeeRate: number;
-        depositQueueManager: import("../../contracts/vault/strategy-vault").QueueManager;
-        withdrawQueueManager: import("../../contracts/vault/strategy-vault").QueueManager;
-        interactiveVaultDict: Record<string, import("../../contracts/vault/strategy-vault").InteractiveVaultConfigItem>;
-        xchainConnectorAddress: null;
-        xchainConfig: null;
-        xchainUpdateHash: bigint;
-        owner: Address;
-        manager: Address;
-        assets: Record<string, import("../../contracts/vault/strategy-vault").AssetV2>;
-        factorialPools: Record<string, import("../../contracts/vault/strategy-vault").FactorialPool>;
-        aggregatorIndex: bigint;
-        content: import("@ton/core").Cell;
-        totalSupply: bigint;
-        oracleConfig: import("@ton/core").Cell | import("../../contracts/oracle/redstone-onchain-oracle/type").RedstoneOnchainOracleConfig | import("../../contracts/oracle/redstone-oracle/type").RedstonOracleConfig;
-        rfqConfig: {
-            priceDeviationTolerance: number;
-            rfqEventEmitterAddress: string | null;
-        } | null;
-        gasConfig: Record<string, bigint> | null;
-        isPrivateVault: boolean;
-        depositCloseTimestamp: number;
-        withdrawOpenTimestamp: number;
-        whitelistedMinters: import("@ton/core").Dictionary<Address, Boolean>;
-        lastCollectTime: number;
-        managementFeeRatePerYear: number;
-        protocolFeeRatePerYear: number;
-        collectedManagementFee: bigint;
-        collectedProtocolFee: bigint;
-        rfqCode: import("@ton/core").Cell;
-        walletCode: import("@ton/core").Cell;
-        dataAggregatorCode: import("@ton/core").Cell;
-        protocolFeeManagerAddress: Address;
-        rfqIndex: bigint;
-        isExecutingStrategy: boolean;
-        maxLeverageRatio: number;
-        assetWalletDict: Record<string, string>;
-        walletAssetDict: Record<string, string>;
-        managementFeeRecipientAddress: Address | null;
-        guardianAddress: Address | null;
-        timelock: bigint;
-        pendingOwnerActionIndex: bigint;
-        pendingOwnerActionCount: bigint;
-        pendingOwnerAction: any;
-        getFactorialPoolAsset: (poolAddress: Address, assetAddress: Address) => import("../../contracts/vault/strategy-vault").FactorialPoolShare;
-        getAsset: (assetAddress: Address) => import("../../contracts/vault/strategy-vault").AssetV2;
-        version: string;
-        address: Address;
-        balance: bigint;
-        code: import("@ton/core").Cell;
-    };
-    totalSupply: bigint;
-    reserves: {
-        [k: string]: bigint;
+export declare function getPoolDataForStrategyVault(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<{
+    [k: string]: import("../..").PoolState;
+}>;
+export declare function getValuationContext(ctx: AffluentContext, vaultAddress: Address): Promise<{
+    vaultStateContext: VaultStateContext;
+    amountContext: import("../../common/transform").VaultAmountContext;
+    valueContext: import("../../common/transform").VaultValueContext;
+    nativeValueDecomposedContext: VaultNativeValueDecomposedContext;
+    nativeAmountDecomposedContext: VaultNativeAmountDecomposedContext;
+    priceInfo: import("../composite-oracle").CompositeOracleResult & {
+        targetVaultAddress: string;
+        price: bigint;
     };
-    poolPositions: Record<string, Record<string, {
-        supplyShare: bigint;
-        supplyAmount: bigint;
-        borrowShare: bigint;
-        borrowAmount: bigint;
-    }>>;
-    price: bigint;
-    priceInfo: import("../composite-oracle").Prices;
 }>;
 export declare function getPrice(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<bigint>;
 export declare function getUnderlyingPrices(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<any>;
+export declare function getNativeAmountDecomposedContext(ctx: AffluentContext, strategyVaultAddress: AddressInput): Promise<VaultNativeAmountDecomposedContext>;

package/dist/services/strategy-vault/query.js

@@ -8,10 +8,10 @@ exports.getRFQAuction = getRFQAuction;
 exports.isVaultAsset = isVaultAsset;
 exports.splitPureAndVaultAsset = splitPureAndVaultAsset;
 exports.getPoolDataForStrategyVault = getPoolDataForStrategyVault;
-exports.getPoolPositionsForStrategyVault = getPoolPositionsForStrategyVault;
 exports.getValuationContext = getValuationContext;
 exports.getPrice = getPrice;
 exports.getUnderlyingPrices = getUnderlyingPrices;
+exports.getNativeAmountDecomposedContext = getNativeAmountDecomposedContext;
 const core_1 = require("@ton/core");
 const utils_1 = require("../../contracts/common/utils");
 const jetton_wallet_1 = require("../../contracts/jetton/jetton-wallet");
@@ -19,6 +19,7 @@ const rfq_auction_1 = require("../../contracts/rfq/rfq_auction");
 const strategy_vault_1 = require("../../contracts/vault/strategy-vault");
 const composite_oracle_1 = require("../composite-oracle");
 const pool_1 = require("../../contracts/core/pool");
+const transform_1 = require("../../common/transform");
 function getVault(ctx, strategyVaultAddress) {
     return ctx.getByContract(strategy_vault_1.StrategyVault, (0, utils_1.toAddress)(strategyVaultAddress));
 }
@@ -75,57 +76,44 @@ async function getPoolDataForStrategyVault(ctx, strategyVaultAddress) {
     const poolDataEntries = await Promise.all(poolDataEntriesPromises);
     return Object.fromEntries(poolDataEntries);
 }
-async function getPoolPositionsForStrategyVault(ctx, strategyVaultAddress) {
-    const strategyVault = getVault(ctx, strategyVaultAddress);
-    const vaultData = await strategyVault.getVaultData();
-    const poolInfo = {};
-    const poolDatas = await getPoolDataForStrategyVault(ctx, strategyVaultAddress);
-    for (const [poolAddress, poolPosition] of Object.entries(vaultData.factorialPools)) {
-        const poolData = poolDatas[poolAddress];
-        const position = {};
-        for (const [assetAddress, assetPosition] of Object.entries(poolPosition)) {
-            const amountPosition = (0, pool_1.positionShareToAmount)(assetPosition, poolData.assets[assetAddress]);
-            position[assetAddress] = {
-                supplyShare: assetPosition.supply,
-                supplyAmount: amountPosition.supply,
-                borrowShare: assetPosition.borrow,
-                borrowAmount: amountPosition.borrow,
-            };
-        }
-        poolInfo[poolAddress] = position;
-    }
-    return poolInfo;
-}
-async function getValuationContext(ctx, strategyVaultAddress) {
+async function getValuationContext(ctx, vaultAddress) {
     const compositeOracle = new composite_oracle_1.CompositeOracleV1(ctx);
-    const vaultData = await getVaultData(ctx, (0, utils_1.toAddress)(strategyVaultAddress));
-    const { allPrices: priceInfo } = await compositeOracle.getVaultPriceWithDetails((0, utils_1.toAddress)(strategyVaultAddress));
-    const vaultPrice = priceInfo[(0, utils_1.toAddress)(strategyVaultAddress).toString()].price;
-    if (!vaultPrice)
-        throw new Error("Vault price not found");
-    const poolPositions = await getPoolPositionsForStrategyVault(ctx, strategyVaultAddress);
+    const vault = ctx.getByContract(strategy_vault_1.StrategyVault, (0, utils_1.toAddress)(vaultAddress));
+    const vaultData = await vault.getVaultData();
+    const priceInfo = await compositeOracle.getVaultPriceWithDetails(vaultAddress, vaultData);
+    const poolPositions = await getPoolDataForStrategyVault(ctx, vaultAddress);
+    const poolContexts = {};
+    Object.entries(poolPositions).forEach(([poolAddress, poolState]) => poolContexts[poolAddress] = transform_1.PoolContext.fromPoolState(poolState));
+    const vaultStateContext = transform_1.VaultStateContext.fromStrategyVaultState(vaultData);
+    const amountContext = vaultStateContext.toAmountContext(poolContexts);
+    const valueContext = amountContext.toValueContext(priceInfo.allPrices);
+    const nativeValueDecomposedContext = transform_1.VaultNativeValueDecomposedContext.fromValueContext(valueContext, priceInfo.allPrices);
+    const nativeAmountDecomposedContext = transform_1.VaultNativeAmountDecomposedContext.fromDecomposedValueContext(nativeValueDecomposedContext, priceInfo.allPrices);
     return {
-        storage: vaultData,
-        totalSupply: vaultData.totalSupply,
-        reserves: Object.fromEntries(Object.entries(vaultData.assets)
-            .map(([assetAddress, assetData]) => [assetAddress, assetData.cash])),
-        poolPositions,
-        price: vaultPrice,
+        vaultStateContext,
+        amountContext,
+        valueContext,
+        nativeValueDecomposedContext,
+        nativeAmountDecomposedContext,
         priceInfo,
     };
 }
 async function getPrice(ctx, strategyVaultAddress) {
-    const valuationCtx = await getValuationContext(ctx, strategyVaultAddress);
-    return valuationCtx.price;
+    const valuationCtx = await getValuationContext(ctx, (0, utils_1.toAddress)(strategyVaultAddress));
+    return valuationCtx.priceInfo.price;
 }
 async function getUnderlyingPrices(ctx, strategyVaultAddress) {
-    const valuationCtx = await getValuationContext(ctx, strategyVaultAddress);
-    const underlyingPriceEntries = Object.keys(valuationCtx.storage.assets)
+    const valuationCtx = await getValuationContext(ctx, (0, utils_1.toAddress)(strategyVaultAddress));
+    const underlyingPriceEntries = Object.keys(valuationCtx.vaultStateContext.assets)
         .map(assetAddress => {
-        const priceData = valuationCtx.priceInfo[assetAddress];
+        const priceData = valuationCtx.priceInfo.allPrices[assetAddress];
         if (!priceData)
             throw new Error(`Price data not found for asset ${assetAddress}`);
         return [assetAddress, priceData.price];
     });
     return Object.fromEntries(underlyingPriceEntries);
 }
+async function getNativeAmountDecomposedContext(ctx, strategyVaultAddress) {
+    const valuationCtx = await getValuationContext(ctx, (0, utils_1.toAddress)(strategyVaultAddress));
+    return valuationCtx.nativeAmountDecomposedContext;
+}

package/dist/utils/risk_calculator/risk_calculator.d.ts

@@ -1,16 +1,16 @@
 import { AccountAssetState, AccountAssetStateWithDelta } from "../../contracts/core/account/type";
-import { AssetPrice, AssetPriceInfo, OnchainDataInfo } from "../../contracts/oracle/redstone-onchain-oracle/type";
+import { AssetPrice, AssetPrices, OnchainDataInfo } from "../../contracts/oracle/redstone-onchain-oracle/type";
 import { PoolState } from "../../contracts/core/pool/type";
 export declare class RiskCalculator {
     accountStatus: Record<string, AccountAssetState>;
-    prices: AssetPriceInfo;
+    prices: AssetPrices;
     onchainData: OnchainDataInfo;
     poolData: PoolState;
     PRICE_DECIMALS: number;
     DELTA_DECIMALS: number;
     RATIO_DECIMALS: number;
     LEVERAGE_DECIMALS: number;
-    constructor(accountStatus: Record<string, AccountAssetState>, prices: AssetPriceInfo, onchainData: OnchainDataInfo, poolData: PoolState);
+    constructor(accountStatus: Record<string, AccountAssetState>, prices: AssetPrices, onchainData: OnchainDataInfo, poolData: PoolState);
     calculateDeltaForTargetRiskRatio(_targetRiskRatio: bigint, // ex : 6000n
     targetAsset: string, dualAsset?: string): SolutionForTargetRatio[];
     calculateDeltaForTargetLeverage(_targetLeverage: bigint, // ex : 6000n

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@affluent-org/sdk",
-  "version": "0.0.4",
+  "version": "0.0.5",
   "description": "affluent-sdk",
   "main": "dist/index.js",
   "scripts": {