diff options
| -rw-r--r-- | src/main.cpp | 4 | ||||
| -rw-r--r-- | src/miner.cpp | 1 | ||||
| -rw-r--r-- | src/primitives/pureheader.h | 6 | ||||
| -rw-r--r-- | src/rpcmining.cpp | 4 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index dfcd50310..ded32eb03 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -2747,14 +2747,14 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo bool ContextualCheckBlockHeader(const CBlockHeader& block, CValidationState& state, CBlockIndex * const pindexPrev) { const CChainParams& chainParams = Params(); - const Consensus::Params& consensusParams = chainParams.GetConsensus(pindexPrev->nHeight + 1); uint256 hash = block.GetHash(); - if (hash == consensusParams.hashGenesisBlock) + if (hash == chainParams.GetConsensus(0).hashGenesisBlock) return true; assert(pindexPrev); int nHeight = pindexPrev->nHeight+1; + const Consensus::Params& consensusParams = chainParams.GetConsensus(nHeight); // Disallow legacy blocks after merge-mining start. if (!consensusParams.fAllowLegacyBlocks diff --git a/src/miner.cpp b/src/miner.cpp index 70968ee50..94fe07dbf 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -103,6 +103,7 @@ CBlockTemplate* CreateNewBlock(const CScript& scriptPubKeyIn) /* Initialise the block version. */ pblock->nVersion = CBlockHeader::CURRENT_VERSION; + pblock->nVersion.SetChainId(chainparams.GetConsensus(0).nAuxpowChainId); // -regtest only: allow overriding block.nVersion with // -blockversion=N to test forking scenarios diff --git a/src/primitives/pureheader.h b/src/primitives/pureheader.h index 0e4385e6e..25f1ce98b 100644 --- a/src/primitives/pureheader.h +++ b/src/primitives/pureheader.h @@ -114,6 +114,12 @@ public: || (nVersion == 2 && GetChainId() == 0); } + CBlockVersion& operator=(const CBlockVersion& other) + { + nVersion = other.nVersion; + return *this; + } + CBlockVersion& operator=(const int nBaseVersion) { nVersion = (nBaseVersion & 0x000000ff) | (nVersion & 0xffffff00); diff --git a/src/rpcmining.cpp b/src/rpcmining.cpp index e0ba823de..ab878c105 100644 --- a/src/rpcmining.cpp +++ b/src/rpcmining.cpp @@ -767,11 +767,11 @@ Value getauxblock(const Array& params, bool fHelp) if (vNodes.empty() && !Params().MineBlocksOnDemand()) throw JSONRPCError(RPC_CLIENT_NOT_CONNECTED, - "Namecoin is not connected!"); + "Dogecoin is not connected!"); if (IsInitialBlockDownload() && !Params().MineBlocksOnDemand()) throw JSONRPCError(RPC_CLIENT_IN_INITIAL_DOWNLOAD, - "Namecoin is downloading blocks..."); + "Dogecoin is downloading blocks..."); /* The variables below are used to keep track of created and not yet submitted auxpow blocks. Lock them, just in case. In principle |