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

package/dist/DigNetwork/DigNetwork.d.ts

@@ -6,10 +6,11 @@ export declare class DigNetwork {
     private peerBlacklist;
     constructor(storeId: string);
     private uploadPreflight;
+    uploadStoreHead(digPeer: DigPeer): Promise<void>;
     uploadStore(digPeer: DigPeer): Promise<void>;
     static subscribeToStore(storeId: string): Promise<void>;
     static unsubscribeFromStore(storeId: string): void;
-    downloadFiles(forceDownload?: boolean, renderProgressBar?: boolean): Promise<void>;
+    downloadFiles(forceDownload?: boolean, renderProgressBar?: boolean, skipData?: boolean): Promise<void>;
     private fetchAvailablePeers;
     private downloadHeightFile;
     private downloadManifestFile;

package/dist/DigNetwork/DigNetwork.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"DigNetwork.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigNetwork.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAA2B;gBAEpC,OAAO,EAAE,MAAM;YAOb,eAAe;IA+ChB,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;WAgCrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAQtD,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAM5C,aAAa,CACxB,aAAa,GAAE,OAAe,EAC9B,iBAAiB,GAAE,OAAc,GAChC,OAAO,CAAC,IAAI,CAAC;YAmFF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAuErB,cAAc;CAkB7B"}
+{"version":3,"file":"DigNetwork.d.ts","sourceRoot":"","sources":["../../src/DigNetwork/DigNetwork.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AAMpC,qBAAa,UAAU;IACrB,OAAO,CAAC,SAAS,CAAY;IAC7B,OAAO,CAAC,UAAU,CAAa;IAC/B,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,aAAa,CAA2B;gBAEpC,OAAO,EAAE,MAAM;YAOb,eAAe;IA8ChB,eAAe,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;IAsDhD,WAAW,CAAC,OAAO,EAAE,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;WA+BrC,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;WAQtD,oBAAoB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI;IAQ5C,aAAa,CACxB,aAAa,GAAE,OAAe,EAC9B,iBAAiB,GAAE,OAAc,EACjC,QAAQ,GAAE,OAAe,GACxB,OAAO,CAAC,IAAI,CAAC;YAqFF,mBAAmB;YAWnB,kBAAkB;YASlB,oBAAoB;YASpB,qBAAqB;YAuErB,cAAc;CAuB7B"}

package/dist/DigNetwork/DigNetwork.js

@@ -63,6 +63,40 @@ class DigNetwork {
         }
         return { generationIndex, lastLocalRootHash };
     }
+    async uploadStoreHead(digPeer) {
+        // First make sure that the remote store is up to date.
+        const rootHistory = await this.dataStore.getRootHistory();
+        const localManifestHashes = await this.dataStore.getManifestHashes();
+        const remoteManifestFile = await digPeer.propagationServer.getStoreData("manifest.dat");
+        const remoteManifestHashes = remoteManifestFile.split("\n").filter(Boolean);
+        const onChainRootHashes = rootHistory.map((root) => root.root_hash);
+        // Check that remote manifest is one behind on-chain root hashes
+        if (remoteManifestHashes.length !== onChainRootHashes.length - 1) {
+            throw new Error("Remote manifest should be one behind the on-chain root. Cannot push head.");
+        }
+        // Compare each remote manifest hash with the corresponding on-chain root hash
+        for (let i = 0; i < remoteManifestHashes.length; i++) {
+            if (remoteManifestHashes[i] !== onChainRootHashes[i]) {
+                throw new Error(`Remote manifest does not match on-chain root at index ${i}. Cannot push head.`);
+            }
+        }
+        // Get the files for the latest local manifest hash
+        const filesToUpload = await this.dataStore.getFileSetForRootHash(localManifestHashes[localManifestHashes.length - 1]);
+        if (!filesToUpload.length) {
+            console.log("No files to upload.");
+            return;
+        }
+        // Upload files to the remote peer with a progress bar
+        await this.runProgressBar(filesToUpload.length, "Store Data", async (progress) => {
+            for (const filePath of filesToUpload) {
+                const relativePath = path
+                    .relative(this.storeDir, filePath)
+                    .replace(/\\/g, "/");
+                await digPeer.propagationServer.pushFile(filePath, relativePath);
+                progress.increment();
+            }
+        });
+    }
     // Uploads the store to a specific peer
     async uploadStore(digPeer) {
         const { generationIndex } = await this.uploadPreflight(digPeer);
@@ -74,7 +108,6 @@ class DigNetwork {
         }
         await this.runProgressBar(filesToUpload.length, "Store Data", async (progress) => {
             for (const filePath of filesToUpload) {
-                console.log(`Uploading ${filePath}...`);
                 const relativePath = path
                     .relative(this.storeDir, filePath)
                     .replace(/\\/g, "/");
@@ -91,11 +124,13 @@ class DigNetwork {
         await digNetwork.downloadFiles(true);
     }
     static unsubscribeFromStore(storeId) {
-        fs.rmdirSync(path.join(config_1.DIG_FOLDER_PATH, "stores", storeId), { recursive: true });
+        fs.rmdirSync(path.join(config_1.DIG_FOLDER_PATH, "stores", storeId), {
+            recursive: true,
+        });
         fs.unlinkSync(path.join(config_1.DIG_FOLDER_PATH, "stores", storeId + ".json"));
     }
     // Downloads files from the network based on the manifest
-    async downloadFiles(forceDownload = false, renderProgressBar = true) {
+    async downloadFiles(forceDownload = false, renderProgressBar = true, skipData = false) {
         try {
             const rootHistory = await this.dataStore.getRootHistory();
             if (!rootHistory.length)
@@ -124,10 +159,12 @@ class DigNetwork {
                 const datFileContent = JSON.parse(fs.readFileSync(datFilePath, "utf-8"));
                 if (datFileContent.root !== rootHash)
                     throw new Error("Root hash mismatch");
-                for (const file of Object.keys(datFileContent.files)) {
-                    const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, path.join(this.storeDir, "data"));
-                    const isInDataDir = filePath.startsWith(path.join(this.storeDir, "data"));
-                    await this.downloadFileFromPeers((0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, "data"), filePath, forceDownload || !isInDataDir);
+                if (!skipData) {
+                    for (const file of Object.keys(datFileContent.files)) {
+                        const filePath = (0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, path.join(this.storeDir, "data"));
+                        const isInDataDir = filePath.startsWith(path.join(this.storeDir, "data"));
+                        await this.downloadFileFromPeers((0, hashUtils_1.getFilePathFromSha256)(datFileContent.files[file].sha256, "data"), filePath, forceDownload || !isInDataDir);
+                    }
                 }
                 if (localManifestHashes[i] !== rootHash)
                     newRootHashes.push(rootHash);
@@ -209,6 +246,8 @@ class DigNetwork {
     }
     async runProgressBar(total, name, task) {
         // Using 'any' to work around TypeScript issues
+        const oldConsoleLog = console.log;
+        console.log = () => { }; // Suppress console.log output
         const multiBar = new cli_progress_1.MultiBar({
             clearOnComplete: false,
             hideCursor: true,
@@ -216,7 +255,10 @@ class DigNetwork {
             noTTYOutput: true,
         }, cli_progress_1.Presets.shades_classic);
         const progress = multiBar.create(total, 0, { name });
-        await task(progress).finally(() => multiBar.stop());
+        await task(progress).finally(() => {
+            multiBar.stop();
+            console.log = oldConsoleLog; // Restore console.log
+        });
     }
 }
 exports.DigNetwork = DigNetwork;

package/dist/blockchain/DataStore.d.ts

@@ -50,5 +50,7 @@ export declare class DataStore {
     isSynced(): Promise<boolean>;
     hasMetaWritePermissions(publicSyntheticKey?: Buffer): Promise<boolean>;
     updateMetadata(metadata: DataStoreMetadata): Promise<DataStoreDriver>;
+    getFileSetForRootHash(rootHash: string): Promise<string[]>;
+    getManifestHashes(): 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,iCAAiC,CAAC;AACzC,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;CA8C5B"}
+{"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,iCAAiC,CAAC;AACzC,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"}

package/dist/blockchain/DataStore.js

@@ -13,6 +13,7 @@ const Wallet_1 = require("./Wallet");
 const config_1 = require("../utils/config");
 const coins_1 = require("./coins");
 const utils_1 = require("../utils");
+const hashUtils_1 = require("../utils/hashUtils");
 const data_integrity_tree_1 = require("@dignetwork/data-integrity-tree");
 const prompts_1 = require("../prompts");
 const FileCache_1 = require("../utils/FileCache");
@@ -406,5 +407,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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dignetwork/dig-sdk",
-  "version": "0.0.1-alpha.3",
+  "version": "0.0.1-alpha.4",
   "description": "",
   "type": "commonjs",
   "main": "./dist/index.js",