Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Clean testnet reset to v3. (branch v11) #83

Merged
merged 4 commits into from
Dec 26, 2014
Merged

Clean testnet reset to v3. (branch v11) #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
25b0d8e
Fix segfault (checking for prev block of genesis).
vertoe Dec 12, 2014
0b054d6
Merge darksend v11 updates.
vertoe Dec 26, 2014
71f3d6e
revert 4f95ea2: testnet v4
vertoe Dec 26, 2014
b0f06bf
Merge upstream commits of branch 'v0.11.0.x' of darkcoin/darkcoin int…
vertoe Dec 26, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/chainparams.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static CMainParams mainParams;


//
// Testnet (v4)
// Testnet (v3)
//
class CTestNetParams : public CMainParams {
public:
Expand Down Expand Up @@ -131,7 +131,7 @@ class CTestNetParams : public CMainParams {
vSeeds.push_back(CDNSSeedData("darkcoin.io", "testnet-seed.darkcoin.io"));
vSeeds.push_back(CDNSSeedData("darkcoin.qa", "testnet-seed.darkcoin.qa"));

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);
Expand Down
4 changes: 2 additions & 2 deletions src/checkpoints.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ namespace Checkpoints
static const CCheckpointData dataTestnet = {
&mapCheckpointsTestnet,
1405699509,
20,
300
201,
500
};

static MapCheckpoints mapCheckpointsRegtest =
Expand Down
2 changes: 1 addition & 1 deletion src/qt/clientmodel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ class ClientModel : public QObject
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;
Expand Down
2 changes: 1 addition & 1 deletion src/rpcblockchain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down