From 287a665404d31f672fdd1469b405b03951d17012 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Sun, 25 Mar 2018 22:48:54 +0300
Subject: [PATCH] Test

---
 src/komodo_bitcoind.h | 4 ++--
 src/main.cpp          | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index b082fe919..6109b09b0 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -621,13 +621,13 @@ int32_t komodo_block2height(CBlock *block)
             //for (i=0; i<6; i++)
             //    printf("%02x",ptr[i]);
             n = ptr[0];
-            for (i=n-4-1; i<n; i++)
+            for (i=0; i<n; i++)
             {
                 //03bb81000101(bb 187) (81 48001) (00 12288256)  <- coinbase.6 ht.12288256
                 height += ((uint32_t)ptr[i+1] << (i*8));
                 //printf("(%02x %x %d) ",ptr[i+1],((uint32_t)ptr[i+1] << (i*8)),height);
             }
-            //printf(" <- coinbase.%d ht.%d\n",(int32_t)block->vtx[0].vin[0].scriptSig.size(),height);
+            printf(" <- coinbase.%d ht.%d\n",(int32_t)block->vtx[0].vin[0].scriptSig.size(),height);
         }
         //komodo_init(height);
     }
diff --git a/src/main.cpp b/src/main.cpp
index 6e85b208a..0cd831b5b 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -3539,7 +3539,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
     // Check transactions
     BOOST_FOREACH(const CTransaction& tx, block.vtx)
     {
-        if ( komodo_validate_interest(tx,komodo_block2height((CBlock *)&block),block.nTime,1) < 0 )
+        if ( komodo_validate_interest(tx,height == 0 ? komodo_block2height((CBlock *)&block) : height,block.nTime,1) < 0 )
              return error("CheckBlock: komodo_validate_interest failed");
         if (!CheckTransaction(tx, state, verifier))
             return error("CheckBlock(): CheckTransaction failed");