LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Remove -bip16 and -paytoscripthashtime command-line arguments

Browse source
This commit is contained in:
Gavin Andresen 2012-03-21 15:45:58 -04:00
parent 2e2c04e250
commit 8f188ece3c
2 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/init.cpp
View file

@ -489,24 +489,11 @@ bool AppInit2(int argc, char* argv[])
fAllowDNS = GetBoolArg("-dns"); fAllowDNS = GetBoolArg("-dns");
fNoListen = !GetBoolArg("-listen", true); fNoListen = !GetBoolArg("-listen", true);
// This code can be removed once a super-majority of the network has upgraded. // Continue to put "/P2SH/" in the coinbase to monitor
if (GetBoolArg("-bip16", true)) // BIP16 support.
{ // This can be removed eventually...
if (fTestNet) const char* pszP2SH = "/P2SH/";
SoftSetArg("-paytoscripthashtime", "1329264000"); // Feb 15 COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
else
SoftSetArg("-paytoscripthashtime", "1333238400"); // April 1 2012
// Put "/P2SH/" in the coinbase so everybody can tell when
// a majority of miners support it
const char* pszP2SH = "/P2SH/";
COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
}
else
{
const char* pszP2SH = "NOP2SH";
COINBASE_FLAGS << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH));
}
if (!fNoListen) if (!fNoListen)
{ {

9
src/main.cpp
View file

@ -1278,12 +1278,9 @@ bool CBlock::ConnectBlock(CTxDB& txdb, CBlockIndex* pindex)
return false; return false;
} }
// To avoid being on the short end of a block-chain split, // BIP16 didn't become active until Apr 1 2012 (Feb 15 on testnet)
// don't do secondary validation of pay-to-script-hash transactions int64 nBIP16SwitchTime = fTestNet ? 1329264000 : 1333238400;
// until blocks with timestamps after paytoscripthashtime (see init.cpp for default). bool fStrictPayToScriptHash = (pindex->nTime >= nBIP16SwitchTime);
// This code can be removed once a super-majority of the network has upgraded.
int64 nEvalSwitchTime = GetArg("-paytoscripthashtime", std::numeric_limits<int64_t>::max());
bool fStrictPayToScriptHash = (pindex->nTime >= nEvalSwitchTime);
//// issue here: it doesn't know the version //// issue here: it doesn't know the version
unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size()); unsigned int nTxPos = pindex->nBlockPos + ::GetSerializeSize(CBlock(), SER_DISK) - 1 + GetSizeOfCompactSize(vtx.size());