@evaafi/sdk 0.4.1 → 0.5.1

package/README.md

@@ -1,7 +1,7 @@
-# EVAA SDK
-
-The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.
-
-## Documentation
-
+# EVAA SDK
+
+The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.
+
+## Documentation
+
 You can find the documentation in the [docs](./docs) folder.

package/dist/api/math.d.ts

@@ -1,6 +1,6 @@
 import { AssetConfig, AssetData, AssetInterest, ExtendedAssetData } from '../types/Master';
 import { Dictionary } from '@ton/core';
-import { LiquidationData, UserBalance } from '../types/User';
+import { LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
 export declare function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint;
 export declare function mulDiv(x: bigint, y: bigint, z: bigint): bigint;
 export declare function bigIntMax(...args: bigint[]): bigint;
@@ -18,3 +18,4 @@ export declare function calculateAssetInterest(assetConfig: AssetConfig, assetDa
 export declare function getAvailableToBorrow(assetsConfig: Dictionary<bigint, AssetConfig>, assetsData: Dictionary<bigint, ExtendedAssetData>, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>): bigint;
 export declare function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint): UserBalance;
 export declare function calculateLiquidationData(assetsConfig: Dictionary<bigint, AssetConfig>, assetsData: Dictionary<bigint, ExtendedAssetData>, principals: Dictionary<bigint, bigint>, prices: Dictionary<bigint, bigint>): LiquidationData;
+export declare function predictHealthFactor(args: PredictHealthFactorArgs): number;

package/dist/api/math.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDiv = exports.mulFactor = void 0;
+exports.predictHealthFactor = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMin = exports.bigIntMax = exports.mulDiv = exports.mulFactor = void 0;
 const constants_1 = require("../constants");
 const User_1 = require("../types/User");
+const sha256BigInt_1 = require("../utils/sha256BigInt");
 function mulFactor(decimal, a, b) {
     return (a * b) / decimal;
 }
@@ -86,9 +87,7 @@ function calculateAssetInterest(assetConfig, assetData) {
                 mulFactor(constants_1.MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, assetConfig.targetUtilization) +
                 mulFactor(constants_1.MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeHigh, utilization - assetConfig.targetUtilization);
     }
-    const reserveFactor = 20n;
-    const reserveScale = 100n;
-    supplyInterest = mulDiv(mulDiv(borrowInterest, utilization, constants_1.MASTER_CONSTANTS.FACTOR_SCALE), reserveScale - reserveFactor, reserveScale);
+    supplyInterest = mulDiv(mulDiv(borrowInterest, utilization, constants_1.MASTER_CONSTANTS.FACTOR_SCALE), constants_1.MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor, constants_1.MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE);
     return {
         supplyInterest,
         borrowInterest,
@@ -171,7 +170,7 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices)
         const values = [];
         const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset);
         const gLoanAssetConfig = assetsConfig.get(gLoanAsset);
-        const liquidationBonus = gLoanAssetConfig.liquidationBonus;
+        const liquidationBonus = gCollateralAssetConfig.liquidationBonus;
         const loanDecimal = 10n ** gLoanAssetConfig.decimals;
         values.push((bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10000000000n)) *
             loanDecimal *
@@ -212,3 +211,34 @@ function calculateLiquidationData(assetsConfig, assetsData, principals, prices)
     };
 }
 exports.calculateLiquidationData = calculateLiquidationData;
+function predictHealthFactor(args) {
+    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.balances, args.prices);
+    const tokenHash = (0, sha256BigInt_1.sha256Hash)(args.tokenSymbol);
+    const assetConfig = args.assetsConfig.get(tokenHash);
+    const assetPrice = Number(args.prices.get(tokenHash));
+    let totalLimit = Number(liquidationData.totalLimit);
+    let totalBorrow = Number(liquidationData.totalDebt);
+    const currentAmount = args.amount;
+    const decimals = Number(assetConfig.decimals);
+    const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
+    const changeType = args.balanceChangeType;
+    if (currentAmount != null && currentAmount != 0n) {
+        if (changeType == User_1.BalanceChangeType.Borrow) {
+            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(constants_1.MASTER_CONSTANTS.ASSET_ORIGINATION_FEE_SCALE));
+        }
+        else if (changeType == User_1.BalanceChangeType.Repay) {
+            totalBorrow -= currentBalance;
+        }
+        else if (changeType == User_1.BalanceChangeType.Withdraw) {
+            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(constants_1.MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+        }
+        else if (changeType == User_1.BalanceChangeType.Supply) {
+            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(constants_1.MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+        }
+    }
+    if (Number(totalLimit) == 0) {
+        return 1;
+    }
+    return Math.min(Math.max(1 - totalBorrow / totalLimit, 0), 1); // let's limit a result to zero below and one above
+}
+exports.predictHealthFactor = predictHealthFactor;

package/dist/api/parser.d.ts

@@ -4,5 +4,5 @@ import { UserData, UserLiteData } from '../types/User';
 export declare function createAssetData(): DictionaryValue<AssetData>;
 export declare function createAssetConfig(): DictionaryValue<AssetConfig>;
 export declare function parseMasterData(masterDataBOC: string, testnet?: boolean): MasterData;
-export declare function parseUserLiteData(userDataBOC: string, assetsData: Dictionary<bigint, ExtendedAssetData>, assetsConfig: Dictionary<bigint, AssetConfig>, testnet?: boolean): UserLiteData;
-export declare function parseUserData(userLiteData: UserLiteData, assetsData: Dictionary<bigint, ExtendedAssetData>, assetsConfig: Dictionary<bigint, AssetConfig>, prices: Dictionary<bigint, bigint>, testnet?: boolean): UserData;
+export declare function parseUserLiteData(userDataBOC: string, assetsData: Dictionary<bigint, ExtendedAssetData>, assetsConfig: Dictionary<bigint, AssetConfig>, testnet?: boolean, applyDust?: boolean): UserLiteData;
+export declare function parseUserData(userLiteData: UserLiteData, assetsData: Dictionary<bigint, ExtendedAssetData>, assetsConfig: Dictionary<bigint, AssetConfig>, prices: Dictionary<bigint, bigint>, testnet?: boolean, applyDust?: boolean): UserData;

package/dist/api/parser.js

@@ -6,6 +6,20 @@ const constants_1 = require("../constants");
 const math_1 = require("./math");
 const helpers_1 = require("./helpers");
 const User_1 = require("../types/User");
+// Will be in v6
+/* export function createUserRewards(): DictionaryValue<UserRewards> {
+    return {
+        serialize: (src: any, buidler: any) => {
+            buidler.storeUint(src.trackingIndex, 64);
+            buidler.storeUint(src.trackingAccured, 64);
+    },
+        parse: (src: Slice) => {
+            const trackingIndex = BigInt(src.loadUint(64));
+            const trackingAccured = BigInt(src.loadUint(64));
+            return { trackingIndex, trackingAccured };
+        },
+    };
+}*/
 function createAssetData() {
     return {
         serialize: (src, buidler) => {
@@ -15,6 +29,10 @@ function createAssetData() {
             buidler.storeUint(src.totalBorrow, 64);
             buidler.storeUint(src.lastAccural, 32);
             buidler.storeUint(src.balance, 64);
+            /* Will be in v6
+            buidler.storeUint(src.trackingSupplyIndex, 64);
+            buidler.storeUint(src.trackingBorrowIndex, 64);
+            buidler.storeUint(src.lastTrackingAccural, 32); */
         },
         parse: (src) => {
             const sRate = BigInt(src.loadInt(64));
@@ -23,6 +41,12 @@ function createAssetData() {
             const totalBorrow = BigInt(src.loadInt(64));
             const lastAccural = BigInt(src.loadInt(32));
             const balance = BigInt(src.loadInt(64));
+            /* Will be in v6
+            const trackingSupplyIndex = BigInt(src.loadUint(64));
+            const trackingBorrowIndex = BigInt(src.loadUint(64));
+            const lastTrackingAccural = BigInt(src.loadUint(32));
+
+            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, lastTrackingAccural};        }, */
             return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance };
         },
     };
@@ -44,7 +68,14 @@ function createAssetConfig() {
             refBuild.storeUint(src.supplyRateSlopeHigh, 64);
             refBuild.storeUint(src.targetUtilization, 64);
             refBuild.storeUint(src.originationFee, 64);
+            refBuild.storeUint(src.dust, 64);
             refBuild.storeUint(src.maxTotalSupply, 64);
+            refBuild.storeUint(src.reserveFactor, 16);
+            refBuild.storeUint(src.liquidationReserveFactor, 16);
+            /* Will be in v6
+            refBuild.storeUint(src.minPrincipalForRewards, 64);
+            refBuild.storeUint(src.baseTrackingSupplySpeed, 64);
+            refBuild.storeUint(src.baseTrackingBorrowSpeed, 64); */
             builder.storeRef(refBuild.endCell());
         },
         parse: (src) => {
@@ -63,6 +94,12 @@ function createAssetConfig() {
             const originationFee = ref.loadUintBig(64);
             const dust = ref.loadUintBig(64);
             const maxTotalSupply = ref.loadUintBig(64);
+            const reserveFactor = ref.loadUintBig(16);
+            const liquidationReserveFactor = ref.loadUintBig(16);
+            /* Will be in v6
+            const minPrincipalForRewards = ref.loadUintBig(64);
+            const baseTrackingSupplySpeed = ref.loadUintBig(64);
+            const baseTrackingBorrowSpeed = ref.loadUintBig(64); */
             return {
                 oracle,
                 decimals,
@@ -78,6 +115,12 @@ function createAssetConfig() {
                 originationFee,
                 dust,
                 maxTotalSupply,
+                reserveFactor,
+                liquidationReserveFactor,
+                /* Will be in v6
+                minPrincipalForRewards,
+                baseTrackingSupplySpeed,
+                baseTrackingBorrowSpeed */
             };
         },
     };
@@ -140,7 +183,7 @@ function parseMasterData(masterDataBOC, testnet = false) {
     };
 }
 exports.parseMasterData = parseMasterData;
-function parseUserLiteData(userDataBOC, assetsData, assetsConfig, testnet = false) {
+function parseUserLiteData(userDataBOC, assetsData, assetsConfig, testnet = false, applyDust = false) {
     const ASSETS_ID = testnet ? constants_1.TESTNET_ASSETS_ID : constants_1.MAINNET_ASSETS_ID;
     const userSlice = core_1.Cell.fromBase64(userDataBOC).beginParse();
     const codeVersion = userSlice.loadCoins();
@@ -152,12 +195,37 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, testnet = fals
     const trackingBorrowIndex = userSlice.loadUintBig(64);
     const dutchAuctionStart = userSlice.loadUint(32);
     const backupCell = (0, helpers_1.loadMyRef)(userSlice);
+    /* Will be in v6
+    let trackingSupplyIndex = 0n;
+    let trackingBorrowIndex = 0n;
+    let dutchAuctionStart = 0;
+    let backupCell = Cell.EMPTY;
+    let rewards = Dictionary.empty(Dictionary.Keys.BigUint(256), createUserRewards());
+    let backupCell1: Cell | null = null;
+    let backupCell2: Cell | null = null;
+    const bitsLeft = userSlice.remainingBits;
+    if (bitsLeft > 32) {
+        trackingSupplyIndex = userSlice.loadUintBig(64);
+        trackingBorrowIndex = userSlice.loadUintBig(64);
+        dutchAuctionStart = userSlice.loadUint(32);
+        backupCell = loadMyRef(userSlice);
+    } else {
+        rewards = userSlice.loadDict(Dictionary.Keys.BigUint(256), createUserRewards());
+        backupCell1 = userSlice.loadMaybeRef();
+        backupCell2 = userSlice.loadMaybeRef();
+    }
+    */
     userSlice.endParse();
     const userBalances = core_1.Dictionary.empty();
     for (const [_, assetID] of Object.entries(ASSETS_ID)) {
         const assetData = assetsData.get(assetID);
         const assetConfig = assetsConfig.get(assetID);
-        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principalsDict.get(assetID) || 0n);
+        let principals = principalsDict.get(assetID) || 0n;
+        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) { // abs(principals) < dust
+            principals = 0n;
+            principalsDict.set(assetID, 0n);
+        }
+        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals);
         userBalances.set(assetID, balance);
     }
     return {
@@ -172,10 +240,14 @@ function parseUserLiteData(userDataBOC, assetsData, assetsConfig, testnet = fals
         trackingBorrowIndex: trackingBorrowIndex,
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
+        /* Will be in v6
+        rewards: rewards,
+        backupCell1: backupCell1,
+        backupCell2: backupCell2, */
     };
 }
 exports.parseUserLiteData = parseUserLiteData;
-function parseUserData(userLiteData, assetsData, assetsConfig, prices, testnet = false) {
+function parseUserData(userLiteData, assetsData, assetsConfig, prices, testnet = false, applyDust = false) {
     const ASSETS_ID = testnet ? constants_1.TESTNET_ASSETS_ID : constants_1.MAINNET_ASSETS_ID;
     const withdrawalLimits = core_1.Dictionary.empty();
     const borrowLimits = core_1.Dictionary.empty();
@@ -184,7 +256,12 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, testnet =
     for (const [_, assetID] of Object.entries(ASSETS_ID)) {
         const assetData = assetsData.get(assetID);
         const assetConfig = assetsConfig.get(assetID);
-        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, userLiteData.principals.get(assetID) || 0n);
+        let principals = userLiteData.principals.get(assetID) || 0n;
+        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) { // abs(principals) < dust
+            principals = 0n;
+            userLiteData.principals.set(assetID, 0n);
+        }
+        const balance = (0, math_1.presentValue)(assetData.sRate, assetData.bRate, principals);
         userLiteData.balances.set(assetID, balance);
     }
     for (const [_, assetID] of Object.entries(ASSETS_ID)) {
@@ -209,9 +286,7 @@ function parseUserData(userLiteData, assetsData, assetsConfig, prices, testnet =
                 prices.get(assetID) -
                 5n, balance.amount), 0n));
         }
-        else {
-            borrowLimits.set(assetID, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(assetID), assetData.balance));
-        }
+        borrowLimits.set(assetID, (0, math_1.bigIntMin)((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(assetID), assetData.balance));
     }
     const limitUsed = borrowBalance + availableToBorrow;
     const limitUsedPercent = limitUsed === 0n

package/dist/api/prices.d.ts

@@ -1,2 +1,2 @@
 import { PriceData } from '../types/Common';
-export declare function getPrices(): Promise<PriceData | undefined>;
+export declare function getPrices(endpoint?: String): Promise<PriceData | undefined>;

package/dist/api/prices.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrices = void 0;
 const core_1 = require("@ton/core");
 const constants_1 = require("../constants");
-async function getPrices() {
+async function getPrices(endpoint = "api.stardust-mainnet.iotaledger.net") {
     try {
-        let result = await fetch('https://api.stardust-mainnet.iotaledger.net/api/indexer/v1/outputs/nft/' + constants_1.NFT_ID, {
+        let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${constants_1.NFT_ID}`, {
             headers: { accept: 'application/json' },
         });
         let outputId = (await result.json());
-        result = await fetch('https://api.stardust-mainnet.iotaledger.net/api/core/v2/outputs/' + outputId.items[0], {
+        result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
             headers: { accept: 'application/json' },
         });
         let resData = (await result.json());

package/dist/constants.d.ts

@@ -1,8 +1,8 @@
 import { Address, Cell } from '@ton/core';
 export declare const EVAA_MASTER_MAINNET: Address;
-export declare const MAINNET_VERSION = 4;
+export declare const MAINNET_VERSION = 5;
 export declare const EVAA_MASTER_TESTNET: Address;
-export declare const TESTNET_VERSION = 4;
+export declare const TESTNET_VERSION = 5;
 export declare const NFT_ID = "0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5";
 export declare const MAINNET_ASSETS_ID: {
     TON: bigint;
@@ -34,6 +34,9 @@ export declare const MASTER_CONSTANTS: {
     FACTOR_SCALE: bigint;
     ASSET_COEFFICIENT_SCALE: bigint;
     ASSET_PRICE_SCALE: bigint;
+    ASSET_RESERVE_FACTOR_SCALE: bigint;
+    ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: bigint;
+    ASSET_ORIGINATION_FEE_SCALE: bigint;
 };
 export declare const LENDING_CODE: Cell;
 export declare const JETTON_WALLETS_CODE: {

package/dist/constants.js

@@ -4,9 +4,9 @@ exports.FEES = exports.OPCODES = exports.JETTON_WALLETS_CODE = exports.LENDING_C
 const core_1 = require("@ton/core");
 const sha256BigInt_1 = require("./utils/sha256BigInt");
 exports.EVAA_MASTER_MAINNET = core_1.Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
-exports.MAINNET_VERSION = 4;
+exports.MAINNET_VERSION = 5;
 exports.EVAA_MASTER_TESTNET = core_1.Address.parse('kQCj7qf3i2Cbf1GVtZCinla7lIvE7l3MBMsJMTfAja3BdoRP');
-exports.TESTNET_VERSION = 4;
+exports.TESTNET_VERSION = 5;
 exports.NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
 exports.MAINNET_ASSETS_ID = {
     TON: (0, sha256BigInt_1.sha256Hash)('TON'),
@@ -40,6 +40,9 @@ exports.MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
     ASSET_COEFFICIENT_SCALE: 10000n,
     ASSET_PRICE_SCALE: BigInt(1e8),
+    ASSET_RESERVE_FACTOR_SCALE: 10000n,
+    ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: 10000n,
+    ASSET_ORIGINATION_FEE_SCALE: BigInt(1e9)
 };
 exports.LENDING_CODE = core_1.Cell.fromBoc(Buffer.from('b5ee9c72c1010e0100fd000d12182a555a6065717691969efd0114ff00f4a413f4bcf2c80b010202c8050202039f740403001ff2f8276a2687d2018fd201800f883b840051d38642c678b64e4400780e58fc10802faf07f80e59fa801e78b096664c02078067c07c100627a7978402014807060007a0ddb0c60201c709080013a0fd007a026900aa90400201200b0a0031b8e1002191960aa00b9e2ca007f4042796d225e8019203f6010201200d0c000bf7c147d2218400b9d10e86981fd201840b07f8138d809797976a2687d2029116382f970fd9178089910374daf81b619fd20182c7883b8701981684100627910eba56001797a6a6ba610fd8200e8768f76a9f6aa00cc2a32a8292878809bef2f1889f883bbcdeb86f01', 'hex'))[0];
 exports.JETTON_WALLETS_CODE = {

package/dist/contracts/MasterContract.js

@@ -44,6 +44,9 @@ class Evaa {
                 .storeUint(constants_1.OPCODES.SUPPLY, 32)
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeAddress(parameters.userAddress)
+                /* Will be in v6
+                .storeUint(parameters.amountToTransfer, 64)
+                .storeRef(parameters.payload) */
                 .endCell())
                 .endCell();
         }
@@ -54,6 +57,9 @@ class Evaa {
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.amount, 64)
                 .storeAddress(parameters.userAddress)
+                /* Will be in v6
+                .storeUint(parameters.amountToTransfer, 64)
+                .storeRef(parameters.payload) */
                 .endCell();
         }
     }
@@ -69,6 +75,9 @@ class Evaa {
             .storeUint(parameters.amount, 64)
             .storeAddress(parameters.userAddress)
             .storeInt(parameters.includeUserCode ? -1 : 0, 2)
+            /* Will be in v6
+            .storeUint(parameters.amountToTransfer, 64)
+            .storeRef(parameters.payload) */
             .storeRef(parameters.priceData)
             .endCell();
     }

package/dist/types/Master.d.ts

@@ -25,6 +25,8 @@ export type AssetConfig = {
     originationFee: bigint;
     dust: bigint;
     maxTotalSupply: bigint;
+    reserveFactor: bigint;
+    liquidationReserveFactor: bigint;
 };
 export type MasterConfig = {
     ifActive: number;

package/dist/types/User.d.ts

@@ -1,4 +1,5 @@
 import { Address, Cell, Dictionary } from '@ton/core';
+import { AssetConfig, ExtendedAssetData } from './Master';
 export declare enum BalanceType {
     supply = "supply",
     borrow = "borrow"
@@ -53,3 +54,22 @@ export type UserDataInactive = {
     type: 'inactive';
 };
 export type UserData = UserDataActive | UserDataInactive;
+export type UserRewards = {
+    trackingIndex: bigint;
+    trackingAccured: bigint;
+};
+export declare enum BalanceChangeType {
+    Borrow = 0,
+    Repay = 1,
+    Supply = 2,
+    Withdraw = 3
+}
+export type PredictHealthFactorArgs = {
+    balanceChangeType: BalanceChangeType;
+    amount: bigint;
+    tokenSymbol: string;
+    balances: Dictionary<bigint, bigint>;
+    prices: Dictionary<bigint, bigint>;
+    assetsData: Dictionary<bigint, ExtendedAssetData>;
+    assetsConfig: Dictionary<bigint, AssetConfig>;
+};

package/dist/types/User.js

@@ -1,8 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BalanceType = void 0;
+exports.BalanceChangeType = exports.BalanceType = void 0;
 var BalanceType;
 (function (BalanceType) {
     BalanceType["supply"] = "supply";
     BalanceType["borrow"] = "borrow";
 })(BalanceType || (exports.BalanceType = BalanceType = {}));
+var BalanceChangeType;
+(function (BalanceChangeType) {
+    BalanceChangeType[BalanceChangeType["Borrow"] = 0] = "Borrow";
+    BalanceChangeType[BalanceChangeType["Repay"] = 1] = "Repay";
+    BalanceChangeType[BalanceChangeType["Supply"] = 2] = "Supply";
+    BalanceChangeType[BalanceChangeType["Withdraw"] = 3] = "Withdraw";
+})(BalanceChangeType || (exports.BalanceChangeType = BalanceChangeType = {}));

package/package.json

@@ -1,34 +1,34 @@
-{
-  "name": "@evaafi/sdk",
-  "version": "0.4.1",
-  "description": "SDK for EVAA contracts",
-  "main": "dist/index.js",
-  "files": [
-    "dist",
-    "src"
-  ],
-  "scripts": {
-    "build": "tsc --declaration"
-  },
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/evaafi/sdk.git"
-  },
-  "author": "EVAA Finance",
-  "license": "MIT",
-  "homepage": "https://github.com/evaafi/sdk#readme",
-  "devDependencies": {
-    "@ton/core": "0.56.0",
-    "@tonconnect/sdk": "^3.0.0",
-    "@types/node": "^20.10.4",
-    "crypto-js": "^4.2.0",
-    "prettier": "^3.2.4",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.3.3"
-  },
-  "peerDependencies": {
-    "@ton/core": ">=0.56.0",
-    "@tonconnect/sdk": ">=3.0.0",
-    "crypto-js": ">=4.2.0"
-  }
-}
+{
+  "name": "@evaafi/sdk",
+  "version": "0.5.1",
+  "description": "SDK for EVAA contracts",
+  "main": "dist/index.js",
+  "files": [
+    "dist",
+    "src"
+  ],
+  "scripts": {
+    "build": "tsc --declaration"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/evaafi/sdk.git"
+  },
+  "author": "EVAA Finance",
+  "license": "MIT",
+  "homepage": "https://github.com/evaafi/sdk#readme",
+  "devDependencies": {
+    "@ton/core": "0.56.0",
+    "@tonconnect/sdk": "^3.0.0",
+    "@types/node": "^20.10.4",
+    "crypto-js": "^4.2.0",
+    "prettier": "^3.2.4",
+    "ts-node": "^10.9.1",
+    "typescript": "^5.3.3"
+  },
+  "peerDependencies": {
+    "@ton/core": ">=0.56.0",
+    "@tonconnect/sdk": ">=3.0.0",
+    "crypto-js": ">=4.2.0"
+  }
+}

package/src/api/math.ts

@@ -1,7 +1,8 @@
 import { AssetConfig, AssetData, AssetInterest, ExtendedAssetData } from '../types/Master';
 import { MASTER_CONSTANTS } from '../constants';
 import { Dictionary } from '@ton/core';
-import { BalanceType, LiquidationData, UserBalance } from '../types/User';
+import { BalanceChangeType, BalanceType, LiquidationData, PredictHealthFactorArgs, UserBalance } from '../types/User';
+import { sha256Hash } from '../utils/sha256BigInt';
 
 export function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint {
     return (a * b) / decimal;
@@ -103,12 +104,10 @@ export function calculateAssetInterest(assetConfig: AssetConfig, assetData: Asse
             );
     }
 
-    const reserveFactor = 20n;
-    const reserveScale = 100n;
     supplyInterest = mulDiv(
         mulDiv(borrowInterest, utilization, MASTER_CONSTANTS.FACTOR_SCALE),
-        reserveScale - reserveFactor,
-        reserveScale,
+        MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE - assetConfig.reserveFactor,
+        MASTER_CONSTANTS.ASSET_RESERVE_FACTOR_SCALE,
     );
 
     return {
@@ -205,7 +204,7 @@ export function calculateLiquidationData(
         const values: bigint[] = [];
         const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset)!;
         const gLoanAssetConfig = assetsConfig.get(gLoanAsset)!;
-        const liquidationBonus = gLoanAssetConfig.liquidationBonus;
+        const liquidationBonus = gCollateralAssetConfig.liquidationBonus;
         const loanDecimal = 10n ** gLoanAssetConfig.decimals;
         values.push(
             (bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10_000_000_000n)) *
@@ -250,3 +249,38 @@ export function calculateLiquidationData(
         liquidable: false,
     };
 }
+
+export function predictHealthFactor(args: PredictHealthFactorArgs): number {
+    const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.balances, args.prices);
+    const tokenHash = sha256Hash(args.tokenSymbol);
+    
+    const assetConfig = args.assetsConfig.get(tokenHash)!;
+    const assetPrice = Number(args.prices.get(tokenHash)!);
+   
+    let totalLimit = Number(liquidationData.totalLimit);
+    let totalBorrow = Number(liquidationData.totalDebt);
+
+    const currentAmount = args.amount;
+
+    const decimals = Number(assetConfig.decimals)
+
+    const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
+    const changeType = args.balanceChangeType;
+
+    if (currentAmount != null && currentAmount != 0n) { 
+        if (changeType == BalanceChangeType.Borrow) {
+            totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(MASTER_CONSTANTS.ASSET_ORIGINATION_FEE_SCALE));
+        } else if (changeType == BalanceChangeType.Repay) {
+            totalBorrow -= currentBalance;
+        } else if (changeType == BalanceChangeType.Withdraw) {
+            totalLimit -= currentBalance * Number(assetConfig.liquidationThreshold) / Number(MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+        } else if (changeType == BalanceChangeType.Supply) {
+            totalLimit += currentBalance * Number(assetConfig.liquidationThreshold) / Number(MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE);
+        }
+    }
+    if (Number(totalLimit) == 0) {
+        return 1;
+    }
+
+    return Math.min(Math.max(1 - totalBorrow / totalLimit, 0), 1);  // let's limit a result to zero below and one above
+}

package/src/api/parser.ts

@@ -11,7 +11,22 @@ import {
     presentValue,
 } from './math';
 import { loadMaybeMyRef, loadMyRef } from './helpers';
-import { BalanceType, UserBalance, UserData, UserLiteData } from '../types/User';
+import { BalanceType, UserBalance, UserData, UserLiteData, UserRewards } from '../types/User';
+
+// Will be in v6
+/* export function createUserRewards(): DictionaryValue<UserRewards> {
+    return {
+        serialize: (src: any, buidler: any) => {
+            buidler.storeUint(src.trackingIndex, 64);
+            buidler.storeUint(src.trackingAccured, 64);
+    },
+        parse: (src: Slice) => {
+            const trackingIndex = BigInt(src.loadUint(64));
+            const trackingAccured = BigInt(src.loadUint(64));
+            return { trackingIndex, trackingAccured };
+        },
+    };
+}*/
 
 export function createAssetData(): DictionaryValue<AssetData> {
     return {
@@ -22,6 +37,10 @@ export function createAssetData(): DictionaryValue<AssetData> {
             buidler.storeUint(src.totalBorrow, 64);
             buidler.storeUint(src.lastAccural, 32);
             buidler.storeUint(src.balance, 64);
+            /* Will be in v6
+            buidler.storeUint(src.trackingSupplyIndex, 64);
+            buidler.storeUint(src.trackingBorrowIndex, 64);
+            buidler.storeUint(src.lastTrackingAccural, 32); */
         },
         parse: (src: Slice) => {
             const sRate = BigInt(src.loadInt(64));
@@ -30,8 +49,13 @@ export function createAssetData(): DictionaryValue<AssetData> {
             const totalBorrow = BigInt(src.loadInt(64));
             const lastAccural = BigInt(src.loadInt(32));
             const balance = BigInt(src.loadInt(64));
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance };
-        },
+            /* Will be in v6
+            const trackingSupplyIndex = BigInt(src.loadUint(64));
+            const trackingBorrowIndex = BigInt(src.loadUint(64));
+            const lastTrackingAccural = BigInt(src.loadUint(32)); 
+
+            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, lastTrackingAccural};        }, */
+            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance};        },
     };
 }
 
@@ -51,7 +75,14 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             refBuild.storeUint(src.supplyRateSlopeHigh, 64);
             refBuild.storeUint(src.targetUtilization, 64);
             refBuild.storeUint(src.originationFee, 64);
+            refBuild.storeUint(src.dust, 64);
             refBuild.storeUint(src.maxTotalSupply, 64);
+            refBuild.storeUint(src.reserveFactor, 16);
+            refBuild.storeUint(src.liquidationReserveFactor, 16);
+            /* Will be in v6 
+            refBuild.storeUint(src.minPrincipalForRewards, 64);
+            refBuild.storeUint(src.baseTrackingSupplySpeed, 64);
+            refBuild.storeUint(src.baseTrackingBorrowSpeed, 64); */
             builder.storeRef(refBuild.endCell());
         },
         parse: (src: Slice) => {
@@ -70,6 +101,12 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             const originationFee = ref.loadUintBig(64);
             const dust = ref.loadUintBig(64);
             const maxTotalSupply = ref.loadUintBig(64);
+            const reserveFactor = ref.loadUintBig(16);
+            const liquidationReserveFactor = ref.loadUintBig(16);
+            /* Will be in v6 
+            const minPrincipalForRewards = ref.loadUintBig(64);
+            const baseTrackingSupplySpeed = ref.loadUintBig(64);
+            const baseTrackingBorrowSpeed = ref.loadUintBig(64); */
 
             return {
                 oracle,
@@ -86,6 +123,12 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
                 originationFee,
                 dust,
                 maxTotalSupply,
+                reserveFactor,
+                liquidationReserveFactor,
+                /* Will be in v6 
+                minPrincipalForRewards,
+                baseTrackingSupplySpeed,
+                baseTrackingBorrowSpeed */
             };
         },
     };
@@ -162,6 +205,7 @@ export function parseUserLiteData(
     assetsData: Dictionary<bigint, ExtendedAssetData>,
     assetsConfig: Dictionary<bigint, AssetConfig>,
     testnet: boolean = false,
+    applyDust: boolean = false
 ): UserLiteData {
     const ASSETS_ID = testnet ? TESTNET_ASSETS_ID : MAINNET_ASSETS_ID;
     const userSlice = Cell.fromBase64(userDataBOC).beginParse();
@@ -175,6 +219,26 @@ export function parseUserLiteData(
     const trackingBorrowIndex = userSlice.loadUintBig(64);
     const dutchAuctionStart = userSlice.loadUint(32);
     const backupCell = loadMyRef(userSlice);
+    /* Will be in v6 
+    let trackingSupplyIndex = 0n;
+    let trackingBorrowIndex = 0n;
+    let dutchAuctionStart = 0;
+    let backupCell = Cell.EMPTY;
+    let rewards = Dictionary.empty(Dictionary.Keys.BigUint(256), createUserRewards());
+    let backupCell1: Cell | null = null;
+    let backupCell2: Cell | null = null;
+    const bitsLeft = userSlice.remainingBits;
+    if (bitsLeft > 32) {
+        trackingSupplyIndex = userSlice.loadUintBig(64);
+        trackingBorrowIndex = userSlice.loadUintBig(64);
+        dutchAuctionStart = userSlice.loadUint(32);
+        backupCell = loadMyRef(userSlice);
+    } else {
+        rewards = userSlice.loadDict(Dictionary.Keys.BigUint(256), createUserRewards());
+        backupCell1 = userSlice.loadMaybeRef();
+        backupCell2 = userSlice.loadMaybeRef();
+    }
+    */
     userSlice.endParse();
 
     const userBalances = Dictionary.empty<bigint, UserBalance>();
@@ -182,7 +246,13 @@ export function parseUserLiteData(
     for (const [_, assetID] of Object.entries(ASSETS_ID)) {
         const assetData = assetsData.get(assetID) as ExtendedAssetData;
         const assetConfig = assetsConfig.get(assetID) as AssetConfig;
-        const balance = presentValue(assetData.sRate, assetData.bRate, principalsDict.get(assetID) || 0n);
+        let principals = principalsDict.get(assetID) || 0n;
+
+        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust)) {  // abs(principals) < dust
+            principals = 0n;
+            principalsDict.set(assetID, 0n);
+        }
+        const balance = presentValue(assetData.sRate, assetData.bRate, principals);
         userBalances.set(assetID, balance);
     }
 
@@ -198,6 +268,10 @@ export function parseUserLiteData(
         trackingBorrowIndex: trackingBorrowIndex,
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
+        /* Will be in v6 
+        rewards: rewards,
+        backupCell1: backupCell1,
+        backupCell2: backupCell2, */
     };
 }
 
@@ -207,6 +281,7 @@ export function parseUserData(
     assetsConfig: Dictionary<bigint, AssetConfig>,
     prices: Dictionary<bigint, bigint>,
     testnet: boolean = false,
+    applyDust: boolean = false
 ): UserData {
     const ASSETS_ID = testnet ? TESTNET_ASSETS_ID : MAINNET_ASSETS_ID;
     const withdrawalLimits = Dictionary.empty<bigint, bigint>();
@@ -217,7 +292,14 @@ export function parseUserData(
     for (const [_, assetID] of Object.entries(ASSETS_ID)) {
         const assetData = assetsData.get(assetID) as ExtendedAssetData;
         const assetConfig = assetsConfig.get(assetID) as AssetConfig;
-        const balance = presentValue(assetData.sRate, assetData.bRate, userLiteData.principals.get(assetID) || 0n);
+        let principals = userLiteData.principals.get(assetID) || 0n;
+
+        if (applyDust && (principals > -assetConfig.dust && principals < assetConfig.dust )) {  // abs(principals) < dust
+            principals = 0n;
+            userLiteData.principals.set(assetID, 0n);
+        }
+
+        const balance = presentValue(assetData.sRate, assetData.bRate, principals);
         userLiteData.balances.set(assetID, balance);
     }
 
@@ -255,12 +337,11 @@ export function parseUserData(
                     0n,
                 ),
             );
-        } else {
-            borrowLimits.set(
-                assetID,
-                bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(assetID)!, assetData.balance),
-            );
         }
+        borrowLimits.set(
+            assetID,
+            bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(assetID)!, assetData.balance),
+        );
     }
 
     const limitUsed = borrowBalance + availableToBorrow;

package/src/api/prices.ts

@@ -1,70 +1,70 @@
-import { beginCell, Cell, Dictionary } from '@ton/core';
-import { NFT_ID } from '../constants';
-import { PriceData } from '../types/Common';
-
-type NftData = {
-    ledgerIndex: number;
-    pageSize: number;
-    items: string[];
-};
-
-type OutputData = {
-    metadata: {
-        blockId: string;
-        transactionId: string;
-        outputIndex: number;
-        isSpent: boolean;
-        milestoneIndexSpent: number;
-        milestoneTimestampSpent: number;
-        transactionIdSpent: string;
-        milestoneIndexBooked: number;
-        milestoneTimestampBooked: number;
-        ledgerIndex: number;
-    };
-    output: {
-        type: number;
-        amount: string;
-        nftId: string;
-        unlockConditions: {
-            type: number;
-            address: {
-                type: number;
-                pubKeyHash: string;
-            };
-        }[];
-        features: {
-            type: number;
-            data: string;
-        }[];
-    };
-};
-
-export async function getPrices(): Promise<PriceData | undefined> {
-    try {
-        let result = await fetch('https://api.stardust-mainnet.iotaledger.net/api/indexer/v1/outputs/nft/' + NFT_ID, {
-            headers: { accept: 'application/json' },
-        });
-        let outputId = (await result.json()) as NftData;
-
-        result = await fetch('https://api.stardust-mainnet.iotaledger.net/api/core/v2/outputs/' + outputId.items[0], {
-            headers: { accept: 'application/json' },
-        });
-
-        let resData = (await result.json()) as OutputData;
-
-        const data = JSON.parse(
-            decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')),
-        );
-
-        const pricesCell = Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
-        const signature = Buffer.from(data['signature'], 'hex');
-
-        return {
-            dict: pricesCell.beginParse().loadDictDirect(Dictionary.Keys.BigUint(256), Dictionary.Values.BigUint(64)),
-            dataCell: beginCell().storeRef(pricesCell).storeBuffer(signature).endCell(),
-        };
-    } catch (error) {
-        console.error(error);
-        return undefined;
-    }
-}
+import { beginCell, Cell, Dictionary } from '@ton/core';
+import { NFT_ID } from '../constants';
+import { PriceData } from '../types/Common';
+
+type NftData = {
+    ledgerIndex: number;
+    pageSize: number;
+    items: string[];
+};
+
+type OutputData = {
+    metadata: {
+        blockId: string;
+        transactionId: string;
+        outputIndex: number;
+        isSpent: boolean;
+        milestoneIndexSpent: number;
+        milestoneTimestampSpent: number;
+        transactionIdSpent: string;
+        milestoneIndexBooked: number;
+        milestoneTimestampBooked: number;
+        ledgerIndex: number;
+    };
+    output: {
+        type: number;
+        amount: string;
+        nftId: string;
+        unlockConditions: {
+            type: number;
+            address: {
+                type: number;
+                pubKeyHash: string;
+            };
+        }[];
+        features: {
+            type: number;
+            data: string;
+        }[];
+    };
+};
+
+export async function getPrices(endpoint: String = "api.stardust-mainnet.iotaledger.net"): Promise<PriceData | undefined> {
+    try {
+        let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${NFT_ID}`, {
+            headers: { accept: 'application/json' },
+        });
+        let outputId = (await result.json()) as NftData;
+
+        result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
+            headers: { accept: 'application/json' },
+        });
+
+        let resData = (await result.json()) as OutputData;
+
+        const data = JSON.parse(
+            decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')),
+        );
+
+        const pricesCell = Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+        const signature = Buffer.from(data['signature'], 'hex');
+
+        return {
+            dict: pricesCell.beginParse().loadDictDirect(Dictionary.Keys.BigUint(256), Dictionary.Values.BigUint(64)),
+            dataCell: beginCell().storeRef(pricesCell).storeBuffer(signature).endCell(),
+        };
+    } catch (error) {
+        console.error(error);
+        return undefined;
+    }
+}

package/src/constants.ts

@@ -2,9 +2,9 @@ import { Address, Cell, toNano } from '@ton/core';
 import { sha256Hash } from './utils/sha256BigInt';
 
 export const EVAA_MASTER_MAINNET = Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
-export const MAINNET_VERSION = 4;
+export const MAINNET_VERSION = 5;
 export const EVAA_MASTER_TESTNET = Address.parse('kQCj7qf3i2Cbf1GVtZCinla7lIvE7l3MBMsJMTfAja3BdoRP');
-export const TESTNET_VERSION = 4;
+export const TESTNET_VERSION = 5;
 
 export const NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
 
@@ -43,6 +43,9 @@ export const MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
     ASSET_COEFFICIENT_SCALE: 10000n,
     ASSET_PRICE_SCALE: BigInt(1e8),
+    ASSET_RESERVE_FACTOR_SCALE: 10000n,
+    ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: 10000n,
+    ASSET_ORIGINATION_FEE_SCALE: BigInt(1e9)
 };
 
 export const LENDING_CODE = Cell.fromBoc(

package/src/contracts/MasterContract.ts

@@ -59,6 +59,9 @@ export type SupplyBaseParameters = {
     amount: bigint;
     userAddress: Address;
     assetID: bigint;
+    /* Will be in v6 
+    amountToTransfer: bigint;
+    payload: Cell; */
 };
 /**
  * Parameters for the TON supply message
@@ -92,6 +95,9 @@ export type WithdrawParameters = {
     userAddress: Address;
     includeUserCode: boolean;
     priceData: Cell;
+    /* Will be in v6 
+    amountToTransfer: bigint;
+    payload: Cell; */
 };
 
 /**
@@ -184,6 +190,9 @@ export class Evaa implements Contract {
                         .storeUint(OPCODES.SUPPLY, 32)
                         .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                         .storeAddress(parameters.userAddress)
+                        /* Will be in v6 
+                        .storeUint(parameters.amountToTransfer, 64)
+                        .storeRef(parameters.payload) */
                         .endCell(),
                 )
                 .endCell();
@@ -194,6 +203,9 @@ export class Evaa implements Contract {
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.amount, 64)
                 .storeAddress(parameters.userAddress)
+                /* Will be in v6 
+                .storeUint(parameters.amountToTransfer, 64)
+                .storeRef(parameters.payload) */
                 .endCell();
         }
     }
@@ -210,6 +222,9 @@ export class Evaa implements Contract {
             .storeUint(parameters.amount, 64)
             .storeAddress(parameters.userAddress)
             .storeInt(parameters.includeUserCode ? -1 : 0, 2)
+            /* Will be in v6 
+            .storeUint(parameters.amountToTransfer, 64)
+            .storeRef(parameters.payload) */
             .storeRef(parameters.priceData)
             .endCell();
     }

package/src/types/Master.ts

@@ -27,6 +27,12 @@ export type AssetConfig = {
     originationFee: bigint;
     dust: bigint;
     maxTotalSupply: bigint;
+    reserveFactor: bigint;
+    liquidationReserveFactor: bigint;
+    /* Will be in v6 
+    minPrincipalForRewards: bigint;
+    baseTrackingSupplySpeed: bigint;
+    baseTrackingBorrowSpeed: bigint; */
 };
 
 export type MasterConfig = {
@@ -44,6 +50,10 @@ export type AssetData = {
     totalBorrow: bigint;
     lastAccural: bigint;
     balance: bigint;
+    /* Will be in v6 
+    trackingSupplyIndex: bigint;
+    trackingBorrowIndex: bigint;
+    lastTrackingAccural: bigint; */
 };
 
 export type AssetInterest = {

package/src/types/User.ts

@@ -1,66 +1,93 @@
-import { Address, Cell, Dictionary } from '@ton/core';
-
-export enum BalanceType {
-    supply = 'supply',
-    borrow = 'borrow',
-}
-
-export type UserBalance = {
-    amount: bigint;
-    type?: BalanceType;
-};
-
-export type UserLiqudationData = {
-    greatestCollateralValue: bigint;
-    greatestCollateralAsset: bigint;
-    greatestLoanValue: bigint;
-    greatestLoanAsset: bigint;
-    totalDebt: bigint;
-    totalLimit: bigint;
-};
-
-export type LiquidableData = UserLiqudationData & {
-    liquidable: true;
-    liquidationAmount: bigint;
-    minCollateralAmount: bigint;
-};
-
-export type NonLiquidableData = UserLiqudationData & {
-    liquidable: false;
-};
-
-export type LiquidationData = LiquidableData | NonLiquidableData;
-
-export type UserLiteData = {
-    type: 'active';
-    codeVersion: number;
-    masterAddress: Address;
-    ownerAddress: Address;
-    principals: Dictionary<bigint, bigint>;
-    state: number;
-    balances: Dictionary<bigint, UserBalance>;
-    trackingSupplyIndex: bigint;
-    trackingBorrowIndex: bigint;
-    dutchAuctionStart: number;
-    backupCell: Cell;
-};
-
-export type UserDataActive = UserLiteData & {
-    withdrawalLimits: Dictionary<bigint, bigint>;
-    borrowLimits: Dictionary<bigint, bigint>;
-    repayLimits?: Dictionary<bigint, bigint>;
-    supplyBalance: bigint;
-    borrowBalance: bigint;
-    availableToBorrow: bigint;
-    limitUsedPercent: number;
-    limitUsed: bigint;
-    healthFactor: number;
-
-    liquidationData: LiquidationData;
-};
-
-export type UserDataInactive = {
-    type: 'inactive';
-};
-
-export type UserData = UserDataActive | UserDataInactive;
+import { Address, Cell, Dictionary } from '@ton/core';
+import { AssetConfig, ExtendedAssetData } from './Master';
+
+export enum BalanceType {
+    supply = 'supply',
+    borrow = 'borrow',
+}
+
+export type UserBalance = {
+    amount: bigint;
+    type?: BalanceType;
+};
+
+export type UserLiqudationData = {
+    greatestCollateralValue: bigint;
+    greatestCollateralAsset: bigint;
+    greatestLoanValue: bigint;
+    greatestLoanAsset: bigint;
+    totalDebt: bigint;
+    totalLimit: bigint;
+};
+
+export type LiquidableData = UserLiqudationData & {
+    liquidable: true;
+    liquidationAmount: bigint;
+    minCollateralAmount: bigint;
+};
+
+export type NonLiquidableData = UserLiqudationData & {
+    liquidable: false;
+};
+
+export type LiquidationData = LiquidableData | NonLiquidableData;
+
+export type UserLiteData = {
+    type: 'active';
+    codeVersion: number;
+    masterAddress: Address;
+    ownerAddress: Address;
+    principals: Dictionary<bigint, bigint>;
+    state: number;
+    balances: Dictionary<bigint, UserBalance>;
+    trackingSupplyIndex: bigint;
+    trackingBorrowIndex: bigint;
+    dutchAuctionStart: number;
+    backupCell: Cell;
+    /* Will be in v6 
+    rewards: Dictionary<bigint, UserRewards>;
+    backupCell1: Cell | null;
+    backupCell2: Cell | null; */
+};
+
+export type UserDataActive = UserLiteData & {
+    withdrawalLimits: Dictionary<bigint, bigint>;
+    borrowLimits: Dictionary<bigint, bigint>;
+    repayLimits?: Dictionary<bigint, bigint>;
+    supplyBalance: bigint;
+    borrowBalance: bigint;
+    availableToBorrow: bigint;
+    limitUsedPercent: number;
+    limitUsed: bigint;
+    healthFactor: number;
+
+    liquidationData: LiquidationData;
+};
+
+export type UserDataInactive = {
+    type: 'inactive';
+};
+
+export type UserData = UserDataActive | UserDataInactive;
+
+export type UserRewards = {
+    trackingIndex: bigint;
+    trackingAccured: bigint;
+};
+
+export enum BalanceChangeType {
+    Borrow = 0,
+    Repay = 1,
+    Supply = 2,
+    Withdraw = 3
+}
+
+export type PredictHealthFactorArgs = {
+    balanceChangeType: BalanceChangeType;
+    amount: bigint;  // always positive
+    tokenSymbol: string;
+    balances: Dictionary<bigint, bigint>;
+    prices: Dictionary<bigint, bigint>;
+    assetsData: Dictionary<bigint, ExtendedAssetData>;
+    assetsConfig: Dictionary<bigint, AssetConfig>;
+};

package/src/utils/tonConnectSender.ts

@@ -1,37 +1,37 @@
-import { ITonConnect, SendTransactionResponse } from '@tonconnect/sdk';
-import { Address, beginCell, Sender, SenderArguments, storeStateInit } from '@ton/core';
-
-/*
-This is not the best solution to get the BOC of the sent external message, however the Sender
-interface does not support returning any value from send(), so at the moment you can get it from
-this global variable.
- */
-let lastSentBoc: SendTransactionResponse | undefined;
-
-export function getLastSentBoc() {
-    return lastSentBoc;
-}
-
-export function getTonConnectSender(connector: ITonConnect): Sender {
-    return {
-        get address(): Address | undefined {
-            return connector.account ? Address.parse(connector.account.address) : undefined;
-        },
-
-        async send(args: SenderArguments): Promise<void> {
-            lastSentBoc = await connector.sendTransaction({
-                validUntil: Date.now() + 2 * 60 * 1000, // 1 minutes
-                messages: [
-                    {
-                        address: args.to.toString(),
-                        amount: args.value.toString(),
-                        payload: args.body?.toBoc().toString('base64'),
-                        stateInit: args.init
-                            ? beginCell().store(storeStateInit(args.init)).endCell().toBoc().toString('base64')
-                            : undefined,
-                    },
-                ],
-            });
-        },
-    };
-}
+import { ITonConnect, SendTransactionResponse } from '@tonconnect/sdk';
+import { Address, beginCell, Sender, SenderArguments, storeStateInit } from '@ton/core';
+
+/*
+This is not the best solution to get the BOC of the sent external message, however the Sender
+interface does not support returning any value from send(), so at the moment you can get it from
+this global variable.
+ */
+let lastSentBoc: SendTransactionResponse | undefined;
+
+export function getLastSentBoc() {
+    return lastSentBoc;
+}
+
+export function getTonConnectSender(connector: ITonConnect): Sender {
+    return {
+        get address(): Address | undefined {
+            return connector.account ? Address.parse(connector.account.address) : undefined;
+        },
+
+        async send(args: SenderArguments): Promise<void> {
+            lastSentBoc = await connector.sendTransaction({
+                validUntil: Date.now() + 2 * 60 * 1000, // 1 minutes
+                messages: [
+                    {
+                        address: args.to.toString(),
+                        amount: args.value.toString(),
+                        payload: args.body?.toBoc().toString('base64'),
+                        stateInit: args.init
+                            ? beginCell().store(storeStateInit(args.init)).endCell().toBoc().toString('base64')
+                            : undefined,
+                    },
+                ],
+            });
+        },
+    };
+}