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

Merge pull request #1439 from nuttycom/fix_shardtree_root_insertion 

zcash_client_backend: Fix panic related to insertion of frontiers below subtree roots.
This commit is contained in:
Kris Nuttycombe 2024-06-30 08:33:12 -06:00 committed by GitHub
parent 5bd911f63b cd7ca2c64f
commit 34cf6d286a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock generated
View File

@ -1123,7 +1123,7 @@ dependencies = [
[[package]] [[package]]
name = "incrementalmerkletree" name = "incrementalmerkletree"
version = "0.5.1" version = "0.5.1"
source = "git+https://github.com/zcash/incrementalmerkletree?rev=8b4b1315d64d171bcf701e5de59d0707dc029f9c#8b4b1315d64d171bcf701e5de59d0707dc029f9c" source = "git+https://github.com/zcash/incrementalmerkletree?rev=337f59179eda51261e9ddfc6b18e8fb84ea277c9#337f59179eda51261e9ddfc6b18e8fb84ea277c9"
dependencies = [ dependencies = [
"either", "either",
"proptest", "proptest",
@ -2228,7 +2228,7 @@ dependencies = [
[[package]] [[package]]
name = "shardtree" name = "shardtree"
version = "0.3.1" version = "0.3.1"
source = "git+https://github.com/zcash/incrementalmerkletree?rev=8b4b1315d64d171bcf701e5de59d0707dc029f9c#8b4b1315d64d171bcf701e5de59d0707dc029f9c" source = "git+https://github.com/zcash/incrementalmerkletree?rev=337f59179eda51261e9ddfc6b18e8fb84ea277c9#337f59179eda51261e9ddfc6b18e8fb84ea277c9"
dependencies = [ dependencies = [
"assert_matches", "assert_matches",
"bitflags 2.5.0", "bitflags 2.5.0",

4
Cargo.toml
View File

@ -124,5 +124,5 @@ panic = 'abort'
codegen-units = 1 codegen-units = 1
[patch.crates-io] [patch.crates-io]
incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "8b4b1315d64d171bcf701e5de59d0707dc029f9c" } incrementalmerkletree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" }
shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "8b4b1315d64d171bcf701e5de59d0707dc029f9c" } shardtree = { git = "https://github.com/zcash/incrementalmerkletree", rev = "337f59179eda51261e9ddfc6b18e8fb84ea277c9" }

6
zcash_client_backend/src/serialization/shardtree.rs
View File

@ -13,7 +13,6 @@ const SER_V1: u8 = 1;
const NIL_TAG: u8 = 0; const NIL_TAG: u8 = 0;
const LEAF_TAG: u8 = 1; const LEAF_TAG: u8 = 1;
const PARENT_TAG: u8 = 2; const PARENT_TAG: u8 = 2;
const PRUNED_TAG: u8 = 3;
/// Writes a [`PrunableTree`] to the provided [`Write`] instance. /// Writes a [`PrunableTree`] to the provided [`Write`] instance.
/// ///
@ -44,10 +43,6 @@ pub fn write_shard<H: HashSer, W: Write>(writer: &mut W, tree: &PrunableTree<H>)
writer.write_u8(NIL_TAG)?; writer.write_u8(NIL_TAG)?;
Ok(()) Ok(())
} }
Node::Pruned => {
writer.write_u8(PRUNED_TAG)?;
Ok(())
}
} }
} }
@ -79,7 +74,6 @@ fn read_shard_v1<H: HashSer, R: Read>(mut reader: &mut R) -> io::Result<Prunable
Ok(Tree::leaf((value, flags))) Ok(Tree::leaf((value, flags)))
} }
NIL_TAG => Ok(Tree::empty()), NIL_TAG => Ok(Tree::empty()),
PRUNED_TAG => Ok(Tree::empty_pruned()),
other => Err(io::Error::new( other => Err(io::Error::new(
io::ErrorKind::InvalidData, io::ErrorKind::InvalidData,
format!("Node tag not recognized: {}", other), format!("Node tag not recognized: {}", other),