@evaafi/sdk 0.9.0 → 0.9.2-a

package/dist/types/Master.d.ts

@@ -1,6 +1,6 @@
 /// <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 +15,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 +25,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 +69,7 @@ export type AssetData = {
     bRate: bigint;
     totalSupply: bigint;
     totalBorrow: bigint;
-    lastAccural: bigint;
+    lastAccrual: bigint;
     balance: bigint;
     trackingSupplyIndex: bigint;
     trackingBorrowIndex: bigint;

package/dist/utils/fivaUtils.d.ts

@@ -0,0 +1,2 @@
+import { Address } from "@ton/core";
+export declare function calculateCloseAddress(address: Address, closeToAddress: Address): Address;

package/dist/utils/fivaUtils.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.calculateCloseAddress = void 0;
+const core_1 = require("@ton/core");
+const sha256BigInt_1 = require("./sha256BigInt");
+function calculateCloseAddress(address, closeToAddress) {
+    const curHashpart = BigInt('0x' + address.hash.toString('hex'));
+    const desiredHashpart = BigInt('0x' + closeToAddress.hash.toString('hex'));
+    const rewriteBits = 8;
+    const mask = (1n << BigInt(256 - rewriteBits)) - 1n;
+    const antimask = invertBigInt(mask, 256);
+    const newHashpart = (curHashpart & mask) | (desiredHashpart & antimask);
+    return new core_1.Address(0, (0, sha256BigInt_1.bigIntToBuffer)(newHashpart));
+}
+exports.calculateCloseAddress = calculateCloseAddress;
+function invertBigInt(value, bits) {
+    const maxValue = (1n << BigInt(bits)) - 1n;
+    return value ^ maxValue;
+}

package/dist/utils/userJettonWallet.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserJettonWallet = void 0;
 const core_1 = require("@ton/core");
 const assets_1 = require("../constants/assets");
+const fivaUtils_1 = require("./fivaUtils");
 function getUserJettonData(ownerAddress, assetName, jettonWalletCode, jettonMasterAddress) {
     switch (assetName) {
         case 'DOGS':
@@ -16,6 +17,7 @@ function getUserJettonData(ownerAddress, assetName, jettonWalletCode, jettonMast
                 .storeAddress(jettonMasterAddress)
                 .endCell();
         case 'PT_tsUSDe_01Sep2025':
+        case 'PT_tsUSDe_18Dec2025':
             return (0, core_1.beginCell)()
                 .storeCoins(0)
                 .storeAddress(ownerAddress)
@@ -65,12 +67,24 @@ function getUserJettonWallet(ownerAddress, poolAssetConfig) {
         jettonWalletCode = new core_1.Cell({ exotic: true, bits: lib_prep.bits, refs: lib_prep.refs });
     }
     const jettonData = getUserJettonData(ownerAddress, assetName, jettonWalletCode, poolAssetConfig.jettonMasterAddress);
-    const stateInit = (0, core_1.beginCell)()
+    let stateInit = (0, core_1.beginCell)()
         .store((0, core_1.storeStateInit)({
         code: jettonWalletCode,
         data: jettonData
     }))
         .endCell();
+    if (poolAssetConfig.name === 'PT_tsUSDe_18Dec2025') {
+        stateInit = (0, core_1.beginCell)()
+            .storeUint(1, 1) // fixed_prefix_length
+            .storeUint(8, 5) // rewrite_bits
+            .storeUint(0, 1) // special (Maybe=0)
+            .storeMaybeRef(jettonWalletCode) // code (Maybe)
+            .storeMaybeRef(jettonData) // data (Maybe)
+            .storeUint(0, 1) // libraries empty
+            .endCell();
+        const addr = new core_1.Address(0, stateInit.hash());
+        return (0, fivaUtils_1.calculateCloseAddress)(addr, poolAssetConfig.jettonMasterAddress);
+    }
     return new core_1.Address(0, stateInit.hash());
 }
 exports.getUserJettonWallet = getUserJettonWallet;

package/dist/utils/utils.d.ts

@@ -7,5 +7,5 @@ export interface FetchConfig {
     timeout: number;
 }
 export declare const DefaultFetchConfig: FetchConfig;
-export declare function proxyFetchRetries<T>(fetch: Promise<T>, config?: FetchConfig): Promise<T>;
+export declare function proxyFetchRetries<T>(factory: () => Promise<T>, config?: FetchConfig): Promise<T>;
 export declare function isValidSubaccountId(subaccountId: number): boolean;

package/dist/utils/utils.js

@@ -18,14 +18,16 @@ exports.DefaultFetchConfig = {
     retries: 3,
     timeout: 1000,
 };
-async function proxyFetchRetries(fetch, config = exports.DefaultFetchConfig) {
+async function proxyFetchRetries(factory, config = exports.DefaultFetchConfig) {
     let lastError = null;
     for (let attempt = 0; attempt <= config.retries; attempt++) {
         try {
             const timeoutPromise = new Promise((_, reject) => {
                 setTimeout(() => reject(new Error('Request timeout')), config.timeout);
             });
-            return await Promise.race([fetch, timeoutPromise]);
+            // Create a fresh promise per attempt
+            const result = await Promise.race([factory(), timeoutPromise]);
+            return result;
         }
         catch (error) {
             lastError = error instanceof Error ? error : new Error(String(error));

package/package.json

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

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;
-})();