autobee 2.9.5 → 2.9.6

package/lib/migrations.js

@@ -84,7 +84,7 @@ async function checkAutobaseMigration(store, local, bootstrap) {
   let catchup
 
   try {
-    length = await findLocalSystemLength(core, session, systemLength)
+    length = await findLocalSystemLength(store, core, session, systemLength)
     catchup = await getCatchupHeads(session, length)
   } finally {
     await session.close()
@@ -205,18 +205,14 @@ function deriveNamespace(name, bootstrap, entropy, encryptionKey) {
 // scan back for the newest block the signed core actually has locally
 // the newest INFO the signed core holds that the batch session agrees with -
 // past its dependency the batch is speculative and may have diverged
-async function findLocalSystemLength(core, session, systemLength) {
+async function findLocalSystemLength(store, core, session, systemLength) {
   let length = Math.min(core.length, systemLength)
 
   while (length > 0) {
     const seq = length - 1
     const node = await core.get(seq, { wait: false })
 
-    if (node) {
-      const blk = decodeBlock(node)
-      const entry = blk.keys[0]
-      if (b4a.equals(entry.key, INFO) && (await sameTree(core, session, length))) return length
-    }
+    if (node && (await isReachableInfo(store, core, session, node, length))) return length
 
     length--
   }
@@ -224,6 +220,15 @@ async function findLocalSystemLength(core, session, systemLength) {
   return 0
 }
 
+// an INFO block the batch agrees with whose views the store has caught up to -
+// otherwise the migrated view would be ahead of what the system can prove
+async function isReachableInfo(store, core, session, node, length) {
+  const entry = decodeBlock(node).keys[0]
+  if (!b4a.equals(entry.key, INFO)) return false
+  if (!(await sameTree(core, session, length))) return false
+  return viewsReached(store, decodeLegacySystemInfo(entry.value))
+}
+
 async function sameTree(core, session, length) {
   if (length <= session.signedLength) return true
   if (length > session.length) return false
@@ -358,3 +363,17 @@ async function getWriterBatch(store, head, key, encryptionKey, nodes = []) {
 
   return batch
 }
+
+async function viewsReached(store, info) {
+  for (const v of info.views) {
+    if (!v.length) continue
+    const core = store.get({ key: v.key, active: false })
+    try {
+      await core.ready()
+      if (core.length < v.length) return false
+    } finally {
+      await core.close()
+    }
+  }
+  return true
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "autobee",
-  "version": "2.9.5",
+  "version": "2.9.6",
   "description": "Bee based autobase",
   "license": "Apache-2.0",
   "author": "Holepunch Inc.",