diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-02 09:08:21 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-06-02 09:11:13 +0200 |
| commit | f00b62391b9317bf4c83676520fede1fb4027c43 (patch) | |
| tree | b9f33e2f74936094d2879c93162f0e89168acab7 | |
| parent | 0e4f2a0a1f28ae0c9e74aae5ff4848bb50550398 (diff) | |
| parent | d449772cf69c01932fc5d72c46054815d6300b3c (diff) | |
| download | bitcoin-f00b62391b9317bf4c83676520fede1fb4027c43.tar.xz | |
Merge pull request #6203
d449772 Remove P2SH coinbase flag, no longer interesting (Luke Dashjr)
| -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 2e4740602f..35284992ed 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 |