hypercore 11.0.45 → 11.0.47

package/lib/copy-prologue.js

@@ -91,7 +91,13 @@ async function flushBatch (prologue, src, dst, batch) {
   // reads done!
 
   if (batch.first) {
-    const treeHash = crypto.tree(nodes.slice(0, batch.roots.length))
+    const roots = nodes.slice(0, batch.roots.length)
+
+    for (const node of roots) {
+      if (!node) throw new Error('Missing nodes for prologue hash')
+    }
+
+    const treeHash = crypto.tree(roots)
     if (!b4a.equals(treeHash, prologue.hash)) throw new Error('Prologue does not match source')
   }
 

package/lib/core.js

@@ -559,7 +559,8 @@ module.exports = class Core {
     }
 
     // tmp log so we can see these
-    console.log('[hypercore] conflict detected in ' + this.id + ' (writable=' + !!this.header.keyPair + ',quorum=' + this.header.manifest.quorum + ')')
+    const id = b4a.toString(this.discoveryKey, 'hex')
+    console.log('[hypercore] conflict detected in ' + id + ' (writable=' + !!this.header.keyPair + ',quorum=' + this.header.manifest.quorum + ')')
     await this._onconflict(proof)
     return true
   }

package/lib/session-state.js

@@ -27,8 +27,6 @@ module.exports = class SessionState {
     this.atomized = null
     this.mutex = new Mutex()
 
-    this.treeFork = -1 // only updated if truncated below dependency
-
     // merkle state
     this.roots = treeInfo.roots.length ? treeInfo.roots : []
     this.fork = treeInfo.fork || 0
@@ -111,7 +109,7 @@ module.exports = class SessionState {
   }
 
   get encryptionFork () {
-    return this.treeFork === -1 ? this.core.header.tree.fork : this.treeFork
+    return this.core.header.tree.fork
   }
 
   async updateSnapshotStorage (storage) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.0.45",
+  "version": "11.0.47",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {