From 1c5a00ced995aeebf91f4f8159b40080cb1604b9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:44:01 +0200 Subject: [PATCH 01/20] Test --- src/pow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index c6cfe9fab..3b99bcc91 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -173,7 +173,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in printf(" minerids from ht.%d\n",height); if ( KOMODO_REWIND == 0 && (notaryid >= 0 || height > 225000) ) return error("CheckProofOfWork(): hash doesn't match nBits"); - } + } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } return true; } From 73326d0273b5657f44a70d8dc6daa47d740b858f Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:50:58 +0200 Subject: [PATCH 02/20] Test --- src/pow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pow.cpp b/src/pow.cpp index 3b99bcc91..51d8ae1dd 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -173,6 +173,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in printf(" minerids from ht.%d\n",height); if ( KOMODO_REWIND == 0 && (notaryid >= 0 || height > 225000) ) return error("CheckProofOfWork(): hash doesn't match nBits"); + else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } return true; From de65ff954383da0ec12c930dd79fb0937e18b794 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:51:17 +0200 Subject: [PATCH 03/20] Test --- src/pow.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/pow.cpp b/src/pow.cpp index 51d8ae1dd..21be20cd0 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -176,6 +176,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } + fprintf(stderr,"POW ok for ht.%d\n",height); return true; } From 2e8e57576ec33d9cf24f250c227f7d11dd35aeb5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:55:07 +0200 Subject: [PATCH 04/20] Test --- src/pow.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/pow.cpp b/src/pow.cpp index 21be20cd0..a826aeb16 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -158,7 +158,6 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in if ( (height < 235300 || height >= 236000) && KOMODO_LOADINGBLOCKS == 0 && height > 188000 ) //&& )//186269, 182507&& komodo_chainactive(height) != 0 && nonzpkeys > 0 { - int32_t i; for (i=31; i>=0; i--) printf("%02x",((uint8_t *)&hash)[i]); printf(" hash vs "); @@ -176,7 +175,15 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } - fprintf(stderr,"POW ok for ht.%d\n",height); + if ( height > 240000 ) + { + for (i=31; i>=0; i--) + printf("%02x",((uint8_t *)&hash)[i]); + printf(" hash vs "); + for (i=31; i>=0; i--) + printf("%02x",((uint8_t *)&bnTarget)[i]); + fprintf(stderr," POW ok for ht.%d notaryid.%d\n",height,notaryid); + } return true; } From 44cc3bc7e63d88947481cb0e4a6f5ae7ce5b07d9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:57:28 +0200 Subject: [PATCH 05/20] Test --- src/pow.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pow.cpp b/src/pow.cpp index a826aeb16..638c23ada 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -178,10 +178,10 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in if ( height > 240000 ) { for (i=31; i>=0; i--) - printf("%02x",((uint8_t *)&hash)[i]); - printf(" hash vs "); + fprintf(stderr,"%02x",((uint8_t *)&hash)[i]); + fprintf(stderr," hash vs "); for (i=31; i>=0; i--) - printf("%02x",((uint8_t *)&bnTarget)[i]); + fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]); fprintf(stderr," POW ok for ht.%d notaryid.%d\n",height,notaryid); } return true; From c49a34c04ac6cd71255dec8f19d3264ee4a88781 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:58:53 +0200 Subject: [PATCH 06/20] Test --- src/pow.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index 638c23ada..3e49009ee 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -171,8 +171,10 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in printf("%d ",mids[i]); printf(" minerids from ht.%d\n",height); if ( KOMODO_REWIND == 0 && (notaryid >= 0 || height > 225000) ) + { + fprintf(stderr,"pow error height.%d loading.%d notaryid.%d\n",height,KOMODO_LOADINGBLOCKS,notaryid); return error("CheckProofOfWork(): hash doesn't match nBits"); - else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); + } else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } if ( height > 240000 ) From 0bba91a407edcdc1e51e85ce9d0a41bf5f0045ec Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 17:59:24 +0200 Subject: [PATCH 07/20] Test --- src/pow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index 3e49009ee..5612c0919 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -177,7 +177,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in } else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } - if ( height > 240000 ) + if ( height > 248000 ) { for (i=31; i>=0; i--) fprintf(stderr,"%02x",((uint8_t *)&hash)[i]); From 37f823fba7f925240179358f59242fcdb29ceaba Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:01:19 +0200 Subject: [PATCH 08/20] Test --- src/pow.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index 5612c0919..0ec0f6fae 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -184,7 +184,10 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in fprintf(stderr," hash vs "); for (i=31; i>=0; i--) fprintf(stderr,"%02x",((uint8_t *)&bnTarget)[i]); - fprintf(stderr," POW ok for ht.%d notaryid.%d\n",height,notaryid); + fprintf(stderr," POW ok for ht.%d notaryid.%d: ",height,notaryid); + for (i=0; i<33; i++) + fprintf(stderr,"%02x",pubkey33[i]); + fprintf(stderr,"\n"); } return true; } From 2eb6b74a261bcd50fe64ebbfd0931dddc42eea3d Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:09:52 +0200 Subject: [PATCH 09/20] Test --- src/komodo_notary.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 6a77ecb77..623889852 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -27,17 +27,17 @@ const char *Notaries_genesis[][2] = { "movecrypto_EU", "021ab53bc6cf2c46b8a5456759f9d608966eff87384c2b52c0ac4cc8dd51e9cc42" }, { "badass_EU", "0209d48554768dd8dada988b98aca23405057ac4b5b46838a9378b95c3e79b9b9e" }, { "crackers_NA", "029e1c01131974f4cd3f564cc0c00eb87a0f9721043fbc1ca60f9bd0a1f73f64a1" }, - { "proto_EU", "03681ffdf17c8f4f0008cefb7fa0779c5e888339cdf932f0974483787a4d6747c1" }, + { "proto_EU", "03681ffdf17c8f4f0008cefb7fa0779c5e888339cdf932f0974483787a4d6747c1" }, // 10 { "jeezy_EU", "023cb3e593fb85c5659688528e9a4f1c4c7f19206edc7e517d20f794ba686fd6d6" }, { "farl4web_EU", "035caa40684ace968677dca3f09098aa02b70e533da32390a7654c626e0cf908e1" }, { "nxtswe_EU", "032fb104e5eaa704a38a52c126af8f67e870d70f82977e5b2f093d5c1c21ae5899" }, { "traderbill_EU", "03196e8de3e2e5d872f31d79d6a859c8704a2198baf0af9c7b21e29656a7eb455f" }, - { "vanbreuk_EU", "024f3cad7601d2399c131fd070e797d9cd8533868685ddbe515daa53c2e26004c3" }, + { "vanbreuk_EU", "024f3cad7601d2399c131fd070e797d9cd8533868685ddbe515daa53c2e26004c3" }, // 15 { "titomane_EU", "03517fcac101fed480ae4f2caf775560065957930d8c1facc83e30077e45bdd199" }, { "supernet_AE", "029d93ef78197dc93892d2a30e5a54865f41e0ca3ab7eb8e3dcbc59c8756b6e355" }, { "supernet_EU", "02061c6278b91fd4ac5cab4401100ffa3b2d5a277e8f71db23401cc071b3665546" }, { "supernet_NA", "033c073366152b6b01535e15dd966a3a8039169584d06e27d92a69889b720d44e1" }, - { "yassin_EU", "033fb7231bb66484081952890d9a03f91164fb27d392d9152ec41336b71b15fbd0" }, + { "yassin_EU", "033fb7231bb66484081952890d9a03f91164fb27d392d9152ec41336b71b15fbd0" }, // 20 { "durerus_EU", "02bcbd287670bdca2c31e5d50130adb5dea1b53198f18abeec7211825f47485d57" }, { "badass_SH", "026b49dd3923b78a592c1b475f208e23698d3f085c4c3b4906a59faf659fd9530b" }, { "badass_NA", "02afa1a9f948e1634a29dc718d218e9d150c531cfa852843a1643a02184a63c1a7" }, @@ -71,7 +71,7 @@ const char *Notaries_elected[][2] = { "crackers_SH", "02be28310e6312d1dd44651fd96f6a44ccc269a321f907502aae81d246fabdb03e" }, { "durerus_EU", "02bcbd287670bdca2c31e5d50130adb5dea1b53198f18abeec7211825f47485d57" }, { "etszombi_AR", "031c79168d15edabf17d9ec99531ea9baa20039d0cdc14d9525863b83341b210e9" }, - { "etszombi_EU", "0281b1ad28d238a2b217e0af123ce020b79e91b9b10ad65a7917216eda6fe64bf7" }, + { "etszombi_EU", "0281b1ad28d238a2b217e0af123ce020b79e91b9b10ad65a7917216eda6fe64bf7" }, // 15 { "etszombi_SH", "025d7a193c0757f7437fad3431f027e7b5ed6c925b77daba52a8755d24bf682dde" }, { "farl4web_EU", "0300ecf9121cccf14cf9423e2adb5d98ce0c4e251721fa345dec2e03abeffbab3f" }, { "farl4web_SH", "0396bb5ed3c57aa1221d7775ae0ff751e4c7dc9be220d0917fa8bbdf670586c030" }, @@ -217,7 +217,7 @@ void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num) memcpy(kp->pubkey,pubkeys[k],33); kp->notaryid = k; HASH_ADD_KEYPTR(hh,N.Notaries,kp->pubkey,33,kp); - if ( 0 && height > 10000 ) + if ( 1 && height > 10000 ) { for (i=0; i<33; i++) printf("%02x",pubkeys[k][i]); From 902ac92da39bbedfde3fd9e9f6025a4637879870 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:14:15 +0200 Subject: [PATCH 10/20] Test --- src/komodo_notary.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 623889852..56739db8a 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -260,7 +260,7 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) return(modval); } } - if ( height >= 300000 ) + if ( height >= 248000 )//300000 ) return(-1); htind = height / KOMODO_ELECTION_GAP; pthread_mutex_lock(&komodo_mutex); From 4ab9dbe9b2a1ea4fd319ba70693a5d7ef67865ad Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:19:05 +0200 Subject: [PATCH 11/20] Test --- src/komodo_notary.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/komodo_notary.h b/src/komodo_notary.h index 56739db8a..e47638c8e 100644 --- a/src/komodo_notary.h +++ b/src/komodo_notary.h @@ -198,7 +198,7 @@ int32_t komodo_notaries(uint8_t pubkeys[64][33],int32_t height) void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num) { static int32_t hwmheight; - int32_t k,i,htind,nonz,height; struct knotary_entry *kp; struct knotaries_entry N; + int32_t k,i,htind,height; struct knotary_entry *kp; struct knotaries_entry N; if ( Pubkeys == 0 ) Pubkeys = (struct knotaries_entry *)calloc(KOMODO_MAXBLOCKS / KOMODO_ELECTION_GAP,sizeof(*Pubkeys)); memset(&N,0,sizeof(N)); @@ -217,7 +217,7 @@ void komodo_notarysinit(int32_t origheight,uint8_t pubkeys[64][33],int32_t num) memcpy(kp->pubkey,pubkeys[k],33); kp->notaryid = k; HASH_ADD_KEYPTR(hh,N.Notaries,kp->pubkey,33,kp); - if ( 1 && height > 10000 ) + if ( 0 && height > 10000 ) { for (i=0; i<33; i++) printf("%02x",pubkeys[k][i]); @@ -260,7 +260,7 @@ int32_t komodo_chosennotary(int32_t *notaryidp,int32_t height,uint8_t *pubkey33) return(modval); } } - if ( height >= 248000 )//300000 ) + if ( height >= 250000 )//300000 ) return(-1); htind = height / KOMODO_ELECTION_GAP; pthread_mutex_lock(&komodo_mutex); @@ -345,7 +345,7 @@ int32_t komodo_notarizeddata(int32_t nHeight,uint256 *notarized_hashp,uint256 *n void komodo_init(int32_t height) { - static int didinit; uint256 zero; int32_t i,k,n; uint8_t pubkeys[64][33]; + static int didinit; uint256 zero; int32_t k,n; uint8_t pubkeys[64][33]; if ( 0 && height != 0 ) printf("komodo_init ht.%d didinit.%d\n",height,didinit); if ( didinit == 0 ) From f0100e72e632b9c02a1d35cd71f6241ffcddb2f0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:29:49 +0200 Subject: [PATCH 12/20] Test --- src/miner.cpp | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 82d177cda..cd095c04a 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -663,9 +663,10 @@ void static BitcoinMiner(CWallet *pwallet) // // Search // - uint8_t pubkeys[66][33]; int mids[66],gpucount,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); + uint8_t pubkeys[66][33]; int mids[256],gpucount,roundrobin_delay,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); savebits = pblock->nBits; arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); + roundrobin_delay = ROUNDROBIN_DELAY; if ( ASSETCHAINS_SYMBOL[0] == 0 && notaryid >= 0 )//komodo_is_special(pindexPrev->nHeight+1,NOTARY_PUBKEY33) > 0 ) { j = 65; @@ -701,7 +702,15 @@ void static BitcoinMiner(CWallet *pwallet) if ( mids[j] == -1 ) gpucount++; } - fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL)); + if ( gpucount > j/3 ) + { + int32_t delta; + i = ((height + notaryid) % 64); + delta = sqrt((double)(gpucount - j/3) / 2); + roundrobin_delay -= delta; + roundrobin_delay += (delta * i) / 64; + } + fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); } for (j=0; j<65; j++) if ( mids[j] == notaryid ) @@ -755,10 +764,10 @@ void static BitcoinMiner(CWallet *pwallet) // fprintf(stderr," missed target\n"); return false; } - if ( ASSETCHAINS_SYMBOL[0] == 0 && Mining_start != 0 && time(NULL) < Mining_start+ROUNDROBIN_DELAY ) + if ( ASSETCHAINS_SYMBOL[0] == 0 && Mining_start != 0 && time(NULL) < Mining_start+roundrobin_delay ) { - //printf("Round robin diff sleep %d\n",(int32_t)(Mining_start+ROUNDROBIN_DELAY-time(NULL))); - int32_t nseconds = Mining_start+ROUNDROBIN_DELAY-time(NULL); + //printf("Round robin diff sleep %d\n",(int32_t)(Mining_start+roundrobin_delay-time(NULL))); + int32_t nseconds = Mining_start+roundrobin_delay-time(NULL); if ( nseconds > 0 ) sleep(nseconds); MilliSleep((rand() % 1700) + 1); From ca3bf7ed8f663b1ff3fe90b2295c8291dbff2789 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:30:12 +0200 Subject: [PATCH 13/20] Test --- src/pow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pow.cpp b/src/pow.cpp index 0ec0f6fae..e0957ab75 100644 --- a/src/pow.cpp +++ b/src/pow.cpp @@ -177,7 +177,7 @@ bool CheckProofOfWork(int32_t height,uint8_t *pubkey33,uint256 hash, unsigned in } else fprintf(stderr,"skip return error height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } else fprintf(stderr,"skip height.%d loading.%d\n",height,KOMODO_LOADINGBLOCKS); } - if ( height > 248000 ) + if ( 0 && height > 248000 ) { for (i=31; i>=0; i--) fprintf(stderr,"%02x",((uint8_t *)&hash)[i]); From 8b51b9e48980d39cc3acfdbdb7739e5c8e49780b Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:31:20 +0200 Subject: [PATCH 14/20] Test --- src/miner.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index cd095c04a..ffc37f5e1 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -549,6 +549,7 @@ int32_t komodo_baseid(char *origbase); int32_t komodo_eligiblenotary(uint8_t pubkeys[66][33],int32_t *mids,int32_t *nonzpkeysp,int32_t height); int32_t FOUND_BLOCK,KOMODO_MAYBEMINED; extern int32_t KOMODO_LASTMINED; +int32_t roundrobin_delay; void static BitcoinMiner(CWallet *pwallet) { @@ -663,7 +664,7 @@ void static BitcoinMiner(CWallet *pwallet) // // Search // - uint8_t pubkeys[66][33]; int mids[256],gpucount,roundrobin_delay,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); + uint8_t pubkeys[66][33]; int mids[256],gpucount,nonzpkeys,i,j,externalflag; uint32_t savebits; int64_t nStart = GetTime(); savebits = pblock->nBits; arith_uint256 hashTarget = arith_uint256().SetCompact(pblock->nBits); roundrobin_delay = ROUNDROBIN_DELAY; From a85440acf81e61756560344136e694ac858a8371 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:32:22 +0200 Subject: [PATCH 15/20] Test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index ffc37f5e1..c1e54c32e 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -706,7 +706,7 @@ void static BitcoinMiner(CWallet *pwallet) if ( gpucount > j/3 ) { int32_t delta; - i = ((height + notaryid) % 64); + i = ((Mining_height + notaryid) % 64); delta = sqrt((double)(gpucount - j/3) / 2); roundrobin_delay -= delta; roundrobin_delay += (delta * i) / 64; From dd98c02d47dcc26eb0b632a42d48e1d5dd5e4a4f Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:46:14 +0200 Subject: [PATCH 16/20] test --- src/miner.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index c1e54c32e..0790f441f 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -705,11 +705,11 @@ void static BitcoinMiner(CWallet *pwallet) } if ( gpucount > j/3 ) { - int32_t delta; + double delta; i = ((Mining_height + notaryid) % 64); delta = sqrt((double)(gpucount - j/3) / 2); - roundrobin_delay -= delta; - roundrobin_delay += (delta * i) / 64; + roundrobin_delay += ((delta * i) / 64) - delta; + printf("delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64) } fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); } From 1a9890f53482355e0e6d4e7709ce1d00b0d4be95 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:49:00 +0200 Subject: [PATCH 17/20] Test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index 0790f441f..f1d168aa4 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -709,7 +709,7 @@ void static BitcoinMiner(CWallet *pwallet) i = ((Mining_height + notaryid) % 64); delta = sqrt((double)(gpucount - j/3) / 2); roundrobin_delay += ((delta * i) / 64) - delta; - printf("delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64) + fprintf(stderr,"delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64) } fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); } From b020e6a38ee772318e8e388a277c7a187aa7a242 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:49:16 +0200 Subject: [PATCH 18/20] Test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index f1d168aa4..80a4d0168 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -709,7 +709,7 @@ void static BitcoinMiner(CWallet *pwallet) i = ((Mining_height + notaryid) % 64); delta = sqrt((double)(gpucount - j/3) / 2); roundrobin_delay += ((delta * i) / 64) - delta; - fprintf(stderr,"delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64) + fprintf(stderr,"delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64); } fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); } From 1812efacf4ab2caa506e94b1a6ccfb670b98c0db Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 18:50:05 +0200 Subject: [PATCH 19/20] Test --- src/miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/miner.cpp b/src/miner.cpp index 80a4d0168..1cb149766 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -709,7 +709,7 @@ void static BitcoinMiner(CWallet *pwallet) i = ((Mining_height + notaryid) % 64); delta = sqrt((double)(gpucount - j/3) / 2); roundrobin_delay += ((delta * i) / 64) - delta; - fprintf(stderr,"delta.%f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64); + fprintf(stderr,"delta.%f %f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64); } fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); } From 67478d4a4cb1f469912b64ebaa0d719fe3ab0338 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sat, 25 Mar 2017 19:06:21 +0200 Subject: [PATCH 20/20] Test --- src/miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/miner.cpp b/src/miner.cpp index 1cb149766..ac1ceff3d 100644 --- a/src/miner.cpp +++ b/src/miner.cpp @@ -707,9 +707,9 @@ void static BitcoinMiner(CWallet *pwallet) { double delta; i = ((Mining_height + notaryid) % 64); - delta = sqrt((double)(gpucount - j/3) / 2); + delta = sqrt((double)gpucount - j/3); roundrobin_delay += ((delta * i) / 64) - delta; - fprintf(stderr,"delta.%f %f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64); + //fprintf(stderr,"delta.%f %f %f\n",delta,(double)(gpucount - j/3) / 2,(delta * i) / 64); } fprintf(stderr," <- prev minerids from ht.%d notary.%d gpucount.%d %.2f%% t.%u %d\n",pindexPrev->nHeight,notaryid,gpucount,100.*(double)gpucount/j,(uint32_t)time(NULL),roundrobin_delay); }