From 82ddb2ef5eac8458e2a3187fa0fe962c71b98085 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 29 Jul 2018 00:05:42 -1100 Subject: [PATCH 1/4] VRSC halving changes --- iguana/exchanges/LP_privkey.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/iguana/exchanges/LP_privkey.c b/iguana/exchanges/LP_privkey.c index 727f5f358..5e97cab6e 100644 --- a/iguana/exchanges/LP_privkey.c +++ b/iguana/exchanges/LP_privkey.c @@ -547,6 +547,14 @@ char *verusblocks() value = jdouble(vout,"value"); supply += value; hexstr = 0; + if ( m == 1 && (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 ) + { + if ( strcmp(hexstr,"2102ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92ac") == 0 || strcmp(hexstr,"76a914cc39e9e699f86b03a5cf1d7f2a0b411cf652641788ac") == 0 ) + { + powsum += value, npow++; + fprintf(stderr,"PoW block\n"); + } + } if ( m == 2 && (vout1= jitem(vouts,1)) != 0 ) { // 6a2001039bbc0bb17576a9149a3af738444dd86b55c86752247aec2e7deb842688ac @@ -566,7 +574,7 @@ char *verusblocks() locked = ((int32_t)script[6] << 16) + ((int32_t)script[5] << 8) + script[4]; addr0 = firstaddr; } else printf("unexpected vout1.(%s) (%s).%d %.8f\n",jprint(vout1,0),hexstr!=0?hexstr:"",(int32_t)strlen(hexstr),jdouble(vout1,"value")); - } else printf("coinbase without opret (%s)\n",jprint(vouts,0)); + } //else printf("coinbase without opret (%s)\n",jprint(vouts,0)); } } free_json(txobj); From c018089fa35b95c8ea109ef2be302bb0c7976de1 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 29 Jul 2018 00:08:10 -1100 Subject: [PATCH 2/4] Got block --- iguana/exchanges/LP_privkey.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/iguana/exchanges/LP_privkey.c b/iguana/exchanges/LP_privkey.c index 5e97cab6e..51221e859 100644 --- a/iguana/exchanges/LP_privkey.c +++ b/iguana/exchanges/LP_privkey.c @@ -504,7 +504,7 @@ void verus_utxos(struct iguana_info *coin,char *coinaddr) char *verusblocks() { - bits256 hash,txid; uint8_t script[44]; double value,avestakedsize,stakedval,RTu3sum,powsum,supply,possum,histo[1280],myhisto[1280]; int32_t num10,num17,num20,num16,num23000,numpow,numpos,num,locked,height,i,m,n,z,numstaked,posflag,npos,npow; char hashstr[64],firstaddr[64],stakingaddr[64],*addr0,*lastaddr,*hexstr; cJSON *blockjson,*txobj,*vouts,*vout,*vout1,*sobj,*addresses,*txs; + bits256 hash,txid; uint8_t script[44]; double value,avestakedsize,stakedval,RTu3sum,powsum,supply,possum,histo[1280],myhisto[1280]; int32_t num10,num17,num20,num16,num23000,numpow,numpos,num,locked,height,i,m,n,z,gotblock,numstaked,posflag,npos,npow; char hashstr[64],firstaddr[64],stakingaddr[64],*addr0,*lastaddr,*hexstr; cJSON *blockjson,*txobj,*vouts,*vout,*vout1,*sobj,*addresses,*txs; struct iguana_info *coin = LP_coinfind("VRSC"); if ( coin == 0 ) return(clonestr("{\"error\":\"VRSC not active\"}")); @@ -533,6 +533,7 @@ char *verusblocks() value = 0; posflag = 0; locked = 0; + gotblock = 0; lastaddr = addr0 = ""; memset(script,0,sizeof(script)); memset(firstaddr,0,sizeof(firstaddr)); @@ -547,12 +548,11 @@ char *verusblocks() value = jdouble(vout,"value"); supply += value; hexstr = 0; - if ( m == 1 && (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 ) + if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 ) { if ( strcmp(hexstr,"2102ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92ac") == 0 || strcmp(hexstr,"76a914cc39e9e699f86b03a5cf1d7f2a0b411cf652641788ac") == 0 ) { - powsum += value, npow++; - fprintf(stderr,"PoW block\n"); + gotblock = 1; } } if ( m == 2 && (vout1= jitem(vouts,1)) != 0 ) @@ -638,7 +638,7 @@ char *verusblocks() numpow++; if ( num < 100 && strcmp(coinaddr,addr0) == 0 ) printf("ht.%-5d lock.%-7d PoW coinbase.(%s) %.8f\n",height,locked,addr0,value); - if ( strcmp(coinaddr,addr0) == 0 ) + if ( strcmp(coinaddr,addr0) == 0 || gotblock != 0 ) powsum += value, npow++; } histo[locked/1000] += value; From feac27c7fe9c77a89979bd0013ce3c1a308f4217 Mon Sep 17 00:00:00 2001 From: jl777 Date: Sun, 29 Jul 2018 01:37:35 -1100 Subject: [PATCH 3/4] Check all variants --- iguana/exchanges/LP_privkey.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/iguana/exchanges/LP_privkey.c b/iguana/exchanges/LP_privkey.c index 51221e859..716bfc30b 100644 --- a/iguana/exchanges/LP_privkey.c +++ b/iguana/exchanges/LP_privkey.c @@ -550,7 +550,7 @@ char *verusblocks() hexstr = 0; if ( (sobj= jobj(vout,"scriptPubKey")) != 0 && (hexstr= jstr(sobj,"hex")) != 0 ) { - if ( strcmp(hexstr,"2102ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92ac") == 0 || strcmp(hexstr,"76a914cc39e9e699f86b03a5cf1d7f2a0b411cf652641788ac") == 0 ) + if ( strcmp(hexstr,"2102ebc786cb83de8dc3922ab83c21f3f8a2f3216940c3bf9da43ce39e2a3a882c92ac") == 0 || strcmp(hexstr,"2102aef0f54a967031f4c63b36d12741fbb9ca39713baedfff7f8c0d0d8ee14ee0ebac") == 0 || strcmp(hexstr,"76a914cc39e9e699f86b03a5cf1d7f2a0b411cf652641788ac") == 0 || strcmp(hexstr,"76a91459fdba29ea85c65ad90f6d38f7a6646476b26b1688ac") == 0 ) { gotblock = 1; } From 06948675b7a5f1fed9361b01239648628f9f3ae5 Mon Sep 17 00:00:00 2001 From: jl777 Date: Wed, 8 Aug 2018 06:28:58 -1100 Subject: [PATCH 4/4] Update ipaddrs --- iguana/dpow/dpow_network.c | 4 ++-- iguana/m_notary_run | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/iguana/dpow/dpow_network.c b/iguana/dpow/dpow_network.c index 5343f33c6..a2b2bb01d 100755 --- a/iguana/dpow/dpow_network.c +++ b/iguana/dpow/dpow_network.c @@ -1308,8 +1308,8 @@ int32_t dpow_addnotary(struct supernet_info *myinfo,struct dpow_info *dp,char *i char str[512]; uint32_t ipbits,*ptr; int32_t i,iter,n,retval = -1; if ( myinfo->IAMNOTARY == 0 ) return(-1); - if ( strcmp(ipaddr,"88.99.251.101") == 0 || strcmp(ipaddr,"82.202.193.100") == 0 ) - return(-1); + //if ( strcmp(ipaddr,"88.99.251.101") == 0 || strcmp(ipaddr,"82.202.193.100") == 0 ) + // return(-1); portable_mutex_lock(&myinfo->notarymutex); if ( myinfo->dpowsock >= 0 )//&& myinfo->dexsock >= 0 ) { diff --git a/iguana/m_notary_run b/iguana/m_notary_run index e62a90669..770e30e6f 100755 --- a/iguana/m_notary_run +++ b/iguana/m_notary_run @@ -26,6 +26,8 @@ curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"ad curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"138.121.203.210\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"139.99.149.41\"}" curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"209.58.169.65\"}" +curl --url "http://127.0.0.1:7776" --data "{\"agent\":\"iguana\",\"method\":\"addnotary\",\"ipaddr\":\"5.189.232.34\"}" + #tests/addnotarys_7776 coins/btc_7776