hypercore 10.27.1 → 10.28.1

package/index.js

@@ -56,7 +56,7 @@ module.exports = class Hypercore extends EventEmitter {
     this.replicator = null
     this.encryption = null
     this.extensions = new Map()
-    this.cache = opts.cache === true ? new Xache({ maxSize: 65536, maxAge: 0 }) : (opts.cache || null)
+    this.cache = createCache(opts.cache)
 
     this.valueEncoding = null
     this.encodeBatch = null
@@ -296,6 +296,7 @@ module.exports = class Hypercore extends EventEmitter {
 
     if (!isFirst) await opts._opening
     if (opts.preload) opts = { ...opts, ...(await this._retryPreload(opts.preload)) }
+    if (this.cache === null && opts.cache) this.cache = createCache(opts.cache)
 
     if (isFirst) {
       await this._openCapabilities(key, storage, opts)
@@ -356,7 +357,6 @@ module.exports = class Hypercore extends EventEmitter {
 
     this.core = await Core.open(this.storage, {
       compat: opts.compat,
-      encrypted: !!opts.encryptionKey || !!opts.encrypted,
       force: opts.force,
       createIfMissing: opts.createIfMissing,
       readonly: unlocked,
@@ -479,7 +479,7 @@ module.exports = class Hypercore extends EventEmitter {
       throw BAD_ARGUMENT('Cannot clone a fork')
     }
 
-    const manifest = opts.manifest || defaultSignerManifest(keyPair.publicKey, !!opts.encryptionKey)
+    const manifest = opts.manifest || defaultSignerManifest(keyPair.publicKey)
     const key = opts.key || (opts.compat !== false ? manifest.signer.publicKey : manifestHash(manifest))
 
     if (b4a.equals(key, this.key)) {
@@ -1117,3 +1117,7 @@ function ensureEncryption (core, opts) {
   if (core.encryption && b4a.equals(core.encryption.key, opts.encryptionKey)) return
   core.encryption = new BlockEncryption(opts.encryptionKey, core.key, { compat: core.core.compat, isBlockKey: opts.isBlockKey })
 }
+
+function createCache (cache) {
+  return cache === true ? new Xache({ maxSize: 65536, maxAge: 0 }) : (cache || null)
+}

package/lib/core.js

@@ -92,7 +92,7 @@ module.exports = class Core {
 
       const keyPair = opts.keyPair || (opts.key ? null : crypto.keyPair())
       const defaultManifest = !opts.manifest && (!!opts.compat || !opts.key || !!(keyPair && b4a.equals(opts.key, keyPair.publicKey)))
-      const manifest = defaultManifest ? defaultSignerManifest(opts.key || keyPair.publicKey, !!opts.encrypted) : createManifest(opts.manifest)
+      const manifest = defaultManifest ? defaultSignerManifest(opts.key || keyPair.publicKey) : createManifest(opts.manifest)
 
       header = {
         external: null,
@@ -188,7 +188,7 @@ module.exports = class Core {
   }
 
   setManifest (manifest, keyPair) {
-    if (!manifest && b4a.equals(keyPair.publicKey, this.header.key)) manifest = defaultSignerManifest(this.header.key, false)
+    if (!manifest && b4a.equals(keyPair.publicKey, this.header.key)) manifest = defaultSignerManifest(this.header.key)
     if (!manifest) return
 
     const compat = isCompat(this.header.key, manifest)
@@ -558,7 +558,7 @@ module.exports = class Core {
 
   _verifyBatchUpgrade (batch, manifest) {
     if (!this.header.manifest) {
-      if (!manifest && this.compat) manifest = defaultSignerManifest(this.header.key, false)
+      if (!manifest && this.compat) manifest = defaultSignerManifest(this.header.key)
 
       if (!manifest || !(isValidManifest(this.header.key, manifest) || (this.compat && isCompat(this.header.key, manifest)))) {
         throw INVALID_SIGNATURE('Proof contains an invalid manifest') // TODO: proper error type

package/lib/manifest.js

@@ -144,7 +144,6 @@ function createManifest (inp) {
   if (!inp) return null
 
   const manifest = {
-    encrypted: !!inp.encrypted,
     hash: 'blake2b',
     static: null,
     signer: null,
@@ -196,9 +195,8 @@ function validateSigner (signer) {
   if (signer.signature && signer.signature !== 'ed25519') throw BAD_ARGUMENT('Only Ed25519 signatures are supported')
 }
 
-function defaultSignerManifest (publicKey, encrypted) {
+function defaultSignerManifest (publicKey) {
   return {
-    encrypted,
     hash: 'blake2b',
     static: null,
     signer: {

package/lib/messages.js

@@ -89,7 +89,6 @@ const multipleSigners = {
 const manifest = exports.manifest = {
   preencode (state, m) {
     c.uint.preencode(state, 0) // version
-    c.uint.preencode(state, 0) // flags
     hashes.preencode(state, m.hash)
     c.uint.preencode(state, 2) // type
 
@@ -107,7 +106,6 @@ const manifest = exports.manifest = {
   },
   encode (state, m) {
     c.uint.encode(state, 0) // version
-    c.uint.encode(state, m.encrypted ? 1 : 0)
     hashes.encode(state, m.hash)
     c.uint.encode(state, m.signer ? 1 : m.multipleSigners ? 2 : 0)
 
@@ -127,14 +125,12 @@ const manifest = exports.manifest = {
     const version = c.uint.decode(state)
     if (version !== 0) throw new Error('Invalid version: ' + version)
 
-    const flags = c.uint.decode(state)
     const hash = hashes.decode(state)
     const type = c.uint.decode(state)
 
     if (type > 2) throw new Error('Unknown type: ' + type)
 
     return {
-      encrypted: (flags & 1) !== 0,
       hash,
       static: type === 0 ? c.fixed32.decode(state) : null,
       signer: type === 1 ? signer.decode(state) : null,

package/package.json

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