From d9e9d8da10cebe40638ee7cbe1efe1557a60f60b Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 25 Oct 2016 12:46:59 -0300 Subject: [PATCH] test --- src/komodo.h | 4 ++-- src/komodo_bitcoind.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo.h b/src/komodo.h index 630051089..dd8da4c8a 100644 --- a/src/komodo.h +++ b/src/komodo.h @@ -282,7 +282,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) len = block.vtx[i].vout[j].scriptPubKey.size(); if ( len <= sizeof(scriptbuf) ) { - memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); + memcpy(scriptbuf,&block.vtx[i].vout[j].scriptPubKey,len); notaryid = komodo_voutupdate(notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,¬arizedheight); if ( 0 && i > 0 ) { @@ -318,7 +318,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block) len = block.vtx[i].vout[j].scriptPubKey.size(); if ( len <= sizeof(scriptbuf) ) { - memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); + memcpy(scriptbuf,&block.vtx[i].vout[j].scriptPubKey,len); 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 ed12a175d..9b659ae8e 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -130,7 +130,7 @@ 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 = (uint8_t *)&block->vtx[0].vin[0].scriptSig; komodo_init(); if ( block->vtx[0].vin[0].scriptSig.size() > 5 ) { @@ -150,7 +150,7 @@ int32_t komodo_block2height(CBlock *block) void komodo_block2pubkey33(uint8_t *pubkey33,CBlock& block) { - uint8_t *ptr = (uint8_t *)block.vtx[0].vout[0].scriptPubKey.data(); + uint8_t *ptr = (uint8_t *)&block.vtx[0].vout[0].scriptPubKey; komodo_init(); memcpy(pubkey33,ptr+1,33); } @@ -164,7 +164,7 @@ void komodo_index2pubkey33(uint8_t *pubkey33,CBlockIndex *pindex,int32_t height) { if ( ReadBlockFromDisk(block,(const CBlockIndex *)pindex, #ifndef KOMODO_ZCASH - Params().GetConsensus(), + Params().GetConsensus() #endif ) != 0 ) {