DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Rename hashReserved to hashSaplingAnchorEnd.

Browse Source
This commit is contained in:
Sean Bowe
2018-04-27 14:11:32 -06:00
parent 08f0728884
commit 691a3fa2e9
5 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/primitives/block.cpp
View File

@@ -112,12 +112,12 @@ uint256 CBlock::CheckMerkleBranch(uint256 hash, const std::vector<uint256>& vMer
std::string CBlock::ToString() const
{
std::stringstream s;
s << strprintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, hashReserved=%s, nTime=%u, nBits=%08x, nNonce=%s, vtx=%u)\n",
s << strprintf("CBlock(hash=%s, ver=%d, hashPrevBlock=%s, hashMerkleRoot=%s, hashSaplingAnchorEnd=%s, nTime=%u, nBits=%08x, nNonce=%s, vtx=%u)\n",
GetHash().ToString(),
nVersion,
hashPrevBlock.ToString(),
hashMerkleRoot.ToString(),
hashReserved.ToString(),
hashSaplingAnchorEnd.ToString(),
nTime, nBits, nNonce.ToString(),
vtx.size());
for (unsigned int i = 0; i < vtx.size(); i++)

10
src/primitives/block.h
View File

@@ -26,7 +26,7 @@ public:
int32_t nVersion;
uint256 hashPrevBlock;
uint256 hashMerkleRoot;
uint256 hashReserved;
uint256 hashSaplingAnchorEnd;
uint32_t nTime;
uint32_t nBits;
uint256 nNonce;
@@ -44,7 +44,7 @@ public:
READWRITE(this->nVersion);
READWRITE(hashPrevBlock);
READWRITE(hashMerkleRoot);
READWRITE(hashReserved);
READWRITE(hashSaplingAnchorEnd);
READWRITE(nTime);
READWRITE(nBits);
READWRITE(nNonce);
@@ -56,7 +56,7 @@ public:
nVersion = CBlockHeader::CURRENT_VERSION;
hashPrevBlock.SetNull();
hashMerkleRoot.SetNull();
hashReserved.SetNull();
hashSaplingAnchorEnd.SetNull();
nTime = 0;
nBits = 0;
nNonce = uint256();
@@ -118,7 +118,7 @@ public:
block.nVersion = nVersion;
block.hashPrevBlock = hashPrevBlock;
block.hashMerkleRoot = hashMerkleRoot;
block.hashReserved = hashReserved;
block.hashSaplingAnchorEnd = hashSaplingAnchorEnd;
block.nTime = nTime;
block.nBits = nBits;
block.nNonce = nNonce;
@@ -158,7 +158,7 @@ public:
READWRITE(this->nVersion);
READWRITE(hashPrevBlock);
READWRITE(hashMerkleRoot);
READWRITE(hashReserved);
READWRITE(hashSaplingAnchorEnd);
READWRITE(nTime);
READWRITE(nBits);
}