@affluent-org/sdk 0.0.5 → 0.0.6

package/dist/pool.js

@@ -21,6 +21,7 @@ const readonlyCachedRedstone_1 = require("./utils/oracle/redstone/readonlyCached
 const unknown_contract_1 = require("./common/unknown-contract");
 const utils_1 = require("./utils/utils");
 const risk_calculator_1 = require("./utils/risk_calculator/risk_calculator");
+const _1 = require(".");
 const toAddress = (value) => {
     if (value instanceof ton_1.Address) {
         return value;
@@ -137,8 +138,12 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), body);
         const steps = [];
         if (toString(params.asset) == this.contracts.WTON) {
-            const poolWTONWalletAddress = await this.getJettonWalletAddress(toString(params.pool), toString(params.asset));
-            const poolWTONWallet = this.open(jetton_wallet_2.WTONWallet.createFromAddress(poolWTONWalletAddress));
+            const wtonWalletCode = ton_1.Cell.fromHex(_1.WTONWalletCompiledJson.hex);
+            const poolWTONWallet = this.client.open(jetton_wallet_2.WTONWallet.createFromConfig({
+                jettonMinter: toAddress(params.asset),
+                owner: toAddress(params.pool),
+                walletCode: wtonWalletCode,
+            }, wtonWalletCode));
             await poolWTONWallet.sendExternalTransfer(sender, jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, {
                 queryId: queryId,
                 ...opts,
@@ -148,14 +153,14 @@ class PoolV1 extends service_1.ServiceBaseV1 {
                     queryId,
                     description: "Sending the tx",
                     from: toAddress(params.sender),
-                    to: poolWTONWalletAddress,
+                    to: poolWTONWallet.address,
                     opcode: jetton_wallet_2.WTONWallet.Op.ExternalTransfer,
                 },
                 {
                     queryId,
                     description: "Supplying jetton to the pool",
                     from: toAddress(params.sender),
-                    to: poolWTONWalletAddress,
+                    to: poolWTONWallet.address,
                     opcode: jetton_wallet_2.WTONWallet.Op.ExternalTransfer,
                 },
             ]);
@@ -315,43 +320,67 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         };
     }
     async withdraw(sender, params) {
-        const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
-        const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
-        const accountData = await senderAccount.getAccountData();
-        const pool = this.open(pool_1.Pool.createFromAddress(toAddress(params.pool)));
-        const poolData = (await pool.getPoolData());
-        let oracleParams = null;
-        if (account_1.Account.haveBorrow(accountData)) {
-            const assets = [...new Set([...account_1.Account.haveAssets(accountData)])];
-            const result = redstone_onchain_oracle_1.RedstoneOnchainOracle.getOracleRequestParams(assets, poolData.oracleConfig);
-            const helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
-            const payload = await helper.createPayload(result.redstoneAssetNames);
-            const requestAssetCell = redstone_onchain_oracle_1.RedstoneOnchainOracle.createAddressToTupleCell(result.requestAssets);
-            const dataFeedIdsTupleBuilder = new ton_1.TupleBuilder();
-            result.feedIds.forEach((item) => dataFeedIdsTupleBuilder.writeNumber(item));
-            const feedIdCell = (0, ton_1.serializeTuple)(dataFeedIdsTupleBuilder.build());
-            oracleParams = (0, ton_1.beginCell)()
-                .storeRef(feedIdCell)
-                .storeRef(payload)
-                .storeRef(requestAssetCell)
-                .endCell();
-        }
-        const isWTON = toString(params.asset) == this.contracts.WTON;
-        const jettonForwardTonAmount = isWTON ? (0, ton_1.toNano)(0.02) : 0n;
-        const jettonForwardPayload = isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : null;
-        const gas = pool_1.Pool.calculateGasFee(pool_1.Pool.Op.Withdraw, pool_1.Pool.Gas.baseFee, pool_1.Pool.Gas.forwardFee, jettonForwardTonAmount, !poolData.oracle, !!oracleParams, poolData.minimumGasFee);
-        await pool.sendWithdraw(sender, gas, {
-            asset: toAddress(params.asset),
-            isShare: params.isShare,
-            amount: params.amount,
-            recipient: toAddress(params.recipient),
-            response: toAddress(params.response),
-            jettonForwardTonAmount,
-            jettonForwardPayload,
-            oracleParams: oracleParams,
-        });
+        const { pool, gas, opts } = await this._withdrawMessage(params);
+        await pool.sendWithdraw(sender, gas + (0, ton_1.toNano)(0.4), opts);
     }
     async withdrawAndWaitTx(sender, params, callbackFn) {
+        const { pool, poolData, oracleParams, gas, opts, senderAccountAddress, poolJettonWalletAddress, recipeintJettonWalletAddress, } = await this._withdrawMessage(params);
+        await pool.sendWithdraw(sender, gas + (0, ton_1.toNano)(0.4), opts);
+        const steps = [
+            {
+                queryId: opts.queryId,
+                description: "Sending the tx",
+                from: toAddress(params.sender),
+                to: toAddress(params.pool),
+                opcode: pool_1.Pool.Op.Withdraw,
+            },
+            {
+                queryId: opts.queryId,
+                description: "Calculating oracle data",
+                from: toAddress(poolData.oracle ? poolData.oracle : params.pool),
+                to: toAddress(params.pool),
+            },
+            {
+                queryId: opts.queryId,
+                description: "Updating the account",
+                from: toAddress(params.pool),
+                to: senderAccountAddress,
+                opcode: pool_1.Pool.Op.ExecuteAction,
+            },
+            {
+                queryId: opts.queryId,
+                description: "Action notification",
+                from: toAddress(params.pool),
+                to: toAddress(params.sender),
+                opcode: pool_1.Pool.Op.ActionNotification,
+            },
+            {
+                queryId: opts.queryId,
+                description: "Withdrawing jetton from the pool",
+                from: poolJettonWalletAddress,
+                to: recipeintJettonWalletAddress,
+                opcode: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
+            },
+        ];
+        (async () => {
+            const matchedTx0 = await this.findAndCallback(toAddress(params.sender), steps[0], "0", callbackFn);
+            if (poolData.oracle && oracleParams) {
+                const matchedTx1 = await this.findAndCallback(toAddress(params.pool), steps[1], matchedTx0.lt.toString(), callbackFn);
+            }
+            const matchedTx2 = await this.findAndCallback(toAddress(senderAccountAddress), steps[2], matchedTx0.lt.toString(), callbackFn);
+            const matchedTx3 = await this.findAndCallback(toAddress(params.sender), steps[3], matchedTx2.lt.toString(), callbackFn);
+            const matchedTx4 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx2.lt.toString(), callbackFn);
+        })();
+        return {
+            action: {
+                type: "pool-withdraw",
+                params,
+                queryId: opts.queryId,
+            },
+            steps,
+        };
+    }
+    async _withdrawMessage(params) {
         const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
         const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
         const accountData = await senderAccount.getAccountData();
@@ -412,10 +441,41 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const body = pool_1.Pool.createWithdrawMsgBody(opts);
         const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), body);
         const gas = pool_1.Pool.calculateGasFee(pool_1.Pool.Op.Withdraw, pool_1.Pool.Gas.baseFee, pool_1.Pool.Gas.forwardFee, jettonForwardTonAmount, !poolData.oracle, !!oracleParams, poolData.minimumGasFee);
-        await pool.sendWithdraw(sender, gas + (0, ton_1.toNano)(0.4), {
-            ...opts,
-            queryId,
-        });
+        return {
+            pool,
+            poolData,
+            oracleParams,
+            gas,
+            opts: { ...opts, queryId },
+            senderAccountAddress,
+            poolJettonWalletAddress,
+            recipeintJettonWalletAddress,
+        };
+    }
+    async findWithdrawTx(queryId, params, callbackFn) {
+        const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
+        const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
+        const accountData = await senderAccount.getAccountData();
+        const pool = this.open(pool_1.Pool.createFromAddress(toAddress(params.pool)));
+        const poolData = (await pool.getPoolData());
+        const poolJettonWalletAddress = await this.getJettonWalletAddress(toString(params.pool), toString(params.asset));
+        const recipeintJettonWalletAddress = await this.getJettonWalletAddress(toString(params.recipient), toString(params.asset));
+        let oracleParams = null;
+        if (account_1.Account.haveBorrow(accountData)) {
+            const assets = [...new Set([...account_1.Account.haveAssets(accountData)])];
+            const result = redstone_onchain_oracle_1.RedstoneOnchainOracle.getOracleRequestParams(assets, poolData.oracleConfig);
+            const helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
+            const payload = await helper.createPayload(result.redstoneAssetNames);
+            const requestAssetCell = redstone_onchain_oracle_1.RedstoneOnchainOracle.createAddressToTupleCell(result.requestAssets);
+            const dataFeedIdsTupleBuilder = new ton_1.TupleBuilder();
+            result.feedIds.forEach((item) => dataFeedIdsTupleBuilder.writeNumber(item));
+            const feedIdCell = (0, ton_1.serializeTuple)(dataFeedIdsTupleBuilder.build());
+            oracleParams = (0, ton_1.beginCell)()
+                .storeRef(feedIdCell)
+                .storeRef(payload)
+                .storeRef(requestAssetCell)
+                .endCell();
+        }
         const steps = [
             {
                 queryId,
@@ -459,7 +519,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
             }
             const matchedTx2 = await this.findAndCallback(toAddress(senderAccountAddress), steps[2], matchedTx0.lt.toString(), callbackFn);
             const matchedTx3 = await this.findAndCallback(toAddress(params.sender), steps[3], matchedTx2.lt.toString(), callbackFn);
-            const matchedTx4 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx2.lt.toString(), callbackFn);
+            const matchedTx4 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx3.lt.toString(), callbackFn);
         })();
         return {
             action: {
@@ -470,60 +530,43 @@ class PoolV1 extends service_1.ServiceBaseV1 {
             steps,
         };
     }
-    async findWithdrawTx(queryId, params, callbackFn) {
-        const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
-        const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
-        const accountData = await senderAccount.getAccountData();
-        const pool = this.open(pool_1.Pool.createFromAddress(toAddress(params.pool)));
-        const poolData = (await pool.getPoolData());
-        const poolJettonWalletAddress = await this.getJettonWalletAddress(toString(params.pool), toString(params.asset));
-        const recipeintJettonWalletAddress = await this.getJettonWalletAddress(toString(params.recipient), toString(params.asset));
-        let oracleParams = null;
-        if (account_1.Account.haveBorrow(accountData)) {
-            const assets = [...new Set([...account_1.Account.haveAssets(accountData)])];
-            const result = redstone_onchain_oracle_1.RedstoneOnchainOracle.getOracleRequestParams(assets, poolData.oracleConfig);
-            const helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
-            const payload = await helper.createPayload(result.redstoneAssetNames);
-            const requestAssetCell = redstone_onchain_oracle_1.RedstoneOnchainOracle.createAddressToTupleCell(result.requestAssets);
-            const dataFeedIdsTupleBuilder = new ton_1.TupleBuilder();
-            result.feedIds.forEach((item) => dataFeedIdsTupleBuilder.writeNumber(item));
-            const feedIdCell = (0, ton_1.serializeTuple)(dataFeedIdsTupleBuilder.build());
-            oracleParams = (0, ton_1.beginCell)()
-                .storeRef(feedIdCell)
-                .storeRef(payload)
-                .storeRef(requestAssetCell)
-                .endCell();
-        }
+    async borrow(sender, params) {
+        const { pool, gas, opts } = await this._borrowMessage(params);
+        await pool.sendBorrow(sender, gas, opts);
+    }
+    async borrowAndWaitTx(sender, params, callbackFn) {
+        const { pool, poolData, oracleParams, gas, opts, senderAccountAddress, poolJettonWalletAddress, recipeintJettonWalletAddress, } = await this._borrowMessage(params);
+        await pool.sendBorrow(sender, gas, opts);
         const steps = [
             {
-                queryId,
+                queryId: opts.queryId,
                 description: "Sending the tx",
                 from: toAddress(params.sender),
                 to: toAddress(params.pool),
-                opcode: pool_1.Pool.Op.Withdraw,
+                opcode: pool_1.Pool.Op.Borrow,
             },
             {
-                queryId,
+                queryId: opts.queryId,
                 description: "Calculating oracle data",
                 from: toAddress(poolData.oracle ? poolData.oracle : params.pool),
                 to: toAddress(params.pool),
             },
             {
-                queryId,
-                description: "Updating the account",
-                from: toAddress(params.pool),
-                to: senderAccountAddress,
-                opcode: pool_1.Pool.Op.ExecuteAction,
-            },
-            {
-                queryId,
+                queryId: opts.queryId,
                 description: "Action notification",
                 from: toAddress(params.pool),
                 to: toAddress(params.sender),
                 opcode: pool_1.Pool.Op.ActionNotification,
             },
             {
-                queryId,
+                queryId: opts.queryId,
+                description: "Updating the account",
+                from: toAddress(params.pool),
+                to: senderAccountAddress,
+                opcode: pool_1.Pool.Op.ProcessBorrowActionResult,
+            },
+            {
+                queryId: opts.queryId,
                 description: "Withdrawing jetton from the pool",
                 from: poolJettonWalletAddress,
                 to: recipeintJettonWalletAddress,
@@ -535,56 +578,20 @@ class PoolV1 extends service_1.ServiceBaseV1 {
             if (poolData.oracle && oracleParams) {
                 const matchedTx1 = await this.findAndCallback(toAddress(params.pool), steps[1], matchedTx0.lt.toString(), callbackFn);
             }
-            const matchedTx2 = await this.findAndCallback(toAddress(senderAccountAddress), steps[2], matchedTx0.lt.toString(), callbackFn);
-            const matchedTx3 = await this.findAndCallback(toAddress(params.sender), steps[3], matchedTx2.lt.toString(), callbackFn);
-            const matchedTx4 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx3.lt.toString(), callbackFn);
+            const matchedTx2 = await this.findAndCallback(toAddress(params.sender), steps[2], matchedTx0.lt.toString(), callbackFn);
+            const matchedTx4 = await this.findAndCallback(toAddress(senderAccountAddress), steps[3], matchedTx0.lt.toString(), callbackFn);
+            const matchedTx3 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx0.lt.toString(), callbackFn);
         })();
         return {
             action: {
-                type: "pool-withdraw",
+                type: "pool-borrow",
                 params,
-                queryId,
+                queryId: opts.queryId,
             },
             steps,
         };
     }
-    async borrow(sender, params) {
-        const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
-        const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
-        const accountData = await senderAccount.getAccountData();
-        const pool = this.open(pool_1.Pool.createFromAddress(toAddress(params.pool)));
-        const poolData = (await pool.getPoolData());
-        const assets = [
-            ...new Set([...account_1.Account.haveAssets(accountData), toString(params.asset)]),
-        ];
-        const result = redstone_onchain_oracle_1.RedstoneOnchainOracle.getOracleRequestParams(assets, poolData.oracleConfig);
-        const helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
-        const payload = await helper.createPayload(result.redstoneAssetNames);
-        const requestAssetCell = redstone_onchain_oracle_1.RedstoneOnchainOracle.createAddressToTupleCell(result.requestAssets);
-        const dataFeedIdsTupleBuilder = new ton_1.TupleBuilder();
-        result.feedIds.forEach((item) => dataFeedIdsTupleBuilder.writeNumber(item));
-        const feedIdCell = (0, ton_1.serializeTuple)(dataFeedIdsTupleBuilder.build());
-        const oracleParams = (0, ton_1.beginCell)()
-            .storeRef(feedIdCell)
-            .storeRef(payload)
-            .storeRef(requestAssetCell)
-            .endCell();
-        const isWTON = toString(params.asset) == this.contracts.WTON;
-        const jettonForwardTonAmount = isWTON ? (0, ton_1.toNano)(0.02) : 0n;
-        const jettonForwardPayload = isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : null;
-        const gas = pool_1.Pool.calculateGasFee(pool_1.Pool.Op.Borrow, pool_1.Pool.Gas.baseFee, pool_1.Pool.Gas.forwardFee, jettonForwardTonAmount, !poolData.oracle, !!oracleParams, poolData.minimumGasFee);
-        await pool.sendBorrow(sender, gas, {
-            asset: toAddress(params.asset),
-            isShare: params.isShare,
-            amount: params.amount,
-            recipient: toAddress(params.recipient),
-            response: toAddress(params.response),
-            jettonForwardTonAmount,
-            jettonForwardPayload,
-            oracleParams: oracleParams,
-        });
-    }
-    async borrowAndWaitTx(sender, params, callbackFn) {
+    async _borrowMessage(params) {
         const senderAccountAddress = await this.getAccountAddress(toString(params.sender), toString(params.pool));
         const senderAccount = this.open(account_1.Account.createFromAddress(senderAccountAddress));
         const accountData = await senderAccount.getAccountData();
@@ -639,62 +646,18 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const body = pool_1.Pool.createWithdrawMsgBody(opts);
         const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), body);
         const gas = pool_1.Pool.calculateGasFee(pool_1.Pool.Op.Borrow, pool_1.Pool.Gas.baseFee, pool_1.Pool.Gas.forwardFee, jettonForwardTonAmount, !poolData.oracle, !!oracleParams, poolData.minimumGasFee);
-        await pool.sendBorrow(sender, gas, {
-            ...opts,
-            queryId,
-        });
-        const steps = [
-            {
-                queryId,
-                description: "Sending the tx",
-                from: toAddress(params.sender),
-                to: toAddress(params.pool),
-                opcode: pool_1.Pool.Op.Borrow,
-            },
-            {
-                queryId,
-                description: "Calculating oracle data",
-                from: toAddress(poolData.oracle ? poolData.oracle : params.pool),
-                to: toAddress(params.pool),
-            },
-            {
-                queryId,
-                description: "Action notification",
-                from: toAddress(params.pool),
-                to: toAddress(params.sender),
-                opcode: pool_1.Pool.Op.ActionNotification,
-            },
-            {
-                queryId,
-                description: "Updating the account",
-                from: toAddress(params.pool),
-                to: senderAccountAddress,
-                opcode: pool_1.Pool.Op.ProcessBorrowActionResult,
-            },
-            {
-                queryId,
-                description: "Withdrawing jetton from the pool",
-                from: poolJettonWalletAddress,
-                to: recipeintJettonWalletAddress,
-                opcode: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
-            },
-        ];
-        (async () => {
-            const matchedTx0 = await this.findAndCallback(toAddress(params.sender), steps[0], "0", callbackFn);
-            if (poolData.oracle && oracleParams) {
-                const matchedTx1 = await this.findAndCallback(toAddress(params.pool), steps[1], matchedTx0.lt.toString(), callbackFn);
-            }
-            const matchedTx2 = await this.findAndCallback(toAddress(params.sender), steps[2], matchedTx0.lt.toString(), callbackFn);
-            const matchedTx4 = await this.findAndCallback(toAddress(senderAccountAddress), steps[3], matchedTx0.lt.toString(), callbackFn);
-            const matchedTx3 = await this.findAndCallback(toAddress(recipeintJettonWalletAddress), steps[4], matchedTx0.lt.toString(), callbackFn);
-        })();
         return {
-            action: {
-                type: "pool-borrow",
-                params,
+            pool,
+            poolData,
+            oracleParams,
+            gas,
+            opts: {
+                ...opts,
                 queryId,
             },
-            steps,
+            senderAccountAddress,
+            poolJettonWalletAddress,
+            recipeintJettonWalletAddress,
         };
     }
     async findBorrowTx(queryId, params, callbackFn) {
@@ -1789,6 +1752,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, poolData);
         const onchainData2 = await this.updateOnchainData(oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         const assetPrices = this.calculatePrices(redstonePrices, onchainData);
         const vaultPositions = await this.getParsedVaults([...vaultAssets]);
         const exposures = await this.getExposures(vaultPositions);
@@ -1837,6 +1801,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, poolData);
         const onchainData2 = await this.updateOnchainData(oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         const prices = this.calculatePrices(redstonePrices, onchainData);
         const vaultPositions = await this.getParsedVaults([...vaultAssets]);
         const exposures = await this.getExposures(vaultPositions);
@@ -1863,6 +1828,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, poolData);
         const onchainData2 = await this.updateOnchainData(oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         const prices = this.calculatePrices(redstonePrices, onchainData);
         const vaultPositions = await this.getParsedVaults([...vaultAssets]);
         const exposures = await this.getExposures(vaultPositions);
@@ -2006,6 +1972,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const pricesData = await this.getPricesV2(poolAddress.toString());
         const onchainData2 = await this.updateOnchainData(pool.oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(pricesData, onchainData);
         // @ts-ignore
         pool.oracleConfig.assetOnchainDataInfo = onchainData;
         const beforeHealth = this.isHealthyV2(pool, accountState.status, pricesData);
@@ -2017,7 +1984,9 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const solutionForTargetRatio = hasAnswer
             ? (0, utils_1.bigIntMin)(solutionsForTargetRatio)
             : utils_1.MAX256;
-        const solutionForLeverage = deltaSolutionForLeverage.delta >= 0n ? deltaSolutionForLeverage.delta : 0n;
+        const solutionForLeverage = deltaSolutionForLeverage.delta >= 0n
+            ? deltaSolutionForLeverage.delta
+            : 0n;
         const maxBorrowableAmount = (0, utils_1.bigIntMin)([
             solutionForTargetRatio,
             solutionForLeverage,
@@ -2051,7 +2020,6 @@ class PoolV1 extends service_1.ServiceBaseV1 {
             afterAccountHealth: afterHealth,
         };
     }
-    ;
     async calculateMaxWithdrawableAmount({ withdrawerAddress, poolAddress, tokenAddress, BUFFER = 100n, }) {
         if (!poolAddress || !withdrawerAddress)
             throw new Error("Pool address or withdrawer address is required");
@@ -2078,6 +2046,7 @@ class PoolV1 extends service_1.ServiceBaseV1 {
         const pricesData = await this.getPricesV2(poolAddress.toString());
         const onchainData2 = await this.updateOnchainData(pool.oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(pricesData, onchainData);
         // @ts-ignore
         pool.oracleConfig.assetOnchainDataInfo = onchainData;
         const beforeHealth = this.isHealthyV2(pool, accountState.status, pricesData);
@@ -2128,7 +2097,6 @@ class PoolV1 extends service_1.ServiceBaseV1 {
             afterAccountHealth: afterHealth,
         };
     }
-    ;
     async getPoolData(poolAddress) {
         if (!(poolAddress instanceof ton_1.Address)) {
             poolAddress = ton_1.Address.parse(poolAddress);

package/dist/poolCacheV1.js

@@ -1732,6 +1732,7 @@ class PoolCacheV1 extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, poolData);
         const onchainData2 = await this.updateOnchainData(poolData.oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         Object.keys(onchainData).forEach((key) => {
             if (!result.requestAssets.map((item) => item.toString()).includes(key) &&
                 !result.redstoneAssets.map((item) => item.toString()).includes(key)) {

package/dist/rfq-auction.d.ts

@@ -1,6 +1,6 @@
 import { Address, Cell, Sender } from "@ton/ton";
 import { AddressInput, AddressLike } from "./contracts/common/type";
-import { StrategyVaultState } from "./contracts/vault/strategy-vault/type";
+import { StrategyVaultState } from "./contracts/vault/strategy-vault/";
 import { ServiceBaseV1 } from "./common/service";
 export declare class RFQAuctionV1 extends ServiceBaseV1 {
     sendAmountBid(sender: Sender, params: {
@@ -31,7 +31,7 @@ export declare class RFQAuctionV1 extends ServiceBaseV1 {
         clear_counts: number;
         queryId?: number;
     }, value?: bigint): Promise<void>;
-    getRfqData(rfqAuctionAddress: AddressInput): Promise<{
+    getRFQData(rfqAuctionAddress: AddressInput): Promise<{
         initialized: boolean;
         index: bigint;
         state: number;

package/dist/rfq-auction.js

@@ -12,7 +12,7 @@ const service_1 = require("./common/service");
 const rfq_auction_1 = require("./contracts/rfq/rfq_auction");
 const jetton_minter_1 = require("./contracts/jetton/jetton-minter");
 const jetton_wallet_1 = require("./contracts/jetton/jetton-wallet");
-const strategy_vault_1 = require("./contracts/vault/strategy-vault");
+const strategy_vault_1 = require("./contracts/vault/strategy-vault/");
 const jetton_minter_2 = require("./contracts/wton/jetton-minter");
 const jetton_wallet_2 = require("./contracts/wton/jetton-wallet");
 const WTONWallet_compiled_json_1 = __importDefault(require("./build/WTONWallet.compiled.json"));
@@ -27,7 +27,7 @@ const toString = (value) => {
 class RFQAuctionV1 extends service_1.ServiceBaseV1 {
     async sendAmountBid(sender, params, value) {
         const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, (0, utils_1.toAddress)(params.rfqAuctionAddress));
-        const rfqData = await rfqAuction.getRfqData();
+        const rfqData = await rfqAuction.getRFQData();
         if (rfqData.config.auctionMode !== rfq_auction_1.RFQAuction.AuctionMode.AmountBid)
             throw new Error("Auction mode must be AmountBid.");
         const existingBid = rfqData.bids[sender.address.toString()];
@@ -87,7 +87,7 @@ class RFQAuctionV1 extends service_1.ServiceBaseV1 {
     }
     async sendSlippageBid(sender, params, value) {
         const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, (0, utils_1.toAddress)(params.rfqAuctionAddress));
-        const rfqData = await rfqAuction.getRfqData();
+        const rfqData = await rfqAuction.getRFQData();
         if (rfqData.config.auctionMode !== rfq_auction_1.RFQAuction.AuctionMode.SlippageBid)
             throw new Error("Auction mode must be SlippageBid.");
         if (params.slippage < 0)
@@ -153,7 +153,7 @@ class RFQAuctionV1 extends service_1.ServiceBaseV1 {
     async sendSettle(sender, params, value) {
         const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, (0, utils_1.toAddress)(params.rfqAuctionAddress));
         const oracleLibs = new oracle_1.OracleLibs(this.client, this.network);
-        const oracleParams = await oracleLibs.getOracleParamsForStrategyVaultRFQAuction(await rfqAuction.getRfqData());
+        const oracleParams = await oracleLibs.getOracleParamsForStrategyVaultRFQAuction(await rfqAuction.getRFQData());
         await rfqAuction.sendSettle(sender, value ?? (0, ton_1.toNano)(1), { oracleParams });
     }
     async sendClearBids(sender, params, value) {
@@ -161,9 +161,9 @@ class RFQAuctionV1 extends service_1.ServiceBaseV1 {
         const fee = value ?? (0, ton_1.toNano)(0.005 * params.clear_counts) + (0, ton_1.toNano)(0.1);
         await rfqAuction.sendClearBids(sender, fee, params.clear_counts);
     }
-    async getRfqData(rfqAuctionAddress) {
+    async getRFQData(rfqAuctionAddress) {
         const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, (0, utils_1.toAddress)(rfqAuctionAddress));
-        return await rfqAuction.getRfqData();
+        return await rfqAuction.getRFQData();
     }
     async getOracleParams(vaultAddress, additionalAssets = [], allFactorialVaults = [], vaultData) {
         const sv = new strategy_vault_2.StrategyVaultV1(this.client, this.network);

package/dist/rfq-batch.d.ts

@@ -1,6 +1,8 @@
-import { Address, Cell, internal, Sender } from "@ton/ton";
+import { Address, Cell, Sender } from "@ton/ton";
 import { AddressInput } from "./contracts/common/type";
 import { ServiceBaseV1 } from "./common/service";
+import { MultiSender } from "./types/sender";
+import { InternalMessageInput } from "./types/messages";
 export declare class RFQBatchV1 extends ServiceBaseV1 {
     sendAddOrder(sender: Sender, params: {
         senderAddress: AddressInput;
@@ -42,13 +44,18 @@ export declare class RFQBatchV1 extends ServiceBaseV1 {
         assetAddress: AddressInput;
         count: number;
     }, value?: bigint): Promise<void>;
+    sendBatchPayout(sender: MultiSender, params: {
+        rfqBatchAddress: AddressInput;
+        assetAddress: AddressInput;
+        count: number;
+    }, value?: bigint): Promise<void>;
     sendReopen(sender: Sender, params: {
         rfqBatchAddress: AddressInput;
     }, value?: bigint): Promise<void>;
     sendCollectFee(sender: Sender, params: {
         rfqBatchAddress: AddressInput;
     }, value?: bigint): Promise<void>;
-    getRfqBatchData(rfqBatchAddress: AddressInput): Promise<{
+    getRFQBatchData(rfqBatchAddress: AddressInput): Promise<{
         index: bigint;
         asset0Address: Address;
         asset1Address: Address;
@@ -80,6 +87,11 @@ export declare class RFQBatchV1 extends ServiceBaseV1 {
         asset1Price: bigint;
         oracleConfig: import("./contracts/oracle/redstone-oracle/type").RedstonOracleConfig | Cell | import("./contracts/oracle/redstone-onchain-oracle/type").RedstoneOnchainOracleConfig | null;
     }>;
+    getLockedAmount(params: {
+        rfqBatchAddress: AddressInput;
+        tokenAddress: AddressInput;
+        userAddress: AddressInput;
+    }): Promise<bigint>;
     createInternalAddOrder(sender: Sender, params: {
         senderAddress: AddressInput;
         rfqBatchAddress: AddressInput;
@@ -88,18 +100,16 @@ export declare class RFQBatchV1 extends ServiceBaseV1 {
         forwardTonAmount?: bigint;
         forwardPayload?: Cell | null;
         queryId?: bigint;
-    }, value?: bigint): Promise<{
-        to: Address | string;
-        value: bigint | string;
-        extracurrency?: import("@ton/core/dist/utils/maybe").Maybe<import("@ton/ton").ExtraCurrency>;
-        bounce?: import("@ton/core/dist/utils/maybe").Maybe<boolean>;
-        init?: import("@ton/core/dist/utils/maybe").Maybe<import("@ton/ton").StateInit>;
-        body?: import("@ton/core/dist/utils/maybe").Maybe<Cell | string>;
-    }>;
+    }, value?: bigint): Promise<InternalMessageInput>;
     createInternalCancelOrder(params: {
         rfqBatchAddress: AddressInput;
         assetAddress: AddressInput;
-    }, value?: bigint): Promise<Parameters<typeof internal>[0]>;
+    }, value?: bigint): Promise<InternalMessageInput>;
+    createInternalPayout(params: {
+        rfqBatchAddress: AddressInput;
+        assetAddress: AddressInput;
+        count: bigint;
+    }, value?: bigint): Promise<InternalMessageInput>;
 }
 type VaultPosition = {
     assets: Record<string, bigint>;