hypercore 10.28.9 → 10.28.11

package/lib/core.js

@@ -919,12 +919,21 @@ async function flushHeader (oplog, bigHeader, header) {
 function noop () {}
 
 function maximumSegmentStart (start, src, dst) {
-  const a = src.firstSet(start)
-  const b = dst.firstUnset(start)
+  while (true) {
+    const a = src.firstSet(start)
+    const b = dst.firstUnset(start)
 
-  if (a === -1) return -1
-  if (b === -1) return a
-  return a < b ? b : a
+    if (a === -1) return -1
+    if (b === -1) return a
+
+    // if dst has the segment, restart
+    if (a < b) {
+      start = b
+      continue
+    }
+
+    return a
+  }
 }
 
 function minimumSegmentEnd (start, src, dst) {

package/lib/replicator.js

@@ -821,7 +821,7 @@ class Peer {
       // We need an upgrade for the seek, if non can be provided, skip
       if (req === null) return false
 
-      req.seek = { bytes: s.seeker.bytes }
+      req.seek = { bytes: s.seeker.padding * s.seeker.start + s.seeker.bytes }
 
       s.inflight.push(req)
       this._send(req)
@@ -851,7 +851,7 @@ class Peer {
       const req = this._makeRequest(false, h.priority)
 
       req.hash = { index: 2 * index, nodes: 0 }
-      req.seek = { bytes: s.seeker.bytes }
+      req.seek = { bytes: s.seeker.padding * s.seeker.start + s.seeker.bytes }
 
       s.inflight.push(req)
       h.inflight.push(req)

package/package.json

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