From c597fda19dbe10d3515bcfef559008f359f743cb Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 15:54:34 +0200 Subject: [PATCH 01/14] test --- iguana/dpow/dpow_network.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 774d1d5fa..c7f1233e4 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -627,11 +627,11 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } else { - timeout = 3000; + timeout = 2500; nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(repsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); - timeout = 200; + timeout = 500; nn_setsockopt(repsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); maxsize = 1024 * 1024; printf("RCVBUF.%d\n",nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); @@ -645,7 +645,7 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } myinfo->dpowipbits[0] = (uint32_t)calc_ipbits(myinfo->ipaddr); myinfo->numdpowipbits = 1; - timeout = 3000; + timeout = 2500; nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); maxsize = 1024 * 1024; printf("RCVBUF.%d\n",nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); From 0b131d8458978bba615f82087dada079231eea30 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 16:12:52 +0200 Subject: [PATCH 02/14] test --- basilisk/basilisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index c76a94f0e..96bf3724f 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -891,7 +891,7 @@ void basilisks_loop(void *arg) if ( (counter % myinfo->numdpows) != 0 ) iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); } - endmilli = startmilli + 10; + endmilli = startmilli + 500; } else { From ce0bc281ee545de992f3bc6815bd402fadfec3bd Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 16:17:48 +0200 Subject: [PATCH 03/14] test --- iguana/dpow/dpow_network.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index c7f1233e4..4d86a8d22 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1227,7 +1227,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) } if ( dp != 0 && crc32 == np->crc32 ) { - //char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz); + char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz); if ( i == myinfo->numdpows ) printf("received nnpacket for (%s)\n",np->symbol); else @@ -1248,9 +1248,9 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) } //dp->crcs[firstz] = crc32; } - } //else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); - } //else printf("ignore.%d np->datalen.%d %d (size %d - %ld) [%s]\n",np->senderind,np->datalen,(int32_t)(size-sizeof(*np)),size,sizeof(*np),np->symbol); - } //else printf("wrong version from.%d %02x %02x size.%d [%s]\n",np->senderind,np->version0,np->version1,size,np->symbol); + } else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); + } else printf("ignore.%d np->datalen.%d %d (size %d - %ld) [%s]\n",np->senderind,np->datalen,(int32_t)(size-sizeof(*np)),size,sizeof(*np),np->symbol); + } else printf("wrong version from.%d %02x %02x size.%d [%s]\n",np->senderind,np->version0,np->version1,size,np->symbol); } else printf("illegal size.%d\n",size); if ( np != 0 ) nn_freemsg(np), np = 0; From bc768406168b2534edcaca6ce00c342e60c3bde1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 16:20:18 +0200 Subject: [PATCH 04/14] test --- iguana/iguana_rpc.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/iguana/iguana_rpc.c b/iguana/iguana_rpc.c index b3d7cb8f1..70c072490 100755 --- a/iguana/iguana_rpc.c +++ b/iguana/iguana_rpc.c @@ -868,9 +868,11 @@ char *SuperNET_rpcparse(struct supernet_info *myinfo,char *retbuf,int32_t bufsiz originstr = &urlstr[i + strlen(fieldstr)]; if ( strncmp(originstr,"http://127.0.0.",strlen("http://127.0.0.")) == 0 ) originstr = "http://127.0.0.1:"; - if ( strncmp(originstr,"file://127.0.0.",strlen("file://127.0.0.")) == 0 ) + else if ( strncmp(originstr,"file://127.0.0.",strlen("file://127.0.0.")) == 0 ) originstr = "http://127.0.0.1:"; - if ( strncmp("null",originstr,strlen("null")) != 0 && strncmp("http://localhost:",originstr,strlen("http://localhost:")) != 0 && strncmp("http://127.0.0.1:",originstr,strlen("http://127.0.0.1:")) != 0 && strncmp("http://easydex.supernet.org",originstr,strlen("http://easydex.supernet.org")) != 0 ) + else if ( strncmp(originstr,"chrome-extension://",strlen("chrome-extension://")) == 0 ) + originstr = "http://127.0.0.1:"; + else if ( strncmp("null",originstr,strlen("null")) != 0 && strncmp("http://localhost:",originstr,strlen("http://localhost:")) != 0 && strncmp("http://127.0.0.1:",originstr,strlen("http://127.0.0.1:")) != 0 && strncmp("http://easydex.supernet.org",originstr,strlen("http://easydex.supernet.org")) != 0 ) { printf("remote %s REJECT.(%s)\n",fieldstr,urlstr); return(clonestr("{\"error\":\"remote origin not enabled\"}")); From ff3e546e7f4946261bb4eeb652bdf0ac6d7fa34b Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 16:22:53 +0200 Subject: [PATCH 05/14] test --- iguana/dpow/dpow_network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 4d86a8d22..f62951dd3 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1227,7 +1227,6 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) } if ( dp != 0 && crc32 == np->crc32 ) { - char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz); if ( i == myinfo->numdpows ) printf("received nnpacket for (%s)\n",np->symbol); else @@ -1235,6 +1234,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) dpow_ipbitsadd(myinfo,dp,np->ipbits,np->numipbits,np->senderind,np->myipbits); if ( (bp= dpow_heightfind(myinfo,dp,np->height)) != 0 && bp->state != 0xffffffff && bp->myind >= 0 ) { + char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d i.%d senderind.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz,i,np->senderind); if ( np->senderind >= 0 && np->senderind < bp->numnotaries ) { if ( memcmp(bp->notaries[np->senderind].pubkey+1,np->srchash.bytes,32) == 0 && bits256_nonz(np->srchash) != 0 ) From 56373a08a8c452ed956f32f60c63409ee499f6c2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 17:27:23 +0200 Subject: [PATCH 06/14] test --- iguana/dpow/dpow_network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index f62951dd3..dbb08c92e 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1245,7 +1245,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) dpow_datahandler(myinfo,dp,bp,np->senderind,np->channel,np->height,np->packet,np->datalen); } else printf("wrong senderind.%d\n",np->senderind); } - } + } else printf("height.%d bp.%p state.%x senderind.%d\n",np->height,bp,bp!=0?bp->state:0,np->senderind); //dp->crcs[firstz] = crc32; } } else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); From e7c9f2a9f77a25cf1db2a72093049d795668fe51 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 17:28:02 +0200 Subject: [PATCH 07/14] test --- iguana/dpow/dpow_network.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index dbb08c92e..463f05a7c 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1122,7 +1122,7 @@ void dpow_send(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_blo np->srchash.bytes[i] = dp->minerkey33[i+1]; np->desthash = desthash; np->channel = channel; - np->height = msgbits; + np->height = bp->height;//msgbits; np->myipbits = myinfo->myaddr.myipbits; strcpy(np->symbol,dp->symbol); np->version0 = DPOW_VERSION & 0xff; From 55a9f2c7ab0783dedb2c57cf54ae47fb0e7e3946 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:02:07 +0200 Subject: [PATCH 08/14] test --- iguana/dpow/dpow_network.c | 2 +- iguana/iguana_notary.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 463f05a7c..56bdce965 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1234,7 +1234,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) dpow_ipbitsadd(myinfo,dp,np->ipbits,np->numipbits,np->senderind,np->myipbits); if ( (bp= dpow_heightfind(myinfo,dp,np->height)) != 0 && bp->state != 0xffffffff && bp->myind >= 0 ) { - char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d i.%d senderind.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz,i,np->senderind); + char str[65]; printf("%s RECV ht.%d ch.%08x (%d) crc32.%08x:%08x datalen.%d:%d firstz.%d i.%d senderind.%d myind.%d\n",bits256_str(str,np->srchash),np->height,np->channel,size,np->crc32,crc32,np->datalen,(int32_t)(size - sizeof(*np)),firstz,i,np->senderind,bp->myind); if ( np->senderind >= 0 && np->senderind < bp->numnotaries ) { if ( memcmp(bp->notaries[np->senderind].pubkey+1,np->srchash.bytes,32) == 0 && bits256_nonz(np->srchash) != 0 ) diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 3787ef58f..7c868dced 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -148,13 +148,13 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) break; src = iguana_coinfind(dp->symbol); dest = iguana_coinfind(dp->dest); - //fprintf(stderr,"dp.%p dPoWupdate (%s -> %s)\n",dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); + fprintf(stderr,"dp.%p dPoWupdate (%s -> %s)\n",dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); if ( src != 0 && dest != 0 ) { dp->numdesttx = sizeof(dp->desttx)/sizeof(*dp->desttx); if ( (height= dpow_getchaintip(myinfo,&blockhash,&blocktime,dp->desttx,&dp->numdesttx,dest)) != dp->destchaintip.blockhash.height && height >= 0 ) { - //printf("%s %s height.%d vs last.%d\n",dp->dest,bits256_str(str,blockhash),height,dp->destchaintip.blockhash.height); + char str[65]; printf("%s %s height.%d vs last.%d\n",dp->dest,bits256_str(str,blockhash),height,dp->destchaintip.blockhash.height); if ( height <= dp->destchaintip.blockhash.height ) { printf("iguana_dPoWupdate dest.%s reorg detected %d vs %d\n",dp->dest,height,dp->destchaintip.blockhash.height); From f5a921196f2db80188cc6b90ea6160fdbe51b14c Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:07:15 +0200 Subject: [PATCH 09/14] test --- basilisk/basilisk.c | 4 ++-- iguana/iguana_notary.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 96bf3724f..837d06f89 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -891,7 +891,7 @@ void basilisks_loop(void *arg) if ( (counter % myinfo->numdpows) != 0 ) iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); } - endmilli = startmilli + 500; + endmilli = startmilli + 50; } else { @@ -902,7 +902,7 @@ void basilisks_loop(void *arg) } if ( myinfo->expiration != 0 && (myinfo->dexsock >= 0 || myinfo->IAMLP != 0 || myinfo->DEXactive > time(NULL)) ) basilisk_requests_poll(myinfo); - //printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,OS_milliseconds()); + printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,OS_milliseconds()); while ( OS_milliseconds() < endmilli ) usleep(10000); iter++; diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 7c868dced..303b80638 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -143,7 +143,7 @@ void dpow_destupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t h void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) { int32_t i,height; uint32_t blocktime; bits256 blockhash; struct iguana_info *src,*dest; - for (i=0; i<100; i++) + for (i=0; i<1; i++) if ( dpow_nanomsg_update(myinfo) <= 0 ) break; src = iguana_coinfind(dp->symbol); From 3e0298aafa481191796a95331e1a5aa917b1c8f2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:12:41 +0200 Subject: [PATCH 10/14] test --- basilisk/basilisk.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 837d06f89..68bd4ace0 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -882,7 +882,7 @@ void basilisks_loop(void *arg) if ( relay != 0 ) basilisk_ping_send(myinfo,relay); counter++; - if ( (counter % 10) == 0 && myinfo->numdpows == 1 ) + if ( myinfo->numdpows == 1 ) iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); else if ( myinfo->numdpows > 1 ) { From 6b65c9c0549501700253fad020bee7a30482651c Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:13:31 +0200 Subject: [PATCH 11/14] test --- iguana/dpow/dpow_network.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 56bdce965..598860972 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -627,7 +627,7 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } else { - timeout = 2500; + timeout = 500; nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(repsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); @@ -645,7 +645,7 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } myinfo->dpowipbits[0] = (uint32_t)calc_ipbits(myinfo->ipaddr); myinfo->numdpowipbits = 1; - timeout = 2500; + timeout = 500; nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); maxsize = 1024 * 1024; printf("RCVBUF.%d\n",nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); From 006544673d38d73f17078369013e2f6c32b2240d Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:16:09 +0200 Subject: [PATCH 12/14] test --- basilisk/basilisk.c | 2 +- iguana/iguana_notary.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 68bd4ace0..aa4360df4 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -902,7 +902,7 @@ void basilisks_loop(void *arg) } if ( myinfo->expiration != 0 && (myinfo->dexsock >= 0 || myinfo->IAMLP != 0 || myinfo->DEXactive > time(NULL)) ) basilisk_requests_poll(myinfo); - printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,OS_milliseconds()); + //printf("RELAYID.%d endmilli %f vs now %f\n",myinfo->NOTARY.RELAYID,endmilli,OS_milliseconds()); while ( OS_milliseconds() < endmilli ) usleep(10000); iter++; diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 303b80638..109a35163 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -143,7 +143,7 @@ void dpow_destupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t h void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) { int32_t i,height; uint32_t blocktime; bits256 blockhash; struct iguana_info *src,*dest; - for (i=0; i<1; i++) + for (i=0; i<10; i++) if ( dpow_nanomsg_update(myinfo) <= 0 ) break; src = iguana_coinfind(dp->symbol); From 0247af9fab62d70182831b3516cf38c687fdaa12 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:21:16 +0200 Subject: [PATCH 13/14] test --- iguana/dpow/dpow_network.c | 7 ++++--- iguana/iguana_notary.c | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 598860972..70cdc1eb1 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -628,8 +628,9 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) else { timeout = 500; - nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(repsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); + nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); + timeout = 10; nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); timeout = 500; nn_setsockopt(repsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); @@ -645,7 +646,7 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } myinfo->dpowipbits[0] = (uint32_t)calc_ipbits(myinfo->ipaddr); myinfo->numdpowipbits = 1; - timeout = 500; + timeout = 10; nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); maxsize = 1024 * 1024; printf("RCVBUF.%d\n",nn_setsockopt(dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); @@ -1245,7 +1246,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) dpow_datahandler(myinfo,dp,bp,np->senderind,np->channel,np->height,np->packet,np->datalen); } else printf("wrong senderind.%d\n",np->senderind); } - } else printf("height.%d bp.%p state.%x senderind.%d\n",np->height,bp,bp!=0?bp->state:0,np->senderind); + } //else printf("height.%d bp.%p state.%x senderind.%d\n",np->height,bp,bp!=0?bp->state:0,np->senderind); //dp->crcs[firstz] = crc32; } } else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index 109a35163..d32895067 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -148,7 +148,7 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) break; src = iguana_coinfind(dp->symbol); dest = iguana_coinfind(dp->dest); - fprintf(stderr,"dp.%p dPoWupdate (%s -> %s)\n",dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); + //fprintf(stderr,"dp.%p dPoWupdate (%s -> %s)\n",dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); if ( src != 0 && dest != 0 ) { dp->numdesttx = sizeof(dp->desttx)/sizeof(*dp->desttx); From 43824c75e9675971434c8a62dd572d6656ee904e Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 27 Dec 2016 18:23:51 +0200 Subject: [PATCH 14/14] test --- iguana/dpow/dpow_network.c | 2 +- iguana/iguana_notary.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 70cdc1eb1..8481a952b 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1249,7 +1249,7 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) } //else printf("height.%d bp.%p state.%x senderind.%d\n",np->height,bp,bp!=0?bp->state:0,np->senderind); //dp->crcs[firstz] = crc32; } - } else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); + } //else printf("crc error from.%d %x vs %x or no dp.%p [%s]\n",np->senderind,crc32,np->crc32,dp,np->symbol); } else printf("ignore.%d np->datalen.%d %d (size %d - %ld) [%s]\n",np->senderind,np->datalen,(int32_t)(size-sizeof(*np)),size,sizeof(*np),np->symbol); } else printf("wrong version from.%d %02x %02x size.%d [%s]\n",np->senderind,np->version0,np->version1,size,np->symbol); } else printf("illegal size.%d\n",size); diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c index d32895067..b5bbcbe75 100755 --- a/iguana/iguana_notary.c +++ b/iguana/iguana_notary.c @@ -143,12 +143,12 @@ void dpow_destupdate(struct supernet_info *myinfo,struct dpow_info *dp,int32_t h void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp) { int32_t i,height; uint32_t blocktime; bits256 blockhash; struct iguana_info *src,*dest; - for (i=0; i<10; i++) + for (i=0; i<100; i++) if ( dpow_nanomsg_update(myinfo) <= 0 ) break; src = iguana_coinfind(dp->symbol); dest = iguana_coinfind(dp->dest); - //fprintf(stderr,"dp.%p dPoWupdate (%s -> %s)\n",dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); + fprintf(stderr,"i.%d dp.%p dPoWupdate (%s -> %s)\n",i,dp,dp!=0?dp->symbol:"",dp!=0?dp->dest:""); if ( src != 0 && dest != 0 ) { dp->numdesttx = sizeof(dp->desttx)/sizeof(*dp->desttx);