diff options
| author | Luke Dashjr <luke-jr+git@utopios.org> | 2015-05-31 06:53:27 +0000 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-02 09:13:03 +0200 |
| commit | c00ae64f775e10f71c108f00ab28e6eb5af94524 (patch) | |
| tree | 9b34217d689192b227ab61225a0c819e683acf7e /src | |
| parent | dfdb6dd052416da726db6c2e5f76e875cf08c507 (diff) | |
| download | bitcoin-c00ae64f775e10f71c108f00ab28e6eb5af94524.tar.xz | |
Remove P2SH coinbase flag, no longer interesting
Github-Pull: #6203
Rebased-From: d449772cf69c01932fc5d72c46054815d6300b3c
Diffstat (limited to 'src')
| -rw-r--r-- | src/init.cpp | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/init.cpp b/src/init.cpp index f4136f09e9..6b343fb049 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<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 |