diff options
| author | Patrick Lodder <[email protected]> | 2016-02-21 16:49:03 +0100 |
|---|---|---|
| committer | Patrick Lodder <[email protected]> | 2016-02-21 16:49:03 +0100 |
| commit | f626f8f43672a940c7840577b007f3d0010c2179 (patch) | |
| tree | 283a89be14a8c0f9166ff05eafa86de1e4711808 /src/core.h | |
| parent | Merge branch '1.8.3-dev' into 1.8-maint (diff) | |
| parent | Merge pull request #1309 from Sporklin/1.8.3-dev-Fixmanpagesports (diff) | |
| download | discoin-1.8-archive.tar.xz discoin-1.8-archive.zip | |
Merge branch '1.8.3-dev' into 1.8-maint1.8-archive
merges the actually released 1.8.3 into 1.8-maint
Diffstat (limited to 'src/core.h')
| -rw-r--r-- | src/core.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/core.h b/src/core.h index 6a0286f9d..ae1e463c7 100644 --- a/src/core.h +++ b/src/core.h @@ -33,6 +33,7 @@ static const int BLOCK_VERSION_DEFAULT = (1 << 0); static const int BLOCK_VERSION_AUXPOW = (1 << 8); static const int BLOCK_VERSION_CHAIN_START = (1 << 16); static const int BLOCK_VERSION_CHAIN_END = (1 << 30); +static const int BLOCK_VERSION_BASE_MASK = 0x000000ff; // DogeCoin aux chain ID = 0x0062 (98) static const int AUXPOW_CHAIN_ID = 0x0062; @@ -364,7 +365,7 @@ class CBlockHeader { public: // header - static const int CURRENT_VERSION=2; + static const int CURRENT_VERSION=3; int nVersion; uint256 hashPrevBlock; uint256 hashMerkleRoot; @@ -396,6 +397,12 @@ public: return nVersion / BLOCK_VERSION_CHAIN_START; } + // base block version without auxpow chain + int GetBaseVersion() const + { + return nVersion & BLOCK_VERSION_BASE_MASK; + } + void SetAuxPow(CAuxPow* pow); void SetNull() |