Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

0.7.12: vrsc update + thc remove #547

Merged
merged 3 commits into from
Jan 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,10 @@ General [Setup instructions](https://github.com/KomodoPlatform/Documentation/blo
| 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 |
| 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 |
| 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 |
| 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 |
| VRSC | [verus](https://github.com/VerusCoin/VerusCoin) | [8a060c6](https://github.com/VerusCoin/VerusCoin/tree/8a060c63b5b1d8295b754080e0f07966b09776d3) | [![dPOW Status](https://badges.komodo.earth/svg/VRSC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
| VRSC | [verus](https://github.com/VerusCoin/VerusCoin) | [1121528](https://github.com/VerusCoin/VerusCoin/tree/11215289254c490b2ed146612e1504376d0964eb) | [![dPOW Status](https://badges.komodo.earth/svg/VRSC_badge.svg?maxAge=60)](https://komodostats.com) | dPoW-3P |
5 changes: 5 additions & 0 deletions doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Changelog

## 0.7.12

- Updates VRSC to [`1121528`](https://github.com/VerusCoin/VerusCoin/commit/11215289254c490b2ed146612e1504376d0964eb)
- Removes THC

## 0.7.11

- Updates VRSC to [`8a060c6`](https://github.com/VerusCoin/VerusCoin/commit/8a060c63b5b1d8295b754080e0f07966b09776d3)
Expand Down
3 changes: 1 addition & 2 deletions doc/daemon_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,11 @@
"NINJA": "41265fb",
"PIRATE": "41265fb",
"SUPERNET": "41265fb",
"THC": "41265fb",
"AYA": "d40b0d7",
"CHIPS": "f0dfd82",
"EMC2": "8d988f0",
"MCL": "4b73b24",
"MIL": "5df2e4d",
"TOKEL": "28939c1",
"VRSC": "8a060c6"
"VRSC": "1121528"
}
59 changes: 59 additions & 0 deletions doc/update0712.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
### dPoW 0.7.12 update information

On your **3P node**:

- update your Verus Coin's codebase to [`1121528`](https://github.com/VerusCoin/VerusCoin/commit/11215289254c490b2ed146612e1504376d0964eb), build it and then restart it.

### Update VSRC

#### Using docker setup

```bash
cd notary_docker_3p
git pull
./update
./start
```

#### Using other setup

- Build Verus Coin

```bash
vrsc_commit='1121528'
cd ~/VerusCoin
git pull
git checkout ${vrsc_commit}
./zcutil/build.sh -j$(expr $(nproc) - 1)
```

- Restart it

```bash
cd ~/VerusCoin/src
./verus stop
source ~/dPoW/iguana/pubkey.txt
./verusd -pubkey=$pubkey &
```


### Remove THC

- Shut down the THC daemon on the **main server**. This coin has been removed from the dPoW assets.

```bash
komodo-cli -ac_name=THC stop
```

- Please remember to delete the remaining data folder located in `~/.komodo/THC` and close the THC p2p port (`36789`) in the firewall.

### Update your dPoW repo

```bash
cd ~/dPoW
git checkout master
git pull
```

Please restart dPoW operations and ensure that your iguana is running smoothly.

17 changes: 0 additions & 17 deletions iguana/assetchains.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,22 +72,5 @@
"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",
"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",
"earlytxid": "7e4a76259e99c9379551389e9f757fc5f46c33ae922a8644dc2b187af2a6adc1",
"addnode": ["209.222.101.247", "103.195.100.32", "157.230.45.184", "165.22.52.123", "15.235.204.174", "148.113.1.52", "65.21.77.109", "89.19.26.211", "89.19.26.212"]
}
]
1 change: 0 additions & 1 deletion iguana/assetchains.old
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,3 @@ komodod -pubkey=$pubkey -ac_name=MARTY -ac_supply=90000000000 -ac_reward=1000000
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 &
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 &
1 change: 0 additions & 1 deletion iguana/coins/thc_7776

This file was deleted.

2 changes: 1 addition & 1 deletion iguana/iguana_notary.c
Original file line number Diff line number Diff line change
Expand Up @@ -559,7 +559,7 @@ STRING_ARG(iguana,addnotary,ipaddr)
}

// TODO: Confirm that this is the correct list of currencies. Is TOKEL supposed to be in here? It's the only 3rd party coin in the list.
char NOTARY_CURRENCIES[][65] = { "SUPERNET", "NINJA", "CCL", "PIRATE", "ILN", "DOC", "MARTY", "KOIN", "THC", "GLEEC", "TOKEL", "CLC" };
char NOTARY_CURRENCIES[][65] = { "SUPERNET", "NINJA", "CCL", "PIRATE", "ILN", "DOC", "MARTY", "KOIN", "GLEEC", "TOKEL", "CLC" };

// "LTC", "USD", "EUR", "JPY", "GBP", "AUD", "CAD", "CHF", "NZD", "CNY", "RUB", "MXN", "BRL", "INR", "HKD", "TRY", "ZAR", "PLN", "NOK", "SEK", "DKK", "CZK", "HUF", "ILS", "KRW", "MYR", "PHP", "RON", "SGD", "THB", "BGN", "IDR", "HRK",

Expand Down
2 changes: 1 addition & 1 deletion iguana/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.7.11
0.7.12