@evaafi/sdk 0.5.6 → 0.6.0-a

package/dist/types/Master.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
 export type MasterConstants = {
     FACTOR_SCALE: bigint;
@@ -20,7 +21,8 @@ export type PoolConfig = {
     masterAddress: Address;
     masterVersion: number;
     masterConstants: MasterConstants;
-    nftId: string;
+    oracles: OracleNFT[];
+    minimalOracles: number;
     poolAssetsConfig: PoolAssetsConfig;
     lendingCode: Cell;
 };
@@ -31,7 +33,6 @@ export type UpgradeConfig = {
     updateTime: number;
     freezeTime: number;
     userCode: Cell;
-    blankCode: Cell;
     newMasterCode: Cell | null;
     newUserCode: Cell | null;
 };
@@ -52,13 +53,20 @@ export type AssetConfig = {
     maxTotalSupply: bigint;
     reserveFactor: bigint;
     liquidationReserveFactor: bigint;
+    minPrincipalForRewards: bigint;
+    baseTrackingSupplySpeed: bigint;
+    baseTrackingBorrowSpeed: bigint;
 };
 export type MasterConfig = {
     ifActive: number;
     admin: Address;
-    adminPK: bigint;
+    oraclesInfo: OraclesInfo;
     tokenKeys: Cell | null;
-    walletToMaster: Cell | null;
+};
+export type OraclesInfo = {
+    numOracles: number;
+    threshold: number;
+    oracles: Cell | null;
 };
 export type AssetData = {
     sRate: bigint;
@@ -67,6 +75,9 @@ export type AssetData = {
     totalBorrow: bigint;
     lastAccural: bigint;
     balance: bigint;
+    trackingSupplyIndex: bigint;
+    trackingBorrowIndex: bigint;
+    awaitedSupply?: bigint;
 };
 export type AssetInterest = {
     supplyInterest: bigint;
@@ -95,3 +106,11 @@ export type AgregatedBalances = {
     totalBorrow: bigint;
     totalSupply: bigint;
 };
+export type OracleNFT = {
+    id: number;
+    address: string;
+};
+export type Oracle = {
+    id: number;
+    pubkey: Buffer;
+};

package/dist/types/User.d.ts

@@ -37,6 +37,9 @@ export type UserLiteData = {
     trackingBorrowIndex: bigint;
     dutchAuctionStart: number;
     backupCell: Cell;
+    rewards: Dictionary<bigint, UserRewards>;
+    backupCell1: Cell | null;
+    backupCell2: Cell | null;
 };
 export type UserDataActive = UserLiteData & {
     withdrawalLimits: Dictionary<bigint, bigint>;
@@ -67,7 +70,7 @@ export declare enum BalanceChangeType {
 export type PredictHealthFactorArgs = {
     balanceChangeType: BalanceChangeType;
     amount: bigint;
-    tokenSymbol: string;
+    asset: PoolAssetConfig;
     principals: Dictionary<bigint, bigint>;
     prices: Dictionary<bigint, bigint>;
     assetsData: ExtendedAssetsData;

package/dist/utils/merkleProof.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.convertToMerkleProof = convertToMerkleProof;
-exports.generateMerkleProofDirect = generateMerkleProofDirect;
-exports.generateMerkleProof = generateMerkleProof;
+exports.generateMerkleProof = exports.generateMerkleProofDirect = exports.convertToMerkleProof = void 0;
 const core_1 = require("@ton/core");
 function readUnaryLength(slice) {
     let res = 0;
@@ -22,6 +20,7 @@ function convertToMerkleProof(c) {
         .storeUint(c.depth(0), 16)
         .storeRef(c));
 }
+exports.convertToMerkleProof = convertToMerkleProof;
 function convertToPrunedBranch(c) {
     return endExoticCell((0, core_1.beginCell)()
         .storeUint(1, 8)
@@ -102,6 +101,8 @@ function generateMerkleProofDirect(dict, keys, keyObject) {
     const s = (0, core_1.beginCell)().storeDictDirect(dict).asSlice();
     return doGenerateMerkleProof('', s, keyObject.bits, keys.map((key) => keyObject.serialize(key).toString(2).padStart(keyObject.bits, '0')));
 }
+exports.generateMerkleProofDirect = generateMerkleProofDirect;
 function generateMerkleProof(dict, keys, keyObject) {
     return convertToMerkleProof(generateMerkleProofDirect(dict, keys, keyObject));
 }
+exports.generateMerkleProof = generateMerkleProof;

package/dist/utils/priceUtils.d.ts

@@ -1,7 +1,7 @@
+/// <reference types="node" />
 import { Cell, Dictionary, Slice } from "@ton/core";
 import { PriceData, RawPriceData } from "../types/Common";
 import { Oracle, PoolAssetsConfig } from "../types/Master";
-import 'promise.any';
 type OutputData = {
     metadata: {
         blockId: string;
@@ -36,7 +36,7 @@ export type OraclePricesData = {
     timestamp: number;
     prices: Dictionary<bigint, bigint>;
 };
-export declare function loadPrices(oracleNftId: String, endpoints: String[], timeout: number): Promise<OutputData>;
+export declare function loadPrices(oracleNftId: String, endpoints: String[]): Promise<OutputData>;
 export declare function parsePrices(outputData: OutputData, oracleId: number): Promise<RawPriceData>;
 export declare function verifyPrices(assets: PoolAssetsConfig): (priceData: RawPriceData) => boolean;
 export declare function getMedianPrice(pricesData: PriceData[], asset: bigint): bigint;

package/dist/utils/priceUtils.js

@@ -1,30 +1,22 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.loadPrices = loadPrices;
-exports.parsePrices = parsePrices;
-exports.verifyPrices = verifyPrices;
-exports.getMedianPrice = getMedianPrice;
-exports.packAssetsData = packAssetsData;
-exports.packPrices = packPrices;
-exports.createOracleDataProof = createOracleDataProof;
-exports.packOraclesData = packOraclesData;
-exports.sumDicts = sumDicts;
+exports.sumDicts = exports.packOraclesData = exports.createOracleDataProof = exports.packPrices = exports.packAssetsData = exports.getMedianPrice = exports.verifyPrices = exports.parsePrices = exports.loadPrices = void 0;
 const core_1 = require("@ton/core");
 const config_1 = require("../config");
 const merkleProof_1 = require("./merkleProof");
-require("promise.any");
-async function loadPrices(oracleNftId, endpoints, timeout) {
-    return await Promise.any(endpoints.map(x => loadOracleData(oracleNftId, x, timeout)));
+async function loadPrices(oracleNftId, endpoints) {
+    return await Promise.any(endpoints.map(x => loadOracleData(oracleNftId, x)));
 }
-async function loadOracleData(oracleNftId, endpoint, timeout) {
+exports.loadPrices = loadPrices;
+async function loadOracleData(oracleNftId, endpoint) {
     let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${oracleNftId}`, {
         headers: { accept: 'application/json' },
-        signal: AbortSignal.timeout(timeout)
+        signal: AbortSignal.timeout(5000)
     });
     let outputId = (await result.json());
     result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
         headers: { accept: 'application/json' },
-        signal: AbortSignal.timeout(timeout)
+        signal: AbortSignal.timeout(5000)
     });
     return await result.json();
 }
@@ -49,11 +41,12 @@ async function parsePrices(outputData, oracleId) {
         throw Error();
     }
 }
+exports.parsePrices = parsePrices;
 function verifyPrices(assets) {
     return function (priceData) {
         const timestamp = Date.now() / 1000;
         const pricesTime = priceData.timestamp;
-        for (const [key, asset] of Object.entries(assets)) {
+        for (const asset of assets) {
             if (!priceData.dict.has(asset.assetId)) {
                 return false;
             }
@@ -62,6 +55,7 @@ function verifyPrices(assets) {
         return timestamp - pricesTime < config_1.TTL_ORACLE_DATA_SEC;
     };
 }
+exports.verifyPrices = verifyPrices;
 function getMedianPrice(pricesData, asset) {
     const sorted = pricesData.map(x => x.dict.get(asset)).sort((a, b) => Number(a) - Number(b));
     const mid = Math.floor(sorted.length / 2);
@@ -72,6 +66,7 @@ function getMedianPrice(pricesData, asset) {
         return sorted[mid];
     }
 }
+exports.getMedianPrice = getMedianPrice;
 function packAssetsData(assetsData) {
     if (assetsData.length == 0) {
         throw new Error("No assets data to pack");
@@ -82,6 +77,7 @@ function packAssetsData(assetsData) {
         .storeMaybeRef(acc)
         .endCell(), null);
 }
+exports.packAssetsData = packAssetsData;
 function packPrices(assetsDataCell, oraclesDataCell) {
     let pricesCell = (0, core_1.beginCell)()
         .storeRef(assetsDataCell)
@@ -89,6 +85,7 @@ function packPrices(assetsDataCell, oraclesDataCell) {
         .endCell();
     return pricesCell;
 }
+exports.packPrices = packPrices;
 function createOracleDataProof(oracle, data, signature, assets) {
     let prunedDict = (0, merkleProof_1.generateMerkleProofDirect)(data.prices, assets, core_1.Dictionary.Keys.BigUint(256));
     let prunedData = (0, core_1.beginCell)().storeUint(data.timestamp, 32).storeMaybeRef(prunedDict).endCell();
@@ -96,6 +93,7 @@ function createOracleDataProof(oracle, data, signature, assets) {
     let oracleDataProof = (0, core_1.beginCell)().storeUint(oracle.id, 32).storeRef(merkleProof).storeBuffer(signature).asSlice();
     return oracleDataProof;
 }
+exports.createOracleDataProof = createOracleDataProof;
 function packOraclesData(oraclesData, assets) {
     if (oraclesData.length == 0) {
         throw new Error("no oracles data to pack");
@@ -103,6 +101,7 @@ function packOraclesData(oraclesData, assets) {
     let proofs = oraclesData.sort((d1, d2) => d1.oracle.id - d2.oracle.id).map(({ oracle, data, signature }) => createOracleDataProof(oracle, data, signature, assets));
     return proofs.reduceRight((acc, val) => (0, core_1.beginCell)().storeSlice(val).storeMaybeRef(acc).endCell(), null);
 }
+exports.packOraclesData = packOraclesData;
 // : String = "api.stardust-mainnet.iotaledger.net"
 function sumDicts(result, addendum) {
     for (const key of addendum.keys()) {
@@ -115,3 +114,4 @@ function sumDicts(result, addendum) {
         result.set(key, current + value);
     }
 }
+exports.sumDicts = sumDicts;

package/dist/utils/sha256BigInt.js

@@ -3,10 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sha256Hash = sha256Hash;
+exports.sha256Hash = void 0;
 const sha256_1 = __importDefault(require("crypto-js/sha256"));
 function sha256Hash(input) {
     const hash = (0, sha256_1.default)(input);
     const hashHex = hash.toString();
     return BigInt('0x' + hashHex);
 }
+exports.sha256Hash = sha256Hash;

package/dist/utils/tonConnectSender.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getLastSentBoc = getLastSentBoc;
-exports.getTonConnectSender = getTonConnectSender;
+exports.getTonConnectSender = exports.getLastSentBoc = void 0;
 const core_1 = require("@ton/core");
 /*
 This is not the best solution to get the BOC of the sent external message, however the Sender
@@ -12,6 +11,7 @@ let lastSentBoc;
 function getLastSentBoc() {
     return lastSentBoc;
 }
+exports.getLastSentBoc = getLastSentBoc;
 function getTonConnectSender(connector) {
     return {
         get address() {
@@ -34,3 +34,4 @@ function getTonConnectSender(connector) {
         },
     };
 }
+exports.getTonConnectSender = getTonConnectSender;

package/dist/utils/userJettonWallet.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = getUserJettonWallet;
+exports.getUserJettonWallet = void 0;
 const core_1 = require("@ton/core");
 const assets_1 = require("../constants/assets");
 function getUserJettonWallet(ownerAddress, poolAssetConfig) {
@@ -59,3 +59,4 @@ function getUserJettonWallet(ownerAddress, poolAssetConfig) {
         .endCell();
     return new core_1.Address(0, stateInit.hash());
 }
+exports.getUserJettonWallet = getUserJettonWallet;

package/dist/utils/utils.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isTonAsset = isTonAsset;
+exports.isTonAsset = void 0;
 function isTonAsset(asset) {
     return asset.name === 'TON';
 }
+exports.isTonAsset = isTonAsset;

package/package.json

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

package/src/api/math.ts

@@ -14,8 +14,9 @@ export function mulDiv(x: bigint, y: bigint, z: bigint): bigint {
 }
 
 export function mulDivC(x: bigint, y: bigint, z: bigint): bigint {
-    const mul = x * y;
-    return mul / z + (mul % z ? 1n : 0n);
+    //const mul = x * y;
+    //return mul / z + (mul % z ? 1n : 0n);
+    return BigInt(Math.ceil(Number(x * y) / Number(z)));
 }
 
 export function bigIntMax(...args: bigint[]): bigint {
@@ -147,85 +148,19 @@ export function getAgregatedBalances (
         const price = prices.get(assetId)!;
         const assetData = assetsData.get(assetId)!;
         const assetConfig = assetsConfig.get(assetId)!;
-  
+        // console.log('price', price);
         if (principal < 0) {
           user_total_borrow += presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals;
         } else {
           user_total_supply += presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals;
         }
-  
+        // console.log('aggregated', assetId, presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).type, presentValue(assetData.sRate, assetData.bRate, principal, masterConstants).amount * price / 10n ** assetConfig.decimals)
       }
     }
     return {totalSupply: user_total_supply, totalBorrow: user_total_borrow};
   }
 
-/**
- * @deprecated The method should be used only for main contract v5
- */
-export function isV5MainPoolContract(poolConfig: PoolConfig): boolean {
-  if ((poolConfig.masterAddress == MAINNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5) || 
-  (poolConfig.masterAddress == TESTNET_POOL_CONFIG.masterAddress && poolConfig.masterVersion == 5)) {
-    return true;
-  } else {
-    return false;
-  }
-}
-
-/**
- * @deprecated The method should be used only for main contract v5
- */
-export function calculateMaximumWithdrawAmountOld(
-    assetsConfig: ExtendedAssetsConfig,
-    assetsData: ExtendedAssetsData,
-    principals: Dictionary<bigint, bigint>,
-    prices: Dictionary<bigint, bigint>,
-    masterConstants: MasterConstants,
-    assetId: bigint,
-): bigint {
-    let withdrawAmountMax = 0n;
-
-    const assetConfig = assetsConfig.get(assetId) as AssetConfig;
-    const assetData = assetsData.get(assetId) as ExtendedAssetData;
-    const oldPrincipal = principals.get(assetId) as bigint;
-    const oldPresentValue = presentValue(assetData.sRate, assetData.bRate, oldPrincipal, masterConstants);
-
-    if (oldPresentValue.amount > assetConfig.dust) {
-        if(checkNotInDebtAtAll(principals)) {
-            withdrawAmountMax = oldPresentValue.amount; 
-        } else {
-            if (!prices.has(assetId)) {
-                return 0n;
-            }
-
-            //const borrowable = getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants);
-            const price = prices.get(assetId) as bigint;
-            const agregatedBalances = getAgregatedBalances(assetsData, assetsConfig, principals, principals, masterConstants);
-            let maxAmountToReclaim = 
-                mulDiv(
-                    agregatedBalances.totalSupply - mulDivC(agregatedBalances.totalBorrow, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
-                    10n**assetConfig.decimals,
-                    price
-                );
-          
-            withdrawAmountMax = bigIntMin(
-                maxAmountToReclaim,
-                oldPresentValue.amount
-            );
-        }
-    } else {
-        if (!prices.has(assetId)) {
-            return 0n;
-        }
-
-        const price = prices.get(assetId) as bigint;
-
-        return getAvailableToBorrow(assetsConfig, assetsData, principals, prices, masterConstants) * (10n ** assetConfig.decimals) / price;
-    }
-
-    return withdrawAmountMax;
-}
-
-export function calculateMaximumWithdrawAmount(  //  todo v6 ifelse dust not debt at all is fixed?
+export function calculateMaximumWithdrawAmount(
     assetsConfig: ExtendedAssetsConfig,
     assetsData: ExtendedAssetsData,
     principals: Dictionary<bigint, bigint>,
@@ -258,10 +193,12 @@ export function calculateMaximumWithdrawAmount(  //  todo v6 ifelse dust not deb
             }
             else if (price > 0) {
                 maxAmountToReclaim =
-                    mulDiv(
-                        mulDivC(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
-                        10n ** assetConfig.decimals, price
-                    );
+                    bigIntMax(0n, 
+                        mulDiv(
+                            mulDiv(borrowable, masterConstants.ASSET_COEFFICIENT_SCALE, assetConfig.collateralFactor),
+                            10n ** assetConfig.decimals, price)
+                            - calculatePresentValue(assetData.sRate, assetConfig.dust, masterConstants) / 2n
+                        );
             }
           
             withdrawAmountMax = bigIntMin(
@@ -299,13 +236,13 @@ export function getAvailableToBorrow(
         const principal = principals.get(assetID) as bigint;
 
         if (principal < 0) {
-            borrowAmount += (calculatePresentValue(assetData.bRate, -principal, masterConstants) * price) / 10n ** assetConfig.decimals;
+            borrowAmount += mulDiv(calculatePresentValue(assetData.bRate, -principal, masterConstants), price, 10n ** assetConfig.decimals);
         } else if (principal > 0) {
             borrowLimit +=
-            mulDivC(
-                mulDivC(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
-                assetConfig.collateralFactor,
-                masterConstants.ASSET_COEFFICIENT_SCALE);
+                mulDiv(
+                    mulDiv(calculatePresentValue(assetData.sRate, principal, masterConstants), price, 10n ** assetConfig.decimals),
+                    assetConfig.collateralFactor,
+                    masterConstants.ASSET_COEFFICIENT_SCALE);
         }
     }
 
@@ -405,7 +342,7 @@ export function calculateLiquidationData(
                 loanScale -
             10n;
         minCollateralAmount = (minCollateralAmount * 97n) / 100n;
-        if (minCollateralAmount / collateralDecimal >= 1n) {
+        if (minCollateralAmount / collateralDecimal >= 0n) {  // todo back to 1
             return {
                 greatestCollateralAsset: collateralAsset,
                 greatestCollateralValue: collateralValue,
@@ -433,10 +370,11 @@ export function calculateLiquidationData(
 
 export function predictHealthFactor(args: PredictHealthFactorArgs): number {
     const liquidationData = calculateLiquidationData(args.assetsConfig, args.assetsData, args.principals, args.prices, args.poolConfig);
-    const tokenHash = sha256Hash(args.tokenSymbol);
+    const assetId = args.asset.assetId;
     
-    const assetConfig = args.assetsConfig.get(tokenHash)!;
-    const assetPrice = Number(args.prices.get(tokenHash)!);
+    const assetConfig = args.assetsConfig.get(assetId)!;
+    const assetPrice = Number(args.prices.get(assetId)!);
+    const assetData = args.assetsData.get(assetId)!;
    
     let totalLimit = Number(liquidationData.totalLimit);
     let totalBorrow = Number(liquidationData.totalDebt);