From 7e0990e3719f8d18cc16bca93f072587ee9271ea Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 11 Dec 2016 10:17:09 +0200 Subject: [PATCH 1/5] test --- iguana/dpow/dpow_fsm.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 031e5787c..5b45203fa 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -433,7 +433,7 @@ void dpow_statemachinestart(void *ptr) break; } } - printf("isratify.%d bestk.%d %llx sigs.%llx state machine ht.%d completed state.%x %s.%s %s.%s recvmask.%llx\n",bp->isratify,bp->bestk,(long long)bp->bestmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),bp->height,bp->state,dp->dest,bits256_str(str,bp->desttxid),dp->symbol,bits256_str(str2,bp->srctxid),(long long)bp->recvmask); + printf("isratify.%d bestk.%d %llx sigs.%llx state machine ht.%d completed state.%x %s.%s %s.%s recvmask.%llx paxwdcrc.%x\n",bp->isratify,bp->bestk,(long long)bp->bestmask,(long long)(bp->bestk>=0?bp->destsigsmasks[bp->bestk]:0),bp->height,bp->state,dp->dest,bits256_str(str,bp->desttxid),dp->symbol,bits256_str(str2,bp->srctxid),(long long)bp->recvmask,bp->paxwdcrc); dp->lastrecvmask = bp->recvmask; dp->ratifying -= bp->isratify; free(ptr); From fca0479a5b563f0c028c25850ed44374665ba401 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 12 Dec 2016 23:14:44 +0200 Subject: [PATCH 2/5] test --- iguana/dpow/dpow_network.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 0e3299b5b..ccf525c76 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -254,7 +254,7 @@ int32_t dpow_addnotary(struct supernet_info *myinfo,struct dpow_info *dp,char *i void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) { - char str[512]; int32_t timeout,retval; + char str[512]; int32_t timeout,retval,maxsize; if ( myinfo->ipaddr[0] == 0 ) { printf("need to set ipaddr before nanomsg\n"); @@ -316,6 +316,9 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) myinfo->numdpowipbits = 1; timeout = 1000; nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); + maxsize = 2048 * 1024; + printf("RCVMAX.%d ",nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVMAXSIZE,&maxsize,sizeof(maxsize))); + printf("RCVTIMEO.%d\n",nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); nn_setsockopt(myinfo->dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(myinfo->repsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); printf("DEXINIT dex.%d rep.%d\n",myinfo->dexsock,myinfo->repsock); From f6162372772faec8a85e403ab061bc56eeb31d13 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 12 Dec 2016 23:16:52 +0200 Subject: [PATCH 3/5] test --- iguana/dpow/dpow_network.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index ccf525c76..5a544c579 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -316,9 +316,8 @@ void dpow_nanomsginit(struct supernet_info *myinfo,char *ipaddr) myinfo->numdpowipbits = 1; timeout = 1000; nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); - maxsize = 2048 * 1024; - printf("RCVMAX.%d ",nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVMAXSIZE,&maxsize,sizeof(maxsize))); - printf("RCVTIMEO.%d\n",nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); + maxsize = 1024 * 1024; + printf("RCVBUF.%d\n",nn_setsockopt(myinfo->dpowsock,NN_SOL_SOCKET,NN_RCVBUF,&maxsize,sizeof(maxsize))); nn_setsockopt(myinfo->dexsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); nn_setsockopt(myinfo->repsock,NN_SOL_SOCKET,NN_RCVTIMEO,&timeout,sizeof(timeout)); printf("DEXINIT dex.%d rep.%d\n",myinfo->dexsock,myinfo->repsock); From 85e3319dcb1d11ef6bf5038ee020c8670f4c3565 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 10:40:09 +0200 Subject: [PATCH 4/5] 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 5a544c579..c706a8fd9 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -662,7 +662,7 @@ void dpow_send(struct supernet_info *myinfo,struct dpow_info *dp,struct dpow_blo if ( bp->isratify == 0 ) { extralen = dpow_paxpending(extras); - bp->notaries[bp->myind].paxwdcrc = calc_crc32(0,extras,extralen); + bp->paxwdcrc = bp->notaries[bp->myind].paxwdcrc = calc_crc32(0,extras,extralen); dpow_nanoutxoset(&np->notarize,bp,0); } else dpow_nanoutxoset(&np->ratify,bp,1); np->size = size; From 2847900c7e4829e68fbb628b2dc5085b43fd44b3 Mon Sep 17 00:00:00 2001 From: jl777 Date: Tue, 13 Dec 2016 12:27:11 +0200 Subject: [PATCH 5/5] test --- iguana/dpow/dpow_fsm.c | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c index 5b45203fa..21c8c0dd6 100755 --- a/iguana/dpow/dpow_fsm.c +++ b/iguana/dpow/dpow_fsm.c @@ -158,7 +158,7 @@ void dpow_statemachinestart(void *ptr) { void **ptrs = ptr; struct supernet_info *myinfo; struct dpow_info *dp; struct dpow_checkpoint checkpoint; - int32_t i,j,ht,destprevvout0,srcprevvout0,numratified=0,kmdheight,myind = -1; uint8_t pubkeys[64][33]; cJSON *ratified=0,*item; struct iguana_info *src,*dest; char *jsonstr,*handle,*hexstr,str[65],str2[65],srcaddr[64],destaddr[64]; bits256 zero,srchash,destprevtxid0,srcprevtxid0; struct dpow_block *bp; struct dpow_entry *ep = 0; uint32_t duration,minsigs,starttime,srctime; + int32_t i,j,ht,extralen,destprevvout0,srcprevvout0,numratified=0,kmdheight,myind = -1; uint8_t extras[10000],pubkeys[64][33]; cJSON *ratified=0,*item; struct iguana_info *src,*dest; char *jsonstr,*handle,*hexstr,str[65],str2[65],srcaddr[64],destaddr[64]; bits256 zero,srchash,destprevtxid0,srcprevtxid0; struct dpow_block *bp; struct dpow_entry *ep = 0; uint32_t duration,minsigs,starttime,srctime; memset(&zero,0,sizeof(zero)); srcprevtxid0 = destprevtxid0 = zero; srcprevvout0 = destprevvout0 = -1; @@ -387,9 +387,14 @@ void dpow_statemachinestart(void *ptr) } sleep(1); } - if ( bp->isratify == 0 || (starttime= checkpoint.timestamp) == 0 ) - bp->starttime = starttime = (uint32_t)time(NULL); - printf("myind.%d isratify.%d DPOW.%s statemachine checkpoint.%d %s start.%u\n",bp->myind,bp->isratify,src->symbol,checkpoint.blockhash.height,bits256_str(str,checkpoint.blockhash.hash),checkpoint.timestamp); + if ( bp->isratify == 0 ) + { + if ( (starttime= checkpoint.timestamp) == 0 ) + bp->starttime = starttime = (uint32_t)time(NULL); + extralen = dpow_paxpending(extras); + bp->paxwdcrc = bp->notaries[bp->myind].paxwdcrc = calc_crc32(0,extras,extralen); + } + printf("PAXWDCRC.%x myind.%d isratify.%d DPOW.%s statemachine checkpoint.%d %s start.%u\n",bp->paxwdcrc,bp->myind,bp->isratify,src->symbol,checkpoint.blockhash.height,bits256_str(str,checkpoint.blockhash.hash),checkpoint.timestamp); for (i=0; iminerkey33[i+1]; //printf("start utxosync start.%u %u\n",starttime,(uint32_t)time(NULL));