Skip to content

Commit

Permalink
fix sync issue
Browse files Browse the repository at this point in the history
  • Loading branch information
gcharang committed Apr 8, 2024
2 parents c1e3b26 + 72a4c64 commit f8d0716
Show file tree
Hide file tree
Showing 10 changed files with 53 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,11 @@ 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 |
| 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 |
| 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) | [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 |
7 changes: 6 additions & 1 deletion doc/changelog.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
# Changelog

## 0.7.13
## 0.7.14

- Adds KIP0002, KIP0003, KIP0004

## 0.7.13

- Restores THC

## 0.7.12

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

## 0.7.11

Expand Down
2 changes: 1 addition & 1 deletion doc/daemon_versions.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
"NINJA": "41265fb",
"PIRATE": "41265fb",
"SUPERNET": "41265fb",
"THC": "41265fb",
"AYA": "d40b0d7",
"CHIPS": "f0dfd82",
"THC": "41265fb",
"EMC2": "8d988f0",
"MCL": "4b73b24",
"MIL": "5df2e4d",
Expand Down
17 changes: 14 additions & 3 deletions doc/update0712.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## dPoW 0.7.11 update information
### dPoW 0.7.12 update information

On your 3P node:
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.

Expand Down Expand Up @@ -36,6 +36,17 @@ 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
Expand All @@ -44,4 +55,4 @@ git checkout master
git pull
```

Once complete, monitor your node to ensure it is running correctly and notarisations are progressing. Make sure any certs for your seednode are up to date and have no permssions issues, and that your wss connection is responding. If you have any issues, please contact us on Discord.
Please restart dPoW operations and ensure that your iguana is running smoothly.
26 changes: 26 additions & 0 deletions doc/update0713.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
### dPoW 0.7.13 update information


### Restore THC

- Restart the THC daemon on the **main server**. This coin has been restored to the dPoW assets.

```bash
komodo-cli -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=157.230.45.184 -addnode=165.22.52.123 -puskey=$pubkey
```

- Remember to import your private key, prepare utxos and open THC p2p port (`36789`) in the firewall.

### Update your dPoW repo

```bash
cd ~/dPoW
git checkout master
git pull
cd iguana
make
pkill -9 iguana
./m_notary_main && ./m_notary_3rdparty (or via Docker: ./m_notary_3rdparty_docker)
```

Restart dPoW operations and ensure that your iguana is running smoothly.
2 changes: 1 addition & 1 deletion doc/updateo713.md → doc/update714.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
### dPoW 0.7.13 update information
### dPoW 0.7.14 update information

On your main node, launch KIP0002, KIP0003, KIP0004 chains, import your private key and start staking

Expand Down
1 change: 1 addition & 0 deletions iguana/assetchains.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@
"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",
Expand Down
2 changes: 1 addition & 1 deletion iguana/coins/thc_7776
Original file line number Diff line number Diff line change
@@ -1 +1 @@
curl --url "http://127.0.0.1:7776" --data "{\"conf\":\"THC.conf\",\"path\":\"${HOME#"/"}/.komodo/THC\",\"unitval\":\"20\",\"zcash\":1,\"RELAY\":-1,\"VALIDATE\":0,\"prefetchlag\":-1,\"poll\":100,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":8,\"newcoin\":\"THC\",\"name\":\"THC\",\"hasheaders\":1,\"useaddmultisig\":0,\"netmagic\":\"7d59c4bd\",\"p2p\":36789,\"rpc\":36790,\"pubval\":60,\"p2shval\":85,\"wifval\":188,\"txfee_satoshis\":\"10000\",\"isPoS\":0,\"minoutput\":10000,\"minconfirms\":2,\"genesishash\":\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\",\"protover\":170002,\"genesisblock\":\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\",\"debug\":0,\"seedipaddr\":\"78.47.196.146\",\"sapling\":1,\"notarypay\":0}"
curl --url "http://127.0.0.1:7776" --data "{\"conf\":\"THC.conf\",\"path\":\"${HOME#"/"}/.komodo/THC\",\"unitval\":\"20\",\"zcash\":1,\"RELAY\":-1,\"VALIDATE\":0,\"prefetchlag\":-1,\"poll\":100,\"active\":1,\"agent\":\"iguana\",\"method\":\"addcoin\",\"startpend\":4,\"endpend\":4,\"services\":129,\"maxpeers\":8,\"newcoin\":\"THC\",\"name\":\"THC\",\"hasheaders\":1,\"useaddmultisig\":0,\"netmagic\":\"7d59c4bd\",\"p2p\":36789,\"rpc\":36790,\"pubval\":60,\"p2shval\":85,\"wifval\":188,\"txfee_satoshis\":\"10000\",\"isPoS\":0,\"minoutput\":10000,\"minconfirms\":2,\"genesishash\":\"027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71\",\"protover\":170002,\"genesisblock\":\"0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2\",\"debug\":0,\"seedipaddr\":\"78.47.196.146\",\"sapling\":1,\"notarypay\":0}"
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", "KIP0002", "KIP0003", "KIP0004"};
char NOTARY_CURRENCIES[][65] = { "SUPERNET", "NINJA", "CCL", "PIRATE", "ILN", "DOC", "THC", "MARTY", "KOIN", "GLEEC", "TOKEL", "CLC", "KIP0002", "KIP0003", "KIP0004" };

// "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.13
0.7.14

0 comments on commit f8d0716

Please sign in to comment.