From e05bde41de37eb2a44f627126be881494f67dcd2 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Feb 2017 21:41:40 +0200 Subject: [PATCH 1/2] Test --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 3f5723493..22aac4910 100755 --- a/.gitignore +++ b/.gitignore @@ -147,3 +147,7 @@ iguana/confs/cc577d22ca76351d495f147b470103392b5f2ab0948e45608623a7d9728e2c6f iguana/confs/cc577d22ca76351d495f147b470103392b5f2ab0948e45608623a7d9728e2c6f.old iguana/DB/DEX.log + +iguana/iguana_notary.o-54f98cc3 + +iguana/pangea_hand.o-02d25ec3 From 6c0a348ba133ec797daeeca17f46b85b0560aac7 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 26 Feb 2017 21:46:17 +0200 Subject: [PATCH 2/2] Merge remote-tracking branch 'origin/beta' into beta --- basilisk/basilisk.c | 3 +- iguana/dpow/dpow_network.c | 210 +++++++++++++++++++------------------ iguana/iguana_payments.c | 4 +- 3 files changed, 111 insertions(+), 106 deletions(-) diff --git a/basilisk/basilisk.c b/basilisk/basilisk.c index 1ea4ac20d..3ab1ea6a3 100755 --- a/basilisk/basilisk.c +++ b/basilisk/basilisk.c @@ -903,13 +903,14 @@ void basilisks_loop(void *arg) { dp = &myinfo->DPOWS[counter % myinfo->numdpows]; iguana_dPoWupdate(myinfo,dp); - if ( (counter % myinfo->numdpows) != 0 ) + //if ( (counter % myinfo->numdpows) != 0 ) { //fprintf(stderr,"F "); iguana_dPoWupdate(myinfo,&myinfo->DPOWS[0]); } endmilli = startmilli + 30; } + //fprintf(stderr,"F "); } else { diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index c493ef03d..017d35973 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -287,9 +287,9 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *key,int32 { timeout = 1000; nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); - timeout = 5000; - nn_setsockopt(reqsock,NN_TCP,NN_RECONNECT_IVL,&timeout,sizeof(timeout)); - timeout = 10000; + //timeout = 5000; + //nn_setsockopt(reqsock,NN_TCP,NN_RECONNECT_IVL,&timeout,sizeof(timeout)); + timeout = 1000; nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); for (i=0; idexseed_ipaddrs)/sizeof(*myinfo->dexseed_ipaddrs); i++) if ( nn_connect(reqsock,nanomsg_tcpname(0,str,myinfo->dexseed_ipaddrs[i],REP_SOCK)) < 0 ) @@ -318,8 +318,8 @@ char *_dex_reqsend(struct supernet_info *myinfo,char *handler,uint8_t *key,int32 nn_setsockopt(subsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(subsock,NN_SUB,NN_SUB_SUBSCRIBE,"",0); printf("CLIENT sockets req.%d sub.%d\n",reqsock,subsock); - timeout = 5000; - nn_setsockopt(reqsock,NN_TCP,NN_RECONNECT_IVL,&timeout,sizeof(timeout)); + //timeout = 5000; + //nn_setsockopt(reqsock,NN_TCP,NN_RECONNECT_IVL,&timeout,sizeof(timeout)); timeout = 10000; nn_setsockopt(reqsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); } @@ -960,6 +960,7 @@ char *_dex_sendrawtransaction(struct supernet_info *myinfo,char *symbol,char *si char *_dex_importaddress(struct supernet_info *myinfo,char *symbol,char *address) { struct dex_request dexreq; +return(clonestr("{\"error\":\"importaddress deprecated\"}")); memset(&dexreq,0,sizeof(dexreq)); safecopy(dexreq.name,symbol,sizeof(dexreq.name)); dexreq.func = 'A'; @@ -1262,12 +1263,13 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } else { - timeout = 500; + timeout = 100; 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(pubsock,NN_SOL_SOCKET,NN_SNDTIMEO,&timeout,sizeof(timeout)); + timeout = 1; nn_setsockopt(dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); - timeout = 500; + timeout = 1; 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))); @@ -1281,7 +1283,7 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) } myinfo->dpowipbits[0] = (uint32_t)calc_ipbits(myinfo->ipaddr); myinfo->numdpowipbits = 1; - timeout = 10; + timeout = 1; 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))); @@ -1886,7 +1888,7 @@ void dpow_ipbitsadd(struct supernet_info *myinfo,struct dpow_info *dp,uint32_t * int32_t dpow_nanomsg_update(struct supernet_info *myinfo) { - int32_t i,n=0,num=0,size,broadcastflag,firstz = -1; char *retstr; uint32_t crc32,r,m; struct dpow_nanomsghdr *np=0; struct dpow_info *dp; struct dpow_block *bp; struct dex_nanomsghdr *dexp = 0; void *freeptr; + int32_t i,n,num,num2,flags=0,size,iter,lastval=0,broadcastflag,firstz = -1; char *retstr; uint32_t crc32,r,m; struct dpow_nanomsghdr *np=0; struct dpow_info *dp; struct dpow_block *bp; struct dex_nanomsghdr *dexp = 0; void *freeptr; if ( time(NULL) < myinfo->nanoinit+5 || (myinfo->dpowsock < 0 && myinfo->dexsock < 0 && myinfo->repsock < 0) ) return(-1); if ( myinfo->IAMNOTARY != 0 && myinfo->numnotaries <= 0 ) @@ -1895,125 +1897,127 @@ int32_t dpow_nanomsg_update(struct supernet_info *myinfo) printf("INIT with %d notaries\n",myinfo->numnotaries); } portable_mutex_lock(&myinfo->dpowmutex); - /*for (i=0; i<100; i++) + num = num2 = n = 0; + for (iter=0; iter<100; iter++) { - struct nn_pollfd pfd; - pfd.fd = myinfo->dpowsock; - pfd.events = NN_POLLIN; - if ( nn_poll(&pfd,1,100) > 0 ) - break; - usleep(1000); - }*/ - while ( (size= signed_nn_recv(&freeptr,myinfo->ctx,myinfo->notaries,myinfo->numnotaries,myinfo->dpowsock,&np)) >= 0 && num < 1000 ) - { - num++; - if ( size > 0 ) + freeptr = 0; + if ( (flags & 1) == 0 && (size= signed_nn_recv(&freeptr,myinfo->ctx,myinfo->notaries,myinfo->numnotaries,myinfo->dpowsock,&np)) > 0 ) { - //fprintf(stderr,"%d ",size); - if ( np->version0 == (DPOW_VERSION & 0xff) && np->version1 == ((DPOW_VERSION >> 8) & 0xff) ) + num++; + if ( size > 0 ) { - //printf("v.%02x %02x datalen.%d size.%d %d vs %d\n",np->version0,np->version1,np->datalen,size,np->datalen,(int32_t)(size - sizeof(*np))); - if ( np->datalen == (size - sizeof(*np)) ) + //fprintf(stderr,"%d ",size); + if ( np->version0 == (DPOW_VERSION & 0xff) && np->version1 == ((DPOW_VERSION >> 8) & 0xff) ) { - crc32 = calc_crc32(0,np->packet,np->datalen); - dp = 0; - for (i=0; inumdpows; i++) + //printf("v.%02x %02x datalen.%d size.%d %d vs %d\n",np->version0,np->version1,np->datalen,size,np->datalen,(int32_t)(size - sizeof(*np))); + if ( np->datalen == (size - sizeof(*np)) ) { - if ( strcmp(np->symbol,myinfo->DPOWS[i].symbol) == 0 ) + crc32 = calc_crc32(0,np->packet,np->datalen); + dp = 0; + for (i=0; inumdpows; i++) { - dp = &myinfo->DPOWS[i]; - break; + if ( strcmp(np->symbol,myinfo->DPOWS[i].symbol) == 0 ) + { + dp = &myinfo->DPOWS[i]; + break; + } } - } - if ( dp != 0 && crc32 == np->crc32 ) - { - if ( i == myinfo->numdpows ) - printf("received nnpacket for (%s)\n",np->symbol); - else + if ( dp != 0 && crc32 == np->crc32 ) { - 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 ) + if ( i == myinfo->numdpows ) + printf("received nnpacket for (%s)\n",np->symbol); + else { - //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 ) + 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 ) { - if ( memcmp(bp->notaries[np->senderind].pubkey+1,np->srchash.bytes,32) == 0 && bits256_nonz(np->srchash) != 0 ) + //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 ( bp->isratify == 0 ) - dpow_nanoutxoget(myinfo,dp,bp,&np->notarize,0,np->senderind,np->channel); - else dpow_nanoutxoget(myinfo,dp,bp,&np->ratify,1,np->senderind,np->channel); - 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); - } 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 ( memcmp(bp->notaries[np->senderind].pubkey+1,np->srchash.bytes,32) == 0 && bits256_nonz(np->srchash) != 0 ) + { + if ( bp->isratify == 0 ) + dpow_nanoutxoget(myinfo,dp,bp,&np->notarize,0,np->senderind,np->channel); + else dpow_nanoutxoget(myinfo,dp,bp,&np->ratify,1,np->senderind,np->channel); + 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); + } 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 flags |= 1; if ( freeptr != 0 ) nn_freemsg(freeptr), np = 0, freeptr = 0; - } //else printf("no packets\n"); - n = 0; - if ( myinfo->dexsock >= 0 ) // from servers - { - while ( (size= signed_nn_recv(&freeptr,myinfo->ctx,myinfo->notaries,myinfo->numnotaries,myinfo->dexsock,&dexp)) > 0 && n < 1000 ) + if ( myinfo->dexsock >= 0 ) // from servers { - //fprintf(stderr,"%d ",size); - n++; - if ( dex_packetcheck(myinfo,dexp,size) == 0 ) + freeptr = 0; + if ( (flags & 2) == 0 && (size= signed_nn_recv(&freeptr,myinfo->ctx,myinfo->notaries,myinfo->numnotaries,myinfo->dexsock,&dexp)) > 0 ) { - //printf("FROM BUS.%08x -> pub\n",dexp->crc32); - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size); - dex_packet(myinfo,dexp,size); - } - //printf("GOT DEX bus PACKET.%d\n",size); + //fprintf(stderr,"%d ",size); + n++; + if ( dex_packetcheck(myinfo,dexp,size) == 0 ) + { + //printf("FROM BUS.%08x -> pub\n",dexp->crc32); + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size); + dex_packet(myinfo,dexp,size); + } + //printf("GOT DEX bus PACKET.%d\n",size); + } else flags |= 2; if ( freeptr != 0 ) nn_freemsg(freeptr), dexp = 0, freeptr = 0; } - } - if ( myinfo->repsock >= 0 ) // from clients - { - while ( (size= nn_recv(myinfo->repsock,&dexp,NN_MSG,0)) > 0 ) + if ( myinfo->repsock >= 0 ) // from clients { - num++; - //printf("REP got %d crc.%08x\n",size,calc_crc32(0,(void *)dexp,size)); - if ( (retstr= dex_response(&broadcastflag,myinfo,dexp)) != 0 ) + dexp = 0; + if ( (flags & 4) == 0 && (size= nn_recv(myinfo->repsock,&dexp,NN_MSG,0)) > 0 ) { - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->repsock,retstr,(int32_t)strlen(retstr)+1); - //printf("send back[%ld]\n",strlen(retstr)+1); - free(retstr); - if ( broadcastflag != 0 ) + num2++; + //printf("REP got %d crc.%08x\n",size,calc_crc32(0,(void *)dexp,size)); + if ( (retstr= dex_response(&broadcastflag,myinfo,dexp)) != 0 ) { - printf("BROADCAST dexp request.[%d]\n",size); - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size); + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->repsock,retstr,(int32_t)strlen(retstr)+1); + //printf("send back[%ld]\n",strlen(retstr)+1); + free(retstr); + if ( broadcastflag != 0 ) + { + //printf("BROADCAST dexp request.[%d]\n",size); + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size); + } } - } - else - { - if ( (m= myinfo->numdpowipbits) > 0 ) - { - r = myinfo->dpowipbits[rand() % m]; - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->repsock,&r,sizeof(r)); - //printf("REP.%08x <- rand ip m.%d %x\n",dexp->crc32,m,r); - } else printf("illegal state without dpowipbits?\n"); - if ( dex_packetcheck(myinfo,dexp,size) == 0 ) + else { - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size); - signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size); - //printf("REP.%08x -> dexbus and pub, t.%d lag.%d\n",dexp->crc32,dexp->timestamp,(int32_t)(time(NULL)-dexp->timestamp)); - dex_packet(myinfo,dexp,size); - } else printf("failed dexpacketcheck\n"); - } - //printf("GOT DEX rep PACKET.%d\n",size); - //if ( freeptr != 0 ) - // nn_freemsg(freeptr), dexp = 0, freeptr = 0; + if ( (m= myinfo->numdpowipbits) > 0 ) + { + r = myinfo->dpowipbits[rand() % m]; + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->repsock,&r,sizeof(r)); + //printf("REP.%08x <- rand ip m.%d %x\n",dexp->crc32,m,r); + } else printf("illegal state without dpowipbits?\n"); + if ( dex_packetcheck(myinfo,dexp,size) == 0 ) + { + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->dexsock,dexp,size); + signed_nn_send(myinfo,myinfo->ctx,myinfo->persistent_priv,myinfo->pubsock,dexp,size); + //printf("REP.%08x -> dexbus and pub, t.%d lag.%d\n",dexp->crc32,dexp->timestamp,(int32_t)(time(NULL)-dexp->timestamp)); + dex_packet(myinfo,dexp,size); + } else printf("failed dexpacketcheck\n"); + } + //printf("GOT DEX rep PACKET.%d\n",size); + //if ( freeptr != 0 ) + // nn_freemsg(freeptr), dexp = 0, freeptr = 0; + //if ( num > 1000 ) + // break; + } else flags |= 4; if ( dexp != 0 ) nn_freemsg(dexp), dexp = 0; - if ( num > 1000 ) - break; } + if ( (num + n + num2) != lastval ) + { + //printf("lastval.%d: num.%d n.%d num2.%d rep packets\n",lastval,num,n,num2); + lastval = (num + n + num2); + } else break; } portable_mutex_unlock(&myinfo->dpowmutex); return(num); diff --git a/iguana/iguana_payments.c b/iguana/iguana_payments.c index f593034b4..82386e4b9 100755 --- a/iguana/iguana_payments.c +++ b/iguana/iguana_payments.c @@ -366,7 +366,7 @@ uint64_t _iguana_interest(uint32_t now,int32_t chainheight,uint32_t txlocktime,u uint64_t iguana_interest(struct supernet_info *myinfo,struct iguana_info *coin,bits256 txid,int32_t vout,uint64_t value) { - char *retstr; int32_t height; cJSON *retjson; struct iguana_txid T,*tx; uint64_t interest=0; + char *retstr; int32_t height; cJSON *retjson=0; struct iguana_txid T,*tx; uint64_t interest=0; if ( coin->FULLNODE < 0 ) // komodod is running { if ( (retjson= dpow_gettxout(myinfo,coin,txid,vout)) != 0 ) @@ -394,7 +394,7 @@ uint64_t iguana_interest(struct supernet_info *myinfo,struct iguana_info *coin,b interest = _iguana_interest((uint32_t)time(NULL),coin->longestchain,tx->locktime,value); } } - char str[65]; printf("interest for %s.v%d %.8f %.8f\n",bits256_str(str,txid),vout,dstr(value),dstr(interest)); + char str[65]; printf("interest for %s.v%d %.8f %.8f (%s)\n",bits256_str(str,txid),vout,dstr(value),dstr(interest),retjson!=0?jprint(retjson,0):""); return(interest); }