Browse Source

test

acspeed
jl777 8 years ago
parent
commit
7c3ea2cd74
  1. 3
      iguana/dpow/dpow_rpc.c
  2. 4
      iguana/dpow/dpow_tx.c

3
iguana/dpow/dpow_rpc.c

@ -97,8 +97,9 @@ int32_t dpow_paxpending(uint8_t *hex)
{
if ( (retjson= cJSON_Parse(retstr)) != 0 )
{
if ( (hexstr= jstr(retjson,"withdraws")) != 0 && (n= is_hexstr(hexstr,0)) > 0 )
if ( (hexstr= jstr(retjson,"withdraws")) != 0 && (n= is_hexstr(hexstr,0)) > 1 )
{
n >>= 1;
printf("PAXPENDING.(%s)\n",retstr);
decode_hex(hex,n,hexstr);
}

4
iguana/dpow/dpow_tx.c

@ -165,7 +165,7 @@ struct dpow_block *dpow_heightfind(struct supernet_info *myinfo,struct dpow_info
int32_t dpow_voutstandard(struct dpow_block *bp,uint8_t *serialized,int32_t m,int32_t src_or_dest,uint8_t pubkeys[][33],int32_t numratified)
{
uint32_t locktime=0,numvouts; uint64_t satoshis,satoshisB; int32_t i,n,opretlen,len=0; uint8_t opret[1024],data[4096];
uint32_t locktime=0,numvouts; uint64_t satoshis,satoshisB; int32_t i,n=0,opretlen,len=0; uint8_t opret[1024],data[4096];
numvouts = 2;
if ( pubkeys == 0 || numratified <= 0 )
{
@ -208,7 +208,7 @@ int32_t dpow_voutstandard(struct dpow_block *bp,uint8_t *serialized,int32_t m,in
return(-1);
}
opretlen = dpow_opreturnscript(data,opret,opretlen);
if ( (n= dpow_paxpending(&opret[opretlen])) > 0 )
if ( (src_or_dest == 0 || strcmp(bp->destcoin->symbol,"BTC") != 0) && (n= dpow_paxpending(&opret[opretlen])) > 0 )
{
for (i=0; i<n; i++)
printf("%02x",opret[opretlen+i]);

Loading…
Cancel
Save