Merge pull request #6203
d449772
Remove P2SH coinbase flag, no longer interesting (Luke Dashjr)
This commit is contained in:
commit
f00b62391b
1 changed files with 0 additions and 6 deletions
|
@ -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
|
||||||
|
|
Loading…
Reference in a new issue