DragonX/dragonx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 2 Wiki Activity

test

Browse Source
This commit is contained in:
jl777
2016-10-25 14:32:58 -03:00
parent da00f2ddcb
commit 189d9dee6c
2 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/komodo.h
View File

@@ -282,7 +282,11 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
len = block.vtx[i].vout[j].scriptPubKey.size(); len = block.vtx[i].vout[j].scriptPubKey.size();
if ( len <= sizeof(scriptbuf) ) if ( len <= sizeof(scriptbuf) )
{ {
#ifdef KOMODO_ZCASH
memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); 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,&notarizedheight); notaryid = komodo_voutupdate(notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,&notarizedheight);
if ( 0 && i > 0 ) if ( 0 && i > 0 )
{ {
@@ -318,7 +322,11 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
len = block.vtx[i].vout[j].scriptPubKey.size(); len = block.vtx[i].vout[j].scriptPubKey.size();
if ( len <= sizeof(scriptbuf) ) if ( len <= sizeof(scriptbuf) )
{ {
#ifdef KOMODO_ZCASH
memcpy(scriptbuf,block.vtx[i].vout[j].scriptPubKey.data(),len); 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 ) if ( len == 35 && scriptbuf[0] == 33 && scriptbuf[34] == 0xac )
{ {
memcpy(pubkeys[numvalid++],scriptbuf+1,33); memcpy(pubkeys[numvalid++],scriptbuf+1,33);

7
src/komodo_bitcoind.h
View File

@@ -130,8 +130,13 @@ void komodo_disconnect(CBlockIndex *pindex,CBlock& block)
int32_t komodo_block2height(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(); 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 ) if ( block->vtx[0].vin[0].scriptSig.size() > 5 )
{ {
//for (i=0; i<6; i++) //for (i=0; i<6; i++)