From 57a509931b5ec5a62e98fcd5f56e5807aef97cf1 Mon Sep 17 00:00:00 2001 From: Duke Leto Date: Tue, 5 Jun 2018 07:41:23 +0000 Subject: [PATCH] Fix more compile errors --- src/komodo_validation015.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/komodo_validation015.h b/src/komodo_validation015.h index 1b3e9e939..32235a0f1 100644 --- a/src/komodo_validation015.h +++ b/src/komodo_validation015.h @@ -81,7 +81,7 @@ void ImportAddress(CWallet*, const CTxDestination& dest, const std::string& strL int32_t gettxout_scriptPubKey(int32_t height,uint8_t *scriptPubKey,int32_t maxsize,uint256 txid,int32_t n) { - static uint256 zero; int32_t i,m; uint8_t *ptr; CTransactionRef tx = MakeTransactionRef(); uint256 hashBlock; + static uint256 zero; int32_t i,m; uint8_t *ptr; CTransactionRef tx=0; uint256 hashBlock; LOCK(cs_main); if ( KOMODO_TXINDEX != 0 ) { @@ -1181,15 +1181,15 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) for (i=0; iGetHash(); - numvouts = block.vtx[i]->vout.size(); + numvouts = block.vtx[i].vout.size(); specialtx = notarizedheight = notarized = 0; signedmask = 0; - numvins = block.vtx[i]->vin.size(); + numvins = block.vtx[i].vin.size(); for (j=0; jvin[j].prevout.hash != zero && (scriptlen= gettxout_scriptPubKey(height,scriptPubKey,sizeof(scriptPubKey),block.vtx[i]->vin[j].prevout.hash,block.vtx[i]->vin[j].prevout.n)) == 35 ) + if ( block.vtx[i].vin[j].prevout.hash != zero && (scriptlen= gettxout_scriptPubKey(height,scriptPubKey,sizeof(scriptPubKey),block.vtx[i].vin[j].prevout.hash,block.vtx[i].vin[j].prevout.n)) == 35 ) { for (k=0; kvout[j].nValue)); - len = block.vtx[i]->vout[j].scriptPubKey.size(); + len = block.vtx[i].vout[j].scriptPubKey.size(); if ( len >= (int32_t)sizeof(uint32_t) && len <= (int32_t)sizeof(scriptbuf) ) { - memcpy(scriptbuf,block.vtx[i]->vout[j].scriptPubKey.data(),len); - komodo_voutupdate(i,j,scriptbuf,len,height,&specialtx,¬arizedheight,(uint64_t)block.vtx[i]->vout[j].nValue,notarized,signedmask); + memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); + komodo_voutupdate(i,j,scriptbuf,len,height,&specialtx,¬arizedheight,(uint64_t)block.vtx[i].vout[j].nValue,notarized,signedmask); } } //if ( NOTARY_PUBKEY33[0] != 0 )