jl777 8 years ago
parent
commit
d37f7ea3b0
  1. 6
      basilisk/basilisk_MSG.c
  2. 7
      iguana/iguana_notary.c

6
basilisk/basilisk_MSG.c

@ -104,9 +104,9 @@ char *basilisk_iterate_MSG(struct supernet_info *myinfo,uint32_t channel,uint32_
keylen = basilisk_messagekey(key,channel,msgid,srchash,desthash);
if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
jaddi(array,item);//, printf("gotmsg0.(%s)\n",jprint(item,0));
keylen = basilisk_messagekey(key,channel,msgid,desthash,srchash);
if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
jaddi(array,item);//, printf("gotmsg0.(%s)\n",jprint(item,0));
//keylen = basilisk_messagekey(key,channel,msgid,desthash,srchash);
//if ( (item= _basilisk_respond_getmessage(myinfo,key,keylen)) != 0 )
// jaddi(array,item);//, printf("gotmsg0.(%s)\n",jprint(item,0));
if ( origwidth > 0 )
{
if ( bits256_nonz(srchash) != 0 )

7
iguana/iguana_notary.c

@ -591,7 +591,9 @@ uint32_t dpow_statemachineiterate(struct supernet_info *myinfo,struct dpow_info
{
// todo: add RBF support
bits256 txid,signedtxid; int32_t vout,completed,i,j,k,m,incr,haveutxo = 0; cJSON *addresses; char *sendtx,*rawtx,*retstr,coinaddr[64],str[65],str2[65]; uint8_t data[sizeof(bits256)*2+1]; uint32_t channel; bits256 srchash,desthash; uint64_t mask;
incr = sqrt(numnotaries) + 1;
if ( numnotaries > 8 )
incr = sqrt(numnotaries) + 1;
else incr = 1;
channel = 'd' | ('P' << 8) | ('o' << 16) | ('W' << 24);
bitcoin_address(coinaddr,coin->chain->pubtype,myinfo->DPOW.minerkey33,33);
if ( bits256_nonz(hashmsg) == 0 )
@ -623,7 +625,8 @@ uint32_t dpow_statemachineiterate(struct supernet_info *myinfo,struct dpow_info
case 1: // wait for utxo, send utxo to all other nodes
if ( (haveutxo= dpow_haveutxo(myinfo,coin,&txid,&vout,coinaddr)) != 0 && vout >= 0 && vout < 0x100 )
{
for (i=(myind % incr); i<numnotaries; i+=incr)
i = (myind % incr);
for (; i<numnotaries; i+=incr)
{
for (j=0; j<sizeof(srchash); j++)
{

Loading…
Cancel
Save