do not reconcile if source tree is shorter

holepunchto · Oct 7, 2024 · 5db484a · 5db484a
1 parent 1dd49ed
commit 5db484a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/lib/core.js b/lib/core.js
@@ -872,6 +872,8 @@ module.exports = class Core {
  const values = await Promise.all(promises)
 
  const batch = await this.tree.reconcile(state.tree, length, treeLength)
+ if (batch === null) return null // could not reconcile
+
  if (batch.upgraded) batch.signature = signature || this.verifier.sign(batch, keyPair)
 
  await this.state.upgrade(treeLength, length, batch, values, keyPair)

diff --git a/lib/merkle-tree.js b/lib/merkle-tree.js
@@ -534,12 +534,18 @@ module.exports = class MerkleTree {
  }
 
  async reconcile (tree, length, treeLength) {
+ if (this.length > length) return null
+
  const nodes = []
  const data = []
 
  const from = this.length * 2
  const to = length * 2
 
+ const batch = this.batch()
+
+ if (from === to) return batch
+
  const reader = tree.storage.createReadBatch()
 
  // upgrade
@@ -573,8 +579,6 @@ module.exports = class MerkleTree {
 
  reader.tryFlush()
 
- const batch = this.batch()
-
  // copy tree nodes
  for (const node of await Promise.all(data)) {
  if (node) batch.nodes.push(node)