highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-07-13 00:56:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

[validation] Always include merkle root in coinbase commitment

Browse Source
This commit is contained in:
Dhruv Mehta
2021-06-20 11:26:35 -07:00
parent 189128c220
commit a806647d26
1 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/validation.cpp
View File

@ -3094,7 +3094,6 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
std::vector<unsigned char> commitment; std::vector<unsigned char> commitment;
int commitpos = GetWitnessCommitmentIndex(block); int commitpos = GetWitnessCommitmentIndex(block);
std::vector<unsigned char> ret(32, 0x00); std::vector<unsigned char> ret(32, 0x00);
if (DeploymentEnabled(consensusParams, Consensus::DEPLOYMENT_SEGWIT)) {
if (commitpos == NO_WITNESS_COMMITMENT) { if (commitpos == NO_WITNESS_COMMITMENT) {
uint256 witnessroot = BlockWitnessMerkleRoot(block, nullptr); uint256 witnessroot = BlockWitnessMerkleRoot(block, nullptr);
CHash256().Write(witnessroot).Write(ret).Finalize(witnessroot); CHash256().Write(witnessroot).Write(ret).Finalize(witnessroot);
@ -3113,7 +3112,6 @@ std::vector<unsigned char> GenerateCoinbaseCommitment(CBlock& block, const CBloc
tx.vout.push_back(out); tx.vout.push_back(out);
block.vtx[0] = MakeTransactionRef(std::move(tx)); block.vtx[0] = MakeTransactionRef(std::move(tx));
} }
}
UpdateUncommittedBlockStructures(block, pindexPrev, consensusParams); UpdateUncommittedBlockStructures(block, pindexPrev, consensusParams);
return commitment; return commitment;
} }