@evaafi/sdk 0.5.4 → 0.5.6

package/src/contracts/MasterContract.ts

@@ -16,10 +16,10 @@ import {
 import { Maybe } from '@ton/core/dist/utils/maybe';
 import { EvaaUser } from './UserContract';
 import { parseMasterData } from '../api/parser';
-import { MasterData, PoolAssetConfig, PoolConfig, PoolJettonAssetConfig, PoolTonAssetConfig } from '../types/Master';
+import { MasterData, PoolAssetConfig, PoolConfig} from '../types/Master';
 import { JettonWallet } from './JettonWallet';
 import { getUserJettonWallet } from '../utils/userJettonWallet';
-import { getPricesByNft, MAINNET_POOL_CONFIG } from '..';
+import { getPrices, isTonAsset, MAINNET_POOL_CONFIG } from '..';
 
 /**
  * Parameters for the Evaa contract
@@ -31,51 +31,26 @@ export type EvaaParameters = {
     debug?: boolean;
 };
 
-/**
- * Parameters for the Jetton message
- * @property responseAddress - address to send excesses
- * @property forwardAmount - amount to forward to the destination address
- */
-export type JettonMessageParameters = {
-    responseAddress?: Address;
-    forwardAmount?: bigint;
-};
-
 /**
  * Base parameters for supply
  * @property queryID - unique query ID
  * @property includeUserCode - true to include user code for update (needed when user contract code version is outdated)
  * @property amount - amount to supply
  * @property userAddress - user address
- * @property assetID - asset ID
+ * @property asset
  */
-export type SupplyBaseParameters = {
+export type SupplyParameters = {
+    asset: PoolAssetConfig
     queryID: bigint;
     includeUserCode: boolean;
     amount: bigint;
     userAddress: Address;
+    responseAddress?: Address;
+    forwardAmount?: bigint;
     /* Will be in v6 
     amountToTransfer: bigint;
     payload: Cell; */
-};
-/**
- * Parameters for the TON supply message
- * @property type - 'ton'
- */
-export type TonSupplyParameters = SupplyBaseParameters & {
-    asset: PoolAssetConfig;
-};
-/**
- * Parameters for the jetton supply message
- * @property type - 'jetton'
- */
-export type JettonSupplyParameters = SupplyBaseParameters &
-    JettonMessageParameters & {
-        asset: PoolJettonAssetConfig & PoolAssetConfig;
-    };
-
-export type SupplyParameters = TonSupplyParameters | JettonSupplyParameters;
-
+}
 
 /**
  * Parameters for the withdraw message
@@ -124,29 +99,16 @@ export type LiquidationBaseData = {
  * @property includeUserCode - true to include user code for update (needed when user contract code version is outdated)
  * @property priceData - price data cell. Can be obtained from the getPrices function
  */
-export type LiquidationBaseParameters = LiquidationBaseData & {
+export type LiquidationParameters = LiquidationBaseData & {
+    asset: PoolAssetConfig;
     queryID: bigint;
     liquidatorAddress: Address;
     includeUserCode: boolean;
     priceData: Cell;
+    responseAddress?: Address;
+    forwardAmount?: bigint;
 };
 
-/**
- * Parameters for the TON liquidation message
- * @property type - 'ton'
- */
-export type TonLiquidationParameters = LiquidationBaseParameters & {
-    asset: PoolAssetConfig;
-};
-/**
- * Parameters for the jetton liquidation message
- * @property type - 'jetton'
- */
-export type JettonLiquidationParameters = LiquidationBaseParameters &
-    JettonMessageParameters & {
-        asset: PoolAssetConfig & PoolJettonAssetConfig
-    };
-
 /**
  * Evaa master contract wrapper
  */
@@ -172,17 +134,15 @@ export class Evaa implements Contract {
      * @returns supply message as a cell
      */
     createSupplyMessage(parameters: SupplyParameters): Cell {
-        if ('jettonMasterAddress' in parameters.asset) {
-            const jettonParams = parameters as JettonSupplyParameters;
-
+        if (!isTonAsset(parameters.asset)) {
             return beginCell()
                 .storeUint(OPCODES.JETTON_TRANSFER, 32)
                 .storeUint(parameters.queryID, 64)
                 .storeCoins(parameters.amount)
                 .storeAddress(this.address)
-                .storeAddress(jettonParams.responseAddress ?? parameters.userAddress)
+                .storeAddress(parameters.responseAddress ?? parameters.userAddress)
                 .storeBit(0)
-                .storeCoins(jettonParams.forwardAmount ?? FEES.SUPPLY_JETTON_FWD)
+                .storeCoins(parameters.forwardAmount ?? FEES.SUPPLY_JETTON_FWD)
                 .storeBit(1)
                 .storeRef(
                     beginCell()
@@ -232,18 +192,16 @@ export class Evaa implements Contract {
      * Create liquidation message
      * @returns liquidation message as a cell
      */
-    createLiquidationMessage(parameters: TonLiquidationParameters | JettonLiquidationParameters): Cell {
-        if ('jettonMasterAddress' in parameters.asset) {
-            const jettonParams = parameters as JettonLiquidationParameters;
-
+    createLiquidationMessage(parameters: LiquidationParameters): Cell {
+        if (!isTonAsset(parameters.asset)) {
             return beginCell()
                 .storeUint(OPCODES.JETTON_TRANSFER, 32)
                 .storeUint(parameters.queryID, 64)
                 .storeCoins(parameters.liquidationAmount)
                 .storeAddress(this.address)
-                .storeAddress(jettonParams.responseAddress ?? parameters.liquidatorAddress)
+                .storeAddress(parameters.responseAddress ?? parameters.liquidatorAddress)
                 .storeBit(0)
-                .storeCoins(jettonParams.forwardAmount ?? FEES.LIQUIDATION_JETTON_FWD)
+                .storeCoins(parameters.forwardAmount ?? FEES.LIQUIDATION_JETTON_FWD)
                 .storeBit(1)
                 .storeRef(
                     beginCell()
@@ -323,11 +281,11 @@ export class Evaa implements Contract {
         provider: ContractProvider,
         via: Sender,
         value: bigint,
-        parameters: TonSupplyParameters | JettonSupplyParameters,
+        parameters: SupplyParameters,
     ) {
         const message = this.createSupplyMessage(parameters);
 
-        if ('jettonMasterAddress' in parameters.asset) {
+        if (!isTonAsset(parameters.asset)) {
             if (!via.address) {
                 throw Error('Via address is required for jetton supply');
             }
@@ -360,11 +318,11 @@ export class Evaa implements Contract {
         provider: ContractProvider,
         via: Sender,
         value: bigint,
-        parameters: TonLiquidationParameters | JettonLiquidationParameters,
+        parameters: LiquidationParameters,
     ) {
         const message = this.createLiquidationMessage(parameters);
 
-        if ('jettonMasterAddress' in parameters.asset) {
+        if (!isTonAsset(parameters.asset)) {
             if (!via.address) {
                 throw Error('Via address is required for jetton liquidation');
             }
@@ -424,9 +382,9 @@ export class Evaa implements Contract {
 
     async getPrices(provider: ContractProvider, endpoints?: string[]) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await getPricesByNft(this.poolConfig.nftId, endpoints);
+            return await getPrices(endpoints, this.poolConfig.nftId);
         } else {
-            return await getPricesByNft(this.poolConfig.nftId);
+            return await getPrices(undefined, this.poolConfig.nftId);
         }
     }
 }

package/src/contracts/UserContract.ts

@@ -1,7 +1,7 @@
 import { Address, beginCell, Cell, Contract, ContractProvider, Dictionary, Sender, SendMode } from '@ton/core';
 import { UserData, UserLiteData } from '../types/User';
 import { parseUserData, parseUserLiteData } from '../api/parser';
-import { AssetConfig, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, PoolConfig } from '../types/Master';
+import { ExtendedAssetsConfig, ExtendedAssetsData, PoolConfig } from '../types/Master';
 import { LiquidationBaseData } from './MasterContract';
 import { OPCODES } from '../constants/general';
 import { MAINNET_POOL_CONFIG } from '../constants/pools';
@@ -41,8 +41,7 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig.poolAssetsConfig,
-                this.poolConfig.masterConstants
+                this.poolConfig
             );
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
@@ -64,7 +63,7 @@ export class EvaaUser implements Contract {
         prices: Dictionary<bigint, bigint>,
     ): boolean {
         if (this._liteData) {
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
             return true;
         }
         return false;
@@ -104,10 +103,9 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig.poolAssetsConfig,
-                this.poolConfig.masterConstants
+                this.poolConfig
             );
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
             this._data = { type: 'inactive' };
@@ -153,11 +151,11 @@ export class EvaaUser implements Contract {
 
         return {
             borrowerAddress: this._data.ownerAddress,
-            loanAsset: this._data.liquidationData.greatestLoanAsset,
-            collateralAsset: this._data.liquidationData.greatestCollateralAsset,
+            loanAsset: this._data.liquidationData.greatestLoanAsset.assetId,
+            collateralAsset: this._data.liquidationData.greatestCollateralAsset.assetId,
             minCollateralAmount: this._data.liquidationData.minCollateralAmount,
             liquidationAmount: this._data.liquidationData.liquidationAmount,
-            tonLiquidation: this._data.liquidationData.greatestLoanAsset === TON_MAINNET.assetId,
+            tonLiquidation: this._data.liquidationData.greatestLoanAsset.assetId === TON_MAINNET.assetId,
         };
     }
 }

package/src/index.ts

@@ -9,6 +9,7 @@ export {
     calculateAssetData,
     calculateAssetInterest,
     getAvailableToBorrow,
+    calculateMaximumWithdrawAmount,
     presentValue,
     calculateLiquidationData,
 } from './api/math';
@@ -17,19 +18,14 @@ export {
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
 
 // Prices
-export { getPricesByNft } from './api/prices';
+export { getPrices } from './api/prices';
 
 // Contracts' wrappers
 export { JettonWallet } from './contracts/JettonWallet';
 export {
     EvaaParameters,
-    JettonMessageParameters,
-    TonSupplyParameters,
-    JettonSupplyParameters,
     WithdrawParameters,
     LiquidationBaseData,
-    TonLiquidationParameters,
-    JettonLiquidationParameters,
     Evaa,
 } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';
@@ -80,10 +76,10 @@ export {
     MAINNET_POOL_CONFIG,
     TESTNET_POOL_CONFIG,
     MAINNET_LP_POOL_CONFIG,
-    TESTNET_LP_POOL_CONFIG
 } from './constants/pools';
 
 export {
+    UNDEFINED_ASSET,
     TON_MAINNET,
     USDT_MAINNET,
     TONUSDT_DEDUST_MAINNET,
@@ -99,6 +95,7 @@ export {
 } from './constants/assets';
 
 export * from './constants/assets'
+export * from './utils/utils'
 
 // Utils
 export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';

package/src/types/Master.ts

@@ -6,19 +6,15 @@ export type MasterConstants = {
     ASSET_PRICE_SCALE: bigint,
     ASSET_RESERVE_FACTOR_SCALE: bigint,
     ASSET_LIQUIDATION_RESERVE_FACTOR_SCALE: bigint,
+    ASSET_LIQUIDATION_THRESHOLD_SCALE: bigint,
+    ASSET_LIQUIDATION_BONUS_SCALE: bigint,
     ASSET_ORIGINATION_FEE_SCALE: bigint
 };
 
-export type PoolAssetConfig = (PoolTonAssetConfig | PoolJettonAssetConfig) & {
-    name: string;
-};
 export type PoolAssetsConfig = PoolAssetConfig[];
 
-export type PoolTonAssetConfig = {
-    assetId: bigint;
-}
-
-export type PoolJettonAssetConfig = {
+export type PoolAssetConfig = {
+    name: string;
     assetId: bigint;
     jettonMasterAddress: Address;
     jettonWalletCode: Cell;
@@ -115,3 +111,8 @@ export type MasterData = {
         borrow: Dictionary<bigint, number>;
     };
 };
+
+export type AgregatedBalances = {
+    totalBorrow: bigint;
+    totalSupply: bigint;
+}

package/src/types/User.ts

@@ -1,5 +1,5 @@
 import { Address, Cell, Dictionary } from '@ton/core';
-import { AssetConfig, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConfig, MasterConstants } from './Master';
+import { AssetConfig, ExtendedAssetData, ExtendedAssetsConfig, ExtendedAssetsData, MasterConfig, MasterConstants, PoolAssetConfig, PoolConfig } from './Master';
 
 export enum BalanceType {
     supply = 'supply',
@@ -13,9 +13,9 @@ export type UserBalance = {
 
 export type UserLiqudationData = {
     greatestCollateralValue: bigint;
-    greatestCollateralAsset: bigint;
+    greatestCollateralAsset: PoolAssetConfig;
     greatestLoanValue: bigint;
-    greatestLoanAsset: bigint;
+    greatestLoanAsset: PoolAssetConfig;
     totalDebt: bigint;
     totalLimit: bigint;
 };
@@ -86,9 +86,9 @@ export type PredictHealthFactorArgs = {
     balanceChangeType: BalanceChangeType;
     amount: bigint;  // always positive
     tokenSymbol: string;
-    balances: Dictionary<bigint, bigint>;
+    principals: Dictionary<bigint, bigint>;
     prices: Dictionary<bigint, bigint>;
     assetsData: ExtendedAssetsData;
     assetsConfig: ExtendedAssetsConfig;
-    masterConstants: MasterConstants;
+    poolConfig: PoolConfig;
 };

package/src/utils/userJettonWallet.ts

@@ -1,7 +1,11 @@
 import { Address, beginCell, Cell, storeStateInit } from '@ton/core';
-import { PoolAssetConfig, PoolJettonAssetConfig } from '../types/Master';
+import { PoolAssetConfig } from '../types/Master';
+import { UNDEFINED_ASSET } from '../constants/assets';
 
-export function getUserJettonWallet(ownerAddress: Address, poolAssetConfig: PoolAssetConfig & PoolJettonAssetConfig) {
+export function getUserJettonWallet(ownerAddress: Address, poolAssetConfig: PoolAssetConfig) {
+  if (poolAssetConfig.name == 'TON' || poolAssetConfig.assetId === UNDEFINED_ASSET.assetId) {
+    throw new Error(`Cant getUserJettonWallet for ${poolAssetConfig.name} asset`)
+  }
     const jettonMasterAddress = poolAssetConfig.jettonMasterAddress;
     const jettonWalletCode = poolAssetConfig.jettonWalletCode;
 

package/src/utils/utils.ts

@@ -0,0 +1,6 @@
+import { PoolAssetConfig } from "../types/Master";
+
+export function isTonAsset(asset: PoolAssetConfig) {
+    return asset.name === 'TON';
+}
+