jl777 8 years ago
parent
commit
349a7de477
  1. 4
      iguana/dpow/dpow_fsm.c
  2. 4
      iguana/dpow/dpow_network.c

4
iguana/dpow/dpow_fsm.c

@ -436,11 +436,11 @@ uint32_t dpow_statemachineiterate(struct supernet_info *myinfo,struct dpow_info
int32_t dpow_checkutxo(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_block *bp,struct iguana_info *coin,bits256 *txidp,int32_t *voutp,char *coinaddr) int32_t dpow_checkutxo(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_block *bp,struct iguana_info *coin,bits256 *txidp,int32_t *voutp,char *coinaddr)
{ {
int32_t haveutxo,completed; bits256 signedtxid; cJSON *addresses; char *rawtx,*sendtx; int32_t haveutxo,completed; bits256 signedtxid; cJSON *addresses; char *rawtx,*sendtx;
if ( (haveutxo= dpow_haveutxo(myinfo,coin,txidp,voutp,coinaddr)) <= 10 && time(NULL) > dp->lastsplit+bp->duration ) if ( (haveutxo= dpow_haveutxo(myinfo,coin,txidp,voutp,coinaddr)) <= 25 && time(NULL) > dp->lastsplit+bp->duration )
{ {
addresses = cJSON_CreateArray(); addresses = cJSON_CreateArray();
jaddistr(addresses,coinaddr); jaddistr(addresses,coinaddr);
if ( (rawtx= iguana_utxoduplicates(myinfo,coin,dp->minerkey33,DPOW_UTXOSIZE,strcmp(coin->symbol,"BTC") == 0 ? 50 : 10,&completed,&signedtxid,0,addresses)) != 0 ) if ( (rawtx= iguana_utxoduplicates(myinfo,coin,dp->minerkey33,DPOW_UTXOSIZE,strcmp(coin->symbol,"BTC") == 0 ? 50 : 50,&completed,&signedtxid,0,addresses)) != 0 )
{ {
if ( (sendtx= dpow_sendrawtransaction(myinfo,coin,rawtx)) != 0 ) if ( (sendtx= dpow_sendrawtransaction(myinfo,coin,rawtx)) != 0 )
{ {

4
iguana/dpow/dpow_network.c

@ -163,7 +163,7 @@ void dpow_ipbitsadd(struct supernet_info *myinfo,uint32_t *ipbits,int32_t numipb
missing++; missing++;
} }
//printf("recv numipbits.%d numdpowipbits.%d matched.%d missing.%d\n",numipbits,n,matched,missing); //printf("recv numipbits.%d numdpowipbits.%d matched.%d missing.%d\n",numipbits,n,matched,missing);
if ( (numipbits == 1 || missing < matched) && missing > 0 ) if ( (numipbits == 1 || missing < matched || matched > (myinfo->numipbits>>1)) && missing > 0 )
{ {
for (i=0; i<numipbits; i++) for (i=0; i<numipbits; i++)
if ( ipbits[i] != 0 ) if ( ipbits[i] != 0 )
@ -204,7 +204,7 @@ void dpow_nanomsg_update(struct supernet_info *myinfo)
else if ( dpow_datahandler(myinfo,dp,np->channel,np->height,np->packet,np->datalen) >= 0 ) else if ( dpow_datahandler(myinfo,dp,np->channel,np->height,np->packet,np->datalen) >= 0 )
dp->crcs[firstz] = crc32; dp->crcs[firstz] = crc32;
} }
} else printf("np->datalen.%d %d (size %d - %ld)\n",np->datalen,(int32_t)(size-sizeof(*np)),size,sizeof(*np)); } else printf("ignore np->datalen.%d %d (size %d - %ld)\n",np->datalen,(int32_t)(size-sizeof(*np)),size,sizeof(*np));
} }
if ( np != 0 ) if ( np != 0 )
nn_freemsg(np); nn_freemsg(np);

Loading…
Cancel
Save