hypercore 10.30.2 → 10.30.4

package/lib/batch.js

@@ -317,6 +317,15 @@ module.exports = class HypercoreBatch extends EventEmitter {
     const flushingLength = Math.min(length - this._sessionLength, this._appends.length)
     if (flushingLength <= 0) return true
 
+    if (this.session.replicator._upgrade) {
+      for (const req of this.session.replicator._upgrade.inflight) {
+        // yield to the remote inflight upgrade, TODO: if the remote upgrade fails, retry flushing...
+        if (req.upgrade && (req.upgrade.start + req.upgrade.length) > length) {
+          return false
+        }
+      }
+    }
+
     const batch = this.createTreeBatch(this._sessionLength + flushingLength)
     if (batch === null) return false
 

package/lib/core.js

@@ -707,7 +707,11 @@ module.exports = class Core {
 
     const batch = this.tree.verifyFullyRemote(proof)
 
-    this._verifyBatchUpgrade(batch, proof.manifest)
+    try {
+      this._verifyBatchUpgrade(batch, proof.manifest)
+    } catch {
+      return true
+    }
 
     const remoteTreeHash = this.crypto.tree(proof.upgrade.nodes)
     const localTreeHash = this.crypto.tree(await this.tree.getRoots(proof.upgrade.length))

package/lib/replicator.js

@@ -688,8 +688,10 @@ class Peer {
       safetyCatch(err)
       if (this.core.closed && !isCriticalError(err)) return
 
-      // might be a fork, verify
-      this._checkIfConflict(err)
+      if (err.code !== 'INVALID_OPERATION') {
+        // might be a fork, verify
+        this._checkIfConflict(err)
+      }
       this.replicator._onnodata(this, req)
       return
     } finally {

package/package.json

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