From 7637aa7fb7fd7e7f38181a55260f39ef8562aceb Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 25 Oct 2016 12:44:59 -0300 Subject: [PATCH] test --- src/komodo_bitcoind.h | 12 ++++++++++-- src/komodo_utils.h | 2 +- src/main.cpp | 1 + 3 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 517d0d706..ed12a175d 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -107,7 +107,11 @@ uint32_t komodo_txtime(uint256 hash) { CTransaction tx; uint256 hashBlock; - if (!GetTransaction(hash, tx, hashBlock, true)) + if (!GetTransaction(hash, tx, +#ifndef KOMODO_ZCASH + Params().GetConsensus(), +#endif + hashBlock, true)) { //printf("null GetTransaction\n"); return(tx.nLockTime); @@ -158,7 +162,11 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) memset(pubkey33,0,33); if ( pindex != 0 ) { - if ( ReadBlockFromDisk(block,(const CBlockIndex *)pindex) != 0 ) + if ( ReadBlockFromDisk(block,(const CBlockIndex *)pindex, +#ifndef KOMODO_ZCASH + Params().GetConsensus(), +#endif + ) != 0 ) { komodo_block2pubkey33(pubkey33,block); } diff --git a/src/komodo_utils.h b/src/komodo_utils.h index ad935a691..7d540f746 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -736,7 +736,7 @@ int32_t bitcoin_addr2rmd160(uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr } for (i=0; i