@evaafi/sdk 0.5.5 → 0.5.6-a

package/dist/contracts/MasterContract.d.ts

@@ -1,7 +1,7 @@
 import { Address, Cell, Contract, ContractProvider, OpenedContract, Sender } from '@ton/core';
 import { Maybe } from '@ton/core/dist/utils/maybe';
 import { EvaaUser } from './UserContract';
-import { MasterData, PoolAssetConfig, PoolConfig, PoolJettonAssetConfig } from '../types/Master';
+import { MasterData, PoolAssetConfig, PoolConfig } from '../types/Master';
 /**
  * Parameters for the Evaa contract
  * @property testnet - true for testnet, false for mainnet
@@ -11,44 +11,23 @@ export type EvaaParameters = {
     poolConfig: PoolConfig;
     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;
 };
-/**
- * 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
  * @property queryID - unique query ID
@@ -91,25 +70,14 @@ 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;
-};
-/**
- * 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;
+    responseAddress?: Address;
+    forwardAmount?: bigint;
 };
 /**
  * Evaa master contract wrapper
@@ -139,7 +107,7 @@ export declare class Evaa implements Contract {
      * Create liquidation message
      * @returns liquidation message as a cell
      */
-    createLiquidationMessage(parameters: TonLiquidationParameters | JettonLiquidationParameters): Cell;
+    createLiquidationMessage(parameters: LiquidationParameters): Cell;
     /**
      * Calculate user contract address
      * @param userAddress
@@ -157,9 +125,9 @@ export declare class Evaa implements Contract {
      * Get master contract data
      */
     get data(): Maybe<MasterData>;
-    sendSupply(provider: ContractProvider, via: Sender, value: bigint, parameters: TonSupplyParameters | JettonSupplyParameters): Promise<void>;
+    sendSupply(provider: ContractProvider, via: Sender, value: bigint, parameters: SupplyParameters): Promise<void>;
     sendWithdraw(provider: ContractProvider, via: Sender, value: bigint, parameters: WithdrawParameters): Promise<void>;
-    sendLiquidation(provider: ContractProvider, via: Sender, value: bigint, parameters: TonLiquidationParameters | JettonLiquidationParameters): Promise<void>;
+    sendLiquidation(provider: ContractProvider, via: Sender, value: bigint, parameters: LiquidationParameters): Promise<void>;
     /**
      * Open user contract wrapper
      * @param forwardPayload - payload that will be forwarded to the address which requested the data

package/dist/contracts/MasterContract.js

@@ -27,16 +27,15 @@ class Evaa {
      * @returns supply message as a cell
      */
     createSupplyMessage(parameters) {
-        if ('jettonMasterAddress' in parameters.asset) {
-            const jettonParams = parameters;
+        if (!(0, __1.isTonAsset)(parameters.asset)) {
             return (0, core_1.beginCell)()
                 .storeUint(general_1.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 ?? general_1.FEES.SUPPLY_JETTON_FWD)
+                .storeCoins(parameters.forwardAmount ?? general_1.FEES.SUPPLY_JETTON_FWD)
                 .storeBit(1)
                 .storeRef((0, core_1.beginCell)()
                 .storeUint(general_1.OPCODES.SUPPLY, 32)
@@ -84,16 +83,15 @@ class Evaa {
      * @returns liquidation message as a cell
      */
     createLiquidationMessage(parameters) {
-        if ('jettonMasterAddress' in parameters.asset) {
-            const jettonParams = parameters;
+        if (!(0, __1.isTonAsset)(parameters.asset)) {
             return (0, core_1.beginCell)()
                 .storeUint(general_1.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 ?? general_1.FEES.LIQUIDATION_JETTON_FWD)
+                .storeCoins(parameters.forwardAmount ?? general_1.FEES.LIQUIDATION_JETTON_FWD)
                 .storeBit(1)
                 .storeRef((0, core_1.beginCell)()
                 .storeUint(general_1.OPCODES.LIQUIDATE, 32)
@@ -162,7 +160,7 @@ class Evaa {
     }
     async sendSupply(provider, via, value, parameters) {
         const message = this.createSupplyMessage(parameters);
-        if ('jettonMasterAddress' in parameters.asset) {
+        if (!(0, __1.isTonAsset)(parameters.asset)) {
             if (!via.address) {
                 throw Error('Via address is required for jetton supply');
             }
@@ -187,7 +185,7 @@ class Evaa {
     }
     async sendLiquidation(provider, via, value, parameters) {
         const message = this.createLiquidationMessage(parameters);
-        if ('jettonMasterAddress' in parameters.asset) {
+        if (!(0, __1.isTonAsset)(parameters.asset)) {
             if (!via.address) {
                 throw Error('Via address is required for jetton liquidation');
             }

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('base64'), assetsData, assetsConfig, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
+            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64'), assetsData, assetsConfig, this.poolConfig);
             this.lastSync = Math.floor(Date.now() / 1000);
         }
         else {
@@ -42,7 +42,7 @@ class EvaaUser {
      */
     calculateUserData(assetsData, assetsConfig, prices) {
         if (this._liteData) {
-            this._data = (0, parser_1.parseUserData)(this._liteData, assetsData, assetsConfig, prices, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
+            this._data = (0, parser_1.parseUserData)(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
             return true;
         }
         return false;
@@ -65,8 +65,8 @@ 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('base64'), assetsData, assetsConfig, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
-            this._data = (0, parser_1.parseUserData)(this._liteData, assetsData, assetsConfig, prices, this.poolConfig.poolAssetsConfig, this.poolConfig.masterConstants);
+            this._liteData = (0, parser_1.parseUserLiteData)(state.data.toString('base64'), assetsData, assetsConfig, this.poolConfig);
+            this._data = (0, parser_1.parseUserData)(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
             this.lastSync = Math.floor(Date.now() / 1000);
         }
         else {
@@ -107,11 +107,11 @@ class EvaaUser {
         }
         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 === assets_1.TON_MAINNET.assetId,
+            tonLiquidation: this._data.liquidationData.greatestLoanAsset.assetId === assets_1.TON_MAINNET.assetId,
         };
     }
 }

package/dist/index.d.ts

@@ -2,14 +2,15 @@ export { mulFactor, mulDiv, bigIntMin, bigIntMax, calculatePresentValue, calcula
 export { createAssetData, createAssetConfig, parseMasterData, parseUserData, parseUserLiteData } from './api/parser';
 export { getPrices } from './api/prices';
 export { JettonWallet } from './contracts/JettonWallet';
-export { EvaaParameters, JettonMessageParameters, TonSupplyParameters, JettonSupplyParameters, WithdrawParameters, LiquidationBaseData, TonLiquidationParameters, JettonLiquidationParameters, Evaa, } from './contracts/MasterContract';
+export { EvaaParameters, WithdrawParameters, LiquidationBaseData, Evaa, } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';
 export { PriceData } from './types/Common';
 export { UpgradeConfig, AssetConfig, MasterConfig, AssetData, AssetInterest, AssetApy, ExtendedAssetData, MasterData, PoolConfig, ExtendedAssetsData, ExtendedAssetsConfig, PoolAssetConfig, PoolAssetsConfig, } from './types/Master';
 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, LENDING_CODE, OPCODES, FEES, MASTER_CONSTANTS } from './constants/general';
-export { MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG, MAINNET_LP_POOL_CONFIG, TESTNET_LP_POOL_CONFIG } from './constants/pools';
-export { TON_MAINNET, USDT_MAINNET, TONUSDT_DEDUST_MAINNET, TON_STORM_MAINNET, USDT_STORM_MAINNET, JUSDT_MAINNET, JUSDC_MAINNET, STTON_MAINNET, TSTON_MAINNET, JUSDT_TESTNET, JUSDC_TESTNET, STTON_TESTNET, } from './constants/assets';
+export { MAINNET_POOL_CONFIG, TESTNET_POOL_CONFIG, MAINNET_LP_POOL_CONFIG, } from './constants/pools';
+export { UNDEFINED_ASSET, TON_MAINNET, USDT_MAINNET, TONUSDT_DEDUST_MAINNET, TON_STORM_MAINNET, USDT_STORM_MAINNET, JUSDT_MAINNET, JUSDC_MAINNET, STTON_MAINNET, TSTON_MAINNET, JUSDT_TESTNET, JUSDC_TESTNET, STTON_TESTNET, } from './constants/assets';
 export * from './constants/assets';
+export * from './utils/utils';
 export { getLastSentBoc, getTonConnectSender } from './utils/tonConnectSender';
 export { getUserJettonWallet } from './utils/userJettonWallet';

package/dist/index.js

@@ -14,7 +14,7 @@ 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 });
-exports.getUserJettonWallet = exports.getTonConnectSender = exports.getLastSentBoc = exports.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.TESTNET_LP_POOL_CONFIG = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = 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.calculateMaximumWithdrawAmount = 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.STTON_TESTNET = exports.JUSDC_TESTNET = exports.JUSDT_TESTNET = exports.TSTON_MAINNET = exports.STTON_MAINNET = exports.JUSDC_MAINNET = exports.JUSDT_MAINNET = exports.USDT_STORM_MAINNET = exports.TON_STORM_MAINNET = exports.TONUSDT_DEDUST_MAINNET = exports.USDT_MAINNET = exports.TON_MAINNET = exports.UNDEFINED_ASSET = exports.MAINNET_LP_POOL_CONFIG = exports.TESTNET_POOL_CONFIG = exports.MAINNET_POOL_CONFIG = exports.MASTER_CONSTANTS = exports.FEES = exports.OPCODES = exports.LENDING_CODE = 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.calculateMaximumWithdrawAmount = 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; } });
@@ -63,8 +63,8 @@ var pools_1 = require("./constants/pools");
 Object.defineProperty(exports, "MAINNET_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.MAINNET_POOL_CONFIG; } });
 Object.defineProperty(exports, "TESTNET_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.TESTNET_POOL_CONFIG; } });
 Object.defineProperty(exports, "MAINNET_LP_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.MAINNET_LP_POOL_CONFIG; } });
-Object.defineProperty(exports, "TESTNET_LP_POOL_CONFIG", { enumerable: true, get: function () { return pools_1.TESTNET_LP_POOL_CONFIG; } });
 var assets_1 = require("./constants/assets");
+Object.defineProperty(exports, "UNDEFINED_ASSET", { enumerable: true, get: function () { return assets_1.UNDEFINED_ASSET; } });
 Object.defineProperty(exports, "TON_MAINNET", { enumerable: true, get: function () { return assets_1.TON_MAINNET; } });
 Object.defineProperty(exports, "USDT_MAINNET", { enumerable: true, get: function () { return assets_1.USDT_MAINNET; } });
 Object.defineProperty(exports, "TONUSDT_DEDUST_MAINNET", { enumerable: true, get: function () { return assets_1.TONUSDT_DEDUST_MAINNET; } });
@@ -78,6 +78,7 @@ Object.defineProperty(exports, "JUSDT_TESTNET", { enumerable: true, get: functio
 Object.defineProperty(exports, "JUSDC_TESTNET", { enumerable: true, get: function () { return assets_1.JUSDC_TESTNET; } });
 Object.defineProperty(exports, "STTON_TESTNET", { enumerable: true, get: function () { return assets_1.STTON_TESTNET; } });
 __exportStar(require("./constants/assets"), exports);
+__exportStar(require("./utils/utils"), exports);
 // Utils
 var tonConnectSender_1 = require("./utils/tonConnectSender");
 Object.defineProperty(exports, "getLastSentBoc", { enumerable: true, get: function () { return tonConnectSender_1.getLastSentBoc; } });

package/dist/types/Master.d.ts

@@ -5,16 +5,13 @@ 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;
@@ -94,3 +91,7 @@ export type MasterData = {
         borrow: Dictionary<bigint, number>;
     };
 };
+export type AgregatedBalances = {
+    totalBorrow: bigint;
+    totalSupply: bigint;
+};

package/dist/types/User.d.ts

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

package/dist/utils/merkleProof.d.ts

@@ -0,0 +1,4 @@
+import { Cell, Dictionary, DictionaryKey, DictionaryKeyTypes } from "@ton/core";
+export declare function convertToMerkleProof(c: Cell): Cell;
+export declare function generateMerkleProofDirect<K extends DictionaryKeyTypes, V>(dict: Dictionary<K, V>, keys: K[], keyObject: DictionaryKey<K>): Cell;
+export declare function generateMerkleProof<K extends DictionaryKeyTypes, V>(dict: Dictionary<K, V>, keys: K[], keyObject: DictionaryKey<K>): Cell;

package/dist/utils/merkleProof.js

@@ -0,0 +1,108 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateMerkleProof = exports.generateMerkleProofDirect = exports.convertToMerkleProof = void 0;
+const core_1 = require("@ton/core");
+function readUnaryLength(slice) {
+    let res = 0;
+    while (slice.loadBit()) {
+        res++;
+    }
+    return res;
+}
+function endExoticCell(b) {
+    let c = b.endCell();
+    return new core_1.Cell({ exotic: true, bits: c.bits, refs: c.refs });
+}
+function convertToMerkleProof(c) {
+    return endExoticCell((0, core_1.beginCell)()
+        .storeUint(3, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16)
+        .storeRef(c));
+}
+exports.convertToMerkleProof = convertToMerkleProof;
+function convertToPrunedBranch(c) {
+    return endExoticCell((0, core_1.beginCell)()
+        .storeUint(1, 8)
+        .storeUint(1, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16));
+}
+function doGenerateMerkleProof(prefix, slice, n, keys) {
+    // Reading label
+    const originalCell = slice.asCell();
+    if (keys.length == 0) {
+        // no keys to prove, prune the whole subdict
+        return convertToPrunedBranch(originalCell);
+    }
+    let lb0 = slice.loadBit() ? 1 : 0;
+    let prefixLength = 0;
+    let pp = prefix;
+    if (lb0 === 0) {
+        // Short label detected
+        // Read
+        prefixLength = readUnaryLength(slice);
+        // Read prefix
+        for (let i = 0; i < prefixLength; i++) {
+            pp += slice.loadBit() ? '1' : '0';
+        }
+    }
+    else {
+        let lb1 = slice.loadBit() ? 1 : 0;
+        if (lb1 === 0) {
+            // Long label detected
+            prefixLength = slice.loadUint(Math.ceil(Math.log2(n + 1)));
+            for (let i = 0; i < prefixLength; i++) {
+                pp += slice.loadBit() ? '1' : '0';
+            }
+        }
+        else {
+            // Same label detected
+            let bit = slice.loadBit() ? '1' : '0';
+            prefixLength = slice.loadUint(Math.ceil(Math.log2(n + 1)));
+            for (let i = 0; i < prefixLength; i++) {
+                pp += bit;
+            }
+        }
+    }
+    if (n - prefixLength === 0) {
+        return originalCell;
+    }
+    else {
+        let sl = originalCell.beginParse();
+        let left = sl.loadRef();
+        let right = sl.loadRef();
+        // NOTE: Left and right branches are implicitly contain prefixes '0' and '1'
+        if (!left.isExotic) {
+            const leftKeys = keys.filter((key) => {
+                return pp + '0' === key.slice(0, pp.length + 1);
+            });
+            left = doGenerateMerkleProof(pp + '0', left.beginParse(), n - prefixLength - 1, leftKeys);
+        }
+        if (!right.isExotic) {
+            const rightKeys = keys.filter((key) => {
+                return pp + '1' === key.slice(0, pp.length + 1);
+            });
+            right = doGenerateMerkleProof(pp + '1', right.beginParse(), n - prefixLength - 1, rightKeys);
+        }
+        return (0, core_1.beginCell)()
+            .storeSlice(sl)
+            .storeRef(left)
+            .storeRef(right)
+            .endCell();
+    }
+}
+function generateMerkleProofDirect(dict, keys, keyObject) {
+    keys.forEach((key) => {
+        if (!dict.has(key)) {
+            throw new Error(`Trying to generate merkle proof for a missing key "${key}"`);
+        }
+    });
+    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

@@ -0,0 +1,55 @@
+/// <reference types="node" />
+import { Cell, Dictionary, Slice } from "@ton/core";
+import { PriceData, RawPriceData } from "../types/Common";
+import { Oracle, PoolAssetsConfig } from "../types/Master";
+type OutputData = {
+    metadata: {
+        blockId: string;
+        transactionId: string;
+        outputIndex: number;
+        isSpent: boolean;
+        milestoneIndexSpent: number;
+        milestoneTimestampSpent: number;
+        transactionIdSpent: string;
+        milestoneIndexBooked: number;
+        milestoneTimestampBooked: number;
+        ledgerIndex: number;
+    };
+    output: {
+        type: number;
+        amount: string;
+        nftId: string;
+        unlockConditions: {
+            type: number;
+            address: {
+                type: number;
+                pubKeyHash: string;
+            };
+        }[];
+        features: {
+            type: number;
+            data: string;
+        }[];
+    };
+};
+export type OraclePricesData = {
+    timestamp: number;
+    prices: Dictionary<bigint, bigint>;
+};
+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;
+export declare function packAssetsData(assetsData: {
+    assetId: bigint;
+    medianPrice: bigint;
+}[]): Cell;
+export declare function packPrices(assetsDataCell: Cell, oraclesDataCell: Cell): Cell;
+export declare function createOracleDataProof(oracle: Oracle, data: OraclePricesData, signature: Buffer, assets: Array<bigint>): Slice;
+export declare function packOraclesData(oraclesData: {
+    oracle: Oracle;
+    data: OraclePricesData;
+    signature: Buffer;
+}[], assets: Array<bigint>): Cell;
+export declare function sumDicts(result: Dictionary<bigint, bigint>, addendum: Dictionary<bigint, bigint>): void;
+export {};

package/dist/utils/priceUtils.js

@@ -0,0 +1,117 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+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");
+async function loadPrices(oracleNftId, endpoints) {
+    return await Promise.any(endpoints.map(x => loadOracleData(oracleNftId, x)));
+}
+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(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(5000)
+    });
+    return await result.json();
+}
+async function parsePrices(outputData, oracleId) {
+    const data = JSON.parse(decodeURIComponent(outputData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')));
+    try {
+        const pricesCell = core_1.Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
+        const signature = Buffer.from(data['signature'], 'hex');
+        const publicKey = Buffer.from(data['publicKey'], 'hex');
+        const timestamp = Number(data['timestamp']);
+        return {
+            dict: pricesCell.beginParse().loadRef().beginParse().loadDictDirect(core_1.Dictionary.Keys.BigUint(256), core_1.Dictionary.Values.BigVarUint(4)),
+            dataCell: (0, core_1.beginCell)().storeRef(pricesCell).storeBuffer(signature).endCell(),
+            oracleId: oracleId,
+            signature: signature,
+            pubkey: publicKey,
+            timestamp: timestamp,
+        };
+    }
+    catch (error) {
+        console.log(oracleId, data, error);
+        throw Error();
+    }
+}
+exports.parsePrices = parsePrices;
+function verifyPrices(assets) {
+    return function (priceData) {
+        const timestamp = Date.now() / 1000;
+        const pricesTime = priceData.timestamp;
+        for (const asset of assets) {
+            if (!priceData.dict.has(asset.assetId)) {
+                return false;
+            }
+        }
+        // console.log('timestamp', timestamp, 'pricestime', pricesTime, timestamp - pricesTime);
+        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);
+    if (sorted.length % 2 === 0) {
+        return (sorted[mid - 1] + sorted[mid]) / 2n;
+    }
+    else {
+        return sorted[mid];
+    }
+}
+exports.getMedianPrice = getMedianPrice;
+function packAssetsData(assetsData) {
+    if (assetsData.length == 0) {
+        throw new Error("No assets data to pack");
+    }
+    return assetsData.reduceRight((acc, { assetId, medianPrice }) => (0, core_1.beginCell)()
+        .storeUint(assetId, 256)
+        .storeCoins(medianPrice)
+        .storeMaybeRef(acc)
+        .endCell(), null);
+}
+exports.packAssetsData = packAssetsData;
+function packPrices(assetsDataCell, oraclesDataCell) {
+    let pricesCell = (0, core_1.beginCell)()
+        .storeRef(assetsDataCell)
+        .storeRef(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();
+    let merkleProof = (0, merkleProof_1.convertToMerkleProof)(prunedData);
+    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");
+    }
+    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()) {
+        const current = result.get(key);
+        const value = addendum.get(key);
+        if (current === undefined) {
+            result.set(key, value);
+            continue;
+        }
+        result.set(key, current + value);
+    }
+}
+exports.sumDicts = sumDicts;

package/dist/utils/userJettonWallet.d.ts

@@ -1,3 +1,3 @@
 import { Address } from '@ton/core';
-import { PoolAssetConfig, PoolJettonAssetConfig } from '../types/Master';
-export declare function getUserJettonWallet(ownerAddress: Address, poolAssetConfig: PoolAssetConfig & PoolJettonAssetConfig): Address;
+import { PoolAssetConfig } from '../types/Master';
+export declare function getUserJettonWallet(ownerAddress: Address, poolAssetConfig: PoolAssetConfig): Address;

package/dist/utils/userJettonWallet.js

@@ -2,7 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getUserJettonWallet = void 0;
 const core_1 = require("@ton/core");
+const assets_1 = require("../constants/assets");
 function getUserJettonWallet(ownerAddress, poolAssetConfig) {
+    if (poolAssetConfig.name == 'TON' || poolAssetConfig.assetId === assets_1.UNDEFINED_ASSET.assetId) {
+        throw new Error(`Cant getUserJettonWallet for ${poolAssetConfig.name} asset`);
+    }
     const jettonMasterAddress = poolAssetConfig.jettonMasterAddress;
     const jettonWalletCode = poolAssetConfig.jettonWalletCode;
     if (poolAssetConfig.name === 'USDT') {

package/dist/utils/utils.d.ts

@@ -0,0 +1,2 @@
+import { PoolAssetConfig } from "../types/Master";
+export declare function isTonAsset(asset: PoolAssetConfig): boolean;

package/dist/utils/utils.js

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