octo
/
Zebra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: generate well-formed finalSaplingRoot in Arbitrary implementation (#3573) 

Co-authored-by: mergify[bot] <37929162+mergify[bot]@users.noreply.github.com>
This commit is contained in:
Conrado Gouvea 2022-02-17 17:10:13 -03:00 committed by GitHub
parent 92b561dc8a
commit bb232ccb74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
zebra-chain/src/block/arbitrary.rs
View File

@ -472,11 +472,20 @@ impl Block {
.unwrap(); .unwrap();
let nu5_height = NetworkUpgrade::Nu5.activation_height(current.network); let nu5_height = NetworkUpgrade::Nu5.activation_height(current.network);
match current_height.cmp(&heartwood_height) { match current_height.cmp(&heartwood_height) {
std::cmp::Ordering::Less => {} std::cmp::Ordering::Less => {
// In pre-Heartwood blocks this is the Sapling note commitment tree root.
// We don't validate it since we checkpoint on Canopy, but it
// needs to be well-formed, i.e. smaller than 𝑞_J, so we
// arbitrarily set it to 1.
block.header.commitment_bytes = [0u8; 32];
block.header.commitment_bytes[0] = 1;
}
std::cmp::Ordering::Equal => { std::cmp::Ordering::Equal => {
// The Heartwood activation block has a hardcoded all-zeroes commitment.
block.header.commitment_bytes = [0u8; 32]; block.header.commitment_bytes = [0u8; 32];
} }
std::cmp::Ordering::Greater => { std::cmp::Ordering::Greater => {
// Set the correct commitment bytes according to the network upgrade.
let history_tree_root = match &history_tree { let history_tree_root = match &history_tree {
Some(tree) => tree.hash().unwrap_or_else(|| [0u8; 32].into()), Some(tree) => tree.hash().unwrap_or_else(|| [0u8; 32].into()),
None => [0u8; 32].into(), None => [0u8; 32].into(),