diff options
| author | Gavin Andresen <gavinandresen@gmail.com> | 2012-01-19 14:14:41 -0500 |
|---|---|---|
| committer | Gavin Andresen <gavinandresen@gmail.com> | 2012-01-19 14:14:41 -0500 |
| commit | aacefd279549c4b524def6e46f4a004bf8bb92bf (patch) | |
| tree | d96dcaefbf2261ea72abd4896ebc6792fcd361ea /src/main.h | |
| parent | 43cda5f325f53e8941efa7f712aed66e3fde172a (diff) | |
| parent | ab845122587ed5bef403fcce1891a52501602a5a (diff) | |
Merge branch 'getmemorypool_blockflagstime' of https://github.com/forrestv/bitcoin
Diffstat (limited to 'src/main.h')
| -rw-r--r-- | src/main.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/main.h b/src/main.h index 678c14cc39..be5f2f58a5 100644 --- a/src/main.h +++ b/src/main.h @@ -49,6 +49,12 @@ static const int fHaveUPnP = false; #endif +// Put "/P2SH/" in the coinbase so everybody can tell when +// a majority of miners support it +static const char* pszP2SH = "/P2SH/"; +static const CScript COINBASE_FLAGS = CScript() << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH)); + + |