autobee 2.9.2 → 2.9.3

package/lib/migrations.js

@@ -77,20 +77,21 @@ async function checkAutobaseMigration(store, local, bootstrap) {
   const encryptionKey = await local.getUserData('autobase/encryption')
   await AutobeeEncryption.setSystemEncryption(bootstrap.key, encryptionKey, core)
 
-  const length = await findLocalSystemLength(core, systemLength)
-  const system = { key, length }
-
   const session = core.session({ name: 'batch' })
   await session.ready()
 
+  let length
   let catchup
 
   try {
+    length = await findLocalSystemLength(core, session, systemLength)
     catchup = await getCatchupHeads(session, length)
   } finally {
     await session.close()
   }
 
+  const system = { key, length }
+
   // nothing reads the info here anymore, but a legacy system that will not
   // decode has to throw for migrateWithFallback pathway
   await readLegacySystemInfo(core, length, { wait: false })
@@ -201,7 +202,9 @@ function deriveNamespace(name, bootstrap, entropy, encryptionKey) {
 // the record's length can run past the signed core into the local batch
 // session, and the signed core can carry verified-but-undownloaded blocks -
 // scan back for the newest block the signed core actually has locally
-async function findLocalSystemLength(core, systemLength) {
+// 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) {
   let length = Math.min(core.length, systemLength)
 
   while (length > 0) {
@@ -211,7 +214,7 @@ async function findLocalSystemLength(core, systemLength) {
     if (node) {
       const blk = decodeBlock(node)
       const entry = blk.keys[0]
-      if (b4a.equals(entry.key, INFO)) return length
+      if (b4a.equals(entry.key, INFO) && (await sameTree(core, session, length))) return length
     }
 
     length--
@@ -220,6 +223,12 @@ async function findLocalSystemLength(core, systemLength) {
   assert(false, 'Expected system block to exist locally')
 }
 
+async function sameTree(core, session, length) {
+  if (length <= session.signedLength) return true
+  if (length > session.length) return false
+  return b4a.equals(await core.treeHash(length), await session.treeHash(length))
+}
+
 function coreLength(core, timeout) {
   if (core.length) return core.length
 
@@ -292,6 +301,9 @@ async function getCatchupHeads(session, from) {
     const entry = blk.keys[0]
 
     if (b4a.equals(entry.key, INFO)) {
+      // a replayed node flushes an INFO without a member block
+      if (batch.length === 0) continue
+
       const oplog = getOplog(entry, batch)
       const { key, length } = encoding.decodeSystemWriter(oplog.key, oplog.value)
 

package/package.json

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