From 22c2c019cce6b09bf29180c0ec75afad0e936ae4 Mon Sep 17 00:00:00 2001 From: Kris Nuttycombe Date: Fri, 24 Feb 2023 15:20:37 -0700 Subject: [PATCH] Do not eagerly track marked nodes in the current bridge. This fixes a minor compatibility issue with respect to possible deserialization of the `incrementalmerkletree-0.3.0` `MerkleBridge` type. It is not necessary to track a marked leaf in the current bridge *unless* the marked position is the bridge's starting position and the prior bridge ended at a checkpoint. --- bridgetree/src/lib.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridgetree/src/lib.rs b/bridgetree/src/lib.rs index daf39f4..be8e2f8 100644 --- a/bridgetree/src/lib.rs +++ b/bridgetree/src/lib.rs @@ -976,7 +976,6 @@ impl BridgeTree { pub fn mark(&mut self) -> Option { match self.current_bridge.take() { Some(mut cur_b) => { - cur_b.track_current_leaf(); let pos = cur_b.position(); // If the latest bridge is a newly created checkpoint, the last prior // bridge will have the same position and all we need to do is mark @@ -988,8 +987,10 @@ impl BridgeTree { { // the current bridge has not been advanced, so we just need to make // sure that we have are tracking the marked leaf + cur_b.track_current_leaf(); self.current_bridge = Some(cur_b); } else { + // the successor(true) call will ensure that the marked leaf is tracked let successor = cur_b.successor(true); self.prior_bridges.push(cur_b); self.current_bridge = Some(successor);