hypercore 11.0.10 → 11.0.12

package/index.js

@@ -146,6 +146,10 @@ class Hypercore extends EventEmitter {
     return crypto.discoveryKey(key)
   }
 
+  static blockEncryptionKey (key, encryptionKey) {
+    return BlockEncryption.blockEncryptionKey(key, encryptionKey)
+  }
+
   static getProtocolMuxer (stream) {
     return stream.noiseStream.userData
   }
@@ -318,7 +322,10 @@ class Hypercore extends EventEmitter {
       if (e) this.core.encryption = new BlockEncryption(e.key, this.key, { compat: this.core.compat, ...e })
     }
 
+    const parent = opts.parent || null
+
     if (this.core.encryption) this.encryption = this.core.encryption
+    else if (parent && parent.encryption) this.encryption = this.core.encryption = parent.encryption
 
     this.writable = this._isWritable()
 
@@ -329,9 +336,9 @@ class Hypercore extends EventEmitter {
       this.encodeBatch = opts.encodeBatch
     }
 
-    if (opts.parent) {
-      if (opts.parent._stateIndex === -1) await opts.parent.ready()
-      this._setupSession(opts.parent)
+    if (parent) {
+      if (parent._stateIndex === -1) await parent.ready()
+      this._setupSession(parent)
     }
 
     if (opts.exclusive) {
@@ -339,17 +346,17 @@ class Hypercore extends EventEmitter {
       await this.core.lockExclusive()
     }
 
-    const parent = opts.parent || this.core
+    const parentState = parent ? parent.state : this.core.state
     const checkout = opts.checkout === undefined ? -1 : opts.checkout
     const state = this.state
 
     if (opts.atom) {
-      this.state = await parent.state.createSession(null, false, opts.atom)
+      this.state = await parentState.createSession(null, false, opts.atom)
       if (state) state.unref()
     } else if (opts.name) {
       // todo: need to make named sessions safe before ready
       // atm we always copy the state in passCapabilities
-      this.state = await parent.state.createSession(opts.name, !!opts.overwrite, null)
+      this.state = await parentState.createSession(opts.name, !!opts.overwrite, null)
       if (state) state.unref() // ref'ed above in setup session
     }
 

package/lib/block-encryption.js

@@ -23,6 +23,12 @@ module.exports = class BlockEncryption {
     sodium.crypto_generichash(this.blindingKey, this.blockKey)
   }
 
+  static blockEncryptionKey (hypercoreKey, encryptionKey) {
+    const blockKey = b4a.alloc(sodium.crypto_stream_KEYBYTES)
+    sodium.crypto_generichash_batch(blockKey, [BLOCK_ENCRYPTION, hypercoreKey, encryptionKey])
+    return blockKey
+  }
+
   encrypt (index, block, fork) {
     const padding = block.subarray(0, this.padding)
     block = block.subarray(this.padding)

package/lib/core.js

@@ -258,10 +258,13 @@ module.exports = class Core {
       header.userData.push({ key, value: unslab(value) })
     }
 
-    // compat from earlier version that do not store contig length
-    // if (header.hints.contiguousLength === 0) {
-    //   while (bitfield.get(header.hints.contiguousLength)) header.hints.contiguousLength++
-    // }
+    const len = bitfield.findFirst(false, header.hints.contiguousLength)
+    if (header.hints.contiguousLength !== len) {
+      header.hints.contiguousLength = len
+      const tx = storage.write()
+      tx.setHints({ contiguousLength: len })
+      await tx.flush()
+    }
 
     // to unslab
     if (header.manifest) header.manifest = Verifier.createManifest(header.manifest)
@@ -757,7 +760,7 @@ function parseHeader (info) {
     tree: info.head || getDefaultTree(),
     hints: {
       reorgs: [],
-      contiguousLength: 0
+      contiguousLength: info.hints ? info.hints.contiguousLength : 0
     }
   }
 }
@@ -769,11 +772,13 @@ async function getCoreInfo (storage) {
 
   const auth = r.getAuth()
   const head = r.getHead()
+  const hints = r.getHints()
 
   r.tryFlush()
 
   return {
     ...await auth,
-    head: await head
+    head: await head,
+    hints: await hints
   }
 }

package/lib/session-state.js

@@ -537,7 +537,7 @@ module.exports = class SessionState {
         return
       }
 
-      if (p.drop) {
+      if (p.drop || p.truncated !== -1) {
         if (p.truncated !== b.start + b.length) throw INVALID_OPERATION('Atomic truncations must be contiguous')
         p.truncated = b.start
         return

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "11.0.10",
+  "version": "11.0.12",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {