@affluent-org/sdk 0.0.5 → 0.0.6

package/dist/rfq-batch.js

@@ -16,7 +16,7 @@ const oracle_1 = require("./oracle/oracle");
 class RFQBatchV1 extends service_1.ServiceBaseV1 {
     async sendAddOrder(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqData = await rfqBatch.getRfqData();
+        const rfqData = await rfqBatch.getRFQData();
         const forwardPayload = rfq_batch_1.RFQBatch.createOrderMsg((0, utils_1.toAddress)(params.senderAddress), params.forwardTonAmount, params.forwardPayload);
         const assetContract = this.getByContract(jetton_minter_1.JettonMinter, (0, utils_1.toAddress)(params.assetAddress));
         const assetWalletAddress = await assetContract.getWalletAddress((0, utils_1.toAddress)(params.senderAddress));
@@ -33,7 +33,7 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
     }
     async sendSettle(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqBatchData = await rfqBatch.getRfqData();
+        const rfqBatchData = await rfqBatch.getRFQData();
         const oracleLibs = new oracle_1.OracleLibs(this.client, this.network);
         const { oracleParams, bucket } = await oracleLibs.getOracleParamsForRFQBatch(rfqBatchData);
         const forwardPayload = rfq_batch_1.RFQBatch.createSettleMsg(oracleParams);
@@ -149,7 +149,7 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
     }
     async getOracleParams(rfqBatchAddress) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(rfqBatchAddress));
-        const rfqBatchData = await rfqBatch.getRfqData();
+        const rfqBatchData = await rfqBatch.getRFQData();
         const oracleConfig = rfqBatchData.oracleConfig;
         let { assets, vaultAssets } = await this.separateAssets([
             rfqBatchData.asset0Address.toString(),
@@ -191,7 +191,7 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
     }
     async sendCancelOrder(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqBatchData = await rfqBatch.getRfqData();
+        const rfqBatchData = await rfqBatch.getRFQData();
         const assetIdx = rfqBatchData.asset0Address.toString() ===
             (0, utils_1.toAddress)(params.assetAddress).toString()
             ? 0
@@ -207,7 +207,7 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
     }
     async sendPayout(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqBatchData = await rfqBatch.getRfqData();
+        const rfqBatchData = await rfqBatch.getRFQData();
         const assetIdx = rfqBatchData.asset0Address.toString() ===
             (0, utils_1.toAddress)(params.assetAddress).toString()
             ? 0
@@ -222,6 +222,40 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
             count: params.count,
         });
     }
+    async sendBatchPayout(sender, params, value) {
+        const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
+        const rfqBatchData = await rfqBatch.getRFQData();
+        const msgs = [];
+        const maxCount = 99n;
+        // Asset0
+        const order0Count = BigInt(Object.values(rfqBatchData.asset0Orders).length);
+        if (order0Count > 0n) {
+            const batchCount = (order0Count + maxCount - 1n) / maxCount;
+            for (let i = 0; i < batchCount; i++) {
+                msgs.push(await this.createInternalPayout({
+                    rfqBatchAddress: params.rfqBatchAddress,
+                    assetAddress: rfqBatchData.asset0Address,
+                    count: maxCount,
+                }));
+            }
+        }
+        // Asset1
+        const order1Count = BigInt(Object.values(rfqBatchData.asset1Orders).length);
+        if (order1Count > 0n) {
+            const batchCount = (order1Count + maxCount - 1n) / maxCount;
+            for (let i = 0; i < batchCount; i++) {
+                msgs.push(await this.createInternalPayout({
+                    rfqBatchAddress: params.rfqBatchAddress,
+                    assetAddress: rfqBatchData.asset1Address,
+                    count: maxCount,
+                }));
+            }
+        }
+        await sender.multiSend(msgs.map((msg) => ({
+            ...msg,
+            sendMode: ton_1.SendMode.PAY_GAS_SEPARATELY,
+        })));
+    }
     async sendReopen(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
         await rfqBatch.sendReopen(sender, value ?? (0, ton_1.toNano)(0.1));
@@ -230,13 +264,28 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
         await rfqBatch.sendCollectFee(sender, value ?? (0, ton_1.toNano)(0.1));
     }
-    async getRfqBatchData(rfqBatchAddress) {
+    async getRFQBatchData(rfqBatchAddress) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(rfqBatchAddress));
-        return await rfqBatch.getRfqData();
+        return await rfqBatch.getRFQData();
+    }
+    async getLockedAmount(params) {
+        const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
+        const rfqBatchData = await rfqBatch.getRFQData();
+        const tokenAddr = (0, utils_1.toAddress)(params.tokenAddress).toString();
+        const userAddr = (0, utils_1.toAddress)(params.userAddress).toString();
+        if (rfqBatchData.asset0Address.toString() === tokenAddr) {
+            return rfqBatchData.asset0Orders[userAddr]?.amount ?? 0n;
+        }
+        else if (rfqBatchData.asset1Address.toString() === tokenAddr) {
+            return rfqBatchData.asset1Orders[userAddr]?.amount ?? 0n;
+        }
+        else {
+            throw new Error("Token not found in RFQ batch");
+        }
     }
     async createInternalAddOrder(sender, params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqData = await rfqBatch.getRfqData();
+        const rfqData = await rfqBatch.getRFQData();
         const forwardPayload = rfq_batch_1.RFQBatch.createOrderMsg((0, utils_1.toAddress)(params.senderAddress), params.forwardTonAmount, params.forwardPayload);
         const assetContract = this.getByContract(jetton_minter_1.JettonMinter, (0, utils_1.toAddress)(params.assetAddress));
         const assetWalletAddress = await assetContract.getWalletAddress((0, utils_1.toAddress)(params.senderAddress));
@@ -260,7 +309,7 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
     }
     async createInternalCancelOrder(params, value) {
         const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
-        const rfqBatchData = await rfqBatch.getRfqData();
+        const rfqBatchData = await rfqBatch.getRFQData();
         const assetIdx = rfqBatchData.asset0Address.toString() ===
             (0, utils_1.toAddress)(params.assetAddress).toString()
             ? 0
@@ -280,5 +329,28 @@ class RFQBatchV1 extends service_1.ServiceBaseV1 {
                 .endCell(),
         };
     }
+    async createInternalPayout(params, value) {
+        const rfqBatch = this.getByContract(rfq_batch_1.RFQBatch, (0, utils_1.toAddress)(params.rfqBatchAddress));
+        const rfqBatchData = await rfqBatch.getRFQData();
+        const assetIdx = rfqBatchData.asset0Address.toString() ===
+            (0, utils_1.toAddress)(params.assetAddress).toString()
+            ? 0
+            : rfqBatchData.asset1Address.toString() ===
+                (0, utils_1.toAddress)(params.assetAddress).toString()
+                ? 1
+                : -1;
+        if (assetIdx === -1)
+            throw new Error("Asset not found");
+        return {
+            to: (0, utils_1.toAddress)(params.rfqBatchAddress),
+            value: value ?? (0, ton_1.toNano)(0.1),
+            body: (0, ton_1.beginCell)()
+                .storeUint(rfq_batch_1.RFQBatch.Op.Payout, 32)
+                .storeUint(0, 64)
+                .storeUint(assetIdx, 1)
+                .storeCoins(params.count)
+                .endCell(),
+        };
+    }
 }
 exports.RFQBatchV1 = RFQBatchV1;

package/dist/services/composite-oracle/computation.d.ts

@@ -1,5 +1,5 @@
 import { Cell } from "@ton/core";
-import { Prices, SyntheticCompositions, VaultPrices, CompositeOracleResult, CompositeOracleInput, IVaultStateContext, IPoolSharePositions, IPoolContext, IAmountPosition } from "../../common/types";
+import { Prices, SyntheticCompositions, VaultPrices, CompositeOracleResult, CompositeOracleInput, IVaultStateContext, IPoolContext, IPosition } from "../../common/types";
 import { AssetPrices, OnchainDataInfo } from "../../contracts/oracle/redstone-onchain-oracle/type";
 export type OracleExposures = {
     assets: Set<string>;
@@ -8,19 +8,14 @@ export type OracleExposures = {
     totalSize(): number;
 };
 export declare function createOracleExposures(): OracleExposures;
-export declare function applyPrice(amount: bigint, price: bigint): bigint;
 export declare function calculateSyntheticPrices(rawPrices: Prices, syntheticCompositions: SyntheticCompositions): Prices;
-export declare function computePoolPositionsValue(poolPositions: IPoolSharePositions, poolInfos: Record<string, IPoolContext>, prices: Prices): {
-    totalValue: bigint;
-    decomposed: Record<string, IAmountPosition>;
-    assetAmounts: Record<string, bigint>;
-};
 export declare function computeVaultValue(vault: IVaultStateContext, poolInfos: Record<string, IPoolContext>, prices: Prices): {
     totalValue: bigint;
     price: bigint;
-    decomposed: Record<string, IAmountPosition>;
+    amountContext: import("../../common/types").IVaultAmountContext;
 };
 export declare function calculateVaultPrices(vaultPositions: Record<string, IVaultStateContext>, poolInfos: Record<string, IPoolContext>, assetPrices: Prices): VaultPrices;
+export declare function nativeDecomposeContext<P extends IPosition>(amountContext: Record<string, P>, prices: Prices): Record<string, P>;
 export declare function computeCompositePrices(input: CompositeOracleInput): CompositeOracleResult;
 export declare function getExposures(vaultPositions: Record<string, IVaultStateContext>): {
     assets: string[];

package/dist/services/composite-oracle/computation.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createOracleExposures = createOracleExposures;
-exports.applyPrice = applyPrice;
 exports.calculateSyntheticPrices = calculateSyntheticPrices;
-exports.computePoolPositionsValue = computePoolPositionsValue;
 exports.computeVaultValue = computeVaultValue;
 exports.calculateVaultPrices = calculateVaultPrices;
+exports.nativeDecomposeContext = nativeDecomposeContext;
 exports.computeCompositePrices = computeCompositePrices;
 exports.getExposures = getExposures;
 exports.separateAssets = separateAssets;
@@ -18,6 +17,8 @@ const type_1 = require("../../contracts/oracle/redstone-onchain-oracle/type");
 const redstone_onchain_oracle_1 = require("../../contracts/oracle/redstone-onchain-oracle");
 const redstoneHelper_1 = require("../../utils/oracle/redstone/redstoneHelper");
 const utils_1 = require("../../contracts/common/utils");
+const transform_1 = require("../../common/transform");
+const helper_1 = require("../../common/helper");
 function createOracleExposures() {
     return {
         assets: new Set(),
@@ -28,9 +29,6 @@ function createOracleExposures() {
         },
     };
 }
-function applyPrice(amount, price) {
-    return (amount * price) / types_1.DECIMALS_OF_PRICE;
-}
 function calculateSyntheticPrices(rawPrices, syntheticCompositions) {
     const prices = { ...rawPrices };
     let pendingAssets = Object.entries(syntheticCompositions);
@@ -87,52 +85,12 @@ function calculateSyntheticPrices(rawPrices, syntheticCompositions) {
     }
     return prices;
 }
-function computePoolPositionsValue(poolPositions, poolInfos, prices) {
-    const decomposed = {};
-    const assetAmounts = {};
-    let totalValue = 0n;
-    for (const [poolAddress, assetPositions] of Object.entries(poolPositions)) {
-        const poolInfo = poolInfos[poolAddress];
-        if (!poolInfo)
-            continue;
-        for (const [assetAddress, position] of Object.entries(assetPositions)) {
-            const assetInfo = poolInfo.assets[assetAddress];
-            if (!assetInfo)
-                continue;
-            const amounts = position.toAmountPosition(assetInfo);
-            if (decomposed[assetAddress])
-                decomposed[assetAddress].applyPosition(amounts);
-            else
-                decomposed[assetAddress] = amounts.clone();
-            const netAmount = amounts.net();
-            assetAmounts[assetAddress] = (assetAmounts[assetAddress] ?? 0n) + netAmount;
-            const price = prices[assetAddress];
-            if (price)
-                totalValue += applyPrice(netAmount, price.price);
-        }
-    }
-    return { totalValue, decomposed, assetAmounts };
-}
 function computeVaultValue(vault, poolInfos, prices) {
-    let cashValue = 0n;
-    const decomposed = {};
-    for (const [assetAddress, amount] of Object.entries(vault.assets)) {
-        const price = prices[assetAddress];
-        if (price && amount.supply > 0n) {
-            cashValue += applyPrice(amount.supply, price.price);
-        }
-        decomposed[assetAddress] = amount.clone();
-    }
-    const poolResult = computePoolPositionsValue(vault.pools, poolInfos, prices);
-    for (const [assetAddress, amounts] of Object.entries(poolResult.decomposed)) {
-        if (decomposed[assetAddress])
-            decomposed[assetAddress].applyPosition(amounts);
-        else
-            decomposed[assetAddress] = amounts.clone();
-    }
-    const totalValue = cashValue + poolResult.totalValue;
-    const price = vault.totalSupply === 0n ? 0n : (totalValue * types_1.DECIMALS_OF_PRICE) / vault.totalSupply;
-    return { totalValue, price, decomposed };
+    const amountContext = vault.toAmountContext(poolInfos);
+    const valueContext = amountContext.toValueContext(prices);
+    const totalValue = valueContext.totalValue;
+    const price = vault.totalSupply === 0n ? 0n : (totalValue / vault.totalSupply);
+    return { totalValue, price, amountContext };
 }
 function calculateVaultPrices(vaultPositions, poolInfos, assetPrices) {
     const vaultPrices = {};
@@ -171,8 +129,7 @@ function calculateVaultPrices(vaultPositions, poolInfos, assetPrices) {
                     type: types_1.CompositeAssetType.VAULT,
                     price: result.price,
                     additionalData: {
-                        decomposed: result.decomposed,
-                        totalSupply: vault.totalSupply,
+                        amountContext: result.amountContext,
                     },
                 };
                 vaultPrices[vaultAddress] = vaultPriceEntry;
@@ -190,8 +147,7 @@ function calculateVaultPrices(vaultPositions, poolInfos, assetPrices) {
                     type: types_1.CompositeAssetType.VAULT,
                     price: 0n,
                     additionalData: {
-                        decomposed: {},
-                        totalSupply: pendingVaults[vaultAddress].totalSupply,
+                        amountContext: new transform_1.VaultAmountContext(vaultAddress, pendingVaults[vaultAddress].totalSupply, {}, {}),
                     },
                 };
                 delete pendingVaults[vaultAddress];
@@ -200,6 +156,52 @@ function calculateVaultPrices(vaultPositions, poolInfos, assetPrices) {
     }
     return vaultPrices;
 }
+function nativeDecomposeContext(amountContext, prices) {
+    const nativeDecomposed = {};
+    Object.entries(amountContext)
+        .forEach(([asset, position]) => {
+        const price = prices[asset];
+        if (price.type === types_1.CompositeAssetType.NATIVE) {
+            nativeDecomposed[asset] = position.addPosition(nativeDecomposed[asset]);
+        }
+        else if (price.type === types_1.CompositeAssetType.SYNTHETIC1) {
+            if (prices[price.additionalData.underlying].type !== types_1.CompositeAssetType.NATIVE)
+                throw new Error(`Invalid underlying asset type: ${price.additionalData.underlying}`);
+            const underlyingNativeDecomposed = nativeDecomposeContext({ [price.additionalData.underlying]: position.muldiv(price.additionalData.reserve, price.additionalData.totalSupply) }, prices);
+            (0, helper_1.applyPositions)(nativeDecomposed, underlyingNativeDecomposed);
+        }
+        else if (price.type === types_1.CompositeAssetType.SYNTHETIC2) {
+            if (prices[price.additionalData0.underlying].type !== types_1.CompositeAssetType.NATIVE)
+                throw new Error(`Invalid underlying asset type: ${price.additionalData0.underlying}`);
+            if (prices[price.additionalData1.underlying].type !== types_1.CompositeAssetType.NATIVE)
+                throw new Error(`Invalid underlying asset type: ${price.additionalData1.underlying}`);
+            const price0 = prices[price.additionalData0.underlying].price;
+            const price1 = prices[price.additionalData1.underlying].price;
+            const value0 = price.additionalData0.reserve * price0;
+            const value1 = price.additionalData1.reserve * price1;
+            const totalValue = value0 + value1;
+            const underlyingNativeDecomposed = nativeDecomposeContext({
+                [price.additionalData0.underlying]: position.muldiv(value0, totalValue),
+                [price.additionalData1.underlying]: position.muldiv(value1, totalValue)
+            }, prices);
+            (0, helper_1.applyPositions)(nativeDecomposed, underlyingNativeDecomposed);
+        }
+        else if (price.type === types_1.CompositeAssetType.VAULT) {
+            const depVaultValue = price.price * price.additionalData.amountContext.totalSupply;
+            const depDecomposed = {};
+            Object.entries(price.additionalData.amountContext.decompose())
+                .forEach(([depAsset, depPosition]) => {
+                depDecomposed[depAsset] = position.cross(depPosition.toValuePosition(prices[depAsset].price), depVaultValue);
+            });
+            const depNativeDecomposed = nativeDecomposeContext(depDecomposed, prices);
+            (0, helper_1.applyPositions)(nativeDecomposed, depNativeDecomposed);
+        }
+        else {
+            throw new Error(`Invalid asset type: ${price}`);
+        }
+    });
+    return nativeDecomposed;
+}
 function computeCompositePrices(input) {
     const assetPrices = calculateSyntheticPrices(input.rawPrices, input.syntheticCompositions);
     const vaultPrices = calculateVaultPrices(input.vaultPositions, input.poolInfos, assetPrices);
@@ -295,9 +297,42 @@ function buildOracleParamsCellFromPayload(assets, oracleConfig, payload, pools,
  */
 async function buildOracleParamsCell(assets, oracleConfig, pools, vaults) {
     const requestParams = redstone_onchain_oracle_1.RedstoneOnchainOracle.getOracleRequestParams(assets, oracleConfig);
-    // Fetch Redstone payload
-    const helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
+    const signers = new Set(oracleConfig.signers
+        .map((s) => s.toLowerCase()));
+    let helper;
+    if (setEqual(signers, restonSigners)) {
+        helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
+    }
+    else if (setEqual(signers, affluentSigners)) {
+        helper = (0, redstoneHelper_1.createRedstoneCustomHelper)("http://aggregatora3loa-ktesxzhb-780180176.ap-northeast-2.elb.amazonaws.com");
+    }
+    else {
+        throw new Error(`Invalid signers: ${[...signers]}`);
+    }
+    // Fetch payload
     const payload = await helper.createPayload(requestParams.redstoneAssetNames);
     // Pure computation
     return buildOracleParamsCellFromPayload(assets, oracleConfig, payload, pools, vaults);
 }
+const restonSigners = new Set([
+    '51Ce04Be4b3E32572C4Ec9135221d0691Ba7d202',
+    '8BB8F32Df04c8b654987DAaeD53D6B6091e3B774',
+    '9c5AE89C4Af6aA32cE58588DBaF90d18a855B6de',
+    'DD682daEC5A90dD295d14DA4b0bec9281017b5bE',
+    'dEB22f54738d54976C4c0fe5ce6d408E40d88499'
+].map((s) => s.toLowerCase()));
+const affluentSigners = new Set([
+    "938b33477fdcebcb1ca4dd9502af775a0c4f2e2c",
+    "7d8d5e5be15338797183652d401f290c21d08e73",
+    "95abc793f212a11330ddafd337edb8b1903f62f5",
+    "4d0a8877125e889004facfdef35fc256548ce038",
+    "fb023d5b920b1c13be0c4cdde27e7b75ef67c627",
+].map((s) => s.toLowerCase()));
+function setEqual(a, b) {
+    if (a.size !== b.size)
+        return false;
+    for (const v of a)
+        if (!b.has(v))
+            return false;
+    return true;
+}

package/dist/services/composite-oracle/index.js

@@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CompositeOracleV1 = exports.CompositeOracleFetcher = void 0;
 const utils_1 = require("../../contracts/common/utils");
-const types_1 = require("../../common/types");
 const computation_1 = require("./computation");
 const query_1 = require("./query");
 __exportStar(require("../../common/types"), exports);
@@ -83,10 +82,10 @@ class CompositeOracleV1 extends query_1.CompositeOracleFetcher {
         const result = this.compute(input);
         const targetVaultAddress = (0, utils_1.toAddress)(vaultAddress).toString();
         const vaultPriceEntry = result.vaultPrices[targetVaultAddress];
-        if (!vaultPriceEntry || vaultPriceEntry.additionalData.totalSupply === 0n) {
+        if (!vaultPriceEntry || vaultPriceEntry.additionalData.amountContext.totalSupply === 0n) {
             return 0n;
         }
-        return (vaultPriceEntry.price * vaultPriceEntry.additionalData.totalSupply) / types_1.DECIMALS_OF_PRICE;
+        return vaultPriceEntry.price * vaultPriceEntry.additionalData.amountContext.totalSupply;
     }
     // ============================================================
     // Static computation methods (no instance needed)
@@ -101,10 +100,10 @@ class CompositeOracleV1 extends query_1.CompositeOracleFetcher {
     static getTotalValueFromInput(input, vaultAddress) {
         const result = (0, computation_1.computeCompositePrices)(input);
         const vaultPriceEntry = result.vaultPrices[vaultAddress];
-        if (!vaultPriceEntry || vaultPriceEntry.additionalData.totalSupply === 0n) {
+        if (!vaultPriceEntry || vaultPriceEntry.additionalData.amountContext.totalSupply === 0n) {
             return 0n;
         }
-        return (vaultPriceEntry.price * vaultPriceEntry.additionalData.totalSupply) / types_1.DECIMALS_OF_PRICE;
+        return vaultPriceEntry.price * vaultPriceEntry.additionalData.amountContext.totalSupply;
     }
 }
 exports.CompositeOracleV1 = CompositeOracleV1;

package/dist/services/composite-oracle/query.js

@@ -59,7 +59,7 @@ class CompositeOracleFetcher {
                 if (rainfo.assetType === 0) {
                     rawPrices[rainfo.address.toString()] = {
                         type: types_1.CompositeAssetType.NATIVE,
-                        price: (item.price * types_1.DECIMALS_OF_PRICE) / rainfo.precision,
+                        price: (item.price * types_1.VALUE_SCALE) / rainfo.precision,
                         timestamp: item.timestamp,
                     };
                 }
@@ -180,8 +180,6 @@ class CompositeOracleFetcher {
                 if (state.state.type === "active" && state.state.data) {
                     const data = core_1.Cell.fromBoc(state.state.data)[0];
                     try {
-                        const vaultData = strategy_vault_1.StrategyVault.parseVaultData(data);
-                        // VaultStateContext.fromStrategyVaultState(vaultData);
                         positions[addressStr] = transform_1.VaultStateContext.fromStrategyVaultStateCell((0, utils_1.toAddress)(vaultAddress), data);
                         return;
                     }

package/dist/services/pool/computation.js

@@ -9,54 +9,12 @@ exports.applyDelta = applyDelta;
 exports.decomposePositions = decomposePositions;
 exports.calculateRisk = calculateRisk;
 exports.isHealthyFromData = isHealthyFromData;
-const core_1 = require("@ton/core");
 const pool_1 = require("../../contracts/core/pool");
 const account_1 = require("../../contracts/core/account");
 const types_1 = require("../../common/types");
-const utils_1 = require("../../contracts/common/utils");
 const transform_1 = require("../../common/transform");
-// ============================================================
-// Position Decomposition Helpers
-// ============================================================
-/**
- * Try to decompose a synthetic/vault asset to its underlying assets
- * Returns null if asset is native (no decomposition needed)
- */
-function tryDecomposeAsset(asset, position, syntheticCompositions, vaultCompositions) {
-    const data = syntheticCompositions[asset];
-    // SYNTHETIC1: single underlying asset (e.g. stTON, tsTON)
-    if (data?.assetType === types_1.CompositeAssetType.SYNTHETIC1 &&
-        "underlyingReserve" in data &&
-        data.underlyingReserve &&
-        data.totalSupply) {
-        const ratio = data.underlyingReserve;
-        const total = data.totalSupply;
-        return [
-            new transform_1.AmountPositionWithAddress((0, utils_1.toAddress)(data.underlyingAddress), (position.supply * ratio) / total, (position.borrow * ratio) / total),
-        ];
-    }
-    // SYNTHETIC2: two underlying assets (e.g. LP tokens)
-    if (data?.assetType === types_1.CompositeAssetType.SYNTHETIC2 &&
-        "underlying0Reserve" in data &&
-        data.underlying0Reserve &&
-        data.underlying1Reserve &&
-        data.totalSupply) {
-        const total = data.totalSupply;
-        return [
-            new transform_1.AmountPositionWithAddress((0, utils_1.toAddress)(data.underlying0Address), (position.supply * data.underlying0Reserve) / total, (position.borrow * data.underlying0Reserve) / total),
-            new transform_1.AmountPositionWithAddress((0, utils_1.toAddress)(data.underlying1Address), (position.supply * data.underlying1Reserve) / total, (position.borrow * data.underlying1Reserve) / total),
-        ];
-    }
-    // VAULT: Strategy Vault - uses decomposed positions
-    const vault = vaultCompositions[asset];
-    if (vault) {
-        const { decomposed, totalSupply } = vault;
-        return Object.entries(decomposed).map(([addr, pos]) => new transform_1.AmountPositionWithAddress(core_1.Address.parse(addr), 
-        // Vault supply/borrow cross each other
-        (position.supply * pos.supply + position.borrow * pos.borrow) / totalSupply, (position.supply * pos.borrow + position.borrow * pos.supply) / totalSupply));
-    }
-    return null; // Native asset
-}
+const computation_1 = require("../../common/computation");
+const helper_1 = require("../../common/helper");
 // ============================================================
 // Pure Computation (no I/O)
 // ============================================================
@@ -101,22 +59,12 @@ function applyDelta(accountData, delta) {
  */
 function decomposePositions(positions, syntheticCompositions, vaultCompositions = {}) {
     const accumulatedPositions = {};
-    const queue = [...Object.values(positions)].map(position => transform_1.AmountPositionWithAddress.from(position));
-    while (queue.length > 0) {
-        const current = queue.shift();
-        if (current.supply === 0n && current.borrow === 0n)
-            continue;
-        // Accumulate all assets (synthetic/vault/native)
-        const asset = current.address.toString();
-        accumulatedPositions[asset] ??= new transform_1.AmountPosition(0n, 0n);
-        accumulatedPositions[asset].supply += current.supply;
-        accumulatedPositions[asset].borrow += current.borrow;
-        // If decomposable, add underlying to queue
-        const decomposed = tryDecomposeAsset(asset, current, syntheticCompositions, vaultCompositions);
-        if (decomposed) {
-            queue.push(...decomposed);
-        }
-    }
+    Object.values(positions)
+        .forEach(position => {
+        const asset = position.address.toString();
+        const decomposed = (0, computation_1.tryNativeDecomposeAsset)(asset, new transform_1.AmountPosition(position.supply, position.borrow), syntheticCompositions, vaultCompositions);
+        (0, helper_1.applyPositions)(accumulatedPositions, decomposed);
+    });
     return accumulatedPositions;
 }
 /** @deprecated Use decomposePositions instead */
@@ -199,7 +147,7 @@ function calculateRisk(decomposedAccountStatus, prices, poolData) {
  * Takes pre-fetched pool data, account status, and prices
  */
 function isHealthyFromData(poolData, accountStatus, prices, syntheticCompositions, vaultCompositions = {}) {
-    const simulatedPoolData = simulateAccrueInterest(poolData);
     const decomposed = decomposePositions(accountStatus, syntheticCompositions, vaultCompositions);
+    const simulatedPoolData = simulateAccrueInterest(poolData);
     return calculateRisk(decomposed, prices, simulatedPoolData);
 }

package/dist/services/pool/index.d.ts

@@ -9,9 +9,11 @@ import * as query from "./query";
 import * as oracle from "./oracle";
 import * as owner from "./owner";
 import * as user from "./user";
+import { PoolSupplyTracer, PoolWithdrawTracer, PoolBorrowTracer, PoolRepayTracer } from "./user/trace";
 export { sendMsg } from "../../lib/send-msg";
 export * from "./owner/types";
 export * from "./user/types";
+export * from "./user/trace";
 export * from "./computation";
 export { computation, query, oracle, owner, user };
 export declare class PoolServiceV1 {
@@ -32,63 +34,12 @@ export declare class PoolServiceV1 {
     static convertShareToAmount(accountData: AccountState, poolData: PoolState): AccountState;
     static haveBorrow(accountData: AccountState): boolean;
     static haveAssets(accountData: AccountState): string[];
-    sendSetOwner(sender: AddressSender, params: owner.SetOwnerParams, value?: bigint): Promise<{
-        newOwner: Address;
-        queryID: number | undefined;
-    }>;
-    sendSetIrmConfig(sender: AddressSender, params: owner.SetIrmConfigParams, value?: bigint): Promise<{
-        asset: Address;
-        irmConfig: import("@ton/core").Cell;
-        queryId: number | undefined;
-    }>;
-    sendSetFeeConfigurer(sender: AddressSender, params: owner.SetFeeConfigurerParams, value?: bigint): Promise<{
-        feeConfigurer: Address;
-        queryId: number | undefined;
-    }>;
-    sendSupply(sender: AddressSender, params: user.SupplyParams, value?: bigint): Promise<{
-        recipient: Address;
-        amount: bigint;
-        response: Address;
-        forwardTonAmount: bigint;
-        forwardPayload: import("@ton/core").Cell;
-        queryId: bigint | undefined;
-    }>;
-    sendWithdraw(sender: AddressSender, params: user.WithdrawParams, value?: bigint): Promise<{
-        asset: Address;
-        isShare: boolean;
-        amount: bigint;
-        recipient: Address;
-        response: Address;
-        jettonForwardTonAmount: bigint;
-        jettonForwardPayload: import("@ton/core").Cell | null;
-        oracleParams: import("@ton/core").Cell | null;
-        queryId: bigint | undefined;
-    }>;
-    sendBorrow(sender: AddressSender, params: user.BorrowParams, value?: bigint): Promise<{
-        asset: Address;
-        isShare: boolean;
-        amount: bigint;
-        recipient: Address;
-        response: Address;
-        jettonForwardTonAmount: bigint;
-        jettonForwardPayload: import("@ton/core").Cell | null;
-        oracleParams: import("@ton/core").Cell | null;
-        queryId: bigint | undefined;
-    }>;
-    sendRepay(sender: AddressSender, params: user.RepayParams, value?: bigint): Promise<{
-        recipient: Address;
-        amount: bigint;
-        response: Address;
-        forwardTonAmount: bigint;
-        forwardPayload: import("@ton/core").Cell;
-        queryId: bigint | undefined;
-    }>;
-    sendLiquidate(sender: AddressSender, params: user.LiquidateParams, value?: bigint): Promise<{
-        recipient: Address;
-        amount: bigint;
-        response: Address;
-        forwardTonAmount: bigint;
-        forwardPayload: import("@ton/core").Cell;
-        queryId: bigint | undefined;
-    }>;
+    sendSetOwner(sender: AddressSender, params: owner.SetOwnerParams, value?: bigint): Promise<import("../..").SimpleTracer>;
+    sendSetIrmConfig(sender: AddressSender, params: owner.SetIrmConfigParams, value?: bigint): Promise<import("../..").SimpleTracer>;
+    sendSetFeeConfigurer(sender: AddressSender, params: owner.SetFeeConfigurerParams, value?: bigint): Promise<import("../..").SimpleTracer>;
+    sendSupply(sender: AddressSender, params: user.SupplyParams, value?: bigint): Promise<PoolSupplyTracer>;
+    sendWithdraw(sender: AddressSender, params: user.WithdrawParams, value?: bigint): Promise<PoolWithdrawTracer>;
+    sendBorrow(sender: AddressSender, params: user.BorrowParams, value?: bigint): Promise<PoolBorrowTracer>;
+    sendRepay(sender: AddressSender, params: user.RepayParams, value?: bigint): Promise<PoolRepayTracer>;
+    sendLiquidate(sender: AddressSender, params: user.LiquidateParams, value?: bigint): Promise<import("../..").SimpleTracer>;
 }