fix uncommitable batches being half written to the tx

holepunchto · Feb 7, 2025 · 35a51ae · 35a51ae
1 parent 3492ba2
commit 35a51ae
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -417,7 +417,9 @@ module.exports = class Core {
 
     if (this.preupdate !== null) await this.preupdate(batch, this.header.key)
 
-    await this.state._verifyBlock(batch, bitfield, value, this.header.manifest ? null : manifest)
+    if (!(await this.state._verifyBlock(batch, bitfield, value, this.header.manifest ? null : manifest))) {
+      return false
+    }
 
     if (!batch.upgraded && bitfield) {
       this.replicator.onhave(bitfield.start, bitfield.length, bitfield.drop)

diff --git a/lib/session-state.js b/lib/session-state.js
@@ -296,6 +296,7 @@ module.exports = class SessionState {
     await this.mutex.lock()
 
     try {
+      if (!batch.commitable()) return false
       const tx = this.createWriteBatch()
       this.updating = true
 
@@ -307,9 +308,8 @@ module.exports = class SessionState {
 
       if (manifest) this.core._setManifest(tx, manifest, null)
 
-      if (batch.commitable()) {
-        batch.commit(tx)
-      }
+      assert(batch.commitable(), 'Should still be commitable')
+      batch.commit(tx)
 
       const head = {
         fork: batch.fork,
@@ -335,6 +335,8 @@ module.exports = class SessionState {
       this.updating = false
       this.mutex.unlock()
     }
+
+    return true
   }
 
   async truncate (length, fork, { signature, keyPair } = {}) {