diff --git a/src/komodo.h b/src/komodo.h index d866b24cd..4e679d37a 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -282,7 +282,11 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) len = block.vtx[i].vout[j].scriptPubKey.size(); if ( len <= sizeof(scriptbuf) ) { +#ifdef KOMODO_ZCASH memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); +#else + memcpy(scriptbuf,(uint8_t *)&block.vtx[i].vout[j].scriptPubKey[0],len); +#endif notaryid = komodo_voutupdate(notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,¬arizedheight); if ( 0 && i > 0 ) { @@ -318,7 +322,11 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) len = block.vtx[i].vout[j].scriptPubKey.size(); if ( len <= sizeof(scriptbuf) ) { +#ifdef KOMODO_ZCASH memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); +#else + memcpy(scriptbuf,(uint8_t *)&block.vtx[i].vout[j].scriptPubKey[0],len); +#endif if ( len == 35 && scriptbuf[0] == 33 && scriptbuf[34] == 0xac ) { memcpy(pubkeys[numvalid++],scriptbuf+1,33); diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index 804c6333b..9fa0db9f8 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -130,8 +130,13 @@ void komodo_disconnect(CBlockIndex *pindex,CBlock& block) int32_t komodo_block2height(CBlock *block) { - int32_t i,n,height = 0; uint8_t *ptr = (uint8_t *)block->vtx[0].vin[0].scriptSig.data(); + int32_t i,n,height = 0; uint8_t *ptr; komodo_init(); +#ifdef KOMODO_ZCASH + ptr = (uint8_t *)block->vtx[0].vin[0].scriptSig.data(); +#else + ptr = (uint8_t *)&block->vtx[0].vin[0].scriptSig[0]; +#endif if ( block->vtx[0].vin[0].scriptSig.size() > 5 ) { //for (i=0; i<6; i++)