@evaafi/sdk 0.5.6-a → 0.6.0-a

package/src/api/prices.ts

@@ -1,69 +1,45 @@
-import { beginCell, Cell, Dictionary } from '@ton/core';
-import { PriceData } from '../types/Common';
-import { MAIN_POOL_NFT_ID } from '../constants/general';
+import { Dictionary } from '@ton/core';
+import { PriceData, RawPriceData } from '../types/Common';
+import { getMedianPrice, loadPrices, packAssetsData, packOraclesData, packPrices, parsePrices, verifyPrices } from '../utils/priceUtils';
+import { OracleNFT, PoolConfig } from '../types/Master';
+import { MAINNET_POOL_CONFIG } from '../constants/pools';
 
-type NftData = {
-    ledgerIndex: number;
-    pageSize: number;
-    items: string[];
-};
+export async function getPrices(endpoints: String[] = ["api.stardust-mainnet.iotaledger.net", "iota.evaa.finance"], poolConfig: PoolConfig = MAINNET_POOL_CONFIG): Promise<PriceData> {
+    if (endpoints.length == 0) {
+        throw new Error("Empty endpoint list");
+    }
+    
+    const prices = await Promise.all(poolConfig.oracles.map(async x => await parsePrices(await loadPrices(x.address, endpoints), x.id)));
+    
+    let acceptedPrices: RawPriceData[] = prices.filter(verifyPrices(poolConfig.poolAssetsConfig));
 
-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 async function getPrices(endpoints: string[] = ["api.stardust-mainnet.iotaledger.net"], nftId: string = MAIN_POOL_NFT_ID) {
-    return await Promise.any(endpoints.map(x => loadPrices(nftId, x)));
-}
+    if (acceptedPrices.length < poolConfig.minimalOracles) {
+        throw new Error("Prices are outdated");
+    }
+
+    if (acceptedPrices.length > poolConfig.minimalOracles && acceptedPrices.length % 2 == 0) {
+        acceptedPrices = acceptedPrices.slice(0, acceptedPrices.length - 1);  // to reduce fees, MINIMAL_ORACLES_NUMBER is odd
+    }
 
-async function loadPrices(nftId: string, endpoint: string = "api.stardust-mainnet.iotaledger.net"): Promise<PriceData> {
-    let result = await fetch(`https://${endpoint}/api/indexer/v1/outputs/nft/${nftId}`, {
-        headers: { accept: 'application/json' },
-    });
-    let outputId = (await result.json()) as NftData;
+    if (acceptedPrices.length != poolConfig.minimalOracles) {
+        const sortedByTimestamp = acceptedPrices.slice().sort((a, b) => b.timestamp - a.timestamp);
+        const newerPrices = sortedByTimestamp.slice(0, poolConfig.minimalOracles);
+        acceptedPrices = newerPrices.sort((a, b) => a.oracleId - b.oracleId);
+    }
 
-    result = await fetch(`https://${endpoint}/api/core/v2/outputs/${outputId.items[0]}`, {
-        headers: { accept: 'application/json' },
-    });
 
-    let resData = (await result.json()) as OutputData;
+    const medianData = poolConfig.poolAssetsConfig.map(asset => ({ assetId: asset.assetId, medianPrice: getMedianPrice(acceptedPrices, asset.assetId)}));
+    const packedMedianData = packAssetsData(medianData);
 
-    const data = JSON.parse(
-        decodeURIComponent(resData.output.features[0].data.replace('0x', '').replace(/[0-9a-f]{2}/g, '%$&')),
-    );
+    const oraclesData = acceptedPrices.map(x => ({oracle: {id: x.oracleId, pubkey: x.pubkey}, data: {timestamp: x.timestamp, prices: x.dict}, signature: x.signature}));
+    const packedOracleData = packOraclesData(oraclesData, poolConfig.poolAssetsConfig.map(x => x.assetId));
 
-    const pricesCell = Cell.fromBoc(Buffer.from(data['packedPrices'], 'hex'))[0];
-    const signature = Buffer.from(data['signature'], 'hex');
+    const dict = Dictionary.empty<bigint, bigint>();
+    medianData.forEach(x => dict.set(x.assetId, x.medianPrice));
 
     return {
-        dict: pricesCell.beginParse().loadDictDirect(Dictionary.Keys.BigUint(256), Dictionary.Values.BigUint(64)),
-        dataCell: beginCell().storeRef(pricesCell).storeBuffer(signature).endCell(),
+        dict: dict,
+        dataCell: packPrices(packedMedianData, packedOracleData)
     };
 }

package/src/config.ts

@@ -0,0 +1 @@
+export const TTL_ORACLE_DATA_SEC = 120;  // todo back to 120

package/src/constants/general.ts

@@ -1,5 +1,6 @@
 import { Address, Cell, toNano } from '@ton/core';
 import { sha256Hash } from '../utils/sha256BigInt';
+import { OracleNFT } from '../types/Master';
 
 export const MASTER_CONSTANTS = {
     FACTOR_SCALE: BigInt(1e12),
@@ -14,15 +15,37 @@ export const MASTER_CONSTANTS = {
 
 export const NULL_ADDRESS = Address.parse('UQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAJKZ');
 
+
 export const EVAA_MASTER_MAINNET = Address.parse('EQC8rUZqR_pWV1BylWUlPNBzyiTYVoBEmQkMIQDZXICfnuRr');
-export const MAINNET_VERSION = 5;
-export const EVAA_MASTER_TESTNET = Address.parse('EQCoIxsE8m0Q_Ui9uM-2RPtVWXqHK0ttuW2Mccuaj4FfdkLl');  // EQBghPVKxgauOyrcyNYNwE2MRRnebaNpDGpVDQLbml_LIXnK
-export const TESTNET_VERSION = 5;
+export const MAINNET_VERSION = 6;
+export const EVAA_MASTER_TESTNET = Address.parse('EQDLsg3w-iBj26Gww7neYoJAxiT2t77Zo8ro56b0yuHsPp3C');
+export const TESTNET_VERSION = 0;
 export const EVAA_LP_MAINNET = Address.parse('EQBIlZX2URWkXCSg3QF2MJZU-wC5XkBoLww-hdWk2G37Jc6N');
-export const EVAA_LP_MAINNET_VERSION = 0;
+export const EVAA_LP_MAINNET_VERSION = 2;
+
+export const ORACLES_MAINNET: OracleNFT[] = [
+    {id: 0, address: '0xd3a8c0b9fd44fd25a49289c631e3ac45689281f2f8cf0744400b4c65bed38e5d'}, 
+    {id: 1, address: '0x2c21cabdaa89739de16bde7bc44e86401fac334a3c7e55305fe5e7563043e191'},
+    {id: 2, address: '0x2eb258ce7b5d02466ab8a178ad8b0ba6ffa7b58ef21de3dc3b6dd359a1e16af0'},
+    {id: 3, address: '0xf9a0769954b4430bca95149fb3d876deb7799d8f74852e0ad4ccc5778ce68b52'},
+];
+
+export const ORACLES_TESTNET: OracleNFT[] = [
+    {id: 0, address: '0x3bb147a37b7a7f874c39320440f352bddd2c9337e31a778731910f0266391650'}, 
+    {id: 1, address: '0x676767e93b05a21aec9023a65f73cffe1c725709c3c964a7c3f0fd4229089bfe'},
+    {id: 2, address: '0x9c9e65951b0c5920c286bdb3410babcaf21f85bc9c90c13172988630f1244e0f'},
+    {id: 3, address: '0x9dcf880229bfb68d7344fd294624b64f1e0b43b9d858f0fdb1bc6434616c08f5'},
+    {id: 4, address: '0x4d1afcf7c0426ca61c405c8cfaef0053a0f0d143740ffed04c8716beb99cd614'},
+    {id: 5, address: '0x11c6baa608ed10733051fd74134441d384e471722fbc496b43ea4e3c6652485f'},
+    {id: 6, address: '0x2b685672f38dc2fce59013bb740bf24c6037049a1c267bb3b5f6f55d5b195f5f'},
+];
 
-export const MAIN_POOL_NFT_ID = '0xfb9874544d76ca49c5db9cc3e5121e4c018bc8a2fb2bfe8f2a38c5b9963492f5';
-export const LP_POOL_NFT_ID = '0x85f0045998038bebd076987deb4d4c680a323cb04380491eaa7857b6469ba923';
+export const ORACLES_LP: OracleNFT[] = [
+    {id: 0, address: '0xd3a8c0b9fd44fd25a49289c631e3ac45689281f2f8cf0744400b4c65bed38e5d'}, 
+    {id: 1, address: '0x2c21cabdaa89739de16bde7bc44e86401fac334a3c7e55305fe5e7563043e191'},
+    {id: 2, address: '0x2eb258ce7b5d02466ab8a178ad8b0ba6ffa7b58ef21de3dc3b6dd359a1e16af0'},
+    {id: 3, address: '0xf9a0769954b4430bca95149fb3d876deb7799d8f74852e0ad4ccc5778ce68b52'},
+];
 
 export const LENDING_CODE = Cell.fromBoc(
     Buffer.from(
@@ -47,9 +70,9 @@ export const OPCODES = {
 
 export const FEES = {
     SUPPLY: toNano('0.3'),
-    WITHDRAW: toNano('0.5'),
-    SUPPLY_JETTON: toNano('0.29'),
-    SUPPLY_JETTON_FWD: toNano('0.5'),
+    WITHDRAW: toNano('0.35'),
+    SUPPLY_JETTON: toNano('0.35'),
+    SUPPLY_JETTON_FWD: toNano('0.3'),
     LIQUIDATION: toNano('0.8'),
     LIQUIDATION_JETTON: toNano('1'),
     LIQUIDATION_JETTON_FWD: toNano('0.8'),

package/src/constants/pools.ts

@@ -1,13 +1,14 @@
 import { Address } from "@ton/core";
 import { JUSDC_MAINNET, JUSDC_TESTNET, JUSDT_MAINNET, JUSDT_TESTNET, STTON_MAINNET, STTON_TESTNET, TON_MAINNET, TON_STORM_MAINNET, TONUSDT_DEDUST_MAINNET, TSTON_MAINNET, USDT_MAINNET, USDT_STORM_MAINNET } from "./assets";
 import { PoolConfig } from "../types/Master";
-import { EVAA_MASTER_MAINNET, EVAA_MASTER_TESTNET, LENDING_CODE, MAINNET_VERSION, MASTER_CONSTANTS, MAIN_POOL_NFT_ID, TESTNET_VERSION, LP_POOL_NFT_ID, EVAA_LP_MAINNET, EVAA_LP_MAINNET_VERSION } from "./general";
+import { EVAA_MASTER_MAINNET, EVAA_MASTER_TESTNET, LENDING_CODE, MAINNET_VERSION, MASTER_CONSTANTS, TESTNET_VERSION, EVAA_LP_MAINNET, EVAA_LP_MAINNET_VERSION, ORACLES_MAINNET, ORACLES_LP, ORACLES_TESTNET } from "./general";
 
 export const MAINNET_POOL_CONFIG: PoolConfig = {
     masterAddress: EVAA_MASTER_MAINNET,
     masterVersion: MAINNET_VERSION,
     masterConstants: MASTER_CONSTANTS,
-    nftId: MAIN_POOL_NFT_ID,
+    oracles: ORACLES_MAINNET,
+    minimalOracles: 3,
     poolAssetsConfig: [
         TON_MAINNET,
         JUSDT_MAINNET,
@@ -23,7 +24,8 @@ export const TESTNET_POOL_CONFIG: PoolConfig = {
     masterAddress: EVAA_MASTER_TESTNET,
     masterVersion: TESTNET_VERSION,
     masterConstants: MASTER_CONSTANTS,
-    nftId: MAIN_POOL_NFT_ID,
+    oracles: ORACLES_TESTNET,
+    minimalOracles: 5,
     poolAssetsConfig: [
         TON_MAINNET,
         JUSDT_TESTNET,
@@ -37,7 +39,8 @@ export const MAINNET_LP_POOL_CONFIG: PoolConfig = {
     masterAddress: EVAA_LP_MAINNET,
     masterVersion: EVAA_LP_MAINNET_VERSION,
     masterConstants: MASTER_CONSTANTS,
-    nftId: LP_POOL_NFT_ID,
+    oracles: ORACLES_LP,
+    minimalOracles: 3,
     poolAssetsConfig: [
         TON_MAINNET,
         USDT_MAINNET,

package/src/contracts/MasterContract.ts

@@ -8,6 +8,7 @@ import {
     Sender,
     SendMode,
     storeStateInit,
+    toNano,
 } from '@ton/core';
 import {
     FEES,
@@ -47,10 +48,9 @@ export type SupplyParameters = {
     userAddress: Address;
     responseAddress?: Address;
     forwardAmount?: bigint;
-    /* Will be in v6 
     amountToTransfer: bigint;
-    payload: Cell; */
-}
+    payload: Cell;
+};
 
 /**
  * Parameters for the withdraw message
@@ -67,11 +67,10 @@ export type WithdrawParameters = {
     amount: bigint;
     userAddress: Address;
     includeUserCode: boolean;
-    priceData: Cell;
-    asset: PoolAssetConfig;
-    /* Will be in v6 
+    asset: PoolAssetConfig
+    priceData: Cell; 
     amountToTransfer: bigint;
-    payload: Cell; */
+    payload: Cell;
 };
 
 /**
@@ -90,6 +89,7 @@ export type LiquidationBaseData = {
     minCollateralAmount: bigint;
     liquidationAmount: bigint;
     tonLiquidation: boolean;
+    forwardAmount?: bigint;
 };
 
 /**
@@ -103,10 +103,11 @@ export type LiquidationParameters = LiquidationBaseData & {
     asset: PoolAssetConfig;
     queryID: bigint;
     liquidatorAddress: Address;
+    responseAddress: Address;
     includeUserCode: boolean;
     priceData: Cell;
-    responseAddress?: Address;
-    forwardAmount?: bigint;
+    payload: Cell;
+    payloadForwardAmount: bigint;
 };
 
 /**
@@ -149,9 +150,8 @@ export class Evaa implements Contract {
                         .storeUint(OPCODES.SUPPLY, 32)
                         .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                         .storeAddress(parameters.userAddress)
-                        /* Will be in v6 
                         .storeUint(parameters.amountToTransfer, 64)
-                        .storeRef(parameters.payload) */
+                        .storeRef(parameters.payload)
                         .endCell(),
                 )
                 .endCell();
@@ -162,9 +162,8 @@ export class Evaa implements Contract {
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.amount, 64)
                 .storeAddress(parameters.userAddress)
-                /* Will be in v6 
                 .storeUint(parameters.amountToTransfer, 64)
-                .storeRef(parameters.payload) */
+                .storeRef(parameters.payload)
                 .endCell();
         }
     }
@@ -181,9 +180,8 @@ export class Evaa implements Contract {
             .storeUint(parameters.amount, 64)
             .storeAddress(parameters.userAddress)
             .storeInt(parameters.includeUserCode ? -1 : 0, 2)
-            /* Will be in v6 
             .storeUint(parameters.amountToTransfer, 64)
-            .storeRef(parameters.payload) */
+            .storeRef(parameters.payload)
             .storeRef(parameters.priceData)
             .endCell();
     }
@@ -214,6 +212,10 @@ export class Evaa implements Contract {
                         // do not need liquidationAmount in case of jetton liquidation because
                         // the exact amount of transferred jettons for liquidation is known
                         .storeUint(0, 64)
+                        .storeRef(beginCell()
+                            .storeUint(parameters.payloadForwardAmount ?? 0, 64)
+                            .storeRef(parameters.payload)
+                        .endCell())
                         .storeRef(parameters.priceData)
                         .endCell(),
                 )
@@ -228,6 +230,10 @@ export class Evaa implements Contract {
                 .storeUint(parameters.minCollateralAmount, 64)
                 .storeInt(parameters.includeUserCode ? -1 : 0, 2)
                 .storeUint(parameters.liquidationAmount, 64)
+                .storeRef(beginCell()
+                    .storeUint(parameters.payloadForwardAmount ?? 0, 64)
+                    .storeRef(parameters.payload)
+                .endCell())
                 .storeRef(parameters.priceData)
                 .endCell();
         }
@@ -382,9 +388,9 @@ export class Evaa implements Contract {
 
     async getPrices(provider: ContractProvider, endpoints?: string[]) {
         if ((endpoints?.length ?? 0) > 0) {
-            return await getPrices(endpoints, this.poolConfig.nftId);
+            return await getPrices(endpoints, this.poolConfig);
         } else {
-            return await getPrices(undefined, this.poolConfig.nftId);
+            return await getPrices(undefined, this.poolConfig);
         }
     }
 }

package/src/contracts/UserContract.ts

@@ -34,6 +34,7 @@ export class EvaaUser implements Contract {
         provider: ContractProvider,
         assetsData: ExtendedAssetsData,
         assetsConfig: ExtendedAssetsConfig,
+        applyDust: boolean = false
     ) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
@@ -41,7 +42,8 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig
+                this.poolConfig,
+                applyDust
             );
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
@@ -96,6 +98,7 @@ export class EvaaUser implements Contract {
         assetsData: ExtendedAssetsData,
         assetsConfig: ExtendedAssetsConfig,
         prices: Dictionary<bigint, bigint>,
+        applyDust: boolean = false
     ) {
         const state = (await provider.getState()).state;
         if (state.type === 'active') {
@@ -103,9 +106,10 @@ export class EvaaUser implements Contract {
                 state.data!.toString('base64'),
                 assetsData,
                 assetsConfig,
-                this.poolConfig
+                this.poolConfig,
+                applyDust
             );
-            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig);
+            this._data = parseUserData(this._liteData, assetsData, assetsConfig, prices, this.poolConfig, applyDust);
             this.lastSync = Math.floor(Date.now() / 1000);
         } else {
             this._data = { type: 'inactive' };

package/src/index.ts

@@ -12,6 +12,7 @@ export {
     calculateMaximumWithdrawAmount,
     presentValue,
     calculateLiquidationData,
+    predictHealthFactor
 } from './api/math';
 
 // Parser
@@ -26,6 +27,7 @@ export {
     EvaaParameters,
     WithdrawParameters,
     LiquidationBaseData,
+    LiquidationParameters,
     Evaa,
 } from './contracts/MasterContract';
 export { EvaaUser } from './contracts/UserContract';
@@ -46,7 +48,9 @@ export {
     ExtendedAssetsConfig,
     PoolAssetConfig,
     PoolAssetsConfig,
+    MasterConstants
 } from './types/Master';
+
 export {
     BalanceType,
     UserBalance,

package/src/types/Common.ts

@@ -1,5 +1,15 @@
 import { Cell, Dictionary } from '@ton/core';
 
+export type RawPriceData = {
+    dict: Dictionary<bigint, bigint>;
+    dataCell: Cell;
+    oracleId: number;
+    signature: Buffer;
+    pubkey: Buffer;
+    timestamp: number;
+};
+
+
 export type PriceData = {
     dict: Dictionary<bigint, bigint>;
     dataCell: Cell;

package/src/types/Master.ts

@@ -24,7 +24,8 @@ export type PoolConfig = {
     masterAddress: Address;
     masterVersion: number;
     masterConstants: MasterConstants;
-    nftId: string;
+    oracles: OracleNFT[];
+    minimalOracles: number;
     poolAssetsConfig: PoolAssetsConfig;
     lendingCode: Cell;
 };
@@ -36,7 +37,7 @@ export type UpgradeConfig = {
     updateTime: number;
     freezeTime: number;
     userCode: Cell;
-    blankCode: Cell;
+    //blankCode: Cell;
     newMasterCode: Cell | null;
     newUserCode: Cell | null;
 };
@@ -58,18 +59,22 @@ export type AssetConfig = {
     maxTotalSupply: bigint;
     reserveFactor: bigint;
     liquidationReserveFactor: bigint;
-    /* Will be in v6 
     minPrincipalForRewards: bigint;
     baseTrackingSupplySpeed: bigint;
-    baseTrackingBorrowSpeed: 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 = {
@@ -79,10 +84,9 @@ export type AssetData = {
     totalBorrow: bigint;
     lastAccural: bigint;
     balance: bigint;
-    /* Will be in v6 
     trackingSupplyIndex: bigint;
     trackingBorrowIndex: bigint;
-    lastTrackingAccural: bigint; */
+    awaitedSupply?: bigint;
 };
 
 export type AssetInterest = {
@@ -115,4 +119,14 @@ export type MasterData = {
 export type AgregatedBalances = {
     totalBorrow: bigint;
     totalSupply: bigint;
-}
+}
+
+export type OracleNFT = {
+    id: number,
+    address: string
+}
+
+export type Oracle = {
+    id: number,
+    pubkey: Buffer
+}

package/src/types/User.ts

@@ -44,10 +44,9 @@ export type UserLiteData = {
     trackingBorrowIndex: bigint;
     dutchAuctionStart: number;
     backupCell: Cell;
-    /* Will be in v6 
     rewards: Dictionary<bigint, UserRewards>;
     backupCell1: Cell | null;
-    backupCell2: Cell | null; */
+    backupCell2: Cell | null;
 };
 
 export type UserDataActive = UserLiteData & {
@@ -85,7 +84,7 @@ export enum BalanceChangeType {
 export type PredictHealthFactorArgs = {
     balanceChangeType: BalanceChangeType;
     amount: bigint;  // always positive
-    tokenSymbol: string;
+    asset: PoolAssetConfig;
     principals: Dictionary<bigint, bigint>;
     prices: Dictionary<bigint, bigint>;
     assetsData: ExtendedAssetsData;

package/src/utils/merkleProof.ts

@@ -0,0 +1,141 @@
+import { Builder, Cell, Dictionary, DictionaryKey, DictionaryKeyTypes, Slice, beginCell } from "@ton/core";
+
+function readUnaryLength(slice: Slice) {
+    let res = 0;
+    while (slice.loadBit()) {
+        res++;
+    }
+    return res;
+}
+
+function endExoticCell(b: Builder): Cell {
+    let c = b.endCell();
+    return new Cell({exotic: true, bits: c.bits, refs: c.refs});
+}
+
+export function convertToMerkleProof(c: Cell): Cell {
+    return endExoticCell(beginCell()
+        .storeUint(3, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16)
+        .storeRef(c));
+}
+
+function convertToPrunedBranch(c: Cell): Cell {
+    return endExoticCell(beginCell()
+        .storeUint(1, 8)
+        .storeUint(1, 8)
+        .storeBuffer(c.hash(0))
+        .storeUint(c.depth(0), 16));
+}
+
+function doGenerateMerkleProof(
+    prefix: string,
+    slice: Slice,
+    n: number,
+    keys: string[]
+): Cell {
+    // 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 beginCell()
+            .storeSlice(sl)
+            .storeRef(left)
+            .storeRef(right)
+            .endCell();
+    }
+}
+
+export function generateMerkleProofDirect<K extends DictionaryKeyTypes, V>(
+    dict: Dictionary<K, V>,
+    keys: K[],
+    keyObject: DictionaryKey<K>
+): Cell {
+    keys.forEach((key) => {
+        if (!dict.has(key)) {
+            throw new Error(`Trying to generate merkle proof for a missing key "${key}"`)
+        }
+    })
+    const s = beginCell().storeDictDirect(dict).asSlice();
+    return doGenerateMerkleProof(
+            '',
+            s,
+            keyObject.bits,
+            keys.map((key) => keyObject.serialize(key).toString(2).padStart(keyObject.bits, '0'))
+    );
+}
+
+export function generateMerkleProof<K extends DictionaryKeyTypes, V>(
+    dict: Dictionary<K, V>,
+    keys: K[],
+    keyObject: DictionaryKey<K>
+): Cell {
+    return convertToMerkleProof(generateMerkleProofDirect(dict, keys, keyObject));
+}