Merge pull request #582 from KomodoPlatform/dev

KomodoPlatform · Jan 27, 2025 · 2f846c0 · 2f846c0
2 parents c1c428d + 12513ea
commit 2f846c0
Show file tree

Hide file tree

Showing 10 changed files with 82 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -60,11 +60,9 @@ General [Setup instructions](https://github.com/KomodoPlatform/Documentation/blo
 | BCZERO   | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/BCZERO_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 |
 | MDX      | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/MDX_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 |
 | RAPH     | [komodo](https://github.com/komodoplatform/komodo)       | [2651eaf](https://github.com/KomodoPlatform/komodo/commit/2651eafc5219de3775cb08ff128c334d4c812aa9)    | [![dPOW Status](https://badges.komodo.earth/svg/RAPH_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |

diff --git a/doc/changelog.md b/doc/changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 0.8.4
+
+- Removes `DOC`, `MARTY` from dPoW
+
 ## 0.8.3
 
 - Adds `BCZERO`, `RAPH`, `MDX` chains to dPoW

diff --git a/doc/daemon_versions.json b/doc/daemon_versions.json
@@ -4,11 +4,9 @@
     "BCZERO": "2651eaf",
     "CCL": "2651eaf",
     "CLC": "2651eaf",
-    "DOC": "2651eaf",
     "GLEEC": "2651eaf",
     "ILN": "2651eaf",
     "KOIN": "2651eaf",
-    "MARTY": "2651eaf",
     "MDX": "2651eaf",
     "PIRATE": "2651eaf",
     "RAPH": "2651eaf",

diff --git a/doc/scoring_epochs.json b/doc/scoring_epochs.json
@@ -168,6 +168,48 @@
 		"season_overtime_end_comment": "TBA",
 		"Servers": {
 			"dPoW-Mainnet": {
+				"SUPERNET": {
+					"start_time": 1728049053,
+					"start_time_comment": "S8 start",
+					"end_time": 1729521795,
+					"end_time_comment": "commit 6ec95c663bd58099e0a160bec66cc01525261764 +24hrs"
+				},
+				"NINJA": {
+					"start_time": 1728049053,
+					"start_time_comment": "S8 start",
+					"end_time": 1729521795,
+					"end_time_comment": "commit 6ec95c663bd58099e0a160bec66cc01525261764 +24hrs"
+				},
+				"BCZERO": {
+					"start_time": 1737306978,
+					"start_time_comment": "commit 86db2fc03255d6615826ebe00e78b2183b41b22f +24hrs",
+					"end_time": 1999999999,
+					"end_time_comment": "S8 end"
+				},
+				"RAPH": {
+					"start_time": 1737306978,
+					"start_time_comment": "commit 86db2fc03255d6615826ebe00e78b2183b41b22f +24hrs",
+					"end_time": 1999999999,
+					"end_time_comment": "S8 end"
+				},
+				"MDX": {
+					"start_time": 1737306978,
+					"start_time_comment": "commit 86db2fc03255d6615826ebe00e78b2183b41b22f +24hrs",
+					"end_time": 1999999999,
+					"end_time_comment": "S8 end"
+				},
+				"DOC": {
+					"start_time": 1728049053,
+					"start_time_comment": "S8 start",
+					"end_time": 1738195200,
+					"end_time_comment": "commit 6ec95c663bd58099e0a160bec66cc01525261764 +24hrs"
+				},
+				"MARTY": {
+					"start_time": 1728049053,
+					"start_time_comment": "S8 start",
+					"end_time": 1738195200,
+					"end_time_comment": "commit 6ec95c663bd58099e0a160bec66cc01525261764 +24hrs"
+				}
 			},
 			"dPoW-3P": {
 			}

diff --git a/doc/update084.md b/doc/update084.md
@@ -0,0 +1,33 @@
+# dPoW 0.8.4 update information
+
+The primary purpose of this update is to reduce resource usage on Notary Node mainnet servers by removing the test chains `DOC` and `MARTY` from dPoW. However, these chains will remain operational for testing purposes within the Komodo Wallet and the Komodo DeFi Framework (KDF). This means removing them from your servers is optional and at your discretion.
+
+This update specifically removes the `DOC` and `MARTY` chains from dPoW, meaning they will no longer be processed by `iguana`. Regarding the Komodo core daemon (`komodod`), if your server’s resources allow, you can continue running `komodod` for these chains to assist with block propagation and other related tasks.
+
+### Stop and remove `DOC` & `MARTY` (optional)
+
+```bash
+komodo-cli -ac_name=DOC stop
+komodo-cli -ac_name=MARTY stop
+rm -rf ~/.komodo/DOC
+rm -rf ~/.komodo/MARTY
+```
+
+### Restart Iguana
+
+```bash
+# Update dPoW repo
+cd ~/dPoW
+git checkout master
+git pull
+
+# Restart Iguana
+pkill -9 iguana  # Note: This command may also terminate 3P Iguana if it is running on the same server.
+cd iguana
+./m_notary_build
+./m_notary_main
+```
+
+Make sure notarisations are progressing.
+
+
diff --git a/iguana/assetchains.json b/iguana/assetchains.json
@@ -21,14 +21,6 @@
     "ac_adaptivepow":"6",
     "addnode": ["209.222.101.247", "103.195.100.32", "node.cryptocollider.com", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
   },
-  {
-    "ac_name": "DOC",
-    "ac_supply": "90000000000",
-    "ac_reward": "100000000",
-    "ac_cc": "3",
-    "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": "GLEEC",
     "ac_supply": "1000000000",
@@ -56,14 +48,6 @@
     "ac_supply": "125000000",
     "addnode": ["209.222.101.247", "103.195.100.32", "3.0.32.10", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
   },
-  {
-    "ac_name": "MARTY",
-    "ac_supply": "90000000000",
-    "ac_reward": "100000000",
-    "ac_cc": "3",
-    "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": "PIRATE",
     "ac_supply": "0",

diff --git a/iguana/assetchains.old b/iguana/assetchains.old
@@ -28,12 +28,12 @@ fi
 
 ${PREFIX}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 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=CLC -ac_supply=99000000 -ac_reward=50000000 -ac_perc=100000000 -ac_founders=1 -ac_cc=45 -ac_public=1 -ac_snapshot=1440 -ac_pubkey=02df9bda7bfe2bcaa938b29a399fb0ba58cfb6cc3ddc0001062a600f60a8237ad9 -addnode=node.cryptocollider.com -ac_adaptivepow=6 -addnode=209.222.101.247 -addnode=103.195.100.32 $1 &
-${PREFIX}komodod -pubkey=$pubkey -ac_name=DOC -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=DOC -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=GLEEC -ac_supply=210000000 -ac_public=1 -ac_staked=100 -addnode=95.217.161.126 -addnode=209.222.101.247 -addnode=103.195.100.32 -datadir=${HOME}/.komodo/GLEEC_OLD $1 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=GLEEC -ac_supply=1000000000 -ac_end=1 -ac_public=1 -ac_staked=50 -addnode=65.21.52.182 -addnode=135.181.80.132 $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=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=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=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 &
 ${PREFIX}komodod -pubkey=$pubkey -ac_name=BCZERO -ac_supply=9999999999 -ac_end=1 -ac_public=1 -ac_staked=50 -addnode=65.21.52.182 $1 &

diff --git a/iguana/coins/doc_7776 b/iguana/coins/doc_7776
diff --git a/iguana/coins/marty_7776 b/iguana/coins/marty_7776
diff --git a/iguana/version b/iguana/version
@@ -1 +1 @@
-0.8.3
+0.8.4