jl777 8 years ago
parent
commit
5119d14dd0
  1. 2
      iguana/dpow/dpow_fsm.c
  2. 3
      iguana/dpow/dpow_network.c
  3. 8
      iguana/dpow/dpow_tx.c

2
iguana/dpow/dpow_fsm.c

@ -643,7 +643,7 @@ void dpow_statemachinestart(void *ptr)
//printf("done utxosync start.%u %u\n",starttime,(uint32_t)time(NULL)); //printf("done utxosync start.%u %u\n",starttime,(uint32_t)time(NULL));
while ( time(NULL) < starttime+bp->duration && src != 0 && dest != 0 && bp->state != 0xffffffff ) while ( time(NULL) < starttime+bp->duration && src != 0 && dest != 0 && bp->state != 0xffffffff )
{ {
sleep(3); sleep(1);
if ( dp->checkpoint.blockhash.height > checkpoint.blockhash.height ) if ( dp->checkpoint.blockhash.height > checkpoint.blockhash.height )
{ {
if ( bp->isratify == 0 ) if ( bp->isratify == 0 )

3
iguana/dpow/dpow_network.c

@ -290,7 +290,8 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
} }
} }
} }
printf("ips.%d NOTARIZE.%d matches.%d bestmatches.%d bestk.%d %llx recv.%llx sigmasks.(%llx %llx) senderind.%d\n",dp->numipbits,bp->minsigs,matches,bestmatches,bp->bestk,(long long)bp->bestmask,(long long)bp->recvmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),(long long)(bp->bestk>=0?bp->srcsigsmasks[bp->bestk]:0),senderind); if ( (rand() % 100) == 0 )
printf("ips.%d NOTARIZE.%d matches.%d bestmatches.%d bestk.%d %llx recv.%llx sigmasks.(%llx %llx) senderind.%d\n",dp->numipbits,bp->minsigs,matches,bestmatches,bp->bestk,(long long)bp->bestmask,(long long)bp->recvmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),(long long)(bp->bestk>=0?bp->srcsigsmasks[bp->bestk]:0),senderind);
} }
} }

8
iguana/dpow/dpow_tx.c

@ -255,7 +255,10 @@ bits256 dpow_notarytx(char *signedtx,int32_t *numsigsp,int32_t isPoS,struct dpow
ep = &bp->notaries[k]; ep = &bp->notaries[k];
cp = (src_or_dest != 0) ? &bp->notaries[k].dest : &bp->notaries[k].src; cp = (src_or_dest != 0) ? &bp->notaries[k].dest : &bp->notaries[k].src;
if ( bits256_nonz(cp->prev_hash) == 0 ) if ( bits256_nonz(cp->prev_hash) == 0 )
return(cp->prev_hash); {
printf("null prevhash k.%d j.%d src_or_dest.%d\n",k,j,src_or_dest);
return(zero);
}
len += iguana_rwbignum(1,&serialized[len],sizeof(cp->prev_hash),cp->prev_hash.bytes); len += iguana_rwbignum(1,&serialized[len],sizeof(cp->prev_hash),cp->prev_hash.bytes);
len += iguana_rwnum(1,&serialized[len],sizeof(cp->prev_vout),&cp->prev_vout); len += iguana_rwnum(1,&serialized[len],sizeof(cp->prev_vout),&cp->prev_vout);
siglen = cp->siglens[bestk]; siglen = cp->siglens[bestk];
@ -287,7 +290,10 @@ bits256 dpow_notarytx(char *signedtx,int32_t *numsigsp,int32_t isPoS,struct dpow
else else
{ {
if ( (n= dpow_voutstandard(bp,&serialized[len],m,src_or_dest)) < 0 ) if ( (n= dpow_voutstandard(bp,&serialized[len],m,src_or_dest)) < 0 )
{
printf("error dpow_voutstandard\n");
return(zero); return(zero);
}
len += n; len += n;
} }
init_hexbytes_noT(signedtx,serialized,len); init_hexbytes_noT(signedtx,serialized,len);

Loading…
Cancel
Save