diff options
author | Cory Fields <cory-nospam-@coryfields.com> | 2014-03-26 15:56:45 -0400 |
---|---|---|
committer | Cory Fields <cory-nospam-@coryfields.com> | 2014-04-22 00:32:30 -0400 |
commit | 4f497cd97da4f9c88790a5f4e97926804669dfca (patch) | |
tree | 512e8c5a53fe638319c74cef2f69b3259917d14c | |
parent | 27bff74e39c4c2951a709114e0d565568a0554fa (diff) | |
download | bitcoin-4f497cd97da4f9c88790a5f4e97926804669dfca.tar.xz |
script: switch outside users to CScriptNum
-rw-r--r-- | src/chainparams.cpp | 2 | ||||
-rw-r--r-- | src/miner.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/chainparams.cpp b/src/chainparams.cpp index b52774ee20..eb56800b92 100644 --- a/src/chainparams.cpp +++ b/src/chainparams.cpp @@ -125,7 +125,7 @@ public: CTransaction txNew; txNew.vin.resize(1); txNew.vout.resize(1); - txNew.vin[0].scriptSig = CScript() << 486604799 << CBigNum(4) << vector<unsigned char>((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); + txNew.vin[0].scriptSig = CScript() << 486604799 << CScriptNum(4) << vector<unsigned char>((const unsigned char*)pszTimestamp, (const unsigned char*)pszTimestamp + strlen(pszTimestamp)); txNew.vout[0].nValue = 50 * COIN; txNew.vout[0].scriptPubKey = CScript() << ParseHex("04678afdb0fe5548271967f1a67130b7105cd6a828e03909a67962e0ea1f61deb649f6bc3f4cef38c4f35504e51ec112de5c384df7ba0b8d578a4c702b6bf11d5f") << OP_CHECKSIG; genesis.vtx.push_back(txNew); diff --git a/src/miner.cpp b/src/miner.cpp index 3351908e65..f21ee0c3a8 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -355,7 +355,7 @@ void IncrementExtraNonce(CBlock* pblock, CBlockIndex* pindexPrev, unsigned int& } ++nExtraNonce; unsigned int nHeight = pindexPrev->nHeight+1; // Height first in coinbase required for block.version=2 - pblock->vtx[0].vin[0].scriptSig = (CScript() << nHeight << CBigNum(nExtraNonce)) + COINBASE_FLAGS; + pblock->vtx[0].vin[0].scriptSig = (CScript() << nHeight << CScriptNum(nExtraNonce)) + COINBASE_FLAGS; assert(pblock->vtx[0].vin[0].scriptSig.size() <= 100); pblock->hashMerkleRoot = pblock->BuildMerkleTree(); |