X-Git-Url: https://git.novaco.in/?p=novacoin.git;a=blobdiff_plain;f=src%2Fmain.cpp;h=891dbed980233a59c8e688f31fd4d008c6073b44;hp=3c3f066042260a55daf5287bf2ac75ae12146866;hb=52a3d2635c417c8e2398d9d4853db938171d406b;hpb=9e8818ec9d01b3cf9e4aa601a96785c4fdc3f9b7 diff --git a/src/main.cpp b/src/main.cpp index 3c3f066..891dbed 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(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();