hypercore 10.38.2 → 11.0.0

package/lib/multisig.js

@@ -20,9 +20,9 @@ function inflate (data) {
   return c.decode(multiSignature, data)
 }
 
-async function partialSignature (tree, signer, from, to = tree.length, signature = tree.signature) {
-  if (from > tree.length) return null
-  const nodes = to <= from ? null : await upgradeNodes(tree, from, to)
+async function partialSignature (core, signer, from, to = core.state.length, signature = core.state.signature) {
+  if (from > core.tree.length) return null
+  const nodes = to <= from ? null : await upgradeNodes(core, from, to)
 
   if (signature.byteLength !== 64) signature = c.decode(multiSignature, signature).proofs[0].signature
 
@@ -34,9 +34,12 @@ async function partialSignature (tree, signer, from, to = tree.length, signature
   }
 }
 
-async function upgradeNodes (tree, from, to) {
-  const p = await tree.proof({ upgrade: { start: from, length: to - from } })
-  return p.upgrade.nodes
+async function upgradeNodes (core, from, to) {
+  const batch = core.storage.read()
+  const treeBatch = core.state.createTreeBatch()
+  const p = await core.tree.proof(batch, treeBatch, { upgrade: { start: from, length: to - from } })
+  batch.tryFlush()
+  return (await p.settle()).upgrade.nodes
 }
 
 function signableLength (lengths, quorum) {

package/lib/mutex.js

@@ -9,6 +9,10 @@ module.exports = class Mutex {
     this._enqueue = (resolve, reject) => this._queue.push([resolve, reject])
   }
 
+  idle () {
+    return this._queue.length === 0 && this.locked === false
+  }
+
   lock () {
     if (this.destroyed) return Promise.reject(this._destroyError || new Error('Mutex has been destroyed'))
     if (this.locked) return new Promise(this._enqueue)

package/lib/remote-bitfield.js

@@ -32,11 +32,11 @@ class RemoteBitfieldPage {
     }
   }
 
-  setRange (start, length, val) {
-    quickbit.fill(this.bitfield, val, start, start + length)
+  setRange (start, end, val) {
+    quickbit.fill(this.bitfield, val, start, end)
 
     let i = Math.floor(start / 128)
-    const n = i + Math.ceil(length / 128)
+    const n = i + Math.ceil((end - start) / 128)
 
     while (i <= n) this.tree.update(this.offset * 8 + i++ * 128)
   }
@@ -188,11 +188,11 @@ module.exports = class RemoteBitfield {
     if (p) p.set(j, val)
   }
 
-  setRange (start, length, val) {
+  setRange (start, end, val) {
     let j = start & (BITS_PER_PAGE - 1)
     let i = (start - j) / BITS_PER_PAGE
 
-    while (length > 0) {
+    while (start < end) {
       let p = this._pages.get(i)
 
       if (!p && val) {
@@ -203,14 +203,14 @@ module.exports = class RemoteBitfield {
         p = this._pages.set(i, new RemoteBitfieldPage(i, new Uint32Array(WORDS_PER_PAGE), s))
       }
 
-      const end = Math.min(j + length, BITS_PER_PAGE)
-      const range = end - j
+      const last = Math.min(end, BITS_PER_PAGE)
+      const range = last - j
 
-      if (p) p.setRange(j, range, val)
+      if (p) p.setRange(j, last, val)
 
       j = 0
       i++
-      length -= range
+      end -= range
     }
   }