hypercore 11.0.6 → 11.0.8

package/lib/bitfield.js

@@ -330,14 +330,15 @@ module.exports = class Bitfield {
         p = this._pages.set(i, new BitfieldPage(i, s))
       }
 
-      const last = Math.min(end, BITS_PER_PAGE)
+      const offset = p.index * BITS_PER_PAGE
+      const last = Math.min(end - offset, BITS_PER_PAGE)
       const range = last - j
 
       if (p) p.setRange(j, last, val)
 
       j = 0
       i++
-      end -= range
+      start += range
     }
   }
 

package/lib/core.js

@@ -649,8 +649,8 @@ module.exports = class Core {
     this.updateContiguousLength({ start, length, drop: true })
   }
 
-  async _onconflict (proof, from) {
-    await this.replicator.onconflict(from)
+  async _onconflict (proof) {
+    await this.replicator.onconflict()
 
     for (let i = this.monitors.length - 1; i >= 0; i--) {
       const s = this.monitors[i]

package/lib/replicator.js

@@ -1578,7 +1578,7 @@ module.exports = class Replicator {
   }
 
   // Called externally when a conflict has been detected and verified
-  async onconflict (from) {
+  async onconflict () {
     const all = []
     for (const peer of this.peers) {
       all.push(peer._onconflict())

package/lib/session-state.js

@@ -233,6 +233,7 @@ module.exports = class SessionState {
     }
 
     if (src.dependencyLength > this.dependencyLength) {
+      this.dependencyLength = src.dependencyLength
       this.storage.updateDependencyLength(src.dependencyLength)
     }
 
@@ -638,12 +639,21 @@ module.exports = class SessionState {
     const firstPage = getBitfieldPage(treeLength)
     const lastPage = getBitfieldPage(totalLength)
 
+    const srx = this.storage.read()
+    const bitfieldPagePromise = srx.getBitfieldPage(firstPage)
+    srx.tryFlush()
+
+    const bitfieldPage = await bitfieldPagePromise
+
     let index = treeLength
 
     for (let i = firstPage; i <= lastPage; i++) {
       const page = b4a.alloc(Bitfield.BYTES_PER_PAGE)
       tx.putBitfieldPage(i, page)
 
+      // copy existing bits in
+      if (i === firstPage && bitfieldPage) page.set(bitfieldPage)
+
       if (index < length) {
         index = fillBitfieldPage(page, index, length, i, true)
         if (index < length) continue

package/package.json

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