@evaafi/sdk 0.5.1 → 0.5.3

package/dist/api/math.js

@@ -222,7 +222,8 @@ function predictHealthFactor(args) {
     const decimals = Number(assetConfig.decimals);
     const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
     const changeType = args.balanceChangeType;
-    if (currentAmount != null && currentAmount != 0n) {
+    if (currentAmount != null && !Number.isNaN(currentAmount) &&
+        Number.isFinite(currentAmount) && currentAmount != 0n) {
         if (changeType == User_1.BalanceChangeType.Borrow) {
             totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(constants_1.MASTER_CONSTANTS.ASSET_ORIGINATION_FEE_SCALE));
         }

package/dist/api/prices.d.ts

@@ -1,2 +1,2 @@
 import { PriceData } from '../types/Common';
-export declare function getPrices(endpoint?: String): Promise<PriceData | undefined>;
+export declare function getPrices(endpoints?: string[]): Promise<PriceData>;

package/dist/api/prices.js

@@ -3,27 +3,24 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getPrices = void 0;
 const core_1 = require("@ton/core");
 const constants_1 = require("../constants");
-async function getPrices(endpoint = "api.stardust-mainnet.iotaledger.net") {
-    try {
-        let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${constants_1.NFT_ID}`, {
-            headers: { accept: 'application/json' },
-        });
-        let outputId = (await result.json());
-        result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
-            headers: { accept: 'application/json' },
-        });
-        let resData = (await result.json());
-        const data = JSON.parse(decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
-        const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
-        const signature = Buffer.from(data['signature'], 'hex');
-        return {
-            dict: pricesCell.beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(64)),
-            dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
-        };
-    }
-    catch (error) {
-        console.error(error);
-        return undefined;
-    }
+async function getPrices(endpoints = ["api.stardust-mainnet.iotaledger.net"]) {
+    return await Promise.any(endpoints.map(x => loadPrices(x)));
 }
 exports.getPrices = getPrices;
+async function loadPrices(endpoint = "api.stardust-mainnet.iotaledger.net") {
+    let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${constants_1.NFT_ID}`, {
+        headers: { accept: 'application/json' },
+    });
+    let outputId = (await result.json());
+    result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
+        headers: { accept: 'application/json' },
+    });
+    let resData = (await result.json());
+    const data = JSON.parse(decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
+    const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+    const signature = Buffer.from(data['signature'], 'hex');
+    return {
+        dict: pricesCell.beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigUint(64)),
+        dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
+    };
+}

package/dist/contracts/MasterContract.js

@@ -224,7 +224,7 @@ class Evaa {
     async getSync(provider) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
-            this._data = (0, parser_1.parseMasterData)(state.data.toString('base64url'), this.network === 'testnet');
+            this._data = (0, parser_1.parseMasterData)(state.data.toString('base64'), this.network === 'testnet');
             if (this.network === 'testnet' && this._data.upgradeConfig.masterCodeVersion !== constants_1.TESTNET_VERSION) {
                 throw Error(`Outdated SDK version. It supports only master code version ${constants_1.TESTNET_VERSION} on testnet, but the current master code version is ${this._data.upgradeConfig.masterCodeVersion}`);
             }

package/dist/contracts/UserContract.js

@@ -25,7 +25,7 @@ class EvaaUser {
     async getSyncLite(provider, assetsData, assetsConfig) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
-            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64url'), assetsData, assetsConfig, this.testnet);
+            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64'), assetsData, assetsConfig, this.testnet);
             this.lastSync = Math.floor(Date.now() / 1000);
         }
         else {
@@ -65,7 +65,7 @@ class EvaaUser {
     async getSync(provider, assetsData, assetsConfig, prices) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
-            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64url'), assetsData, assetsConfig, this.testnet);
+            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64'), assetsData, assetsConfig, this.testnet);
             this._data = (0, parser_1.parseUserData)(this._liteData, assetsData, assetsConfig, prices, this.testnet);
             this.lastSync = Math.floor(Date.now() / 1000);
         }

package/dist/index.d.ts

@@ -6,7 +6,7 @@ export { EvaaParameters, JettonMessageParameters, TonSupplyParameters, JettonSup
 export { EvaaUser } from './contracts/UserContract';
 export { PriceData } from './types/Common';
 export { UpgradeConfig, AssetConfig, MasterConfig, AssetData, AssetInterest, AssetApy, ExtendedAssetData, MasterData, } from './types/Master';
-export { BalanceType, UserBalance, UserLiqudationData, LiquidableData, NonLiquidableData, LiquidationData, UserDataInactive, UserDataActive, UserData, } from './types/User';
+export { BalanceType, UserBalance, UserLiqudationData, LiquidableData, NonLiquidableData, LiquidationData, UserDataInactive, UserDataActive, UserData, BalanceChangeType } from './types/User';
 export { EVAA_MASTER_MAINNET, MAINNET_VERSION, EVAA_MASTER_TESTNET, TESTNET_VERSION, JETTON_MASTER_ADDRESSES, MASTER_CONSTANTS, LENDING_CODE, OPCODES, FEES, } from './constants';
 export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';
 export { getUserJettonWallet } from './utils/userJettonWallet';

package/dist/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
+exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.FEES = exports.OPCODES = exports.LENDING_CODE = exports.MASTER_CONSTANTS = exports.JETTON_MASTER_ADDRESSES = exports.TESTNET_VERSION = exports.EVAA_MASTER_TESTNET = exports.MAINNET_VERSION = exports.EVAA_MASTER_MAINNET = exports.BalanceChangeType = exports.BalanceType = exports.EvaaUser = exports.Evaa = exports.JettonWallet = exports.getPrices = exports.parseUserLiteData = exports.parseUserData = exports.parseMasterData = exports.createAssetConfig = exports.createAssetData = exports.calculateLiquidationData = exports.presentValue = exports.getAvailableToBorrow = exports.calculateAssetInterest = exports.calculateAssetData = exports.calculateCurrentRates = exports.calculatePresentValue = exports.bigIntMax = exports.bigIntMin = exports.mulDiv = exports.mulFactor = void 0;
 // Math
 var math_1 = require("./api/math");
 Object.defineProperty(exports, "mulFactor", { enumerable: true, get: function () { return math_1.mulFactor; } });
@@ -33,6 +33,7 @@ var UserContract_1 = require("./contracts/UserContract");
 Object.defineProperty(exports, "EvaaUser", { enumerable: true, get: function () { return UserContract_1.EvaaUser; } });
 var User_1 = require("./types/User");
 Object.defineProperty(exports, "BalanceType", { enumerable: true, get: function () { return User_1.BalanceType; } });
+Object.defineProperty(exports, "BalanceChangeType", { enumerable: true, get: function () { return User_1.BalanceChangeType; } });
 // Constants
 var constants_1 = require("./constants");
 Object.defineProperty(exports, "EVAA_MASTER_MAINNET", { enumerable: true, get: function () { return constants_1.EVAA_MASTER_MAINNET; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@evaafi/sdk",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "SDK for EVAA contracts",
   "main": "dist/index.js",
   "files": [

package/src/api/math.ts

@@ -267,7 +267,8 @@ export function predictHealthFactor(args: PredictHealthFactorArgs): number {
     const currentBalance = assetPrice * Number(currentAmount) / Math.pow(10, decimals);
     const changeType = args.balanceChangeType;
 
-    if (currentAmount != null && currentAmount != 0n) { 
+    if (currentAmount != null && !Number.isNaN(currentAmount) &&
+             Number.isFinite(currentAmount) && currentAmount != 0n) { 
         if (changeType == BalanceChangeType.Borrow) {
             totalBorrow += currentBalance * (1 + Number(assetConfig.originationFee) / Number(MASTER_CONSTANTS.ASSET_ORIGINATION_FEE_SCALE));
         } else if (changeType == BalanceChangeType.Repay) {

package/src/api/prices.ts

@@ -37,34 +37,33 @@ type OutputData = {
             data: string;
         }[];
     };
-};
+}
 
-export async function getPrices(endpoint: String = "api.stardust-mainnet.iotaledger.net"): Promise<PriceData | undefined> {
-    try {
-        let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${NFT_ID}`, {
-            headers: { accept: 'application/json' },
-        });
-        let outputId = (await result.json()) as NftData;
+export async function getPrices(endpoints: string[] = ["api.stardust-mainnet.iotaledger.net"]) {
+    return await Promise.any(endpoints.map(x => loadPrices(x)));
+}
 
-        result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
-            headers: { accept: 'application/json' },
-        });
+async function loadPrices(endpoint: String = "api.stardust-mainnet.iotaledger.net"): Promise<PriceData> {
+    let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${NFT_ID}`, {
+        headers: { accept: 'application/json' },
+    });
+    let outputId = (await result.json()) as NftData;
 
-        let resData = (await result.json()) as OutputData;
+    result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
+        headers: { accept: 'application/json' },
+    });
 
-        const data = JSON.parse(
-            decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')),
-        );
+    let resData = (await result.json()) as OutputData;
 
-        const pricesCell = Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
-        const signature = Buffer.from(data['signature'], 'hex');
+    const data = JSON.parse(
+        decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')),
+    );
 
-        return {
-            dict: pricesCell.beginParse().loadDictDirect(Dictionary.Keys.BigUint(256), Dictionary.Values.BigUint(64)),
-            dataCell: beginCell().storeRef(pricesCell).storeBuffer(signature).endCell(),
-        };
-    } catch (error) {
-        console.error(error);
-        return undefined;
-    }
+    const pricesCell = Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+    const signature = Buffer.from(data['signature'], 'hex');
+
+    return {
+        dict: pricesCell.beginParse().loadDictDirect(Dictionary.Keys.BigUint(256), Dictionary.Values.BigUint(64)),
+        dataCell: beginCell().storeRef(pricesCell).storeBuffer(signature).endCell(),
+    };
 }

package/src/contracts/MasterContract.ts

@@ -405,7 +405,7 @@ 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('base64url'), this.network === 'testnet');
+            this._data = parseMasterData(state.data!.toString('base64'), this.network === 'testnet');
             if (this.network === 'testnet' && this._data.upgradeConfig.masterCodeVersion !== TESTNET_VERSION) {
                 throw Error(
                     `Outdated SDK version. It supports only master code version ${TESTNET_VERSION} on testnet, but the current master code version is ${this._data.upgradeConfig.masterCodeVersion}`,

package/src/contracts/UserContract.ts

@@ -37,7 +37,7 @@ export class EvaaUser implements Contract {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
             this._liteData = parseUserLiteData(
-                state.data!.toString('base64url'),
+                state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
                 this.testnet,
@@ -99,7 +99,7 @@ export class EvaaUser implements Contract {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
             this._liteData = parseUserLiteData(
-                state.data!.toString('base64url'),
+                state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
                 this.testnet,

package/src/index.ts

@@ -56,6 +56,7 @@ export {
     UserDataInactive,
     UserDataActive,
     UserData,
+    BalanceChangeType
 } from './types/User';
 
 // Constants