This commit is contained in:
jl777
2016-10-25 12:44:59 -03:00
parent ba8f30436f
commit 7637aa7fb7
3 changed files with 12 additions and 3 deletions

View File

@@ -107,7 +107,11 @@ uint32_t komodo_txtime(uint256 hash)
{ {
CTransaction tx; CTransaction tx;
uint256 hashBlock; uint256 hashBlock;
if (!GetTransaction(hash, tx, hashBlock, true)) if (!GetTransaction(hash, tx,
#ifndef KOMODO_ZCASH
Params().GetConsensus(),
#endif
hashBlock, true))
{ {
//printf("null GetTransaction\n"); //printf("null GetTransaction\n");
return(tx.nLockTime); return(tx.nLockTime);
@@ -158,7 +162,11 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height)
memset(pubkey33,0,33); memset(pubkey33,0,33);
if ( pindex != 0 ) 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); komodo_block2pubkey33(pubkey33,block);
} }

View File

@@ -736,7 +736,7 @@ int32_t bitcoin_addr2rmd160(uint8_t *addrtypep,uint8_t rmd160[20],char *coinaddr
} }
for (i=0; i<len; i++) for (i=0; i<len; i++)
printf("%02x ",buf[i]); printf("%02x ",buf[i]);
char str[65]; printf("\nhex checkhash.(%s) len.%d mismatch %02x %02x %02x %02x vs %02x %02x %02x %02x\n",coinaddr,len,buf[len-1]&0xff,buf[len-2]&0xff,buf[len-3]&0xff,buf[len-4]&0xff,hash.bytes[31],hash.bytes[30],hash.bytes[29],hash.bytes[28]); printf("\nhex checkhash.(%s) len.%d mismatch %02x %02x %02x %02x vs %02x %02x %02x %02x\n",coinaddr,len,buf[len-1]&0xff,buf[len-2]&0xff,buf[len-3]&0xff,buf[len-4]&0xff,hash.bytes[31],hash.bytes[30],hash.bytes[29],hash.bytes[28]);
} }
} }
return(0); return(0);

View File

@@ -556,6 +556,7 @@ uint8_t NOTARY_PUBKEY33[33];
//#define KOMODO_ENABLE_INTEREST enabling this is a hardfork //#define KOMODO_ENABLE_INTEREST enabling this is a hardfork
#define KOMODO_SOURCE "KMD" #define KOMODO_SOURCE "KMD"
#define KOMODO_PAX #define KOMODO_PAX
#define KOMODO_ZCASH
#include "komodo.h" #include "komodo.h"
////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////