mirror/bitcoin
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #6203

Browse Source 
d449772 Remove P2SH coinbase flag, no longer interesting (Luke Dashjr)
This commit is contained in:
Wladimir J. van der Laan committed 2015-06-02 09:11:13 +02:00
2 parents 0e4f2a0a1f d449772cf6
commit f00b62391b
1 file changed
-6
Download Patch File Download Diff File Expand all files Collapse all files
src/init.cpp
-6
View File
@@ -787,12 +787,6 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
if (nConnectTimeout <= 0) if (nConnectTimeout <= 0)
nConnectTimeout = DEFAULT_CONNECT_TIMEOUT; 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" // Fee-per-kilobyte amount considered the same as "free"
// If you are mining, be careful setting this: // If you are mining, be careful setting this:
// if you set it to zero then // if you set it to zero then