@affluent-org/sdk 0.0.4 → 0.0.6

package/dist/share-vault.d.ts

@@ -1,8 +1,8 @@
-import { Address, Sender } from "@ton/ton";
+import { Address, Cell, Sender } from "@ton/ton";
 import { ShareVaultManagerSetTargetWeightAction, ShareVaultManagerSupplyAction, ShareVaultManagerWithdrawAction, ShareVaultUserActionParams } from "./types/action";
 import { TxStep, TxCallBackFn } from "./utils/tracker/type";
+import { ShareVaultState, WhitelistedPoolData } from "./contracts/vault/share-vault";
 import { ServiceBaseV1 } from "./common/service";
-import { ShareVaultState, WhitelistedPool } from "./contracts/vault/share-vault/type";
 type PoolInfoForShareVault = {
     cash: bigint;
     totalSupplyAmount: bigint;
@@ -20,8 +20,38 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
         };
         steps: TxStep[];
     } | undefined>;
-    supply(sender: Sender, params: ShareVaultUserActionParams): Promise<void>;
-    supplyAndWaitTx(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
+    supply(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            recipient: Address;
+            response: Address;
+            amount: bigint;
+            forwardTonAmount: bigint;
+        };
+        queryId: bigint;
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+    } | {
+        opt: {
+            queryId: bigint;
+            recipient: Address;
+            response: Address;
+            amount: bigint;
+            forwardTonAmount: bigint;
+            forwardPayload: Cell;
+        };
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+    }>;
+    supplyAndWaitTx(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn, vaultData?: ShareVaultState): Promise<{
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    }>;
+    supplyAndWaitTxV1(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn, vaultData?: ShareVaultState): Promise<{
         action: {
             type: string;
             params: ShareVaultUserActionParams;
@@ -29,6 +59,47 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
         };
         steps: TxStep[];
     }>;
+    supplyAndWaitTxV2(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn, vaultData?: ShareVaultState): Promise<{
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    }>;
+    supplyV1(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            recipient: Address;
+            response: Address;
+            amount: bigint;
+            forwardTonAmount: bigint;
+        };
+        queryId: bigint;
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+    }>;
+    supplyV2(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            recipient: Address;
+            response: Address;
+            amount: bigint;
+            forwardTonAmount: bigint;
+            forwardPayload: Cell;
+        };
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+    }>;
+    buildSupplySteps(params: ShareVaultUserActionParams, queryId: bigint, senderVaultWalletAddress: Address, firstStep: TxStep): TxStep[];
+    waitSupplyTx(steps: TxStep[], params: ShareVaultUserActionParams, queryId: bigint, senderVaultWalletAddress: Address, callbackFn?: TxCallBackFn): {
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    };
     findSupplyTx(queryId: bigint, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
         action: {
             type: string;
@@ -37,8 +108,34 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
         };
         steps: TxStep[];
     }>;
-    withdraw(sender: Sender, params: ShareVaultUserActionParams): Promise<void>;
-    withdrawAndWaitTx(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
+    withdraw(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            response: Address;
+            amount: bigint;
+        };
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+        asset: Address;
+        senderJettonWalletAddress: Address;
+    }>;
+    withdrawAndWaitTx(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn, vaultData?: ShareVaultState): Promise<{
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    }>;
+    withdrawAndWaitTxV1(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    }>;
+    withdrawAndWaitTxV2(sender: Sender, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
         action: {
             type: string;
             params: ShareVaultUserActionParams;
@@ -46,6 +143,38 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
         };
         steps: TxStep[];
     }>;
+    withdrawV1(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            response: Address;
+            amount: bigint;
+        };
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+        asset: Address;
+        senderJettonWalletAddress: Address;
+    }>;
+    withdrawV2(sender: Sender, params: ShareVaultUserActionParams, vaultData?: ShareVaultState): Promise<{
+        opt: {
+            queryId: bigint;
+            response: Address;
+            amount: bigint;
+            forwardPayload: Cell;
+        };
+        steps: TxStep[];
+        senderVaultWalletAddress: Address;
+        asset: Address;
+        senderJettonWalletAddress: Address;
+    }>;
+    buildWithdrawSteps(params: ShareVaultUserActionParams, queryId: bigint, vaultJettonWalletAddress: Address, senderVaultWalletAddress: Address, senderJettonWalletAddress: Address): TxStep[];
+    waitWithdrawTx(steps: TxStep[], params: ShareVaultUserActionParams, queryId: bigint, senderVaultWalletAddress: Address, assetAddress: Address, senderJettonWalletAddress: Address, callbackFn?: TxCallBackFn): {
+        action: {
+            type: string;
+            params: ShareVaultUserActionParams;
+            queryId: bigint;
+        };
+        steps: TxStep[];
+    };
     findWithdrawTx(queryId: bigint, params: ShareVaultUserActionParams, callbackFn?: TxCallBackFn): Promise<{
         action: {
             type: string;
@@ -58,7 +187,34 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
     withdrawFromPool(sender: Sender, params: ShareVaultManagerWithdrawAction): Promise<void>;
     withdrawFromPoolSimulate(sender: Address, params: ShareVaultManagerWithdrawAction): Promise<void>;
     setTargetWeight(sender: Sender, params: ShareVaultManagerSetTargetWeightAction): Promise<void>;
-    getVaultData(vaultAddress: Address | string): Promise<ShareVaultState>;
+    getVaultData(vaultAddress: Address | string): Promise<{
+        totalSupply: bigint;
+        owner: Address | null;
+        manager: Address | null;
+        asset: Address;
+        balance: bigint;
+        cash: bigint;
+        totalTargetWeight: bigint;
+        nextAggregatorIndex: bigint;
+        isWtonVault: boolean;
+        assetWallet: Address | null;
+        whitelistedPools: Record<string, {
+            isWhitelisted: boolean;
+            targetWeight: bigint;
+            supply: bigint;
+        } & {
+            address: Address;
+        }>;
+        minimumGasFee: {
+            supply: bigint;
+            withdraw: bigint;
+            factorialSupply: bigint;
+            factorialWithdraw: bigint;
+            mintVaultShareTokens: bigint;
+        };
+        code: Cell;
+        address: Address;
+    }>;
     getPoolCashAmounts(vaultData: ShareVaultState): Promise<Record<string, bigint>>;
     getPoolInfoForShareVault(vaultData: ShareVaultState): Promise<Record<string, PoolInfoForShareVault>>;
     estimateWithdrawLiquidityFulfillmentPoolCount(vaultData: ShareVaultState, requst_vault_shares: bigint): Promise<{
@@ -70,7 +226,7 @@ export declare class ShareVaultV1 extends ServiceBaseV1 {
             pool: any;
         }[];
     }>;
-    getPoolTupleSortedByTargetWeight(whitelistedPools: Record<string, WhitelistedPool>, totalAssetAmount: bigint, totalTargetWeight: bigint, poolInfoForShareVault: Record<string, PoolInfoForShareVault>): {
+    getPoolTupleSortedByTargetWeight(whitelistedPools: Record<string, WhitelistedPoolData>, totalAssetAmount: bigint, totalTargetWeight: bigint, poolInfoForShareVault: Record<string, PoolInfoForShareVault>): {
         targetWeightRatio: number;
         poolAddress: string;
         availableAmount: bigint;

package/dist/share-vault.js

@@ -1,4 +1,7 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ShareVaultV1 = void 0;
 const ton_1 = require("@ton/ton");
@@ -10,8 +13,10 @@ const share_vault_1 = require("./contracts/vault/share-vault");
 const query_id_generactor_1 = require("./utils/tracker/query-id-generactor");
 const parser_1 = require("./utils/parser");
 const jetton_wallet_2 = require("./contracts/wton/jetton-wallet");
-const jetton_minter_2 = require("./contracts/wton/jetton-minter");
 const service_1 = require("./common/service");
+const versions_1 = require("./common/versions");
+const jetton_minter_2 = require("./contracts/wton/jetton-minter");
+const WTONWallet_compiled_json_1 = __importDefault(require("./build/WTONWallet.compiled.json"));
 const TIMEOUT_SEC = 2 * 60 * 1000;
 const sleep = (ms) => new Promise((r) => setTimeout(r, ms));
 const toAddress = (value) => {
@@ -47,81 +52,159 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
             return this.findWithdrawTx(BigInt(action.queryId), action.params, callbackFn);
         }
     }
-    async supply(sender, params) {
+    async supply(sender, params, vaultData) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
-        const vaultData = await shareVault.getVaultData();
+        vaultData ??= await shareVault.getVaultData();
+        const version = this.contractVersion.getVersion(vaultData.code);
+        try {
+            if (version === versions_1.AffluentVersions.ShareV1) {
+                return await this.supplyV1(sender, params, vaultData);
+            }
+            else {
+                return await this.supplyV2(sender, params, vaultData);
+            }
+        }
+        catch (error) {
+            console.error(version);
+            throw error;
+        }
+    }
+    async supplyAndWaitTx(sender, params, callbackFn, vaultData) {
+        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
+        vaultData ??= await shareVault.getVaultData();
+        const version = this.contractVersion.getVersion(vaultData.code);
+        try {
+            if (version === versions_1.AffluentVersions.ShareV1) {
+                return this.supplyAndWaitTxV1(sender, params, callbackFn, vaultData);
+            }
+            else {
+                return this.supplyAndWaitTxV2(sender, params, callbackFn, vaultData);
+            }
+        }
+        catch (error) {
+            console.error(version);
+            throw error;
+        }
+    }
+    async supplyAndWaitTxV1(sender, params, callbackFn, vaultData) {
+        const result = await this.supplyV1(sender, params, vaultData);
+        return this.waitSupplyTx(result.steps, params, result.opt.queryId, result.senderVaultWalletAddress, callbackFn);
+    }
+    async supplyAndWaitTxV2(sender, params, callbackFn, vaultData) {
+        const result = await this.supplyV2(sender, params, vaultData);
+        return this.waitSupplyTx(result.steps, params, result.opt.queryId, result.senderVaultWalletAddress, callbackFn);
+    }
+    async supplyV1(sender, params, vaultData) {
+        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
+        vaultData ??= await shareVault.getVaultData();
         const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Supply, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
+        const senderJettonWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(vaultData.asset));
+        const senderJettonWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderJettonWalletAddress));
+        const senderVaultWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(params.vault));
+        const _opt = {
+            recipient: toAddress(params.vault),
+            response: toAddress(params.response),
+            amount: params.amount,
+            forwardTonAmount: gas,
+        };
+        const body = senderJettonWallet.createTransferBody(_opt);
+        const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), body);
+        const opt = {
+            ..._opt,
+            queryId: queryId,
+        };
+        let steps = [];
         if (toString(vaultData.asset) == this.contracts.WTON) {
-            const vaultWTONWalletAddress = await this.getJettonWalletAddress(toString(params.vault), toString(vaultData.asset));
-            const vaultWTONWallet = this.client.open(jetton_wallet_2.WTONWallet.createFromAddress(vaultWTONWalletAddress));
-            await vaultWTONWallet.sendExternalTransfer(sender, jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, {
-                recipient: toAddress(params.vault),
-                response: toAddress(params.response),
-                amount: params.amount,
-                forwardTonAmount: gas,
-                forwardPayload: (0, ton_1.beginCell)().storeUint(0, 32).endCell(),
+            const wtonWalletCode = ton_1.Cell.fromHex(WTONWallet_compiled_json_1.default.hex);
+            const vaultWTONWallet = this.client.open(jetton_wallet_2.WTONWallet.createFromConfig({
+                jettonMinter: vaultData.asset,
+                owner: toAddress(params.vault),
+                walletCode: wtonWalletCode,
+            }, wtonWalletCode));
+            await vaultWTONWallet.sendExternalTransfer(sender, jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opt);
+            steps = this.buildSupplySteps(params, queryId, senderVaultWalletAddress, {
+                queryId,
+                description: "Starting the tx",
+                from: toAddress(params.sender),
+                to: vaultWTONWallet.address,
+                opcode: jetton_wallet_2.WTONWallet.Op.ExternalTransfer,
             });
         }
         else {
-            const senderJettonWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(vaultData.asset));
-            const senderJettonWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderJettonWalletAddress));
-            await senderJettonWallet.sendTransfer(sender, gas + jetton_wallet_1.JettonWallet.Gas.Transfer, {
-                recipient: toAddress(params.vault),
-                response: toAddress(params.response),
-                amount: params.amount,
-                forwardTonAmount: gas,
+            await senderJettonWallet.sendTransfer(sender, gas + jetton_wallet_1.JettonWallet.Gas.Transfer, opt);
+            steps = this.buildSupplySteps(params, queryId, senderVaultWalletAddress, {
+                description: "Starting the tx",
+                from: toAddress(params.sender),
+                to: senderJettonWalletAddress,
+                opcode: jetton_wallet_1.JettonWallet.Op.Transfer,
+                queryId: queryId,
             });
         }
+        return {
+            opt,
+            queryId,
+            steps,
+            senderVaultWalletAddress,
+        };
     }
-    async supplyAndWaitTx(sender, params, callbackFn) {
+    async supplyV2(sender, params, vaultData) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
-        const vaultData = await shareVault.getVaultData();
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Supply, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
+        vaultData ??= await shareVault.getVaultData();
+        const isWTON = this.isWTON(toString(vaultData.asset));
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Supply, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee, isWTON);
         const senderJettonWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(vaultData.asset));
         const senderJettonWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderJettonWalletAddress));
         const senderVaultWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(params.vault));
-        const opt = {
+        const _opt = {
             recipient: toAddress(params.vault),
             response: toAddress(params.response),
             amount: params.amount,
             forwardTonAmount: gas,
+            forwardPayload: share_vault_1.ShareVault.createSupplyForwardPayload({
+                responseAddress: toAddress(params.response),
+                jettonForwardTonAmount: isWTON ? jetton_minter_2.WTON_UNWRAP_GAS : 0n,
+                jettonForwardPayload: isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined,
+            }),
         };
-        const body = senderJettonWallet.createTransferBody(opt);
+        const body = senderJettonWallet.createTransferBody(_opt);
         const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), body);
-        const steps = [];
+        const opt = {
+            ..._opt,
+            queryId: queryId,
+        };
+        let steps = [];
         if (toString(vaultData.asset) == this.contracts.WTON) {
             const vaultWTONWalletAddress = await this.getJettonWalletAddress(toString(params.vault), toString(vaultData.asset));
             const vaultWTONWallet = this.client.open(jetton_wallet_2.WTONWallet.createFromAddress(vaultWTONWalletAddress));
-            await vaultWTONWallet.sendExternalTransfer(sender, jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, {
-                ...opt,
-                queryId: queryId,
+            await vaultWTONWallet.sendExternalTransfer(sender, jetton_wallet_2.WTONWallet.Gas.ExternalTransfer, opt);
+            steps = this.buildSupplySteps(params, queryId, senderVaultWalletAddress, {
+                queryId,
+                description: "Starting the tx",
+                from: toAddress(params.sender),
+                to: vaultWTONWalletAddress,
+                opcode: jetton_wallet_2.WTONWallet.Op.ExternalTransfer,
             });
-            steps.push(...[
-                {
-                    queryId,
-                    description: "Starting the tx",
-                    from: toAddress(params.sender),
-                    to: vaultWTONWalletAddress,
-                    opcode: jetton_wallet_2.WTONWallet.Op.ExternalTransfer,
-                },
-            ]);
         }
         else {
-            await senderJettonWallet.sendTransfer(sender, gas + jetton_wallet_1.JettonWallet.Gas.Transfer, {
-                ...opt,
+            await senderJettonWallet.sendTransfer(sender, gas + jetton_wallet_1.JettonWallet.Gas.Transfer, opt);
+            steps = this.buildSupplySteps(params, queryId, senderVaultWalletAddress, {
+                description: "Starting the tx",
+                from: toAddress(params.sender),
+                to: senderJettonWalletAddress,
+                opcode: jetton_wallet_1.JettonWallet.Op.Transfer,
                 queryId: queryId,
             });
-            steps.push(...[
-                {
-                    description: "Starting the tx",
-                    from: toAddress(params.sender),
-                    to: senderJettonWalletAddress,
-                    opcode: jetton_wallet_1.JettonWallet.Op.Transfer,
-                    queryId: queryId,
-                },
-            ]);
         }
+        return {
+            opt,
+            steps,
+            senderVaultWalletAddress,
+        };
+    }
+    buildSupplySteps(params, queryId, senderVaultWalletAddress, firstStep) {
+        const steps = [];
         steps.push(...[
+            firstStep,
             {
                 description: "Sending the token to the vault",
                 to: toAddress(params.vault),
@@ -153,6 +236,9 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
                 opcode: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
             },
         ]);
+        return steps;
+    }
+    waitSupplyTx(steps, params, queryId, senderVaultWalletAddress, callbackFn) {
         (async () => {
             const matchedTx1 = await (0, tracker_1.findTx)(this.client, toAddress(params.sender), "0", steps[0]);
             steps[0].matchedTx = matchedTx1;
@@ -319,21 +405,69 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
             steps,
         };
     }
-    async withdraw(sender, params) {
+    async withdraw(sender, params, vaultData) {
+        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
+        vaultData ??= await shareVault.getVaultData();
+        const version = this.contractVersion.getVersion(vaultData.code);
+        if (version === versions_1.AffluentVersions.ShareV1) {
+            return this.withdrawV1(sender, params, vaultData);
+        }
+        else {
+            return this.withdrawV2(sender, params, vaultData);
+        }
+    }
+    async withdrawAndWaitTx(sender, params, callbackFn, vaultData) {
+        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
+        vaultData ??= await shareVault.getVaultData();
+        const version = this.contractVersion.getVersion(vaultData.code);
+        if (version === versions_1.AffluentVersions.ShareV1) {
+            return this.withdrawAndWaitTxV1(sender, params, callbackFn);
+        }
+        else {
+            return this.withdrawAndWaitTxV2(sender, params, callbackFn);
+        }
+    }
+    async withdrawAndWaitTxV1(sender, params, callbackFn) {
+        const result = await this.withdrawV1(sender, params);
+        return this.waitWithdrawTx(result.steps, params, result.opt.queryId, result.senderVaultWalletAddress, result.asset, result.senderJettonWalletAddress, callbackFn);
+    }
+    async withdrawAndWaitTxV2(sender, params, callbackFn) {
+        const result = await this.withdrawV2(sender, params);
+        return this.waitWithdrawTx(result.steps, params, result.opt.queryId, result.senderVaultWalletAddress, result.asset, result.senderJettonWalletAddress, callbackFn);
+    }
+    async withdrawV1(sender, params, vaultData) {
+        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
+        vaultData ??= await shareVault.getVaultData();
+        const asset = vaultData.asset;
+        const vaultJettonWalletAddress = await this.getJettonWalletAddress(toString(params.vault), toString(vaultData.asset));
+        const senderJettonWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(vaultData.asset));
+        const senderJettonWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderJettonWalletAddress));
         const senderVaultWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(params.vault));
         const senderVaultWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderVaultWalletAddress));
-        const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
-        const vaultData = await shareVault.getVaultData();
         const { count } = await this.estimateWithdrawLiquidityFulfillmentPoolCount(vaultData, params.amount);
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Withdraw, share_vault_1.ShareVault.Gas.baseFee, count, vaultData.minimumGasFee) + (0, ton_1.toNano)(0.1); // TODO: re-mapping withdraw gas fee
-        await senderVaultWallet.sendBurn(sender, gas, {
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Withdraw, share_vault_1.ShareVault.Gas.baseFee, count, vaultData.minimumGasFee, this.isWTON(toString(vaultData.asset))) + (0, ton_1.toNano)(0.1);
+        const _opt = {
             response: toAddress(params.response),
             amount: params.amount,
-        });
+        };
+        const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), jetton_wallet_1.JettonWallet.getBurnMsgBody(_opt));
+        const opt = {
+            ..._opt,
+            queryId: queryId,
+        };
+        await senderVaultWallet.sendBurn(sender, gas, opt);
+        const steps = this.buildWithdrawSteps(params, queryId, vaultJettonWalletAddress, senderVaultWalletAddress, senderJettonWalletAddress);
+        return {
+            opt,
+            steps,
+            senderVaultWalletAddress,
+            asset,
+            senderJettonWalletAddress,
+        };
     }
-    async withdrawAndWaitTx(sender, params, callbackFn) {
+    async withdrawV2(sender, params, vaultData) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
-        const vaultData = await shareVault.getVaultData();
+        vaultData ??= await shareVault.getVaultData();
         const asset = vaultData.asset;
         const vaultJettonWalletAddress = await this.getJettonWalletAddress(toString(params.vault), toString(vaultData.asset));
         const senderJettonWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(vaultData.asset));
@@ -341,14 +475,32 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
         const senderVaultWalletAddress = await this.getJettonWalletAddress(toString(params.sender), toString(params.vault));
         const senderVaultWallet = this.client.open(jetton_wallet_1.JettonWallet.createFromAddress(senderVaultWalletAddress));
         const { count } = await this.estimateWithdrawLiquidityFulfillmentPoolCount(vaultData, params.amount);
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Withdraw, share_vault_1.ShareVault.Gas.baseFee, count, vaultData.minimumGasFee) + (0, ton_1.toNano)(0.1); // TODO: re-mapping withdraw gas fee
-        const opt = { response: toAddress(params.response), amount: params.amount };
-        // const queryId = 16131232817234889649n;
-        const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), jetton_wallet_1.JettonWallet.getBurnMsgBody(opt));
-        await senderVaultWallet.sendBurn(sender, gas, {
-            ...opt,
+        const isWTON = this.isWTON(toString(vaultData.asset));
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.Withdraw, share_vault_1.ShareVault.Gas.baseFee, count, vaultData.minimumGasFee, isWTON) + (0, ton_1.toNano)(0.1);
+        const _opt = {
+            response: toAddress(params.response),
+            amount: params.amount,
+            forwardPayload: share_vault_1.ShareVault.createWithdrawForwardPayload({
+                jettonForwardTonAmount: isWTON ? jetton_minter_2.WTON_UNWRAP_GAS : 0n,
+                jettonForwardPayload: isWTON ? jetton_minter_2.WTON_UNWRAP_CELL : undefined,
+            }),
+        };
+        const queryId = (0, query_id_generactor_1.generateQueryId)(toAddress(params.sender), jetton_wallet_1.JettonWallet.getBurnMsgBody(_opt));
+        const opt = {
+            ..._opt,
             queryId: queryId,
-        });
+        };
+        await senderVaultWallet.sendBurn(sender, gas, opt);
+        const steps = this.buildWithdrawSteps(params, queryId, vaultJettonWalletAddress, senderVaultWalletAddress, senderJettonWalletAddress);
+        return {
+            opt,
+            steps,
+            senderVaultWalletAddress,
+            asset,
+            senderJettonWalletAddress,
+        };
+    }
+    buildWithdrawSteps(params, queryId, vaultJettonWalletAddress, senderVaultWalletAddress, senderJettonWalletAddress) {
         const steps = [
             {
                 description: "Staring the tx",
@@ -389,6 +541,9 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
                 opcode: jetton_wallet_1.JettonWallet.Op.InternalTransfer,
             },
         ];
+        return steps;
+    }
+    waitWithdrawTx(steps, params, queryId, senderVaultWalletAddress, assetAddress, senderJettonWalletAddress, callbackFn) {
         (async () => {
             const matchedTx0 = await (0, tracker_1.findTx)(this.client, senderVaultWalletAddress, "0", steps[0]);
             steps[0].matchedTx = matchedTx0;
@@ -443,7 +598,7 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
                     callbackFn(steps[4]);
                 const matchedTxs5 = [];
                 for (let poolAddress of poolAddresses) {
-                    const poolJettonWalletAddress = await this.getJettonWalletAddress(toString(poolAddress), toString(vaultData.asset));
+                    const poolJettonWalletAddress = await this.getJettonWalletAddress(toString(poolAddress), toString(assetAddress));
                     const matchedTx = await (0, tracker_1.findTx)(this.client, poolJettonWalletAddress, matchedTx2.lt.toString(), { ...steps[5], from: poolJettonWalletAddress });
                     matchedTxs5.push(matchedTx);
                 }
@@ -583,7 +738,7 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
     async supplyToPool(sender, params) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
         const vaultData = await shareVault.getVaultData();
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.supplyToPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.SupplyToPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
         await shareVault.sendSupplyToPool(sender, gas, {
             pool: toAddress(params.pool),
             amount: params.amount,
@@ -594,7 +749,7 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
         console.log("shareVault", shareVault);
         const vaultData = await shareVault.getVaultData();
         console.log("vaultData", vaultData);
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.withdrawFromPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.WithdrawFromPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
         console.log("gas", gas);
         await shareVault.sendWithdrawFromPool(sender, gas, {
             pool: toAddress(params.pool),
@@ -605,7 +760,7 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
     async withdrawFromPoolSimulate(sender, params) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
         const vaultData = await shareVault.getVaultData();
-        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.withdrawFromPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
+        const gas = share_vault_1.ShareVault.calculateGasFee(share_vault_1.ShareVault.Op.WithdrawFromPool, share_vault_1.ShareVault.Gas.baseFee, Object.keys(vaultData.whitelistedPools).length, vaultData.minimumGasFee);
         console.log("vaultData", vaultData);
         console.log("gas", gas);
         // await shareVault.sendWithdrawFromPool(sender, gas, {
@@ -616,7 +771,7 @@ class ShareVaultV1 extends service_1.ServiceBaseV1 {
     }
     async setTargetWeight(sender, params) {
         const shareVault = this.client.open(share_vault_1.ShareVault.createFromAddress(toAddress(params.vault)));
-        await shareVault.sendSetTargetWeight(sender, (0, ton_1.toNano)(0.006), {
+        await shareVault.sendSetTargetWeight(sender, (0, ton_1.toNano)(0.01), {
             pool: toAddress(params.pool),
             targetWeight: params.targetWeight,
         });