diff options
| author | Forrest Voight <[email protected]> | 2012-01-14 18:51:52 -0500 |
|---|---|---|
| committer | Forrest Voight <[email protected]> | 2012-01-14 19:22:24 -0500 |
| commit | 52a3d2635c417c8e2398d9d4853db938171d406b (patch) | |
| tree | e5cecd765a59dcca04ad96d88ac94f922eb1b12c /src/main.cpp | |
| parent | Remove base58 encoding from validateaddress/addmultisigaddress (diff) | |
| download | discoin-52a3d2635c417c8e2398d9d4853db938171d406b.tar.xz discoin-52a3d2635c417c8e2398d9d4853db938171d406b.zip | |
Separated COINBASE_FLAGS out into main.h and made RPC getmemorypool return it
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/main.cpp b/src/main.cpp index 3c3f06604..891dbed98 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -3130,12 +3130,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& hashPrevBlock = pblock->hashPrevBlock; } ++nExtraNonce; - pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nTime << CBigNum(nExtraNonce); - - // Put "/P2SH/" in the coinbase so everybody can tell when - // a majority of miners support it - const char* pszP2SH = "/P2SH/"; - pblock->vtx[0].vin[0].scriptSig += CScript() << std::vector<unsigned char>(pszP2SH, pszP2SH+strlen(pszP2SH)); + pblock->vtx[0].vin[0].scriptSig = (CScript() << pblock->nTime << CBigNum(nExtraNonce)) + COINBASE_FLAGS; assert(pblock->vtx[0].vin[0].scriptSig.size() <= 100); pblock->hashMerkleRoot = pblock->BuildMerkleTree(); |