Skip to content

WIP: add hash witness merkle root in block header #88

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
scravy wants to merge 1 commit into from
Closed

WIP: add hash witness merkle root in block header #88

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 10 additions & 6 deletions src/primitives/block.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class CBlockHeader
int32_t nVersion;
uint256 hashPrevBlock;
uint256 hashMerkleRoot;
uint256 hashWitnessMerkleRoot;
uint32_t nTime;
uint32_t nBits;
uint32_t nNonce;
Expand All @@ -40,6 +41,7 @@ class CBlockHeader
READWRITE(this->nVersion);
READWRITE(hashPrevBlock);
READWRITE(hashMerkleRoot);
READWRITE(hashWitnessMerkleRoot);
READWRITE(nTime);
READWRITE(nBits);
READWRITE(nNonce);
Expand All @@ -50,6 +52,7 @@ class CBlockHeader
nVersion = 0;
hashPrevBlock.SetNull();
hashMerkleRoot.SetNull();
hashWitnessMerkleRoot.SetNull();
nTime = 0;
nBits = 0;
nNonce = 0;
Expand Down Expand Up @@ -112,12 +115,13 @@ class CBlock : public CBlockHeader
CBlockHeader GetBlockHeader() const
{
CBlockHeader block;
block.nVersion = nVersion;
block.hashPrevBlock = hashPrevBlock;
block.hashMerkleRoot = hashMerkleRoot;
block.nTime = nTime;
block.nBits = nBits;
block.nNonce = nNonce;
block.nVersion = nVersion;
block.hashPrevBlock = hashPrevBlock;
block.hashMerkleRoot = hashMerkleRoot;
block.hashWitnessMerkleRoot = hashWitnessMerkleRoot;
block.nTime = nTime;
block.nBits = nBits;
block.nNonce = nNonce;
return block;
}

Expand Down