@affluent-org/sdk 0.0.4 → 0.0.6

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

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StrategyVaultV1 = exports.user = exports.manager = exports.owner = exports.createQueryId = exports.sendMsg = void 0;
+exports.StrategyVaultServiceV1 = exports.user = exports.manager = exports.owner = exports.createQueryId = exports.sendMsg = void 0;
 const context_1 = require("../../context");
 const send_msg_1 = require("../../lib/send-msg");
 const composite_oracle_1 = require("../composite-oracle");
@@ -48,6 +48,8 @@ const manager = __importStar(require("./manager"));
 exports.manager = manager;
 const user = __importStar(require("./user"));
 exports.user = user;
+const utils_1 = require("../../contracts/common/utils");
+const trace_1 = require("./user/trace");
 var send_msg_2 = require("../../lib/send-msg");
 Object.defineProperty(exports, "sendMsg", { enumerable: true, get: function () { return send_msg_2.sendMsg; } });
 var computation_1 = require("../../contracts/vault/strategy-vault/computation");
@@ -55,7 +57,8 @@ Object.defineProperty(exports, "createQueryId", { enumerable: true, get: functio
 __exportStar(require("./owner/types"), exports);
 __exportStar(require("./manager/types"), exports);
 __exportStar(require("./user/types"), exports);
-class StrategyVaultV1 {
+__exportStar(require("./user/trace"), exports);
+class StrategyVaultServiceV1 {
     ctx;
     constructor(ctx = context_1.AffluentContext.getInstance()) {
         this.ctx = ctx;
@@ -106,166 +109,225 @@ class StrategyVaultV1 {
     // Owner
     // ============================================================
     async sendSetOwner(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetOwnerMsg(this.ctx, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetOwnerMsg(this.ctx, params));
     }
     async sendSetGuardianAddress(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetGuardianAddressMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetGuardianAddressMsg(this.ctx, params, value));
     }
     async sendSetManager(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetManagerMsg(this.ctx, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetManagerMsg(this.ctx, params));
     }
     async sendSetPrivateVault(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetPrivateVaultMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetPrivateVaultMsg(this.ctx, params, value));
     }
     async sendSetWhitelistedMinters(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetWhitelistedMintersMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetWhitelistedMintersMsg(this.ctx, params, value));
     }
     async sendSetMaxLeverageRatio(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetMaxLeverageRatioMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetMaxLeverageRatioMsg(this.ctx, params, value));
     }
     async sendExecuteOwnerAction(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createExecuteOwnerActionMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createExecuteOwnerActionMsg(this.ctx, params, value));
     }
     async sendRevertOwnerAction(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createRevertOwnerActionMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createRevertOwnerActionMsg(this.ctx, params, value));
     }
     async sendSetTimelock(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetTimelockMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetTimelockMsg(this.ctx, params, value));
     }
     async sendSetManagementFeeRecipientAddress(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetManagementFeeRecipientAddressMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetManagementFeeRecipientAddressMsg(this.ctx, params, value));
     }
     async sendSetProtocolFeeRatePerYear(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetProtocolFeeRatePerYearMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetProtocolFeeRatePerYearMsg(this.ctx, params, value));
     }
     async sendSetProtocolFeeManagerAddress(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetProtocolFeeManagerAddressMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetProtocolFeeManagerAddressMsg(this.ctx, params, value));
     }
     async sendSetFactorialPoolConfig(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetFactorialPoolConfigMsg(this.ctx, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetFactorialPoolConfigMsg(this.ctx, params));
     }
     async sendSetAssetConfig(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetAssetConfigMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetAssetConfigMsg(this.ctx, params, value));
     }
     async sendSetRFQConfig(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetRFQConfigMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetRFQConfigMsg(this.ctx, params, value));
     }
     async sendSetManagementFeeRatePerYear(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetManagementFeeRatePerYearMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetManagementFeeRatePerYearMsg(this.ctx, params, value));
     }
     async sendSetDepositCloseTimestamp(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetDepositCloseTimestampMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetDepositCloseTimestampMsg(this.ctx, params, value));
     }
     async sendSetWithdrawOpenTimestamp(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetWithdrawOpenTimestampMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetWithdrawOpenTimestampMsg(this.ctx, params, value));
     }
     async sendSetGasConfig(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetGasConfigMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetGasConfigMsg(this.ctx, params, value));
     }
     async sendSetOracleConfig(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetOracleConfigMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetOracleConfigMsg(this.ctx, params, value));
     }
     async sendSetWalletCode(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetWalletCodeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetWalletCodeMsg(this.ctx, params, value));
     }
     async sendSetDataAggregatorCode(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetDataAggregatorCodeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetDataAggregatorCodeMsg(this.ctx, params, value));
     }
     async sendSetRFQCode(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetRFQCodeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetRFQCodeMsg(this.ctx, params, value));
     }
     async sendSetContent(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createSetContentMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createSetContentMsg(this.ctx, params, value));
     }
     async sendUpgradeCode(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createUpgradeCodeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createUpgradeCodeMsg(this.ctx, params, value));
     }
     async sendCollectProtocolFee(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createCollectProtocolFeeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createCollectProtocolFeeMsg(this.ctx, params, value));
     }
     async sendClaimManagementFee(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, owner.createClaimManagementFeeMsg(this.ctx, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await owner.createClaimManagementFeeMsg(this.ctx, params, value));
     }
     // ============================================================
     // Manager
     // ============================================================
     async sendSupplyToFactorial(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createSupplyToFactorialMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createSupplyToFactorialMsg(this.ctx, sender, params, value));
     }
     async sendBorrowFromFactorial(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createBorrowFromFactorialMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createBorrowFromFactorialMsg(this.ctx, sender, params, value));
     }
     async sendRepayToFactorial(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createRepayToFactorialMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createRepayToFactorialMsg(this.ctx, sender, params, value));
     }
     async sendWithdrawFromFactorial(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createWithdrawFromFactorialMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createWithdrawFromFactorialMsg(this.ctx, sender, params, value));
     }
     async sendLiquidateToFactorial(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createLiquidateToFactorialMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createLiquidateToFactorialMsg(this.ctx, sender, params, value));
     }
     async sendDepositToVault(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createDepositToVaultMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createDepositToVaultMsg(this.ctx, sender, params));
     }
     async sendWithdrawFromVault(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createWithdrawFromVaultMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createWithdrawFromVaultMsg(this.ctx, sender, params));
     }
     async sendDepositToVaultQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createDepositToVaultQueueMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createDepositToVaultQueueMsg(this.ctx, sender, params));
     }
     async sendWithdrawFromVaultQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createWithdrawFromVaultQueueMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createWithdrawFromVaultQueueMsg(this.ctx, sender, params));
     }
     async sendDepositToVaultQueueCancel(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createDepositToVaultQueueCancelMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createDepositToVaultQueueCancelMsg(this.ctx, sender, params));
     }
     async sendWithdrawFromVaultQueueCancel(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createWithdrawFromVaultQueueCancelMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createWithdrawFromVaultQueueCancelMsg(this.ctx, sender, params));
     }
     async sendCreateAmountRFQ(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createAmountRFQMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createAmountRFQMsg(this.ctx, sender, params, value));
     }
     async sendCreateSlippageRFQ(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createSlippageRFQMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createSlippageRFQMsg(this.ctx, sender, params, value));
     }
     async sendCancelRFQ(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createCancelRFQMsg(this.ctx, sender, params, value));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createCancelRFQMsg(this.ctx, sender, params, value));
     }
     async sendUnwrapWTON(sender, params, value) {
         return manager.sendUnwrapWTON(this.ctx, sender, params, value);
     }
     async sendConfirmQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createConfirmQueueMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createConfirmQueueMsg(this.ctx, sender, params));
     }
     async sendExecuteDepositQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createExecuteDepositQueueMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createExecuteDepositQueueMsg(this.ctx, sender, params));
     }
     async sendExecuteWithdrawQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, manager.createExecuteWithdrawQueueMsg(this.ctx, sender, params));
+        return (0, send_msg_1.sendMsgAndWaitTxSimple)(this.ctx, sender, await manager.createExecuteWithdrawQueueMsg(this.ctx, sender, params));
     }
     // ============================================================
     // User
     // ============================================================
     async sendDepositAsset(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, user.createDepositAssetMsg(this.ctx, sender, params, value));
+        const msg = await user.createDepositAssetMsg(this.ctx, sender, params, value);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        const asset = (0, utils_1.toAddress)(params.assetAddress);
+        return trace_1.StrategyVaultDepositTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            asset,
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            isWTON: this.ctx.isWTON(asset),
+        });
     }
     async sendBurnVaultAsset(sender, params, value) {
-        return (0, send_msg_1.sendMsg)(sender, user.createBurnVaultAssetMsg(this.ctx, sender, params, value));
+        const msg = await user.createBurnVaultAssetMsg(this.ctx, sender, params, value);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        return trace_1.StrategyVaultWithdrawTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            withdrawAsset: (0, utils_1.toAddress)(params.withdrawAssetAddress),
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            isWTON: this.ctx.isWTON((0, utils_1.toAddress)(params.withdrawAssetAddress)),
+        });
     }
     async sendDepositQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, user.createDepositQueueMsg(this.ctx, sender, params));
+        const msg = await user.createDepositQueueMsg(this.ctx, sender, params);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        const asset = (0, utils_1.toAddress)(params.assetAddress);
+        return trace_1.StrategyVaultDepositQueueTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            asset,
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            isWTON: this.ctx.isWTON(asset),
+        });
     }
     async sendWithdrawQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, user.createWithdrawQueueMsg(this.ctx, sender, params));
+        const msg = await user.createWithdrawQueueMsg(this.ctx, sender, params);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        return trace_1.StrategyVaultWithdrawQueueTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+        });
     }
     async sendCancelDepositQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, user.createCancelDepositQueueMsg(this.ctx, params));
+        const msg = await user.createCancelDepositQueueMsg(this.ctx, params);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        const asset = (0, utils_1.toAddress)(params.assetAddress);
+        return trace_1.StrategyVaultCancelDepositQueueTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            asset,
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+            isWTON: this.ctx.isWTON(asset),
+        });
     }
     async sendCancelWithdrawQueue(sender, params) {
-        return (0, send_msg_1.sendMsg)(sender, user.createCancelWithdrawQueueMsg(this.ctx, params));
+        const msg = await user.createCancelWithdrawQueueMsg(this.ctx, params);
+        const result = await (0, send_msg_1.sendMsgAndWaitTx)(this.ctx, sender, msg);
+        return trace_1.StrategyVaultCancelWithdrawQueueTracer.create({
+            ctx: this.ctx,
+            msgBody: msg.input.body,
+            extHash: await result.getExternalHash(),
+            actor: sender.address,
+            vault: (0, utils_1.toAddress)(params.strategyVaultAddress),
+        });
     }
     async getValuationContext(vaultAddress) {
-        return query.getValuationContext(this.ctx, vaultAddress);
+        return query.getValuationContext(this.ctx, (0, utils_1.toAddress)(vaultAddress));
     }
     async getPrice(vaultAddress) {
         return query.getPrice(this.ctx, vaultAddress);
@@ -273,5 +335,8 @@ class StrategyVaultV1 {
     async getUnderlyingPrices(vaultAddress) {
         return query.getUnderlyingPrices(this.ctx, vaultAddress);
     }
+    async getNativeAmountDecomposedContext(vaultAddress) {
+        return query.getNativeAmountDecomposedContext(this.ctx, vaultAddress);
+    }
 }
-exports.StrategyVaultV1 = StrategyVaultV1;
+exports.StrategyVaultServiceV1 = StrategyVaultServiceV1;

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

@@ -4,18 +4,18 @@ import { AddressInput, AddressLike } from "../../contracts/common/type";
 import { StrategyVaultState } from "../../contracts/vault/strategy-vault";
 import { PoolState } from "../../contracts/core/pool/type";
 import { OracleExposures } from "../composite-oracle/computation";
-import { VaultPositions } from "../composite-oracle/types";
+import { IVaultStateContext } from "../../common/types";
 export { OracleExposures, createOracleExposures } from "../composite-oracle/computation";
 /**
  * Build oracle params Cell from pre-fetched data
  * Pure computation - no network calls
  */
-export declare function buildOracleParamsCellFromData(assets: string[], oracleConfig: any, vaultPositions: VaultPositions, extraPools?: string[]): Promise<Cell>;
+export declare function buildOracleParamsCellFromData(assets: string[], oracleConfig: any, vaultPositions: Record<string, IVaultStateContext>, extraPools?: string[]): Promise<Cell>;
 /**
  * Build oracle params with bucket from pre-fetched data
  * Pure computation - no network calls
  */
-export declare function buildOracleParamsWithBucketFromData(assets: string[], oracleConfig: any, vaultPositions: VaultPositions, initialBucket?: OracleExposures, extraPools?: string[]): {
+export declare function buildOracleParamsWithBucketFromData(assets: string[], oracleConfig: any, vaultPositions: Record<string, IVaultStateContext>, initialBucket?: OracleExposures, extraPools?: string[]): {
     oracleParamsPromise: Promise<Cell>;
     bucket: OracleExposures;
 };

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

@@ -114,6 +114,7 @@ class OracleHelper {
         const oracleConfig = vaultData.oracleConfig;
         const allAssets = [...Object.keys(vaultData.assets), ...additionalAssets];
         const { vaultAssets } = (0, computation_1.separateAssets)(allAssets, oracleConfig);
+        vaultAssets.push(vaultData.address.toString()); // include self
         // Fetch
         const vaultPositions = await this.fetcher.fetchVaultPositions(vaultAssets);
         // Compute

package/dist/services/strategy-vault/owner/index.d.ts

@@ -1,7 +1,7 @@
 import { Dictionary } from "@ton/core";
 import { AffluentContext } from "../../../context";
 import { StrategyVault } from "../../../contracts/vault/strategy-vault";
-import { SetOwnerParams, SetGuardianAddressParams, SetManagerParams, SetPrivateVaultParams, SetWhitelistedMintersParams, SetMaxLeverageRatioParams, ExecuteOwnerActionParams, RevertOwnerActionParams, SetTimelockParams, SetManagementFeeRecipientAddressParams, SetProtocolFeeRatePerYearParams, SetProtocolFeeManagerAddressParams, SetFactorialPoolConfigParams, SetAssetConfigParams, SetRFQConfigParams, SetManagementFeeRatePerYearParams, SetDepositCloseTimestampParams, SetWithdrawOpenTimestampParams, SetGasConfigParams, SetOracleConfigParams, SetWalletCodeParams, SetDataAggregatorCodeParams, SetRFQCodeParams, SetContentParams, UpgradeCodeParams, CollectProtocolFeeParams, ClaimManagementFeeParams } from "./types";
+import { SetOwnerParams, SetGuardianAddressParams, SetManagerParams, SetPrivateVaultParams, SetWhitelistedMintersParams, SetMaxLeverageRatioParams, ExecuteOwnerActionParams, RevertOwnerActionParams, SetTimelockParams, SetManagementFeeRecipientAddressParams, SetProtocolFeeRatePerYearParams, SetProtocolFeeManagerAddressParams, SetFactorialPoolConfigParams, SetAssetConfigV2Params, SetRFQConfigParams, SetManagementFeeRatePerYearParams, SetDepositCloseTimestampParams, SetWithdrawOpenTimestampParams, SetGasConfigParams, SetOracleConfigParams, SetWalletCodeParams, SetDataAggregatorCodeParams, SetRFQCodeParams, SetContentParams, UpgradeCodeParams, CollectProtocolFeeParams, ClaimManagementFeeParams } from "./types";
 export * from "./types";
 export declare function createSetOwnerMsg(ctx: AffluentContext, params: SetOwnerParams): Promise<{
     opts: {
@@ -135,7 +135,7 @@ export declare function createSetFactorialPoolConfigMsg(ctx: AffluentContext, pa
         body: import("@ton/core").Cell;
     };
 }>;
-export declare function createSetAssetConfigMsg(ctx: AffluentContext, params: SetAssetConfigParams, value?: bigint): Promise<{
+export declare function createSetAssetConfigMsg(ctx: AffluentContext, params: SetAssetConfigV2Params, value?: bigint): Promise<{
     opts: {
         vault: import("@ton/core").OpenedContract<StrategyVault>;
     };

package/dist/services/strategy-vault/owner/index.js

@@ -192,7 +192,7 @@ async function createSetAssetConfigMsg(ctx, params, value) {
     const vault = ctx.getByContract(strategy_vault_1.StrategyVault, (0, utils_1.toAddress)(params.strategyVaultAddress));
     const to = vault.address;
     const resolvedValue = value ?? (0, core_1.toNano)(0.02);
-    const body = strategy_vault_1.StrategyVault.createSetAssetConfigMsgBody((0, utils_1.toAddress)(params.assetAddress), params.isWhitelisted, params.isDepositable, params.isWithdrawable, params.exposureCap, params.queryId);
+    const body = strategy_vault_1.StrategyVault.createSetAssetConfigV2MsgBody((0, utils_1.toAddress)(params.assetAddress), params.isWhitelisted, params.isDepositable, params.isWithdrawable, params.isDepositQueueActivated, params.isWithdrawQueueActivated, params.exposureCap, params.queryId);
     return {
         opts: { vault },
         input: { to, value: resolvedValue, body },

package/dist/services/strategy-vault/owner/types.d.ts

@@ -78,6 +78,10 @@ export type SetAssetConfigParams = {
     exposureCap: number;
     queryId?: number;
 };
+export type SetAssetConfigV2Params = SetAssetConfigParams & {
+    isDepositQueueActivated: boolean;
+    isWithdrawQueueActivated: boolean;
+};
 export type SetRFQConfigParams = {
     strategyVaultAddress: AddressInput;
     priceDeviationTolerance: bigint;

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

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