hypercore-storage 1.0.6 → 1.0.8

package/index.js

@@ -91,8 +91,18 @@ class HypercoreStorage {
 
     for (let i = deps.length - 1; i >= 0; i--) {
       if (deps[i].length >= length) continue
-      deps[i].length = length
-      this.core.dependencies = deps.slice(0, i + 1)
+
+      this.core = {
+        corePointer: this.core.corePointer,
+        dataPointer: this.core.dataPointer,
+        dependencies: deps.slice(0, i + 1)
+      }
+
+      this.core.dependencies[i] = {
+        dataPointer: deps[i].dataPointer,
+        length
+      }
+
       return
     }
 
@@ -145,7 +155,6 @@ class HypercoreStorage {
     if (session === null) return null
 
     const core = {
-      version: this.core.version,
       corePointer: this.core.corePointer,
       dataPointer: session.dataPointer,
       dependencies: []
@@ -190,7 +199,6 @@ class HypercoreStorage {
 
     const length = head === null ? 0 : head.length
     const core = {
-      version: this.core.version,
       corePointer: this.core.corePointer,
       dataPointer: session.dataPointer,
       dependencies: this._addDependency({ dataPointer: this.core.dataPointer, length })
@@ -209,16 +217,14 @@ class HypercoreStorage {
   async createAtomicSession (atom, head) {
     const length = head === null ? 0 : head.length
     const core = {
-      version: this.core.version,
       corePointer: this.core.corePointer,
       dataPointer: this.core.dataPointer,
-      dependencies: this._addDependency({ dataPointer: this.core.dataPointer, length })
+      dependencies: this._addDependency(null)
     }
 
     const coreTx = new CoreTX(core, this.db, atom.view, [])
 
     if (length > 0) coreTx.setHead(head)
-    coreTx.setDependency(core.dependencies[core.dependencies.length - 1])
 
     await coreTx.flush()
 
@@ -231,7 +237,7 @@ class HypercoreStorage {
     for (let i = 0; i < this.core.dependencies.length; i++) {
       const d = this.core.dependencies[i]
 
-      if (d.length > dep.length) {
+      if (dep !== null && d.length > dep.length) {
         deps.push({ dataPointer: d.dataPointer, length: dep.length })
         return deps
       }
@@ -239,7 +245,7 @@ class HypercoreStorage {
       deps.push(d)
     }
 
-    deps.push(dep)
+    if (dep !== null) deps.push(dep)
     return deps
   }
 
@@ -583,10 +589,10 @@ class CorestoreStorage {
   }
 
   async _resumeFromPointers (view, discoveryKey, create, { version, corePointer, dataPointer }) {
-    const core = { version, corePointer, dataPointer, dependencies: [] }
+    const core = { corePointer, dataPointer, dependencies: [] }
 
     while (true) {
-      const rx = new CoreRX({ version, dataPointer, corePointer: 0, dependencies: [] }, this.db, view)
+      const rx = new CoreRX({ dataPointer, corePointer: 0, dependencies: [] }, this.db, view)
       const dependencyPromise = rx.getDependency()
       rx.tryFlush()
       const dependency = await dependencyPromise
@@ -597,7 +603,7 @@ class CorestoreStorage {
 
     const result = new HypercoreStorage(this, this.db.session(), core, EMPTY, null)
 
-    if (result.core.version === 0) await this._migrateCore(result, discoveryKey, create)
+    if (version < VERSION) await this._migrateCore(result, discoveryKey, create)
     return result
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore-storage",
-  "version": "1.0.6",
+  "version": "1.0.8",
   "main": "index.js",
   "files": [
     "index.js",