hypercore 10.21.4 → 10.21.5

package/lib/caps.js

@@ -2,7 +2,6 @@ const crypto = require('hypercore-crypto')
 const sodium = require('sodium-universal')
 const b4a = require('b4a')
 const c = require('compact-encoding')
-const m = require('./messages')
 
 // TODO: rename this to "crypto" and move everything hashing related etc in here
 // Also lets move the tree stuff from hypercore-crypto here
@@ -18,11 +17,10 @@ exports.replicate = function (isInitiator, key, handshakeHash) {
 }
 
 exports.manifestHash = function (manifest) {
-  const state = { start: 0, end: 32, buffer: null }
-  m.manifest.preencode(state, manifest)
+  const state = { start: 0, end: 32 + manifest.byteLength, buffer: null }
   state.buffer = b4a.allocUnsafe(state.end)
   c.raw.encode(state, MANIFEST)
-  m.manifest.encode(state, manifest)
+  c.raw.encode(state, manifest)
   const out = b4a.allocUnsafe(32)
   sodium.crypto_generichash(out, state.buffer)
   return out

package/lib/core.js

@@ -8,6 +8,7 @@ const BlockStore = require('./block-store')
 const Bitfield = require('./bitfield')
 const Info = require('./info')
 const { BAD_ARGUMENT, STORAGE_EMPTY, STORAGE_CONFLICT, INVALID_SIGNATURE } = require('hypercore-errors')
+const c = require('compact-encoding')
 const m = require('./messages')
 const caps = require('./caps')
 
@@ -104,7 +105,7 @@ module.exports = class Core {
 
       header = {
         external: null,
-        key: opts.key || (opts.compat ? manifest.signer.publicKey : caps.manifestHash(manifest)),
+        key: opts.key || (opts.compat ? manifest.signer.publicKey : hashManifest(manifest)),
         manifest,
         keyPair,
         userData: [],
@@ -453,7 +454,7 @@ module.exports = class Core {
     if (!this.header.manifest) {
       if (!manifest) { // compat mode, remove in future version
         manifest = defaultSignerManifest(this.header.key)
-      } else if (!manifest || !b4a.equals(this.header.key, caps.manifestHash(manifest))) {
+      } else if (!manifest || !b4a.equals(this.header.key, hashManifest(manifest))) {
         throw INVALID_SIGNATURE('Proof contains an invalid manifest') // TODO: proper error type
       }
     }
@@ -800,4 +801,8 @@ function defaultSignerManifest (publicKey) {
   }
 }
 
+function hashManifest (manifest) {
+  return caps.manifestHash(c.encode(m.manifest, manifest))
+}
+
 function noop () {}

package/lib/messages.js

@@ -824,6 +824,7 @@ oplog.header = {
       }
 
       return {
+        external: null,
         key: old.signer.publicKey,
         manifest: {
           hash: old.types.tree,

package/package.json

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