From a268218d115e53f0c8453a42fb3d17e3e6dee8e9 Mon Sep 17 00:00:00 2001 From: jl777 Date: Fri, 25 Jan 2019 01:24:33 -1100 Subject: [PATCH 01/10] Nonz = 0 --- src/komodo_utils.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index 289a84d7c..3701f5257 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1654,7 +1654,7 @@ extern int64_t MAX_MONEY; void komodo_args(char *argv0) { extern const char *Notaries_elected1[][2]; - std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[8192],disablebits[32],*extraptr=0; FILE *fp; uint64_t val; uint16_t port; int32_t i,nonz,baseid,len,n,extralen = 0; uint64_t ccenables[256]; + std::string name,addn; char *dirname,fname[512],arg0str[64],magicstr[9]; uint8_t magic[4],extrabuf[8192],disablebits[32],*extraptr=0; FILE *fp; uint64_t val; uint16_t port; int32_t i,nonz=0,baseid,len,n,extralen = 0; uint64_t ccenables[256]; IS_KOMODO_NOTARY = GetBoolArg("-notary", false); memset(ccenables,0,sizeof(ccenables)); memset(disablebits,0,sizeof(disablebits)); From 2933c4d2a9220576e0fc5766c50c006374282827 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 14 Feb 2019 22:08:20 +0000 Subject: [PATCH 02/10] modified: assetchains.json modified: assetchains.old --- src/assetchains.json | 9 ++++++++- src/assetchains.old | 1 + 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/assetchains.json b/src/assetchains.json index 2775f5db3..c4e61d395 100644 --- a/src/assetchains.json +++ b/src/assetchains.json @@ -240,5 +240,12 @@ "217.182.129.38", "37.187.225.231" ] - } + }, + { + "ac_name": "ILN", + "ac_supply": "10000000000", + "ac_cc": "2", + "addnode": ["51.75.122.83"] + } + ] diff --git a/src/assetchains.old b/src/assetchains.old index 41cbbdae1..c1b2594fe 100755 --- a/src/assetchains.old +++ b/src/assetchains.old @@ -47,4 +47,5 @@ echo $pubkey ./komodod -pubkey=$pubkey -ac_name=ZEX -ac_cc=2 -ac_founders=1 -ac_halving=525600 -ac_reward=13000000000 -ac_pubkey=039d4a50cc70d1184e462a22edb3b66385da97cc8059196f8305c184a3e21440af -addnode=5.9.102.210 & ./komodod -pubkey=$pubkey -ac_name=KSB -ac_supply=1000000000 -ac_end=1 -ac_public=1 -addnode=37.187.225.231 & ./komodod -pubkey=$pubkey -ac_name=OUR -ac_reward=1478310502 -ac_halving=525600 -ac_cc=42 -ac_supply=100000000 -ac_perc=77700 -ac_staked=93 -ac_pubkey=02652a3f3e00b3a1875a918314f0bac838d6dd189a346fa623f5efe9541ac0b98c -ac_public=1 -addnode=51.255.195.65 -addnode=217.182.129.38 -addnode=37.187.225.231 & +./komodod -pubkey=$pubkey -ac_name=ILN -ac_supply=10000000000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=51.75.122.83 & From 8702ec813060035217711e4d8b1bbb2409968ad8 Mon Sep 17 00:00:00 2001 From: Your Name Date: Thu, 14 Feb 2019 22:34:38 +0000 Subject: [PATCH 03/10] new file: ac/ilien new file: fiat/ilien --- src/ac/ilien | 3 +++ src/fiat/ilien | 3 +++ 2 files changed, 6 insertions(+) create mode 100755 src/ac/ilien create mode 100755 src/fiat/ilien diff --git a/src/ac/ilien b/src/ac/ilien new file mode 100755 index 000000000..53e571661 --- /dev/null +++ b/src/ac/ilien @@ -0,0 +1,3 @@ +#!/bin/bash +./komodo-cli -ac_name=ILN $1 $2 $3 $4 $5 $6 + diff --git a/src/fiat/ilien b/src/fiat/ilien new file mode 100755 index 000000000..53e571661 --- /dev/null +++ b/src/fiat/ilien @@ -0,0 +1,3 @@ +#!/bin/bash +./komodo-cli -ac_name=ILN $1 $2 $3 $4 $5 $6 + From b97f4e091ec7fdc60fd88cb3c93c86dfe87c1bf1 Mon Sep 17 00:00:00 2001 From: blackjok3rtt <30971146+blackjok3rtt@users.noreply.github.com> Date: Thu, 14 Mar 2019 16:47:09 +0800 Subject: [PATCH 04/10] fix 100% PoS chain (#1332) --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index c530db4fb..ae9a9360b 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1527,7 +1527,7 @@ int32_t komodo_is_PoSblock(int32_t slowflag,int32_t height,CBlock *pblock,arith_ fprintf(stderr,"ht.%d isPoS.%d utxo not validated -> must be PoW fake\n",height,isPoS); isPoS = 0; } - else + else if ( ASSETCHAINS_STAKED != 100 ) { bnTarget = komodo_PoWtarget(&PoSperc,bnTarget,height,ASSETCHAINS_STAKED); if ( bhash < bnTarget ) From 314b66513926a864514eb16cf5d4d01121c5f2c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihail=20=C2=ABKolo=C2=BB=20Fedorov?= Date: Thu, 21 Mar 2019 10:01:53 +0300 Subject: [PATCH 05/10] RICK & MORTY (#1341) --- src/ac/morty | 2 ++ src/ac/rick | 2 ++ src/assetchains.json | 15 +++++++++++++++ src/assetchains.old | 3 ++- src/fiat/morty | 2 ++ src/fiat/rick | 2 ++ 6 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 src/ac/morty create mode 100755 src/ac/rick create mode 100755 src/fiat/morty create mode 100755 src/fiat/rick diff --git a/src/ac/morty b/src/ac/morty new file mode 100755 index 000000000..4579324b7 --- /dev/null +++ b/src/ac/morty @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=MORTY $1 $2 $3 $4 $5 $6 diff --git a/src/ac/rick b/src/ac/rick new file mode 100755 index 000000000..b68bd56ab --- /dev/null +++ b/src/ac/rick @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=RICK $1 $2 $3 $4 $5 $6 diff --git a/src/assetchains.json b/src/assetchains.json index dfc352a2f..a37e13208 100644 --- a/src/assetchains.json +++ b/src/assetchains.json @@ -243,6 +243,21 @@ "ac_supply": "10000000000", "ac_cc": "2", "addnode": ["51.75.122.83"] + }, + { + "ac_name": "RICK", + "ac_supply": "90000000000", + "ac_reward": "100000000", + "ac_cc": "3", + "addnode": ["138.201.136.145"] + }, + { + "ac_name": "MORTY", + "ac_supply": "90000000000", + "ac_reward": "100000000", + "ac_cc": "3", + "addnode": ["138.201.136.145"] } + ] diff --git a/src/assetchains.old b/src/assetchains.old index cc85f1cd1..d200d26bd 100755 --- a/src/assetchains.old +++ b/src/assetchains.old @@ -47,4 +47,5 @@ echo $pubkey ./komodod -pubkey=$pubkey -ac_name=KSB -ac_supply=1000000000 -ac_end=1 -ac_public=1 -addnode=37.187.225.231 & ./komodod -pubkey=$pubkey -ac_name=OUR -ac_reward=1478310502 -ac_halving=525600 -ac_cc=42 -ac_supply=100000000 -ac_perc=77700 -ac_staked=93 -ac_pubkey=02652a3f3e00b3a1875a918314f0bac838d6dd189a346fa623f5efe9541ac0b98c -ac_public=1 -addnode=51.255.195.65 -addnode=217.182.129.38 -addnode=37.187.225.231 & ./komodod -pubkey=$pubkey -ac_name=ILN -ac_supply=10000000000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=51.75.122.83 & - +./komodod -pubkey=$pubkey -ac_name=RICK -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -addnode=138.201.136.145 & +./komodod -pubkey=$pubkey -ac_name=MORTY -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -addnode=138.201.136.145 & diff --git a/src/fiat/morty b/src/fiat/morty new file mode 100755 index 000000000..99cfa9a09 --- /dev/null +++ b/src/fiat/morty @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=EQL $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/rick b/src/fiat/rick new file mode 100755 index 000000000..99cfa9a09 --- /dev/null +++ b/src/fiat/rick @@ -0,0 +1,2 @@ +#!/bin/bash +./komodo-cli -ac_name=EQL $1 $2 $3 $4 $5 $6 From 5caf0cb306a00980cf11994d458aa6cbdd67677b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mihail=20=C2=ABKolo=C2=BB=20Fedorov?= Date: Thu, 21 Mar 2019 15:36:40 +0300 Subject: [PATCH 06/10] fix rick & morty (#1342) * RICK & MORTY * fix --- src/fiat/morty | 2 +- src/fiat/rick | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/fiat/morty b/src/fiat/morty index 99cfa9a09..4579324b7 100755 --- a/src/fiat/morty +++ b/src/fiat/morty @@ -1,2 +1,2 @@ #!/bin/bash -./komodo-cli -ac_name=EQL $1 $2 $3 $4 $5 $6 +./komodo-cli -ac_name=MORTY $1 $2 $3 $4 $5 $6 diff --git a/src/fiat/rick b/src/fiat/rick index 99cfa9a09..b68bd56ab 100755 --- a/src/fiat/rick +++ b/src/fiat/rick @@ -1,2 +1,2 @@ #!/bin/bash -./komodo-cli -ac_name=EQL $1 $2 $3 $4 $5 $6 +./komodo-cli -ac_name=RICK $1 $2 $3 $4 $5 $6 From b8cdcb25ba1676c60f39a14595e44d57ca7224dc Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 1 Apr 2019 05:37:46 -1100 Subject: [PATCH 07/10] 150000 activation --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index e76da09ec..d5d44bb3d 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1234,7 +1234,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height) n = pblock->vtx[i].vout.size(); for (j=0; j 100000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) + if ( height > 150000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) break; //fprintf(stderr,"(%d %.8f).%d ",i,dstr(pblock->vtx[i].vout[j].nValue),j); if ( i != 0 || j != 1 ) From bed1dd2d1ffc9eaaf96b0d37784a193c0963a61e Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 1 Apr 2019 05:38:52 -1100 Subject: [PATCH 08/10] 225k activation --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index d5d44bb3d..d23dac77a 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1234,7 +1234,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height) n = pblock->vtx[i].vout.size(); for (j=0; j 150000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) + if ( height > 225000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) break; //fprintf(stderr,"(%d %.8f).%d ",i,dstr(pblock->vtx[i].vout[j].nValue),j); if ( i != 0 || j != 1 ) From 7b0a4efdca711257d1ce34cb80f43e10fdd216f0 Mon Sep 17 00:00:00 2001 From: jl777 Date: Mon, 1 Apr 2019 05:39:18 -1100 Subject: [PATCH 09/10] 225k activation --- src/komodo_bitcoind.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/komodo_bitcoind.h b/src/komodo_bitcoind.h index e76da09ec..d23dac77a 100644 --- a/src/komodo_bitcoind.h +++ b/src/komodo_bitcoind.h @@ -1234,7 +1234,7 @@ uint64_t komodo_commission(const CBlock *pblock,int32_t height) n = pblock->vtx[i].vout.size(); for (j=0; j 100000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) + if ( height > 225000 && ASSETCHAINS_STAKED != 0 && txn_count > 1 && i == txn_count-1 && j == n-1 ) break; //fprintf(stderr,"(%d %.8f).%d ",i,dstr(pblock->vtx[i].vout[j].nValue),j); if ( i != 0 || j != 1 ) From 497038ca05656d6da82985dc7c99e91e27c4535b Mon Sep 17 00:00:00 2001 From: zatJUM <45312760+zatJUM@users.noreply.github.com> Date: Tue, 9 Apr 2019 16:59:41 +0000 Subject: [PATCH 10/10] Updates returned strings for cleanwallettransactions --- src/wallet/rpcwallet.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/wallet/rpcwallet.cpp b/src/wallet/rpcwallet.cpp index da9afc215..860333b83 100644 --- a/src/wallet/rpcwallet.cpp +++ b/src/wallet/rpcwallet.cpp @@ -1067,9 +1067,9 @@ UniValue cleanwallettransactions(const UniValue& params, bool fHelp) "1. \"txid\" (string, optional) The transaction id to keep.\n" "\nResult:\n" "{\n" - " \"total_transactons\" : n, (numeric) Transactions in wallet of " + strprintf("%s",komodo_chainname()) + "\n" - " \"remaining_transactons\" : n, (numeric) Transactions in wallet after clean.\n" - " \"removed_transactons\" : n, (numeric) The number of transactions removed.\n" + " \"total_transactions\" : n, (numeric) Transactions in wallet of " + strprintf("%s",komodo_chainname()) + "\n" + " \"remaining_transactions\" : n, (numeric) Transactions in wallet after clean.\n" + " \"removed_transactions\" : n, (numeric) The number of transactions removed.\n" "}\n" "\nExamples:\n" + HelpExampleCli("cleanwallettransactions", "")