From 651989c73c82ee2f3866a3ca1098c3b6260b61ea Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Tue, 18 Oct 2016 19:00:22 -0300
Subject: [PATCH] test

---
 src/komodo.h          | 11 +++++++++--
 src/main.cpp          | 14 +-------------
 src/rpcblockchain.cpp | 12 ++++++++++++
 3 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/src/komodo.h b/src/komodo.h
index 87a3cb510..c64ad5caf 100644
--- a/src/komodo.h
+++ b/src/komodo.h
@@ -178,6 +178,7 @@ const char *Notaries[64][2] =
 int32_t IS_KOMODO_NOTARY,USE_EXTERNAL_PUBKEY,NOTARIZED_HEIGHT;
 std::string NOTARY_PUBKEY;
 uint256 NOTARIZED_HASH;
+char *komodo_gettxout(bits256 hash,int32_t n);
 
 int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp)
 {
@@ -208,10 +209,10 @@ int32_t komodo_blockindexcheck(CBlockIndex *pindex,uint32_t *nBitsp)
     return(0);
 }
 
-void komodo_connectblock(CBlockIndex *pindex,CBlock& block,int32_t numvins)
+void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
 {
     char *scriptstr,*opreturnstr; uint32_t notarizedheight; uint8_t opret[256];
-    int32_t i,j,k,opretlen,len,numvouts,height,txn_count; uint256 kmdtxid,btctxid;
+    int32_t i,j,k,opretlen,len,numvouts,numvins,height,txn_count; uint256 kmdtxid,btctxid;
     // update voting results and official (height, notaries[])
     if ( pindex != 0 )
     {
@@ -219,6 +220,12 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block,int32_t numvins)
         txn_count = block.vtx.size();
         for (i=0; i<txn_count; i++)
         {
+            numvins = block.vtx[i].vin.size();
+            for (j=0; j<numvins; j++)
+            {
+                if ( (scriptstr= komodo_gettxout(block.vtx[i].vin[j].prevout.hash,block.vtx[i].vin[j].prevout.n)) != 0 )
+                    printf("ht.%d i.%d j.%d (%s)\n",height,i,j,scriptstr);
+            }
             numvouts = block.vtx[i].vout.size();
             for (j=0; j<numvouts; j++)
             {
diff --git a/src/main.cpp b/src/main.cpp
index 8d5324a30..aeacbbe4f 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2222,20 +2222,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
     int64_t nTime4 = GetTimeMicros(); nTimeCallbacks += nTime4 - nTime3;
     LogPrint("bench", "    - Callbacks: %.2fms [%.2fs]\n", 0.001 * (nTime4 - nTime3), nTimeCallbacks * 0.000001);
     
-    int32_t i,j,height,txn_count,numvins; char *scriptstr;
     //FlushStateToDisk();
-    height = pindex->nHeight;
-    txn_count = block.vtx.size();
-    for (i=0; i<txn_count; i++)
-    {
-        numvins = block.vtx[i].vin.size();
-        for (j=0; j<numvins; j++)
-        {
-            scriptstr = (char *)view.GetSpendFor(block.vtx[i].vin[j]).ToString().c_str();
-            printf("ht.%d txi.%d vini.%d of %d: (%s)\n",height,i,j,numvins,scriptstr);
-        }
-    }
-    komodo_connectblock(pindex,*(CBlock *)&block,numvins);
+    komodo_connectblock(pindex,*(CBlock *)&block);
 
     return true;
 }
diff --git a/src/rpcblockchain.cpp b/src/rpcblockchain.cpp
index 7f7d21b78..dd071604d 100644
--- a/src/rpcblockchain.cpp
+++ b/src/rpcblockchain.cpp
@@ -460,6 +460,18 @@ Value gettxout(const Array& params, bool fHelp)
     return ret;
 }
 
+char *komodo_gettxout(bits256 hash,int32_t n)
+{
+    CCoins coins; CBlockIndex *pindex;
+    if ( pcoinsTip->GetCoins(hash,coins) == 0 )
+            return(0);
+    if ( n < 0 || (unsigned int)n >= coins.vout.size() || coins.vout[n].IsNull() )
+        return(0);
+    BlockMap::iterator it = mapBlockIndex.find(pcoinsTip->GetBestBlock());
+    pindex = it->second;
+    return(coins.vout[n].scriptPubKey.ToString().c_str());
+}
+
 Value verifychain(const Array& params, bool fHelp)
 {
     if (fHelp || params.size() > 2)