From c00ae64f775e10f71c108f00ab28e6eb5af94524 Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Sun, 31 May 2015 06:53:27 +0000 Subject: [PATCH] Remove P2SH coinbase flag, no longer interesting Github-Pull: #6203 Rebased-From: d449772cf69c01932fc5d72c46054815d6300b3c --- src/init.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/init.cpp b/src/init.cpp index f4136f09..6b343fb0 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -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(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