autobee 2.0.0-rc.29 → 2.0.0-rc.30

package/lib/topo.js

@@ -226,7 +226,7 @@ async function inflate(auto, reorder, opts = null) {
 async function getOplogBatch(undo, core, length, weight, index, opts = null) {
   const seq = length - 1
   const block = await core.get(seq, opts)
-  if (block === null) return null
+  if (block === null) return null // wait: false in replay helper
 
   const oplog = encoding.decodeOplog(block)
   const head = createNode(core, length, weight, oplog)
@@ -236,6 +236,7 @@ async function getOplogBatch(undo, core, length, weight, index, opts = null) {
   if (legacy) {
     for (let i = length - 1; i > 0; i--) {
       const block = await core.get(i - 1, opts)
+      if (block === null) return null // wait: false in replay helper
       const oplog = encoding.decodeOplog(block)
       if (oplog.batch.end === 0) break
       head.batch.start++

package/lib/writers.js

@@ -786,10 +786,18 @@ function createNode(core, length, weight, oplog) {
 }
 
 function finalizeNodeBatch(batch) {
-  if (batch.length === 0 || batch[0].version > LEGACY_OPLOG_VERSION) return batch
+  // replay batches keep unreachable blocks as null holes (topo.getOplogBatch)
+  let first = null
+  for (const node of batch) {
+    if (node !== null) {
+      first = node
+      break
+    }
+  }
+  if (first === null || first.version > LEGACY_OPLOG_VERSION) return batch
 
   for (let i = 0; i < batch.length; i++) {
-    batch[i].batch.start = i
+    if (batch[i] !== null) batch[i].batch.start = i
   }
 
   return batch

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "2.0.0-rc.29",
+  "version": "2.0.0-rc.30",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",