@evaafi/sdk 0.6.4 → 0.9.0

package/dist/types/Master.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
+import { Oracle } from '../prices/Oracle.interface';
+export { FeedMapItem, parseFeedsMapDict } from '../api/feeds';
 export type MasterConstants = {
     FACTOR_SCALE: bigint;
     ASSET_COEFFICIENT_SCALE: bigint;
@@ -25,10 +26,9 @@ export type PoolConfig = {
     masterAddress: Address;
     masterVersion: number;
     masterConstants: MasterConstants;
-    oracles: OracleNFT[];
-    minimalOracles: number;
     poolAssetsConfig: PoolAssetsConfig;
     lendingCode: Cell;
+    oracles: Oracle;
 };
 export type UpgradeConfig = {
     masterCodeVersion: number;
@@ -41,7 +41,7 @@ export type UpgradeConfig = {
     newUserCode: Cell | null;
 };
 export type AssetConfig = {
-    oracle: bigint;
+    jwAddress: bigint;
     decimals: bigint;
     collateralFactor: bigint;
     liquidationThreshold: bigint;
@@ -60,17 +60,10 @@ export type AssetConfig = {
     minPrincipalForRewards: bigint;
     baseTrackingSupplySpeed: bigint;
     baseTrackingBorrowSpeed: bigint;
-};
-export type MasterConfig = {
-    ifActive: number;
-    admin: Address;
-    oraclesInfo: OraclesInfo;
-    tokenKeys: Cell | null;
-};
-export type OraclesInfo = {
-    numOracles: number;
-    threshold: number;
-    oracles: Cell | null;
+    borrowCap: number | bigint;
+    heCategory: number;
+    heCollateralFactor: number;
+    heLiquidationThreshold: number;
 };
 export type AssetData = {
     sRate: bigint;
@@ -94,28 +87,14 @@ export type AssetApy = {
 export type ExtendedAssetData = AssetData & AssetInterest & AssetApy;
 export type ExtendedAssetsData = Dictionary<bigint, ExtendedAssetData>;
 export type ExtendedAssetsConfig = Dictionary<bigint, AssetConfig>;
-export type MasterData = {
-    meta: string;
-    upgradeConfig: UpgradeConfig;
-    masterConfig: MasterConfig;
-    assetsConfig: ExtendedAssetsConfig;
-    assetsData: ExtendedAssetsData;
-    assetsReserves: Dictionary<bigint, bigint>;
-    apy: {
-        supply: Dictionary<bigint, number>;
-        borrow: Dictionary<bigint, number>;
-    };
-};
 export type AgregatedBalances = {
     totalBorrow: bigint;
     totalSupply: bigint;
 };
-export type OracleNFT = {
-    id: number;
+export type ExtendedEvaaOracle = EvaaOracle & {
     address: string;
-    pubkey: Buffer;
 };
-export type Oracle = {
+export type EvaaOracle = {
     id: number;
     pubkey: Buffer;
 };

package/dist/types/Master.js

@@ -1,2 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseFeedsMapDict = void 0;
+var feeds_1 = require("../api/feeds");
+Object.defineProperty(exports, "parseFeedsMapDict", { enumerable: true, get: function () { return feeds_1.parseFeedsMapDict; } });

package/dist/types/MasterRewards.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaRewardsConfig = {

package/dist/types/UserRewards.d.ts

@@ -1,5 +1,4 @@
 /// <reference types="node" />
-/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaUserRewardsConfig = {

package/dist/utils/sha256BigInt.d.ts

@@ -1,4 +1,3 @@
 /// <reference types="node" />
-/// <reference types="node" />
 export declare function sha256Hash(input: string): bigint;
 export declare function bigIntToBuffer(value: bigint): Buffer;

package/dist/utils/userJettonWallet.js

@@ -5,14 +5,6 @@ const core_1 = require("@ton/core");
 const assets_1 = require("../constants/assets");
 function getUserJettonData(ownerAddress, assetName, jettonWalletCode, jettonMasterAddress) {
     switch (assetName) {
-        case 'uTON':
-            return (0, core_1.beginCell)()
-                .storeCoins(0)
-                .storeUint(0, 64)
-                .storeAddress(ownerAddress)
-                .storeAddress(jettonMasterAddress)
-                .storeRef(jettonWalletCode)
-                .endCell();
         case 'DOGS':
         case 'NOT':
         case 'USDT':

package/dist/utils/utils.d.ts

@@ -1,4 +1,11 @@
-import { PoolAssetConfig } from "../types/Master";
+import { PoolAssetConfig } from '../types/Master';
 export declare function isTonAsset(asset: PoolAssetConfig): boolean;
 export declare function isTonAssetId(assetId: bigint): boolean;
 export declare function delay(ms: number): Promise<unknown>;
+export interface FetchConfig {
+    retries: number;
+    timeout: number;
+}
+export declare const DefaultFetchConfig: FetchConfig;
+export declare function proxyFetchRetries<T>(fetch: Promise<T>, config?: FetchConfig): Promise<T>;
+export declare function isValidSubaccountId(subaccountId: number): boolean;

package/dist/utils/utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.delay = exports.isTonAssetId = exports.isTonAsset = void 0;
+exports.isValidSubaccountId = exports.proxyFetchRetries = exports.DefaultFetchConfig = exports.delay = exports.isTonAssetId = exports.isTonAsset = void 0;
 const assets_1 = require("../constants/assets");
 function isTonAsset(asset) {
     return asset.name === 'TON';
@@ -11,6 +11,35 @@ function isTonAssetId(assetId) {
 }
 exports.isTonAssetId = isTonAssetId;
 function delay(ms) {
-    return new Promise(resolve => setTimeout(resolve, ms));
+    return new Promise((resolve) => setTimeout(resolve, ms));
 }
 exports.delay = delay;
+exports.DefaultFetchConfig = {
+    retries: 3,
+    timeout: 1000,
+};
+async function proxyFetchRetries(fetch, config = exports.DefaultFetchConfig) {
+    let lastError = null;
+    for (let attempt = 0; attempt <= config.retries; attempt++) {
+        try {
+            const timeoutPromise = new Promise((_, reject) => {
+                setTimeout(() => reject(new Error('Request timeout')), config.timeout);
+            });
+            return await Promise.race([fetch, timeoutPromise]);
+        }
+        catch (error) {
+            lastError = error instanceof Error ? error : new Error(String(error));
+            if (attempt < config.retries) {
+                // Exponential backoff: wait 1s, 2s, 4s, etc.
+                const delay = Math.pow(2, attempt) * 1000;
+                await new Promise((resolve) => setTimeout(resolve, delay));
+            }
+        }
+    }
+    throw new Error(`Failed to fetch after ${config.retries + 1} attempts. Last error: ${lastError instanceof Error ? lastError.message : JSON.stringify(lastError, null, 2)}`);
+}
+exports.proxyFetchRetries = proxyFetchRetries;
+function isValidSubaccountId(subaccountId) {
+    return (subaccountId << 16) >> 16 === subaccountId && subaccountId !== -0x8000;
+}
+exports.isValidSubaccountId = isValidSubaccountId;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evaafi/sdk",
-    "version": "0.6.4",
+    "version": "0.9.0",
     "description": "The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.",
     "main": "dist/index.js",
     "files": [
@@ -19,7 +19,6 @@
     "license": "MIT",
     "homepage": "https://github.com/evaafi/sdk#readme",
     "devDependencies": {
-        "@orbs-network/ton-access": "^2.3.3",
         "@ton/core": "0.56.0",
         "@ton/crypto": "^3.3.0",
         "@tonconnect/sdk": "3.0.5",
@@ -38,8 +37,10 @@
         "crypto-js": ">=4.2.0"
     },
     "dependencies": {
+        "@pythnetwork/hermes-client": "^2.0.0",
+        "@pythnetwork/pyth-ton-js": "^0.1.2",
         "@ton/ton": "14.0.0",
         "dotenv": "16.4.5"
     },
-    "packageManager": "yarn@4.9.1+sha512.f95ce356460e05be48d66401c1ae64ef84d163dd689964962c6888a9810865e39097a5e9de748876c2e0bf89b232d583c33982773e9903ae7a76257270986538"
+    "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c"
 }

package/src/api/feeds.ts

@@ -0,0 +1,90 @@
+import { Dictionary } from '@ton/ton';
+import { Buffer } from 'buffer';
+import { ASSET_ID } from '../constants/assets';
+
+export const PYTH_TON_PRICE_FEED_ID = '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026';
+export const PYTH_USDT_PRICE_FEED_ID = '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b';
+export const PYTH_STTON_PRICE_FEED_ID = '0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002';
+export const PYTH_TSTON_PRICE_FEED_ID = '0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25';
+export const PYTH_USDC_PRICE_FEED_ID = '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a';
+export const PYTH_USDE_PRICE_FEED_ID = '0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d';
+export const PYTH_TSUSDE_PRICE_FEED_ID = '0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19';
+
+export function bigintToBuffer(value: bigint, size: number): Buffer {
+    if (value < 0n) {
+        throw new Error('Only non-negative bigint is supported');
+    }
+    // it's questionable whether it stores in LE or BE
+    // and what option will TVM use, now by default it's BE
+    const hex = value.toString(16);
+    const padded = hex.padStart(size * 2, '0');
+    return Buffer.from(padded, 'hex');
+}
+
+export const packConnectedFeeds = (evaa_id: bigint, reffered_id: bigint) => {
+    return Buffer.concat([bigintToBuffer(evaa_id, 32), bigintToBuffer(reffered_id, 32)]);
+};
+
+export const EVAA_TON_PRICE_FEED_ID = ASSET_ID.TON;
+export const EVAA_NOT_PRICE_FEED_ID = ASSET_ID.NOT;
+export const EVAA_DOGS_PRICE_FEED_ID = ASSET_ID.DOGS;
+export const EVAA_USDT_PRICE_FEED_ID = ASSET_ID.USDT;
+export const EVAA_STTON_PRICE_FEED_ID = ASSET_ID.stTON;
+export const EVAA_TSTON_PRICE_FEED_ID = ASSET_ID.tsTON;
+export const EVAA_JUSDC_PRICE_FEED_ID = ASSET_ID.jUSDC;
+export const EVAA_JUSDT_PRICE_FEED_ID = ASSET_ID.jUSDT;
+export const EVAA_USDE_PRICE_FEED_ID = ASSET_ID.USDe;
+export const EVAA_TSUSDE_PRICE_FEED_ID = ASSET_ID.tsUSDe;
+
+export const MAIN_POOL_FEEDS_MAP: Dictionary<bigint, Buffer> = (() => {
+    const map = Dictionary.empty<bigint, Buffer>();
+    map.set(BigInt(PYTH_TON_PRICE_FEED_ID), packConnectedFeeds(EVAA_TON_PRICE_FEED_ID, 0n));
+    map.set(BigInt(PYTH_USDT_PRICE_FEED_ID), packConnectedFeeds(EVAA_USDT_PRICE_FEED_ID, 0n));
+    map.set(
+        BigInt(PYTH_STTON_PRICE_FEED_ID),
+        packConnectedFeeds(EVAA_STTON_PRICE_FEED_ID, BigInt(PYTH_TON_PRICE_FEED_ID)),
+    );
+    map.set(
+        BigInt(PYTH_TSTON_PRICE_FEED_ID),
+        packConnectedFeeds(EVAA_TSTON_PRICE_FEED_ID, BigInt(PYTH_TON_PRICE_FEED_ID)),
+    );
+    map.set(BigInt(PYTH_USDC_PRICE_FEED_ID), packConnectedFeeds(EVAA_JUSDC_PRICE_FEED_ID, 0n));
+    map.set(BigInt(PYTH_USDT_PRICE_FEED_ID), packConnectedFeeds(EVAA_JUSDT_PRICE_FEED_ID, 0n));
+    map.set(BigInt(PYTH_USDE_PRICE_FEED_ID), packConnectedFeeds(EVAA_USDE_PRICE_FEED_ID, 0n));
+    map.set(BigInt(PYTH_TSUSDE_PRICE_FEED_ID), packConnectedFeeds(EVAA_TSUSDE_PRICE_FEED_ID, 0n));
+    return map;
+})();
+
+export type FeedMapItem = {
+    evaaId: bigint;
+    referredPythFeed: bigint;
+};
+
+export function parseFeedsMapDict(dict: Dictionary<bigint, Buffer>) {
+    const parsedData = new Map<bigint, FeedMapItem>();
+    for (const key of dict.keys()) {
+        const buffer = dict.get(key)!;
+
+        const hex1 = '0x' + buffer.toString('hex', 0, 32);
+        const hex2 = '0x' + buffer.toString('hex', 32);
+
+        const evaaId = BigInt(hex1);
+        const referredPythFeed = BigInt(hex2);
+
+        parsedData.set(key, { evaaId, referredPythFeed });
+    }
+
+    return parsedData;
+}
+
+export const TESTNET_ALLOWED_REF_TOKENS: Dictionary<bigint, bigint> = (() => {
+    const map = Dictionary.empty<bigint, bigint>();
+    map.set(BigInt(EVAA_JUSDT_PRICE_FEED_ID), BigInt(EVAA_USDT_PRICE_FEED_ID));
+    return map;
+})();
+
+export const TESTNET_FEEDS_MAP: Dictionary<bigint, Buffer> = (() => {
+    const map = Dictionary.empty<bigint, Buffer>();
+    map.set(BigInt(PYTH_TON_PRICE_FEED_ID), packConnectedFeeds(EVAA_TON_PRICE_FEED_ID, 0n));
+    return map;
+})();

package/src/api/liquidation.ts

@@ -174,7 +174,7 @@ export function calculateLiquidationAmounts(
 
     const _isBadDebt = isBadDebt(supplyAmount, borrowAmount, liquidationBonus, masterConstants);
     if (!_isBadDebt) {
-        allowedCollateralValue = BigMath.min(allowedCollateralValue, BigMath.max(allowedCollateralValue / 2n, collateralThreshold));
+        allowedCollateralValue = BigMath.min(allowedCollateralValue, BigMath.max(allowedCollateralValue / 3n, collateralThreshold));
     }
 
     const loanValue = toAssetWorth(loanInfo.balance, loanInfo.scale, loanInfo.price);

package/src/api/math.ts

@@ -452,7 +452,7 @@ export function calculateLiquidationData(
         const liquidationBonus = collateralAssetConfig.liquidationBonus;
         const loanScale = 10n ** loanAssetConfig.decimals;
         values.push(
-            (bigIntMax(collateralValue / 2n, bigIntMin(collateralValue, COLLATERAL_WORTH_THRESHOLD)) *
+            (bigIntMax(collateralValue / 3n, bigIntMin(collateralValue, COLLATERAL_WORTH_THRESHOLD)) *
                 loanScale *
                 poolConfig.masterConstants.ASSET_COEFFICIENT_SCALE) /
             liquidationBonus /

package/src/api/parser.ts

@@ -1,5 +1,17 @@
 import { beginCell, Cell, Dictionary, DictionaryValue, Slice } from '@ton/core';
-import { AssetConfig, AssetData, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConfig, MasterConstants, MasterData, PoolAssetsConfig, PoolConfig } from '../types/Master';
+import { MasterConfig, MasterData, OracleInfo } from '../contracts/AbstractMaster';
+import {
+    AssetConfig,
+    AssetData,
+    ExtendedAssetData,
+    ExtendedAssetsConfig,
+    ExtendedAssetsData,
+    MasterConstants,
+    PoolAssetsConfig,
+    PoolConfig,
+} from '../types/Master';
+import { BalanceType, UserBalance, UserData, UserLiteData, UserRewards } from '../types/User';
+import { loadMaybeMyRef, loadMyRef } from './helpers';
 import {
     bigIntMax,
     bigIntMin,
@@ -11,16 +23,14 @@ import {
     getAvailableToBorrow,
     presentValue,
 } from './math';
-import { loadMaybeMyRef, loadMyRef } from './helpers';
-import { BalanceType, UserBalance, UserData, UserLiteData, UserRewards } from '../types/User';
-import { checkNotInDebtAtAll } from "../api/math";
+import { OracleParser } from './parsers/AbstractOracleParser';
 
 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));
@@ -51,9 +61,19 @@ export function createAssetData(): DictionaryValue<AssetData> {
             const balance = BigInt(src.loadUintBig(64));
             const trackingSupplyIndex = BigInt(src.loadUintBig(64));
             const trackingBorrowIndex = BigInt(src.loadUintBig(64));
-            const awaitedSupply = BigInt(src.loadUintBig(64));  
+            const awaitedSupply = BigInt(src.loadUintBig(64));
 
-            return { sRate, bRate, totalSupply, totalBorrow, lastAccural, balance, trackingSupplyIndex, trackingBorrowIndex, awaitedSupply};
+            return {
+                sRate,
+                bRate,
+                totalSupply,
+                totalBorrow,
+                lastAccural,
+                balance,
+                trackingSupplyIndex,
+                trackingBorrowIndex,
+                awaitedSupply,
+            };
         },
     };
 }
@@ -61,7 +81,7 @@ export function createAssetData(): DictionaryValue<AssetData> {
 export function createAssetConfig(): DictionaryValue<AssetConfig> {
     return {
         serialize: (src: any, builder: any) => {
-            builder.storeUint(src.oracle, 256);
+            builder.storeUint(src.jwAddress, 256);
             builder.storeUint(src.decimals, 8);
             const refBuild = beginCell();
             refBuild.storeUint(src.collateralFactor, 16);
@@ -81,10 +101,14 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             refBuild.storeUint(src.minPrincipalForRewards, 64);
             refBuild.storeUint(src.baseTrackingSupplySpeed, 64);
             refBuild.storeUint(src.baseTrackingBorrowSpeed, 64);
+            refBuild.storeInt(src.borrowCap, 64);
+            refBuild.storeUint(src.heCategory, 8);
+            refBuild.storeUint(src.heCollateralFactor, 16);
+            refBuild.storeUint(src.heLiquidationThreshold, 16);
             builder.storeRef(refBuild.endCell());
         },
         parse: (src: Slice) => {
-            const oracle = src.loadUintBig(256);
+            const jwAddress = src.loadUintBig(256);
             const decimals = BigInt(src.loadUint(8));
             const ref = src.loadRef().beginParse();
             const collateralFactor = ref.loadUintBig(16);
@@ -104,9 +128,13 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
             const minPrincipalForRewards = ref.loadUintBig(64);
             const baseTrackingSupplySpeed = ref.loadUintBig(64);
             const baseTrackingBorrowSpeed = ref.loadUintBig(64);
+            const borrowCap = ref.loadInt(64);
+            const heCategory = ref.loadUint(8);
+            const heCollateralFactor = ref.loadUint(16);
+            const heLiquidationThreshold = ref.loadUint(16);
 
             return {
-                oracle,
+                jwAddress,
                 decimals,
                 collateralFactor,
                 liquidationThreshold,
@@ -124,17 +152,25 @@ export function createAssetConfig(): DictionaryValue<AssetConfig> {
                 liquidationReserveFactor,
                 minPrincipalForRewards,
                 baseTrackingSupplySpeed,
-                baseTrackingBorrowSpeed
+                baseTrackingBorrowSpeed,
+                borrowCap,
+                heCategory,
+                heCollateralFactor,
+                heLiquidationThreshold,
             };
         },
     };
 }
 
-export function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAssetsConfig, masterConstants: MasterConstants): MasterData {
+export function parseMasterData(
+    masterDataBOC: string,
+    poolAssetsConfig: PoolAssetsConfig,
+    masterConstants: MasterConstants,
+    oracleParser: OracleParser,
+): MasterData<MasterConfig<OracleInfo>> {
     const masterSlice = Cell.fromBase64(masterDataBOC).beginParse();
     const meta = masterSlice.loadRef().beginParse().loadStringTail();
     const upgradeConfigParser = masterSlice.loadRef().beginParse();
-
     const upgradeConfig = {
         masterCodeVersion: Number(upgradeConfigParser.loadCoins()),
         userCodeVersion: Number(upgradeConfigParser.loadCoins()),
@@ -146,31 +182,31 @@ export function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAss
         newUserCode: loadMaybeMyRef(upgradeConfigParser),
     };
     // upgradeConfigParser.endParse(); todo fix with new testnet contract
-
     const masterConfigSlice = masterSlice.loadRef().beginParse();
+
     const assetsConfigDict = masterConfigSlice.loadDict(Dictionary.Keys.BigUint(256), createAssetConfig());
     const assetsDataDict = masterSlice.loadDict(Dictionary.Keys.BigUint(256), createAssetData());
-
     const assetsExtendedData = Dictionary.empty<bigint, ExtendedAssetData>();
     const assetsReserves = Dictionary.empty<bigint, bigint>();
     const apy = {
         supply: Dictionary.empty<bigint, number>(),
         borrow: Dictionary.empty<bigint, number>(),
     };
-    
-    for (const [tokenSymbol, asset] of Object.entries(poolAssetsConfig)) {
+
+    for (const [, asset] of Object.entries(poolAssetsConfig)) {
         const assetData = calculateAssetData(assetsConfigDict, assetsDataDict, asset.assetId, masterConstants);
         assetsExtendedData.set(asset.assetId, assetData);
     }
+
+    const ifActive = oracleParser.getIfActive(masterConfigSlice);
+    const oraclesInfo = oracleParser.parseOracleConfig(masterConfigSlice);
+
     const masterConfig = {
-        ifActive: masterConfigSlice.loadInt(8),
+        ifActive,
         admin: masterConfigSlice.loadAddress(),
-        oraclesInfo:  {
-            numOracles: masterConfigSlice.loadUint(16),
-            threshold: masterConfigSlice.loadUint(16),
-            oracles: loadMaybeMyRef(masterConfigSlice)
-        },
+        oraclesInfo,
         tokenKeys: loadMaybeMyRef(masterConfigSlice),
+        supervisor: masterConfigSlice.loadMaybeAddress(),
     };
     masterConfigSlice.endParse();
 
@@ -179,11 +215,9 @@ export function parseMasterData(masterDataBOC: string, poolAssetsConfig: PoolAss
         const totalSupply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
         const totalBorrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
         assetsReserves.set(asset.assetId, assetData.balance - totalSupply + totalBorrow);
-
         apy.supply.set(asset.assetId, (1 + (Number(assetData.supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1);
         apy.borrow.set(asset.assetId, (1 + (Number(assetData.borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1);
     }
-
     return {
         meta: meta,
         upgradeConfig: upgradeConfig,
@@ -200,7 +234,7 @@ export function parseUserLiteData(
     assetsData: ExtendedAssetsData,
     assetsConfig: ExtendedAssetsConfig,
     poolConfig: PoolConfig,
-    applyDust: boolean = false
+    applyDust: boolean = false,
 ): UserLiteData {
     const poolAssetsConfig = poolConfig.poolAssetsConfig;
     const masterConstants = poolConfig.masterConstants;
@@ -232,7 +266,7 @@ export function parseUserLiteData(
         backupCell1 = userSlice.loadMaybeRef();
         backupCell2 = userSlice.loadMaybeRef();
     }
-    
+
     userSlice.endParse();
     const userBalances = Dictionary.empty<bigint, UserBalance>();
 
@@ -243,7 +277,7 @@ export function parseUserLiteData(
         let principal = realPrincipals.get(asset.assetId) || 0n;
         let balance = presentValue(assetData.sRate, assetData.bRate, principal, masterConstants);
 
-        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
+        if (applyDust && principal > 0 && principal < assetConfig.dust) {
             principal = 0n;
             balance = {
                 amount: 0n,
@@ -270,7 +304,7 @@ export function parseUserLiteData(
         dutchAuctionStart: dutchAuctionStart,
         backupCell: backupCell,
         fullyParsed: false,
-        
+
         rewards: rewards,
         backupCell1: backupCell1,
         backupCell2: backupCell2,
@@ -283,7 +317,7 @@ export function parseUserData(
     assetsConfig: ExtendedAssetsConfig,
     prices: Dictionary<bigint, bigint>,
     poolConfig: PoolConfig,
-    applyDust: boolean = false
+    applyDust: boolean = false,
 ): UserData {
     userLiteData.fullyParsed = true;
     let havePrincipalWithoutPrice = false;
@@ -314,7 +348,7 @@ export function parseUserData(
         let principal = userLiteData.principals.get(asset.assetId) || 0n;
         const balance = presentValue(assetData.sRate, assetData.bRate, principal, masterConstants);
 
-        if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
+        if (applyDust && principal > 0 && principal < assetConfig.dust) {
             principal = 0n;
             userLiteData.principals.set(asset.assetId, 0n);
         }
@@ -338,19 +372,35 @@ export function parseUserData(
         }
     }
 
-    const availableToBorrow = getAvailableToBorrow(assetsConfig, assetsData, userLiteData.realPrincipals, prices, masterConstants);
+    const availableToBorrow = getAvailableToBorrow(
+        assetsConfig,
+        assetsData,
+        userLiteData.realPrincipals,
+        prices,
+        masterConstants,
+    );
 
     for (const [_, asset] of Object.entries(poolAssetsConfig)) {
         const balance = userLiteData.balances.get(asset.assetId) as UserBalance;
         const assetConfig = assetsConfig.get(asset.assetId) as AssetConfig;
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
-        
+
         const assetLiquidityMinusReserves = getAssetLiquidityMinusReserves(assetData, masterConstants);
 
         if (balance.type === BalanceType.supply) {
             withdrawalLimits.set(
                 asset.assetId,
-                bigIntMin(calculateMaximumWithdrawAmount(assetsConfig, assetsData, userLiteData.realPrincipals, prices, masterConstants, asset.assetId), assetData.balance)
+                bigIntMin(
+                    calculateMaximumWithdrawAmount(
+                        assetsConfig,
+                        assetsData,
+                        userLiteData.realPrincipals,
+                        prices,
+                        masterConstants,
+                        asset.assetId,
+                    ),
+                    assetData.balance,
+                ),
             );
         }
 
@@ -361,7 +411,13 @@ export function parseUserData(
 
         borrowLimits.set(
             asset.assetId,
-            bigIntMax(0n, bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!, assetLiquidityMinusReserves)),
+            bigIntMax(
+                0n,
+                bigIntMin(
+                    (availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!,
+                    assetLiquidityMinusReserves,
+                ),
+            ),
         );
     }
 
@@ -374,10 +430,16 @@ export function parseUserData(
     let healthFactor = 1;
     let liquidationData;
     if (!havePrincipalWithoutPrice) {
-        liquidationData = calculateLiquidationData(assetsConfig, assetsData, userLiteData.realPrincipals, prices, poolConfig);
+        liquidationData = calculateLiquidationData(
+            assetsConfig,
+            assetsData,
+            userLiteData.realPrincipals,
+            prices,
+            poolConfig,
+        );
         if (liquidationData.totalLimit != 0n) {
             healthFactor = 1 - Number(liquidationData.totalDebt) / Number(liquidationData.totalLimit);
-        } 
+        }
     }
     return {
         ...userLiteData,
@@ -390,6 +452,6 @@ export function parseUserData(
         limitUsed: limitUsed,
         liquidationData: liquidationData,
         healthFactor: healthFactor,
-        havePrincipalWithoutPrice: havePrincipalWithoutPrice
+        havePrincipalWithoutPrice: havePrincipalWithoutPrice,
     };
 }

package/src/api/parsers/AbstractOracleParser.ts

@@ -0,0 +1,16 @@
+import { Slice } from '@ton/core';
+import { ClassicOracleInfo } from './ClassicOracleParser';
+import { PythOracleInfo } from './PythOracleParser';
+
+export interface OracleParser {
+    parseOracleConfig(masterConfigSlice: Slice): ClassicOracleInfo | PythOracleInfo;
+    getIfActive(masterConfigSlice: Slice): number;
+}
+
+export abstract class AbstractOracleParser implements OracleParser {
+    abstract parseOracleConfig(masterConfigSlice: Slice): ClassicOracleInfo | PythOracleInfo;
+
+    getIfActive(masterConfigSlice: Slice): number {
+        return masterConfigSlice.loadInt(8);
+    }
+}

package/src/api/parsers/ClassicOracleParser.ts

@@ -0,0 +1,20 @@
+import { Cell, Slice } from '@ton/core';
+import { loadMaybeMyRef } from '../helpers';
+import { AbstractOracleParser } from './AbstractOracleParser';
+
+export type ClassicOracleInfo = {
+    numOracles: number;
+    threshold: number;
+    oracles: Cell | null;
+};
+
+export class ClassicOracleParser extends AbstractOracleParser {
+    parseOracleConfig(masterConfigSlice: Slice): ClassicOracleInfo {
+        const oraclesSlice = masterConfigSlice.loadRef().beginParse();
+        return {
+            numOracles: oraclesSlice.loadUint(16),
+            threshold: oraclesSlice.loadUint(16),
+            oracles: loadMaybeMyRef(oraclesSlice),
+        };
+    }
+}