hypercore 11.13.0 → 11.13.2

package/lib/merkle-tree.js

@@ -679,6 +679,7 @@ class MerkleTree {
     // TODO: we could prop use a read batch here and do this in blocks of X for perf
     while (!ite.contains(head) && !(await hasTreeNode(session.storage, ite.index))) {
       cnt++
+      if (cnt >= 1024) throw ASSERTION('Bad arguments to missingNodes index=' + index + ' at length=' + length)
       ite.parent()
     }
 
@@ -742,6 +743,7 @@ function getByteOffsetBatch (roots, index, rx) {
   if ((index & 1) === 1) index = flat.leftSpan(index)
 
   let head = 0
+  let cnt = 0
 
   const promises = []
 
@@ -756,6 +758,8 @@ function getByteOffsetBatch (roots, index, rx) {
     const ite = flat.iterator(node.index)
 
     while (ite.index !== index) {
+      if (++cnt >= 1024) throw ASSERTION('Bad getByteOffsetSession index=' + index)
+
       if (index < ite.index) {
         ite.leftChild()
       } else {
@@ -930,8 +934,10 @@ async function seekTrustedTree (session, root, bytes, padding) {
   if (!bytes) return root
 
   const ite = flat.iterator(root)
+  let cnt = 0
 
   while ((ite.index & 1) !== 0) {
+    if (++cnt >= 1024) throw ASSERTION('Bad seekTrusted bytes=' + bytes + ', paddding=' + padding)
     const l = await getTreeNodeFromStorage(session.storage, ite.leftChild())
 
     if (l) {
@@ -972,11 +978,13 @@ async function seekUntrustedTree (session, root, bytes, padding) {
 
 function seekProof (session, rx, seekRoot, root, p) {
   const ite = flat.iterator(seekRoot)
+  let cnt = 0
 
   p.seek = []
   p.seek.push(getTreeNodeOrError(rx, ite.index))
 
   while (ite.index !== root) {
+    if (++cnt >= 1024) throw ASSERTION('Bad seekProof seekRoot=' + seekRoot + ', root=' + root)
     ite.sibling()
     p.seek.push(getTreeNodeOrError(rx, ite.index))
     ite.parent()
@@ -987,11 +995,13 @@ function blockAndSeekProof (session, rx, node, seek, seekRoot, root, p) {
   if (!node) return seekProof(session, rx, seekRoot, root, p)
 
   const ite = flat.iterator(node.index)
+  let cnt = 0
 
   p.node = []
   if (!node.value) p.node.push(getTreeNodeOrError(rx, ite.index))
 
   while (ite.index !== root) {
+    if (++cnt >= 1024) throw ASSERTION('Bad blockAndSeekProof seekRoot=' + seekRoot + ', root=' + root)
     ite.sibling()
 
     if (seek && ite.contains(seekRoot) && ite.index !== seekRoot) {
@@ -1017,10 +1027,13 @@ function upgradeProof (session, rx, node, seek, from, to, subTree, p) {
 
       const root = ite.index
       const target = from - 2
+      let cnt = 0
 
       ite.seek(target)
 
       while (ite.index !== root) {
+        if (++cnt >= 1024) throw ASSERTION('Bad upgradeProof target=' + target + ', root=' + root)
+
         ite.sibling()
         if (ite.index > target) {
           if (p.node === null && p.seek === null && ite.contains(subTree)) {
@@ -1064,10 +1077,12 @@ function additionalUpgradeProof (session, rx, from, to, p) {
 
       const root = ite.index
       const target = from - 2
+      let cnt = 0
 
       ite.seek(target)
 
       while (ite.index !== root) {
+        if (++cnt >= 1024) throw ASSERTION('Bad arguments to additionalUpgradeProof root=' + root + ' target=' + target)
         ite.sibling()
         if (ite.index > target) {
           p.additionalUpgrade.push(getTreeNodeOrError(rx, ite.index))

package/lib/replicator.js

@@ -30,7 +30,7 @@ const ReceiverQueue = require('./receiver-queue')
 const HotswapQueue = require('./hotswap-queue')
 const RemoteBitfield = require('./remote-bitfield')
 const { MerkleTree } = require('./merkle-tree')
-const { REQUEST_CANCELLED, REQUEST_TIMEOUT, INVALID_CAPABILITY, SNAPSHOT_NOT_AVAILABLE } = require('hypercore-errors')
+const { REQUEST_CANCELLED, REQUEST_TIMEOUT, INVALID_CAPABILITY, SNAPSHOT_NOT_AVAILABLE, ASSERTION } = require('hypercore-errors')
 const m = require('./messages')
 const caps = require('./caps')
 
@@ -1235,13 +1235,20 @@ class Peer {
 
   _hasTreeParent (index) {
     if (this.remoteLength >= this.core.state.length) return true
+    if (!(index >= 0)) throw ASSERTION('bad index to _hasTreeParent: ' + index)
 
     const ite = flatTree.iterator(index * 2)
 
     let span = 2
     let length = 0
+    let cnt = 0
 
     while (true) {
+      if (++cnt >= 64) {
+        throw ASSERTION('_hasTreeParent is stuck, index=' + index + ', length=' + length +
+          ', span=' + span + ', remoteLength=' + this.remoteLength + ', length=' + this.core.state.length)
+      }
+
       ite.parent()
 
       const left = (ite.index - ite.factor / 2 + 1) / 2

package/package.json

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