Adding gettruboredemption and some useful RPC info

Grandpa-Jones · Jun 27, 2015 · 3c2d471 · 3c2d471
1 parent 945b419
commit 3c2d471
Show file tree

Hide file tree

Showing 8 changed files with 326 additions and 8 deletions.
diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp
@@ -279,9 +279,11 @@ static const CRPCCommand vRPCCommands[] =
     { "getblockhash",           &getblockhash,           false,  false },
     { "gettransaction",         &gettransaction,         false,  false },
     { "listtransactions",       &listtransactions,       false,  false },
+    { "getfirstturboblock",     &getfirstturboblock,     false,  false },
     { "getturbo",               &getturbo,               false,  false },
     { "getmyturboaddresses",    &getmyturboaddresses,    false,  false },
     { "getallturboaddresses",   &getallturboaddresses,   false,  false },
+    { "getturboredemption",     &getturboredemption,     false,  false },
     { "listaddressgroupings",   &listaddressgroupings,   false,  false },
     { "signmessage",            &signmessage,            false,  false },
     { "verifymessage",          &verifymessage,          false,  false },

diff --git a/src/bitcoinrpc.h b/src/bitcoinrpc.h
@@ -185,9 +185,11 @@ extern json_spirit::Value listaddressgroupings(const json_spirit::Array& params,
 extern json_spirit::Value listaccounts(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value listsinceblock(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value gettransaction(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getfirstturboblock(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getturbo(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getmyturboaddresses(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value getallturboaddresses(const json_spirit::Array& params, bool fHelp);
+extern json_spirit::Value getturboredemption(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value backupwallet(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value keypoolrefill(const json_spirit::Array& params, bool fHelp);
 extern json_spirit::Value walletpassphrase(const json_spirit::Array& params, bool fHelp);

diff --git a/src/main.cpp b/src/main.cpp
@@ -62,6 +62,9 @@ int64_t nTurboDuration = 30 * 24 * 60 * 60; // TurboStake ends after 30 days
 // hardcoded upon first update - Thu, 25 Jun 2015 06:03:07 GMT
 int64_t nTurboEndTime = 1432620187 + nTurboDuration;
 
+// block time of first stake (about 2 days 10 min after block 1 found)
+int64_t nTurboStartTime = 1432793442;
+
 // set when known
 // int nLastTurboHeight = 0;
 // set when known

diff --git a/src/main.h b/src/main.h
@@ -112,6 +112,7 @@ extern std::set<CWallet*> setpwalletRegistered;
 extern unsigned char pchMessageStart[4];
 extern std::map<uint256, CBlock*> mapOrphanBlocks;
 
+extern int64_t nTurboStartTime;
 extern int64_t nTurboEndTime;
 extern CBlockIndex *pindexLastTurbo;
 

diff --git a/src/qt/turboaddresstablemodel.cpp b/src/qt/turboaddresstablemodel.cpp
@@ -27,7 +27,6 @@ class TurboAddressTablePriv
 
     void refreshTurboAddressTable()
     {
-        printf("TurboAddressTablePriv::refreshTurboAddressTable: called\n");
         cachedTurboAddressTable.clear();
 
         int rank = 0;
@@ -36,7 +35,6 @@ class TurboAddressTablePriv
             ++rank;
             cachedTurboAddressTable.append(TurboAddressTableEntry(rank, QString::fromStdString(it->name_),
                                                                 it->value_.get_int()));
-            printf("TurboAddressTablePriv::refreshTurboAddressTable: rank: %d\n", rank);
         }
 
         // qLowerBound() and qUpperBound() require
@@ -207,7 +205,6 @@ void TurboAddressTableModel::emitLayoutChanged()
 
 void TurboAddressTableModel::setTurbos(json_spirit::Object allTurbos)
 {
-    printf("TurboAddressTableModel::setTurbos: called\n");
     emit beginResetModel();
     priv->allTurbos = allTurbos;
     priv->refreshTurboAddressTable();
@@ -224,7 +221,6 @@ void TurboAddressTableModel::update()
 
     if (!IsInitialBlockDownload()) {
           // [TODO] factor getallturboaddresses
-          printf("TurboAddressTableModel::update: called\n");
           json_spirit::Object allTurbos = getallturboaddresses(json_spirit::Array(), false).get_obj();
           this->setTurbos(allTurbos);
     }

diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
@@ -113,6 +113,7 @@ Object blockToJSON(const CBlock& block, const CBlockIndex* blockindex, bool fPri
     result.push_back(Pair("difficulty", GetDifficulty(blockindex)));
     result.push_back(Pair("blocktrust", leftTrim(blockindex->GetBlockTrust().GetHex(), '0')));
     result.push_back(Pair("chaintrust", leftTrim(blockindex->nChainTrust.GetHex(), '0')));
+    result.push_back(Pair("money supply", ValueFromAmount(blockindex->nMoneySupply)));
     if (blockindex->pprev)
         result.push_back(Pair("previousblockhash", blockindex->pprev->GetBlockHash().GetHex()));
     if (blockindex->pnext)

diff --git a/src/rpcrawtransaction.cpp b/src/rpcrawtransaction.cpp
@@ -46,10 +46,16 @@ void ScriptPubKeyToJSON(const CScript& scriptPubKey, Object& out, bool fIncludeH
 
 void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
 {
+    CTxDB txdb("r");
+
     entry.push_back(Pair("txid", tx.GetHash().GetHex()));
     entry.push_back(Pair("version", tx.nVersion));
     entry.push_back(Pair("time", (boost::int64_t)tx.nTime));
     entry.push_back(Pair("locktime", (boost::int64_t)tx.nLockTime));
+    if (tx.nVersion > 1) {
+       entry.push_back(Pair("tx-comment", tx.strTxComment));
+       entry.push_back(Pair("product-id", (boost::int64_t)tx.nProdTypeID));
+    }
     Array vin;
     BOOST_FOREACH(const CTxIn& txin, tx.vin)
     {
@@ -66,6 +72,41 @@ void TxToJSON(const CTransaction& tx, const uint256 hashBlock, Object& entry)
             in.push_back(Pair("scriptSig", o));
         }
         in.push_back(Pair("sequence", (boost::int64_t)txin.nSequence));
+
+
+        // [TODO] Refactor this! See getturboredemption.
+        CTransaction txPrev;
+        CTxIndex txindex;
+        if (!txPrev.ReadFromDisk(txdb, txin.prevout, txindex))
+        {
+              if (fDebug)
+              {
+                  printf("TxToJSON: could not read txin from disk\n");
+              }
+              continue;  // previous transaction not in main chain?
+        }
+        CTxOut prevtxout = txPrev.vout[txin.prevout.n];
+
+        int nRequired;
+        txnouttype type;
+        vector<CTxDestination> addresses;
+        if (ExtractDestinations(prevtxout.scriptPubKey, type, addresses, nRequired))
+        {
+            in.push_back(Pair("value", ValueFromAmount(prevtxout.nValue)));
+        }
+        else
+        {
+            in.push_back(Pair("type", GetTxnOutputType(TX_NONSTANDARD)));
+        }
+
+        Array a;
+        BOOST_FOREACH(const CTxDestination& addr, addresses)
+        {
+            a.push_back(CBitcoinAddress(addr).ToString());
+        }
+
+        in.push_back(Pair("addresses", a));
+
         vin.push_back(in);
     }
     entry.push_back(Pair("vin", vin));