diff options
| author | Gregory Maxwell <greg@xiph.org> | 2012-06-23 19:02:55 -0700 |
|---|---|---|
| committer | Gregory Maxwell <greg@xiph.org> | 2012-06-23 19:02:55 -0700 |
| commit | 0ae2ac5431c762dcf44318a688f1a0d5b130ac23 (patch) | |
| tree | 2a4ff64f589fd173432dd5161d8b3dd8212b69ee /src/main.cpp | |
| parent | d62a1947be5350ed60066ccacc7aba43bbdf48fb (diff) | |
| parent | e6332751c613b3a248ec9638f0cce7964fd86da0 (diff) | |
| download | bitcoin-0ae2ac5431c762dcf44318a688f1a0d5b130ac23.tar.xz | |
Merge pull request #1503 from gmaxwell/testnet_tweaks
Remove some rule differences which aren't needed with testnet3.
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/main.cpp b/src/main.cpp index a49d2a06b4..27802a4985 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -1325,8 +1325,7 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex) // This logic is not necessary for memory pool transactions, as AcceptToMemoryPool // already refuses previously-known transaction id's entirely. // 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 || (fTestNet && pindex->nTime > 1329696000)) + if (pindex->nTime > 1331769600) { 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) - int64 nBIP16SwitchTime = fTestNet ? 1329264000 : 1333238400; + // BIP16 didn't become active until Apr 1 2012 + int64 nBIP16SwitchTime = 1333238400; bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime); //// issue here: it doesn't know the version |