@evaafi/sdk 0.6.0 → 0.6.1

package/src/contracts/MasterContract.ts

@@ -20,7 +20,7 @@ import { parseMasterData } from '../api/parser';
 import { MasterData, PoolAssetConfig, PoolConfig} from '../types/Master';
 import { JettonWallet } from './JettonWallet';
 import { getUserJettonWallet } from '../utils/userJettonWallet';
-import { getPrices, isTonAsset, MAINNET_POOL_CONFIG } from '..';
+import { getPrices, isTonAsset, isTonAssetId, MAINNET_POOL_CONFIG } from '..';
 
 /**
  * Parameters for the Evaa contract
@@ -107,6 +107,7 @@ export type LiquidationParameters = LiquidationBaseData & {
     includeUserCode: boolean;
     priceData: Cell;
     payload: Cell;
+    payloadForwardAmount: bigint;
 };
 
 /**
@@ -114,7 +115,7 @@ export type LiquidationParameters = LiquidationBaseData & {
  */
 export class Evaa implements Contract {
     readonly address: Address;
-    private poolConfig: PoolConfig;
+    private _poolConfig: PoolConfig;
     private readonly debug?: boolean;
     private _data?: MasterData;
     private lastSync = 0;
@@ -124,11 +125,18 @@ export class Evaa implements Contract {
      * @param parameters Evaa contract parameters
      */
     constructor(parameters?: EvaaParameters) {
-        this.poolConfig = parameters?.poolConfig ?? MAINNET_POOL_CONFIG;
-        this.address = this.poolConfig.masterAddress;
+        this._poolConfig = parameters?.poolConfig ?? MAINNET_POOL_CONFIG;
+        this.address = this._poolConfig.masterAddress;
         this.debug = parameters?.debug;
     }
 
+    /**
+     * Returns pool config
+     */
+    get poolConfig(): PoolConfig {
+        return this._poolConfig;
+    }
+
     /**
      * Create supply message
      * @returns supply message as a cell
@@ -212,7 +220,7 @@ export class Evaa implements Contract {
                         // the exact amount of transferred jettons for liquidation is known
                         .storeUint(0, 64)
                         .storeRef(beginCell()
-                            .storeUint(parameters.forwardAmount ?? 0, 64) // idk .. ) todo check
+                            .storeUint(parameters.payloadForwardAmount ?? 0, 64)
                             .storeRef(parameters.payload)
                         .endCell())
                         .storeRef(parameters.priceData)
@@ -230,7 +238,7 @@ export class Evaa implements Contract {
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.liquidationAmount, 64)
                 .storeRef(beginCell()
-                    .storeUint(parameters.forwardAmount ?? 0, 64) // idk .. ) todo check
+                    .storeUint(parameters.payloadForwardAmount ?? 0, 64)
                     .storeRef(parameters.payload)
                 .endCell())
                 .storeRef(parameters.priceData)
@@ -268,7 +276,7 @@ export class Evaa implements Contract {
      * @returns user contract
      */
     openUserContract(userAddress: Address): EvaaUser {
-        return EvaaUser.createFromAddress(this.calculateUserSCAddr(userAddress, this.poolConfig.lendingCode), this.poolConfig);
+        return EvaaUser.createFromAddress(this.calculateUserSCAddr(userAddress, this._poolConfig.lendingCode), this._poolConfig);
     }
 
     getOpenedUserContract(provider: ContractProvider, userAddress: Address): OpenedContract<EvaaUser> {
@@ -327,7 +335,7 @@ export class Evaa implements Contract {
     ) {
         const message = this.createLiquidationMessage(parameters);
 
-        if (!isTonAsset(parameters.asset)) {
+        if (!isTonAssetId(parameters.loanAsset)) {
             if (!via.address) {
                 throw Error('Via address is required for jetton liquidation');
             }
@@ -373,10 +381,10 @@ export class Evaa implements Contract {
     async getSync(provider: ContractProvider) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
-            this._data = parseMasterData(state.data!.toString('base64'), this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
-            if (this._data.upgradeConfig.masterCodeVersion !== this.poolConfig.masterVersion) {
+            this._data = parseMasterData(state.data!.toString('base64'), this._poolConfig.poolAssetsConfig, this._poolConfig.masterConstants);
+            if (this._data.upgradeConfig.masterCodeVersion !== this._poolConfig.masterVersion) {
                 throw Error(
-                    `Outdated SDK pool version. It supports only master code version ${this.poolConfig.masterVersion}, but the current master code version is ${this._data.upgradeConfig.masterCodeVersion}`,
+                    `Outdated SDK pool version. It supports only master code version ${this._poolConfig.masterVersion}, but the current master code version is ${this._data.upgradeConfig.masterCodeVersion}`,
                 );
             }
             this.lastSync = Math.floor(Date.now() / 1000);
@@ -387,9 +395,9 @@ export class Evaa implements Contract {
 
     async getPrices(provider: ContractProvider, endpoints?: string[]) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await getPrices(endpoints, this.poolConfig);
+            return await getPrices(endpoints, this._poolConfig);
         } else {
-            return await getPrices(undefined, this.poolConfig);
+            return await getPrices(undefined, this._poolConfig);
         }
     }
 }

package/src/contracts/UserContract.ts

@@ -20,6 +20,7 @@ export class EvaaUser implements Contract {
     /**
      * Create user contract wrapper from address
      * @param address user contract address
+     * @param poolConfig pool config
      */
     static createFromAddress(address: Address, poolConfig: PoolConfig = MAINNET_POOL_CONFIG) {
         return new EvaaUser(address, poolConfig);
@@ -34,6 +35,7 @@ export class EvaaUser implements Contract {
         provider: ContractProvider,
         assetsData: ExtendedAssetsData,
         assetsConfig: ExtendedAssetsConfig,
+        applyDust: boolean = false
     ) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
@@ -41,7 +43,8 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig
+                this.poolConfig,
+                applyDust
             );
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
@@ -96,6 +99,7 @@ export class EvaaUser implements Contract {
         assetsData: ExtendedAssetsData,
         assetsConfig: ExtendedAssetsConfig,
         prices: Dictionary<bigint, bigint>,
+        applyDust: boolean = false
     ) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
@@ -103,9 +107,10 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig
+                this.poolConfig,
+                applyDust
             );
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig, applyDust);
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
             this._data = { type: 'inactive' };

package/src/index.ts

@@ -12,9 +12,32 @@ export {
     calculateMaximumWithdrawAmount,
     presentValue,
     calculateLiquidationData,
-    predictHealthFactor
+    predictHealthFactor,
+    calculateHealthParams,
+    BigMath,
 } from './api/math';
 
+export {
+    calculateLiquidationAmounts,
+    calculateMinCollateralByTransferredAmount,
+    isLiquidatable,
+    isBadDebt,
+    addReserve,
+    deductReserve,
+    addLiquidationBonus,
+    deductLiquidationBonus,
+    toAssetAmount,
+    toAssetWorth,
+    PreparedAssetInfo,
+    PreparedAssetInfoResult,
+    prepareAssetInfo,
+    findAssetById,
+    selectGreatestAssets,
+    calculateAssetsValues,
+    AssetsValues,
+    SelectedAssets,
+} from './api/liquidation';
+
 // Parser
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
 
@@ -28,7 +51,7 @@ export {
     WithdrawParameters,
     LiquidationBaseData,
     LiquidationParameters,
-    Evaa,
+    Evaa
 } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';
 
@@ -79,10 +102,11 @@ export {
 export {
     MAINNET_POOL_CONFIG,
     TESTNET_POOL_CONFIG,
-    MAINNET_LP_POOL_CONFIG,
+    MAINNET_LP_POOL_CONFIG
 } from './constants/pools';
 
 export {
+    ASSET_ID,
     UNDEFINED_ASSET,
     TON_MAINNET,
     USDT_MAINNET,
@@ -95,11 +119,11 @@ export {
     TSTON_MAINNET,
     JUSDT_TESTNET,
     JUSDC_TESTNET,
-    STTON_TESTNET,
+    STTON_TESTNET
 } from './constants/assets';
 
-export * from './constants/assets'
-export * from './utils/utils'
+export * from './constants/assets';
+export * from './utils/utils';
 
 // Utils
 export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';

package/src/types/Master.ts

@@ -8,7 +8,10 @@ export type MasterConstants = {
     ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: bigint,
     ASSET_LIQUIDATION_THRESHOLD_SCALE: bigint,
     ASSET_LIQUIDATION_BONUS_SCALE: bigint,
-    ASSET_ORIGINATION_FEE_SCALE: bigint
+    ASSET_ORIGINATION_FEE_SCALE: bigint,
+    ASSET_SRATE_SCALE: bigint,
+    ASSET_BRATE_SCALE: bigint,
+    COLLATERAL_WORTH_THRESHOLD: bigint,
 };
 
 export type PoolAssetsConfig = PoolAssetConfig[];

package/src/types/User.ts

@@ -74,6 +74,14 @@ export type UserRewards = {
     trackingAccured: bigint;
 };
 
+export type HealthParamsArgs = {
+    assetsData: ExtendedAssetsData;
+    assetsConfig: ExtendedAssetsConfig;
+    principals: Dictionary<bigint, bigint>;
+    prices: Dictionary<bigint, bigint>;
+    poolConfig: PoolConfig;
+}
+
 export enum BalanceChangeType {
     Borrow = 0,
     Repay = 1,

package/src/utils/utils.ts

@@ -1,6 +1,10 @@
 import { PoolAssetConfig } from "../types/Master";
+import { ASSET_ID } from '../constants/assets';
 
 export function isTonAsset(asset: PoolAssetConfig) {
     return asset.name === 'TON';
 }
 
+export function isTonAssetId(assetId: bigint) {
+    return assetId === ASSET_ID.TON;
+}