hypercore 11.5.0 → 11.6.1

package/index.js

@@ -235,8 +235,8 @@ class Hypercore extends EventEmitter {
     return s
   }
 
-  setEncryptionKey (encryptionKey, opts) {
-    const encryption = this._getEncryptionProvider(encryptionKey, !!(opts && opts.block))
+  setEncryptionKey (key, opts) {
+    const encryption = this._getEncryptionProvider({ key, block: !!(opts && opts.block) })
     return this.setEncryption(encryption, opts)
   }
 
@@ -253,7 +253,6 @@ class Hypercore extends EventEmitter {
     }
 
     this.encryption = encryption
-    if (!this.core.encryption) this.core.encryption = this.encryption
   }
 
   setKeyPair (keyPair) {
@@ -329,19 +328,11 @@ class Hypercore extends EventEmitter {
 
     if (this.keyPair === null) this.keyPair = opts.keyPair || this.core.header.keyPair
 
-    const e = getEncryptionOption(opts)
-    if (!this.core.encryption && e) {
-      if (isEncryptionProvider(e)) {
-        this.core.encryption = e
-      } else {
-        this.core.encryption = this._getEncryptionProvider(e.key, e.block)
-      }
-    }
-
     const parent = opts.parent || null
+    if (parent && parent.encryption) this.encryption = parent.encryption
 
-    if (this.core.encryption) this.encryption = this.core.encryption
-    else if (parent && parent.encryption) this.encryption = this.core.encryption = parent.encryption
+    const e = getEncryptionOption(opts)
+    if (!this.encryption) this.encryption = this._getEncryptionProvider(e)
 
     this.writable = this._isWritable()
 
@@ -1064,9 +1055,10 @@ class Hypercore extends EventEmitter {
     return block
   }
 
-  _getEncryptionProvider (encryptionKey, block) {
-    if (!encryptionKey) return null
-    return new DefaultEncryption(encryptionKey, this.key, { block, compat: this.core.compat })
+  _getEncryptionProvider (e) {
+    if (isEncryptionProvider(e)) return e
+    if (!e || !e.key) return null
+    return new DefaultEncryption(e.key, this.key, { block: e.block, compat: this.core.compat })
   }
 }
 

package/lib/core.js

@@ -42,7 +42,6 @@ module.exports = class Core {
     this.skipBitfield = null
     this.globalCache = opts.globalCache || null
     this.autoClose = opts.autoClose !== false
-    this.encryption = null
     this.onidle = noop
 
     this.state = null

package/package.json

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