jl777 8 years ago
parent
commit
2bbc147d8b
  1. 2
      crypto777/bitcoind_RPC.c
  2. 13
      iguana/dpow/dpow_network.c
  3. 2
      iguana/dpow/dpow_rpc.c

2
crypto777/bitcoind_RPC.c

@ -204,7 +204,7 @@ try_again:
} }
else if ( numretries >= 2 ) else if ( numretries >= 2 )
{ {
printf("Maximum number of retries exceeded!\n"); //printf("Maximum number of retries exceeded!\n");
free(s.ptr); free(s.ptr);
return(0); return(0);
} }

13
iguana/dpow/dpow_network.c

@ -227,8 +227,17 @@ void dpow_ratify_update(struct supernet_info *myinfo,struct dpow_info *dp,struct
bp->pendingratifybestk = bp->ratifybestk; bp->pendingratifybestk = bp->ratifybestk;
bp->pendingratifybestmask = bp->ratifybestmask; bp->pendingratifybestmask = bp->ratifybestmask;
dpow_signedtxgen(myinfo,dp,bp->destcoin,bp,bp->ratifybestk,bp->ratifybestmask,bp->myind,DPOW_SIGBTCCHANNEL,1,1); dpow_signedtxgen(myinfo,dp,bp->destcoin,bp,bp->ratifybestk,bp->ratifybestmask,bp->myind,DPOW_SIGBTCCHANNEL,1,1);
dpow_signedtxgen(myinfo,dp,bp->srccoin,bp,bp->ratifybestk,bp->ratifybestmask,bp->myind,DPOW_SIGCHANNEL,0,1);
} }
if ( bp->ratifysigsmasks[0] == bp->bestmask ) // have all sigs
{
if ( bp->state < 1000 )
dpow_sigscheck(myinfo,dp,bp,bp->myind,1);
if ( bp->ratifysigsmasks[1] == bp->bestmask ) // have all sigs
{
if ( bp->state != 0xffffffff )
dpow_sigscheck(myinfo,dp,bp,bp->myind,0);
} else printf("ratify srcmask.%llx != bestmask.%llx\n",(long long)bp->ratifysigsmasks[0],(long long)bp->bestmask);
} else printf("ratify destmask.%llx != bestmask.%llx\n",(long long)bp->ratifysigsmasks[1],(long long)bp->bestmask);
} }
} }
printf("numips.%d RATIFY.%d matches.%d bestmatches.%d bestk.%d %llx recv.%llx sigmasks.(%llx %llx)\n",dp->numipbits,bp->minsigs,matches,bestmatches,bp->ratifybestk,(long long)bp->ratifybestmask,(long long)bp->ratifyrecvmask,(long long)bp->ratifysigmasks[1],(long long)bp->ratifysigmasks[0]); printf("numips.%d RATIFY.%d matches.%d bestmatches.%d bestk.%d %llx recv.%llx sigmasks.(%llx %llx)\n",dp->numipbits,bp->minsigs,matches,bestmatches,bp->ratifybestk,(long long)bp->ratifybestmask,(long long)bp->ratifyrecvmask,(long long)bp->ratifysigmasks[1],(long long)bp->ratifysigmasks[0]);
@ -283,7 +292,7 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
{ {
if ( bp->pendingbestk != bp->bestk || bp->pendingbestmask != bp->bestmask ) if ( bp->pendingbestk != bp->bestk || bp->pendingbestmask != bp->bestmask )
{ {
printf("new PENDING BESTK (%d %llx) state.%d\n",bp->bestk,(long long)bp->bestmask,bp->state); //printf("new PENDING BESTK (%d %llx) state.%d\n",bp->bestk,(long long)bp->bestmask,bp->state);
bp->pendingbestk = bp->bestk; bp->pendingbestk = bp->bestk;
bp->pendingbestmask = bp->bestmask; bp->pendingbestmask = bp->bestmask;
dpow_signedtxgen(myinfo,dp,bp->destcoin,bp,bp->bestk,bp->bestmask,bp->myind,DPOW_SIGBTCCHANNEL,1,0); dpow_signedtxgen(myinfo,dp,bp->destcoin,bp,bp->bestk,bp->bestmask,bp->myind,DPOW_SIGBTCCHANNEL,1,0);

2
iguana/dpow/dpow_rpc.c

@ -818,7 +818,7 @@ int32_t dpow_issuer_iteration(struct dpow_info *dp,struct iguana_info *coin,int3
} }
else else
{ {
printf("error from %s\n",coin->symbol); //printf("error from %s\n",coin->symbol);
sleep(3); sleep(3);
} }
return(height); return(height);

Loading…
Cancel
Save