hypercore 10.37.13 → 10.37.15

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
+    header.key = unslab(header.key)
+    header.tree.rootHash = unslab(header.tree.rootHash)
+    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 = 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
   }
 
@@ -260,7 +260,7 @@ class MerkleTreeBatch {
     this.tree.length = this.length
     this.tree.byteLength = this.byteLength
     this.tree.fork = this.fork
-    this.tree.signature = this.signature !== null ? unslab(this.signature) : null
+    this.tree.signature = this.signature
   }
 
   seek (bytes, padding) {
@@ -430,7 +430,7 @@ module.exports = class MerkleTree {
     this.roots = roots
     this.length = roots.length ? totalSpan(roots) / 2 : 0
     this.byteLength = totalSize(roots)
-    this.signature = signature !== null ? unslab(signature) : null
+    this.signature = signature
     this.prologue = prologue
 
     this.storage = storage
@@ -471,7 +471,7 @@ module.exports = class MerkleTree {
   }
 
   hash () {
-    return this.crypto.tree(this.roots)
+    return unslab(this.crypto.tree(this.roots))
   }
 
   signable (namespace) {
@@ -982,7 +982,7 @@ function verifyUpgrade ({ fork, upgrade }, blockRoot, batch) {
     ite.sibling()
   }
 
-  batch.signature = upgrade.signature
+  batch.signature = unslab(upgrade.signature)
   batch.fork = fork
 
   return q.extra === null

package/lib/replicator.js

@@ -1108,6 +1108,8 @@ class Peer {
       if (h.inflight.length > 0) continue
 
       const req = this._makeRequest(false, h.priority, index + 1)
+      if (req === null) continue
+
       const nodes = flatTree.depth(s.seeker.start + s.seeker.end - 1)
 
       req.hash = { index: 2 * index, nodes }
@@ -1299,6 +1301,7 @@ class Peer {
       if (this._remoteHasBlock(index) === false) continue
 
       const req = this._makeRequest(false, 0, 0)
+      if (req === null) continue
 
       req.hash = { index: 2 * index, nodes: f.batch.want.nodes }
 

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.13",
+  "version": "10.37.15",
   "description": "Hypercore is a secure, distributed append-only log",
   "main": "index.js",
   "scripts": {
@@ -61,7 +61,7 @@
     "safety-catch": "^1.0.1",
     "sodium-universal": "^4.0.0",
     "streamx": "^2.12.4",
-    "unslab": "^1.0.0",
+    "unslab": "^1.3.0",
     "xache": "^1.1.0",
     "z32": "^1.0.0"
   },