hypercore 10.25.4 → 10.26.1

package/index.js

@@ -167,15 +167,16 @@ module.exports = class Hypercore extends EventEmitter {
     if (!noiseStream.userData) {
       const protocol = Protomux.from(noiseStream)
 
-      if (opts.ondiscoverykey) {
-        protocol.pair({ protocol: 'hypercore/alpha' }, opts.ondiscoverykey)
-      }
       if (opts.keepAlive !== false) {
         noiseStream.setKeepAlive(5000)
       }
       noiseStream.userData = protocol
     }
 
+    if (opts.ondiscoverykey) {
+      noiseStream.userData.pair({ protocol: 'hypercore/alpha' }, opts.ondiscoverykey)
+    }
+
     return outerStream
   }
 
@@ -248,9 +249,9 @@ module.exports = class Hypercore extends EventEmitter {
     return s
   }
 
-  async setEncryptionKey (key) {
+  async setEncryptionKey (encryptionKey, opts) {
     if (!this.opened) await this.opening
-    this.encryption = key ? new BlockEncryption(key, this.key) : null
+    this.encryption = encryptionKey ? new BlockEncryption(encryptionKey, this.key, { compat: this.core.compat, ...opts }) : null
   }
 
   setKeyPair (keyPair) {
@@ -388,7 +389,7 @@ module.exports = class Hypercore extends EventEmitter {
     this.replicator.findingPeers += this._findingPeers
 
     if (!this.encryption && opts.encryptionKey) {
-      this.encryption = new BlockEncryption(opts.encryptionKey, this.key)
+      this.encryption = new BlockEncryption(opts.encryptionKey, this.key, { compat: this.core.compat, isBlockKey: opts.isBlockKey })
     }
   }
 
@@ -651,7 +652,12 @@ module.exports = class Hypercore extends EventEmitter {
 
       if (status & 0b10000) {
         for (let i = 0; i < this.sessions.length; i++) {
-          this.sessions[i].emit('manifest')
+          const s = this.sessions[i]
+
+          s.emit('manifest')
+          if (s.encryption && s.encryption.compat !== this.core.compat) {
+            s.encryption = new BlockEncryption(s.encryptionKey, this.key, { compat: this.core.compat, isBlockKey: s.isBlockKey })
+          }
         }
       }
 
@@ -1108,5 +1114,5 @@ function ensureEncryption (core, opts) {
   // Only override the block encryption if it's either not already set or if
   // the caller provided a different key.
   if (core.encryption && b4a.equals(core.encryption.key, opts.encryptionKey)) return
-  core.encryption = new BlockEncryption(opts.encryptionKey, core.key)
+  core.encryption = new BlockEncryption(opts.encryptionKey, core.key, { compat: core.core.compat, isBlockKey: opts.isBlockKey })
 }

package/lib/block-encryption.js

@@ -1,19 +1,22 @@
 const sodium = require('sodium-universal')
 const c = require('compact-encoding')
 const b4a = require('b4a')
+const { BLOCK_ENCRYPTION } = require('./caps')
 
 const nonce = b4a.alloc(sodium.crypto_stream_NONCEBYTES)
 
 module.exports = class BlockEncryption {
-  constructor (encryptionKey, hypercoreKey) {
+  constructor (encryptionKey, hypercoreKey, { isBlockKey = false, compat = false } = {}) {
     const subKeys = b4a.alloc(2 * sodium.crypto_stream_KEYBYTES)
 
     this.key = encryptionKey
-    this.blockKey = subKeys.subarray(0, sodium.crypto_stream_KEYBYTES)
+    this.blockKey = isBlockKey ? encryptionKey : subKeys.subarray(0, sodium.crypto_stream_KEYBYTES)
     this.blindingKey = subKeys.subarray(sodium.crypto_stream_KEYBYTES)
     this.padding = 8
+    this.compat = compat
+    this.isBlockKey = isBlockKey
 
-    sodium.crypto_generichash(this.blockKey, encryptionKey, hypercoreKey)
+    if (!isBlockKey) sodium.crypto_generichash_batch(this.blockKey, compat ? [encryptionKey] : [BLOCK_ENCRYPTION, encryptionKey], hypercoreKey)
     sodium.crypto_generichash(this.blindingKey, this.blockKey)
   }
 

package/lib/caps.js

@@ -6,10 +6,18 @@ const c = require('compact-encoding')
 // TODO: rename this to "crypto" and move everything hashing related etc in here
 // Also lets move the tree stuff from hypercore-crypto here
 
-const [TREE, REPLICATE_INITIATOR, REPLICATE_RESPONDER, MANIFEST, DEFAULT_NAMESPACE] = crypto.namespace('hypercore', 5)
+const [
+  TREE,
+  REPLICATE_INITIATOR,
+  REPLICATE_RESPONDER,
+  MANIFEST,
+  DEFAULT_NAMESPACE,
+  BLOCK_ENCRYPTION
+] = crypto.namespace('hypercore', 6)
 
 exports.MANIFEST = MANIFEST
 exports.DEFAULT_NAMESPACE = DEFAULT_NAMESPACE
+exports.BLOCK_ENCRYPTION = BLOCK_ENCRYPTION
 
 exports.replicate = function (isInitiator, key, handshakeHash) {
   const out = b4a.allocUnsafe(32)

package/package.json

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