From 3661d19dffe5b7db43aa46dc63dcb72aeb7d3850 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sun, 14 Jul 2019 01:22:13 +0800 Subject: [PATCH 1/6] Create ac.json alternative to assetchains.json with ac_name as unique key --- src/ac.json | 340 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 340 insertions(+) create mode 100644 src/ac.json diff --git a/src/ac.json b/src/ac.json new file mode 100644 index 000000000..5d0052730 --- /dev/null +++ b/src/ac.json @@ -0,0 +1,340 @@ +[{ + "REVS": { + "ac_supply": "1300000" + } + }, + { + "SUPERNET": { + "ac_supply": "816061" + } + }, + { + "DEX": { + "ac_supply": "999999" + } + }, + { + "PANGEA": { + "ac_supply": "999999" + } + }, + { + "JUMBLR": { + "ac_supply": "999999" + } + }, + { + "BET": { + "ac_supply": "999999" + } + }, + { + "CRYPTO": { + "ac_supply": "999999" + } + }, + { + "HODL": { + "ac_supply": "9999999" + } + }, + { + "MSHARK": { + "ac_supply": "1400000" + } + }, + { + "BOTS": { + "ac_supply": "999999" + } + }, + { + "MGW": { + "ac_supply": "999999" + } + }, + { + "COQUI": { + "ac_supply": "72000000", + "ac_ccactivate": "200000" + } + }, + { + "WLC": { + "ac_supply": "210000000" + } + }, + { + "KV": { + "ac_supply": "1000000" + } + }, + { + "CEAL": { + "ac_supply": "366666666" + } + }, + { + "MESH": { + "ac_supply": "1000007" + } + }, + { + "AXO": { + "ac_supply": "200000000", + "ac_ccactivate": "130000" + } + }, + { + "ETOMIC": { + "ac_supply": "100000000" + } + }, + { + "BTCH": { + "ac_supply": "20998641" + } + }, + { + "PIZZA": { + "ac_supply": "100000000" + } + }, + { + "BEER": { + "ac_supply": "100000000" + } + }, + { + "NINJA": { + "ac_supply": "100000000" + } + }, + { + "OOT": { + "ac_supply": "216000000", + "ac_sapling": "5000000" + } + }, + { + "BNTN": { + "ac_supply": "500000000" + } + }, + { + "CHAIN": { + "ac_supply": "999999" + } + }, + { + "PRLPAY": { + "ac_supply": "500000000" + } + }, + { + "DSEC": { + "ac_supply": "7000000" + } + }, + { + "GLXT": { + "ac_supply": "10000000000" + } + }, + { + "EQL": { + "ac_supply": "500000000", + "ac_ccactivate": "205000" + } + }, + { + "ZILLA": { + "ac_supply": "11000000", + "ac_sapling": "5000000", + "addnode": [ + "51.68.215.104" + ] + } + }, + { + "RFOX": { + "ac_supply": "1000000000", + "ac_reward": "100000000" + } + }, + { + "SEC": { + "ac_supply": "1000000000", + "ac_cc": "333" + } + }, + { + "CCL": { + "ac_supply": "200000000", + "ac_end": "1", + "ac_cc": "2", + "addressindex": "1", + "spentindex": "1", + "addnode": [ + "142.93.136.89", + "195.201.22.89" + ] + } + }, + { + "PIRATE": { + "ac_supply": "0", + "ac_reward": "25600000000", + "ac_halving": "77777", + "ac_private": "1", + "addnode": [ + "136.243.102.225" + ] + } + }, + { + "PGT": { + "ac_supply": "10000000", + "ac_end": "1", + "addnode": [ + "190.114.254.104" + ] + } + }, + { + "DION": { + "ac_supply": "3900000000", + "ac_reward": "22260000000", + "ac_staked": "100", + "ac_cc": "1", + "ac_end": "4300000000", + "addnode": [ + "51.75.124.34" + ] + } + }, + { + "KMDICE": { + "ac_supply": "10500000", + "ac_reward": "2500000000", + "ac_halving": "210000", + "ac_cc": "2", + "addressindex": "1", + "spentindex": "1", + "addnode": [ + "144.76.217.232" + ] + } + }, + { + "KSB": { + "ac_supply": "1000000000", + "ac_end": "1", + "ac_public": "1", + "addnode": [ + "37.187.225.231" + ] + } + }, + { + "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", + "217.182.129.38", + "37.187.225.231" + ] + } + }, + { + "ILN": { + "ac_supply": "10000000000", + "ac_cc": "2", + "addnode": ["51.75.122.83"] + } + }, + { + "RICK": { + "ac_supply": "90000000000", + "ac_reward": "100000000", + "ac_cc": "3", + "addnode": ["138.201.136.145"] + } + }, + { + "MORTY": { + "ac_supply": "90000000000", + "ac_reward": "100000000", + "ac_cc": "3", + "addnode": ["138.201.136.145"] + } + }, + { + "VOTE2019": { + "ac_supply": "123651638", + "ac_public": "1", + "addnode": ["95.213.238.98"] + } + }, + { + "KOIN": { + "ac_supply": "125000000", + "addnode": ["3.0.32.10"] + } + }, + { + "ZEXO": { + "ac_reward": "1478310502", + "ac_halving": "525600", + "ac_cc": "42", + "ac_ccenable": "236", + "ac_supply": "100000000", + "ac_perc": "77700", + "ac_staked": "93", + "ac_pubkey": "02713bd85e054db923694b6b7a85306264edf4d6bd6d331814f2b40af444b3ebbc", + "ac_public": "1", + "addnode": [ + "195.201.20.230", + "80.240.17.222" + ] + } + }, + { + "K64": { + "ac_reward": "0", + "ac_supply": "64000777", + "ac_staked": "10", + "addnode": ["18.197.20.21"] + } + }, + { + "HUSH3": { + "ac_sapling": "1", + "ac_founders": "1", + "ac_reward": "0,1125000000,562500000", + "ac_end": "128,340000,5422111", + "ac_blocktime": "150", + "ac_supply": "6178674", + "ac_halving": "129,340000,840000", + "ac_cc": "2", + "ac_cclib": "hush3", + "ac_ccenable": "228,234,235,236,241", + "ac_perc": "11111111", + "ac_eras": "3", + "ac_script": "76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac", + "clientname": "GoldenSandtrout", + "addnode": [ + "188.165.212.101", + "136.243.227.142", + "5.9.224.250" + ] + } + } +] From 2ed03590afec86ac57b278a9bc9604a37ce8ca7f Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sun, 14 Jul 2019 01:25:17 +0800 Subject: [PATCH 2/6] Update ac.json removed outer array --- src/ac.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/ac.json b/src/ac.json index 5d0052730..d57dbb8b7 100644 --- a/src/ac.json +++ b/src/ac.json @@ -1,4 +1,4 @@ -[{ +{ "REVS": { "ac_supply": "1300000" } @@ -337,4 +337,3 @@ ] } } -] From 8a20e3a9e7e790f92e0f626fc1dd1ac65f7d3cec Mon Sep 17 00:00:00 2001 From: Dwy ! Date: Sat, 13 Jul 2019 20:15:38 +0200 Subject: [PATCH 3/6] fixed ac.json --- src/ac.json | 186 ++++++++++++++++++++++++++-------------------------- 1 file changed, 93 insertions(+), 93 deletions(-) diff --git a/src/ac.json b/src/ac.json index d57dbb8b7..4f75d2f8c 100644 --- a/src/ac.json +++ b/src/ac.json @@ -2,152 +2,152 @@ "REVS": { "ac_supply": "1300000" } - }, - { + , + "SUPERNET": { "ac_supply": "816061" } - }, - { + , + "DEX": { "ac_supply": "999999" } - }, - { + , + "PANGEA": { "ac_supply": "999999" } - }, - { + + , "JUMBLR": { "ac_supply": "999999" } - }, - { + , + "BET": { "ac_supply": "999999" } - }, - { + , + "CRYPTO": { "ac_supply": "999999" } - }, - { + , + "HODL": { "ac_supply": "9999999" } - }, - { + , + "MSHARK": { "ac_supply": "1400000" } - }, - { + , + "BOTS": { "ac_supply": "999999" } - }, - { + , + "MGW": { "ac_supply": "999999" } - }, - { + , + "COQUI": { "ac_supply": "72000000", "ac_ccactivate": "200000" } - }, - { + , + "WLC": { "ac_supply": "210000000" } - }, - { + , + "KV": { "ac_supply": "1000000" } - }, - { + , + "CEAL": { "ac_supply": "366666666" } - }, - { + , + "MESH": { "ac_supply": "1000007" } - }, - { + , + "AXO": { "ac_supply": "200000000", "ac_ccactivate": "130000" } - }, - { + , + "ETOMIC": { "ac_supply": "100000000" } - }, - { + , + "BTCH": { "ac_supply": "20998641" } - }, - { + , + "PIZZA": { "ac_supply": "100000000" } - }, - { + , + "BEER": { "ac_supply": "100000000" } - }, - { + , + "NINJA": { "ac_supply": "100000000" } - }, - { + , + "OOT": { "ac_supply": "216000000", "ac_sapling": "5000000" } - }, - { + , + "BNTN": { "ac_supply": "500000000" } - }, - { + , + "CHAIN": { "ac_supply": "999999" } - }, - { + , + "PRLPAY": { "ac_supply": "500000000" } - }, - { + , + "DSEC": { "ac_supply": "7000000" } - }, - { + , + "GLXT": { "ac_supply": "10000000000" } - }, - { + , + "EQL": { "ac_supply": "500000000", "ac_ccactivate": "205000" } - }, - { + , + "ZILLA": { "ac_supply": "11000000", "ac_sapling": "5000000", @@ -155,20 +155,20 @@ "51.68.215.104" ] } - }, - { + , + "RFOX": { "ac_supply": "1000000000", "ac_reward": "100000000" } - }, - { + , + "SEC": { "ac_supply": "1000000000", "ac_cc": "333" } - }, - { + , + "CCL": { "ac_supply": "200000000", "ac_end": "1", @@ -180,8 +180,8 @@ "195.201.22.89" ] } - }, - { + , + "PIRATE": { "ac_supply": "0", "ac_reward": "25600000000", @@ -191,8 +191,8 @@ "136.243.102.225" ] } - }, - { + , + "PGT": { "ac_supply": "10000000", "ac_end": "1", @@ -200,8 +200,8 @@ "190.114.254.104" ] } - }, - { + , + "DION": { "ac_supply": "3900000000", "ac_reward": "22260000000", @@ -212,8 +212,8 @@ "51.75.124.34" ] } - }, - { + , + "KMDICE": { "ac_supply": "10500000", "ac_reward": "2500000000", @@ -225,8 +225,8 @@ "144.76.217.232" ] } - }, - { + , + "KSB": { "ac_supply": "1000000000", "ac_end": "1", @@ -235,8 +235,8 @@ "37.187.225.231" ] } - }, - { + , + "OUR": { "ac_reward": "1478310502", "ac_halving": "525600", @@ -252,44 +252,44 @@ "37.187.225.231" ] } - }, - { + , + "ILN": { "ac_supply": "10000000000", "ac_cc": "2", "addnode": ["51.75.122.83"] } - }, - { + , + "RICK": { "ac_supply": "90000000000", "ac_reward": "100000000", "ac_cc": "3", "addnode": ["138.201.136.145"] } - }, - { + , + "MORTY": { "ac_supply": "90000000000", "ac_reward": "100000000", "ac_cc": "3", "addnode": ["138.201.136.145"] } - }, - { + , + "VOTE2019": { "ac_supply": "123651638", "ac_public": "1", "addnode": ["95.213.238.98"] } - }, - { + , + "KOIN": { "ac_supply": "125000000", "addnode": ["3.0.32.10"] } - }, - { + , + "ZEXO": { "ac_reward": "1478310502", "ac_halving": "525600", @@ -305,16 +305,16 @@ "80.240.17.222" ] } - }, - { + , + "K64": { "ac_reward": "0", "ac_supply": "64000777", "ac_staked": "10", "addnode": ["18.197.20.21"] } - }, - { + , + "HUSH3": { "ac_sapling": "1", "ac_founders": "1", @@ -336,4 +336,4 @@ "5.9.224.250" ] } - } +} \ No newline at end of file From f186490cdcbce945ea5aa6790f2a967786fd32a3 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:36:52 +0800 Subject: [PATCH 4/6] update to COQUICASH, remove VOTE2019 --- src/ac.json | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/ac.json b/src/ac.json index 4f75d2f8c..7f3f7ba03 100644 --- a/src/ac.json +++ b/src/ac.json @@ -53,13 +53,19 @@ "ac_supply": "999999" } , - - "COQUI": { + "COQUICASH": { "ac_supply": "72000000", - "ac_ccactivate": "200000" + "ac_reward": "7200000000", + "ac_staked": "50", + "ac_halving": "420000", + "ac_cc": "2", + "ac_ccenable": "227,235,236,241", + "addnode": [ + "78.47.108.168" + ] } - , - + , + "WLC": { "ac_supply": "210000000" } @@ -277,13 +283,6 @@ } , - "VOTE2019": { - "ac_supply": "123651638", - "ac_public": "1", - "addnode": ["95.213.238.98"] - } - , - "KOIN": { "ac_supply": "125000000", "addnode": ["3.0.32.10"] @@ -336,4 +335,4 @@ "5.9.224.250" ] } -} \ No newline at end of file +} From b1d53487734bc4256f51514fce039af1e80a7484 Mon Sep 17 00:00:00 2001 From: smk762 <35845239+smk762@users.noreply.github.com> Date: Sun, 14 Jul 2019 15:38:31 +0800 Subject: [PATCH 5/6] update to COQUICASH, remove VOTE2019 --- src/assetchains.json | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/src/assetchains.json b/src/assetchains.json index 20dd04ee2..e68872d6b 100644 --- a/src/assetchains.json +++ b/src/assetchains.json @@ -44,9 +44,16 @@ "ac_supply": "999999" }, { - "ac_name": "COQUI", + "ac_name": "COQUICASH", "ac_supply": "72000000", - "ac_ccactivate": "200000" + "ac_reward": "7200000000", + "ac_staked": "50", + "ac_halving": "420000", + "ac_cc": "2", + "ac_ccenable": "227,235,236,241", + "addnode": [ + "78.47.108.168" + ] }, { "ac_name": "WLC", @@ -235,12 +242,6 @@ "ac_cc": "3", "addnode": ["138.201.136.145"] }, - { - "ac_name": "VOTE2019", - "ac_supply": "123651638", - "ac_public": "1", - "addnode": ["95.213.238.98"] - }, { "ac_name": "KOIN", "ac_supply": "125000000", From bf40254a7e3738adface1578625725c238e7446d Mon Sep 17 00:00:00 2001 From: jl777 Date: Thu, 18 Jul 2019 03:04:20 -1100 Subject: [PATCH 6/6] Fix spurious prints of deactivate --- src/komodo_utils.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/komodo_utils.h b/src/komodo_utils.h index a9a06c80f..65601e655 100644 --- a/src/komodo_utils.h +++ b/src/komodo_utils.h @@ -1769,6 +1769,8 @@ void komodo_args(char *argv0) { int32_t ecode = ccEnablesHeight[i]; int32_t ht = ccEnablesHeight[i+1]; + if ( i > 1 && ccEnablesHeight[i-2] == ecode ) + break; if ( ecode > 255 || ecode < 0 ) fprintf(stderr, "ac_ccactivateht: invalid evalcode.%i must be between 0 and 256.\n", ecode); else if ( ht > 0 )