@affluent-org/sdk 0.0.4 → 0.0.6

package/dist/strategy_vault/base.js

@@ -21,6 +21,9 @@ const redstoneHelper_1 = require("../utils/oracle/redstone/redstoneHelper");
 const readonlyCachedRedstone_1 = require("../utils/oracle/redstone/readonlyCachedRedstone");
 const oracle_1 = require("../oracle/oracle");
 const unknown_contract_1 = require("../common/unknown-contract");
+const oracle_v2_1 = require("../oracle/oracle-v2");
+const share_vault_1 = require("../share-vault");
+const versions_1 = require("../common/versions");
 function jsonReplacer(_, value) {
     if (typeof value === "bigint") {
         return { __type: "bigint", value: value.toString() };
@@ -310,13 +313,33 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
         return oracleParams;
     }
     async sendDepositAsset(sender, params, value) {
+        const { opts, input } = await this._createInternalDepositAsset(sender, params, value);
+        await sender.send(input);
+        return opts;
+    }
+    async createInternalDepositAsset(sender, params, value) {
+        const { opts, input } = await this._createInternalDepositAsset(sender, params, value);
+        return input;
+    }
+    async _createInternalDepositAsset(sender, params, value) {
+        const vaultault = this.client.open(strategy_vault_1.StrategyVault.createFromAddress((0, utils_1.toAddress)(params.strategyVaultAddress)));
+        const vaultData = await vaultault.getVaultData();
+        const version = this.contractVersion.getVersion(vaultData.code);
+        if (version === versions_1.AffluentVersions.StrategyV1) {
+            return this._createInternalDepositAssetV1(sender, params, value);
+        }
+        else {
+            return this._createInternalDepositAssetV2(sender, params, value);
+        }
+    }
+    async _createInternalDepositAssetV1(sender, params, value) {
         const vault = this.getVault(params.strategyVaultAddress);
         const vaultData = await vault.getVaultData();
         const oracle = new oracle_1.OracleLibs(this.client, this.network);
         // need all assets in vault
         const oraclePayload = await oracle.getOracleParamsForStrategyVault(vaultData, [params.assetAddress.toString(), ...Object.keys(vaultData.assets)]);
         const isWTON = params.assetAddress.toString() === this.contracts.WTON ? true : false;
-        const forwardPayload = strategy_vault_1.StrategyVault.createDepositPayload(oraclePayload, isWTON ? (0, core_1.toNano)(0.02) : 0n, isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined);
+        const forwardPayload = strategy_vault_1.StrategyVault.createDepositPayloadV1(oraclePayload, isWTON ? (0, core_1.toNano)(0.02) : 0n, isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined);
         const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
         const fee = vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Deposit] +
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.DepositLogic] +
@@ -333,50 +356,36 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
             // send to vault wton wallet
             const wtonMaster = this.getByContract(jetton_minter_2.WTONMinter, assetAddress);
             const wtonWallet = this.getByContract(jetton_wallet_2.WTONWallet, (0, utils_1.toAddress)(await wtonMaster.getWalletAddress(vault.address)));
-            await wtonWallet.sendExternalTransfer(sender, value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opts);
+            return {
+                opts,
+                input: wtonWallet.createInternalExternalTransfer(value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opts),
+            };
         }
         else {
             // send to sender jetton wallet
             const jettonMaster = this.getByContract(jetton_minter_1.JettonMinter, assetAddress);
             const jettonWalletAddress = await jettonMaster.getWalletAddress(sender.address);
             const jettonWallet = this.getByContract(jetton_wallet_1.JettonWallet, jettonWalletAddress);
-            await jettonWallet.sendTransfer(sender, value ?? fee + (0, core_1.toNano)(0.1), opts);
+            return {
+                opts,
+                input: jettonWallet.createInternalTransfer(value ?? fee + (0, core_1.toNano)(0.1), opts),
+            };
         }
-        return opts;
-    }
-    async sendBurnVaultAsset(sender, params, value) {
-        const vault = this.getVault(params.strategyVaultAddress);
-        const vaultData = await vault.getVaultData();
-        const vaultAssetWalllet = await this.getVaultWallet(params.strategyVaultAddress, sender.address);
-        const oraclePayload = await this.getOracleParamsV2(params.strategyVaultAddress);
-        const withdrawAssetAddress = (0, utils_1.toAddress)(params.withdrawAssetAddress);
-        const isWTON = withdrawAssetAddress.toString() === this.contracts.WTON ? true : false;
-        const forwardPayload = strategy_vault_1.StrategyVault.createWithdrawPayload(withdrawAssetAddress, oraclePayload, isWTON ? (0, core_1.toNano)(0.02) : 0n, isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined);
-        const fee = vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Withdraw] +
-            vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.WithdrawLogic] +
-            (isWTON ? (0, core_1.toNano)(0.02) : 0n) +
-            (0, core_1.toNano)(0.1);
-        const opts = {
-            amount: params.vaultShareAmountForBurn,
-            response: sender.address,
-            forwardPayload: forwardPayload,
-            queryId: createQueryId({ ...params, forwardPayload }),
-        };
-        await vaultAssetWalllet.sendBurn(sender, value ?? fee, opts);
-        return opts;
     }
-    async createInternalDepositAsset(sender, params, value) {
+    async _createInternalDepositAssetV2(sender, params, value) {
         const vault = this.getVault(params.strategyVaultAddress);
         const vaultData = await vault.getVaultData();
         const oracle = new oracle_1.OracleLibs(this.client, this.network);
         // need all assets in vault
         const oraclePayload = await oracle.getOracleParamsForStrategyVault(vaultData, [params.assetAddress.toString(), ...Object.keys(vaultData.assets)]);
         const isWTON = params.assetAddress.toString() === this.contracts.WTON ? true : false;
-        const forwardPayload = strategy_vault_1.StrategyVault.createDepositPayload(oraclePayload, isWTON ? (0, core_1.toNano)(0.02) : 0n, isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined);
+        const jettonResponseTonAmount = isWTON ? (0, core_1.toNano)(0.02) : 0n;
+        const jettonResponsePayload = isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined;
+        const forwardPayload = strategy_vault_1.StrategyVault.createDepositPayload(sender.address, oraclePayload, jettonResponseTonAmount, jettonResponsePayload);
         const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
         const fee = vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Deposit] +
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.DepositLogic] +
-            (isWTON ? (0, core_1.toNano)(0.02) : 0n);
+            jettonResponseTonAmount;
         const opts = {
             recipient: vault.address,
             amount: params.amount,
@@ -385,31 +394,49 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
             forwardPayload,
             queryId: params.queryId ?? createQueryId({ ...params, forwardPayload }),
         };
-        if (assetAddress.toString() === (0, utils_1.toAddress)(this.contracts.WTON).toString()) {
-            // send to vault wton wallet
+        if (isWTON) {
             const wtonMaster = this.getByContract(jetton_minter_2.WTONMinter, assetAddress);
             const wtonWallet = this.getByContract(jetton_wallet_2.WTONWallet, (0, utils_1.toAddress)(await wtonMaster.getWalletAddress(vault.address)));
-            return wtonWallet.createInternalExternalTransfer(value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opts);
+            return {
+                opts,
+                input: wtonWallet.createInternalExternalTransfer(value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opts),
+            };
         }
         else {
             // send to sender jetton wallet
             const jettonMaster = this.getByContract(jetton_minter_1.JettonMinter, assetAddress);
             const jettonWalletAddress = await jettonMaster.getWalletAddress(sender.address);
             const jettonWallet = this.getByContract(jetton_wallet_1.JettonWallet, jettonWalletAddress);
-            return jettonWallet.createInternalTransfer(value ?? fee + (0, core_1.toNano)(0.1), opts);
+            return {
+                opts,
+                input: jettonWallet.createInternalTransfer(value ?? fee + (0, core_1.toNano)(0.1), opts),
+            };
         }
     }
+    async sendBurnVaultAsset(sender, params, value) {
+        const { opts, input } = await this._createInternalBurnVaultAsset(sender, params, value);
+        await sender.send(input);
+        return opts;
+    }
     async createInternalBurnVaultAsset(sender, params, value) {
+        const { opts, input } = await this._createInternalBurnVaultAsset(sender, params, value);
+        return input;
+    }
+    async _createInternalBurnVaultAsset(sender, params, value) {
         const vault = this.getVault(params.strategyVaultAddress);
         const vaultData = await vault.getVaultData();
         const vaultAssetWalllet = await this.getVaultWallet(params.strategyVaultAddress, sender.address);
-        const oraclePayload = await this.getOracleParamsV2(params.strategyVaultAddress);
+        const oracle = new oracle_1.OracleLibs(this.client, this.network);
+        // need all assets in vault
+        const oraclePayload = await oracle.getOracleParamsForStrategyVault(vaultData, [params.withdrawAssetAddress.toString(), ...Object.keys(vaultData.assets)]);
         const withdrawAssetAddress = (0, utils_1.toAddress)(params.withdrawAssetAddress);
         const isWTON = withdrawAssetAddress.toString() === this.contracts.WTON ? true : false;
-        const forwardPayload = strategy_vault_1.StrategyVault.createWithdrawPayload(withdrawAssetAddress, oraclePayload, isWTON ? (0, core_1.toNano)(0.02) : 0n, isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined);
+        const jettonResponseTonAmount = isWTON ? (0, core_1.toNano)(0.02) : 0n;
+        const jettonResponsePayload = isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined;
+        const forwardPayload = strategy_vault_1.StrategyVault.createWithdrawPayload(withdrawAssetAddress, oraclePayload, jettonResponseTonAmount, jettonResponsePayload);
         const fee = vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Withdraw] +
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.WithdrawLogic] +
-            (isWTON ? (0, core_1.toNano)(0.02) : 0n) +
+            jettonResponseTonAmount +
             (0, core_1.toNano)(0.1);
         const opts = {
             amount: params.vaultShareAmountForBurn,
@@ -417,22 +444,445 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
             forwardPayload: forwardPayload,
             queryId: createQueryId({ ...params, forwardPayload }),
         };
-        return vaultAssetWalllet.createInternalBurn(value ?? fee, opts);
+        return {
+            opts,
+            input: vaultAssetWalllet.createInternalBurn(value ?? fee, opts),
+        };
+    }
+    async createInternalDepositQueue(sender, params) {
+        const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
+        const isWTON = this.isWTON(assetAddress);
+        const vault = this.getVault(params.strategyVaultAddress);
+        const jettonForwardParams = params.jettonForwardParams ?? {};
+        const queueItemParams = params.queueItemParams ?? {};
+        queueItemParams.jettonForwardTonAmount ??= isWTON ? jetton_minter_2.WTON_UNWRAP_GAS : 0n;
+        queueItemParams.jettonForwardPayload ??= isWTON
+            ? jetton_minter_2.WTON_UNWRAP_CELL
+            : undefined;
+        queueItemParams.actionForwardTonAmount ??= 0n;
+        const vaultData = await vault.getVaultData();
+        jettonForwardParams.forwardPayload ??=
+            strategy_vault_1.StrategyVault.createDepositQueuePayload(params.responseAddress ?? sender.address, queueItemParams.jettonForwardTonAmount, queueItemParams.jettonForwardPayload);
+        const isFirst = !vaultData.depositQueueManager.pendingAssetQueue[assetAddress.toString()]
+            ?.dict[sender.address.toString()];
+        jettonForwardParams.forwardTonAmount ??=
+            strategy_vault_1.StrategyVault.calcQueueResistGas(vaultData, queueItemParams, isFirst) +
+                (0, core_1.toNano)(0.03); // buffer
+        const sendValue = params.value ?? jettonForwardParams.forwardTonAmount + (0, core_1.toNano)(0.1);
+        const opts = {
+            recipient: vault.address,
+            amount: params.amount,
+            response: sender.address,
+            forwardTonAmount: jettonForwardParams.forwardTonAmount,
+            forwardPayload: jettonForwardParams.forwardPayload,
+            queryId: params.queryId ?? createQueryId(params),
+        };
+        if (isWTON) {
+            // send to vault wton wallet
+            const wtonMaster = this.getByContract(jetton_minter_2.WTONMinter, assetAddress);
+            const wtonWallet = this.getByContract(jetton_wallet_2.WTONWallet, (0, utils_1.toAddress)(await wtonMaster.getWalletAddress(vault.address)));
+            return {
+                opts,
+                input: wtonWallet.createInternalExternalTransfer(sendValue, opts),
+            };
+        }
+        else {
+            // send to sender jetton wallet
+            const jettonMaster = this.getByContract(jetton_minter_1.JettonMinter, assetAddress);
+            const jettonWalletAddress = await jettonMaster.getWalletAddress(sender.address);
+            const jettonWallet = this.getByContract(jetton_wallet_1.JettonWallet, jettonWalletAddress);
+            return {
+                opts,
+                input: jettonWallet.createInternalTransfer(sendValue, opts),
+            };
+        }
+    }
+    async sendDepositQueue(sender, params) {
+        const { input, opts } = await this.createInternalDepositQueue(sender, params);
+        await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+        return opts;
+    }
+    async createInternalWithdrawQueue(sender, params) {
+        const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
+        const isWTON = this.isWTON(assetAddress);
+        const vault = this.getVault(params.strategyVaultAddress);
+        const jettonForwardParams = params.jettonForwardParams ?? {};
+        const queueItemParams = params.queueItemParams ?? {};
+        queueItemParams.jettonForwardTonAmount ??= isWTON ? jetton_minter_2.WTON_UNWRAP_GAS : 0n;
+        queueItemParams.jettonForwardPayload ??= isWTON
+            ? jetton_minter_2.WTON_UNWRAP_CELL
+            : undefined;
+        queueItemParams.actionForwardTonAmount ??= 0n;
+        const vaultData = await vault.getVaultData();
+        jettonForwardParams.forwardPayload ??=
+            strategy_vault_1.StrategyVault.createWithdrawQueuePayload(assetAddress, queueItemParams.jettonForwardTonAmount, queueItemParams.jettonForwardPayload, queueItemParams.actionForwardTonAmount, queueItemParams.actionForwardPayload);
+        const isFirst = !vaultData.withdrawQueueManager.pendingAssetQueue[assetAddress.toString()]
+            ?.dict[sender.address.toString()];
+        jettonForwardParams.forwardTonAmount ??=
+            strategy_vault_1.StrategyVault.calcQueueResistGas(vaultData, queueItemParams, isFirst) +
+                (0, core_1.toNano)(0.03); // buffer
+        const sendValue = params.value ?? jettonForwardParams.forwardTonAmount + (0, core_1.toNano)(0.1);
+        const opts = {
+            amount: params.shareAmount,
+            response: sender.address,
+            forwardPayload: jettonForwardParams.forwardPayload,
+            queryId: params.queryId ?? createQueryId(params),
+        };
+        const vaultWalllet = await this.getVaultWallet(params.strategyVaultAddress, sender.address);
+        return {
+            opts,
+            input: vaultWalllet.createInternalBurn(sendValue, opts),
+        };
+    }
+    async sendWithdrawQueue(sender, params) {
+        const { input, opts } = await this.createInternalWithdrawQueue(sender, params);
+        await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+        return opts;
+    }
+    async createInternalCancelDepositQueue(params) {
+        const vault = this.getVault(params.strategyVaultAddress);
+        const opts = {
+            to: vault.address,
+            value: params.value ?? (0, core_1.toNano)(0.1),
+            assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+            userAddress: (0, utils_1.toAddress)(params.userAddress),
+            queryId: params.queryId ?? createQueryId(params),
+        };
+        return {
+            opts,
+            input: strategy_vault_1.StrategyVault.createInternalCancelDepositQueue(opts),
+        };
+    }
+    async sendCancelDepositQueue(sender, params) {
+        const { input, opts } = await this.createInternalCancelDepositQueue(params);
+        await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+        return opts;
+    }
+    async createInternalCancelWithdrawQueue(params) {
+        const vault = this.getVault(params.strategyVaultAddress);
+        const opts = {
+            to: vault.address,
+            value: params.value ?? (0, core_1.toNano)(0.1),
+            assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+            userAddress: (0, utils_1.toAddress)(params.userAddress),
+            queryId: params.queryId ?? createQueryId(params),
+        };
+        return {
+            opts,
+            input: strategy_vault_1.StrategyVault.createInternalCancelWithdrawQueue(opts),
+        };
+    }
+    async sendCancelWithdrawQueue(sender, params) {
+        const { input, opts } = await this.createInternalCancelWithdrawQueue(params);
+        await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+        return opts;
+    }
+    async createInternalConfirmQueue(params) {
+        const opts = {
+            to: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            value: params.value ?? (0, core_1.toNano)(0.5),
+            depositAssets: params.depositAssets,
+            withdrawAssets: params.withdrawAssets,
+            oracleParams: params.oracleParams,
+            queryId: params.queryId ?? 0n,
+        };
+        return {
+            opts,
+            input: strategy_vault_1.StrategyVault.createInternalConfirmQueue(opts),
+        };
+    }
+    async sendConfirmQueue(sender, params) {
+        const vault = this.getVault(params.strategyVaultAddress);
+        const vaultData = await vault.getVaultData();
+        const gasConfig = vaultData.gasConfig;
+        const oracle = new oracle_1.OracleLibs(this.client, this.network);
+        // need all assets in vault
+        const oracleParams = await oracle.getOracleParamsForStrategyVault(vaultData, [...Object.keys(vaultData.assets)]);
+        const depositAssets = params.depositAssets ??
+            Object.entries(vaultData.depositQueueManager.pendingAssetQueue)
+                .filter(([key, value]) => {
+                return (value.sum > 0n &&
+                    !vaultData.depositQueueManager.confirmedAssetQueue[key]);
+            })
+                .map(([key]) => (0, utils_1.toAddress)(key));
+        const withdrawAssets = params.withdrawAssets ??
+            Object.entries(vaultData.withdrawQueueManager.pendingAssetQueue)
+                .filter(([key, value]) => {
+                return (value.sum > 0n &&
+                    !vaultData.withdrawQueueManager.confirmedAssetQueue[key]);
+            })
+                .map(([key]) => (0, utils_1.toAddress)(key));
+        const depositLogicGas = depositAssets.length
+            ? gasConfig[strategy_vault_1.StrategyVault.GasKey.Deposit] +
+                gasConfig[strategy_vault_1.StrategyVault.GasKey.DepositLogic] *
+                    BigInt(depositAssets.length)
+            : 0n;
+        const withdrawLogicGas = withdrawAssets.length
+            ? gasConfig[strategy_vault_1.StrategyVault.GasKey.Withdraw] +
+                gasConfig[strategy_vault_1.StrategyVault.GasKey.WithdrawLogic] *
+                    BigInt(withdrawAssets.length)
+            : 0n;
+        const estimateGas = withdrawLogicGas + depositLogicGas + (0, core_1.toNano)(0.05); // + buffer
+        const value = params.value ?? estimateGas + (0, core_1.toNano)(0.05); // + buffer
+        const queryId = params.queryId ?? 0n;
+        const { opts, input } = await this.createInternalConfirmQueue({
+            strategyVaultAddress: params.strategyVaultAddress,
+            depositAssets,
+            withdrawAssets,
+            oracleParams,
+            value,
+            queryId,
+        });
+        return await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+    }
+    async createInternalExecuteDepositQueue(sender, params) {
+        params.count ??= 50n;
+        const opts = {
+            to: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            value: params.value ?? (0, core_1.toNano)(0.05),
+            asset: (0, utils_1.toAddress)(params.assetAddress),
+            count: params.count,
+            queryId: params.queryId ?? 0n,
+        };
+        return {
+            opts,
+            input: strategy_vault_1.StrategyVault.createInternalExecuteDepositQueue(opts),
+        };
+    }
+    async sendExecuteDepositQueue(sender, params) {
+        const { opts, input } = await this.createInternalExecuteDepositQueue(sender, params);
+        return await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+    }
+    async createInternalExecuteWithdrawQueue(sender, params) {
+        const opts = {
+            to: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            value: params.value ?? (0, core_1.toNano)(0.05),
+            asset: (0, utils_1.toAddress)(params.assetAddress),
+            count: params.count ?? 50n,
+            queryId: params.queryId ?? 0n,
+        };
+        return {
+            opts,
+            input: strategy_vault_1.StrategyVault.createInternalExecuteWithdrawQueue(opts),
+        };
+    }
+    async sendExecuteWithdrawQueue(sender, params) {
+        const { opts, input } = await this.createInternalExecuteWithdrawQueue(sender, params);
+        return await sender.send({
+            to: input.to,
+            value: input.value,
+            body: input.body,
+            sendMode: core_1.SendMode.PAY_GAS_SEPARATELY,
+        });
+    }
+    async sendDepositToVault(sender, params) {
+        const oracle = new oracle_v2_1.OracleLibsV2(this.client, this.network);
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const strategyVaultData = await strategyVault.getVaultData();
+        const targetVaultType = await oracle.getAssetType(params.depositToVault);
+        const strategyResponseGas = strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.IncreaseBalance] +
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ActionNotification];
+        const bucket = new oracle_v2_1.AddressBucket();
+        let targetVaultOracleParams;
+        let forwardTonAmount = 0n;
+        if (targetVaultType.type === "share-vault") {
+            const depositToVault = this.getByContract(__1.ShareVault, params.depositToVault);
+            const shareVaultData = await depositToVault.getVaultData();
+            const shareVaultSupplyGas = __1.ShareVault.calculateGasFee(__1.ShareVault.Op.Supply, __1.ShareVault.Gas.baseFee, Object.keys(shareVaultData.whitelistedPools).length, shareVaultData.minimumGasFee);
+            forwardTonAmount = shareVaultSupplyGas + strategyResponseGas;
+        }
+        else if (targetVaultType.type === "strategy-vault") {
+            const depositToVault = this.getVault(params.depositToVault);
+            const depositToVaultData = await depositToVault.getVaultData();
+            const targetVaultOracleInfo = await oracle.getOracleParamsForStrategyVault(depositToVault.address, depositToVaultData, bucket);
+            targetVaultOracleParams = targetVaultOracleInfo.oracleParams;
+            const targetDepositGas = depositToVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Deposit];
+            forwardTonAmount =
+                (0, core_1.toNano)(bucket.totalSize() * 0.05) +
+                    targetDepositGas +
+                    strategyResponseGas;
+        }
+        else {
+            throw new Error("Invalid target vault type");
+        }
+        const { oracleParams } = await oracle.getOracleParamsForStrategyVault(strategyVault.address, strategyVaultData, bucket);
+        const vaultStrategyGas = (0, core_1.toNano)(bucket.totalSize() * 0.05) + // data agg & oracle
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.VaultInteraction]; // send to vault
+        const sendValue = params.value ?? vaultStrategyGas + forwardTonAmount + (0, core_1.toNano)(0.1); // add buffer
+        await strategyVault.sendDepositToVault(sender, sendValue, {
+            oracleParams,
+            vaultInteractParams: {
+                vaultAddress: (0, utils_1.toAddress)(params.depositToVault),
+                assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+                assetAmount: params.amount,
+                forwardTonAmount,
+            },
+            targetVaultOracleParams,
+            queryId: params.queryId,
+        });
+    }
+    async sendWithdrawFromVault(sender, params) {
+        const oracle = new oracle_v2_1.OracleLibsV2(this.client, this.network);
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const strategyVaultData = await strategyVault.getVaultData();
+        const targetVaultType = await oracle.getAssetType(params.withdrawFromVault);
+        const strategyResponseGas = strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.IncreaseBalance] +
+            2n *
+                strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ActionNotification];
+        const bucket = new oracle_v2_1.AddressBucket();
+        let targetVaultOracleParams;
+        let forwardTonAmount = 0n;
+        if (targetVaultType.type === "share-vault") {
+            const withdrawFromVault = this.getByContract(__1.ShareVault, params.withdrawFromVault);
+            const shareVaultData = await withdrawFromVault.getVaultData();
+            const { count } = await new share_vault_1.ShareVaultV1(this.client, this.network).estimateWithdrawLiquidityFulfillmentPoolCount(shareVaultData, params.withdrawAmount);
+            const targetWithdrawGas = __1.ShareVault.calculateGasFee(__1.ShareVault.Op.Withdraw, __1.ShareVault.Gas.baseFee, count, shareVaultData.minimumGasFee);
+            forwardTonAmount = targetWithdrawGas + strategyResponseGas + (0, core_1.toNano)(0.1); // add buffer
+        }
+        else if (targetVaultType.type === "strategy-vault") {
+            const withdrawFromVault = this.getVault(params.withdrawFromVault);
+            const withdrawFromVaultData = await withdrawFromVault.getVaultData();
+            const targetVaultOracleInfo = await oracle.getOracleParamsForStrategyVault(withdrawFromVault.address, withdrawFromVaultData, bucket);
+            targetVaultOracleParams = targetVaultOracleInfo.oracleParams;
+            const targetWithdrawGas = withdrawFromVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.Withdraw];
+            forwardTonAmount =
+                (0, core_1.toNano)(bucket.totalSize() * 0.05) +
+                    targetWithdrawGas +
+                    strategyResponseGas;
+        }
+        else {
+            throw new Error("Invalid target vault type");
+        }
+        const { oracleParams } = await oracle.getOracleParamsForStrategyVault(strategyVault.address, strategyVaultData, bucket);
+        const vaultStrategyGas = (0, core_1.toNano)(bucket.totalSize() * 0.05) + // data agg & oracle
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.VaultInteraction]; // send to vault
+        const sendValue = params.value ?? vaultStrategyGas + forwardTonAmount + (0, core_1.toNano)(0.1); // add buffer
+        await strategyVault.sendWithdrawFromVault(sender, sendValue, {
+            oracleParams,
+            vaultInteractParams: {
+                targetVaultAddress: (0, utils_1.toAddress)(params.withdrawFromVault),
+                targetVaultAmount: params.withdrawAmount,
+                assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+                forwardTonAmount,
+            },
+            targetVaultOracleParams,
+            queryId: params.queryId,
+        });
+    }
+    async sendDepositToVaultQueue(sender, params) {
+        const oracle = new oracle_v2_1.OracleLibsV2(this.client, this.network);
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const strategyVaultData = await strategyVault.getVaultData();
+        const targetVault = this.getByContract(strategy_vault_1.StrategyVault, params.depositToVaultQueue);
+        const targetVaultData = await targetVault.getVaultData();
+        const { oracleParams, bucket } = await oracle.getOracleParamsForStrategyVault(strategyVault.address, strategyVaultData);
+        const vaultStrategyGas = (0, core_1.toNano)(bucket.totalSize() * 0.05) + // data agg & oracle
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.JettonTransfer] +
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.VaultInteraction];
+        const forwardTonAmount = strategy_vault_1.StrategyVault.calcQueueResistGas(targetVaultData, {
+            actionForwardTonAmount: strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ActionNotification],
+            jettonForwardTonAmount: strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.IncreaseBalance],
+        });
+        const sendValue = params.value ?? vaultStrategyGas + forwardTonAmount + (0, core_1.toNano)(0.1); // add buffer
+        await strategyVault.sendDepositToVaultQueue(sender, sendValue, {
+            oracleParams,
+            vaultQueueInteractParams: {
+                vaultAddress: (0, utils_1.toAddress)(params.depositToVaultQueue),
+                assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+                assetAmount: params.amount,
+            },
+            queryId: params.queryId,
+        });
+    }
+    async sendWithdrawFromVaultQueue(sender, params) {
+        const oracle = new oracle_v2_1.OracleLibsV2(this.client, this.network);
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const strategyVaultData = await strategyVault.getVaultData();
+        const targetVault = this.getByContract(strategy_vault_1.StrategyVault, params.withdrawFromVaultQueue);
+        const targetVaultData = await targetVault.getVaultData();
+        const { oracleParams, bucket } = await oracle.getOracleParamsForStrategyVault(strategyVault.address, strategyVaultData);
+        const vaultStrategyGas = (0, core_1.toNano)(bucket.totalSize() * 0.05) + // data agg & oracle
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.JettonTransfer] +
+            strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.VaultInteraction];
+        const forwardTonAmount = strategy_vault_1.StrategyVault.calcQueueResistGas(targetVaultData, {
+            actionForwardTonAmount: strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ActionNotification],
+            jettonForwardTonAmount: strategyVaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.IncreaseBalance],
+        });
+        const sendValue = params.value ?? vaultStrategyGas + forwardTonAmount + (0, core_1.toNano)(0.1); // add buffer
+        await strategyVault.sendWithdrawFromVaultQueue(sender, sendValue, {
+            oracleParams,
+            vaultQueueInteractParams: {
+                targetVaultAddress: (0, utils_1.toAddress)(params.withdrawFromVaultQueue),
+                targetVaultAmount: params.amount,
+                assetAddress: (0, utils_1.toAddress)(params.assetAddress),
+            },
+            queryId: params.queryId,
+        });
+    }
+    async sendDepositToVaultQueueCancel(sender, params) {
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
+        const sendValue = params.value ?? (0, core_1.toNano)(0.1);
+        await strategyVault.sendCancelDepositToVaultQueue(sender, sendValue, {
+            targetVaultAddress: (0, utils_1.toAddress)(params.depositToVaultQueue),
+            assetAddress,
+            queryId: params.queryId,
+        });
+    }
+    async sendWithdrawFromVaultQueueCancel(sender, params) {
+        const strategyVault = this.getVault(params.strategyVaultAddress);
+        const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
+        const sendValue = params.value ?? (0, core_1.toNano)(0.1);
+        await strategyVault.sendCancelWithdrawFromVaultQueue(sender, sendValue, {
+            targetVaultAddress: (0, utils_1.toAddress)(params.withdrawFromVaultQueue),
+            assetAddress,
+            queryId: params.queryId,
+        });
     }
     async getRFQAuctionAddress(strategyVaultAddress, index) {
         const strategyVault = this.getByContract(strategy_vault_1.StrategyVault, strategyVaultAddress);
-        return await strategyVault.getRfqAddress(index);
+        return await strategyVault.getRFQAddress(index);
     }
     async getRFQAuction(strategyVaultAddress, index) {
         const strategyVault = this.getByContract(strategy_vault_1.StrategyVault, strategyVaultAddress);
-        const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, await strategyVault.getRfqAddress(index));
+        const rfqAuction = this.getByContract(rfq_auction_1.RFQAuction, await strategyVault.getRFQAddress(index));
         return rfqAuction;
     }
     async sendCreateAmountRFQ(sender, params, value) {
         const strategyVault = this.getVault(params.strategyVaultAddress);
         const vaultData = await strategyVault.getVaultData();
         const rfqIndex = vaultData.rfqIndex;
-        const rfqAuctionAddress = await strategyVault.getRfqAddress(rfqIndex);
+        const rfqAuctionAddress = await strategyVault.getRFQAddress(rfqIndex);
         const sellAssetAddress = (0, utils_1.toAddress)(params.sellAssetAddress);
         const buyAssetAddress = (0, utils_1.toAddress)(params.buyAssetAddress);
         const sellAssetRFQWallet = await this.getByContract(jetton_minter_1.JettonMinter, sellAssetAddress).getWalletAddress(rfqAuctionAddress);
@@ -475,7 +925,7 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
         const strategyVault = this.getVault(params.strategyVaultAddress);
         const vaultData = await strategyVault.getVaultData();
         const rfqIndex = vaultData.rfqIndex;
-        const rfqAuctionAddress = await strategyVault.getRfqAddress(rfqIndex);
+        const rfqAuctionAddress = await strategyVault.getRFQAddress(rfqIndex);
         const sellAssetAddress = (0, utils_1.toAddress)(params.sellAssetAddress);
         const buyAssetAddress = (0, utils_1.toAddress)(params.buyAssetAddress);
         const sellAssetRFQWallet = await this.getByContract(jetton_minter_1.JettonMinter, sellAssetAddress).getWalletAddress(rfqAuctionAddress);
@@ -590,7 +1040,7 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
     async sendLiquidateToFactorial(sender, params, value) {
         const strategyVault = this.getByContract(strategy_vault_1.StrategyVault, params.strategyVaultAddress);
         const vaultData = await strategyVault.getVaultData();
-        const oraclePayload = await this.getOracleParamsV2(params.strategyVaultAddress);
+        const oraclePayload = await this.getOracleParamsV2(strategyVault.address);
         const oracleCalculateGas = BigInt(Object.keys(vaultData.assets).length +
             Object.keys(vaultData.factorialPools).length) * (0, core_1.toNano)(0.05);
         await strategyVault.sendLiquidateToFactorial(sender, value ??
@@ -678,6 +1128,7 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, oracleConfig);
         const onchainData2 = await this.updateOnchainData(oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         const prices = this.calculatePrices(redstonePrices, onchainData);
         const exposurePoolsData = {};
         for (let exposurePool of exposurePools) {
@@ -701,6 +1152,7 @@ class StrategyVaultBase extends service_1.ServiceBaseV1 {
         const { redstonePrices, onchainData: od } = await this.getRedstonePrices(assets, oracleConfig);
         const onchainData2 = await this.updateOnchainData(oracleConfig.assetOnchainDataInfo);
         const onchainData = { ...od, ...onchainData2 };
+        this.updateOnchainInternalData(redstonePrices, onchainData);
         const prices = this.calculatePrices(redstonePrices, onchainData);
         const exposurePoolsData = {};
         for (let exposurePool of exposurePools) {