autobee 2.0.0-rc.0 → 2.0.0-rc.2

package/index.js

@@ -1145,8 +1145,11 @@ module.exports = class Autobee extends ReadyResource {
     this.system.bee.move(head)
     await this.system.reset()
 
-    // todo: binary search to find shared common tree and pass as undo
-    this.system.shared = { flushes: -1, view: EMPTY_HEAD, system: EMPTY_HEAD }
+    this.system.shared = this.rebootTo.shared || {
+      flushes: -1,
+      view: EMPTY_HEAD,
+      system: EMPTY_HEAD
+    }
 
     // migrate is set when fast-forwarding from a legacy head
     if (migrate) {

package/lib/reboot.js

@@ -86,10 +86,23 @@ module.exports = class Reboot {
     await Promise.all(promises)
     if (this.destroyed) return null
 
+    const shared = await this._commonAncestor()
+    if (this.destroyed) return null
+
     return {
       head: this.head,
       tip: this.tip,
-      migrate: null
+      migrate: null,
+      shared
+    }
+  }
+
+  async _commonAncestor() {
+    try {
+      return await this.auto.system.commonAncestor(this.head)
+    } catch (err) {
+      safetyCatch(err)
+      return null
     }
   }
 

package/lib/system.js

@@ -123,11 +123,13 @@ module.exports = class Systembee {
       }
 
       if (l.flushes >= r.flushes) {
+        if (a.done) break
         a = await hist1.next()
         if (a.value) l = getInfo(a.value)
       }
 
       if (r.flushes >= l.flushes) {
+        if (b.done) break
         b = await hist2.next()
         if (b.value) r = getInfo(b.value)
       }

package/package.json

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