FULLFEATURE: Separate serialization tx witness and the rest

This commit is contained in:
Pieter Wuille 2015-05-11 15:52:17 -07:00 committed by Matt Corallo
parent a04ea8a812
commit 663e9bd329
10 changed files with 164 additions and 51 deletions

View file

@ -2488,7 +2488,7 @@ int CMerkleTx::GetDepthInMainChainINTERNAL(const CBlockIndex* &pindexRet) const
// Make sure the merkle branch connects to this block
if (!fMerkleVerified)
{
if (CBlock::CheckMerkleBranch(GetHash(), vMerkleBranch, nIndex) != pindex->hashMerkleRoot)
if (CBlock::CheckMerkleBranch(GetFullHash(), vMerkleBranch, nIndex) != pindex->hashMerkleRoot)
return 0;
fMerkleVerified = true;
}