Merge pull request #23 from evaafi/sdk-v062c

APP-109 Sdk v062c

Author: sepezho

CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/)
 and this project adheres to [Semantic Versioning](https://semver.org/).
 
+## 0.6.2-c — 2025-01-07
+### Added
+ - ```getAssetLiquidityMinusReserves``` function needed to count the amount of free amount for withdrawal
+### Fixed
+ - ```borrowLimits``` function now take into account the amount available for withdrawal
+
 ## 0.6.2-b — 2024-12-17
 ### Added
  - new field in ```UserLiteData``` . ```fullyParsed``` and ```havePrincipalWithoutPrice```

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.6.2-b",
+  "version": "0.6.2-c",
   "description": "The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.",
   "main": "dist/index.js",
   "files": [

src/api/math.ts

@@ -1,5 +1,6 @@
 import {
     AgregatedBalances,
+    AssetApy,
     AssetConfig,
     AssetData,
     AssetInterest,
@@ -54,6 +55,12 @@ export function calculatePresentValue(index: bigint, principalValue: bigint, mas
     return (principalValue * index) / masterConstants.FACTOR_SCALE;
 }
 
+export function getAssetLiquidityMinusReserves(assetData: AssetData, masterConstants: MasterConstants) {
+    const total_supply = calculatePresentValue(assetData.sRate, assetData.totalSupply, masterConstants);
+    const total_borrow = calculatePresentValue(assetData.bRate, assetData.totalBorrow, masterConstants);
+    return bigIntMin(total_supply - total_borrow, assetData.balance);
+}
+
 export function calculateCurrentRates(assetConfig: AssetConfig, assetData: AssetData, masterConstants: MasterConstants) {
     const now = BigInt(Math.floor(Date.now() / 1000));
     const timeElapsed = now - assetData.lastAccural;
@@ -530,7 +537,7 @@ export function predictHealthFactor(args: PredictHealthFactorArgs): number {
  *
  * @returns Estimated APYs for Supply and Borrow
  */
-export function predictAPY(args: PredictAPYArgs): AssetInterest {
+export function predictAPY(args: PredictAPYArgs): AssetInterest & AssetApy {
     const assetConfig = args.assetConfig;
     const assetData = args.assetData;
     const masterConstants = args.masterConstants;
@@ -553,5 +560,11 @@ export function predictAPY(args: PredictAPYArgs): AssetInterest {
         }
     }
 
-    return calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig, masterConstants);
+    const interest = calculateInterestWithSupplyBorrow(totalSupply, totalBorrow, assetConfig, masterConstants);
+
+    return {
+        ...interest,
+        supplyApy: (1 + (Number(interest.supplyInterest) / 1e12) * 24 * 3600) ** 365 - 1,
+        borrowApy: (1 + (Number(interest.borrowInterest) / 1e12) * 24 * 3600) ** 365 - 1
+    }
 }

src/api/parser.ts

@@ -7,6 +7,7 @@ import {
     calculateLiquidationData,
     calculateMaximumWithdrawAmount,
     calculatePresentValue,
+    getAssetLiquidityMinusReserves,
     getAvailableToBorrow,
     presentValue,
 } from './math';
@@ -344,6 +345,8 @@ export function parseUserData(
         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,
@@ -358,7 +361,7 @@ export function parseUserData(
 
         borrowLimits.set(
             asset.assetId,
-            bigIntMax(0n, bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!, assetData.balance, assetData.totalSupply - assetData.totalBorrow)),
+            bigIntMax(0n, bigIntMin((availableToBorrow * 10n ** assetConfig.decimals) / prices.get(asset.assetId)!, assetLiquidityMinusReserves)),
         );
     }
 

src/index.ts

@@ -17,6 +17,7 @@ export {
     calculateInterestWithSupplyBorrow,
     predictAPY,
     BigMath,
+    getAssetLiquidityMinusReserves,
 } from './api/math';
 
 export {

tests/dust_test.ts

@@ -1,4 +1,4 @@
-import {BalanceChangeType, createAssetConfig, Evaa, EVAA_MASTER_MAINNET, getPrices, MAINNET_LP_POOL_CONFIG, MAINNET_POOL_CONFIG, PricesCollector, TESTNET_POOL_CONFIG, USDT_MAINNET, UserDataActive} from '../src';
+import {BalanceChangeType, createAssetConfig, Evaa, EVAA_MASTER_MAINNET, getPrices, JUSDC_MAINNET, JUSDT_MAINNET, MAINNET_LP_POOL_CONFIG, MAINNET_POOL_CONFIG, PricesCollector, TESTNET_POOL_CONFIG, TON_MAINNET, USDT_MAINNET, UserDataActive} from '../src';
 import {Address, beginCell, Dictionary, TonClient} from '@ton/ton';
 import dotenv from 'dotenv';
 import { predictHealthFactor } from '../src/api/math';
@@ -16,16 +16,22 @@ beforeAll(async () => {
 test('Manual dust check', async () => {
     const evaa = client.open(new Evaa({poolConfig: MAINNET_POOL_CONFIG}));
     await evaa.getSync();
-    const user = client.open(await evaa.openUserContract(Address.parseFriendly("UQD0x5tVfMGTgUJpOvn6as58kKJEremAaXq8_rP3rA2bW3D9").address));
+    const user = client.open(await evaa.openUserContract(Address.parseFriendly("UQDN5CpSs8HT2GO4IymOXPS5zTDzHtY-s8VTuUVAsCTwWJzM").address));
 
     const collector = new PricesCollector(MAINNET_POOL_CONFIG);
     //console.log('priceData', priceData);
     await user.getSync(evaa.data!.assetsData, evaa.data!.assetsConfig, (await collector.getPrices()).dict, true);
-    
+
     if (user.data?.type != 'active') {
         console.log('User is inactive');
         return;
     }
+    console.log(evaa.data?.assetsData.get(JUSDC_MAINNET.assetId)?.totalSupply);
+    console.log(evaa.data?.assetsReserves.get(JUSDC_MAINNET.assetId));
+    console.log(evaa.data?.assetsConfig.get(JUSDC_MAINNET.assetId));
+    console.log('withdrawalLimits', user.data.withdrawalLimits);
+    console.log('borrowLimits', user.data.borrowLimits);
+
     console.log('User principals');
     console.log('realPrincipals', user.data.realPrincipals);
     console.log('userPrincipal', user.data.principals);

tests/math/predictAPY.test.ts

@@ -1,4 +1,4 @@
-import { AssetConfig, AssetData, BalanceChangeType, calculatePresentValue, Evaa, EvaaUser, MAINNET_POOL_CONFIG, MASTER_CONSTANTS, MasterConfig, MasterConstants, mulFactor, predictAPY, Prices, PricesCollector, RawPriceData, TON_MAINNET, UserDataActive, verifyPricesSign, verifyRawPriceDataSign } from "../../src";
+import { AssetConfig, AssetData, BalanceChangeType, calculatePresentValue, Evaa, EvaaUser, ExtendedAssetData, MAINNET_POOL_CONFIG, MASTER_CONSTANTS, MasterConfig, MasterConstants, mulFactor, predictAPY, Prices, PricesCollector, RawPriceData, TON_MAINNET, UserDataActive, verifyPricesSign, verifyRawPriceDataSign } from "../../src";
 import { Dictionary, OpenedContract, TonClient } from "@ton/ton";
 
 import dotenv from 'dotenv';
@@ -7,10 +7,10 @@ describe('parseUserData test', () => {
     dotenv.config();
     let clientMainNet;
     let evaaMainNet: OpenedContract<Evaa>;
-    let assetsData: Dictionary<bigint, AssetData>;
+    let assetsData: Dictionary<bigint, ExtendedAssetData>;
     let assetsConfig: Dictionary<bigint, AssetConfig>;
     let masterConstants: MasterConstants;
-    let tonData: AssetData;
+    let tonData: ExtendedAssetData;
     let tonConfig: AssetConfig;
     let totalSupply: bigint;
     let totalBorrow: bigint;
@@ -63,4 +63,15 @@ describe('parseUserData test', () => {
 
         expect(predicted.borrowInterest).toEqual(tonConfig.baseBorrowRate);
     });
+
+    test('test 0 value', () => {        
+        const predicted = predictAPY({
+            amount: 0n,
+            balanceChangeType: BalanceChangeType.Repay,
+            assetData: tonData,
+            assetConfig: tonConfig,
+            masterConstants: masterConstants
+        });
+        expect(predicted.borrowInterest).toEqual(tonData.borrowInterest);
+    });
 });

tests/supply_withdraw_test.ts

@@ -207,8 +207,8 @@ test('Just supply mainnet', async () => {
         console.log(e);
     }
 })*/
-/*
-test('Just withdraw', async () => {
+
+/*test('Just withdraw', async () => {
     console.log(priceData.dict);
     await evaaMainNet.getSync();
 
@@ -222,14 +222,14 @@ test('Just withdraw', async () => {
     await evaaMainNet.sendWithdraw(sender_mainnet, toNano(0.7), {
         queryID: 0n,
         includeUserCode: true,
-        amount: 100_000_000n,
+        amount: 200_000n,
         userAddress: address,
-        asset: TON_MAINNET,
+        asset: USDT_MAINNET,
         priceData: currentWithdrawPrices.dataCell,
         amountToTransfer: toNano(0),
         payload: Cell.EMPTY
     });
-})
+})*/
 
 /*test('Liquidate test', async () => {
     await evaa.getSync();