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