Skip to content

Commit 762e34e

Browse files
barrystylebarrystyle
authored and
barrystyle
committed
Merge pull request dashpay#15 from barrystyle/0.14-finaltestnet
Long term testnet parameters set.
2 parents 81546e5 + edb1fe9 commit 762e34e

File tree

2 files changed

+12
-9
lines changed

2 files changed

+12
-9
lines changed

src/chainparams.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -478,17 +478,17 @@ class CTestNetParams : public CChainParams {
478478
// By default assume that the signatures in ancestors of this block are valid.
479479
consensus.defaultAssumeValid = uint256S("0x0000000000000000000000000000000000000000000000000000000000000000");
480480

481-
pchMessageStart[0] = 0x11;
482-
pchMessageStart[1] = 0x33;
483-
pchMessageStart[2] = 0x55;
484-
pchMessageStart[3] = 0x77;
481+
pchMessageStart[0] = 0x22;
482+
pchMessageStart[1] = 0x44;
483+
pchMessageStart[2] = 0x66;
484+
pchMessageStart[3] = 0x88;
485485
vAlertPubKey = ParseHex("04517d8a699cb43d3938d7b24faaff7cda448ca4ea267723ba614784de661949bf632d6304316b244646dea079735b9a6fc4af804efb4752075b9fe2245e14e412");
486486
nDefaultPort = 29999;
487487
nPruneAfterHeight = 1000;
488488

489-
genesis = CreateGenesisBlock(1567342000, 4913, 0x1f00ffff, 1, 0 * COIN, true);
489+
genesis = CreateGenesisBlock(1567646780, 24712, 0x1f00ffff, 1, 0 * COIN, true);
490490
consensus.hashGenesisBlock = genesis.GetHash();
491-
assert(consensus.hashGenesisBlock == uint256S("0x00002ab12b7dedeeec3f13e601f835a7bbb1987ec3ee22093962a7c9b2f6b745"));
491+
assert(consensus.hashGenesisBlock == uint256S("0x0000d3b6747d6f7fe976c218fe7834d2fa79b661a6debe69a0af9b8faea3b0fa"));
492492

493493
vFixedSeeds.clear();
494494
vFixedSeeds = std::vector<SeedSpec6>(pnSeed6_test, pnSeed6_test + ARRAYLEN(pnSeed6_test));

src/validation.cpp

+6-3
Original file line numberDiff line numberDiff line change
@@ -530,10 +530,13 @@ bool CheckTransaction(const CTransaction& tx, CValidationState &state)
530530
}
531531

532532
// Check for banned inputs
533-
for (const auto& txin : tx.vin) {
534-
if (areBannedInputs(txin.prevout.hash, txin.prevout.n))
535-
return state.DoS(100, false, REJECT_INVALID, "banned-inputs-spent");
533+
if (IsPoS()) {
534+
for (const auto& txin : tx.vin) {
535+
if (areBannedInputs(txin.prevout.hash, txin.prevout.n))
536+
return state.DoS(100, false, REJECT_INVALID, "banned-inputs-spent");
537+
}
536538
}
539+
537540
// Basic checks that don't depend on any context
538541
if (!allowEmptyTxInOut && tx.vin.empty())
539542
return state.DoS(10, false, REJECT_INVALID, "bad-txns-vin-empty");

0 commit comments

Comments
 (0)