0.21.kyo.2 #50
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Empty file.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,6 +15,10 @@ | |
|
|
||
| #include <vector> | ||
|
|
||
| #define BLOCK_PROOF_OF_STAKE 0x01 // is proof-of-stake block | ||
| #define BLOCK_STAKE_ENTROPY 0x02 // entropy bit for stake modifier | ||
| #define BLOCK_STAKE_MODIFIER 0x04 | ||
|
|
||
| /** | ||
| * Maximum amount of time that a block timestamp is allowed to exceed the | ||
| * current network-adjusted time before the block will be accepted. | ||
|
|
@@ -63,6 +67,12 @@ class CBlockFileInfo | |
| nBlocks = 0; | ||
| nSize = 0; | ||
| nUndoSize = 0; | ||
| nFlags = 0; | ||
|
There was a problem hiding this comment. These changes belong in the Also, Take a look at the file on 0.17 here: Please make sure you're careful when you move code, it needs to be added to appropriate locations - this is important as some properties are purposely mem-only or not serialized at all depending on usage. I understand you were trying to short-hand initialize the values on declaration with |
||
| nStakeModifier = 0; | ||
| nStakeModifierChecksum = 0; | ||
| hashProofOfStake = arith_uint256(); | ||
| prevoutStake.SetNull(); | ||
| nStakeTime = 0; | ||
| nHeightFirst = 0; | ||
| nHeightLast = 0; | ||
| nTimeFirst = 0; | ||
|
|
@@ -180,14 +190,27 @@ class CBlockIndex | |
| uint32_t nBits{0}; | ||
| uint32_t nNonce{0}; | ||
|
|
||
| unsigned int nFlags; // ppcoin: block index flags | ||
|
|
||
| uint64_t nStakeModifier; // hash modifier for proof-of-stake | ||
| unsigned int nStakeModifierChecksum; // checksum of index; in-memeory only | ||
|
|
||
| // proof-of-stake specific fields | ||
| COutPoint prevoutStake; | ||
| unsigned int nStakeTime; | ||
| arith_uint256 hashProofOfStake; | ||
|
|
||
| //! (memory only) Sequential id assigned to distinguish order in which blocks are received. | ||
| int32_t nSequenceId{0}; | ||
|
|
||
| //! (memory only) Maximum nTime in the chain up to and including this block. | ||
| unsigned int nTimeMax{0}; | ||
|
|
||
|
|
||
|
|
||
| CBlockIndex() | ||
| { | ||
|
|
||
| } | ||
|
|
||
| explicit CBlockIndex(const CBlockHeader& block) | ||
|
|
@@ -301,6 +324,47 @@ class CBlockIndex | |
| return false; | ||
| } | ||
|
|
||
| bool IsProofOfWork() const | ||
| { | ||
| return !(nFlags & BLOCK_PROOF_OF_STAKE); | ||
| } | ||
|
|
||
| bool IsProofOfStake() const | ||
| { | ||
| return (nFlags & BLOCK_PROOF_OF_STAKE); | ||
| } | ||
|
|
||
| void SetProofOfStake() | ||
| { | ||
| nFlags |= BLOCK_PROOF_OF_STAKE; | ||
| } | ||
|
|
||
| unsigned int GetStakeEntropyBit() const | ||
| { | ||
| return ((nFlags & BLOCK_STAKE_ENTROPY) >> 1); | ||
| } | ||
|
|
||
| bool SetStakeEntropyBit(unsigned int nEntropyBit) | ||
| { | ||
| if (nEntropyBit > 1) | ||
| return false; | ||
| nFlags |= (nEntropyBit ? BLOCK_STAKE_ENTROPY : 0); | ||
| return true; | ||
| } | ||
|
|
||
| void SetStakeModifier(uint64_t nModifier, bool fGeneratedStakeModifier) | ||
| { | ||
| nStakeModifier = nModifier; | ||
| if (fGeneratedStakeModifier) | ||
| nFlags |= BLOCK_STAKE_MODIFIER; | ||
| } | ||
|
|
||
| bool GeneratedStakeModifier() const | ||
| { | ||
| return (nFlags & BLOCK_STAKE_MODIFIER); | ||
| } | ||
|
|
||
|
|
||
| //! Build the skiplist pointer for this entry. | ||
| void BuildSkip(); | ||
|
|
||
|
|
@@ -319,11 +383,15 @@ const CBlockIndex* LastCommonAncestor(const CBlockIndex* pa, const CBlockIndex* | |
| /** Used to marshal pointers into hashes for db storage. */ | ||
| class CDiskBlockIndex : public CBlockIndex | ||
| { | ||
| private: | ||
| uint256 blockHash; | ||
|
|
||
| public: | ||
| uint256 hashPrev; | ||
|
|
||
| CDiskBlockIndex() { | ||
| hashPrev = uint256(); | ||
|
|
||
|
There was a problem hiding this comment. missing |
||
| } | ||
|
|
||
| explicit CDiskBlockIndex(const CBlockIndex* pindex) : CBlockIndex(*pindex) { | ||
|
|
@@ -342,13 +410,27 @@ class CDiskBlockIndex : public CBlockIndex | |
| if (obj.nStatus & BLOCK_HAVE_DATA) READWRITE(VARINT(obj.nDataPos)); | ||
| if (obj.nStatus & BLOCK_HAVE_UNDO) READWRITE(VARINT(obj.nUndoPos)); | ||
|
|
||
| READWRITE(nFlags); | ||
| READWRITE(nStakeModifier); | ||
| if (IsProofOfStake()) { | ||
| READWRITE(prevoutStake); | ||
| READWRITE(nStakeTime); | ||
| } else if (ser_action.ForRead()) { | ||
| const_cast<CDiskBlockIndex*>(this)->prevoutStake.SetNull(); | ||
| const_cast<CDiskBlockIndex*>(this)->nStakeTime = 0; | ||
| } | ||
|
|
||
| READWRITE(hashProofOfStake); | ||
|
|
||
| // block header | ||
| READWRITE(obj.nVersion); | ||
| READWRITE(obj.hashPrev); | ||
| READWRITE(obj.hashMerkleRoot); | ||
| READWRITE(obj.nTime); | ||
| READWRITE(obj.nBits); | ||
| READWRITE(obj.nNonce); | ||
| READWRITE(blockHash); | ||
|
|
||
| } | ||
|
|
||
| uint256 GetBlockHash() const | ||
|
|
@@ -360,6 +442,8 @@ class CDiskBlockIndex : public CBlockIndex | |
| block.nTime = nTime; | ||
| block.nBits = nBits; | ||
| block.nNonce = nNonce; | ||
| const_cast<CDiskBlockIndex*>(this)->blockHash = block.GetHash(); | ||
|
|
||
| return block.GetHash(); | ||
| } | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what happened to
static const CAmount CENT = 1000000;I believe this was used across different files?