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

Auto merge of #4054 - rex4539:haveshieldedrequirements, r=Eirik0 

Rename joinsplit to shielded

Closes https://github.com/zcash/zcash/issues/3550
This commit is contained in:
Homu 2019-07-11 09:45:19 -07:00
parent 29c1b29f3f 8bcb96999e
commit 984b41422a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main.cpp
View File

@ -1475,8 +1475,8 @@ bool AcceptToMemoryPool(CTxMemPool& pool, CValidationState &state, const CTransa
// are the joinsplits' and sapling spends' requirements met in tx(valid anchors/nullifiers)?
if (!view.HaveShieldedRequirements(tx))
return state.Invalid(error("AcceptToMemoryPool: joinsplit requirements not met"),
REJECT_DUPLICATE, "bad-txns-joinsplit-requirements-not-met");
return state.Invalid(error("AcceptToMemoryPool: shielded requirements not met"),
REJECT_DUPLICATE, "bad-txns-shielded-requirements-not-met");
// Bring the best block into scope
view.GetBestBlock();