kvazar
/
kevacoin
mirror of https://github.com/kvazar-network/kevacoin.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1503 from gmaxwell/testnet_tweaks 

Remove some rule differences which aren't needed with testnet3.
0.8
Gregory Maxwell 13 years ago
parent
d62a1947be e6332751c6
commit
0ae2ac5431
1 changed files with 3 additions and 4 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 7
      src/main.cpp

7
src/main.cpp
Unescape View File

@ -1325,8 +1325,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
// This logic is not necessary for memory pool transactions, as AcceptToMemoryPool // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool
// already refuses previously-known transaction id's entirely. // already refuses previously-known transaction id's entirely.
// This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC. // This rule applies to all blocks whose timestamp is after March 15, 2012, 0:00 UTC.
// On testnet it is enabled as of februari 20, 2012, 0:00 UTC. if (pindex->nTime > 1331769600)
if (pindex->nTime > 1331769600 || (fTestNet && pindex->nTime > 1329696000))
{ {
BOOST_FOREACH(CTransaction& tx, vtx) BOOST_FOREACH(CTransaction& tx, vtx)
{ {
@ -1340,8 +1339,8 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
} }
} }
// BIP16 didn't become active until Apr 1 2012 (Feb 15 on testnet) // BIP16 didn't become active until Apr 1 2012
int64 nBIP16SwitchTime = fTestNet ? 1329264000 : 1333238400; int64 nBIP16SwitchTime = 1333238400;
bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime); bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime);
//// issue here: it doesn't know the version //// issue here: it doesn't know the version

Write Preview
Loading…
Cancel
Save