Merge pull request #21 from evaafi/sdk-v062a

Sdk v062a

Author: iMCrazyDev

CHANGELOG.md

@@ -4,6 +4,13 @@ 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-a - 2024-12-13
+### Added
+ - new field in UserLiteData ```user.data.realPrincipals``` -
+   principals before applying dusts
+### Fixed
+ - getPricesForWithdraw/getPricesForLiquidate they should now be called with a different argument 
+
 ## 0.6.2 - 2024-11-21
 ### Added
 - ALTS Pool

package.json

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

src/api/parser.ts

@@ -208,7 +208,8 @@ export function parseUserLiteData(
     const codeVersion = userSlice.loadCoins();
     const masterAddress = userSlice.loadAddress();
     const userAddress = userSlice.loadAddress();
-    const principalsDict = userSlice.loadDict(Dictionary.Keys.BigUint(256), Dictionary.Values.BigInt(64));
+    const realPrincipals = userSlice.loadDict(Dictionary.Keys.BigUint(256), Dictionary.Values.BigInt(64));
+    const principalsDict = Dictionary.empty(Dictionary.Keys.BigUint(256), Dictionary.Values.BigInt(64));
     const userState = userSlice.loadInt(64);
 
     let trackingSupplyIndex = 0n;
@@ -237,7 +238,7 @@ export function parseUserLiteData(
         const assetData = assetsData.get(asset.assetId) as ExtendedAssetData;
         const assetConfig = assetsConfig.get(asset.assetId) as AssetConfig;
 
-        let principal = principalsDict.get(asset.assetId) || 0n;
+        let principal = realPrincipals.get(asset.assetId) || 0n;
         let balance = presentValue(assetData.sRate, assetData.bRate, principal, masterConstants);
 
         if (applyDust && (principal > 0 && (principal < assetConfig.dust))) {
@@ -247,6 +248,8 @@ export function parseUserLiteData(
                 type: BalanceType.supply,
             };
             principalsDict.set(asset.assetId, 0n);
+        } else {
+            principalsDict.set(asset.assetId, principal);
         }
         userBalances.set(asset.assetId, balance);
     }
@@ -257,6 +260,7 @@ export function parseUserLiteData(
         masterAddress: masterAddress,
         ownerAddress: userAddress,
         principals: principalsDict,
+        realPrincipals: realPrincipals,
         state: userState,
         balances: userBalances,
         trackingSupplyIndex: trackingSupplyIndex,

src/constants/general.ts

@@ -23,7 +23,7 @@ export const NULL_ADDRESS = Address.parse('UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
 export const EVAA_MASTER_MAINNET = Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
 export const MAINNET_VERSION = 6;
 export const EVAA_MASTER_TESTNET = Address.parse('EQDLsg3w-iBj26Gww7neYoJAxiT2t77Zo8ro56b0yuHsPp3C');
-export const TESTNET_VERSION = 0;
+export const TESTNET_VERSION = 1;
 export const EVAA_LP_MAINNET = Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
 export const EVAA_LP_MAINNET_VERSION = 3;
 export const EVAA_ALTS_MAINNET = Address.parse('EQANURVS3fhBO9bivig34iyJQi97FhMbpivo1aUEAS2GYSu-');

src/constants/pools.ts

@@ -15,7 +15,7 @@ export const MAINNET_POOL_CONFIG: PoolConfig = {
         STTON_MAINNET,
         TSTON_MAINNET,
         USDT_MAINNET,
-        UTON_MAINNET // announce
+        // UTON_MAINNET // announce
     ],
     lendingCode: LENDING_CODE
 };

src/prices/PricesCollector.ts

@@ -29,18 +29,18 @@ export class PricesCollector {
 
     // TODO Make UserData class and incapsulate raw bigintegers
 
-    async getPricesForLiquidate(userPrincipals: Dictionary<bigint, bigint>, retries: number = 1, timeout: number = 3000): Promise<Prices>  {
-        const assets = userPrincipals.keys().map(x => this.#poolConfig.poolAssetsConfig.find(asset => asset.assetId == x));
+    async getPricesForLiquidate(realPrincipals: Dictionary<bigint, bigint>, retries: number = 1, timeout: number = 3000): Promise<Prices>  {
+        const assets = this.#filterEmptyPrincipalsAndAssets(realPrincipals);
         if (assets.includes(undefined)) {
             throw new Error("User from another pool");
         }
         return await this.getPrices(assets.map(x => x!), retries, timeout);
     }
 
 
-    async getPricesForWithdraw(userPrincipals: Dictionary<bigint, bigint>, withdrawAsset: PoolAssetConfig, collateralToDebt = false, retries: number = 1, timeout: number = 3000): Promise<Prices>  {
-        let assets = userPrincipals.keys().map(x => this.#poolConfig.poolAssetsConfig.find(asset => asset.assetId == x));
-        if (checkNotInDebtAtAll(userPrincipals) && userPrincipals.has(withdrawAsset.assetId) && !collateralToDebt) {
+    async getPricesForWithdraw(realPrincipals: Dictionary<bigint, bigint>, withdrawAsset: PoolAssetConfig, collateralToDebt = false, retries: number = 1, timeout: number = 3000): Promise<Prices>  {
+        let assets = this.#filterEmptyPrincipalsAndAssets(realPrincipals);
+        if (checkNotInDebtAtAll(realPrincipals) && (realPrincipals.get(withdrawAsset.assetId) ?? 0n) > 0n && !collateralToDebt) {
             return new Prices(Dictionary.empty<bigint, bigint>(), Cell.EMPTY);
         }
 
@@ -132,4 +132,8 @@ export class PricesCollector {
         this.#prices = this.#prices.filter(verifyPricesTimestamp());
         return this.#prices.length;
     }
+
+    #filterEmptyPrincipalsAndAssets(principals: Dictionary<bigint, bigint>) {
+        return principals.keys().filter(x => principals.get(x)! > 0n).map(x => this.#poolConfig.poolAssetsConfig.find(asset => asset.assetId == x));
+    }
 }

src/types/User.ts

@@ -1,4 +1,4 @@
-import { Address, Cell, Dictionary } from '@ton/core';
+import { Address, BitBuilder, Cell, Dictionary } from '@ton/core';
 import { AssetConfig, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConfig, MasterConstants, PoolAssetConfig, PoolConfig } from './Master';
 
 export enum BalanceType {
@@ -38,6 +38,7 @@ export type UserLiteData = {
     masterAddress: Address;
     ownerAddress: Address;
     principals: Dictionary<bigint, bigint>;
+    realPrincipals: Dictionary<bigint, bigint>;  // principals before applying dusts
     state: number;
     balances: Dictionary<bigint, UserBalance>;
     trackingSupplyIndex: bigint;
@@ -59,7 +60,6 @@ export type UserDataActive = UserLiteData & {
     limitUsedPercent: number;
     limitUsed: bigint;
     healthFactor: number;
-
     liquidationData: LiquidationData;
 };
 

tests/dust_test.ts

@@ -1,4 +1,4 @@
-import {BalanceChangeType, createAssetConfig, Evaa, EVAA_MASTER_MAINNET, getPrices, MAINNET_LP_POOL_CONFIG, MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG, UserDataActive} from '../src';
+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 {Address, beginCell, Dictionary, TonClient} from '@ton/ton';
 import dotenv from 'dotenv';
 import { predictHealthFactor } from '../src/api/math';
@@ -8,30 +8,33 @@ let client: TonClient;
 beforeAll(async () => {
     dotenv.config();
     client = new TonClient({
-        endpoint: 'https://testnet.toncenter.com/api/v2/jsonRPC',
-        apiKey: process.env.RPC_API_KEY,
+        endpoint: 'https://toncenter.com/api/v2/jsonRPC',
+        apiKey: process.env.RPC_API_KEY_MAINNET,
     });
 });
 
 test('Manual dust check', async () => {
-    const evaa = client.open(new Evaa({poolConfig: TESTNET_POOL_CONFIG}));
+    const evaa = client.open(new Evaa({poolConfig: MAINNET_POOL_CONFIG}));
     await evaa.getSync();
-    const user = client.open(await evaa.openUserContract(Address.parseFriendly("0QAq-I1fRZcegpp2bDALewjsXfdYRnYqE7KMA8DIi98EQLBd").address));
+    const user = client.open(await evaa.openUserContract(Address.parseFriendly("UQD0x5tVfMGTgUJpOvn6as58kKJEremAaXq8_rP3rA2bW3D9").address));
 
-    const priceData = await evaa.getPrices();
+    const collector = new PricesCollector(MAINNET_POOL_CONFIG);
     //console.log('priceData', priceData);
-    await user.getSync(evaa.data!.assetsData, evaa.data!.assetsConfig, priceData!.dict);
+    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('User principals')
-    for (const asset of TESTNET_POOL_CONFIG.poolAssetsConfig) {
+    console.log('User principals');
+    console.log('realPrincipals', user.data.realPrincipals);
+    console.log('userPrincipal', user.data.principals);
+    console.log('getPricesForWithdraw', (await collector.getPricesForWithdraw(user.data.realPrincipals, USDT_MAINNET)).dict);
+    /*for (const asset of TESTNET_POOL_CONFIG.poolAssetsConfig) {
         if (!user.data.principals.has(asset.assetId)) {
             continue;
         }
         console.log('Asset: ', ' dust ', evaa.data?.assetsConfig.get(asset.assetId)?.dust, ' principal ', user.data.principals.get(asset.assetId),
             ' Withdrawal limits ', user.data.withdrawalLimits.get(asset.assetId), '  balances ', user.data.balances);
-    }
+    }*/
 });