From d37f7ea3b01a3a2d015f2bb7157b6cf342a4d322 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 8 Oct 2016 17:44:35 -0300 Subject: [PATCH] test --- basilisk/basilisk_MSG.c | 6 +++--- iguana/iguana_notary.c | 7 +++++-- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/basilisk/basilisk_MSG.c b/basilisk/basilisk_MSG.c index 53924e9cd..df4b71d13 100755 --- a/basilisk/basilisk_MSG.c +++ b/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 ) diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 90e1db749..3b7e6614a 100755 --- a/iguana/iguana_notary.c +++ b/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