jl777 8 years ago
parent
commit
aad9fd1f1e
  1. 8
      iguana/dpow/dpow_fsm.c
  2. 2
      iguana/dpow/dpow_network.c

8
iguana/dpow/dpow_fsm.c

@ -129,14 +129,14 @@ int32_t dpow_datahandler(struct supernet_info *myinfo,struct dpow_info *dp,uint3
bestk = data[rlen++]; bestk = data[rlen++];
n = data[rlen++]; n = data[rlen++];
rlen += iguana_rwbignum(0,&data[rlen],sizeof(hashmsg),hashmsg.bytes); rlen += iguana_rwbignum(0,&data[rlen],sizeof(hashmsg),hashmsg.bytes);
printf("got ENTRIES bestk.%d numnotaries.%d\n",bestk,n); //printf("got ENTRIES bestk.%d numnotaries.%d\n",bestk,n);
if ( bits256_cmp(hashmsg,bp->hashmsg) == 0 ) if ( bits256_cmp(hashmsg,bp->hashmsg) == 0 )
{ {
memset(notaries,0,sizeof(notaries)); memset(notaries,0,sizeof(notaries));
for (i=0; i<64; i++) for (i=0; i<64; i++)
notaries[i].bestk = -1; notaries[i].bestk = -1;
rlen += dpow_rwcoinentrys(0,&data[rlen],notaries,n,bestk); rlen += dpow_rwcoinentrys(0,&data[rlen],notaries,n,bestk);
printf("matched hashmsg rlen.%d vs datalen.%d\n",rlen,datalen); //printf("matched hashmsg rlen.%d vs datalen.%d\n",rlen,datalen);
for (i=0; i<n; i++) for (i=0; i<n; i++)
{ {
for (iter=0; iter<2; iter++) for (iter=0; iter<2; iter++)
@ -147,7 +147,7 @@ int32_t dpow_datahandler(struct supernet_info *myinfo,struct dpow_info *dp,uint3
{ {
if ( bits256_nonz(refptr->prev_hash) == 0 ) if ( bits256_nonz(refptr->prev_hash) == 0 )
{ {
printf(">>>>>>>>> got utxo.[%d] indirectly <<<<<<<<<<<\n",i); printf(">>>>>>>>> %s got utxo.[%d] indirectly <<<<<<<<<<<\n",iter!=0?"dest":"src",i);
refptr->prev_hash = ptr->prev_hash; refptr->prev_hash = ptr->prev_hash;
refptr->prev_vout = ptr->prev_vout; refptr->prev_vout = ptr->prev_vout;
if ( iter == 1 && bits256_nonz(notaries[i].src.prev_hash) != 0 ) if ( iter == 1 && bits256_nonz(notaries[i].src.prev_hash) != 0 )
@ -158,7 +158,7 @@ int32_t dpow_datahandler(struct supernet_info *myinfo,struct dpow_info *dp,uint3
{ {
if ( ptr->siglens[bestk] > 0 && refptr->siglens[bestk] == 0 ) if ( ptr->siglens[bestk] > 0 && refptr->siglens[bestk] == 0 )
{ {
printf(">>>>>>>>>> got siglen.%d for [%d] indirectly <<<<<<<<<<\n",ptr->siglens[bestk],i); printf(">>>>>>>>>> got %s siglen.%d for [%d] indirectly <<<<<<<<<<\n",iter!=0?"dest":"src",ptr->siglens[bestk],i);
memcpy(refptr->sigs[bestk],ptr->sigs[bestk],ptr->siglens[bestk]); memcpy(refptr->sigs[bestk],ptr->sigs[bestk],ptr->siglens[bestk]);
refptr->siglens[bestk] = ptr->siglens[bestk]; refptr->siglens[bestk] = ptr->siglens[bestk];
if ( iter != 0 ) if ( iter != 0 )

2
iguana/dpow/dpow_network.c

@ -348,7 +348,7 @@ void dpow_sigsend(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_
{ {
struct dpow_sigentry dsig; int32_t i,len; uint8_t data[4096]; struct dpow_entry *ep; struct dpow_sigentry dsig; int32_t i,len; uint8_t data[4096]; struct dpow_entry *ep;
ep = &bp->notaries[myind]; ep = &bp->notaries[myind];
printf("ht.%d sigsend.%s: myind.%d bestk.%d %llx >>>>>> broadcast channel.%x\n",bp->height,sigchannel == DPOW_SIGCHANNEL ? bp->srccoin->symbol : bp->destcoin->symbol,myind,bestk,(long long)bestmask,sigchannel); //printf("ht.%d sigsend.%s: myind.%d bestk.%d %llx >>>>>> broadcast channel.%x\n",bp->height,sigchannel == DPOW_SIGCHANNEL ? bp->srccoin->symbol : bp->destcoin->symbol,myind,bestk,(long long)bestmask,sigchannel);
memset(&dsig,0,sizeof(dsig)); memset(&dsig,0,sizeof(dsig));
for (i=0; i<33; i++) for (i=0; i<33; i++)
dsig.senderpub[i] = dp->minerkey33[i]; dsig.senderpub[i] = dp->minerkey33[i];

Loading…
Cancel
Save