From edc9b4e826fb4f5dac84e506981e3fd54db9b17b Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 18:11:41 +0300
Subject: [PATCH 1/6] Test
---
iguana/dpow/dpow_network.c | 2 +-
iguana/iguana_notary.c | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c
index de2fc4c34..32a3ffe0d 100755
--- a/iguana/dpow/dpow_network.c
+++ b/iguana/dpow/dpow_network.c
@@ -1537,7 +1537,7 @@ void dpow_bestconsensus(struct dpow_info *dp,struct dpow_block *bp)
bp->bestmatches = bestmatches;
bp->notaries[bp->myind].bestmask = bp->bestmask = masks[besti];
bp->notaries[bp->myind].bestk = bp->bestk = bestks[besti];
- if ( 0 && bp->myind == 0 && strcmp("KMD",dp->symbol) == 0 )
+ if ( bp->myind == 0 && strcmp("CHIPS",dp->symbol) == 0 )
{
for (i=0; i<bp->numnotaries; i++)
printf("%d:%d%s ",wts[i],owts[i],wts[i]*owts[i]>median?"*":"");
diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c
index e29b0a4d7..28b513c7f 100755
--- a/iguana/iguana_notary.c
+++ b/iguana/iguana_notary.c
@@ -269,13 +269,16 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
}
+ dp->lastsrcupdate = (uint32_t)time(NULL);
}
else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->lastheight )
{
+ while ( dp->lastheight <= height )
+ {
+ blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
+ dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
+ }
dp->lastsrcupdate = (uint32_t)time(NULL);
- dp->lastheight = height;
- blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
- dpow_srcupdate(myinfo,dp,dp->lastheight,blockhash,(uint32_t)time(NULL),blocktime);
}
} //else printf("error getchaintip for %s\n",dp->symbol);
} else printf("iguana_dPoWupdate missing src.(%s) %p or dest.(%s) %p\n",dp->symbol,src,dp->dest,dest);
From 49be237dd9fe1db5355a81893ac584acfee48822 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 18:32:12 +0300
Subject: [PATCH 2/6] Test
---
iguana/iguana_notary.c | 28 +++++++++++++++-------------
1 file changed, 15 insertions(+), 13 deletions(-)
diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c
index 28b513c7f..1cdec30aa 100755
--- a/iguana/iguana_notary.c
+++ b/iguana/iguana_notary.c
@@ -241,8 +241,8 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
if ( (height= dpow_getchaintip(myinfo,&merkleroot,&blockhash,&blocktime,dp->srctx,&dp->numsrctx,src)) != dp->last.blockhash.height && height > 0 )
{
char str[65]; printf("[%s].%d %s %s height.%d vs last.%d\n",dp->dest,dp->SRCHEIGHT,dp->symbol,bits256_str(str,blockhash),height,dp->last.blockhash.height);
- if ( dp->lastheight == 0 )
- dp->lastheight = height-1;
+ if ( dp->last.blockhash.height == 0 )
+ dp->last.blockhash.height = height-1;
dp->SRCHEIGHT = height;
if ( height < dp->last.blockhash.height )
{
@@ -254,30 +254,32 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
}
else
{
- while ( dp->lastheight <= height )
+ while ( dp->last.blockhash.height <= height )
{
- printf("dp->lastheight.%d <= height.%d\n",dp->lastheight,height);
- blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
- dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
+ printf("dp->last.blockhash.height.%d <= height.%d\n",dp->last.blockhash.height,height);
+ blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
+ dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
}
}
}
else if ( strcmp(dp->symbol,"KMD") == 0 )
{
- while ( dp->lastheight <= height )
+ while ( dp->last.blockhash.height <= height )
{
- blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
- dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
+ blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
+ dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
}
dp->lastsrcupdate = (uint32_t)time(NULL);
}
- else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->lastheight )
+ else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->last.blockhash.height )
{
- while ( dp->lastheight <= height )
+ printf("start dp->last.blockhash.height.%d height.%d\n",dp->last.blockhash.height,height);
+ while ( dp->last.blockhash.height <= height )
{
- blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
- dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
+ blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
+ dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
}
+ printf("end dp->last.blockhash.height.%d height.%d\n",dp->last.blockhash.height,height);
dp->lastsrcupdate = (uint32_t)time(NULL);
}
} //else printf("error getchaintip for %s\n",dp->symbol);
From 362eb3e40d5b2222f01931ec03d84cd974462c36 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 18:42:26 +0300
Subject: [PATCH 3/6] Test
---
iguana/iguana_notary.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c
index 1cdec30aa..1d8f63370 100755
--- a/iguana/iguana_notary.c
+++ b/iguana/iguana_notary.c
@@ -264,22 +264,24 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
}
else if ( strcmp(dp->symbol,"KMD") == 0 )
{
+ printf("%s start dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
while ( dp->last.blockhash.height <= height )
{
blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
}
+ printf("%s end dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
dp->lastsrcupdate = (uint32_t)time(NULL);
}
else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->last.blockhash.height )
{
- printf("start dp->last.blockhash.height.%d height.%d\n",dp->last.blockhash.height,height);
+ printf("%s start dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
while ( dp->last.blockhash.height <= height )
{
blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
}
- printf("end dp->last.blockhash.height.%d height.%d\n",dp->last.blockhash.height,height);
+ printf("%s end dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
dp->lastsrcupdate = (uint32_t)time(NULL);
}
} //else printf("error getchaintip for %s\n",dp->symbol);
From 9797ab1c5d4439b59a5ac51029c75cabbdf3159d Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 18:51:23 +0300
Subject: [PATCH 4/6] Test
---
iguana/iguana_notary.c | 33 +++++++++++++--------------------
1 file changed, 13 insertions(+), 20 deletions(-)
diff --git a/iguana/iguana_notary.c b/iguana/iguana_notary.c
index 1d8f63370..e29b0a4d7 100755
--- a/iguana/iguana_notary.c
+++ b/iguana/iguana_notary.c
@@ -241,8 +241,8 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
if ( (height= dpow_getchaintip(myinfo,&merkleroot,&blockhash,&blocktime,dp->srctx,&dp->numsrctx,src)) != dp->last.blockhash.height && height > 0 )
{
char str[65]; printf("[%s].%d %s %s height.%d vs last.%d\n",dp->dest,dp->SRCHEIGHT,dp->symbol,bits256_str(str,blockhash),height,dp->last.blockhash.height);
- if ( dp->last.blockhash.height == 0 )
- dp->last.blockhash.height = height-1;
+ if ( dp->lastheight == 0 )
+ dp->lastheight = height-1;
dp->SRCHEIGHT = height;
if ( height < dp->last.blockhash.height )
{
@@ -254,35 +254,28 @@ void iguana_dPoWupdate(struct supernet_info *myinfo,struct dpow_info *dp)
}
else
{
- while ( dp->last.blockhash.height <= height )
+ while ( dp->lastheight <= height )
{
- printf("dp->last.blockhash.height.%d <= height.%d\n",dp->last.blockhash.height,height);
- blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
- dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
+ printf("dp->lastheight.%d <= height.%d\n",dp->lastheight,height);
+ blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
+ dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
}
}
}
else if ( strcmp(dp->symbol,"KMD") == 0 )
{
- printf("%s start dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
- while ( dp->last.blockhash.height <= height )
+ while ( dp->lastheight <= height )
{
- blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
- dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
+ blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
+ dpow_srcupdate(myinfo,dp,dp->lastheight++,blockhash,(uint32_t)time(NULL),blocktime);
}
- printf("%s end dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
- dp->lastsrcupdate = (uint32_t)time(NULL);
}
- else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->last.blockhash.height )
+ else if ( time(NULL) > dp->lastsrcupdate+60 || height != dp->lastheight )
{
- printf("%s start dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
- while ( dp->last.blockhash.height <= height )
- {
- blockhash = dpow_getblockhash(myinfo,src,dp->last.blockhash.height);
- dpow_srcupdate(myinfo,dp,dp->last.blockhash.height++,blockhash,(uint32_t)time(NULL),blocktime);
- }
- printf("%s end dp->last.blockhash.height.%d height.%d\n",dp->symbol,dp->last.blockhash.height,height);
dp->lastsrcupdate = (uint32_t)time(NULL);
+ dp->lastheight = height;
+ blockhash = dpow_getblockhash(myinfo,src,dp->lastheight);
+ dpow_srcupdate(myinfo,dp,dp->lastheight,blockhash,(uint32_t)time(NULL),blocktime);
}
} //else printf("error getchaintip for %s\n",dp->symbol);
} else printf("iguana_dPoWupdate missing src.(%s) %p or dest.(%s) %p\n",dp->symbol,src,dp->dest,dest);
From 5f8bc8abb99167549abb50a8190b3bde7c2a88bd Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 19:37:36 +0300
Subject: [PATCH 5/6] Test
---
iguana/dpow/dpow_fsm.c | 4 ++++
iguana/dpow/dpow_tx.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/iguana/dpow/dpow_fsm.c b/iguana/dpow/dpow_fsm.c
index 655c3b80b..12d624137 100755
--- a/iguana/dpow/dpow_fsm.c
+++ b/iguana/dpow/dpow_fsm.c
@@ -437,6 +437,10 @@ void dpow_statemachinestart(void *ptr)
}
bp->myind = myind;
printf("[%d] notarize %s->%s %s ht.%d minsigs.%d duration.%d start.%u MoM[%d] %s\n",bp->myind,dp->symbol,dp->dest,bits256_str(str,checkpoint.blockhash.hash),checkpoint.blockhash.height,minsigs,duration,checkpoint.timestamp,bp->MoMdepth,bits256_str(str2,bp->MoM));
+ {
+ if ( strcmp(dp->symbol,"CHIPS") == 0 && bp->myind == 0 )
+ dpow_signedtxgen(myinfo,dp,src,bp,bp->myind,1LL<<bp->myind,bp->myind,DPOW_SIGCHANNEL,0,0);
+ }
if ( bp->isratify != 0 && memcmp(bp->notaries[0].pubkey,bp->ratified_pubkeys[0],33) != 0 )
{
for (i=0; i<33; i++)
diff --git a/iguana/dpow/dpow_tx.c b/iguana/dpow/dpow_tx.c
index 0658abea6..5092b915e 100755
--- a/iguana/dpow/dpow_tx.c
+++ b/iguana/dpow/dpow_tx.c
@@ -483,17 +483,17 @@ void dpow_rawtxsign(struct supernet_info *myinfo,struct dpow_info *dp,struct igu
retval = 0;
break;
} else printf("sig.%d of %d didnt match pubkey? (%s)\n",j,m,jprint(vinitem,0));
- } // else printf("notmine.(%s)\n",jprint(item,0));
+ } else printf("notmine.(%s)\n",jprint(item,0));
}
} else printf("no vin[] (%s)\n",jprint(txobj2,0));
free_json(txobj2);
} else printf("cant parse.(%s)\n",rawtx2);
free(rawtx2);
- } //else printf("error decoding (%s) %s\n",signedtx==0?"":signedtx,jsonstr);
+ } else printf("error decoding (%s) %s\n",signedtx==0?"":signedtx,jsonstr);
free_json(signobj);
} else printf("error parsing.(%s)\n",jsonstr);
free(jsonstr);
- }
+ } else printf("%s null signature in dpow_rawtxsign\n",dp->symbol);
}
int32_t dpow_signedtxgen(struct supernet_info *myinfo,struct dpow_info *dp,struct iguana_info *coin,struct dpow_block *bp,int8_t bestk,uint64_t bestmask,int32_t myind,uint32_t deprec,int32_t src_or_dest,int32_t useratified)
@@ -508,7 +508,7 @@ int32_t dpow_signedtxgen(struct supernet_info *myinfo,struct dpow_info *dp,struc
if ( (vins= dpow_vins(coin,bp,bestk,bestmask,1,src_or_dest,useratified)) != 0 )
{
txid = dpow_notarytx(rawtx,&numsigs,coin->chain->isPoS,bp,bestk,bestmask,0,src_or_dest,bp->numratified!=0?bp->ratified_pubkeys:0,useratified*bp->numratified);
- //char str[65]; printf("signedtxgen %s src_or_dest.%d (%d %llx) useratified.%d raw.(%s)\n",bits256_str(str,txid),src_or_dest,bestk,(long long)bestmask,useratified,rawtx);
+ char str[65]; printf("%s signedtxgen %s src_or_dest.%d (%d %llx) useratified.%d raw.(%s)\n",dp->symbol,bits256_str(str,txid),src_or_dest,bestk,(long long)bestmask,useratified,rawtx);
if ( bits256_nonz(txid) != 0 && rawtx[0] != 0 ) // send tx to share utxo set
{
if ( useratified != 0 )
From cad21f454b30aa4c57623d43a14bc02b582f2ba3 Mon Sep 17 00:00:00 2001
From: jl777 <jameslee777@yahoo.com>
Date: Fri, 18 May 2018 19:56:11 +0300
Subject: [PATCH 6/6] 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 32a3ffe0d..7061caa77 100755
--- a/iguana/dpow/dpow_network.c
+++ b/iguana/dpow/dpow_network.c
@@ -1948,7 +1948,7 @@ void dpow_notarize_update(struct supernet_info *myinfo,struct dpow_info *dp,stru
{
if ( bp->state != 0xffffffff )
dpow_sigscheck(myinfo,dp,bp,bp->myind,0,bp->pendingbestk,bp->pendingbestmask,0,0);
- } else if ( strcmp(dp->symbol,"CHIPS") == 0 || strcmp(dp->symbol,"GAME") == 0 )printf("srcmask.[%d:%d] %llx %llx != bestmask.%llx\n",bp->bestk,bp->pendingbestk,(long long)bp->srcsigsmasks[bp->pendingbestk],(long long)bp->srcsigsmasks[bp->bestk],(long long)bp->pendingbestmask);
+ } // else if ( strcmp(dp->symbol,"CHIPS") == 0 || strcmp(dp->symbol,"GAME") == 0 )printf("srcmask.[%d:%d] %llx %llx != bestmask.%llx\n",bp->bestk,bp->pendingbestk,(long long)bp->srcsigsmasks[bp->pendingbestk],(long long)bp->srcsigsmasks[bp->bestk],(long long)bp->pendingbestmask);
} else if ( strcmp(dp->symbol,"CHIPS") == 0 || strcmp(dp->symbol,"GAME") == 0 )
printf("destmask.%llx != bestmask.%llx\n",(long long)bp->destsigsmasks[bp->bestk],(long long)bp->bestmask);
}