Merge pull request #6203

d449772 Remove P2SH coinbase flag, no longer interesting (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan 2015-06-02 09:08:21 +02:00
commit f00b62391b
No known key found for this signature in database
GPG key ID: 74810B012346C9A6

View file

@ -787,12 +787,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (nConnectTimeout <= 0)
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT;
// 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));
// Fee-per-kilobyte amount considered the same as "free"
// If you are mining, be careful setting this:
// if you set it to zero then