hypercore 11.11.1 → 11.12.0

package/index.js

@@ -71,6 +71,7 @@ class Hypercore extends EventEmitter {
     this.closed = false
     this.weak = !!opts.weak
     this.snapshotted = !!opts.snapshot
+    this.onseq = opts.onseq || null
     this.onwait = opts.onwait || null
     this.wait = opts.wait !== false
     this.timeout = opts.timeout || 0
@@ -219,6 +220,7 @@ class Hypercore extends EventEmitter {
     const wait = opts.wait === false ? false : this.wait
     const writable = opts.writable === undefined ? !this._readonly : opts.writable === true
     const onwait = opts.onwait === undefined ? this.onwait : opts.onwait
+    const onseq = opts.onseq === undefined ? this.onseq : opts.onseq
     const timeout = opts.timeout === undefined ? this.timeout : opts.timeout
     const weak = opts.weak === undefined ? this.weak : opts.weak
     const Clz = opts.class || Hypercore
@@ -226,6 +228,7 @@ class Hypercore extends EventEmitter {
       ...opts,
       wait,
       onwait,
+      onseq,
       timeout,
       writable,
       weak,
@@ -768,6 +771,8 @@ class Hypercore extends EventEmitter {
 
     const encoding = (opts && opts.valueEncoding && c.from(opts.valueEncoding)) || this.valueEncoding
 
+    if (this.onseq !== null) this.onseq(index, this)
+
     const req = this._get(index, opts)
 
     let block = await req

package/lib/merkle-tree.js

@@ -1091,9 +1091,8 @@ function nodesToRoot (index, nodes, head) {
   const ite = flat.iterator(index)
 
   for (let i = 0; i < nodes; i++) {
-    const index = ite.index
     ite.parent()
-    if (ite.contains(head)) return index
+    if (ite.contains(head)) throw INVALID_OPERATION('Nodes is out of bounds')
   }
 
   return ite.index

package/lib/replicator.js

@@ -402,7 +402,9 @@ class Peer {
       wireBitfield: { tx: 0, rx: 0 },
       wireRange: { tx: 0, rx: 0 },
       wireExtension: { tx: 0, rx: 0 },
-      hotswaps: 0
+      hotswaps: 0,
+      invalidData: 0,
+      invalidRequests: 0
     }
 
     this.receiverQueue = new ReceiverQueue()
@@ -725,6 +727,8 @@ class Peer {
       return new ProofRequest(msg, proof, block, manifest)
     } catch (err) {
       batch.destroy()
+      this.stats.invalidRequests++
+      this.replicator.stats.invalidRequests++
       throw err
     }
   }
@@ -927,6 +931,7 @@ class Peer {
         this._checkIfConflict()
       }
 
+      this.paused = true
       this.replicator._onnodata(this, req)
       this.replicator._oninvalid(err, req, data, this)
       return
@@ -1495,7 +1500,9 @@ module.exports = class Replicator {
       wireBitfield: { tx: 0, rx: 0 },
       wireRange: { tx: 0, rx: 0 },
       wireExtension: { tx: 0, rx: 0 },
-      hotswaps: 0
+      hotswaps: 0,
+      invalidData: 0,
+      invalidRequests: 0
     }
 
     this._attached = new Set()
@@ -2281,7 +2288,7 @@ module.exports = class Replicator {
   }
 
   _updatePeer (peer) {
-    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight() || !peer.remoteUploading) {
       return false
     }
 
@@ -2313,7 +2320,7 @@ module.exports = class Replicator {
   }
 
   _updatePeerNonPrimary (peer) {
-    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight()) {
+    if (!peer.isActive() || peer.inflight >= peer.getMaxInflight() || !peer.remoteUploading) {
       return false
     }
 
@@ -2540,6 +2547,8 @@ module.exports = class Replicator {
   _oninvalid (err, req, res, from) {
     const sessions = this.core.monitors
 
+    this.stats.invalidData++
+    from.stats.invalidData++
     for (let i = 0; i < sessions.length; i++) {
       sessions[i].emit('verification-error', err, req, res, from)
     }

package/lib/session-state.js

@@ -483,7 +483,8 @@ module.exports = class SessionState {
         }
       }
 
-      tx.deleteBlockRange(start, end)
+      if ((end - start) === 1) tx.deleteBlock(start)
+      else tx.deleteBlockRange(start, end)
 
       const dependency = start < this.flushedLength() ? updateDependency(this, start, true) : null
 

package/package.json

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