zec
/
incrementalmerkletree
mirror of https://github.com/zcash/incrementalmerkletree.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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.
This commit is contained in:
Kris Nuttycombe 2023-02-24 15:20:37 -07:00
parent 92121642b0
commit 22c2c019cc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bridgetree/src/lib.rs
View File

@ -976,7 +976,6 @@ impl<H: Hashable + Ord + Clone, const DEPTH: u8> BridgeTree<H, DEPTH> {
pub fn mark(&mut self) -> Option<Position> { pub fn mark(&mut self) -> Option<Position> {
match self.current_bridge.take() { match self.current_bridge.take() {
Some(mut cur_b) => { Some(mut cur_b) => {
cur_b.track_current_leaf();
let pos = cur_b.position(); let pos = cur_b.position();
// If the latest bridge is a newly created checkpoint, the last prior // 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 // bridge will have the same position and all we need to do is mark
@ -988,8 +987,10 @@ impl<H: Hashable + Ord + Clone, const DEPTH: u8> BridgeTree<H, DEPTH> {
{ {
// the current bridge has not been advanced, so we just need to make // the current bridge has not been advanced, so we just need to make
// sure that we have are tracking the marked leaf // sure that we have are tracking the marked leaf
cur_b.track_current_leaf();
self.current_bridge = Some(cur_b); self.current_bridge = Some(cur_b);
} else { } else {
// the successor(true) call will ensure that the marked leaf is tracked
let successor = cur_b.successor(true); let successor = cur_b.successor(true);
self.prior_bridges.push(cur_b); self.prior_bridges.push(cur_b);
self.current_bridge = Some(successor); self.current_bridge = Some(successor);