@dignetwork/dig-sdk 0.0.1-alpha.8 → 0.0.1-alpha.80

package/dist/blockchain/DataStore.d.ts

@@ -1,4 +1,4 @@
-import { DataStore as DataStoreDriver, DataStoreMetadata } from "datalayer-driver";
+import { DataStore as DataStoreDriver, DataStoreMetadata } from "@dignetwork/datalayer-driver";
 import { RootHistoryItem } from "../types";
 import { DataIntegrityTree, DataIntegrityTreeOptions } from "../DataIntegrityTree";
 import { CreateStoreUserInputs } from "../types";
@@ -13,7 +13,7 @@ export declare class DataStore {
     serialize(): string;
     static getActiveStore(): Promise<DataStore | undefined>;
     static deserialize(serialized: string): DataStore;
-    static from(storeId: string | Buffer): DataStore;
+    static from(storeId: string | Buffer, rootHash?: string): DataStore;
     static create(inputs?: CreateStoreUserInputs): Promise<DataStore>;
     private static mint;
     /**
@@ -38,19 +38,30 @@ export declare class DataStore {
         latestHeight: number;
         latestHash: Buffer;
     }>;
+    cacheStoreCreationHeight(): Promise<{
+        createdAtHeight: number;
+        createdAtHash: Buffer;
+    }>;
     getCreationHeight(): Promise<{
         createdAtHeight: number;
         createdAtHash: Buffer;
     }>;
     private setCreationHeight;
     getRootHistory(): Promise<RootHistoryItem[]>;
-    getLocalRootHistory(): Promise<RootHistoryItem[] | undefined>;
-    validate(): Promise<boolean>;
+    generateManifestFile(folderPath?: string): Promise<void>;
     getMetaData(): Promise<DataStoreMetadata>;
     isSynced(): Promise<boolean>;
     hasMetaWritePermissions(publicSyntheticKey?: Buffer): Promise<boolean>;
     updateMetadata(metadata: DataStoreMetadata): Promise<DataStoreDriver>;
-    getFileSetForRootHash(rootHash: string): Promise<string[]>;
-    getManifestHashes(): string[];
+    /**
+     * Retrieve the file set for a given root hash and validate file integrity.
+     *
+     * @param {string} rootHash - The root hash to fetch the file set.
+     * @returns {Promise<{ fileName: string, file: string }[]>} - An array of unique file objects.
+     */
+    getFileSetForRootHash(rootHash: string): Promise<{
+        name: string;
+        path: string;
+    }[]>;
 }
 //# sourceMappingURL=DataStore.d.ts.map

package/dist/blockchain/DataStore.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataStore.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,SAAS,IAAI,eAAe,EAE5B,iBAAiB,EAIlB,MAAM,kBAAkB,CAAC;AAY1B,OAAO,EAAE,eAAe,EAAW,MAAM,UAAU,CAAC;AAGpD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AASjD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAoB;gBAEpB,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAiB/D,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,IAAI,IAAI,iBAAiB,CAEnC;IAEM,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;WAMN,cAAc,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;WAOtD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;WAK1C,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;WAYnC,MAAM,CACxB,MAAM,GAAE,qBAA0B,GACjC,OAAO,CAAC,SAAS,CAAC;mBAyCA,IAAI;IA4FzB;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5C;;;OAGG;WACiB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxD;;;;OAIG;mBACkB,mBAAmB;WAqB1B,YAAY,IAAI,SAAS,EAAE;IAW5B,aAAa,IAAI,OAAO,CAAC;QACpC,WAAW,EAAE,eAAe,CAAC;QAC7B,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAyGW,iBAAiB,IAAI,OAAO,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;YA0BY,iBAAiB;IAYlB,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAsB5C,mBAAmB,IAAI,OAAO,CAAC,eAAe,EAAE,GAAG,SAAS,CAAC;IAiB7D,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IA+E5B,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAKzC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAgB5B,uBAAuB,CAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC;IAkBN,cAAc,CACzB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,eAAe,CAAC;IA+Cd,qBAAqB,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAiChE,iBAAiB,IAAI,MAAM,EAAE;CAUrC"}
+{"version":3,"file":"DataStore.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStore.ts"],"names":[],"mappings":"AAEA,OAAO,EAOL,SAAS,IAAI,eAAe,EAE5B,iBAAiB,EAIlB,MAAM,8BAA8B,CAAC;AAWtC,OAAO,EAAE,eAAe,EAAW,MAAM,UAAU,CAAC;AAGpD,OAAO,EACL,iBAAiB,EACjB,wBAAwB,EACzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAAE,qBAAqB,EAAE,MAAM,UAAU,CAAC;AAajD,qBAAa,SAAS;IACpB,OAAO,CAAC,OAAO,CAAS;IACxB,OAAO,CAAC,IAAI,CAAoB;gBAEpB,OAAO,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,wBAAwB;IAiB/D,IAAW,OAAO,IAAI,MAAM,CAE3B;IAED,IAAW,IAAI,IAAI,iBAAiB,CAEnC;IAEM,QAAQ,IAAI,MAAM;IAIlB,QAAQ,IAAI,MAAM;IAIlB,SAAS,IAAI,MAAM;WAMN,cAAc,IAAI,OAAO,CAAC,SAAS,GAAG,SAAS,CAAC;WAOtD,WAAW,CAAC,UAAU,EAAE,MAAM,GAAG,SAAS;WAK1C,IAAI,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,EAAE,QAAQ,CAAC,EAAE,MAAM,GAAG,SAAS;WAiBtD,MAAM,CACxB,MAAM,GAAE,qBAA0B,GACjC,OAAO,CAAC,SAAS,CAAC;mBAyCA,IAAI;IA4FzB;;;OAGG;IACU,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC;IAK5C;;;OAGG;WACiB,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;IAIxD;;;;OAIG;mBACkB,mBAAmB;WAqB1B,YAAY,IAAI,SAAS,EAAE;IAW5B,aAAa,IAAI,OAAO,CAAC;QACpC,WAAW,EAAE,eAAe,CAAC;QAC7B,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,CAAC;IAyGW,wBAAwB,IAAI,OAAO,CAAC;QAC/C,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;IAiBW,iBAAiB,IAAI,OAAO,CAAC;QACxC,eAAe,EAAE,MAAM,CAAC;QACxB,aAAa,EAAE,MAAM,CAAC;KACvB,CAAC;YA0BY,iBAAiB;IAYlB,cAAc,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IAwC5C,oBAAoB,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAexD,WAAW,IAAI,OAAO,CAAC,iBAAiB,CAAC;IAKzC,QAAQ,IAAI,OAAO,CAAC,OAAO,CAAC;IAM5B,uBAAuB,CAClC,kBAAkB,CAAC,EAAE,MAAM,GAC1B,OAAO,CAAC,OAAO,CAAC;IAkBN,cAAc,CACzB,QAAQ,EAAE,iBAAiB,GAC1B,OAAO,CAAC,eAAe,CAAC;IA+C3B;;;;;OAKG;IACU,qBAAqB,CAChC,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,EAAE,CAAC;CAyC7C"}

package/dist/blockchain/DataStore.js

@@ -6,18 +6,22 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.DataStore = void 0;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const datalayer_driver_1 = require("datalayer-driver");
+const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const util_1 = require("util");
 const FullNodePeer_1 = require("./FullNodePeer");
 const Wallet_1 = require("./Wallet");
 const config_1 = require("../utils/config");
 const coins_1 = require("./coins");
-const utils_1 = require("../utils");
+const colorette_1 = require("colorette");
 const hashUtils_1 = require("../utils/hashUtils");
 const DataIntegrityTree_1 = require("../DataIntegrityTree");
 const prompts_1 = require("../prompts");
 const FileCache_1 = require("../utils/FileCache");
 const DataStoreSerializer_1 = require("./DataStoreSerializer");
+const node_cache_1 = __importDefault(require("node-cache"));
+const config_2 = require("../utils/config");
+// Initialize the cache with a TTL of 180 seconds (3 minutes)
+const rootHistoryCache = new node_cache_1.default({ stdTTL: 180 });
 const stat = (0, util_1.promisify)(fs_1.default.stat);
 const readdir = (0, util_1.promisify)(fs_1.default.readdir);
 class DataStore {
@@ -62,12 +66,15 @@ class DataStore {
         const parsed = JSON.parse(serialized);
         return new DataStore(parsed.storeId);
     }
-    static from(storeId) {
+    static from(storeId, rootHash) {
         const existingTreeOptions = {
             storageMode: "local",
             storeDir: config_1.STORE_PATH,
             disableInitialize: true,
         };
+        if (rootHash) {
+            existingTreeOptions.rootHash = rootHash;
+        }
         if (storeId instanceof Buffer) {
             return new DataStore(storeId.toString("hex"), existingTreeOptions);
         }
@@ -257,22 +264,31 @@ class DataStore {
             throw error;
         }
     }
+    async cacheStoreCreationHeight() {
+        const peer = await FullNodePeer_1.FullNodePeer.connect();
+        const createdAtHeight = await peer.getStoreCreationHeight(Buffer.from(this.storeId, "hex"), null, Buffer.from(config_2.MAIN_NET_GENISES_CHALLENGE, "hex"));
+        // Get just before created at height so we can find the coin
+        const justBeforeCreatedAtHeight = Number(createdAtHeight) - 1;
+        const createdAtHash = await peer.getHeaderHash(justBeforeCreatedAtHeight);
+        await this.setCreationHeight(justBeforeCreatedAtHeight, createdAtHash);
+        return { createdAtHeight: justBeforeCreatedAtHeight, createdAtHash };
+    }
     async getCreationHeight() {
-        const defaultHeight = config_1.MIN_HEIGHT;
-        const defaultHash = Buffer.from(config_1.MIN_HEIGHT_HEADER_HASH, "hex");
         // Initialize the FileCache for the height file
         const fileCache = new FileCache_1.FileCache(`stores/${this.storeId}`);
         // Try to retrieve the cached height information
         const cachedHeightInfo = fileCache.get("height");
         if (!cachedHeightInfo) {
-            // If no cache, return the default values
-            return { createdAtHeight: defaultHeight, createdAtHash: defaultHash };
+            // If no cache, regenerate the cache
+            return this.cacheStoreCreationHeight();
         }
         // Parse the cached height and hash values
         const { height, hash } = cachedHeightInfo;
+        const defaultHeight = config_1.MIN_HEIGHT;
+        const defaultHash = Buffer.from(config_1.MIN_HEIGHT_HEADER_HASH, "hex");
         return {
             createdAtHeight: height || defaultHeight,
-            createdAtHash: Buffer.from(hash || config_1.MIN_HEIGHT_HEADER_HASH, "hex"),
+            createdAtHash: hash ? Buffer.from(hash, "hex") : defaultHash,
         };
     }
     async setCreationHeight(height, hash) {
@@ -284,97 +300,49 @@ class DataStore {
         });
     }
     async getRootHistory() {
+        // Check if the root history is cached for this storeId
+        const cachedHistory = rootHistoryCache.get(this.storeId);
+        if (cachedHistory) {
+            return cachedHistory;
+        }
+        // Fetch root history from peer if not cached
         const peer = await FullNodePeer_1.FullNodePeer.connect();
         const { createdAtHeight, createdAtHash } = await this.getCreationHeight();
         const { rootHashes, rootHashesTimestamps } = await peer.syncStoreFromLauncherId(Buffer.from(this.storeId, "hex"), createdAtHeight, createdAtHash, true);
         if (!rootHashes) {
             return [];
         }
-        return rootHashes.map((rootHash, index) => ({
+        // Build the root history list
+        const rootHistory = rootHashes.map((rootHash, index) => ({
             root_hash: rootHash.toString("hex"),
             timestamp: Number(rootHashesTimestamps?.[index].toString()),
+            synced: fs_1.default.existsSync(path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash.toString("hex")}.dat`)),
         }));
+        // Store the root history in the cache
+        rootHistoryCache.set(this.storeId, rootHistory);
+        return rootHistory;
     }
-    async getLocalRootHistory() {
-        const manifestFilePath = (0, config_1.getManifestFilePath)(this.storeId);
-        if (!fs_1.default.existsSync(manifestFilePath)) {
-            console.error("Manifest file not found", manifestFilePath);
-            return undefined;
+    // Generates a fresh manifest file based on the current root history
+    // and what is currently on disk
+    async generateManifestFile(folderPath) {
+        if (!folderPath) {
+            folderPath = path_1.default.join(config_1.STORE_PATH, this.storeId, "data");
         }
-        const manifestHashes = fs_1.default
-            .readFileSync(manifestFilePath, "utf-8")
-            .split("\n")
-            .filter(Boolean);
-        return manifestHashes.map((rootHash) => ({
-            root_hash: rootHash,
-            timestamp: 0, // Timestamps are not yet included in the manifest
-        }));
-    }
-    async validate() {
         const rootHistory = await this.getRootHistory();
-        const manifestFilePath = (0, config_1.getManifestFilePath)(this.storeId);
-        if (!fs_1.default.existsSync(manifestFilePath)) {
-            console.error("Manifest file not found", manifestFilePath);
-            return false;
-        }
-        const manifestHashes = fs_1.default
-            .readFileSync(manifestFilePath, "utf-8")
-            .split("\n")
-            .filter(Boolean);
-        if (manifestHashes.length > rootHistory.length) {
-            console.error("The store is corrupted: Manifest file has more hashes than the root history.");
-            return false;
-        }
-        if (rootHistory.length > manifestHashes.length) {
-            console.error("The store is not synced: Root history has more hashes than the manifest file.");
-            return false;
-        }
-        for (let i = 0; i < manifestHashes.length; i++) {
-            if (manifestHashes[i] !== rootHistory[i]?.root_hash) {
-                console.error(`Root hash mismatch at position ${i}: expected ${manifestHashes[i]} but found ${rootHistory[i]?.root_hash}`);
-                return false;
-            }
-        }
-        let filesIntegrityIntact = true;
-        for (const rootHash of manifestHashes) {
-            const datFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash}.dat`);
-            if (!fs_1.default.existsSync(datFilePath)) {
-                console.error(`Data file for root hash ${rootHash} not found`);
-                return false;
-            }
-            const datFileContent = JSON.parse(fs_1.default.readFileSync(datFilePath, "utf-8"));
-            if (datFileContent.root !== rootHash) {
-                console.error(`Root hash in data file does not match: ${datFileContent.root} !== ${rootHash}`);
-                return false;
-            }
-            for (const [fileKey, fileData] of Object.entries(datFileContent.files)) {
-                const integrityCheck = (0, utils_1.validateFileSha256)(fileData.sha256, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
-                if (!integrityCheck) {
-                    filesIntegrityIntact = false;
-                }
-            }
-        }
-        if (!filesIntegrityIntact) {
-            console.error("Store Corrupted: Data failed SHA256 validation.");
-            return false;
-        }
-        return true;
+        // Need this for the dataintegrity tree to work properly
+        fs_1.default.writeFileSync(path_1.default.join(folderPath, "manifest.dat"), rootHistory
+            .filter((root) => root.synced)
+            .map((root) => root.root_hash)
+            .join("\n"));
     }
     async getMetaData() {
         const { latestStore } = await this.fetchCoinInfo();
         return latestStore.metadata;
     }
     async isSynced() {
-        const rootHistory = await this.getRootHistory();
-        const manifestFilePath = (0, config_1.getManifestFilePath)(this.storeId);
-        if (!fs_1.default.existsSync(manifestFilePath)) {
-            return false;
-        }
-        const manifestHashes = fs_1.default
-            .readFileSync(manifestFilePath, "utf-8")
-            .split("\n")
-            .filter(Boolean);
-        return rootHistory.length === manifestHashes.length;
+        const dataStore = await DataStore.from(this.storeId);
+        const rootHistory = await dataStore.getRootHistory();
+        return !rootHistory.some((root) => !root.synced);
     }
     async hasMetaWritePermissions(publicSyntheticKey) {
         const wallet = await Wallet_1.Wallet.load("default");
@@ -407,27 +375,36 @@ class DataStore {
         }
         return updateStoreResponse.newStore;
     }
+    /**
+     * Retrieve the file set for a given root hash and validate file integrity.
+     *
+     * @param {string} rootHash - The root hash to fetch the file set.
+     * @returns {Promise<{ fileName: string, file: string }[]>} - An array of unique file objects.
+     */
     async getFileSetForRootHash(rootHash) {
         const datFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, `${rootHash}.dat`);
         const datFileContent = JSON.parse(fs_1.default.readFileSync(datFilePath, "utf-8"));
-        const heightDatFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, "height.json");
-        const manifestFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, "manifest.dat");
-        const filesInvolved = [];
-        filesInvolved.push(manifestFilePath);
-        filesInvolved.push(datFilePath);
-        filesInvolved.push(heightDatFilePath);
+        // Use a Set to ensure uniqueness
+        const filesInvolved = new Set();
+        // Iterate over each file and perform an integrity check
         for (const [fileKey, fileData] of Object.entries(datFileContent.files)) {
-            const filepath = path_1.default.join(config_1.STORE_PATH, this.storeId, "data", fileKey);
-            const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[fileKey].sha256, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
-            filesInvolved.push(filePath);
+            const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[fileKey].sha256, "data");
+            // Perform the integrity check
+            const integrityCheck = await DataIntegrityTree_1.DataIntegrityTree.validateKeyIntegrityWithForeignTree(fileKey, datFileContent.files[fileKey].sha256, datFileContent, rootHash, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
+            if (integrityCheck) {
+                // Add the file to the Set
+                filesInvolved.add({
+                    name: Buffer.from(fileKey, "hex").toString("utf-8"),
+                    path: filePath,
+                });
+            }
+            else {
+                console.error((0, colorette_1.red)(`File ${fileKey} failed the integrity check.`));
+                throw new Error(`Integrity check failed for file: ${fileKey}. Aborting.`);
+            }
         }
-        return filesInvolved;
-    }
-    getManifestHashes() {
-        const manifestFilePath = path_1.default.join(config_1.STORE_PATH, this.storeId, "manifest.dat");
-        return fs_1.default.existsSync(manifestFilePath)
-            ? fs_1.default.readFileSync(manifestFilePath, "utf-8").split("\n").filter(Boolean)
-            : [];
+        // Convert Set to Array and return
+        return Array.from(filesInvolved);
     }
 }
 exports.DataStore = DataStore;

package/dist/blockchain/DataStoreSerializer.d.ts

@@ -1,4 +1,4 @@
-import { DataStore } from "datalayer-driver";
+import { DataStore } from "@dignetwork/datalayer-driver";
 import { Buffer } from "buffer";
 export declare class DataStoreSerializer {
     private storeInfo;

package/dist/blockchain/DataStoreSerializer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DataStoreSerializer.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStoreSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAKV,MAAM,kBAAkB,CAAC;AAC1B,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAOnE,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgDF,WAAW,CACvB,IAAI,EAAE;QACJ,WAAW,EAAE,GAAG,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,GACA;QACD,WAAW,EAAE,SAAS,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB;CAuEF"}
+{"version":3,"file":"DataStoreSerializer.d.ts","sourceRoot":"","sources":["../../src/blockchain/DataStoreSerializer.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,SAAS,EAKV,MAAM,8BAA8B,CAAC;AACtC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,qBAAa,mBAAmB;IAC9B,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,UAAU,CAAS;gBAEf,SAAS,EAAE,SAAS,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM;IAOnE,SAAS;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;WAgDF,WAAW,CACvB,IAAI,EAAE;QACJ,WAAW,EAAE,GAAG,CAAC;QACjB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB,GACA;QACD,WAAW,EAAE,SAAS,CAAC;QACvB,YAAY,EAAE,MAAM,CAAC;QACrB,UAAU,EAAE,MAAM,CAAC;KACpB;CAuEF"}

package/dist/blockchain/FullNodePeer.d.ts

@@ -1,12 +1,20 @@
-import { Peer } from "datalayer-driver";
+import { Peer } from "@dignetwork/datalayer-driver";
 export declare class FullNodePeer {
     private static cachedPeer;
     private static memoizedFetchNewPeerIPs;
     private peer;
+    private static deprioritizedIps;
     private constructor();
     static connect(): Promise<Peer>;
     private static isPortReachable;
     private static isValidIpAddress;
+    /**
+     * Retrieves the TRUSTED_FULLNODE IP from the environment
+     * and verifies if it is a valid IP address.
+     *
+     * @returns {string | null} The valid IP address or null if invalid
+     */
+    private static getTrustedFullNode;
     private static fetchNewPeerIPs;
     private static getPeerIPs;
     private static createPeerProxy;

package/dist/blockchain/FullNodePeer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAmBxC,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IAQnB,OAAO;WAIa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;mBAOV,eAAe;mBAkDf,UAAU;IAyB/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBA8CT,WAAW;IAgGzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}
+{"version":3,"file":"FullNodePeer.d.ts","sourceRoot":"","sources":["../../src/blockchain/FullNodePeer.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,IAAI,EAAE,MAAM,8BAA8B,CAAC;AAoBpD,qBAAa,YAAY;IACvB,OAAO,CAAC,MAAM,CAAC,UAAU,CAAkD;IAC3E,OAAO,CAAC,MAAM,CAAC,uBAAuB,CAA0B;IAChE,OAAO,CAAC,IAAI,CAAO;IACnB,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAA0B;IAMzD,OAAO;WAIa,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAK5C,OAAO,CAAC,MAAM,CAAC,eAAe;IAiB9B,OAAO,CAAC,MAAM,CAAC,gBAAgB;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBA2Df,UAAU;IA2B/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAkDT,WAAW;IA+FzB,OAAO,IAAI,IAAI;WAIF,mBAAmB,CACrC,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,CAAC;CAwBpB"}

package/dist/blockchain/FullNodePeer.js

@@ -7,7 +7,7 @@ exports.FullNodePeer = void 0;
 const path_1 = __importDefault(require("path"));
 const os_1 = __importDefault(require("os"));
 const fs_1 = __importDefault(require("fs"));
-const datalayer_driver_1 = require("datalayer-driver");
+const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const chia_server_coin_1 = require("chia-server-coin");
 const promises_1 = require("dns/promises");
 const net_1 = __importDefault(require("net"));
@@ -16,6 +16,7 @@ const nanospinner_1 = require("nanospinner");
 const config_1 = require("../utils/config");
 const FULLNODE_PORT = 8444;
 const LOCALHOST = "127.0.0.1";
+const CHIA_NODES_HOST = "chia-nodes";
 const DNS_HOSTS = [
     "dns-introducer.chia.net",
     "chia.ctrlaltdel.ch",
@@ -48,19 +49,38 @@ class FullNodePeer {
         const ipv4Regex = /^(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$/;
         return ipv4Regex.test(ip);
     }
-    static async fetchNewPeerIPs() {
+    /**
+     * Retrieves the TRUSTED_FULLNODE IP from the environment
+     * and verifies if it is a valid IP address.
+     *
+     * @returns {string | null} The valid IP address or null if invalid
+     */
+    static getTrustedFullNode() {
         const trustedNodeIp = process.env.TRUSTED_FULLNODE || null;
+        if (trustedNodeIp && FullNodePeer.isValidIpAddress(trustedNodeIp)) {
+            return trustedNodeIp;
+        }
+        return null;
+    }
+    static async fetchNewPeerIPs() {
+        const trustedNodeIp = FullNodePeer.getTrustedFullNode();
         const priorityIps = [];
-        // Prioritize trustedNodeIp
+        // Prioritize trustedNodeIp unless it's deprioritized
         if (trustedNodeIp &&
-            FullNodePeer.isValidIpAddress(trustedNodeIp) &&
+            !FullNodePeer.deprioritizedIps.has(trustedNodeIp) &&
             (await FullNodePeer.isPortReachable(trustedNodeIp, FULLNODE_PORT))) {
             priorityIps.push(trustedNodeIp);
         }
-        // Prioritize LOCALHOST
-        if (await FullNodePeer.isPortReachable(LOCALHOST, FULLNODE_PORT)) {
+        // Prioritize LOCALHOST unless it's deprioritized
+        if (!FullNodePeer.deprioritizedIps.has(LOCALHOST) &&
+            (await FullNodePeer.isPortReachable(LOCALHOST, FULLNODE_PORT))) {
             priorityIps.push(LOCALHOST);
         }
+        // Prioritize CHIA_NODES_HOST unless it's deprioritized
+        if (!FullNodePeer.deprioritizedIps.has(CHIA_NODES_HOST) &&
+            (await FullNodePeer.isPortReachable(CHIA_NODES_HOST, FULLNODE_PORT))) {
+            priorityIps.push(CHIA_NODES_HOST);
+        }
         if (priorityIps.length > 0) {
             return priorityIps;
         }
@@ -102,6 +122,8 @@ class FullNodePeer {
         }
         // @ts-ignore
         if (FullNodePeer.memoizedFetchNewPeerIPs?.cache?.clear) {
+            // Clear cache and reset deprioritized IPs when cache is cleared
+            FullNodePeer.deprioritizedIps.clear();
             // @ts-ignore
             FullNodePeer.memoizedFetchNewPeerIPs.cache.clear();
         }
@@ -137,6 +159,10 @@ class FullNodePeer {
                             // If the error is WebSocket-related or timeout, reset the peer
                             if (error.message.includes("WebSocket") || error.message.includes("Operation timed out")) {
                                 FullNodePeer.cachedPeer = null;
+                                // @ts-ignore
+                                FullNodePeer.memoizedFetchNewPeerIPs.cache.clear();
+                                FullNodePeer.deprioritizedIps.clear();
+                                console.info(`Fullnode Peer error, reconnecting to a new peer...`);
                                 const newPeer = await FullNodePeer.getBestPeer();
                                 return newPeer[prop](...args);
                             }
@@ -192,16 +218,17 @@ class FullNodePeer {
             throw new Error("No valid peak heights obtained from any peer.");
         }
         const highestPeak = Math.max(...validHeights);
-        // Prioritize LOCALHOST and TRUSTED_NODE_IP if they have the highest peak height
+        // Prioritize LOCALHOST, TRUSTED_NODE_IP, and CHIA_NODES_HOST if they have the highest peak height
         let bestPeerIndex = validHeights.findIndex((height, index) => height === highestPeak &&
-            (peerIPs[index] === LOCALHOST || peerIPs[index] === trustedNodeIp));
-        // If LOCALHOST or TRUSTED_NODE_IP don't have the highest peak, select any peer with the highest peak
+            !FullNodePeer.deprioritizedIps.has(peerIPs[index]) && // Exclude deprioritized IPs
+            (peerIPs[index] === LOCALHOST || peerIPs[index] === trustedNodeIp || peerIPs[index] === CHIA_NODES_HOST));
+        // If LOCALHOST, TRUSTED_NODE_IP, or CHIA_NODES_HOST don't have the highest peak, select any peer with the highest peak
         if (bestPeerIndex === -1) {
             bestPeerIndex = validHeights.findIndex((height) => height === highestPeak);
         }
         const bestPeer = peers[bestPeerIndex];
         FullNodePeer.cachedPeer = { peer: bestPeer, timestamp: now };
-        console.log(`Using Peer: ${peerIPs[bestPeerIndex]}`);
+        console.log(`Using Fullnode Peer: ${peerIPs[bestPeerIndex]}`);
         return bestPeer;
     }
     getPeer() {
@@ -228,6 +255,7 @@ class FullNodePeer {
 }
 exports.FullNodePeer = FullNodePeer;
 FullNodePeer.cachedPeer = null;
+FullNodePeer.deprioritizedIps = new Set(); // New set for deprioritized IPs
 (() => {
     FullNodePeer.memoizedFetchNewPeerIPs = (0, lodash_1.memoize)(FullNodePeer.fetchNewPeerIPs);
 })();

package/dist/blockchain/ServerCoin.d.ts

@@ -1,4 +1,4 @@
-import { ServerCoin as ServerCoinDriver } from "datalayer-driver";
+import { ServerCoin as ServerCoinDriver } from "@dignetwork/datalayer-driver";
 import { NconfManager } from "../utils/NconfManager";
 export declare class ServerCoin {
     private storeId;
@@ -8,14 +8,22 @@ export declare class ServerCoin {
     saveServerCoinData(serverCoin: ServerCoinDriver, epoch: number, peerIp: string): Promise<void>;
     melt(epoch: number, peerIp: string): Promise<void>;
     private removeServerCoinData;
+    getAllEpochPeers(epoch: number, blacklist?: string[]): Promise<string[]>;
+    getActiveEpochPeers(blacklist?: string[]): Promise<string[]>;
     sampleCurrentEpoch(sampleSize?: number, blacklist?: string[]): Promise<string[]>;
     sampleServerCoinsByEpoch(epoch: number, sampleSize?: number, blacklist?: string[]): Promise<string[]>;
-    static getCurrentEpoch(): number;
+    static getCurrentEpoch(): {
+        epoch: number;
+        round: number;
+    };
     ensureServerCoinExists(peerIp: string): Promise<void>;
     meltOutdatedEpochs(peerIp: string): Promise<void>;
     static meltUntrackedStoreCoins(): Promise<void>;
     private getServerCoinsForStore;
     hasEpochCoinBeenCreated(currentEpoch: number, peerIp: string): Promise<boolean>;
-    static calculateEpoch(currentTimestampUTC: Date): number;
+    static calculateEpochAndRound(currentTimestampUTC: Date): {
+        epoch: number;
+        round: number;
+    };
 }
 //# sourceMappingURL=ServerCoin.d.ts.map

package/dist/blockchain/ServerCoin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,kBAAkB,CAAC;AAI1B,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAMrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAAwC;gBAGpE,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAgBrB,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAsCN,eAAe,IAAI,MAAM;IAK1B,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YA4D7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,cAAc,CAAC,mBAAmB,EAAE,IAAI,GAAG,MAAM;CAiBhE"}
+{"version":3,"file":"ServerCoin.d.ts","sourceRoot":"","sources":["../../src/blockchain/ServerCoin.ts"],"names":[],"mappings":"AACA,OAAO,EAML,UAAU,IAAI,gBAAgB,EAE/B,MAAM,8BAA8B,CAAC;AAItC,OAAO,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAWrD,qBAAa,UAAU;IACrB,OAAO,CAAC,OAAO,CAAS;IACxB,gBAAuB,iBAAiB,eAEtC;gBAEU,OAAO,EAAE,MAAM;IAKd,cAAc,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,gBAAgB,CAAC;IA2DzD,kBAAkB,CAC7B,UAAU,EAAE,gBAAgB,EAC5B,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,IAAI,CAAC;IAqBH,IAAI,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAoDjD,oBAAoB;IAerB,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,SAAS,GAAE,MAAM,EAAO,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IA0C5E,mBAAmB,CAC9B,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,kBAAkB,CAC7B,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAMP,wBAAwB,CACnC,KAAK,EAAE,MAAM,EACb,UAAU,GAAE,MAAU,EACtB,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;WAeN,eAAe,IAAI;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAKpD,sBAAsB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAiDrD,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WA+B1C,uBAAuB;YAkE7B,sBAAsB;IAWvB,uBAAuB,CAClC,YAAY,EAAE,MAAM,EACpB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,OAAO,CAAC;WAuBL,sBAAsB,CAAC,mBAAmB,EAAE,IAAI,GAAG;QAC/D,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;KACf;CA2BF"}

package/dist/blockchain/ServerCoin.js

@@ -5,13 +5,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ServerCoin = void 0;
 const lodash_1 = __importDefault(require("lodash"));
-const datalayer_driver_1 = require("datalayer-driver");
+const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const FullNodePeer_1 = require("./FullNodePeer");
 const coins_1 = require("./coins");
 const Wallet_1 = require("./Wallet");
 const NconfManager_1 = require("../utils/NconfManager");
 const DataStore_1 = require("./DataStore");
+const node_cache_1 = __importDefault(require("node-cache"));
+const network_1 = require("../utils/network");
 const serverCoinCollateral = 300000000;
+// Initialize the cache with a TTL of 300 seconds (5 minutes)
+const serverCoinPeersCache = new node_cache_1.default({ stdTTL: 300 });
 class ServerCoin {
     constructor(storeId) {
         this.storeId = storeId;
@@ -23,7 +27,7 @@ class ServerCoin {
             const wallet = await Wallet_1.Wallet.load("default");
             const publicSyntheticKey = await wallet.getPublicSyntheticKey();
             const serverCoinCreationCoins = await (0, coins_1.selectUnspentCoins)(peer, BigInt(serverCoinCollateral), BigInt(1000000));
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             const epochBasedHint = (0, datalayer_driver_1.morphLauncherId)(Buffer.from(this.storeId, "hex"), BigInt(currentEpoch));
             const newServerCoin = (0, datalayer_driver_1.createServerCoin)(publicSyntheticKey, serverCoinCreationCoins, epochBasedHint, [peerIp], BigInt(serverCoinCollateral), BigInt(1000000));
             const combinedCoinSpends = [...newServerCoin.coinSpends];
@@ -94,13 +98,13 @@ class ServerCoin {
         serverCoins = serverCoins.filter((coin) => coin.coin.parentCoinInfo !== serverCoin.parentCoinInfo);
         await ServerCoin.serverCoinManager.setConfigValue(`${this.storeId}:${peerIp}`, serverCoins);
     }
-    // Sample server coins for the current epoch
-    async sampleCurrentEpoch(sampleSize = 5, blacklist = []) {
-        const epoch = ServerCoin.getCurrentEpoch();
-        return this.sampleServerCoinsByEpoch(epoch, sampleSize, blacklist);
-    }
-    // Sample server coins by epoch
-    async sampleServerCoinsByEpoch(epoch, sampleSize = 5, blacklist = []) {
+    async getAllEpochPeers(epoch, blacklist = []) {
+        const cacheKey = `serverCoinPeers-${this.storeId}-${epoch}`;
+        // Check if the result is already cached
+        const cachedPeers = serverCoinPeersCache.get(cacheKey);
+        if (cachedPeers) {
+            return cachedPeers;
+        }
         const epochBasedHint = (0, datalayer_driver_1.morphLauncherId)(Buffer.from(this.storeId, "hex"), BigInt(epoch));
         const peer = await FullNodePeer_1.FullNodePeer.connect();
         const maxClvmCost = BigInt(11000000000);
@@ -118,18 +122,42 @@ class ServerCoin {
         if (process.env.DIG_DEBUG === "1") {
             console.log("Server Coin Peers: ", serverCoinPeers);
         }
-        // Convert the Set back to an array if needed
-        return lodash_1.default.sampleSize(Array.from(serverCoinPeers), sampleSize);
+        const peerList = Array.from(serverCoinPeers);
+        // Cache the result
+        serverCoinPeersCache.set(cacheKey, peerList);
+        return peerList;
+    }
+    async getActiveEpochPeers(blacklist = []) {
+        const { epoch } = ServerCoin.getCurrentEpoch();
+        return this.getAllEpochPeers(epoch, blacklist);
+    }
+    // Sample server coins for the current epoch
+    async sampleCurrentEpoch(sampleSize = 5, blacklist = []) {
+        const { epoch } = ServerCoin.getCurrentEpoch();
+        return this.sampleServerCoinsByEpoch(epoch, sampleSize, blacklist);
+    }
+    // Sample server coins by epoch
+    async sampleServerCoinsByEpoch(epoch, sampleSize = 5, blacklist = []) {
+        // We dont want our own IP to be included
+        const myIp = await (0, network_1.getPublicIpAddress)();
+        if (myIp) {
+            blacklist.push(myIp);
+        }
+        const serverCoinPeers = await this.getAllEpochPeers(epoch, blacklist);
+        if (process.env.DIG_DEBUG === "1") {
+            console.log("Server Coin Peers: ", serverCoinPeers);
+        }
+        return lodash_1.default.sampleSize(serverCoinPeers, sampleSize);
     }
     // Get the current epoch based on the current timestamp
     static getCurrentEpoch() {
-        return ServerCoin.calculateEpoch(new Date());
+        return ServerCoin.calculateEpochAndRound(new Date());
     }
     // Ensure server coin exists for the current epoch
     async ensureServerCoinExists(peerIp) {
         try {
             console.log(`Ensuring server coin exists for store ${this.storeId}...`);
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             const serverCoins = await this.getServerCoinsForStore(peerIp);
             // Check if a server coin already exists for the current epoch
             const existingCoin = serverCoins.find((coin) => coin.epoch === currentEpoch);
@@ -160,7 +188,7 @@ class ServerCoin {
     // Melt outdated server coins
     async meltOutdatedEpochs(peerIp) {
         try {
-            const currentEpoch = ServerCoin.getCurrentEpoch();
+            const { epoch: currentEpoch } = ServerCoin.getCurrentEpoch();
             let serverCoins = await this.getServerCoinsForStore(peerIp);
             // Filter out coins that are not in the current epoch
             const outdatedCoins = serverCoins.filter((coin) => coin.epoch < currentEpoch);
@@ -244,17 +272,23 @@ class ServerCoin {
         }
     }
     // Static method to calculate the current epoch
-    static calculateEpoch(currentTimestampUTC) {
+    static calculateEpochAndRound(currentTimestampUTC) {
         const firstEpochStart = new Date(Date.UTC(2024, 8, 3, 0, 0)); // Sept 3, 2024, 00:00 UTC
         // Convert the current timestamp to milliseconds
         const currentTimestampMillis = currentTimestampUTC.getTime();
         // Calculate the number of milliseconds in one epoch (7 days)
-        const millisecondsInEpoch = 7 * 24 * 60 * 60 * 1000;
+        const millisecondsInEpoch = 7 * 24 * 60 * 60 * 1000; // 7 days in milliseconds
         // Calculate the difference in milliseconds between the current timestamp and the first epoch start
         const differenceMillis = currentTimestampMillis - firstEpochStart.getTime();
         // Calculate the current epoch number
         const epochNumber = Math.floor(differenceMillis / millisecondsInEpoch) + 1;
-        return epochNumber;
+        // Calculate the milliseconds elapsed since the start of the current epoch
+        const elapsedMillisInCurrentEpoch = differenceMillis % millisecondsInEpoch;
+        // Calculate the number of milliseconds in a round (10 minutes)
+        const millisecondsInRound = 10 * 60 * 1000; // 10 minutes in milliseconds
+        // Calculate the current round number
+        const roundNumber = Math.floor(elapsedMillisInCurrentEpoch / millisecondsInRound) + 1;
+        return { epoch: epochNumber, round: roundNumber };
     }
 }
 exports.ServerCoin = ServerCoin;