Skip to content

Commit

Permalink
Merge branch 'dev' into update/s8-pubkeys
Browse files Browse the repository at this point in the history
  • Loading branch information
smk762 committed Sep 23, 2024
2 parents 5198f6d + 6fa3ce0 commit c68ce6f
Show file tree
Hide file tree
Showing 11 changed files with 126 additions and 52 deletions.
25 changes: 12 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,23 +55,22 @@ General [Setup instructions](https://github.com/KomodoPlatform/Documentation/blo

| Coin | src | Version/Tree | Status | dPoW |
| -------- | -------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------------- | ------------ |
| KMD | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/KMD_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-Mainnet |
| KMD | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![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) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/CCL_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| CLC | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/CLC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| DOC | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| GLEEC | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/GLEEC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| ILN | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/ILN_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| KOIN | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/KOIN_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| MARTY | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| NINJA | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/NINJA_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| PIRATE | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/PIRATE_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| SUPERNET | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/SUPERNET_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| VOTE2024 | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/VOTE2024_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| CCL | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/CCL_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| CLC | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/CLC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| DOC | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| GLEEC | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/GLEECOLD_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| ILN | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/ILN_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| KOIN | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/KOIN_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| MARTY | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/MORTY_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| NINJA | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/NINJA_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| PIRATE | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/PIRATE_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| SUPERNET | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/SUPERNET_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| AYA | [aryacoin](https://github.com/KomodoPlatform/AYAv2) | [d40b0d7](https://github.com/KomodoPlatform/AYAv2/tree/d40b0d7682d1568fc4bb5a18c705c0681ecfaa85) | [![dPOW Status](https://badges.komodo.earth/svg/AYA_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
| CHIPS | [chips](https://github.com/chips-blockchain/chips) | [f0dfd82](https://github.com/chips-blockchain/chips/tree/f0dfd82dd9f98626dd0045c3ed93102dfd5988fb) | [![dPOW Status](https://badges.komodo.earth/svg/CHIPS_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
| EMC2 | [emc2](https://github.com/emc2foundation/einsteinium) | [8d988f0](https://github.com/emc2foundation/einsteinium/tree/8d988f05a5ccafed5cf4c16493ef30cf3125f7a9) | [![dPOW Status](https://badges.komodo.earth/svg/EMC2_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
| MCL | [marmarachain](https://github.com/marmarachain/marmara) | [4b73b24](https://github.com/marmarachain/marmara/tree/4b73b246552723d1dec60be33636323239ba395d) | [![dPOW Status](https://badges.komodo.earth/svg/MCL_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3p |
| MIL | [mil](https://github.com/emc2foundation/mil) | [5df2e4d](https://github.com/emc2foundation/mil/tree/5df2e4d569e546c71e730aa85ad2a0813f3b6369) | [![dPOW Status](https://badges.komodo.earth/svg/MIL_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
| THC | [komodo](https://github.com/komodoplatform/komodo) | [41265fb](https://github.com/KomodoPlatform/komodo/tree/41265fb26d51e4f629b3dadcc92aa19e6867a76e) | [![dPOW Status](https://badges.komodo.earth/svg/THC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| THC | [komodo](https://github.com/komodoplatform/komodo) | [0adeeab](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79) | [![dPOW Status](https://badges.komodo.earth/svg/THC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-mainnet |
| TOKEL | [tokel](https://github.com/TokelPlatform/tokel) | [28939c1](https://github.com/TokelPlatform/tokel/tree/28939c11a574c9a98e35240890c64be0688c4f85) | [![dPOW Status](https://badges.komodo.earth/svg/TOKEL_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
12 changes: 6 additions & 6 deletions doc/bible.md
Original file line number Diff line number Diff line change
Expand Up @@ -253,13 +253,13 @@ Notary Nodes are responsible for protecting over a billion (fiat) dollars in ass
| VOTE2024 airdrop | 7th June 2024 | 1717804799 |
| Season 8 Candidate proposals open | 1st-14th June 2024 | 1718409599 |
| Season 8 Election start | 14th June 2024 | 1718409599 |
| Season 8 Election end | 1st July 2024, 23:59:59 UTC* | 1719878399 |
| Season 8 Election Winners announced | 7th July 2024 | 1720396799 |
| Season 8 Election Winners pubkey deadline | 14th July 2024 | 1721001599 |
| Komodo daemon Season 8 update released | 14th August 2024 (estimated) | 1723679999 |
| Hardfork / dPoW season 8 start | 14th Sept 2024 (estimated) | 1726358399 |
| Season 8 Election end | 13th July 2024, 23:59:59 UTC* | 1720915199 |
| Season 8 Election Winners announced | 19th July 2024 | 1721347200 |
| Season 8 Election Winners pubkey deadline | 4th August 2024 | 1722124800 |
| Komodo daemon Season 8 update released | 4th Sept 2024 (estimated) | 1724803200 |
| Hardfork / dPoW season 8 start | 4th Oct 2024 (estimated) | 1727481600 |

* Votes cast in the election are valid until the first notarised block (inclusive) after 1st July 2024, 23:59:59 UTC.
* Votes cast in the election are valid until the first notarised block (inclusive) after 13th July 2024, 23:59:59 UTC.



Expand Down
6 changes: 6 additions & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
# Changelog

## 0.7.16

- Removes VOTE2024
- Updates `komodod` to [`0adeeab`](https://github.com/KomodoPlatform/komodo/commit/0adeeabdd484ef40539d1275c6a765f5c530ea79)
- Updates KDF to [`v2.1.0-beta`](https://github.com/KomodoPlatform/komodo-defi-framework/releases/tag/v2.1.0-beta)

## 0.7.15

- Adds VOTE2024
Expand Down
26 changes: 13 additions & 13 deletions doc/daemon_versions.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
{
"KMD": "41265fb",
"KMD": "0adeeab",
"LTC": "0.16",
"CCL": "41265fb",
"CLC": "41265fb",
"DOC": "41265fb",
"GLEEC": "41265fb",
"ILN": "41265fb",
"KOIN": "41265fb",
"MARTY": "41265fb",
"NINJA": "41265fb",
"PIRATE": "41265fb",
"SUPERNET": "41265fb",
"VOTE2024": "41265fb",
"CCL": "0adeeab",
"CLC": "0adeeab",
"DOC": "0adeeab",
"GLEEC": "0adeeab",
"ILN": "0adeeab",
"KOIN": "0adeeab",
"MARTY": "0adeeab",
"NINJA": "0adeeab",
"PIRATE": "0adeeab",
"SUPERNET": "0adeeab",
"VOTE2024": "0adeeab",
"AYA": "d40b0d7",
"CHIPS": "f0dfd82",
"THC": "41265fb",
"THC": "0adeeab",
"EMC2": "8d988f0",
"MCL": "4b73b24",
"MIL": "5df2e4d",
Expand Down
16 changes: 8 additions & 8 deletions doc/scoring_epochs.json
Original file line number Diff line number Diff line change
Expand Up @@ -129,31 +129,31 @@
"Servers": {
"dPoW-Mainnet": {
"KIP0002": {
"start_time": "1712957751",
"start_time": 1712957751,
"start_time_comment": "commit 0d39f6d614756fb055578f236f2ba38acfec99d3 +24hrs",
"end_time": "1716039985",
"end_time": 1716039985,
"end_time_comment": "commit TBA +24hrs"
},
"KIP0003": {
"start_time": "1712957751",
"start_time": 1712957751,
"start_time_comment": "commit 0d39f6d614756fb055578f236f2ba38acfec99d3 +24hrs",
"end_time": "1716039985",
"end_time": 1716039985,
"end_time_comment": "commit TBA +24hrs"
},
"KIP0004": {
"start_time": "1712957751",
"start_time": 1712957751,
"start_time_comment": "commit 0d39f6d614756fb055578f236f2ba38acfec99d3 +24hrs",
"end_time": "1716039985",
"end_time": 1716039985,
"end_time_comment": "commit TBA +24hrs"
},
"VOTE2024": {
"start_time": "1716039985",
"start_time": 1716039985,
"start_time_comment": "commit TBA +24hrs"
}
},
"dPoW-3P": {
"VRSC": {
"end_time": "1716039985",
"end_time": 1716039985,
"end_time_comment": "commit TBA +24hrs"
}
}
Expand Down
4 changes: 4 additions & 0 deletions doc/seed_version_epochs.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,10 @@
},
"b0fd99e": {
"version": "2.0.0",
"end": 1725539219
},
"35e9239": {
"version": "2.1.0",
"end": 1987654321
}
}
76 changes: 76 additions & 0 deletions doc/update0716.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# dPoW 0.7.16 update information


### Stop and remove `VOTE2024`

```bash
komodo-cli -ac_name=VOTE2024 stop
rm -rf ~/.komodo/VOTE2024
```

### Update `komodod` to the latest version on main and 3p nodes.

```bash
cd ~/komodo/src/
git checkout master && git pull
./zcutil/build.sh -j$(nproc)
```
Once built, stop and restart KMD and all smartchains on the main server.

Repeat the update for your 3P komodo daemon. If you are using docker container repo for 3P:

```bash
cd ~/notary_docker_3p
./update
./start
```

**NOTE:** If your blockchain data folder contains data from an older daemon version (before we switched to the 0.7.x versioning, such as 3.x.x), you might encounter this error when starting the 0.9.0 daemon:

```bash
2024-08-21 18:49:12 ERROR: LoadBlockIndex() : failed to read value
2024-08-21 18:49:12 : Error loading block database.
error in HDD data, might just need to update to latest, if that doesn't work, then you need to resync.
```
__This should only be an issue on verteran nodes that have been running for a long time without a recent "sync from scratch"__.
In this case, you have several options:
- Resync from scratch (slowest but most accurate, allowing your node to recalculate value pools).
- Bootstrap from [dexstats.info](https://dexstats.info/bootstrap.php) (fastest, but since the initial sync version is unknown, value pools might be incorrectly calculated). Value pools refer to the stats for transparent, sprout, sapling, and burned chain values.
- Reindex with `-reindex` (but options `resync` and `bootstrap` are recommended).
@decker has provided a [script](https://raw.githubusercontent.com/DeckerSU/komodo_scripts/master/restart_kmd_daemons.sh) to simplify the upgrade process. Just run it on a host with launched Komodo daemons within a directory containing the new version of komodod and komodo-cli, and all launched instances will be stopped and re-launched with the new version of the daemon. Very convenient!
__This script is not compatible with the docker container setup on 3P, but these were likely sync'd from scratch recently enough to not encounter this error__



### Update `mm2` to the latest version.

Download the latest `mm2` release from the [releases page](https://github.com/KomodoPlatform/komodo-defi-framework/releases/tag/v2.1.0-beta), replace your existing `mm2` binary, then restart `mm2`.

If using the docker container, pull the latest and restart the container.

```bash
cd ~/notary_docker_3p
./update mm2
```

### 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,3rdparty} # use the appropriate script that matches your node type (main or 3p).
```

Make sure notarisations are progressing.
9 changes: 0 additions & 9 deletions iguana/assetchains.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,15 +47,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": "VOTE2024",
"ac_public": "1",
"ac_staked": "10",
"ac_supply": "149826699",
"addnode": [
"65.21.52.182"
]
},
{
"ac_name": "MARTY",
"ac_supply": "90000000000",
Expand Down
1 change: 0 additions & 1 deletion iguana/assetchains.old
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,3 @@ komodod -pubkey=$pubkey -ac_name=NINJA -ac_supply=100000000 -addnode=95.213.238.
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 &
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 &
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 &
komodod -pubkey=$pubkey -ac_name=VOTE2024 -ac_public=1 -ac_supply=149826699 -ac_staked=10 -addnode=65.21.52.182 $1 &
Loading

0 comments on commit c68ce6f

Please sign in to comment.