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:14:13 +0200 |
| commit | ecc96f5ba9af206d1eb69f41d4d04f4fd014eeb3 (patch) | |
| tree | 1102487ced816c2cadd71fe127070e4448656f4c | |
| parent | ebd7d8d78c2d89ceaf40894cedd6b21fb8bebe96 (diff) | |
| download | bitcoin-ecc96f5ba9af206d1eb69f41d4d04f4fd014eeb3.tar.xz | |
Remove P2SH coinbase flag, no longer interesting
Github-Pull: #6203
Rebased-From: d449772cf69c01932fc5d72c46054815d6300b3c
| -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 00c8e399e8..ed05c15729 100644 --- a/src/init.cpp +++ b/src/init.cpp @@ -683,12 +683,6 @@ bool AppInit2(boost::thread_group& threadGroup) 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 |