@evaafi/sdk 0.9.0 → 0.9.1

package/dist/oracles/prices/ClassicPrices.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ClassicPrices = exports.ClassicPricesOffset = exports.ClassicPricesMode = void 0;
+const core_1 = require("@ton/core");
+const AbstractPrices_1 = require("./AbstractPrices");
+var ClassicPricesMode;
+(function (ClassicPricesMode) {
+    ClassicPricesMode["SPOT"] = "spot";
+    ClassicPricesMode["TWAP"] = "twap";
+})(ClassicPricesMode || (exports.ClassicPricesMode = ClassicPricesMode = {}));
+exports.ClassicPricesOffset = {
+    [ClassicPricesMode.SPOT]: 1n,
+    [ClassicPricesMode.TWAP]: 0n,
+};
+class ClassicPrices extends AbstractPrices_1.AbstractPrices {
+    constructor(params) {
+        super(params);
+        this.params = params;
+    }
+    static createEmptyTwapPrices() {
+        return new ClassicPrices({
+            mode: ClassicPricesMode.TWAP,
+            dict: core_1.Dictionary.empty(),
+            dataCell: core_1.Cell.EMPTY,
+            minPublishTime: undefined,
+            maxPublishTime: undefined,
+        });
+    }
+    static createEmptySpotPrices() {
+        return new ClassicPrices({
+            mode: ClassicPricesMode.SPOT,
+            dict: core_1.Dictionary.empty(),
+            dataCell: core_1.Cell.EMPTY,
+            minPublishTime: undefined,
+            maxPublishTime: undefined,
+        });
+    }
+    static createEmptyPrices() {
+        return new ClassicPrices({
+            mode: undefined,
+            dict: core_1.Dictionary.empty(),
+            dataCell: core_1.Cell.EMPTY,
+            minPublishTime: undefined,
+            maxPublishTime: undefined,
+        });
+    }
+}
+exports.ClassicPrices = ClassicPrices;

package/dist/oracles/prices/PythPrices.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="node" />
+/// <reference types="node" />
+import { HexString } from '@pythnetwork/hermes-client';
+import { PoolAssetConfig } from '../../types/Master';
+import { AbstractPrices, PriceParameters } from './AbstractPrices';
+export interface PythPricesParams extends PriceParameters {
+    targetFeeds: HexString[];
+    refAssets: PoolAssetConfig[];
+    binaryUpdate: Buffer;
+}
+export declare class PythPrices extends AbstractPrices {
+    private readonly params;
+    constructor(params: PythPricesParams);
+    static createEmptyPrices(): PythPrices;
+    refAssets(): PoolAssetConfig[];
+    targetFeeds(): HexString[];
+    binaryUpdate(): Buffer;
+}

package/dist/oracles/prices/PythPrices.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PythPrices = void 0;
+const core_1 = require("@ton/core");
+const AbstractPrices_1 = require("./AbstractPrices");
+class PythPrices extends AbstractPrices_1.AbstractPrices {
+    constructor(params) {
+        super(params);
+        this.params = params;
+    }
+    static createEmptyPrices() {
+        return new PythPrices({
+            dict: core_1.Dictionary.empty(),
+            dataCell: core_1.Cell.EMPTY,
+            minPublishTime: undefined,
+            maxPublishTime: undefined,
+            targetFeeds: [],
+            refAssets: [],
+            binaryUpdate: Buffer.alloc(0),
+        });
+    }
+    refAssets() {
+        return this.params.refAssets;
+    }
+    targetFeeds() {
+        return this.params.targetFeeds;
+    }
+    binaryUpdate() {
+        return this.params.binaryUpdate;
+    }
+}
+exports.PythPrices = PythPrices;

package/dist/oracles/prices/index.d.ts

@@ -0,0 +1,3 @@
+export * from './AbstractPrices';
+export * from './ClassicPrices';
+export * from './PythPrices';

package/dist/oracles/prices/index.js

@@ -0,0 +1,19 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./AbstractPrices"), exports);
+__exportStar(require("./ClassicPrices"), exports);
+__exportStar(require("./PythPrices"), exports);

package/dist/{prices → oracles}/utils.d.ts

@@ -1,9 +1,15 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Cell, Dictionary, Slice } from '@ton/core';
 import { EvaaOracle, ExtendedEvaaOracle } from '../types/Master';
 import { FetchConfig } from '../utils/utils';
+import { PriceData } from './prices';
 import { PriceSource } from './sources/PriceSource';
-import { OraclePricesData, PriceData, PriceSourcesConfig, RawPriceData } from './Types';
+import { OraclePricesData, PriceSourcesConfig, RawPriceData } from './Types';
+export declare const UPDATE_PRICE_FEEDS_BASE_GAS = 300000n;
+export declare const UPDATE_PRICE_FEEDS_PER_UPDATE_GAS = 90000n;
+export declare const GAS_PRICE_FACTOR = 400n;
+export declare function calcPythUpdateFee(numUpdates: number): bigint;
 export declare function verifyPricesTimestamp(): (priceData: RawPriceData) => boolean;
 export declare function getMedianPrice(pricesData: PriceData[], asset: bigint): bigint | null;
 export declare function packAssetsData(assetsData: {

package/dist/{prices → oracles}/utils.js

@@ -1,12 +1,21 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyRawPriceDataSign = exports.verifyPricesSign = exports.unpackMedianPrices = exports.collectAndFilterPrices = exports.generatePriceSources = exports.sumDicts = exports.packOraclesData = exports.createOracleDataProof = exports.packPrices = exports.packAssetsData = exports.getMedianPrice = exports.verifyPricesTimestamp = void 0;
+exports.verifyRawPriceDataSign = exports.verifyPricesSign = exports.unpackMedianPrices = exports.collectAndFilterPrices = exports.generatePriceSources = exports.sumDicts = exports.packOraclesData = exports.createOracleDataProof = exports.packPrices = exports.packAssetsData = exports.getMedianPrice = exports.verifyPricesTimestamp = exports.calcPythUpdateFee = exports.GAS_PRICE_FACTOR = exports.UPDATE_PRICE_FEEDS_PER_UPDATE_GAS = exports.UPDATE_PRICE_FEEDS_BASE_GAS = void 0;
 const core_1 = require("@ton/core");
 const crypto_1 = require("@ton/crypto");
 const merkleProof_1 = require("../utils/merkleProof");
 const constants_1 = require("./constants");
 const Backend_1 = require("./sources/Backend");
 const Icp_1 = require("./sources/Icp");
+exports.UPDATE_PRICE_FEEDS_BASE_GAS = 300000n;
+exports.UPDATE_PRICE_FEEDS_PER_UPDATE_GAS = 90000n;
+// Current settings in basechain are as follows: 1 unit of gas costs 400 nanotons
+exports.GAS_PRICE_FACTOR = 400n;
+// TODO: use PythContract for dynamic fee calc
+function calcPythUpdateFee(numUpdates) {
+    return (exports.UPDATE_PRICE_FEEDS_BASE_GAS + exports.UPDATE_PRICE_FEEDS_PER_UPDATE_GAS * BigInt(numUpdates)) * exports.GAS_PRICE_FACTOR;
+}
+exports.calcPythUpdateFee = calcPythUpdateFee;
 function verifyPricesTimestamp() {
     return function (priceData) {
         const timestamp = Date.now() / 1000;

package/dist/rewards/RewardMaster.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Cell, Contract, ContractProvider, Sender, StateInit } from '@ton/ton';
 import { Maybe } from '@ton/ton/dist/utils/maybe';
 import { EvaaRewardsConfig } from '../types/MasterRewards';

package/dist/rewards/RewardUser.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Cell, Contract, ContractProvider, Sender, StateInit } from '@ton/ton';
 import { Maybe } from '@ton/ton/dist/utils/maybe';
 import { EvaaUserRewardsConfig } from '../types/UserRewards';

package/dist/types/Master.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Cell, Dictionary } from '@ton/core';
-import { Oracle } from '../prices/Oracle.interface';
+import { AbstractCollector } from '../oracles';
 export { FeedMapItem, parseFeedsMapDict } from '../api/feeds';
 export type MasterConstants = {
     FACTOR_SCALE: bigint;
@@ -15,7 +16,6 @@ export type MasterConstants = {
     ASSET_BRATE_SCALE: bigint;
     COLLATERAL_WORTH_THRESHOLD: bigint;
 };
-export type PoolAssetsConfig = PoolAssetConfig[];
 export type PoolAssetConfig = {
     name: string;
     assetId: bigint;
@@ -26,9 +26,9 @@ export type PoolConfig = {
     masterAddress: Address;
     masterVersion: number;
     masterConstants: MasterConstants;
-    poolAssetsConfig: PoolAssetsConfig;
+    poolAssetsConfig: PoolAssetConfig[];
     lendingCode: Cell;
-    oracles: Oracle;
+    collector: AbstractCollector;
 };
 export type UpgradeConfig = {
     masterCodeVersion: number;
@@ -70,7 +70,7 @@ export type AssetData = {
     bRate: bigint;
     totalSupply: bigint;
     totalBorrow: bigint;
-    lastAccural: bigint;
+    lastAccrual: bigint;
     balance: bigint;
     trackingSupplyIndex: bigint;
     trackingBorrowIndex: bigint;

package/dist/types/MasterRewards.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaRewardsConfig = {

package/dist/types/UserRewards.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import { Address, Cell } from '@ton/ton';
 import { PoolAssetConfig } from './Master';
 export type EvaaUserRewardsConfig = {

package/dist/utils/sha256BigInt.d.ts

@@ -1,3 +1,4 @@
 /// <reference types="node" />
+/// <reference types="node" />
 export declare function sha256Hash(input: string): bigint;
 export declare function bigIntToBuffer(value: bigint): Buffer;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@evaafi/sdk",
-    "version": "0.9.0",
+    "version": "0.9.1",
     "description": "The EVAA SDK is designed to easily integrate with the EVAA lending protocol on TON blockchain.",
     "main": "dist/index.js",
     "files": [
@@ -41,6 +41,5 @@
         "@pythnetwork/pyth-ton-js": "^0.1.2",
         "@ton/ton": "14.0.0",
         "dotenv": "16.4.5"
-    },
-    "packageManager": "yarn@4.9.2+sha512.1fc009bc09d13cfd0e19efa44cbfc2b9cf6ca61482725eb35bbc5e257e093ebf4130db6dfe15d604ff4b79efd8e1e8e99b25fa7d0a6197c9f9826358d4d65c3c"
+    }
 }

package/src/api/feeds.ts

@@ -1,14 +1,16 @@
+import { HexString } from '@pythnetwork/hermes-client';
 import { Dictionary } from '@ton/ton';
 import { Buffer } from 'buffer';
-import { ASSET_ID } from '../constants/assets';
 
-export const PYTH_TON_PRICE_FEED_ID = '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026';
-export const PYTH_USDT_PRICE_FEED_ID = '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b';
-export const PYTH_STTON_PRICE_FEED_ID = '0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002';
-export const PYTH_TSTON_PRICE_FEED_ID = '0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25';
-export const PYTH_USDC_PRICE_FEED_ID = '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a';
-export const PYTH_USDE_PRICE_FEED_ID = '0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d';
-export const PYTH_TSUSDE_PRICE_FEED_ID = '0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19';
+export const FEED_ID = {
+    TON: '0x8963217838ab4cf5cadc172203c1f0b763fbaa45f346d8ee50ba994bbcac3026',
+    USDT: '0x2b89b9dc8fdf9f34709a5b106b472f0f39bb6ca9ce04b0fd7f2e971688e2e53b',
+    stTON: '0x9145e059026a4d5a46f3b96408f7e572e33b3257b9c2dbe8dba551c772762002',
+    tsTON: '0x3d1784128eeab5961ec60648fe497d3901eebd211b7f51e4bb0db9f024977d25',
+    USDC: '0xeaa020c61cc479712813461ce153894a96a6c00b21ed0cfc2798d1f9a9e9c94a',
+    USDe: '0x6ec879b1e9963de5ee97e9c8710b742d6228252a5e2ca12d4ae81d7fe5ee8c5d',
+    tsUSDe: '0xcbe184846426619a60f51056d26efecb0537ad3a73b1e965fe695d06a257cb19',
+};
 
 export function bigintToBuffer(value: bigint, size: number): Buffer {
     if (value < 0n) {
@@ -21,70 +23,32 @@ export function bigintToBuffer(value: bigint, size: number): Buffer {
     return Buffer.from(padded, 'hex');
 }
 
-export const packConnectedFeeds = (evaa_id: bigint, reffered_id: bigint) => {
-    return Buffer.concat([bigintToBuffer(evaa_id, 32), bigintToBuffer(reffered_id, 32)]);
+export const packConnectedFeeds = (evaa_id: bigint, feedId: HexString) => {
+    return Buffer.concat([bigintToBuffer(evaa_id, 32), bigintToBuffer(BigInt(feedId), 32)]);
 };
 
-export const EVAA_TON_PRICE_FEED_ID = ASSET_ID.TON;
-export const EVAA_NOT_PRICE_FEED_ID = ASSET_ID.NOT;
-export const EVAA_DOGS_PRICE_FEED_ID = ASSET_ID.DOGS;
-export const EVAA_USDT_PRICE_FEED_ID = ASSET_ID.USDT;
-export const EVAA_STTON_PRICE_FEED_ID = ASSET_ID.stTON;
-export const EVAA_TSTON_PRICE_FEED_ID = ASSET_ID.tsTON;
-export const EVAA_JUSDC_PRICE_FEED_ID = ASSET_ID.jUSDC;
-export const EVAA_JUSDT_PRICE_FEED_ID = ASSET_ID.jUSDT;
-export const EVAA_USDE_PRICE_FEED_ID = ASSET_ID.USDe;
-export const EVAA_TSUSDE_PRICE_FEED_ID = ASSET_ID.tsUSDe;
-
-export const MAIN_POOL_FEEDS_MAP: Dictionary<bigint, Buffer> = (() => {
-    const map = Dictionary.empty<bigint, Buffer>();
-    map.set(BigInt(PYTH_TON_PRICE_FEED_ID), packConnectedFeeds(EVAA_TON_PRICE_FEED_ID, 0n));
-    map.set(BigInt(PYTH_USDT_PRICE_FEED_ID), packConnectedFeeds(EVAA_USDT_PRICE_FEED_ID, 0n));
-    map.set(
-        BigInt(PYTH_STTON_PRICE_FEED_ID),
-        packConnectedFeeds(EVAA_STTON_PRICE_FEED_ID, BigInt(PYTH_TON_PRICE_FEED_ID)),
-    );
-    map.set(
-        BigInt(PYTH_TSTON_PRICE_FEED_ID),
-        packConnectedFeeds(EVAA_TSTON_PRICE_FEED_ID, BigInt(PYTH_TON_PRICE_FEED_ID)),
-    );
-    map.set(BigInt(PYTH_USDC_PRICE_FEED_ID), packConnectedFeeds(EVAA_JUSDC_PRICE_FEED_ID, 0n));
-    map.set(BigInt(PYTH_USDT_PRICE_FEED_ID), packConnectedFeeds(EVAA_JUSDT_PRICE_FEED_ID, 0n));
-    map.set(BigInt(PYTH_USDE_PRICE_FEED_ID), packConnectedFeeds(EVAA_USDE_PRICE_FEED_ID, 0n));
-    map.set(BigInt(PYTH_TSUSDE_PRICE_FEED_ID), packConnectedFeeds(EVAA_TSUSDE_PRICE_FEED_ID, 0n));
-    return map;
-})();
+export const unpackConnectedFeeds = (buffer: Buffer): FeedMapItem => {
+    return {
+        assetId: BigInt(`0x${buffer.toString('hex', 0, 32)}`),
+        feedId: `0x${buffer.toString('hex', 32)}`,
+    };
+};
 
 export type FeedMapItem = {
-    evaaId: bigint;
-    referredPythFeed: bigint;
+    assetId: bigint;
+    feedId: HexString;
 };
 
 export function parseFeedsMapDict(dict: Dictionary<bigint, Buffer>) {
-    const parsedData = new Map<bigint, FeedMapItem>();
+    const parsedData = new Map<HexString, FeedMapItem>();
     for (const key of dict.keys()) {
         const buffer = dict.get(key)!;
 
-        const hex1 = '0x' + buffer.toString('hex', 0, 32);
-        const hex2 = '0x' + buffer.toString('hex', 32);
+        const assetId = BigInt(`0x${buffer.toString('hex', 0, 32)}`);
+        const feedId = `0x${buffer.toString('hex', 32)}`;
 
-        const evaaId = BigInt(hex1);
-        const referredPythFeed = BigInt(hex2);
-
-        parsedData.set(key, { evaaId, referredPythFeed });
+        parsedData.set(`0x${key.toString(16)}`, { assetId, feedId });
     }
 
     return parsedData;
 }
-
-export const TESTNET_ALLOWED_REF_TOKENS: Dictionary<bigint, bigint> = (() => {
-    const map = Dictionary.empty<bigint, bigint>();
-    map.set(BigInt(EVAA_JUSDT_PRICE_FEED_ID), BigInt(EVAA_USDT_PRICE_FEED_ID));
-    return map;
-})();
-
-export const TESTNET_FEEDS_MAP: Dictionary<bigint, Buffer> = (() => {
-    const map = Dictionary.empty<bigint, Buffer>();
-    map.set(BigInt(PYTH_TON_PRICE_FEED_ID), packConnectedFeeds(EVAA_TON_PRICE_FEED_ID, 0n));
-    return map;
-})();