@evaafi/sdk 0.3.0 → 0.3.2

package/dist/api/math.js

@@ -48,7 +48,7 @@ function calculateCurrentRates(assetConfig, assetData) {
 }
 exports.calculateCurrentRates = calculateCurrentRates;
 function calculateAssetData(assetsConfigDict, assetsDataDict, assetId) {
-    const config = assetsConfigDict.get(assetId); // maybe it's a huge mistake could be
+    const config = assetsConfigDict.get(assetId);
     const data = assetsDataDict.get(assetId);
     if (!data || !config) {
         throw new Error('Asset Data or Config is not accessible');

package/dist/api/parser.js

@@ -50,16 +50,17 @@ function createAssetConfig() {
             const oracle = src.loadUintBig(256);
             const decimals = BigInt(src.loadUint(8));
             const ref = src.loadRef().beginParse();
-            const collateralFactor = BigInt(ref.loadUint(16));
-            const liquidationThreshold = BigInt(ref.loadUint(16));
-            const liquidationBonus = BigInt(ref.loadUint(16));
-            const baseBorrowRate = BigInt(ref.loadUint(64));
-            const borrowRateSlopeLow = BigInt(ref.loadUint(64));
-            const borrowRateSlopeHigh = BigInt(ref.loadUint(64));
-            const supplyRateSlopeLow = BigInt(ref.loadUint(64));
-            const supplyRateSlopeHigh = BigInt(ref.loadUint(64));
-            const targetUtilization = BigInt(ref.loadUint(64));
-            const originationFee = BigInt(ref.loadUint(64));
+            const collateralFactor = ref.loadUintBig(16);
+            const liquidationThreshold = ref.loadUintBig(16);
+            const liquidationBonus = ref.loadUintBig(16);
+            const baseBorrowRate = ref.loadUintBig(64);
+            const borrowRateSlopeLow = ref.loadUintBig(64);
+            const borrowRateSlopeHigh = ref.loadUintBig(64);
+            const supplyRateSlopeLow = ref.loadUintBig(64);
+            const supplyRateSlopeHigh = ref.loadUintBig(64);
+            const targetUtilization = ref.loadUintBig(64);
+            const originationFee = ref.loadUintBig(64);
+            const dust = ref.loadUintBig(64);
             return {
                 oracle,
                 decimals,
@@ -73,6 +74,7 @@ function createAssetConfig() {
                 supplyRateSlopeHigh,
                 targetUtilization,
                 originationFee,
+                dust,
             };
         },
     };
@@ -110,7 +112,7 @@ function parseMasterData(masterDataBOC) {
     const masterConfig = {
         ifActive: masterConfigSlice.loadInt(8),
         admin: masterConfigSlice.loadAddress(),
-        adminPK: masterConfigSlice.loadBuffer(64),
+        adminPK: masterConfigSlice.loadUintBig(256),
         tokenKeys: (0, helpers_1.loadMaybeMyRef)(masterConfigSlice),
         walletToMaster: (0, helpers_1.loadMaybeMyRef)(masterConfigSlice),
     };

package/dist/api/prices.d.ts

@@ -1,9 +1,2 @@
 import { PriceData } from '../types/Common';
-type SerializedPrice = {
-    symbol: string;
-    value: number;
-    timestamp: number;
-};
-export declare function getLiteDataBytesString(priceData: SerializedPrice): string;
 export declare function getPrices(): Promise<PriceData | undefined>;
-export {};

package/dist/api/prices.js

@@ -1,99 +1,24 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPrices = exports.getLiteDataBytesString = void 0;
+exports.getPrices = void 0;
 const core_1 = require("@ton/core");
-const ethers_1 = require("ethers");
 const constants_1 = require("../constants");
-function hexToArrayBuffer(input) {
-    if (typeof input !== 'string') {
-        throw new TypeError('Expected input to be a string');
-    }
-    if (input.length % 2 !== 0) {
-        throw new RangeError('Expected string to be an even number of characters');
-    }
-    if (input.startsWith('0x')) {
-        input = input.slice(2);
-    }
-    const view = new Uint8Array(input.length / 2);
-    for (let i = 0; i < input.length; i += 2) {
-        view[i / 2] = parseInt(input.substring(i, i + 2), 16);
-    }
-    return Buffer.from(view.buffer);
-}
-function convertStringToBytes32String(str) {
-    if (str.length > 31) {
-        const bytes32StringLength = 32 * 2 + 2; // 32 bytes (each byte uses 2 symbols) + 0x
-        if (str.length === bytes32StringLength && str.startsWith('0x')) {
-            return str;
-        }
-        else {
-            return ethers_1.ethers.utils.id(str);
-        }
-    }
-    else {
-        return ethers_1.ethers.utils.formatBytes32String(str);
-    }
-}
-function getLiteDataBytesString(priceData) {
-    let data = priceData.symbol.substr(2) + priceData.value.toString(16).padStart(64, '0');
-    data += Math.ceil(priceData.timestamp / 1000)
-        .toString(16)
-        .padStart(64, '0');
-    return data;
-}
-exports.getLiteDataBytesString = getLiteDataBytesString;
-async function getPrice(symbol) {
-    const res = await fetch(`https://api.redstone.finance/prices?symbol=${symbol}&provider=redstone&limit=1`);
-    const data = (await res.json());
-    const price = data[0];
-    const message = {
-        symbol: convertStringToBytes32String(price.symbol),
-        value: Math.round(price.value * 10 ** 8),
-        timestamp: price.timestamp,
-    };
-    let dictKey;
-    const dictValue = BigInt(message.value) * 10n;
-    switch (message.symbol) {
-        case '0x544f4e0000000000000000000000000000000000000000000000000000000000':
-            dictKey = constants_1.ASSET_ID.TON;
-            break;
-        case '0x5553445400000000000000000000000000000000000000000000000000000000':
-            dictKey = constants_1.ASSET_ID.jUSDT;
-            break;
-        case '0x5553444300000000000000000000000000000000000000000000000000000000':
-            dictKey = constants_1.ASSET_ID.jUSDC;
-            break;
-        default:
-            throw new Error('Unknown symbol');
-    }
-    const signature = hexToArrayBuffer(price.liteEvmSignature);
-    return {
-        data: Buffer.from(getLiteDataBytesString(message), 'hex'),
-        signature: signature,
-        dictKey: dictKey,
-        dictValue: dictValue,
-    };
-}
 async function getPrices() {
     try {
-        const symbols = ['TON', 'USDT', 'USDC'];
-        const rawPriceData = [];
-        const priceDict = core_1.Dictionary.empty(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(64));
-        const pricePromises = symbols.map(async (symbol) => {
-            const price = await getPrice(symbol);
-            priceDict.set(price.dictKey, price.dictValue);
-            rawPriceData.push(price);
+        let result = await fetch('https://api.stardust-mainnet.iotaledger.net/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], {
+            headers: { accept: 'application/json' },
         });
-        await Promise.all(pricePromises);
-        const rawPricesDict = core_1.Dictionary.empty();
-        for (const data of rawPriceData) {
-            rawPricesDict.set(data.signature, (0, core_1.beginCell)().storeBuffer(data.data).endCell());
-        }
+        let resData = (await result.json());
+        const data = JSON.parse(decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
+        const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+        const signature = Buffer.from(data['signature'], 'hex');
         return {
-            dict: priceDict,
-            dataCell: (0, core_1.beginCell)()
-                .storeDictDirect(rawPricesDict, core_1.Dictionary.Keys.Buffer(65), core_1.Dictionary.Values.Cell())
-                .endCell(),
+            dict: pricesCell.beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(64)),
+            dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
         };
     }
     catch (error) {

package/dist/constants.d.ts

@@ -1,18 +1,28 @@
 import { Address, Cell } from '@ton/core';
 export declare const EVAA_MASTER_MAINNET: Address;
-export declare const MAINNET_VERSION = 2;
+export declare const MAINNET_VERSION = 3;
 export declare const EVAA_MASTER_TESTNET: Address;
-export declare const TESTNET_VERSION = 1;
+export declare const TESTNET_VERSION = 3;
+export declare const NFT_ID = "0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5";
 export declare const ASSET_ID: {
     TON: bigint;
     jUSDT: bigint;
     jUSDC: bigint;
+    stTON: bigint;
+    tsTON: bigint;
+    USDT: bigint;
 };
 export declare const JETTON_MASTER_ADDRESSES: {
     jUSDT_MAINNET: Address;
     jUSDT_TESTNET: Address;
     jUSDC_MAINNET: Address;
     jUSDC_TESTNET: Address;
+    stTON_MAINNET: Address;
+    stTON_TESTNET: Address;
+    tsTON_MAINNET: Address;
+    tsTON_TESTNET: null;
+    USDT_MAINNET: Address;
+    USDT_TESTNET: null;
 };
 export declare const MASTER_CONSTANTS: {
     FACTOR_SCALE: bigint;

package/dist/constants.js

@@ -1,22 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FEES = exports.OPCODES = exports.JETTON_WALLET_CODE = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.ASSET_ID = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = void 0;
+exports.FEES = exports.OPCODES = exports.JETTON_WALLET_CODE = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.ASSET_ID = exports.NFT_ID = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = void 0;
 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 = 2;
-exports.EVAA_MASTER_TESTNET = core_1.Address.parse('kQBi2jDaq_-Oi62V7u_j_Vr1We8EqC3h0jkhB4Gf4JW741vX');
-exports.TESTNET_VERSION = 1;
+exports.MAINNET_VERSION = 3;
+exports.EVAA_MASTER_TESTNET = core_1.Address.parse('kQClWdMebpK90b6imEUreQJ4M3oz8Gqwd3xkVIowR8LDX98-');
+exports.TESTNET_VERSION = 3;
+exports.NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
 exports.ASSET_ID = {
     TON: (0, sha256BigInt_1.sha256Hash)('TON'),
     jUSDT: (0, sha256BigInt_1.sha256Hash)('jUSDT'),
     jUSDC: (0, sha256BigInt_1.sha256Hash)('jUSDC'),
+    stTON: (0, sha256BigInt_1.sha256Hash)('stTON'),
+    tsTON: (0, sha256BigInt_1.sha256Hash)('tsTON'),
+    USDT: (0, sha256BigInt_1.sha256Hash)('USDT'),
 };
 exports.JETTON_MASTER_ADDRESSES = {
     jUSDT_MAINNET: core_1.Address.parse('EQBwbF0otxLyA3VrRjjC1q7i3G7LtoEpdyBjZEuNtrhC4drm'),
-    jUSDT_TESTNET: core_1.Address.parse('kQAGvWIETv29VRXLBL3lugxdLeCZ3r7jcuUvqKeZpbcwiQo0'),
+    jUSDT_TESTNET: core_1.Address.parse('kQBtFVedUkg9Q7M5eMx_gxAdP5R7QCLR-3RCYQNrm_DZYr6Z'),
     jUSDC_MAINNET: core_1.Address.parse('EQCEHZi-CLX2ghdsNbY35umR1OFODG5ySHrtK6GItMdWv7dS'),
-    jUSDC_TESTNET: core_1.Address.parse('kQCwj7zrRnBIYUhM7BShqupouNgubrdJUmmA3AAuPH9CK0Kj'),
+    jUSDC_TESTNET: core_1.Address.parse('kQCZWZD_rBZ1vrqF22aX4AZrU1a1q-YKZH_R2VlALoVNCvXd'),
+    stTON_MAINNET: core_1.Address.parse('EQBOn-1b-315ogeCl5lfPYW0ut6sjA2eq4LTdRv5vJJ1SsxX'),
+    stTON_TESTNET: core_1.Address.parse('kQCpm8ixF6STW7aidxn_Qkp4sR73msPlrduCeRZfo-Zu7dxt'),
+    tsTON_MAINNET: core_1.Address.parse('EQCRC0telhv1QESvTx24nNqUWB72zCysXQ0Bx97lVzucQ3Gr'),
+    tsTON_TESTNET: null,
+    USDT_MAINNET: core_1.Address.parse('EQD_kMQkK-A9-CQu3CdOnQUDZ2_8bY8Zrh1PvtE3hZpxvdRH'),
+    USDT_TESTNET: null,
 };
 exports.MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),

package/dist/types/Master.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
 export type UpgradeConfig = {
     masterCodeVersion: number;
@@ -24,11 +23,12 @@ export type AssetConfig = {
     supplyRateSlopeHigh: bigint;
     targetUtilization: bigint;
     originationFee: bigint;
+    dust: bigint;
 };
 export type MasterConfig = {
     ifActive: number;
     admin: Address;
-    adminPK: Buffer;
+    adminPK: bigint;
     tokenKeys: Cell | null;
     walletToMaster: Cell | null;
 };

package/dist/utils/userJettonWallet.js

@@ -22,6 +22,30 @@ function getUserJettonWallet(ownerAddress, assetID, network) {
                 builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.jUSDC_TESTNET);
             }
             break;
+        case constants_1.ASSET_ID.stTON:
+            if (network === 'mainnet') {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.stTON_MAINNET);
+            }
+            else {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.stTON_TESTNET);
+            }
+            break;
+        case constants_1.ASSET_ID.tsTON:
+            if (network === 'mainnet') {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.tsTON_MAINNET);
+            }
+            else {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.tsTON_TESTNET);
+            }
+            break;
+        case constants_1.ASSET_ID.USDT:
+            if (network === 'mainnet') {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.USDT_MAINNET);
+            }
+            else {
+                builder.storeAddress(constants_1.JETTON_MASTER_ADDRESSES.USDT_TESTNET);
+            }
+            break;
         default:
             throw new Error('Unsupported asset');
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "description": "SDK for EVAA contracts",
   "main": "dist/index.js",
   "files": [

package/src/api/math.ts

@@ -1,252 +1,252 @@
-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';
-
-export function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint {
-    return (a * b) / decimal;
-}
-
-export function mulDiv(x: bigint, y: bigint, z: bigint): bigint {
-    return (x * y) / z;
-}
-
-export function bigIntMax(...args: bigint[]): bigint {
-    return args.reduce((m, e) => (e > m ? e : m));
-}
-export function bigIntMin(...args: bigint[]): bigint {
-    return args.reduce((m, e) => (e < m ? e : m));
-}
-
-export function calculatePresentValue(index: bigint, principalValue: bigint): bigint {
-    return (principalValue * index) / MASTER_CONSTANTS.FACTOR_SCALE;
-}
-
-export function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData) {
-    const now = BigInt(Math.floor(Date.now() / 1000));
-    const timeElapsed = now - assetData.lastAccural;
-    const { supplyInterest, borrowInterest } = calculateAssetInterest(assetConfig, assetData);
-
-    if (timeElapsed > 0) {
-        const updatedSRate =
-            assetData.sRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.sRate, supplyInterest * timeElapsed);
-        const updatedBRate =
-            assetData.bRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.bRate, borrowInterest * timeElapsed);
-        return {
-            sRate: updatedSRate,
-            bRate: updatedBRate,
-            supplyInterest,
-            borrowInterest,
-            now,
-        };
-    }
-
-    return {
-        sRate: assetData.sRate,
-        bRate: assetData.bRate,
-        supplyInterest,
-        borrowInterest,
-        now,
-    };
-}
-
-export function calculateAssetData(
-    assetsConfigDict: Dictionary<bigint, AssetConfig>,
-    assetsDataDict: Dictionary<bigint, AssetData>,
-    assetId: bigint,
-): ExtendedAssetData {
-    const config = assetsConfigDict.get(assetId); // maybe it's a huge mistake could be
-    const data = assetsDataDict.get(assetId);
-
-    if (!data || !config) {
-        throw new Error('Asset Data or Config is not accessible');
-    }
-
-    const { sRate, bRate, supplyInterest, borrowInterest, now } = calculateCurrentRates(config, data);
-    data.sRate = sRate || 0n;
-    data.bRate = bRate || 0n;
-    data.lastAccural = now;
-
-    const supplyApy = (1 + (Number(supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1;
-    const borrowApy = (1 + (Number(borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1;
-
-    return {
-        ...data,
-        ...{ supplyInterest, borrowInterest },
-        ...{ supplyApy, borrowApy },
-    };
-}
-
-export function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData): AssetInterest {
-    const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply);
-    const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow);
-    let utilization = 0n;
-    let supplyInterest = 0n;
-    let borrowInterest = 0n;
-
-    if (totalSupply !== 0n) {
-        utilization = (totalBorrow * MASTER_CONSTANTS.FACTOR_SCALE) / totalSupply;
-    }
-
-    if (utilization <= assetConfig.targetUtilization) {
-        borrowInterest =
-            assetConfig.baseBorrowRate +
-            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, utilization);
-    } else {
-        borrowInterest =
-            assetConfig.baseBorrowRate +
-            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, assetConfig.targetUtilization) +
-            mulFactor(
-                MASTER_CONSTANTS.FACTOR_SCALE,
-                assetConfig.borrowRateSlopeHigh,
-                utilization - assetConfig.targetUtilization,
-            );
-    }
-
-    const reserveFactor = 10n;
-    const reserveScale = 100n;
-    supplyInterest = mulDiv(
-        mulDiv(borrowInterest, utilization, MASTER_CONSTANTS.FACTOR_SCALE),
-        reserveScale - reserveFactor,
-        reserveScale,
-    );
-
-    return {
-        supplyInterest,
-        borrowInterest,
-    };
-}
-
-export function getAvailableToBorrow(
-    assetsConfig: Dictionary<bigint, AssetConfig>,
-    assetsData: Dictionary<bigint, ExtendedAssetData>,
-    principals: Dictionary<bigint, bigint>,
-    prices: Dictionary<bigint, bigint>,
-): bigint {
-    let borrowLimit = 0n;
-    let borrowAmount = 0n;
-
-    for (const assetID of principals.keys()) {
-        const assetConfig = assetsConfig.get(assetID) as AssetConfig;
-        const assetData = assetsData.get(assetID) as ExtendedAssetData;
-        const price = prices.get(assetID) as bigint;
-        const principal = principals.get(assetID) as bigint;
-
-        if (principal < 0) {
-            borrowAmount += (calculatePresentValue(assetData.bRate, -principal) * price) / 10n ** assetConfig.decimals;
-        } else if (principal > 0) {
-            borrowLimit +=
-                (calculatePresentValue(assetData.sRate, principal) * price * assetConfig.collateralFactor) /
-                10n ** assetConfig.decimals /
-                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
-        }
-    }
-
-    return borrowLimit - borrowAmount;
-}
-
-export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint): UserBalance {
-    if (principalValue > 0) {
-        return {
-            amount: calculatePresentValue(sRate, principalValue),
-            type: BalanceType.supply,
-        };
-    } else if (principalValue < 0) {
-        return {
-            amount: calculatePresentValue(bRate, -principalValue),
-            type: BalanceType.borrow,
-        };
-    } else {
-        return {
-            amount: 0n,
-            type: undefined,
-        };
-    }
-}
-
-export function calculateLiquidationData(
-    assetsConfig: Dictionary<bigint, AssetConfig>,
-    assetsData: Dictionary<bigint, ExtendedAssetData>,
-    principals: Dictionary<bigint, bigint>,
-    prices: Dictionary<bigint, bigint>,
-): LiquidationData {
-    let gCollateralValue = 0n;
-    let gCollateralAsset = 0n;
-    let gLoanValue = 0n;
-    let gLoanAsset = 0n;
-    let totalDebt = 0n;
-    let totalLimit = 0n;
-
-    for (const key of principals.keys()) {
-        const principal = principals.get(key)!;
-        const assetConfig = assetsConfig.get(key)!;
-        const assetData = assetsData.get(key)!;
-        const balance =
-            principal > 0 ? (principal * assetData.sRate) / BigInt(1e12) : (principal * assetData.bRate) / BigInt(1e12);
-        if (balance > 0) {
-            const assetWorth = (balance * prices.get(key)!) / 10n ** assetConfig.decimals;
-            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
-            if (assetWorth > gCollateralValue) {
-                gCollateralValue = assetWorth;
-                gCollateralAsset = key;
-            }
-        } else if (balance < 0) {
-            const assetWorth = (-balance * prices.get(key)!) / 10n ** assetConfig.decimals;
-            totalDebt += assetWorth;
-            if (assetWorth > gLoanValue) {
-                gLoanValue = assetWorth;
-                gLoanAsset = key;
-            }
-        }
-    }
-
-    if (totalLimit < totalDebt) {
-        const gLoanAssetPrice = prices.get(gLoanAsset)!;
-        const values: bigint[] = [];
-        const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset)!;
-        const gLoanAssetConfig = assetsConfig.get(gLoanAsset)!;
-        const liquidationBonus = gLoanAssetConfig.liquidationBonus;
-        const loanDecimal = 10n ** gLoanAssetConfig.decimals;
-        values.push(
-            (bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10_000_000_000n)) *
-                loanDecimal *
-                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE) /
-                liquidationBonus /
-                gLoanAssetPrice,
-        );
-        values.push((gLoanValue * loanDecimal) / gLoanAssetPrice);
-
-        const liquidationAmount = (bigIntMin(...values) as bigint) - 5n;
-        const gCollateralAssetPrice: bigint = prices.get(gCollateralAsset)!;
-        const collateralDecimal = 10n ** gCollateralAssetConfig.decimals;
-        let minCollateralAmount =
-            (((liquidationAmount * gLoanAssetPrice * liquidationBonus) / 10000n) * collateralDecimal) /
-                gCollateralAssetPrice /
-                loanDecimal -
-            10n;
-        minCollateralAmount = (minCollateralAmount * 97n) / 100n;
-        if (minCollateralAmount / collateralDecimal >= 1n) {
-            return {
-                greatestCollateralAsset: gCollateralAsset,
-                greatestCollateralValue: gCollateralValue,
-                greatestLoanAsset: gLoanAsset,
-                greatestLoanValue: gLoanValue,
-                totalDebt,
-                totalLimit,
-                liquidable: true,
-                liquidationAmount,
-                minCollateralAmount,
-            };
-        }
-    }
-
-    return {
-        greatestCollateralAsset: gCollateralAsset,
-        greatestCollateralValue: gCollateralValue,
-        greatestLoanAsset: gLoanAsset,
-        greatestLoanValue: gLoanValue,
-        totalDebt,
-        totalLimit,
-        liquidable: false,
-    };
-}
+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';
+
+export function mulFactor(decimal: bigint, a: bigint, b: bigint): bigint {
+    return (a * b) / decimal;
+}
+
+export function mulDiv(x: bigint, y: bigint, z: bigint): bigint {
+    return (x * y) / z;
+}
+
+export function bigIntMax(...args: bigint[]): bigint {
+    return args.reduce((m, e) => (e > m ? e : m));
+}
+export function bigIntMin(...args: bigint[]): bigint {
+    return args.reduce((m, e) => (e < m ? e : m));
+}
+
+export function calculatePresentValue(index: bigint, principalValue: bigint): bigint {
+    return (principalValue * index) / MASTER_CONSTANTS.FACTOR_SCALE;
+}
+
+export function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData) {
+    const now = BigInt(Math.floor(Date.now() / 1000));
+    const timeElapsed = now - assetData.lastAccural;
+    const { supplyInterest, borrowInterest } = calculateAssetInterest(assetConfig, assetData);
+
+    if (timeElapsed > 0) {
+        const updatedSRate =
+            assetData.sRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.sRate, supplyInterest * timeElapsed);
+        const updatedBRate =
+            assetData.bRate + mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetData.bRate, borrowInterest * timeElapsed);
+        return {
+            sRate: updatedSRate,
+            bRate: updatedBRate,
+            supplyInterest,
+            borrowInterest,
+            now,
+        };
+    }
+
+    return {
+        sRate: assetData.sRate,
+        bRate: assetData.bRate,
+        supplyInterest,
+        borrowInterest,
+        now,
+    };
+}
+
+export function calculateAssetData(
+    assetsConfigDict: Dictionary<bigint, AssetConfig>,
+    assetsDataDict: Dictionary<bigint, AssetData>,
+    assetId: bigint,
+): ExtendedAssetData {
+    const config = assetsConfigDict.get(assetId);
+    const data = assetsDataDict.get(assetId);
+
+    if (!data || !config) {
+        throw new Error('Asset Data or Config is not accessible');
+    }
+
+    const { sRate, bRate, supplyInterest, borrowInterest, now } = calculateCurrentRates(config, data);
+    data.sRate = sRate || 0n;
+    data.bRate = bRate || 0n;
+    data.lastAccural = now;
+
+    const supplyApy = (1 + (Number(supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1;
+    const borrowApy = (1 + (Number(borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1;
+
+    return {
+        ...data,
+        ...{ supplyInterest, borrowInterest },
+        ...{ supplyApy, borrowApy },
+    };
+}
+
+export function calculateAssetInterest(assetConfig: AssetConfig, assetData: AssetData): AssetInterest {
+    const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply);
+    const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow);
+    let utilization = 0n;
+    let supplyInterest = 0n;
+    let borrowInterest = 0n;
+
+    if (totalSupply !== 0n) {
+        utilization = (totalBorrow * MASTER_CONSTANTS.FACTOR_SCALE) / totalSupply;
+    }
+
+    if (utilization <= assetConfig.targetUtilization) {
+        borrowInterest =
+            assetConfig.baseBorrowRate +
+            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, utilization);
+    } else {
+        borrowInterest =
+            assetConfig.baseBorrowRate +
+            mulFactor(MASTER_CONSTANTS.FACTOR_SCALE, assetConfig.borrowRateSlopeLow, assetConfig.targetUtilization) +
+            mulFactor(
+                MASTER_CONSTANTS.FACTOR_SCALE,
+                assetConfig.borrowRateSlopeHigh,
+                utilization - assetConfig.targetUtilization,
+            );
+    }
+
+    const reserveFactor = 10n;
+    const reserveScale = 100n;
+    supplyInterest = mulDiv(
+        mulDiv(borrowInterest, utilization, MASTER_CONSTANTS.FACTOR_SCALE),
+        reserveScale - reserveFactor,
+        reserveScale,
+    );
+
+    return {
+        supplyInterest,
+        borrowInterest,
+    };
+}
+
+export function getAvailableToBorrow(
+    assetsConfig: Dictionary<bigint, AssetConfig>,
+    assetsData: Dictionary<bigint, ExtendedAssetData>,
+    principals: Dictionary<bigint, bigint>,
+    prices: Dictionary<bigint, bigint>,
+): bigint {
+    let borrowLimit = 0n;
+    let borrowAmount = 0n;
+
+    for (const assetID of principals.keys()) {
+        const assetConfig = assetsConfig.get(assetID) as AssetConfig;
+        const assetData = assetsData.get(assetID) as ExtendedAssetData;
+        const price = prices.get(assetID) as bigint;
+        const principal = principals.get(assetID) as bigint;
+
+        if (principal < 0) {
+            borrowAmount += (calculatePresentValue(assetData.bRate, -principal) * price) / 10n ** assetConfig.decimals;
+        } else if (principal > 0) {
+            borrowLimit +=
+                (calculatePresentValue(assetData.sRate, principal) * price * assetConfig.collateralFactor) /
+                10n ** assetConfig.decimals /
+                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
+        }
+    }
+
+    return borrowLimit - borrowAmount;
+}
+
+export function presentValue(sRate: bigint, bRate: bigint, principalValue: bigint): UserBalance {
+    if (principalValue > 0) {
+        return {
+            amount: calculatePresentValue(sRate, principalValue),
+            type: BalanceType.supply,
+        };
+    } else if (principalValue < 0) {
+        return {
+            amount: calculatePresentValue(bRate, -principalValue),
+            type: BalanceType.borrow,
+        };
+    } else {
+        return {
+            amount: 0n,
+            type: undefined,
+        };
+    }
+}
+
+export function calculateLiquidationData(
+    assetsConfig: Dictionary<bigint, AssetConfig>,
+    assetsData: Dictionary<bigint, ExtendedAssetData>,
+    principals: Dictionary<bigint, bigint>,
+    prices: Dictionary<bigint, bigint>,
+): LiquidationData {
+    let gCollateralValue = 0n;
+    let gCollateralAsset = 0n;
+    let gLoanValue = 0n;
+    let gLoanAsset = 0n;
+    let totalDebt = 0n;
+    let totalLimit = 0n;
+
+    for (const key of principals.keys()) {
+        const principal = principals.get(key)!;
+        const assetConfig = assetsConfig.get(key)!;
+        const assetData = assetsData.get(key)!;
+        const balance =
+            principal > 0 ? (principal * assetData.sRate) / BigInt(1e12) : (principal * assetData.bRate) / BigInt(1e12);
+        if (balance > 0) {
+            const assetWorth = (balance * prices.get(key)!) / 10n ** assetConfig.decimals;
+            totalLimit += (assetWorth * assetConfig.liquidationThreshold) / MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE;
+            if (assetWorth > gCollateralValue) {
+                gCollateralValue = assetWorth;
+                gCollateralAsset = key;
+            }
+        } else if (balance < 0) {
+            const assetWorth = (-balance * prices.get(key)!) / 10n ** assetConfig.decimals;
+            totalDebt += assetWorth;
+            if (assetWorth > gLoanValue) {
+                gLoanValue = assetWorth;
+                gLoanAsset = key;
+            }
+        }
+    }
+
+    if (totalLimit < totalDebt) {
+        const gLoanAssetPrice = prices.get(gLoanAsset)!;
+        const values: bigint[] = [];
+        const gCollateralAssetConfig = assetsConfig.get(gCollateralAsset)!;
+        const gLoanAssetConfig = assetsConfig.get(gLoanAsset)!;
+        const liquidationBonus = gLoanAssetConfig.liquidationBonus;
+        const loanDecimal = 10n ** gLoanAssetConfig.decimals;
+        values.push(
+            (bigIntMax(gCollateralValue / 2n, bigIntMin(gCollateralValue, 10_000_000_000n)) *
+                loanDecimal *
+                MASTER_CONSTANTS.ASSET_COEFFICIENT_SCALE) /
+                liquidationBonus /
+                gLoanAssetPrice,
+        );
+        values.push((gLoanValue * loanDecimal) / gLoanAssetPrice);
+
+        const liquidationAmount = (bigIntMin(...values) as bigint) - 5n;
+        const gCollateralAssetPrice: bigint = prices.get(gCollateralAsset)!;
+        const collateralDecimal = 10n ** gCollateralAssetConfig.decimals;
+        let minCollateralAmount =
+            (((liquidationAmount * gLoanAssetPrice * liquidationBonus) / 10000n) * collateralDecimal) /
+                gCollateralAssetPrice /
+                loanDecimal -
+            10n;
+        minCollateralAmount = (minCollateralAmount * 97n) / 100n;
+        if (minCollateralAmount / collateralDecimal >= 1n) {
+            return {
+                greatestCollateralAsset: gCollateralAsset,
+                greatestCollateralValue: gCollateralValue,
+                greatestLoanAsset: gLoanAsset,
+                greatestLoanValue: gLoanValue,
+                totalDebt,
+                totalLimit,
+                liquidable: true,
+                liquidationAmount,
+                minCollateralAmount,
+            };
+        }
+    }
+
+    return {
+        greatestCollateralAsset: gCollateralAsset,
+        greatestCollateralValue: gCollateralValue,
+        greatestLoanAsset: gLoanAsset,
+        greatestLoanValue: gLoanValue,
+        totalDebt,
+        totalLimit,
+        liquidable: false,
+    };
+}

package/src/constants.ts

@@ -1,58 +1,64 @@
-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 = 3;
-export const EVAA_MASTER_TESTNET = Address.parse('kQClWdMebpK90b6imEUreQJ4M3oz8Gqwd3xkVIowR8LDX98-');
-export const TESTNET_VERSION = 3;
-
-export const NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
-
-export const ASSET_ID = {
-    TON: sha256Hash('TON'),
-    jUSDT: sha256Hash('jUSDT'),
-    jUSDC: sha256Hash('jUSDC'),
-    stTON: sha256Hash('stTON'),
-};
-
-export const JETTON_MASTER_ADDRESSES = {
-    jUSDT_MAINNET: Address.parse('EQBwbF0otxLyA3VrRjjC1q7i3G7LtoEpdyBjZEuNtrhC4drm'),
-    jUSDT_TESTNET: Address.parse('kQBtFVedUkg9Q7M5eMx_gxAdP5R7QCLR-3RCYQNrm_DZYr6Z'),
-    jUSDC_MAINNET: Address.parse('EQCEHZi-CLX2ghdsNbY35umR1OFODG5ySHrtK6GItMdWv7dS'),
-    jUSDC_TESTNET: Address.parse('kQCZWZD_rBZ1vrqF22aX4AZrU1a1q-YKZH_R2VlALoVNCvXd'),
-    stTON_MAINNET: Address.parse('EQBOn-1b-315ogeCl5lfPYW0ut6sjA2eq4LTdRv5vJJ1SsxX'),
-    stTON_TESTNET: Address.parse('kQCpm8ixF6STW7aidxn_Qkp4sR73msPlrduCeRZfo-Zu7dxt'),
-};
-
-export const MASTER_CONSTANTS = {
-    FACTOR_SCALE: BigInt(1e12),
-    ASSET_COEFFICIENT_SCALE: 10000n,
-    ASSET_PRICE_SCALE: BigInt(1e8),
-};
-
-export const LENDING_CODE = Cell.fromBoc(
-    Buffer.from(
-        'b5ee9c72c1010e0100fd000d12182a555a6065717691969efd0114ff00f4a413f4bcf2c80b010202c8050202039f740403001ff2f8276a2687d2018fd201800f883b840051d38642c678b64e4400780e58fc10802faf07f80e59fa801e78b096664c02078067c07c100627a7978402014807060007a0ddb0c60201c709080013a0fd007a026900aa90400201200b0a0031b8e1002191960aa00b9e2ca007f4042796d225e8019203f6010201200d0c000bf7c147d2218400b9d10e86981fd201840b07f8138d809797976a2687d2029116382f970fd9178089910374daf81b619fd20182c7883b8701981684100627910eba56001797a6a6ba610fd8200e8768f76a9f6aa00cc2a32a8292878809bef2f1889f883bbcdeb86f01',
-        'hex',
-    ),
-)[0];
-export const JETTON_WALLET_CODE = Cell.fromBase64(
-    'te6cckECEQEAAyMAART/APSkE/S88sgLAQIBYgIDAgLMBAUAG6D2BdqJofQB9IH0gahhAgHUBgcCASAICQDDCDHAJJfBOAB0NMDAXGwlRNfA/AM4PpA+kAx+gAxcdch+gAx+gAwc6m0AALTH4IQD4p+pVIgupUxNFnwCeCCEBeNRRlSILqWMUREA/AK4DWCEFlfB7y6k1nwC+BfBIQP8vCAAET6RDBwuvLhTYAIBIAoLAIPUAQa5D2omh9AH0gfSBqGAJpj8EIC8aijKkQXUEIPe7L7wndCVj5cWLpn5j9ABgJ0CgR5CgCfQEsZ4sA54tmZPaqQB8VA9M/+gD6QCHwAe1E0PoA+kD6QNQwUTahUirHBfLiwSjC//LiwlQ0QnBUIBNUFAPIUAT6AljPFgHPFszJIsjLARL0APQAywDJIPkAcHTIywLKB8v/ydAE+kD0BDH6ACDXScIA8uLEd4AYyMsFUAjPFnD6AhfLaxPMgMAgEgDQ4AnoIQF41FGcjLHxnLP1AH+gIizxZQBs8WJfoCUAPPFslQBcwjkXKRceJQCKgToIIJycOAoBS88uLFBMmAQPsAECPIUAT6AljPFgHPFszJ7VQC9ztRND6APpA+kDUMAjTP/oAUVGgBfpA+kBTW8cFVHNtcFQgE1QUA8hQBPoCWM8WAc8WzMkiyMsBEvQA9ADLAMn5AHB0yMsCygfL/8nQUA3HBRyx8uLDCvoAUaihggiYloBmtgihggiYloCgGKEnlxBJEDg3XwTjDSXXCwGAPEADXO1E0PoA+kD6QNQwB9M/+gD6QDBRUaFSSccF8uLBJ8L/8uLCBYIJMS0AoBa88uLDghB73ZfeyMsfFcs/UAP6AiLPFgHPFslxgBjIywUkzxZw+gLLaszJgED7AEATyFAE+gJYzxYBzxbMye1UgAHBSeaAYoYIQc2LQnMjLH1Iwyz9Y+gJQB88WUAfPFslxgBDIywUkzxZQBvoCFctqFMzJcfsAECQQIwB8wwAjwgCwjiGCENUydttwgBDIywVQCM8WUAT6AhbLahLLHxLLP8ly+wCTNWwh4gPIUAT6AljPFgHPFszJ7VSV6u3X',
-);
-
-export const OPCODES = {
-    SUPPLY: 0x1,
-    WITHDRAW: 0x2,
-    LIQUIDATE: 0x3,
-    JETTON_TRANSFER: 0xf8a7ea5,
-};
-
-export const FEES = {
-    SUPPLY: toNano('0.3'),
-    WITHDRAW: toNano('0.5'),
-    SUPPLY_JETTON: toNano('0.8'),
-    SUPPLY_JETTON_FWD: toNano('0.5'),
-    LIQUIDATION: toNano('0.8'),
-    LIQUIDATION_JETTON: toNano('1'),
-    LIQUIDATION_JETTON_FWD: toNano('0.8'),
-};
+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 = 3;
+export const EVAA_MASTER_TESTNET = Address.parse('kQClWdMebpK90b6imEUreQJ4M3oz8Gqwd3xkVIowR8LDX98-');
+export const TESTNET_VERSION = 3;
+
+export const NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
+
+export const ASSET_ID = {
+    TON: sha256Hash('TON'),
+    jUSDT: sha256Hash('jUSDT'),
+    jUSDC: sha256Hash('jUSDC'),
+    stTON: sha256Hash('stTON'),
+    tsTON: sha256Hash('tsTON'),
+    USDT: sha256Hash('USDT'),
+};
+
+export const JETTON_MASTER_ADDRESSES = {
+    jUSDT_MAINNET: Address.parse('EQBwbF0otxLyA3VrRjjC1q7i3G7LtoEpdyBjZEuNtrhC4drm'),
+    jUSDT_TESTNET: Address.parse('kQBtFVedUkg9Q7M5eMx_gxAdP5R7QCLR-3RCYQNrm_DZYr6Z'),
+    jUSDC_MAINNET: Address.parse('EQCEHZi-CLX2ghdsNbY35umR1OFODG5ySHrtK6GItMdWv7dS'),
+    jUSDC_TESTNET: Address.parse('kQCZWZD_rBZ1vrqF22aX4AZrU1a1q-YKZH_R2VlALoVNCvXd'),
+    stTON_MAINNET: Address.parse('EQBOn-1b-315ogeCl5lfPYW0ut6sjA2eq4LTdRv5vJJ1SsxX'),
+    stTON_TESTNET: Address.parse('kQCpm8ixF6STW7aidxn_Qkp4sR73msPlrduCeRZfo-Zu7dxt'),
+    tsTON_MAINNET: Address.parse('EQCRC0telhv1QESvTx24nNqUWB72zCysXQ0Bx97lVzucQ3Gr'),
+    tsTON_TESTNET: null,
+    USDT_MAINNET: Address.parse('EQD_kMQkK-A9-CQu3CdOnQUDZ2_8bY8Zrh1PvtE3hZpxvdRH'),
+    USDT_TESTNET: null,
+};
+
+export const MASTER_CONSTANTS = {
+    FACTOR_SCALE: BigInt(1e12),
+    ASSET_COEFFICIENT_SCALE: 10000n,
+    ASSET_PRICE_SCALE: BigInt(1e8),
+};
+
+export const LENDING_CODE = Cell.fromBoc(
+    Buffer.from(
+        'b5ee9c72c1010e0100fd000d12182a555a6065717691969efd0114ff00f4a413f4bcf2c80b010202c8050202039f740403001ff2f8276a2687d2018fd201800f883b840051d38642c678b64e4400780e58fc10802faf07f80e59fa801e78b096664c02078067c07c100627a7978402014807060007a0ddb0c60201c709080013a0fd007a026900aa90400201200b0a0031b8e1002191960aa00b9e2ca007f4042796d225e8019203f6010201200d0c000bf7c147d2218400b9d10e86981fd201840b07f8138d809797976a2687d2029116382f970fd9178089910374daf81b619fd20182c7883b8701981684100627910eba56001797a6a6ba610fd8200e8768f76a9f6aa00cc2a32a8292878809bef2f1889f883bbcdeb86f01',
+        'hex',
+    ),
+)[0];
+export const JETTON_WALLET_CODE = Cell.fromBase64(
+    'te6cckECEQEAAyMAART/APSkE/S88sgLAQIBYgIDAgLMBAUAG6D2BdqJofQB9IH0gahhAgHUBgcCASAICQDDCDHAJJfBOAB0NMDAXGwlRNfA/AM4PpA+kAx+gAxcdch+gAx+gAwc6m0AALTH4IQD4p+pVIgupUxNFnwCeCCEBeNRRlSILqWMUREA/AK4DWCEFlfB7y6k1nwC+BfBIQP8vCAAET6RDBwuvLhTYAIBIAoLAIPUAQa5D2omh9AH0gfSBqGAJpj8EIC8aijKkQXUEIPe7L7wndCVj5cWLpn5j9ABgJ0CgR5CgCfQEsZ4sA54tmZPaqQB8VA9M/+gD6QCHwAe1E0PoA+kD6QNQwUTahUirHBfLiwSjC//LiwlQ0QnBUIBNUFAPIUAT6AljPFgHPFszJIsjLARL0APQAywDJIPkAcHTIywLKB8v/ydAE+kD0BDH6ACDXScIA8uLEd4AYyMsFUAjPFnD6AhfLaxPMgMAgEgDQ4AnoIQF41FGcjLHxnLP1AH+gIizxZQBs8WJfoCUAPPFslQBcwjkXKRceJQCKgToIIJycOAoBS88uLFBMmAQPsAECPIUAT6AljPFgHPFszJ7VQC9ztRND6APpA+kDUMAjTP/oAUVGgBfpA+kBTW8cFVHNtcFQgE1QUA8hQBPoCWM8WAc8WzMkiyMsBEvQA9ADLAMn5AHB0yMsCygfL/8nQUA3HBRyx8uLDCvoAUaihggiYloBmtgihggiYloCgGKEnlxBJEDg3XwTjDSXXCwGAPEADXO1E0PoA+kD6QNQwB9M/+gD6QDBRUaFSSccF8uLBJ8L/8uLCBYIJMS0AoBa88uLDghB73ZfeyMsfFcs/UAP6AiLPFgHPFslxgBjIywUkzxZw+gLLaszJgED7AEATyFAE+gJYzxYBzxbMye1UgAHBSeaAYoYIQc2LQnMjLH1Iwyz9Y+gJQB88WUAfPFslxgBDIywUkzxZQBvoCFctqFMzJcfsAECQQIwB8wwAjwgCwjiGCENUydttwgBDIywVQCM8WUAT6AhbLahLLHxLLP8ly+wCTNWwh4gPIUAT6AljPFgHPFszJ7VSV6u3X',
+);
+
+export const OPCODES = {
+    SUPPLY: 0x1,
+    WITHDRAW: 0x2,
+    LIQUIDATE: 0x3,
+    JETTON_TRANSFER: 0xf8a7ea5,
+};
+
+export const FEES = {
+    SUPPLY: toNano('0.3'),
+    WITHDRAW: toNano('0.5'),
+    SUPPLY_JETTON: toNano('0.8'),
+    SUPPLY_JETTON_FWD: toNano('0.5'),
+    LIQUIDATION: toNano('0.8'),
+    LIQUIDATION_JETTON: toNano('1'),
+    LIQUIDATION_JETTON_FWD: toNano('0.8'),
+};

package/src/utils/userJettonWallet.ts

@@ -1,41 +1,55 @@
-import { Address, beginCell, storeStateInit } from '@ton/core';
-import { ASSET_ID, JETTON_MASTER_ADDRESSES, JETTON_WALLET_CODE } from '../constants';
-
-export function getUserJettonWallet(ownerAddress: Address, assetID: bigint, network: 'mainnet' | 'testnet'): Address {
-    const builder = beginCell().storeCoins(0).storeAddress(ownerAddress);
-    switch (assetID) {
-        case ASSET_ID.jUSDT:
-            if (network === 'mainnet') {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_MAINNET);
-            } else {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_TESTNET);
-            }
-            break;
-        case ASSET_ID.jUSDC:
-            if (network === 'mainnet') {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_MAINNET);
-            } else {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_TESTNET);
-            }
-            break;
-        case ASSET_ID.stTON:
-            if (network === 'mainnet') {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_MAINNET);
-            } else {
-                builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_TESTNET);
-            }
-            break;
-        default:
-            throw new Error('Unsupported asset');
-    }
-    const data = builder.storeRef(JETTON_WALLET_CODE).endCell();
-    const stateInit = beginCell()
-        .store(
-            storeStateInit({
-                code: JETTON_WALLET_CODE,
-                data: data,
-            }),
-        )
-        .endCell();
-    return new Address(0, stateInit.hash());
-}
+import { Address, beginCell, storeStateInit } from '@ton/core';
+import { ASSET_ID, JETTON_MASTER_ADDRESSES, JETTON_WALLET_CODE } from '../constants';
+
+export function getUserJettonWallet(ownerAddress: Address, assetID: bigint, network: 'mainnet' | 'testnet'): Address {
+    const builder = beginCell().storeCoins(0).storeAddress(ownerAddress);
+    switch (assetID) {
+        case ASSET_ID.jUSDT:
+            if (network === 'mainnet') {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_MAINNET);
+            } else {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDT_TESTNET);
+            }
+            break;
+        case ASSET_ID.jUSDC:
+            if (network === 'mainnet') {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_MAINNET);
+            } else {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.jUSDC_TESTNET);
+            }
+            break;
+        case ASSET_ID.stTON:
+            if (network === 'mainnet') {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_MAINNET);
+            } else {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.stTON_TESTNET);
+            }
+            break;
+        case ASSET_ID.tsTON:
+            if (network === 'mainnet') {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_MAINNET);
+            } else {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.tsTON_TESTNET);
+            }
+            break;
+        case ASSET_ID.USDT:
+            if (network === 'mainnet') {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_MAINNET);
+            } else {
+                builder.storeAddress(JETTON_MASTER_ADDRESSES.USDT_TESTNET);
+            }
+            break;
+        default:
+            throw new Error('Unsupported asset');
+    }
+    const data = builder.storeRef(JETTON_WALLET_CODE).endCell();
+    const stateInit = beginCell()
+        .store(
+            storeStateInit({
+                code: JETTON_WALLET_CODE,
+                data: data,
+            }),
+        )
+        .endCell();
+    return new Address(0, stateInit.hash());
+}

package/dist/types/Redstone.d.ts

@@ -1,15 +0,0 @@
-export type CoinData = {
-    id: string;
-    symbol: string;
-    provider: string;
-    value: number;
-    liteEvmSignature: string;
-    permawebTx: string;
-    version: string;
-    source: {
-        coingecko: number;
-    };
-    timestamp: number;
-    minutes: number;
-    providerPublicKey: string;
-};

package/dist/types/Redstone.js

@@ -1,2 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });