Merge pull request #571 from KomodoPlatform/dev

KomodoPlatform · Oct 19, 2024 · 9d4d51a · 9d4d51a
2 parents e7ecc23 + d500d31
commit 9d4d51a
Show file tree

Hide file tree

Showing 10 changed files with 87 additions and 41 deletions.
diff --git a/README.md b/README.md
@@ -55,18 +55,16 @@ General [Setup instructions](https://github.com/KomodoPlatform/Documentation/blo
 
 | Coin     | src                                                      | Version/Tree                                                                                           | Status                                                                                                  | dPoW         |
 | -------- | -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------- | ------------ |
-| KMD      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/KMD_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-Mainnet |
+| KMD      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/KMD_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-Mainnet |
 | LTC      | [litecoin](https://github.com/litecoin-project/litecoin) | [0.16](https://github.com/litecoin-project/litecoin/tree/69fce744115a7d2889ff1b90e89582b83de405ad)     | [![dPOW Status](https://badges.komodo.earth/svg/KMD_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-Mainnet |
-| CCL      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/CCL_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
-| CLC      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/CLC_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
-| DOC      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-mainnet |
-| GLEEC    | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/GLEECOLD_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
-| ILN      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/ILN_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
-| KOIN     | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/KOIN_badge.svg?maxAge=60)](https://komodostats.com)     | dPoW-mainnet |
-| MARTY    | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-mainnet |
-| NINJA    | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/NINJA_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-mainnet |
-| PIRATE   | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/PIRATE_badge.svg?maxAge=60)](https://komodostats.com)   | dPoW-mainnet |
-| SUPERNET | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/SUPERNET_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
-| THC      | [komodo](https://github.com/komodoplatform/komodo)       | [bf8ace3](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)    | [![dPOW Status](https://badges.komodo.earth/svg/THC_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
+| CCL      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/CCL_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
+| CLC      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/CLC_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
+| DOC      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-mainnet |
+| GLEEC    | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/GLEECOLD_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
+| ILN      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/ILN_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
+| KOIN     | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/KOIN_badge.svg?maxAge=60)](https://komodostats.com)     | dPoW-mainnet |
+| MARTY    | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-mainnet |
+| PIRATE   | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/PIRATE_badge.svg?maxAge=60)](https://komodostats.com)   | dPoW-mainnet |
+| THC      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/THC_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-mainnet |
 | MCL      | [marmarachain](https://github.com/marmarachain/marmara)  | [7938b2c](https://github.com/marmarachain/marmara/commit/7938b2cb5d791ee30790384903a61a4934b7e8f1)     | [![dPOW Status](https://badges.komodo.earth/svg/MCL_badge.svg?maxAge=60)](https://komodostats.com)      | dPoW-3p      |
 | TOKEL    | [tokel](https://github.com/TokelPlatform/tokel)          | [b97260d](https://github.com/TokelPlatform/tokel/commit/b97260d4ac9d91f6bd28b116a1cee794a3a3035e)      | [![dPOW Status](https://badges.komodo.earth/svg/TOKEL_badge.svg?maxAge=60)](https://komodostats.com)    | dPoW-3P      |
diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.8.1
+
+- Removes `SUPERNET`, `NINJA`
+- Updates `komodod` to [`bf8ace3`](https://github.com/KomodoPlatform/komodo/commit/bf8ace347f6a684dcb8738e4943474113bdde6ca)
+
 ## 0.8.0
 
 - Adds new GLEEC chain, moves old GLEEC to GLEEC_OLD

diff --git a/doc/daemon_versions.json b/doc/daemon_versions.json
@@ -1,17 +1,15 @@
 {
-    "KMD": "bf8ace3",
+    "KMD": "2651eaf",
     "LTC": "0.16",
-    "CCL": "bf8ace3",
-    "CLC": "bf8ace3",
-    "DOC": "bf8ace3",
-    "GLEEC": "bf8ace3",
-    "ILN": "bf8ace3",
-    "KOIN": "bf8ace3",
-    "MARTY": "bf8ace3",
-    "NINJA": "bf8ace3",
-    "PIRATE": "bf8ace3",
-    "SUPERNET": "bf8ace3",
-    "THC": "bf8ace3",
+    "CCL": "2651eaf",
+    "CLC": "2651eaf",
+    "DOC": "2651eaf",
+    "GLEEC": "2651eaf",
+    "ILN": "2651eaf",
+    "KOIN": "2651eaf",
+    "MARTY": "2651eaf",
+    "PIRATE": "2651eaf",
+    "THC": "2651eaf",
     "MCL": "7938b2c",
     "TOKEL": "b97260d"
 }
diff --git a/doc/update081.md b/doc/update081.md
@@ -0,0 +1,60 @@
+# dPoW 0.8.1 update information
+
+### Stop and remove `SUPERNET` & `NINJA`
+
+```bash
+komodo-cli -ac_name=SUPERNET stop
+komodo-cli -ac_name=NINJA stop
+rm -rf ~/.komodo/SUPERNET
+rm -rf ~/.komodo/NINJA
+```
+
+### Prepare GLEEC_OLD datafolder by create a symlink (mandatory)
+
+ln -s -f $HOME/.komodo/GLEEC_OLD/GLEEC.conf $HOME/.komodo/GLEEC_OLD/GLEEC_OLD.conf
+
+### Update `komodod` on main node
+
+```bash
+cd ~/komodo/
+git fetch --all
+git checkout 2651eaf
+./zcutil/build.sh -j$(nproc)
+```
+
+### Restart the old GLEEC chain
+
+```bash
+komodo-cli -ac_name=GLEEC -datadir=$HOME/.komodo/GLEEC_OLD stop; sleep 5
+~/dPoW/iguana/checkGLEEC.sh # check the GLEEC installation
+source pubkey.txt
+komodod -ac_name=GLEEC -ac_supply=210000000 -ac_public=1 -ac_staked=100 -datadir=${HOME}/.komodo/GLEEC_OLD -addnode=95.217.161.126 -addnode=209.222.101.247 -addnode=103.195.100.32 &
+```
+
+### Make sure the old GLEEC chain is running smoothly and has caught up with the latest notarizations
+```bash
+komodo-cli -ac_name=GLEEC -datadir=$HOME/.komodo/GLEEC_OLD getinfo
+# It should look like this: https://github.com/KomodoPlatform/komodo/pull/637#issue-2586189960
+# i.e., the notarized block height should be close to the longest chain, and the name should be GLEEC_OLD.
+```
+
+This ensures the old GLEEC chain is functioning as expected and is up-to-date with notarizations.
+
+### Restart Iguana
+
+```bash
+# Update dPoW repo
+cd ~/dPoW
+git checkout master
+git pull
+
+# Restart Iguana
+pkill -9 iguana
+cd iguana
+./m_notary_build
+./m_notary_main
+```
+
+Make sure notarisations are progressing.
+
+
diff --git a/iguana/assetchains.json b/iguana/assetchains.json
@@ -64,11 +64,6 @@
     "ac_staked": "10",
     "addnode": ["209.222.101.247", "103.195.100.32", "65.21.77.109", "65.21.51.47", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
   },  
-  {
-    "ac_name": "NINJA",
-    "ac_supply": "100000000",
-    "addnode": ["209.222.101.247", "103.195.100.32", "209.222.101.247", "103.195.100.32", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
-  },
   {
     "ac_name": "PIRATE",
     "ac_supply": "0",
@@ -77,12 +72,6 @@
     "ac_private": "1",
     "addnode": ["209.222.101.247", "103.195.100.32", "88.99.212.81", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
   },
-  {
-    "ac_name": "SUPERNET",
-    "ac_supply": "816061",
-    "addnode": ["209.222.101.247", "103.195.100.32", "209.222.101.247", "103.195.100.32", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
-
-  },
   {
     "ac_name": "THC",
     "ac_supply": "251253103",

diff --git a/iguana/assetchains.old b/iguana/assetchains.old
@@ -34,7 +34,5 @@ ${PREFIX}komodod -pubkey=$pubkey -ac_name=GLEEC -ac_supply=1000000000 -ac_end=1
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=ILN -ac_supply=10000000000 -ac_cc=2 -addressindex=1 -spentindex=1 -addnode=51.75.122.83 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=KOIN -ac_supply=125000000 -addnode=3.0.32.10 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=MARTY -ac_supply=90000000000 -ac_reward=100000000 -ac_cc=3 -ac_staked=10 -addnode=65.21.77.109 -addnode=65.21.51.47 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
-${PREFIX}komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=95.213.238.98 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=PIRATE -ac_supply=0 -ac_reward=25600000000 -ac_halving=77777 -ac_private=1 -addnode=88.99.212.81 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
-${PREFIX}komodod -pubkey=$pubkey -ac_name=SUPERNET -ac_supply=816061 -addnode=95.213.238.98 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
 ${PREFIX}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 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
diff --git a/iguana/coins/ninja_7776 b/iguana/coins/ninja_7776