Merge pull request jl777#269 from KomodoPlatform/beta

sync master
phm87 · Jan 19, 2020 · b7e4aa0 · b7e4aa0
2 parents 52ab5ef + 3ebaf02
commit b7e4aa0
Show file tree

Hide file tree

Showing 36 changed files with 5 additions and 211 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -50,6 +50,7 @@ build:ubuntu:
   - master
   - beta
   - dev
+  - DEX
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_LINUX}
@@ -85,6 +86,7 @@ build:windows:
   - master
   - beta
   - dev
+  - DEX
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_WINDOWS}
@@ -119,6 +121,7 @@ build:macos:
   - master
   - beta
   - dev
+  - DEX
   artifacts:
     paths:
     - ${AGAMA_ARTIFACTS_MACOS}

diff --git a/src/ac.json b/src/ac.json
@@ -76,11 +76,6 @@
     }
   ,
 
-    "CEAL": {
-      "ac_supply": "366666666"
-    }
-  ,
-
     "MESH": {
       "ac_supply": "1000007"
     }
@@ -102,16 +97,6 @@
     }
   ,
 
-    "PIZZA": {
-      "ac_supply": "100000000"
-    }
-  ,
-
-    "BEER": {
-      "ac_supply": "100000000"
-    }
-  ,
-
     "NINJA": {
       "ac_supply": "100000000"
     }
@@ -122,38 +107,7 @@
       "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",
@@ -207,32 +161,7 @@
       ]
     }
   ,
-
-    "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",

diff --git a/src/ac/beer b/src/ac/beer
diff --git a/src/ac/bntn b/src/ac/bntn
diff --git a/src/ac/ceal b/src/ac/ceal
diff --git a/src/ac/chain b/src/ac/chain
diff --git a/src/ac/commod b/src/ac/commod
diff --git a/src/ac/dion b/src/ac/dion
diff --git a/src/ac/dsec b/src/ac/dsec
diff --git a/src/ac/eql b/src/ac/eql
diff --git a/src/ac/glxt b/src/ac/glxt
diff --git a/src/ac/ilien b/src/ac/ilien
diff --git a/src/ac/kmdice b/src/ac/kmdice
diff --git a/src/ac/mgnx b/src/ac/mgnx
diff --git a/src/ac/mnz b/src/ac/mnz
diff --git a/src/ac/pizza b/src/ac/pizza
diff --git a/src/ac/prlpay b/src/ac/prlpay
diff --git a/src/ac/vote2018 b/src/ac/vote2018
diff --git a/src/ac/vote2019 b/src/ac/vote2019
diff --git a/src/assetchains.json b/src/assetchains.json
@@ -63,10 +63,6 @@
       "ac_name":"KV",
       "ac_supply":"1000000"
   },
-  {
-      "ac_name":"CEAL",
-      "ac_supply":"366666666"
-  },
   {
       "ac_name":"MESH",
       "ac_supply":"1000007"
@@ -93,27 +89,6 @@
       "ac_supply":"216000000",
       "ac_sapling":"5000000"
   },
-  {
-      "ac_name":"BNTN",
-      "ac_supply":"500000000"
-  },
-  {
-      "ac_name":"CHAIN",
-      "ac_supply":"999999"
-  },
-  {
-      "ac_name":"PRLPAY",
-      "ac_supply":"500000000"
-  },
-  {
-      "ac_name":"DSEC",
-      "ac_supply":"7000000"
-  },
-  {
-      "ac_name":"EQL",
-      "ac_supply":"500000000",
-      "ac_ccactivate":"205000"
-  },
   {
       "ac_name":"ZILLA",
       "ac_supply":"11000000",
@@ -162,29 +137,6 @@
           "190.114.254.104"
       ]
   },
-  {
-      "ac_name":"DION",
-      "ac_supply":"3900000000",
-      "ac_reward":"22260000000",
-      "ac_staked":"100",
-      "ac_cc":"1",
-      "ac_end":"4300000000",
-      "addnode":[
-          "51.75.124.34"
-      ]
-  },
-  {
-      "ac_name":"KMDICE",
-      "ac_supply":"10500000",
-      "ac_reward":"2500000000",
-      "ac_halving":"210000",
-      "ac_cc":"2",
-      "addressindex":"1",
-      "spentindex":"1",
-      "addnode":[
-          "144.76.217.232"
-      ]
-  },
   {
       "ac_name":"KSB",
       "ac_supply":"1000000000",
@@ -314,21 +266,6 @@
           "165.22.52.123"
       ]
   },
-  {
-      "ac_name":"COMMOD",
-      "ac_supply":"0",
-      "ac_reward":"204800000000,100000000",
-      "ac_end":"482130,0",
-      "ac_halving":"43830,525960",
-      "ac_decay":"50000000,10000000",
-      "ac_eras":"2",
-      "ac_cc":"777",
-      "ac_public":"1",
-      "addnode":[
-          "34.246.186.176",
-          "34.251.151.148"
-      ]
-  },
   {
       "ac_name":"WLC21",
       "ac_supply":"21000000",

diff --git a/src/assetchains.old b/src/assetchains.old
@@ -18,27 +18,19 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=COQUICASH -ac_supply=72000000 -ac_reward=7200000000 -ac_staked=50 -ac_halving=420000 -ac_cc=2 -ac_ccenable=227,235,236,241 -addnode=78.47.108.168 &
 ./komodod -pubkey=$pubkey -ac_name=WLC -ac_supply=210000000 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=KV -ac_supply=1000000 -addnode=95.213.238.98 $1 &
-./komodod -pubkey=$pubkey -ac_name=CEAL -ac_supply=366666666 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=MESH -ac_supply=1000007 -addnode=95.213.238.98 $1 &
 ./komodod -pubkey=$pubkey -ac_name=AXO -ac_supply=200000000 -ac_ccactivate=130000 -addnode=95.213.238.98 &
 ./komodod -pubkey=$pubkey -ac_name=ETOMIC -ac_supply=100000000 -addnode=95.213.238.98 &
 ./komodod -pubkey=$pubkey -ac_name=BTCH -ac_supply=20998641 -addnode=95.213.238.98 &
 ./komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=95.213.238.98 &
 ./komodod -pubkey=$pubkey -ac_name=OOT -ac_supply=216000000 -ac_sapling=5000000 -addnode=95.213.238.98 &
-./komodod -pubkey=$pubkey -ac_name=BNTN -ac_supply=500000000 -addnode=95.213.238.98 &
-./komodod -pubkey=$pubkey -ac_name=CHAIN -ac_supply=999999 -addnode=95.213.238.98 &
-./komodod -pubkey=$pubkey -ac_name=PRLPAY -ac_supply=500000000 -addnode=13.250.226.125 &
-./komodod -pubkey=$pubkey -ac_name=DSEC -ac_supply=7000000 -addnode=185.148.147.30 &
-./komodod -pubkey=$pubkey -ac_name=EQL -ac_supply=500000000 -ac_ccactivate=205000 -addnode=46.101.124.153 &
 ./komodod -pubkey=$pubkey -ac_name=ZILLA -ac_supply=11000000 -ac_sapling=5000000 -addnode=51.68.215.104 &
 ./komodod -pubkey=$pubkey -ac_name=RFOX -ac_supply=1000000000 -ac_reward=100000000 -addnode=95.213.238.98 &
 ~/VerusCoin/src/verusd -pubkey=$pubkey &
 ./komodod -pubkey=$pubkey -ac_name=SEC -ac_cc=333 -ac_supply=1000000000 -addnode=185.148.145.43 &
 ./komodod -pubkey=$pubkey -ac_name=CCL -ac_supply=200000000 -ac_end=1 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=142.93.136.89 -addnode=195.201.22.89 &
 ./komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=178.63.77.56 &
 ./komodod -pubkey=$pubkey -ac_name=PGT -ac_supply=10000000 -ac_end=1 -addnode=190.114.254.104 &
-./komodod -pubkey=$pubkey -ac_name=KMDICE -ac_supply=10500000 -ac_reward=2500000000 -ac_halving=210000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=144.76.217.232 &
-./komodod -pubkey=$pubkey -ac_name=DION -ac_supply=3900000000 -ac_reward=22260000000 -ac_staked=100 -ac_cc=1 -ac_end=4300000000 -addnode=51.75.124.34 &
 ./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 &
@@ -49,6 +41,5 @@ echo $pubkey
 ./komodod -pubkey=$pubkey -ac_name=K64 -ac_supply=64000777 -ac_reward=0 -ac_staked=10 -addnode=18.197.20.211 &
 ~/hush3/src/komodod -pubkey=$pubkey -ac_name=HUSH3 -ac_sapling=1 -ac_reward=0,1125000000,562500000 -ac_halving=129,340000,840000 -ac_end=128,340000,5422111 -ac_eras=3 -ac_blocktime=150 -ac_cc=2 -ac_ccenable=228,234,235,236,241 -ac_founders=1 -ac_supply=6178674 -ac_perc=11111111 -clientname=GoldenSandtrout -addnode=188.165.212.101 -addnode=136.243.227.142 -addnode=5.9.224.250 -ac_cclib=hush3 -ac_script=76a9145eb10cf64f2bab1b457f1f25e658526155928fac88ac &
 ./komodod -pubkey=$pubkey -ac_name=THC -ac_supply=251253103 -ac_reward=360000000,300000000,240000000,180000000,150000000,90000000,0 -ac_staked=100 -ac_eras=7 -ac_end=500001,1000001,1500001,2000001,2500001,4500001,0 -ac_perc=233333333 -ac_cc=2 -ac_ccenable=229,236,240 -ac_script=2ea22c8020987fad30df055db6fd922c3a57e55d76601229ed3da3b31340112e773df3d0d28103120c008203000401ccb8 -ac_founders=150 -ac_cbmaturity=1 -ac_sapling=1 -addnode=157.230.45.184 -addnode=165.22.52.123 -earlytxid=7e4a76259e99c9379551389e9f757fc5f46c33ae922a8644dc2b187af2a6adc1 &
-./komodod -pubkey=$pubkey -ac_name=COMMOD -ac_supply=0 -ac_reward=204800000000,100000000 -ac_end=482130,0 -ac_halving=43830,525960 -ac_decay=50000000,10000000 -ac_eras=2 -ac_cc=777 -ac_public=1 -addnode=34.246.186.176 -addnode=34.251.151.148 &
 ./komodod -pubkey=$pubkey -ac_name=WLC21 -ac_supply=21000000 -ac_reward=190258751 -ac_staked=90 -ac_public=1 -addnode=37.187.225.231 -addnode=51.38.38.134 &
 
diff --git a/src/fiat/beer b/src/fiat/beer
diff --git a/src/fiat/bntn b/src/fiat/bntn
diff --git a/src/fiat/ceal b/src/fiat/ceal
diff --git a/src/fiat/chain b/src/fiat/chain
diff --git a/src/fiat/commod b/src/fiat/commod
diff --git a/src/fiat/dion b/src/fiat/dion
diff --git a/src/fiat/dsec b/src/fiat/dsec
diff --git a/src/fiat/eql b/src/fiat/eql
diff --git a/src/fiat/glxt b/src/fiat/glxt
diff --git a/src/fiat/ilien b/src/fiat/ilien
diff --git a/src/fiat/kmdice b/src/fiat/kmdice
diff --git a/src/fiat/mgnx b/src/fiat/mgnx
diff --git a/src/fiat/mnz b/src/fiat/mnz
diff --git a/src/fiat/pizza b/src/fiat/pizza
diff --git a/src/fiat/prlpay b/src/fiat/prlpay