hypercore 11.33.5 → 11.34.1

package/lib/replicator.js

@@ -1019,7 +1019,7 @@ class Peer {
       }
 
       let req = null
-      const batch = this.core.storage.read()
+      const batch = this.core.storage.read(this.core.state.fork)
       try {
         req = await this._getProof(batch, msg, true)
       } catch (err) {
@@ -1051,7 +1051,7 @@ class Peer {
     }
 
     try {
-      const batch = this.core.storage.read()
+      const batch = this.core.storage.read(this.core.state.fork)
 
       // TODO: could still be answerable if (index, fork) is an ancestor of the current fork
       const req =
@@ -1749,6 +1749,17 @@ class Peer {
     return false
   }
 
+  _addLastRangeBatch(r, start, end) {
+    const { WANT_BATCH } = w
+
+    const next = this.core.bitfield.findLast(false, end - 1)
+    if (next === -1 || next < start) return false
+
+    const b = (next - (next & (WANT_BATCH - 1))) / WANT_BATCH
+
+    return r.addBatch(b)
+  }
+
   _populateRangeBatches(r) {
     const { WANT_BATCH } = w
     for (let i = r.batches.length - 1; i >= 0; i--) {
@@ -1764,10 +1775,13 @@ class Peer {
       r.removeBatch(b)
     }
 
-    while (r.batches.length < 3) {
-      const end = r.end === -1 ? this.core.state.length : r.end
-      if (end <= r.start) return
+    const end = r.end === -1 ? this.core.state.length : r.end
+    if (end <= r.start) return
 
+    // always keep the last batch in the range selected
+    if (r.batches.length < 3) this._addLastRangeBatch(r, r.start, end)
+
+    while (r.batches.length < 3) {
       const len = end - r.start
       const off = r.start + (r.linear ? 0 : Math.floor(Math.random() * len))
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.33.5",
+  "version": "11.34.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -54,7 +54,7 @@
     "hypercore-crypto": "^3.2.1",
     "hypercore-errors": "^1.5.0",
     "hypercore-id-encoding": "^1.2.0",
-    "hypercore-storage": "^3.0.0",
+    "hypercore-storage": "^3.2.0",
     "is-options": "^1.0.1",
     "nanoassert": "^2.0.0",
     "protomux": "^3.5.0",