hypercore 10.23.0 → 10.24.1

package/index.js

@@ -8,6 +8,7 @@ const Xache = require('xache')
 const NoiseSecretStream = require('@hyperswarm/secret-stream')
 const Protomux = require('protomux')
 const z32 = require('z32')
+const id = require('hypercore-id-encoding')
 
 const Replicator = require('./lib/replicator')
 const Core = require('./lib/core')
@@ -42,16 +43,9 @@ module.exports = class Hypercore extends EventEmitter {
       key = opts.key || null
     }
 
-    if (key && typeof key === 'string') {
-      key = b4a.from(key, 'hex')
-    }
-
+    if (key && typeof key === 'string') key = id.decode(key)
     if (!opts) opts = {}
 
-    if (!opts.crypto && key && key.byteLength !== 32) {
-      throw BAD_ARGUMENT('Hypercore key should be 32 bytes')
-    }
-
     if (!storage) storage = opts.storage
 
     this[promises] = true
@@ -85,7 +79,6 @@ module.exports = class Hypercore extends EventEmitter {
     this.closing = null
     this.opening = null
 
-    this._manifest = opts.manifest || null
     this._clone = opts.clone || null
     this._readonly = opts.writable === false
     this._preappend = preappend.bind(this)
@@ -546,7 +539,7 @@ module.exports = class Hypercore extends EventEmitter {
   }
 
   get manifest () {
-    return this._manifest || (this.core === null ? null : this.core.header.manifest)
+    return this.core === null ? null : this.core.header.manifest
   }
 
   get length () {
@@ -642,8 +635,7 @@ module.exports = class Hypercore extends EventEmitter {
 
       if (status & 0b10000) {
         for (let i = 0; i < this.sessions.length; i++) {
-          const s = this.sessions[i]
-          if (!s._manifest) s.emit('manifest')
+          this.sessions[i].emit('manifest')
         }
       }
 

package/lib/core.js

@@ -494,7 +494,7 @@ module.exports = class Core {
 
     const verifier = this.verifier || createVerifier(manifest, { compat: isCompat(this.header.key, manifest), crypto: this.crypto, legacy: this._legacy })
 
-    if (!batch.signature || !verifier.verify(batch, batch.signature)) {
+    if (!verifier.verify(batch, batch.signature)) {
       throw INVALID_SIGNATURE('Proof contains an invalid signature')
     }
 

package/lib/manifest.js

@@ -44,6 +44,7 @@ class CompatVerifier {
   }
 
   verify (batch, signature) {
+    if (!signature) return false
     return this.crypto.verify(batch.signableCompat(this.legacy), signature, this.publicKey)
   }
 }
@@ -63,6 +64,7 @@ class SingleVerifier {
   }
 
   verify (batch, signature) {
+    if (!signature) return false
     return this.crypto.verify(batch.signable(this.namespace), signature, this.publicKey)
   }
 }
@@ -82,6 +84,8 @@ class MultiVerifier {
   }
 
   verify (batch, signature) {
+    if (!signature) return false
+
     const inputs = multisig.inflate(signature)
 
     if (inputs.length < this.quorum) return false
@@ -188,7 +192,7 @@ function parseSigner (signer) {
 
 function validateSigner (signer) {
   if (!signer || !signer.publicKey) throw BAD_ARGUMENT('Signer missing public key')
-  if (signer.signature !== 'ed25519') throw BAD_ARGUMENT('Only Ed25519 signatures are supported')
+  if (signer.signature && signer.signature !== 'ed25519') throw BAD_ARGUMENT('Only Ed25519 signatures are supported')
 }
 
 function defaultSignerManifest (publicKey) {

package/lib/multisig.js

@@ -24,9 +24,9 @@ function inflate (data) {
   return inputs
 }
 
-async function partialSignature (core, signer, from, to = core.core.tree.length, signature = core.core.tree.signature) {
-  if (from > core.core.tree.length) return null
-  const patch = to <= from ? null : await upgrade(core, from, to)
+async function partialSignature (tree, signer, from, to = tree.length, signature = tree.signature) {
+  if (from > tree.length) return null
+  const patch = to <= from ? null : await upgrade(tree, from, to)
 
   return {
     signer,
@@ -35,8 +35,8 @@ async function partialSignature (core, signer, from, to = core.core.tree.length,
   }
 }
 
-async function upgrade (core, from, to) {
-  const p = await core.core.tree.proof({ upgrade: { start: from, length: to - from } })
+async function upgrade (tree, from, to) {
+  const p = await tree.proof({ upgrade: { start: from, length: to - from } })
   p.upgrade.additionalNodes = []
   p.upgrade.signature = null
   return p.upgrade

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hypercore",
-  "version": "10.23.0",
+  "version": "10.24.1",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -45,6 +45,7 @@
     "flat-tree": "^1.9.0",
     "hypercore-crypto": "^3.2.1",
     "hypercore-errors": "^1.1.0",
+    "hypercore-id-encoding": "^1.2.0",
     "is-options": "^1.0.1",
     "protomux": "^3.5.0",
     "quickbit-universal": "^2.1.1",