diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-04-12 21:26:35 -0400 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-05-25 14:36:40 -0400 |
| commit | feeb761ba07af74a7cd78b8c8f7c2a961fd9ea1c (patch) | |
| tree | 8cec30ee5da602e1cdc19d1ff23d27097146d0b3 | |
| parent | 4e6e3293ff377854487bdf01a77dafb22955ed91 (diff) | |
Testnet, Mark III
| -rw-r--r-- | src/irc.cpp | 4 | ||||
| -rw-r--r-- | src/main.cpp | 6 | ||||
| -rw-r--r-- | src/util.cpp | 2 |
3 files changed, 5 insertions, 7 deletions
diff --git a/src/irc.cpp b/src/irc.cpp index 1049188411..c0b3b7478d 100644 --- a/src/irc.cpp +++ b/src/irc.cpp @@ -291,8 +291,8 @@ void ThreadIRCSeed2(void* parg) } if (fTestNet) { - Send(hSocket, "JOIN #bitcoinTEST\r"); - Send(hSocket, "WHO #bitcoinTEST\r"); + Send(hSocket, "JOIN #bitcoinTEST3\r"); + Send(hSocket, "WHO #bitcoinTEST3\r"); } else { // randomly join #bitcoin00-#bitcoin99 int channel_number = GetRandInt(100); diff --git a/src/main.cpp b/src/main.cpp index 96718cf181..dd1a7b9007 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1926,12 +1926,11 @@ bool LoadBlockIndex(bool fAllowNew) { if (fTestNet) { - hashGenesisBlock = uint256("0x00000007199508e34a9ff81e6ec0c477a4cccff2a4767a8eee39c11db367b008"); - bnProofOfWorkLimit = CBigNum(~uint256(0) >> 28); pchMessageStart[0] = 0xfa; pchMessageStart[1] = 0xbf; pchMessageStart[2] = 0xb5; pchMessageStart[3] = 0xda; + hashGenesisBlock = uint256("000000000933ea01ad0ee984209779baaec3ced90fa3f408719526f8d77f4943"); } // @@ -1977,8 +1976,7 @@ bool LoadBlockIndex(bool fAllowNew) if (fTestNet) { block.nTime = 1296688602; - block.nBits = 0x1d07fff8; - block.nNonce = 384568319; + block.nNonce = 414098458; } //// debug print diff --git a/src/util.cpp b/src/util.cpp index 3ab30baff6..b07c9c1b7e 100644 --- a/src/util.cpp +++ b/src/util.cpp @@ -834,7 +834,7 @@ const boost::filesystem::path &GetDataDir(bool fNetSpecific) path = GetDefaultDataDir(); } if (fNetSpecific && GetBoolArg("-testnet", false)) - path /= "testnet"; + path /= "testnet3"; fs::create_directory(path); |