Permalink
Browse files

Merge pull request #6203

d449772 Remove P2SH coinbase flag, no longer interesting (Luke Dashjr)
  • Loading branch information...
laanwj committed Jun 2, 2015
2 parents 0e4f2a0 + d449772 commit f00b62391b9317bf4c83676520fede1fb4027c43
Showing with 0 additions and 6 deletions.
  1. +0 −6 src/init.cpp
View
@@ -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

0 comments on commit f00b623

Please sign in to comment.