hypercore 11.4.2 → 11.6.0

package/index.js

@@ -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,10 @@ 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
+    if (!this.encryption) this.encryption = this._getEncryptionProvider(opts)
 
     this.writable = this._isWritable()
 
@@ -1064,9 +1054,11 @@ 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 (opts) {
+    const e = getEncryptionOption(opts)
+    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.4.2",
+  "version": "11.6.0",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -54,11 +54,12 @@
     "hypercore-id-encoding": "^1.2.0",
     "hypercore-storage": "^1.0.0",
     "is-options": "^1.0.1",
+    "nanoassert": "^2.0.0",
     "protomux": "^3.5.0",
     "quickbit-universal": "^2.2.0",
     "random-array-iterator": "^1.0.0",
     "safety-catch": "^1.0.1",
-    "sodium-universal": "^4.0.0",
+    "sodium-universal": "^5.0.1",
     "streamx": "^2.12.4",
     "unslab": "^1.3.0",
     "z32": "^1.0.0"