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-26 12:48:34 -03:00
parent 1bf821543e
commit bfa5b4f217
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/komodo.h
View File

@@ -202,7 +202,7 @@ void komodo_stateupdate(int32_t height,uint8_t notarypubs[][33],uint8_t numnotar
//#ifdef KOMODO_PAX //#ifdef KOMODO_PAX
else if ( pvals != 0 && numpvals > 0 ) else if ( pvals != 0 && numpvals > 0 )
{ {
int32_t nonz = 0; int32_t i,nonz = 0;
for (i=0; i<32; i++) for (i=0; i<32; i++)
if ( pvals[i] != 0 ) if ( pvals[i] != 0 )
nonz++; nonz++;
@@ -354,6 +354,7 @@ void komodo_connectblock(CBlockIndex *pindex,CBlock& block)
#else #else
memcpy(scriptbuf,(uint8_t *)&block.vtx[i].vout[j].scriptPubKey[0],len); memcpy(scriptbuf,(uint8_t *)&block.vtx[i].vout[j].scriptPubKey[0],len);
#endif #endif
// signedmask is needed here!
notaryid = komodo_voutupdate(notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,&notarizedheight,(uint64_t)block.vtx[i].vout[j].nValue); notaryid = komodo_voutupdate(notaryid,scriptbuf,len,height,txhash,i,j,&voutmask,&specialtx,&notarizedheight,(uint64_t)block.vtx[i].vout[j].nValue);
if ( 0 && i > 0 ) if ( 0 && i > 0 )
{ {

10
src/komodo_gateway.h
View File

@@ -43,14 +43,14 @@ const char *komodo_opreturn(int32_t height,uint64_t value,uint8_t *opretbuf,int3
return(typestr); return(typestr);
} }
void komodo_gateway_voutupdate(char *symbol,int32_t height,int32_t txi,int32_t vout,int32_t numvouts,uint64_t value,uint8_t *script,int32_t len) void komodo_gateway_voutupdate(char *symbol,int32_t isspecial,int32_t height,int32_t txi,int32_t vout,int32_t numvouts,uint64_t value,uint8_t *script,int32_t len)
{ {
int32_t i,opretlen,offset = 0; uint256 zero; const char *typestr; int32_t i,opretlen,offset = 0; uint256 zero; const char *typestr;
typestr = "unknown"; typestr = "unknown";
if ( script[offset++] == 0x6a ) if ( script[offset++] == 0x6a )
{ {
offset += komodo_scriptitemlen(&opretlen,&script[offset]); offset += komodo_scriptitemlen(&opretlen,&script[offset]);
if ( len >= offset+32*2+4 && strcmp((char *)&script[offset+32*2+4],"KMD") == 0 ) if ( isspecial != 0 && len >= offset+32*2+4 && strcmp((char *)&script[offset+32*2+4],"KMD") == 0 )
typestr = "notarized"; typestr = "notarized";
else if ( script[offset] == 'P' ) else if ( script[offset] == 'P' )
{ {
@@ -58,7 +58,7 @@ void komodo_gateway_voutupdate(char *symbol,int32_t height,int32_t txi,int32_t v
komodo_paxpricefeed(height,&script[++offset],opretlen); komodo_paxpricefeed(height,&script[++offset],opretlen);
printf("height.%d pricefeed len.%d\n",height,opretlen); printf("height.%d pricefeed len.%d\n",height,opretlen);
} }
else else if ( isspecial != 0 )
{ {
komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,value,&script[offset],opretlen); komodo_stateupdate(0,0,0,0,zero,0,0,0,0,0,value,&script[offset],opretlen);
for (i=0; i<len; i++) for (i=0; i<len; i++)
@@ -95,10 +95,10 @@ int32_t komodo_gateway_tx(char *symbol,int32_t height,int32_t txi,char *txidstr,
printf("ht.%d txi.%d vout.%d/%d %s script (%d %d)\n",height,txi,vout,n,hexstr,memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66),memcmp(&hexstr[6],CRYPTO777_RMD160STR,40)); printf("ht.%d txi.%d vout.%d/%d %s script (%d %d)\n",height,txi,vout,n,hexstr,memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66),memcmp(&hexstr[6],CRYPTO777_RMD160STR,40));
if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) ) if ( vout == 0 && ((memcmp(&hexstr[2],CRYPTO777_PUBSECPSTR,66) == 0 && len == 35) || (memcmp(&hexstr[6],CRYPTO777_RMD160STR,40) == 0 && len == 25)) )
isspecial = 1; isspecial = 1;
else if ( isspecial != 0 && len <= sizeof(script) ) else if ( len <= sizeof(script) )
{ {
decode_hex(script,len,hexstr); decode_hex(script,len,hexstr);
komodo_gateway_voutupdate(symbol,height,txi,vout,n,value,script,len); komodo_gateway_voutupdate(symbol,isspecial,height,txi,vout,n,value,script,len);
} }
} }
} }