@dignetwork/dig-sdk 0.0.1-alpha.3 → 0.0.1-alpha.30

package/dist/blockchain/DataStore.js

@@ -6,14 +6,15 @@ 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 data_integrity_tree_1 = require("@dignetwork/data-integrity-tree");
+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");
@@ -32,7 +33,7 @@ class DataStore {
                 storeDir: config_1.STORE_PATH,
             };
         }
-        this.tree = new data_integrity_tree_1.DataIntegrityTree(storeId, _options);
+        this.tree = new DataIntegrityTree_1.DataIntegrityTree(storeId, _options);
     }
     get StoreId() {
         return this.storeId;
@@ -335,6 +336,7 @@ class DataStore {
             }
         }
         let filesIntegrityIntact = true;
+        // At this point we have verified that the root history and manifest file match
         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)) {
@@ -347,8 +349,11 @@ class DataStore {
                 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) {
+                // We are going to check if the sha256 belongs to the tree, and then we are going to make sure
+                // that the file is in the data folder and that the sha256 of the file matches the one in the dat file
+                const belongsInTree = await this.Tree.verifyKeyIntegrity(fileData.sha256, rootHash);
+                const fileIntegrityCheck = (0, utils_1.validateFileSha256)(fileData.sha256, path_1.default.join(config_1.STORE_PATH, this.storeId, "data"));
+                if (!fileIntegrityCheck || !belongsInTree) {
                     filesIntegrityIntact = false;
                 }
             }
@@ -406,5 +411,27 @@ class DataStore {
         }
         return updateStoreResponse.newStore;
     }
+    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);
+        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);
+        }
+        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)
+            : [];
+    }
 }
 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,4 +1,4 @@
-import { Peer } from "datalayer-driver";
+import { Peer } from "@dignetwork/datalayer-driver";
 export declare class FullNodePeer {
     private static cachedPeer;
     private static memoizedFetchNewPeerIPs;
@@ -7,6 +7,13 @@ export declare class FullNodePeer {
     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;mBA4BT,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;AAmBpD,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;IAM/B;;;;;OAKG;IACH,OAAO,CAAC,MAAM,CAAC,kBAAkB;mBASZ,eAAe;mBAiDf,UAAU;IAyB/B,OAAO,CAAC,MAAM,CAAC,eAAe;mBAgDT,WAAW;IAgGzB,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"));
@@ -48,12 +48,24 @@ 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
         if (trustedNodeIp &&
-            FullNodePeer.isValidIpAddress(trustedNodeIp) &&
             (await FullNodePeer.isPortReachable(trustedNodeIp, FULLNODE_PORT))) {
             priorityIps.push(trustedNodeIp);
         }
@@ -107,18 +119,38 @@ class FullNodePeer {
         }
         return FullNodePeer.memoizedFetchNewPeerIPs();
     }
-    static createPeerProxy(peer, certFile, keyFile) {
+    static createPeerProxy(peer) {
         return new Proxy(peer, {
             get: (target, prop) => {
                 const originalMethod = target[prop];
                 if (typeof originalMethod === "function") {
                     return async (...args) => {
+                        let timeoutId;
+                        // Start the timeout to forget the peer after 1 minute
+                        const timeoutPromise = new Promise((_, reject) => {
+                            timeoutId = setTimeout(() => {
+                                FullNodePeer.cachedPeer = null;
+                                reject(new Error("Operation timed out. Reconnecting to a new peer."));
+                            }, 60000); // 1 minute
+                        });
                         try {
-                            return await originalMethod.apply(target, args);
+                            // Run the original method and race it against the timeout
+                            const result = await Promise.race([
+                                originalMethod.apply(target, args),
+                                timeoutPromise,
+                            ]);
+                            // Clear the timeout if the operation succeeded
+                            if (timeoutId) {
+                                clearTimeout(timeoutId);
+                            }
+                            return result;
                         }
                         catch (error) {
-                            if (error.message.includes("WebSocket")) {
+                            // 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();
                                 const newPeer = await FullNodePeer.getBestPeer();
                                 return newPeer[prop](...args);
                             }
@@ -149,7 +181,7 @@ class FullNodePeer {
             if (ip) {
                 try {
                     const peer = await datalayer_driver_1.Peer.new(`${ip}:${FULLNODE_PORT}`, false, certFile, keyFile);
-                    return FullNodePeer.createPeerProxy(peer, certFile, keyFile);
+                    return FullNodePeer.createPeerProxy(peer);
                 }
                 catch (error) {
                     console.error(`Failed to create peer for IP ${ip}: ${error.message}`);

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;AAMrD,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,CAC3B,KAAK,EAAE,MAAM,EACb,SAAS,GAAE,MAAM,EAAO,GACvB,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCP,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;WAMN,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,7 +5,7 @@ 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");
@@ -23,7 +23,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 +94,7 @@ 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 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 +112,31 @@ 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);
+        return Array.from(serverCoinPeers);
+    }
+    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 = []) {
+        const serverCoinPeers = await this.getAllEpochPeers(epoch, blacklist);
+        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 +167,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 +251,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;

package/dist/blockchain/Wallet.d.ts

@@ -1,5 +1,5 @@
 import { Buffer } from "buffer";
-import { Peer, Coin, CoinSpend } from "datalayer-driver";
+import { Peer, Coin, CoinSpend } from "@dignetwork/datalayer-driver";
 export declare const DEFAULT_FEE_COIN_COST = 64000000;
 export declare class Wallet {
     private mnemonic;

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

@@ -1 +1 @@
-{"version":3,"file":"Wallet.d.ts","sourceRoot":"","sources":["../../src/blockchain/Wallet.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EASL,IAAI,EACJ,IAAI,EAEJ,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAM1B,eAAO,MAAM,qBAAqB,WAAa,CAAC;AAOhD,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;WAKa,IAAI,CACtB,UAAU,GAAE,MAAkB,EAC9B,iBAAiB,GAAE,OAAc,GAChC,OAAO,CAAC,MAAM,CAAC;IAsBX,WAAW,IAAI,MAAM;WAOR,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAMpD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAShE,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6BhE,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMxC,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKzC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;WAK7B,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASlD,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;mBAU/B,oBAAoB;mBAWpB,mBAAmB;IAM3B,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO3D,2BAA2B,CACtC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC;IASN,kBAAkB,CAC7B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,IAAI,EAAO,GACrB,OAAO,CAAC,IAAI,EAAE,CAAC;WAwCE,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;WAItF,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAOlF"}
+{"version":3,"file":"Wallet.d.ts","sourceRoot":"","sources":["../../src/blockchain/Wallet.ts"],"names":[],"mappings":"AAUA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EASL,IAAI,EACJ,IAAI,EAEJ,SAAS,EAEV,MAAM,8BAA8B,CAAC;AAMtC,eAAO,MAAM,qBAAqB,WAAa,CAAC;AAOhD,qBAAa,MAAM;IACjB,OAAO,CAAC,QAAQ,CAAuB;IACvC,OAAO,CAAC,UAAU,CAAS;IAE3B,OAAO;WAKa,IAAI,CACtB,UAAU,GAAE,MAAkB,EAC9B,iBAAiB,GAAE,OAAc,GAChC,OAAO,CAAC,MAAM,CAAC;IAsBX,WAAW,IAAI,MAAM;WAOR,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAMpD,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;WAShE,oBAAoB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IA6BhE,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKrC,qBAAqB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMxC,sBAAsB,IAAI,OAAO,CAAC,MAAM,CAAC;IAKzC,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC;IAMrC,iBAAiB,IAAI,OAAO,CAAC,MAAM,CAAC;WAK7B,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;WASlD,WAAW,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;mBAU/B,oBAAoB;mBAWpB,mBAAmB;IAM3B,2BAA2B,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAO3D,2BAA2B,CACtC,KAAK,EAAE,MAAM,EACb,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,OAAO,CAAC;IASN,kBAAkB,CAC7B,IAAI,EAAE,IAAI,EACV,UAAU,EAAE,MAAM,EAClB,SAAS,EAAE,MAAM,EACjB,SAAS,GAAE,IAAI,EAAO,GACrB,OAAO,CAAC,IAAI,EAAE,CAAC;WAwCE,yBAAyB,CAAC,IAAI,EAAE,IAAI,EAAE,UAAU,EAAE,SAAS,EAAE,GAAG,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC;WAItF,eAAe,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAOlF"}

package/dist/blockchain/Wallet.js

@@ -38,7 +38,7 @@ const chia_root_resolver_1 = require("chia-root-resolver");
 const chia_config_loader_1 = require("chia-config-loader");
 const encryption_1 = require("../utils/encryption");
 const buffer_1 = require("buffer");
-const datalayer_driver_1 = require("datalayer-driver");
+const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const config_1 = require("../utils/config");
 const FileCache_1 = require("../utils/FileCache");
 const KEYRING_FILE = "keyring.json";

package/dist/blockchain/coins.d.ts

@@ -1,4 +1,4 @@
-import { Peer, Coin, CoinSpend } from "datalayer-driver";
+import { Peer, Coin, CoinSpend } from "@dignetwork/datalayer-driver";
 export declare const DEFAULT_FEE_COIN_COST = 64000000;
 export declare const calculateFeeForCoinSpends: (peer: Peer, coinSpends: CoinSpend[] | null) => Promise<bigint>;
 export declare const selectUnspentCoins: (peer: Peer, coinAmount: bigint, feeBigInt: bigint, omitCoins?: Coin[], walletName?: string) => Promise<Coin[]>;

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

@@ -1 +1 @@
-{"version":3,"file":"coins.d.ts","sourceRoot":"","sources":["../../src/blockchain/coins.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACJ,IAAI,EAEJ,SAAS,EAEV,MAAM,kBAAkB,CAAC;AAK1B,eAAO,MAAM,qBAAqB,WAAa,CAAC;AAWhD,eAAO,MAAM,yBAAyB,SAC9B,IAAI,cACE,SAAS,EAAE,GAAG,IAAI,KAC7B,OAAO,CAAC,MAAM,CA4BhB,CAAC;AAEF,eAAO,MAAM,kBAAkB,SACvB,IAAI,cACE,MAAM,aACP,MAAM,cACN,IAAI,EAAE,eACL,MAAM,KACjB,OAAO,CAAC,IAAI,EAAE,CAoEhB,CAAC;AAGF,eAAO,MAAM,eAAe,SACpB,IAAI,UACF,MAAM,KACb,OAAO,CAAC,OAAO,CAWjB,CAAC"}
+{"version":3,"file":"coins.d.ts","sourceRoot":"","sources":["../../src/blockchain/coins.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,IAAI,EACJ,IAAI,EAEJ,SAAS,EAEV,MAAM,8BAA8B,CAAC;AAKtC,eAAO,MAAM,qBAAqB,WAAa,CAAC;AAWhD,eAAO,MAAM,yBAAyB,SAC9B,IAAI,cACE,SAAS,EAAE,GAAG,IAAI,KAC7B,OAAO,CAAC,MAAM,CA4BhB,CAAC;AAEF,eAAO,MAAM,kBAAkB,SACvB,IAAI,cACE,MAAM,aACP,MAAM,cACN,IAAI,EAAE,eACL,MAAM,KACjB,OAAO,CAAC,IAAI,EAAE,CAoEhB,CAAC;AAGF,eAAO,MAAM,eAAe,SACpB,IAAI,UACF,MAAM,KACb,OAAO,CAAC,OAAO,CAWjB,CAAC"}

package/dist/blockchain/coins.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isCoinSpendable = exports.selectUnspentCoins = exports.calculateFeeForCoinSpends = exports.DEFAULT_FEE_COIN_COST = void 0;
-const datalayer_driver_1 = require("datalayer-driver");
+const datalayer_driver_1 = require("@dignetwork/datalayer-driver");
 const Wallet_1 = require("./Wallet");
 const config_1 = require("../utils/config");
 const FileCache_1 = require("../utils/FileCache");

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 export * from './blockchain';
 export * from './DigNetwork';
 export * from './utils';
-export * from '@dignetwork/data-integrity-tree';
+export * from './DataIntegrityTree';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,SAAS,CAAC;AACxB,cAAc,qBAAqB,CAAC"}

package/dist/index.js

@@ -17,4 +17,4 @@ Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./blockchain"), exports);
 __exportStar(require("./DigNetwork"), exports);
 __exportStar(require("./utils"), exports);
-__exportStar(require("@dignetwork/data-integrity-tree"), exports);
+__exportStar(require("./DataIntegrityTree"), exports);

package/dist/utils/config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAKrC,eAAO,MAAM,oBAAoB,qEACmC,CAAC;AAErE,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,sBAAsB,qEACiC,CAAC;AAErE,eAAO,MAAM,eAAe,QACqC,CAAC;AAElE,eAAO,MAAM,UAAU,QAAuC,CAAC;AAE/D,eAAO,MAAM,aAAa,QAAkC,CAAC;AAC7D,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAE9E,eAAO,MAAM,mBAAmB,YAAa,MAAM,KAAG,MACN,CAAC;AAEjD,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,MACL,CAAC;AAEhD,eAAO,MAAM,mBAAmB,QAAO,IAItC,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,MAAM,KAAG,IAU1C,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,MAAM,KAAG,IAUhD,CAAC;AAqBF,eAAO,MAAM,YAAY,YACd,MAAM,KACd;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CAYH,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,MAAM,EAOtC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,MAAM,GAAG,IAAI,CAkC9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,SAY/C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM,KAAG,SAmBjD,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,YACjB,MAAM,OACV,MAAM,SACJ,GAAG,KACT,IAMF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,YAAa,MAAM,OAAO,MAAM,KAAG,IAcjE,CAAC"}
+{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/utils/config.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AAKrC,eAAO,MAAM,oBAAoB,qEACmC,CAAC;AAErE,eAAO,MAAM,UAAU,UAAU,CAAC;AAClC,eAAO,MAAM,sBAAsB,qEACiC,CAAC;AAErE,eAAO,MAAM,eAAe,QACqC,CAAC;AAElE,eAAO,MAAM,UAAU,QAAuC,CAAC;AAE/D,eAAO,MAAM,aAAa,QAAkC,CAAC;AAC7D,eAAO,MAAM,gBAAgB,QAAgD,CAAC;AAE9E,eAAO,MAAM,mBAAmB,YAAa,MAAM,KAAG,MACN,CAAC;AAEjD,eAAO,MAAM,iBAAiB,YAAa,MAAM,KAAG,MACL,CAAC;AAEhD,eAAO,MAAM,mBAAmB,QAAO,IAItC,CAAC;AAEF,eAAO,MAAM,SAAS,WAAY,MAAM,KAAG,IAQ1C,CAAC;AAEF,eAAO,MAAM,cAAc,YAAa,MAAM,KAAG,IAQhD,CAAC;AAqBF,eAAO,MAAM,YAAY,YACd,MAAM,KACd;IACD,QAAQ,EAAE;QACR,QAAQ,EAAE,MAAM,CAAC;QACjB,KAAK,EAAE,MAAM,CAAC;QACd,KAAK,EAAE,MAAM,CAAC;QACd,WAAW,EAAE,MAAM,CAAC;KACrB,CAAC;CAYH,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,aAAa,QAAO,MAAM,EAOtC,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,gBAAgB,QAAa,OAAO,CAAC,MAAM,GAAG,IAAI,CAkC9D,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,aAAa,YAAa,MAAM,KAAG,SAS/C,CAAC;AAEF;;;;;;GAMG;AACH,eAAO,MAAM,eAAe,YAAa,MAAM,KAAG,SAoBjD,CAAC;AAEF;;;;;;;GAOG;AACH,eAAO,MAAM,eAAe,YACjB,MAAM,OACV,MAAM,SACJ,GAAG,KACT,IAMF,CAAC;AAEF;;;;;GAKG;AACH,eAAO,MAAM,kBAAkB,YAAa,MAAM,OAAO,MAAM,KAAG,IAcjE,CAAC"}

package/dist/utils/config.js

@@ -49,9 +49,7 @@ const createInitialConfig = () => {
 };
 exports.createInitialConfig = createInitialConfig;
 const setRemote = (remote) => {
-    if (!fs.existsSync(exports.CONFIG_FILE_PATH)) {
-        throw new Error("Config file not found.");
-    }
+    (0, exports.ensureDigConfig)("");
     const config = JSON.parse(fs.readFileSync(exports.CONFIG_FILE_PATH, "utf-8"));
     config.remote = remote;
     fs.writeFileSync(exports.CONFIG_FILE_PATH, JSON.stringify(config, null, 4));
@@ -59,9 +57,7 @@ const setRemote = (remote) => {
 };
 exports.setRemote = setRemote;
 const setActiveStore = (storeId) => {
-    if (!fs.existsSync(exports.CONFIG_FILE_PATH)) {
-        throw new Error("Config file not found.");
-    }
+    (0, exports.ensureDigConfig)("");
     const config = JSON.parse(fs.readFileSync(exports.CONFIG_FILE_PATH, "utf-8"));
     config.active_store = storeId;
     fs.writeFileSync(exports.CONFIG_FILE_PATH, JSON.stringify(config, null, 4));
@@ -151,9 +147,7 @@ exports.getActiveStoreId = getActiveStoreId;
  * @throws Will throw an error if the config file does not exist or cannot be parsed.
  */
 const loadDigConfig = (baseDir) => {
-    if (!fs.existsSync(exports.CONFIG_FILE_PATH)) {
-        throw new Error(`Configuration file not found at ${exports.CONFIG_FILE_PATH}`);
-    }
+    (0, exports.ensureDigConfig)("");
     try {
         const configContent = fs.readFileSync(exports.CONFIG_FILE_PATH, "utf-8");
         const config = JSON.parse(configContent);
@@ -173,6 +167,7 @@ exports.loadDigConfig = loadDigConfig;
  */
 const ensureDigConfig = (baseDir) => {
     if (!fs.existsSync(exports.CONFIG_FILE_PATH)) {
+        fs.mkdirSync(exports.DIG_FOLDER_PATH, { recursive: true });
         const defaultConfig = { deploy_dir: "./dist" };
         fs.writeFileSync(exports.CONFIG_FILE_PATH, JSON.stringify(defaultConfig, null, 4), "utf-8");
         console.log(`Created new dig.config.json at ${exports.CONFIG_FILE_PATH}`);

package/dist/utils/directoryUtils.d.ts

@@ -1,10 +1,4 @@
-import { DataIntegrityTree } from "@dignetwork/data-integrity-tree";
-/**
- * Recursively add all files in a directory to the Merkle tree, skipping the .dig, .git folders, and files in .gitignore.
- * @param datalayer - The DataStoreManager instance.
- * @param dirPath - The directory path.
- * @param baseDir - The base directory for relative paths.
- */
+import { DataIntegrityTree } from "../DataIntegrityTree";
 export declare const addDirectory: (datalayer: DataIntegrityTree, dirPath: string, baseDir?: string) => Promise<void>;
 /**
  * Calculate the total size of the DIG_FOLDER_PATH

package/dist/utils/directoryUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"directoryUtils.d.ts","sourceRoot":"","sources":["../../src/utils/directoryUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AAEpE;;;;;GAKG;AACH,eAAO,MAAM,YAAY,cACZ,iBAAiB,WACnB,MAAM,YACN,MAAM,KACd,OAAO,CAAC,IAAI,CAmCd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,eAAgB,MAAM,KAAG,MAiBxD,CAAC"}
+{"version":3,"file":"directoryUtils.d.ts","sourceRoot":"","sources":["../../src/utils/directoryUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,iBAAiB,EAAE,MAAM,sBAAsB,CAAC;AA+BzD,eAAO,MAAM,YAAY,cACZ,iBAAiB,WACnB,MAAM,YACN,MAAM,KACd,OAAO,CAAC,IAAI,CA4Cd,CAAC;AAEF;;;;GAIG;AACH,eAAO,MAAM,mBAAmB,eAAgB,MAAM,KAAG,MAiBxD,CAAC"}

package/dist/utils/directoryUtils.js

@@ -27,15 +27,29 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.calculateFolderSize = exports.addDirectory = void 0;
-const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
+const fs = __importStar(require("fs"));
 const ignore_1 = __importDefault(require("ignore"));
-/**
- * Recursively add all files in a directory to the Merkle tree, skipping the .dig, .git folders, and files in .gitignore.
- * @param datalayer - The DataStoreManager instance.
- * @param dirPath - The directory path.
- * @param baseDir - The base directory for relative paths.
- */
+// Custom concurrency handler
+const limitConcurrency = async (concurrencyLimit, tasks) => {
+    const executing = [];
+    for (const task of tasks) {
+        const p = task();
+        // Add the new task to the executing array
+        executing.push(p);
+        // When a task completes, remove it from the executing array
+        const cleanup = p.finally(() => {
+            executing.splice(executing.indexOf(cleanup), 1);
+        });
+        // Once the limit is reached, wait for one to complete
+        if (executing.length >= concurrencyLimit) {
+            await new Promise((resolve) => setTimeout(resolve, 100));
+            await Promise.race(executing);
+        }
+    }
+    // Wait for all remaining tasks to complete
+    return Promise.all(executing);
+};
 const addDirectory = async (datalayer, dirPath, baseDir = dirPath) => {
     const ig = (0, ignore_1.default)();
     const gitignorePath = path.join(baseDir, ".gitignore");
@@ -45,6 +59,7 @@ const addDirectory = async (datalayer, dirPath, baseDir = dirPath) => {
         ig.add(gitignoreContent);
     }
     const files = fs.readdirSync(dirPath);
+    const tasks = [];
     for (const file of files) {
         const filePath = path.join(dirPath, file);
         const relativePath = path.relative(baseDir, filePath).replace(/\\/g, "/");
@@ -54,18 +69,22 @@ const addDirectory = async (datalayer, dirPath, baseDir = dirPath) => {
         }
         const stat = fs.statSync(filePath);
         if (stat.isDirectory()) {
-            await (0, exports.addDirectory)(datalayer, filePath, baseDir);
+            // Recursively process the directory
+            tasks.push(() => (0, exports.addDirectory)(datalayer, filePath, baseDir));
         }
         else {
-            await new Promise((resolve, reject) => {
+            // Add a task for each file to be processed
+            tasks.push(() => new Promise((resolve, reject) => {
                 const stream = fs.createReadStream(filePath);
                 datalayer
                     .upsertKey(stream, Buffer.from(relativePath).toString("hex"))
-                    .then(resolve)
+                    .then(() => resolve())
                     .catch(reject);
-            });
+            }));
         }
     }
+    // Run tasks with limited concurrency (set the concurrency limit as needed)
+    await limitConcurrency(10, tasks); // Adjust 10 based on your system limits
 };
 exports.addDirectory = addDirectory;
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.30",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",
@@ -25,7 +25,7 @@
     "LICENSE"
   ],
   "dependencies": {
-    "@dignetwork/data-integrity-tree": "^0.0.22",
+    "@dignetwork/datalayer-driver": "^0.1.24",
     "bip39": "^3.1.0",
     "chia-bls": "^1.0.2",
     "chia-config-loader": "^1.0.1",
@@ -34,7 +34,6 @@
     "chia-wallet": "^1.0.18",
     "cli-progress": "^3.12.0",
     "crypto-js": "^4.2.0",
-    "datalayer-driver": "^0.1.21",
     "fs-extra": "^11.2.0",
     "ignore": "^5.3.2",
     "inquirer": "^10.1.8",
@@ -42,6 +41,7 @@
     "merkletreejs": "^0.4.0",
     "nanospinner": "^1.1.0",
     "nconf": "^0.12.1",
+    "p-limit": "^6.1.0",
     "superagent": "^10.0.0"
   },
   "devDependencies": {