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

---
 src/coins.cpp | 7 +++++++
 src/coins.h   | 1 +
 src/main.cpp  | 9 ++-------
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/coins.cpp b/src/coins.cpp
index d60269962..c2ff8ecb4 100644
--- a/src/coins.cpp
+++ b/src/coins.cpp
@@ -376,6 +376,13 @@ const CTxOut &CCoinsViewCache::GetOutputFor(const CTxIn& input) const
     return coins->vout[input.prevout.n];
 }
 
+const CScript &CCoinsViewCache::GetSpendFor(const CTxIn& input) const
+{
+    const CCoins* coins = AccessCoins(input.prevout.hash);
+    assert(coins && coins->IsAvailable(input.prevout.n));
+    return coins->vout[input.prevout.n].scriptPubKey;
+}
+
 CAmount CCoinsViewCache::GetValueIn(const CTransaction& tx) const
 {
     if (tx.IsCoinBase())
diff --git a/src/coins.h b/src/coins.h
index af78782e5..decad72f0 100644
--- a/src/coins.h
+++ b/src/coins.h
@@ -522,6 +522,7 @@ public:
     double GetPriority(const CTransaction &tx, int nHeight) const;
 
     const CTxOut &GetOutputFor(const CTxIn& input) const;
+    const CTxOut &GetScriptFor(const CTxIn& input) const;
 
     friend class CCoinsModifier;
 
diff --git a/src/main.cpp b/src/main.cpp
index 13fd1b180..823f73745 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -2231,13 +2231,8 @@ bool ConnectBlock(const CBlock& block, CValidationState& state, CBlockIndex* pin
         numvins = block.vtx[i].vin.size();
         for (j=0; j<numvins; j++)
         {
-            const COutPoint &prevout = block.vtx[i].vin[j].prevout;
-            const CCoins *coins = view.AccessCoins(prevout.hash);
-            if ( coins != 0 )
-            {
-                scriptstr = (char *)coins->vout[prevout.n].scriptPubKey.ToString().c_str();
-                printf("ht.%d txi.%d vini.%d of %d: (%s)\n",height,i,j,numvins,scriptstr);
-            }
+            scriptstr = (char *)inputs.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);