@affluent-org/sdk 0.0.9 → 0.0.10

package/dist/contracts/vault/strategy-vault/codec.d.ts

@@ -506,7 +506,7 @@ export declare function parseExecuteStrategyMsgBody(cell: Cell): {
 };
 export declare function createSupplyToFactorialMsgBody(pool: Address, asset: Address, amount: bigint, response: Address, queryID?: number): Cell;
 export declare function createWithdrawFromFactorialMsgBody(oracleParams: Cell, pool: Address, asset: Address, amount: bigint, isShare: boolean, response: Address, queryID?: number): Cell;
-export declare function createBorrowFromFactorialMsgBody(oracleParams: Cell, pool: Address, asset: Address, amount: bigint, isShare: boolean, response: Address, queryID?: number): Cell;
+export declare function createBorrowFromFactorialMsgBody(oracleParams: Cell, poolOracleParams: Cell, pool: Address, asset: Address, amount: bigint, isShare: boolean, response: Address, queryID?: number): Cell;
 export declare function createRepayToFactorialMsgBody(pool: Address, asset: Address, amount: bigint, response: Address, queryID?: number): Cell;
 export declare function createLiquidateToFactorialMsgBody(oracleParams: Cell, pool: Address, borrower: Address, repayAsset: Address, seizeAsset: Address, repayAmount: bigint, response: Address, queryID?: number): Cell;
 export declare function parseSupplyToFactorialMsgBody(cell: Cell): {

package/dist/contracts/vault/strategy-vault/codec.js

@@ -1003,8 +1003,8 @@ function createSupplyToFactorialMsgBody(pool, asset, amount, response, queryID)
 function createWithdrawFromFactorialMsgBody(oracleParams, pool, asset, amount, isShare, response, queryID) {
     return (0, core_1.beginCell)().storeUint(constants_1.Op.ExecuteStrategy, 32).storeUint(queryID ?? 0, 64).storeRef(oracleParams).storeUint(constants_1.Op.WithdrawFromFactorial, 32).storeAddress(pool).storeAddress(asset).storeCoins(amount).storeBit(isShare).storeAddress(response).endCell();
 }
-function createBorrowFromFactorialMsgBody(oracleParams, pool, asset, amount, isShare, response, queryID) {
-    return (0, core_1.beginCell)().storeUint(constants_1.Op.ExecuteStrategy, 32).storeUint(queryID ?? 0, 64).storeUint(constants_1.Op.BorrowFromFactorial, 32).storeMaybeRef(oracleParams).storeRef(oracleParams).storeAddress(pool).storeAddress(asset).storeCoins(amount).storeBit(isShare).storeAddress(response).endCell();
+function createBorrowFromFactorialMsgBody(oracleParams, poolOracleParams, pool, asset, amount, isShare, response, queryID) {
+    return (0, core_1.beginCell)().storeUint(constants_1.Op.ExecuteStrategy, 32).storeUint(queryID ?? 0, 64).storeUint(constants_1.Op.BorrowFromFactorial, 32).storeMaybeRef(oracleParams).storeRef(poolOracleParams).storeAddress(pool).storeAddress(asset).storeCoins(amount).storeBit(isShare).storeAddress(response).endCell();
 }
 function createRepayToFactorialMsgBody(pool, asset, amount, response, queryID) {
     return (0, core_1.beginCell)().storeUint(constants_1.Op.ExecuteStrategy, 32).storeUint(queryID ?? 0, 64).storeUint(constants_1.Op.RepayToFactorial, 32).storeAddress(pool).storeAddress(asset).storeCoins(amount).storeAddress(response).endCell();

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

@@ -300,14 +300,12 @@ async function buildOracleParamsCell(assets, oracleConfig, pools, vaults) {
     const signers = new Set(oracleConfig.signers
         .map((s) => s.toLowerCase()));
     let helper;
-    if (setEqual(signers, restonSigners)) {
-        helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
-    }
-    else if (setEqual(signers, affluentSigners)) {
+    if (setEqual(signers, affluentSigners)) {
         helper = (0, redstoneHelper_1.createRedstoneCustomHelper)("http://aggregatora3loa-ktesxzhb-780180176.ap-northeast-2.elb.amazonaws.com");
     }
     else {
-        throw new Error(`Invalid signers: ${[...signers]}`);
+        // setEqual(signers, restonSigners)
+        helper = (0, redstoneHelper_1.createRedstoneHelper)("prod");
     }
     // Fetch payload
     const payload = await helper.createPayload(requestParams.redstoneAssetNames);

package/dist/services/pool/user/index.js

@@ -81,7 +81,7 @@ async function createSupplyMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: poolWTONWallet.address,
-                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer,
+                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer + opts.amount + opts.forwardTonAmount,
                 body: poolWTONWallet.createExternalTransferBody(opts),
             },
         };
@@ -207,7 +207,7 @@ async function createRepayMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: poolWTONWallet.address,
-                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer,
+                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer + opts.amount + opts.forwardTonAmount,
                 body: poolWTONWallet.createExternalTransferBody(opts),
             },
         };
@@ -265,7 +265,7 @@ async function createLiquidateMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: poolWTONWallet.address,
-                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer,
+                value: value ?? jetton_wallet_2.WTONWallet.Gas.ExternalTransfer + opts.amount + opts.forwardTonAmount,
                 body: poolWTONWallet.createExternalTransferBody(opts),
             },
         };

package/dist/services/rfq-auction/user/index.js

@@ -74,7 +74,7 @@ async function createAmountBidMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: wtonWallet.address,
-                value: value ?? gas,
+                value: value ?? gas + opts.amount + forwardTonAmount,
                 body: wtonWallet.createExternalTransferBody(opts),
             },
         };
@@ -140,7 +140,7 @@ async function createSlippageBidMsg(ctx, sender, params, value) {
             opts,
             input: {
                 to: wtonWallet.address,
-                value: value ?? gas,
+                value: value ?? gas + opts.amount + forwardTonAmount,
                 body: wtonWallet.createExternalTransferBody(opts),
             },
         };

package/dist/services/share-vault/manager/index.js

@@ -70,7 +70,7 @@ async function createWithdrawFromPoolMsg(ctx, params, value) {
         .storeUint(share_vault_1.ShareVault.Op.WithdrawFromPool, 32)
         .storeUint(opts.queryID ?? 0, 64)
         .storeAddress(poolAddress)
-        .storeUint(opts.isShare ? 1 : 0, 1)
+        .storeBit(opts.isShare)
         .storeCoins(params.amount)
         .endCell();
     return {

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

@@ -541,6 +541,8 @@ export declare function createWithdrawFromFactorialMsg(ctx: AffluentContext, sen
         };
         poolData: import("../../..").PoolState;
         poolOraclePayload: Cell;
+        oraclePayload: Cell;
+        oracleCalculateGas: bigint;
         poolAddress: Address;
         assetAddress: Address;
     };
@@ -553,6 +555,7 @@ export declare function createWithdrawFromFactorialMsg(ctx: AffluentContext, sen
 export declare function createLiquidateToFactorialMsg(ctx: AffluentContext, sender: AddressSender, params: LiquidateToFactorialParams, value?: bigint): Promise<{
     opts: {
         strategyVault: import("@ton/core").OpenedContract<StrategyVault>;
+        pool: import("@ton/core").OpenedContract<Pool>;
         vaultData: {
             globalDepositValueCap: bigint;
             withdrawFeeRate: number;
@@ -676,6 +679,8 @@ export declare function createLiquidateToFactorialMsg(ctx: AffluentContext, send
             balance: bigint;
             code: Cell;
         };
+        poolData: import("../../..").PoolState;
+        poolOraclePayload: Cell;
         oraclePayload: Cell;
         oracleCalculateGas: bigint;
         poolAddress: Address;

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

@@ -43,7 +43,6 @@ const oracle_1 = require("../oracle");
 const share_vault_2 = require("../../share-vault");
 const computation_1 = require("../../../contracts/vault/strategy-vault/computation");
 const query_1 = require("../query");
-const oracle_2 = require("../oracle");
 __exportStar(require("./types"), exports);
 // ============================================================
 // Factorial Pool Operations
@@ -72,16 +71,19 @@ async function createBorrowFromFactorialMsg(ctx, sender, params, value) {
         params.assetAddress.toString(),
         ...Object.keys(vaultData.assets),
     ]);
-    const oracleCalculateGas = BigInt(Object.keys(vaultData.assets).length + Object.keys(vaultData.factorialPools).length) * (0, core_1.toNano)(0.05);
-    const poolAddress = (0, utils_1.toAddress)(params.poolAddress);
     const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
+    const poolAddress = (0, utils_1.toAddress)(params.poolAddress);
+    const pool = ctx.getByContract(pool_1.Pool, poolAddress);
+    const poolData = await pool.getPoolData();
+    const poolOraclePayload = await oracleLibs.getOracleParamsForPool(poolData);
     const to = strategyVault.address;
+    const body = strategy_vault_1.StrategyVault.createBorrowFromFactorialMsgBody(oraclePayload, poolOraclePayload, poolAddress, assetAddress, params.assetAmount, params.isShare, sender.address, params.queryId);
+    const oracleCalculateGas = BigInt(Object.keys(vaultData.assets).length + Object.keys(vaultData.factorialPools).length) * (0, core_1.toNano)(0.05);
     const resolvedValue = value ??
         vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.FactorialTransferOut] +
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ExecuteStrategy] +
             oracleCalculateGas +
             (0, core_1.toNano)(0.1);
-    const body = strategy_vault_1.StrategyVault.createBorrowFromFactorialMsgBody(oraclePayload, poolAddress, assetAddress, params.assetAmount, params.isShare, sender.address, params.queryId);
     return {
         opts: { strategyVault, vaultData, oraclePayload, oracleCalculateGas, poolAddress, assetAddress },
         input: { to, value: resolvedValue, body },
@@ -113,20 +115,32 @@ async function createWithdrawFromFactorialMsg(ctx, sender, params, value) {
     const poolAddress = (0, utils_1.toAddress)(params.poolAddress);
     const assetAddress = (0, utils_1.toAddress)(params.assetAddress);
     const to = strategyVault.address;
+    const oracleCalculateGas = BigInt(Object.keys(vaultData.assets).length + Object.keys(vaultData.factorialPools).length) * (0, core_1.toNano)(0.05);
     const resolvedValue = value ??
         vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.FactorialTransferOut] +
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ExecuteStrategy] +
+            oracleCalculateGas +
             (0, core_1.toNano)(0.1);
     const body = strategy_vault_1.StrategyVault.createWithdrawFromFactorialMsgBody(poolOraclePayload, poolAddress, assetAddress, params.assetAmount, params.isShare, sender.address, params.queryId);
+    const { oracleParams: oraclePayload } = await oracleLibs.getOracleParamsForStrategyVaultV2(vaultData, [
+        params.assetAddress.toString(),
+        ...Object.keys(vaultData.assets),
+    ]);
     return {
-        opts: { strategyVault, pool, vaultData, poolData, poolOraclePayload, poolAddress, assetAddress },
+        opts: { strategyVault, pool, vaultData, poolData, poolOraclePayload, oraclePayload, oracleCalculateGas, poolAddress, assetAddress },
         input: { to, value: resolvedValue, body },
     };
 }
 async function createLiquidateToFactorialMsg(ctx, sender, params, value) {
     const strategyVault = ctx.getByContract(strategy_vault_1.StrategyVault, params.strategyVaultAddress);
+    const pool = ctx.getByContract(pool_1.Pool, params.poolAddress);
+    const oracleLibs = new oracle_1.OracleHelper(ctx);
     const vaultData = await strategyVault.getVaultData();
-    const oraclePayload = await (0, oracle_2.getOracleParams)(ctx, strategyVault.address);
+    const poolData = await pool.getPoolData();
+    const poolOraclePayload = await oracleLibs.getOracleParamsForPool(poolData, [
+        params.repayAssetAddress.toString(),
+        params.seizeAssetAddress.toString(),
+    ]);
     const oracleCalculateGas = BigInt(Object.keys(vaultData.assets).length + Object.keys(vaultData.factorialPools).length) * (0, core_1.toNano)(0.05);
     const poolAddress = (0, utils_1.toAddress)(params.poolAddress);
     const borrowerAddress = (0, utils_1.toAddress)(params.borrowerAddress);
@@ -138,9 +152,14 @@ async function createLiquidateToFactorialMsg(ctx, sender, params, value) {
             vaultData.gasConfig[strategy_vault_1.StrategyVault.GasKey.ExecuteStrategy] +
             oracleCalculateGas +
             (0, core_1.toNano)(0.1);
-    const body = strategy_vault_1.StrategyVault.createLiquidateToFactorialMsgBody(oraclePayload, poolAddress, borrowerAddress, repayAssetAddress, seizeAssetAddress, params.repayAmount, sender.address, params.queryId);
+    const { oracleParams: oraclePayload } = await oracleLibs.getOracleParamsForStrategyVaultV2(vaultData, [
+        params.repayAssetAddress.toString(),
+        params.seizeAssetAddress.toString(),
+        ...Object.keys(vaultData.assets),
+    ]);
+    const body = strategy_vault_1.StrategyVault.createLiquidateToFactorialMsgBody(poolOraclePayload, poolAddress, borrowerAddress, repayAssetAddress, seizeAssetAddress, params.repayAmount, sender.address, params.queryId);
     return {
-        opts: { strategyVault, vaultData, oraclePayload, oracleCalculateGas, poolAddress, borrowerAddress, repayAssetAddress, seizeAssetAddress },
+        opts: { strategyVault, pool, vaultData, poolData, poolOraclePayload, oraclePayload, oracleCalculateGas, poolAddress, borrowerAddress, repayAssetAddress, seizeAssetAddress },
         input: { to, value: resolvedValue, body },
     };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@affluent-org/sdk",
-  "version": "0.0.9",
+  "version": "0.0.10",
   "description": "affluent-sdk",
   "main": "dist/index.js",
   "scripts": {