maxmustermann/dogecoin
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

extracted auxpow consts

Browse source 
set testnet start of auxpow to block 158100
This commit is contained in:
Patrick Lodder 2014-07-23 13:31:37 +02:00
parent b6a2963042
commit aeb626aeeb
3 changed files with 12 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/core.cpp
View file

@ -8,12 +8,6 @@
#include "util.h"
int GetOurChainID()
{
return 0x0000;
}
std::string COutPoint::ToString() const
{
return strprintf("COutPoint(%s, %u)", hash.ToString().substr(0,10), n);

22
src/core.h
View file

@ -28,23 +28,19 @@ int ReadWriteAuxPow(Stream& s, boost::shared_ptr<CAuxPow>& auxpow, int nType, in
template <typename Stream>
int ReadWriteAuxPow(Stream& s, const boost::shared_ptr<CAuxPow>& auxpow, int nType, int nVersion, CSerActionGetSerializeSize ser_action);
enum
{
// primary version
BLOCK_VERSION_DEFAULT = (1 << 0),
// primary version
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);
// modifiers
BLOCK_VERSION_AUXPOW = (1 << 8),
// bits allocated for chain ID
BLOCK_VERSION_CHAIN_START = (1 << 16),
BLOCK_VERSION_CHAIN_END = (1 << 30),
};
static const int AUXPOW_CHAIN_ID = 0x0000; //TODO change me
static const int AUXPOW_START_MAINNET = INT_MAX; //TODO change me
static const int AUXPOW_START_TESTNET = 158100;
/** No amount larger than this (in satoshi) is valid */
static const int64_t MAX_MONEY = 10000000000 * COIN; // Dogecoin: maximum of 100B coins (given some randomness), max transaction 10,000,000,000
inline bool MoneyRange(int64_t nValue) { return (nValue >= 0 && nValue <= MAX_MONEY); }
int GetOurChainID();
/** An outpoint - a combination of a transaction hash and an index n into its vout */
class COutPoint
@ -403,7 +399,7 @@ public:
void SetNull()
{
nVersion = CBlockHeader::CURRENT_VERSION | (GetOurChainID() * BLOCK_VERSION_CHAIN_START);
nVersion = CBlockHeader::CURRENT_VERSION | (AUXPOW_CHAIN_ID * BLOCK_VERSION_CHAIN_START);
hashPrevBlock = 0;
hashMerkleRoot = 0;
nTime = 0;

6
src/main.cpp
View file

@ -2356,9 +2356,9 @@ bool ReceivedBlockTransactions(const CBlock &block, CValidationState& state, CBl
int GetAuxPowStartBlock()
{
if (TestNet())
return INT_MAX; // never
return AUXPOW_START_TESTNET;
else
return INT_MAX; // never
return AUXPOW_START_MAINNET;
}
bool CBlockHeader::CheckProofOfWork(int nHeight) const
@ -2369,7 +2369,7 @@ bool CBlockHeader::CheckProofOfWork(int nHeight) const
// - this block must have our chain ID
// - parent block must not have the same chain ID (see CAuxPow::Check)
// - index of this chain in chain merkle tree must be pre-determined (see CAuxPow::Check)
if (!TestNet() && nHeight != INT_MAX && GetChainID() != GetOurChainID())
if (!TestNet() && nHeight != INT_MAX && GetChainID() != AUXPOW_CHAIN_ID)
return error("CheckProofOfWork() : block does not have our chain ID");
if (auxpow.get() != NULL)