sikkienl/dash
1
0
Fork 0
mirror of https://github.com/dashpay/dash.git synced 2024-12-26 12:32:48 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'v0.11.0.x' of https://github.com/darkcoin/darkcoin into v0.11.0.x

Browse Source
This commit is contained in:
Evan Duffield 2014-12-26 15:30:20 -07:00
commit 13e49d5470
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/chainparams.cpp
View File

@ -64,6 +64,7 @@ public:
vSeeds.push_back(CDNSSeedData("darkcoin.io", "dnsseed.darkcoin.io"));
vSeeds.push_back(CDNSSeedData("darkcoin.qa", "dnsseed.darkcoin.qa"));
vSeeds.push_back(CDNSSeedData("masternode.io", "dnsseed.masternode.io"));
base58Prefixes[PUBKEY_ADDRESS] = list_of(76); // Darkcoin addresses start with X
base58Prefixes[SCRIPT_ADDRESS] = list_of(5);
@ -101,7 +102,7 @@ static CMainParams mainParams;
//
// Testnet (v4)
// Testnet (v3)
//
class CTestNetParams : public CMainParams {
public:
@ -130,8 +131,9 @@ public:
vSeeds.clear();
vSeeds.push_back(CDNSSeedData("darkcoin.io", "testnet-seed.darkcoin.io"));
vSeeds.push_back(CDNSSeedData("darkcoin.qa", "testnet-seed.darkcoin.qa"));
vSeeds.push_back(CDNSSeedData("masternode.io", "test.dnsseed.masternode.io"));
base58Prefixes[PUBKEY_ADDRESS] = list_of(111); // Testnet v4 addresses
base58Prefixes[PUBKEY_ADDRESS] = list_of(111); // Testnet v3 addresses
base58Prefixes[SCRIPT_ADDRESS] = list_of(196);
base58Prefixes[SECRET_KEY] = list_of(239);
base58Prefixes[EXT_PUBLIC_KEY] = list_of(0x04)(0x35)(0x87)(0xCF);

4
src/checkpoints.cpp
View File

@ -68,8 +68,8 @@ namespace Checkpoints
static const CCheckpointData dataTestnet = {
&mapCheckpointsTestnet,
1405699509,
20,
300
201,
500
};
static MapCheckpoints mapCheckpointsRegtest =

5
src/main.cpp
View File

@ -2297,7 +2297,6 @@ bool ConnectBlock(CBlock& block, CValidationState& state, CBlockIndex* pindex, C
view.SetBestBlock(pindex->GetBlockHash());
return true;
}
bool fScriptChecks = pindex->nHeight >= Checkpoints::GetTotalBlocksEstimate();
// Do not allow blocks that contain transactions which 'overwrite' older transactions,
@ -2874,7 +2873,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
bool MasternodePayments = false;
if(Params().NetworkID() == CChainParams::TESTNET){
if(TestNet()){
if(block.nTime > START_MASTERNODE_PAYMENTS_TESTNET) MasternodePayments = true;
} else {
if(block.nTime > START_MASTERNODE_PAYMENTS) MasternodePayments = true;
@ -2919,7 +2918,7 @@ bool CheckBlock(const CBlock& block, CValidationState& state, bool fCheckPOW, bo
CBitcoinAddress address2(address1);
LogPrintf("CheckBlock() : Couldn't find masternode payment(%d|%d) or payee(%d|%s) nHeight %d. \n", foundPaymentAmount, masternodePaymentAmount, foundPayee, address2.ToString().c_str(), chainActive.Tip()->nHeight+1);
if(!TestNet()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee"));
if(!TestNet() && !RegTest()) return state.DoS(100, error("CheckBlock() : Couldn't find masternode payment or payee"));
}
}
} else {

2
src/qt/clientmodel.h
View File

@ -55,7 +55,7 @@ public:
double getVerificationProgress() const;
QDateTime getLastBlockDate() const;
//! Return network (main, testnet4, regtest)
//! Return network (main, testnet3, regtest)
QString getNetworkName() const;
//! Return true if core is doing initial block download
bool inInitialBlockDownload() const;

2
src/rpcblockchain.cpp
View File

@ -441,7 +441,7 @@ Value getblockchaininfo(const Array& params, bool fHelp)
"Returns an object containing various state info regarding block chain processing.\n"
"\nResult:\n"
"{\n"
" \"chain\": \"xxxx\", (string) current chain (main, testnet4, regtest)\n"
" \"chain\": \"xxxx\", (string) current chain (main, testnet3, regtest)\n"
" \"blocks\": xxxxxx, (numeric) the current number of blocks processed in the server\n"
" \"bestblockhash\": \"...\", (string) the hash of the currently best block\n"
" \"difficulty\": xxxxxx, (numeric) the current difficulty\n"