From 49c8e53ee2c2705fd0a8731458cb776dad7e1f6e Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Mon, 25 Jul 2011 11:59:41 -0400
Subject: Save coinbase, not just extraNonce

---
 src/rpc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/rpc.cpp')

diff --git a/src/rpc.cpp b/src/rpc.cpp
index 9e7cfc5b3..2a458423c 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -1581,7 +1581,8 @@ Value getwork(const Array& params, bool fHelp)
     if (IsInitialBlockDownload())
         throw JSONRPCError(-10, "Bitcoin is downloading blocks...");
 
-    static map<uint256, pair<CBlock*, unsigned int> > mapNewBlock;
+    typedef map<uint256, pair<CBlock*, CScript> > mapNewBlock_t;
+    static mapNewBlock_t mapNewBlock;
     static vector<CBlock*> vNewBlock;
     static CReserveKey reservekey(pwalletMain);
 
@@ -1624,7 +1625,7 @@ Value getwork(const Array& params, bool fHelp)
         pblock->nNonce = 0;
 
         // Save
-        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, nExtraNonce);
+        mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
 
         // Prebuild hash buffers
         char pmidstate[32];
@@ -1657,11 +1658,10 @@ Value getwork(const Array& params, bool fHelp)
         if (!mapNewBlock.count(pdata->hashMerkleRoot))
             return false;
         CBlock* pblock = mapNewBlock[pdata->hashMerkleRoot].first;
-        unsigned int nExtraNonce = mapNewBlock[pdata->hashMerkleRoot].second;
 
         pblock->nTime = pdata->nTime;
         pblock->nNonce = pdata->nNonce;
-        pblock->vtx[0].vin[0].scriptSig = CScript() << pblock->nBits << CBigNum(nExtraNonce);
+        pblock->vtx[0].vin[0].scriptSig = mapNewBlock[pdata->hashMerkleRoot].second;
         pblock->hashMerkleRoot = pblock->BuildMerkleTree();
 
         return CheckWork(pblock, *pwalletMain, reservekey);
-- 
cgit v1.2.3


From 83f4cd156e9d52bd7c4351336dfa4806a43ee4e4 Mon Sep 17 00:00:00 2001
From: Luke Dashjr <luke-jr+git@utopios.org>
Date: Tue, 6 Sep 2011 16:39:05 -0400
Subject: Bugfix: Use timestamp in coinbase rather than "bits", needed to
 ensure coinbase txn is unique even if address is the same

---
 src/rpc.cpp | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/rpc.cpp')

diff --git a/src/rpc.cpp b/src/rpc.cpp
index 2a458423c..33cfa77b4 100644
--- a/src/rpc.cpp
+++ b/src/rpc.cpp
@@ -1615,15 +1615,14 @@ Value getwork(const Array& params, bool fHelp)
             vNewBlock.push_back(pblock);
         }
 
-        // Update nExtraNonce
-        static unsigned int nExtraNonce = 0;
-        static int64 nPrevTime = 0;
-        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce, nPrevTime);
-
         // Update nTime
         pblock->nTime = max(pindexPrev->GetMedianTimePast()+1, GetAdjustedTime());
         pblock->nNonce = 0;
 
+        // Update nExtraNonce
+        static unsigned int nExtraNonce = 0;
+        IncrementExtraNonce(pblock, pindexPrev, nExtraNonce);
+
         // Save
         mapNewBlock[pblock->hashMerkleRoot] = make_pair(pblock, pblock->vtx[0].vin[0].scriptSig);
 
-- 
cgit v1.2.3