hypercore 10.37.12 → 10.37.14

package/lib/core.js

@@ -1,5 +1,6 @@
 const hypercoreCrypto = require('hypercore-crypto')
 const b4a = require('b4a')
+const unslab = require('unslab')
 const Oplog = require('./oplog')
 const BigHeader = require('./big-header')
 const Mutex = require('./mutex')
@@ -125,6 +126,11 @@ module.exports = class Core {
       header = await bigHeader.load(header.external)
     }
 
+    // unslab the long lived buffers to avoid keeping the slab alive
+    if (header.key !== null) header.key = unslab(header.key)
+    if (header.tree.rootHash !== null) header.tree.rootHash = unslab(header.tree.rootHash)
+    if (header.tree.signature !== null) header.tree.signature = unslab(header.tree.signature)
+
     if (opts.manifest) {
       // if we provide a manifest and no key, verify that the stored key is the same
       if (!opts.key && !Verifier.isValidManifest(header.key, Verifier.createManifest(opts.manifest))) {
@@ -163,6 +169,9 @@ module.exports = class Core {
       while (bitfield.get(header.hints.contiguousLength)) header.hints.contiguousLength++
     }
 
+    // to unslab
+    if (header.manifest) header.manifest = Verifier.createManifest(header.manifest)
+
     const verifier = header.manifest ? new Verifier(header.key, header.manifest, { crypto, legacy }) : null
 
     for (const e of entries) {
@@ -184,7 +193,7 @@ module.exports = class Core {
       if (e.treeUpgrade) {
         const batch = await tree.truncate(e.treeUpgrade.length, e.treeUpgrade.fork)
         batch.ancestors = e.treeUpgrade.ancestors
-        batch.signature = e.treeUpgrade.signature
+        batch.signature = e.treeUpgrade.signature === null ? null : unslab(e.treeUpgrade.signature)
         addReorgHint(header.hints.reorgs, tree, batch)
         batch.commit()
 
@@ -697,6 +706,8 @@ module.exports = class Core {
       }
     }
 
+    manifest = Verifier.createManifest(manifest) // To unslab
+
     const verifier = this.verifier || new Verifier(this.header.key, manifest, { crypto: this.crypto, legacy: this._legacy })
 
     if (!verifier.verify(batch, batch.signature)) {

package/lib/merkle-tree.js

@@ -138,7 +138,7 @@ class MerkleTreeBatch {
   }
 
   hash () {
-    if (this.hashCached === null) this.hashCached = this.tree.crypto.tree(this.roots)
+    if (this.hashCached === null) this.hashCached = unslab(this.tree.crypto.tree(this.roots))
     return this.hashCached
   }
 
@@ -183,6 +183,7 @@ class MerkleTreeBatch {
   }
 
   appendRoot (node, ite) {
+    node = unslabNode(node)
     this.hashCached = null
     this.upgraded = true
     this.length += ite.factor / 2
@@ -200,7 +201,7 @@ class MerkleTreeBatch {
         break
       }
 
-      const node = parentNode(this.tree.crypto, ite.parent(), a, b)
+      const node = unslabNode(parentNode(this.tree.crypto, ite.parent(), a, b))
       this.nodes.push(node)
       this.roots.pop()
       this.roots.pop()
@@ -453,7 +454,7 @@ module.exports = class MerkleTree {
     const batch = new MerkleTreeBatch(this)
     if (length === this.length) return batch
 
-    const roots = await this.getRoots(length)
+    const roots = unslabNodes(await this.getRoots(length))
 
     batch.roots = roots
     batch.length = length
@@ -470,7 +471,7 @@ module.exports = class MerkleTree {
   }
 
   hash () {
-    return this.crypto.tree(this.roots)
+    return unslab(this.crypto.tree(this.roots))
   }
 
   signable (namespace) {
@@ -670,7 +671,7 @@ module.exports = class MerkleTree {
       if (i < batch.roots.length && batch.roots[i].index === root) continue
 
       while (batch.roots.length > i) batch.roots.pop()
-      batch.roots.push(await this.get(root))
+      batch.roots.push(unslabNode(await this.get(root)))
     }
 
     while (batch.roots.length > fullRoots.length) {
@@ -818,7 +819,7 @@ module.exports = class MerkleTree {
 
     const roots = []
     for (const index of flat.fullRoots(2 * length)) {
-      roots.push(await getStoredNode(storage, index, null, true))
+      roots.push(unslabNode(await getStoredNode(storage, index, null, true)))
     }
 
     return new MerkleTree(storage, roots, opts.fork || 0, opts.signature || null, opts.prologue || null)
@@ -981,7 +982,7 @@ function verifyUpgrade ({ fork, upgrade }, blockRoot, batch) {
     ite.sibling()
   }
 
-  batch.signature = upgrade.signature
+  batch.signature = upgrade.signature !== null ? unslab(upgrade.signature) : null
   batch.fork = fork
 
   return q.extra === null
@@ -1388,3 +1389,14 @@ async function generateProof (tree, block, hash, seek, upgrade) {
 function getUnpaddedSize (node, padding, ite) {
   return padding === 0 ? node.size : node.size - padding * (ite ? ite.countLeaves() : flat.countLeaves(node.index))
 }
+
+function unslabNodes (nodes) {
+  for (const node of nodes) unslabNode(node)
+  return nodes
+}
+
+function unslabNode (node) {
+  if (node === null) return node
+  node.hash = unslab(node.hash)
+  return node
+}

package/lib/verifier.js

@@ -3,6 +3,7 @@ const b4a = require('b4a')
 const c = require('compact-encoding')
 const flat = require('flat-tree')
 const { BAD_ARGUMENT } = require('hypercore-errors')
+const unslab = require('unslab')
 
 const m = require('./messages')
 const multisig = require('./multisig')
@@ -201,7 +202,9 @@ module.exports = class Verifier {
       if (!(b4a.isBuffer(inp.prologue.hash) && inp.prologue.hash.byteLength === 32) || !(inp.prologue.length >= 0)) {
         throw BAD_ARGUMENT('Invalid prologue')
       }
+
       manifest.prologue = inp.prologue
+      manifest.prologue.hash = unslab(manifest.prologue.hash)
     }
 
     return manifest
@@ -237,7 +240,7 @@ function defaultQuorum (man) {
 }
 
 function generateUpgrade (patch, start, length) {
-  const upgrade = { start, length, nodes: null, additionalNodes: [] }
+  const upgrade = { start, length, nodes: null, additionalNodes: [], signature: null }
 
   const from = start * 2
   const to = from + length * 2
@@ -274,8 +277,8 @@ function parseSigner (signer) {
   validateSigner(signer)
   return {
     signature: 'ed25519',
-    namespace: signer.namespace || caps.DEFAULT_NAMESPACE,
-    publicKey: signer.publicKey
+    namespace: unslab(signer.namespace || caps.DEFAULT_NAMESPACE),
+    publicKey: unslab(signer.publicKey)
   }
 }
 

package/package.json

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