ce564e381a
Changes are as below: Wrap CBlockHeader::nVersion into a new class (CBlockVersion). This allows to take care of interpreting the field into a base version, auxpow flag and the chain ID. Update getauxblock.py for new 'generate' RPC call. Add 'auxpow' to block JSON. Accept auxpow as PoW verification. Add unit tests for auxpow verification. Add check for memory-layout of CBlockVersion. Weaken auxpow chain ID checks for the testnet. Allow Params() to overrule when to check the auxpow chain ID and for legacy blocks. Use this to disable the checks on testnet. Introduce CPureBlockHeader. Split the block header part that is used by auxpow and the "real" block header (that uses auxpow) to resolve the cyclic dependency between the two. Differentiate between uint256 and arith_uint256. This change was done upstream, modify the auxpow code. Add missing lock in auxpow_tests. Fix REST header check for auxpow headers. Those can be longer, thus take that into account. Also perform the check actually on an auxpow header. Correctly set the coinbase for getauxblock results. Call IncrementExtraNonce in getauxblock so that the coinbase is actually initialised with the stuff it should be. (BIP30 block height and COINBASE_FLAGS.) Implement getauxblock plus regression test. Turn auxpow test into FIXTURE test. This allows using of the Params() calls. Move CMerkleTx code to auxpow.cpp. Otherwise we get linker errors when building without wallet. Fix rebase with BIP66. Update the code to handle BIP66's nVersion=3. Enforce that auxpow parent blocks have no auxpow block version. This is for compatibility with namecoind. See also https://github.com/namecoin/namecoin/pull/199. Move auxpow-related parameters to Consensus::Params.
30 lines
808 B
C++
30 lines
808 B
C++
// Copyright (c) 2009-2010 Satoshi Nakamoto
|
|
// Copyright (c) 2009-2014 The Bitcoin developers
|
|
// Distributed under the MIT/X11 software license, see the accompanying
|
|
// file COPYING or http://www.opensource.org/licenses/mit-license.php.
|
|
|
|
#include "primitives/pureheader.h"
|
|
|
|
#include "crypto/scrypt.h"
|
|
#include "hash.h"
|
|
#include "utilstrencodings.h"
|
|
|
|
void CPureBlockHeader::SetBaseVersion(int32_t nBaseVersion, int32_t nChainId)
|
|
{
|
|
assert(nBaseVersion >= 1 && nBaseVersion < VERSION_AUXPOW);
|
|
assert(!IsAuxpow());
|
|
nVersion = nBaseVersion | (nChainId * VERSION_CHAIN_START);
|
|
}
|
|
|
|
uint256 CPureBlockHeader::GetHash() const
|
|
{
|
|
return SerializeHash(*this);
|
|
}
|
|
|
|
uint256 CPureBlockHeader::GetPoWHash() const
|
|
{
|
|
uint256 thash;
|
|
scrypt_1024_1_1_256(BEGIN(nVersion), BEGIN(thash));
|
|
return thash;
|
|
}
|