hypercore 10.37.11 → 10.37.13

package/index.js

@@ -11,6 +11,7 @@ const z32 = require('z32')
 const id = require('hypercore-id-encoding')
 const safetyCatch = require('safety-catch')
 const { createTracer } = require('hypertrace')
+const unslab = require('unslab')
 
 const Replicator = require('./lib/replicator')
 const Core = require('./lib/core')
@@ -911,7 +912,12 @@ module.exports = class Hypercore extends EventEmitter {
   }
 
   async _cacheOnResolve (index, req, fork) {
-    const block = await req
+    const resolved = await req
+
+    // Unslab only when it takes up less then half the slab
+    const block = resolved !== null && 2 * resolved.byteLength < resolved.buffer.byteLength
+      ? unslab(resolved)
+      : resolved
 
     if (this.cache && fork === this.core.tree.fork) {
       this.cache.set(index, Promise.resolve(block))

package/lib/merkle-tree.js

@@ -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()
@@ -259,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
+    this.tree.signature = this.signature !== null ? unslab(this.signature) : null
   }
 
   seek (bytes, padding) {
@@ -429,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
+    this.signature = signature !== null ? unslab(signature) : null
     this.prologue = prologue
 
     this.storage = storage
@@ -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
@@ -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)
@@ -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/messages.js

@@ -2,6 +2,7 @@ const c = require('compact-encoding')
 const b4a = require('b4a')
 const { DEFAULT_NAMESPACE } = require('./caps')
 const { INVALID_OPLOG_VERSION } = require('hypercore-errors')
+const unslab = require('unslab')
 
 const EMPTY = b4a.alloc(0)
 
@@ -244,7 +245,7 @@ wire.handshake = {
     const flags = c.uint.decode(state)
     return {
       seeks: (flags & 1) !== 0,
-      capability: c.fixed32.decode(state)
+      capability: unslab(c.fixed32.decode(state))
     }
   }
 }

package/package.json

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