From 198481557bf9a6a6a9301a298ff5887b7448d7ae Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 13 Apr 2018 21:13:56 +0300
Subject: [PATCH] Test

---
 src/komodo_bitcoind.h | 16 ++++++++--------
 src/main.cpp          |  6 +++---
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h
index 923243aa6..86989799d 100644
--- a/src/komodo_bitcoind.h
+++ b/src/komodo_bitcoind.h
@@ -659,21 +659,21 @@ int32_t komodo_block2height(CBlock *block)
     return(height);
 }
 
-void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block)
+void komodo_block2pubkey33(uint8_t *pubkey33,CBlock *block)
 {
     int32_t n;
     if ( KOMODO_LOADINGBLOCKS == 0 )
         memset(pubkey33,0xff,33);
     else memset(pubkey33,0,33);
-    if ( block.vtx[0].vout.size() > 0 )
+    if ( block->vtx[0].vout.size() > 0 )
     {
 #ifdef KOMODO_ZCASH
-        uint8_t *ptr = (uint8_t *)block.vtx[0].vout[0].scriptPubKey.data();
+        uint8_t *ptr = (uint8_t *)block->vtx[0].vout[0].scriptPubKey.data();
 #else
-        uint8_t *ptr = (uint8_t *)&block.vtx[0].vout[0].scriptPubKey[0];
+        uint8_t *ptr = (uint8_t *)&block->vtx[0].vout[0].scriptPubKey[0];
 #endif
         //komodo_init(0);
-        n = block.vtx[0].vout[0].scriptPubKey.size();
+        n = block->vtx[0].vout[0].scriptPubKey.size();
         if ( n == 35 )
             memcpy(pubkey33,ptr+1,33);
     }
@@ -738,7 +738,7 @@ void komodo_pindex_init(CBlockIndex *pindex,int32_t height)
         else memset(pindex->pubkey33,0,33);
         if ( komodo_blockload(block,pindex) == 0 )
         {
-            komodo_block2pubkey33(pindex->pubkey33,block);
+            komodo_block2pubkey33(pindex->pubkey33,&block);
             //for (i=0; i<33; i++)
             //    fprintf(stderr,"%02x",pindex->pubkey33[i]);
             //fprintf(stderr," set pubkey at height %d/%d\n",pindex->nHeight,height);
@@ -773,7 +773,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
     {
         if ( komodo_blockload(block,pindex) == 0 )
         {
-            komodo_block2pubkey33(pindex->pubkey33,block);
+            komodo_block2pubkey33(pindex->pubkey33,&block);
             return;
         }
         if ( pindex->didinit != 0 )
@@ -825,7 +825,7 @@ int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *non
                 memset(pindex->pubkey33,0,33);
                 pindex->didinit = 0;
                 if ( komodo_blockload(block,pindex) == 0 )
-                    komodo_block2pubkey33(pindex->pubkey33,block);
+                    komodo_block2pubkey33(pindex->pubkey33,&block);
             }
             if ( pindex->notaryid >= 0 && pindex->didinit != 0 )
             {
diff --git a/src/main.cpp b/src/main.cpp
index c721790b3..cf854dbf1 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -54,7 +54,7 @@ using namespace std;
 CCriticalSection cs_main;
 extern uint8_t NOTARY_PUBKEY33[33];
 extern int32_t KOMODO_LOADINGBLOCKS;
-void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block);
+void komodo_block2pubkey33(uint8_t *pubkey33,CBlock *block);
 
 BlockMap mapBlockIndex;
 CChain chainActive;
@@ -1611,7 +1611,7 @@ bool ReadBlockFromDisk(int32_t height,CBlock& block, const CDiskBlockPos& pos)
         return error("%s: Deserialize or I/O error - %s at %s", __func__, e.what(), pos.ToString());
     }
     // Check the header
-    komodo_block2pubkey33(pubkey33,(CBlock)block);
+    komodo_block2pubkey33(pubkey33,(CBlock *)&block);
     if (!(CheckEquihashSolution(&block, Params()) && CheckProofOfWork(height,pubkey33,block.GetHash(), block.nBits, Params().GetConsensus())))
     {
         int32_t i; for (i=0; i<33; i++)
@@ -3529,7 +3529,7 @@ bool CheckBlock(int32_t height,CBlockIndex *pindex,const CBlock& block, CValidat
     if (!CheckBlockHeader(height,pindex,block,state,fCheckPOW))
         return false;
     //komodo_index2pubkey33(pubkey33,pindex,height);
-    komodo_block2pubkey33(pubkey33,(CBlock)block);
+    komodo_block2pubkey33(pubkey33,(CBlock *)&block);
     if ( fCheckPOW && !CheckProofOfWork(height,pubkey33,block.GetHash(), block.nBits, Params().GetConsensus()) )
         return state.DoS(50, error("CheckBlock(): proof of work failed"),REJECT_INVALID, "high-hash");