Skip to content

Commit 50b7fa8

Browse files
jgarzikjgarzik
authored
Merge pull request #18 from btc1/2017_testnet5
Merge testnet5 support
2 parents 5441106 + 7e333ea commit 50b7fa8

File tree

8 files changed

+44
-38
lines changed

8 files changed

+44
-38
lines changed

‎contrib/gitian-descriptors/gitian-linux.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-linux-0.14"
2+
name: "bitcoin-linux-0.14-segwit2x"
33
enable_cache: true
44
suites:
55
- "trusty"

‎contrib/gitian-descriptors/gitian-osx.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-osx-0.14"
2+
name: "bitcoin-osx-0.14-segwit2x"
33
enable_cache: true
44
suites:
55
- "trusty"

‎contrib/gitian-descriptors/gitian-win.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
name: "bitcoin-win-0.14"
2+
name: "bitcoin-win-0.14-segwit2x"
33
enable_cache: true
44
suites:
55
- "trusty"

‎qa/rpc-tests/p2p-compactblocks.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ def setup_network(self):
123123

124124
# Start up node0 to be a version 1, pre-segwit node.
125125
self.nodes = start_nodes(self.num_nodes, self.options.tmpdir,
126-
[["-debug", "-logtimemicros=1", "-bip9params=segwit:0:0"],
126+
[["-debug", "-logtimemicros=1", "-bip9params=segwit:0:0", "-bip9params=segwit2x:0:0"],
127127
["-debug", "-logtimemicros", "-txindex"]])
128128
connect_nodes(self.nodes[0], 1)
129129

‎qa/rpc-tests/p2p-segwit.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ def setup_network(self):
203203
connect_nodes(self.nodes[0], 1)
204204

205205
# Disable segwit's bip9 parameter to simulate upgrading after activation.
206-
self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1", "-bip9params=segwit:0:0"]))
206+
self.nodes.append(start_node(2, self.options.tmpdir, ["-debug", "-whitelist=127.0.0.1", "-bip9params=segwit:0:0", "-bip9params=segwit2x:0:0"]))
207207
connect_nodes(self.nodes[0], 2)
208208

209209
''' Helpers '''

‎qa/rpc-tests/test_framework/mininode.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1611,7 +1611,7 @@ class NodeConn(asyncore.dispatcher):
16111611
}
16121612
MAGIC_BYTES = {
16131613
"mainnet": b"\xf9\xbe\xb4\xd9", # mainnet
1614-
"testnet3": b"\x0b\x11\x09\x07", # testnet3
1614+
"testnet5": b"\x6e\x65\x74\x00", # testnet5
16151615
"regtest": b"\xfa\xbf\xb5\xda", # regtest
16161616
}
16171617

‎src/chainparams.cpp

Lines changed: 36 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -173,17 +173,17 @@ class CMainParams : public CChainParams {
173173
static CMainParams mainParams;
174174

175175
/**
176-
* Testnet (v3)
176+
* Testnet (v5)
177177
*/
178178
class CTestNetParams : public CChainParams {
179179
public:
180180
CTestNetParams() {
181181
strNetworkID = "test";
182182
consensus.nSubsidyHalvingInterval = 210000;
183-
consensus.BIP34Height = 21111;
184-
consensus.BIP34Hash = uint256S("0x0000000023b3a96d3484e5abb3755c413e7d41500f8e2a5c3f0dd01299cd8ef8");
185-
consensus.BIP65Height = 581885; // 00000000007f6655f22f98e72ed80d8b06dc761d5da09df0fa1dc4be4f861eb6
186-
consensus.BIP66Height = 330776; // 000000002104c8c45e99a8853285a3b592602a3ccde2b832481da85e9e4ba182
183+
consensus.BIP34Height = 10001;
184+
consensus.BIP34Hash = uint256S("0x00000000fb7c0a2aeb5f1244e81921b84b7ac770004543144e10c2284f89bfd8");
185+
consensus.BIP65Height = 10001; // 00000000fb7c0a2aeb5f1244e81921b84b7ac770004543144e10c2284f89bfd8
186+
consensus.BIP66Height = 10001; // 00000000fb7c0a2aeb5f1244e81921b84b7ac770004543144e10c2284f89bfd8
187187
consensus.powLimit = uint256S("00000000ffffffffffffffffffffffffffffffffffffffffffffffffffffffff");
188188
consensus.nPowTargetTimespan = 14 * 24 * 60 * 60; // two weeks
189189
consensus.nPowTargetSpacing = 10 * 60;
@@ -192,30 +192,35 @@ class CTestNetParams : public CChainParams {
192192
consensus.nRuleChangeActivationThreshold = 1512; // 75% for testchains
193193
consensus.nMinerConfirmationWindow = 2016; // nPowTargetTimespan / nPowTargetSpacing
194194
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].bit = 28;
195-
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1199145601; // January 1, 2008
196-
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1230767999; // December 31, 2008
195+
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nStartTime = 1496275200; // June 1, 2017
196+
consensus.vDeployments[Consensus::DEPLOYMENT_TESTDUMMY].nTimeout = 1510704000; // November 15, 2017
197197

198198
// Deployment of BIP68, BIP112, and BIP113.
199199
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
200-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1456790400; // March 1st, 2016
201-
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1493596800; // May 1st, 2017
200+
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 1496275200; // June 1, 2017
201+
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 1510704000; // November 15, 2017
202202

203203
// Deployment of SegWit (BIP141, BIP143, and BIP147)
204204
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
205-
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1462060800; // May 1st 2016
206-
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1493596800; // May 1st 2017
205+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 1496275200; // June 1, 2017
206+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 1510704000; // November 15th, 2017
207+
208+
// Deployment of SegWit2x
209+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].bit = 4;
210+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nStartTime = 1496275200; // June 1, 2017.
211+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nTimeout = 1510704000; // November 15th, 2017
207212

208213
// The best chain should have at least this much work.
209-
consensus.nMinimumChainWork = uint256S("0x00000000000000000000000000000000000000000000001f057509eba81aed91");
214+
consensus.nMinimumChainWork = uint256S("0x0000000000000000000000000000000000000000000000000000000000000100");
210215

211216
// By default assume that the signatures in ancestors of this block are valid.
212-
consensus.defaultAssumeValid = uint256S("0x00000000000128796ee387cf110ccb9d2f36cffaf7f73079c995377c65ac0dcc"); //1079274
217+
consensus.defaultAssumeValid = uint256S("0x00000000fb7c0a2aeb5f1244e81921b84b7ac770004543144e10c2284f89bfd8"); // 10001
213218

214-
pchMessageStart[0] = 0x0b;
215-
pchMessageStart[1] = 0x11;
216-
pchMessageStart[2] = 0x09;
217-
pchMessageStart[3] = 0x07;
218-
nDefaultPort = 18333;
219+
pchMessageStart[0] = 0x6e;
220+
pchMessageStart[1] = 0x65;
221+
pchMessageStart[2] = 0x74;
222+
pchMessageStart[3] = 0x00;
223+
nDefaultPort = 18555;
219224
nPruneAfterHeight = 1000;
220225

221226
genesis = CreateGenesisBlock(1296688602, 414098458, 0x1d00ffff, 1, 50 * COIN);
@@ -226,10 +231,7 @@ class CTestNetParams : public CChainParams {
226231
vFixedSeeds.clear();
227232
vSeeds.clear();
228233
// nodes with support for servicebits filtering should be at the top
229-
vSeeds.push_back(CDNSSeedData("testnetbitcoin.jonasschnelli.ch", "testnet-seed.bitcoin.jonasschnelli.ch", true));
230-
vSeeds.push_back(CDNSSeedData("petertodd.org", "seed.tbtc.petertodd.org", true));
231-
vSeeds.push_back(CDNSSeedData("bluematt.me", "testnet-seed.bluematt.me"));
232-
vSeeds.push_back(CDNSSeedData("bitcoin.schildbach.de", "testnet-seed.bitcoin.schildbach.de"));
234+
vSeeds.push_back(CDNSSeedData("testnet5.b-pay.net", "seed.testnet5.b-pay.net"));
233235

234236
base58Prefixes[PUBKEY_ADDRESS] = std::vector<unsigned char>(1,111);
235237
base58Prefixes[SCRIPT_ADDRESS] = std::vector<unsigned char>(1,196);
@@ -239,22 +241,21 @@ class CTestNetParams : public CChainParams {
239241

240242
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));
241243

242-
fMiningRequiresPeers = true;
244+
fMiningRequiresPeers = false;
243245
fDefaultConsistencyChecks = false;
244246
fRequireStandard = false;
245-
fMineBlocksOnDemand = false;
247+
fMineBlocksOnDemand = true;
246248

247249

248250
checkpointData = (CCheckpointData) {
249251
boost::assign::map_list_of
250-
( 546, uint256S("000000002a936ca763904c3c35fce2f3556c559c0214345d31b1bcebf76acb70")),
252+
( 10001, uint256S("00000000fb7c0a2aeb5f1244e81921b84b7ac770004543144e10c2284f89bfd8")),
251253
};
252254

253255
chainTxData = ChainTxData{
254-
// Data as of block 00000000c2872f8f8a8935c8e3c5862be9038c97d4de2cf37ed496991166928a (height 1063660)
255-
1483546230,
256-
12834668,
257-
0.15
256+
1497295460,
257+
31626,
258+
0
258259
};
259260

260261
}
@@ -286,10 +287,15 @@ class CRegTestParams : public CChainParams {
286287
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].bit = 0;
287288
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nStartTime = 0;
288289
consensus.vDeployments[Consensus::DEPLOYMENT_CSV].nTimeout = 999999999999ULL;
290+
289291
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].bit = 1;
290292
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nStartTime = 0;
291293
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT].nTimeout = 999999999999ULL;
292294

295+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].bit = 4;
296+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nStartTime = 0;
297+
consensus.vDeployments[Consensus::DEPLOYMENT_SEGWIT2X].nTimeout = 999999999999ULL;
298+
293299
// The best chain should have at least this much work.
294300
consensus.nMinimumChainWork = uint256S("0x00");
295301

@@ -371,4 +377,4 @@ void UpdateRegtestBIP9Parameters(Consensus::DeploymentPos d, int64_t nStartTime,
371377
{
372378
regTestParams.UpdateBIP9Parameters(d, nStartTime, nTimeout);
373379
}
374-
380+

‎src/chainparamsbase.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ class CBaseTestNetParams : public CBaseChainParams
4545
public:
4646
CBaseTestNetParams()
4747
{
48-
nRPCPort = 18332;
49-
strDataDir = "testnet3";
48+
nRPCPort = 18554;
49+
strDataDir = "testnet5";
5050
}
5151
};
5252
static CBaseTestNetParams testNetParams;

0 commit comments

Comments
 (0)