From fe332a0d5531b82b2fe83273bfcfbc43d8a639dc Mon Sep 17 00:00:00 2001 From: Chris Kleeschulte Date: Wed, 7 Jun 2017 13:28:22 -0400 Subject: [PATCH] Changes for testnet5 (segwit2x). --- qa/rpc-tests/test_framework/mininode.py | 2 +- src/chainparams.cpp | 17 +++++++---------- src/chainparamsbase.cpp | 4 ++-- 3 files changed, 10 insertions(+), 13 deletions(-) diff --git a/qa/rpc-tests/test_framework/mininode.py b/qa/rpc-tests/test_framework/mininode.py index 5b563c58ae1e1..9151d6bd05a76 100755 --- a/qa/rpc-tests/test_framework/mininode.py +++ b/qa/rpc-tests/test_framework/mininode.py @@ -1611,7 +1611,7 @@ class NodeConn(asyncore.dispatcher): } MAGIC_BYTES = { "mainnet": b"\xf9\xbe\xb4\xd9", # mainnet - "testnet3": b"\x0b\x11\x09\x07", # testnet3 + "testnet5": b"\x6e\x65\x74\x00", # testnet5 "regtest": b"\xfa\xbf\xb5\xda", # regtest } diff --git a/src/chainparams.cpp b/src/chainparams.cpp index fe30f86521462..06e9eb972c01b 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -216,11 +216,11 @@ class CTestNetParams : public CChainParams { // By default assume that the signatures in ancestors of this block are valid. consensus.defaultAssumeValid = uint256S("0x00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc"); //1079274 - pchMessageStart[0] = 0x0b; - pchMessageStart[1] = 0x11; - pchMessageStart[2] = 0x09; - pchMessageStart[3] = 0x07; - nDefaultPort = 18333; + pchMessageStart[0] = 0x6e; + pchMessageStart[1] = 0x65; + pchMessageStart[2] = 0x74; + pchMessageStart[3] = 0x00; + nDefaultPort = 18555; nPruneAfterHeight = 1000; genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN); @@ -231,10 +231,7 @@ class CTestNetParams : public CChainParams { vFixedSeeds.clear(); vSeeds.clear(); // nodes with support for servicebits filtering should be at the top - vSeeds.push_back(CDNSSeedData("testnetbitcoin.jonasschnelli.ch", "testnet-seed.bitcoin.jonasschnelli.ch", true)); - vSeeds.push_back(CDNSSeedData("petertodd.org", "seed.tbtc.petertodd.org", true)); - vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me")); - vSeeds.push_back(CDNSSeedData("bitcoin.schildbach.de", "testnet-seed.bitcoin.schildbach.de")); + vSeeds.push_back(CDNSSeedData("testnet5.b-pay.net", "seed.testnet5.b-pay.net")); base58Prefixes[PUBKEY_ADDRESS] = std::vector(1,111); base58Prefixes[SCRIPT_ADDRESS] = std::vector(1,196); @@ -380,4 +377,4 @@ void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime, { regTestParams.UpdateBIP9Parameters(d, nStartTime, nTimeout); } - + diff --git a/src/chainparamsbase.cpp b/src/chainparamsbase.cpp index cb71a8b550c75..291cde68f46b7 100644 --- a/src/chainparamsbase.cpp +++ b/src/chainparamsbase.cpp @@ -45,8 +45,8 @@ class CBaseTestNetParams : public CBaseChainParams public: CBaseTestNetParams() { - nRPCPort = 18332; - strDataDir = "testnet3"; + nRPCPort = 18554; + strDataDir = "testnet5"; } }; static CBaseTestNetParams testNetParams;