zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Auto merge of #5241 - nuttycom:consensus/check_orchard_root_bottom, r=daira 

Consensus: Add check to ensure that the Orchard commitment tree is not overfull after AppendBundle.

Part of #5197.
This commit is contained in:
Homu 2021-07-29 13:20:34 +00:00
parent 5802be3427 ec4e9ae509
commit 81da4f92ab
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main.cpp
View File

@ -3238,7 +3238,11 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
sapling_tree.append(outputDescription.cmu);
}
orchard_tree.AppendBundle(tx.GetOrchardBundle());
if (!orchard_tree.AppendBundle(tx.GetOrchardBundle())) {
return state.DoS(100,
error("ConnectBlock(): block would overfill the Orchard commitment tree."),
REJECT_INVALID, "orchard-commitment-tree-full");
};
if (!(tx.vShieldedSpend.empty() && tx.vShieldedOutput.empty())) {
total_sapling_tx += 1;