autobee 2.0.0-rc.26 → 2.0.0-rc.27

package/index.js

@@ -177,6 +177,7 @@ module.exports = class Autobee extends ReadyResource {
     this._bootingAll.catch(safetyCatch)
 
     await this.bee.ready()
+    await this._workingBee.ready()
     await this._bootingState
 
     this._localSystemStart = this.system.bee.context.local.length
@@ -1042,12 +1043,7 @@ module.exports = class Autobee extends ReadyResource {
 
     this.writers.attest(witnessed)
 
-    for (const { key, added, isAnchor } of changed) {
-      if (isAnchor) {
-        // no Writer/ActiveWriters tracking, but still wake anything linked to it
-        this.writers.triggers.trigger(b4a.toString(key, 'hex'), 1)
-        continue
-      }
+    for (const { key, added } of changed) {
       if (added) await this.writers.add(key)
       else await this.writers.remove(key)
     }

package/lib/system.js

@@ -85,8 +85,8 @@ module.exports = class Systembee {
     this.update(key, length, -1, 0, false, false, true, false, false, -1, false)
   }
 
-  addAnchor(key, { length = 1 } = {}) {
-    this.update(key, length, -1, -1, false, true, false, false, true, -1, false)
+  addAnchor(key) {
+    this.update(key, 0, -1, -1, false, true, false, false, true, -1, false)
   }
 
   isGenesis() {

package/lib/topo.js

@@ -1,7 +1,8 @@
 const b4a = require('b4a')
 const encoding = require('./encoding.js')
-const { createNode } = require('./writers.js')
+const { createNode, finalizeNodeBatch } = require('./writers.js')
 const asserts = require('./asserts.js')
+const { LEGACY_OPLOG_VERSION } = require('./constants.js')
 
 const EMPTY_HEAD = { length: 0, key: null }
 const INFO_LEGACY_KEY = b4a.concat([b4a.from([0, 0]), b4a.from('info')])
@@ -275,8 +276,20 @@ 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
+
   const oplog = encoding.decodeOplog(block)
   const head = createNode(core, length, weight, oplog)
+  const legacy = oplog.version <= LEGACY_OPLOG_VERSION
+
+  // if this is legacy the start pointer is always 0, fix
+  if (legacy) {
+    for (let i = length - 1; i > 0; i--) {
+      const block = await core.get(i - 1, opts)
+      const oplog = encoding.decodeOplog(block)
+      if (oplog.batch.end === 0) break
+      head.batch.start++
+    }
+  }
 
   const batch = []
   const result = { undo, batch, index }
@@ -304,6 +317,8 @@ async function getOplogBatch(undo, core, length, weight, index, opts = null) {
   }
 
   batch.push(head)
+  finalizeNodeBatch(batch)
+
   return result
 }
 

package/lib/writers.js

@@ -1,6 +1,7 @@
 const b4a = require('b4a')
 const encoding = require('./encoding.js')
 const Triggers = require('./triggers.js')
+const { LEGACY_OPLOG_VERSION } = require('./constants.js')
 const { signAttestation, resolveWeight } = require('./witness.js')
 const { WriterEncryption } = require('autobee-encryption')
 
@@ -62,9 +63,6 @@ class ActiveWriters {
 
     let added = false
     if (!w) {
-      // anchors are local-only and never replicated - nothing to fetch
-      const info = await this.auto.system.get(key, { unflushed: true })
-      if (info && info.isAnchor) return
       w = await this.add(key)
       if (!w) return
       added = true
@@ -453,7 +451,9 @@ class Writer {
   async update() {
     const info = await this.system.get(this.core.key)
 
-    if (info && info.isAnchor && this !== this.writers.localWriter) {
+    // an anchor core is prologue-only, so once its single node has applied
+    // nothing more can ever come - retire the writer
+    if (info && info.isAnchor && info.length > 0 && this !== this.writers.localWriter) {
       await this.detachAndClose()
       return info.length
     }
@@ -572,7 +572,7 @@ class Writer {
       }
 
       batch.push(node)
-      if (b.end === 0) return batch
+      if (b.end === 0) return finalizeNodeBatch(batch)
 
       // TODO: mark as dead
       if (batch.length >= BATCH_WRITER_SANITY) return null
@@ -763,6 +763,7 @@ function sortsBefore(a, b) {
 exports.ActiveWriters = ActiveWriters
 exports.Writer = Writer
 exports.createNode = createNode
+exports.finalizeNodeBatch = finalizeNodeBatch
 
 function createNode(core, length, weight, oplog) {
   return {
@@ -784,4 +785,14 @@ function createNode(core, length, weight, oplog) {
   }
 }
 
+function finalizeNodeBatch(batch) {
+  if (batch.length === 0 || batch[0].version > LEGACY_OPLOG_VERSION) return batch
+
+  for (let i = 0; i < batch.length; i++) {
+    batch[i].batch.start = i
+  }
+
+  return batch
+}
+
 function noop() {}

package/package.json

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