Merge branch 'dev' into add-dips

.github/ISSUE_TEMPLATE/bug_report.md

@@ -1,6 +1,6 @@
 ---
 name: Bug report
-about: Marketmaker 1.0 bug report
+about: Report a bug with Iguana
 
 ---
 

.github/PULL_REQUEST_TEMPLATE/daemon_update.md

@@ -0,0 +1,15 @@
+---
+name: Daemon Update
+about: Update daemon to latest version
+
+---
+
+**Checklist**
+- [ ] Update daemon build has been confirmed working and binaries launch the chain
+- [ ] Update commit has been security reviewed
+- [ ] README.md has been updated with new version information
+- [ ] Update doc has been created
+- [ ] `scoring_epochs.json` has been updated (if applicable)
+- [ ] `daemon_versions.json` has been updated. Use the script in `utils` folder to generate the new file (after updating the readme)
+- [ ] Changelog has been updated
+- [ ] Version has been incremented

.github/workflows/main.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-18.04, ubuntu-20.04]
+        os: [ubuntu-20.04, ubuntu-22.04]
     steps:
     - uses: actions/checkout@v1
     - name: Install dependencies
@@ -24,4 +24,4 @@ jobs:
         sudo make install
         sudo ldconfig
     - name: Build dpow client "iguana"
-      run: cd iguana && make
+      run: cd iguana && make

doc/bible.md

@@ -241,9 +241,8 @@ Operating a Notary Node comes with various responsibilities but also grants you
 ## Guidelines, General Information and Policies 
 
 ### Important Dates for Season 7:
-
-| Event                                      | Date                           | Timestamp   |
----------------------------------------------------------------------------------------------
+| Event | Date | Timestamp |
+| --- | --- | --- |
 | KMD snapshot for VOTE2023                  | 7th April 2023                 | 1680911999  |
 | Season 6 scoring ends                      | 7th April 2023, 23:59:59 UTC   | 1680911999  |
 | Season 6 Auto re-elected winners announced | 14th April 2023                | 1681516799  |

doc/changelog.md

@@ -1,5 +1,45 @@
 # Changelog
 
+## 0.7.2
+
+- Updates VRSC to [`cd20298`](https://github.com/VerusCoin/VerusCoin/tree/cd2029890b5a101c60474d0517d955c166049dd0)
+
+## 0.7.1
+
+- Updates VRSC to [`66e16e7`](https://github.com/VerusCoin/VerusCoin/tree/66e16e79c8c3f60279952b2b36a8b06d4d7a81de)
+
+## 0.7.0
+
+- Removes `BET`, `BOTS`, `CRYPTO`, `DEX`, `HOLD`, `JUMBLR`, `MGW`, `MORTY`, `MSHARK`, `PANGEA`, `REVS`, `RICK`
+- Adds `DOC`, `MARTY`
+- Updates iguana and dPoW repo for S7 (main, 3P and dockerised 3P)
+
+## 0.6.14
+
+- Updates VRSC to [`185d1a5`](https://github.com/VerusCoin/VerusCoin/tree/185d1a54b8d890c95fd2ce5dd622f099a99aae6e)
+
+## 0.6.13
+
+- Updates VRSC to [`caa1107`](https://github.com/VerusCoin/VerusCoin/tree/caa1107fea7bda7ac27af559b8676ddf1dfb3f55)
+
+## 0.6.12
+
+- Updates KMD to [`156dba6`](https://github.com/KomodoPlatform/komodo/tree/156dba60184c07d0781a57d5b5005b8f3dba0c98)
+- Updates VRSC to [`4beede9`](https://github.com/VerusCoin/VerusCoin/tree/4beede91ab5562d866a90cc5b2d203acbe2bd22c)
+
+## 0.6.11
+
+- Updates VRSC to [`3f0f435`](https://github.com/VerusCoin/VerusCoin/commit/3f0f4353f12e82e107144687e9e111c31134b9d4)
+
+## 0.6.10
+
+- Updates VRSC to [`42e83aa`](https://github.com/VerusCoin/VerusCoin/commit/42e83aa08aa44d30bf9620d6da9ef0f68b85d530)
+
+## 0.6.9
+
+- Updates VRSC to [`f672ccf`](https://github.com/VerusCoin/VerusCoin/tree/f672ccfbc3e77205bc5715c6370d06ad4894399c)
+- Removes VOTE2023
+
 ## 0.6.8
 
 - Removes KIP0001

doc/daemon_versions.json

@@ -0,0 +1,22 @@
+{
+    "KMD": "156dba6",
+    "LTC": "0.16",
+    "CCL": "156dba6",
+    "CLC": "156dba6",
+    "DOC": "156dba6",
+    "GLEEC": "156dba6",
+    "ILN": "156dba6",
+    "KOIN": "156dba6",
+    "MARTY": "156dba6",
+    "NINJA": "156dba6",
+    "PIRATE": "156dba6",
+    "SUPERNET": "156dba6",
+    "THC": "156dba6",
+    "AYA": "d40b0d7",
+    "CHIPS": "f0dfd82",
+    "EMC2": "8d988f0",
+    "MCL": "c675fcb",
+    "MIL": "5df2e4d",
+    "TOKEL": "f1fc997",
+    "VRSC": "cd20298"
+}

doc/scoring_epochs.json

@@ -97,10 +97,6 @@
 				"KIP0001": {
 					"start_time": 1677725103,
 					"start_time_comment": "Thu Mar 2 20:45:03 2023 +0800 5185ce701af3ebb52399671ff0847ff9f978220b"
-				},
-				"VOTE2023": {
-					"start_time": 1680566399,
-					"start_time_comment": "TBA, Est. April 3 2023"
 				}
 			},
 			"dPoW-3P": {
@@ -119,17 +115,13 @@
 				"SFUSD": {
 					"end_time": 1674838170,
 					"end_time_comment": "Fri Jan 27 16:49:30 2023 +0800 f1ae27513df1cff2eeab7e50f873dfb1dd82e27c"
-				},
-				"KIP0001": {
-					"end_time": 1680566399,
-					"end_time_comment": "TBA, Est. April 3 2023"
 				}
 			}
 		}
 	},
 	"Season_7": {
-		"season_start": 1688169599,
-		"season_start_comment": "estimated, https://github.com/KomodoPlatform/komodo/blob/master/src/komodo_globals.h#L54",
+		"season_start": 1688132253,
+		"season_start_comment": "Friday, 30 June 2023 13:37:33, https://github.com/KomodoPlatform/komodo/blob/b416d476cca1ec16d48e54cf18aeffc80424bf20/src/komodo_hardfork.cpp#L15",
 		"season_end": 1999999999,
 		"season_end_comment": "not yet defined, using far in future",
 		"season_overtime_end": 1999999999,

doc/seed_version_epochs.json

@@ -1,22 +1,24 @@
 {
     "b8598439a": {
-      "start": 0,
       "end": 1659006671
     },
     "ce32ab8da": {
-      "start": 0,
       "end": 1666271160
     },
     "0f6c72615": {
-      "start": 0,
       "end": 1668898800
     },
     "6e4de5d21": {
-      "start": 0,
       "end": 1680566399
     },
     "6bb79b3d8": {
-      "start": 0,
-      "end": 1999999999
+      "end": 1680911999
+    },
+    "278b525ba": {
+      "end": 1680911999
+    },
+    "371595d6c": {
+      "version": "1.0.4",
+      "end": 1987654321
     }
 }

doc/update0610.md

@@ -0,0 +1,30 @@
+### dPoW 0.6.10 update information
+
+- On your 3P node, update your Verus Coin's codebase to  [`42e83aa`](https://github.com/VerusCoin/VerusCoin/commit/42e83aa08aa44d30bf9620d6da9ef0f68b85d530), build it and then restart it. 
+
+- Build Verus Coin
+```bash
+cd ~/VerusCoin
+git pull
+git checkout 42e83aa
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/VerusCoin/src
+./verus stop
+source ~/dPoW/iguana/pubkey.txt
+./verusd -pubkey=$pubkey &
+```
+
+- Update your dPoW repo
+
+```bash
+cd ~/dPoW
+git checkout master
+git pull
+```
+
+Make sure your iguana is running properly.

doc/update0611.md

@@ -0,0 +1,30 @@
+### dPoW 0.6.11 update information
+
+- On your 3P node, update your Verus Coin's codebase to  [`3f0f435`](https://github.com/VerusCoin/VerusCoin/commit/3f0f4353f12e82e107144687e9e111c31134b9d4), build it and then restart it. 
+
+- Build Verus Coin
+```bash
+cd ~/VerusCoin
+git pull
+git checkout 3f0f435
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/VerusCoin/src
+./verus stop
+source ~/dPoW/iguana/pubkey.txt
+./verusd -pubkey=$pubkey &
+```
+
+- Update your dPoW repo
+
+```bash
+cd ~/dPoW
+git checkout master
+git pull
+```
+
+Make sure your iguana is running properly.

doc/update0612.md

@@ -0,0 +1,57 @@
+### dPoW 0.6.12 update information
+
+- On your **Main and 3P nodes**, update your Komodo codebase to [`156dba6`](https://github.com/KomodoPlatform/komodo/tree/156dba60184c07d0781a57d5b5005b8f3dba0c98), build it and then restart it.
+
+- Build the daemon
+
+```bash
+cd ~/komodo
+git pull
+git checkout 156dba6
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/komodo/src
+./komodo-cli stop
+source ~/dPoW/iguana/pubkey.txt
+
+# On Main node
+./komodod -gen -genproclimit=1 -pubkey=$pubkey -minrelaytxfee=0.000035 -opretmintxfee=0.004 -notary=".litecoin/litecoin.conf" &
+
+# On Third Party node
+./komodod -pubkey=$pubkey -notary &
+```
+
+
+- On your 3P node, update your Verus Coin's codebase to [`4beede9`](https://github.com/VerusCoin/VerusCoin/tree/4beede91ab5562d866a90cc5b2d203acbe2bd22c), build it and then restart it.
+
+- Build Verus Coin
+
+```bash
+cd ~/VerusCoin
+git pull
+git checkout 4beede9
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/VerusCoin/src
+./verus stop
+source ~/dPoW/iguana/pubkey.txt
+./verusd -pubkey=$pubkey &
+```
+
+- Update your dPoW repo
+
+```bash
+cd ~/dPoW
+git checkout master
+git pull
+```
+
+Make sure your iguana is running properly.

doc/update0613.md

@@ -0,0 +1,31 @@
+### dPoW 0.6.13 update information
+
+- On your 3P node, update your Verus Coin's codebase to [`caa1107`](https://github.com/VerusCoin/VerusCoin/tree/caa1107fea7bda7ac27af559b8676ddf1dfb3f55), build it and then restart it.
+
+- Build Verus Coin
+
+```bash
+cd ~/VerusCoin
+git pull
+git checkout caa1107
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/VerusCoin/src
+./verus stop
+source ~/dPoW/iguana/pubkey.txt
+./verusd -pubkey=$pubkey &
+```
+
+- Update your dPoW repo
+
+```bash
+cd ~/dPoW
+git checkout master
+git pull
+```
+
+Make sure your iguana is running properly.

doc/update0614.md

@@ -0,0 +1,31 @@
+### dPoW 0.6.14 update information
+
+- On your 3P node, update your Verus Coin's codebase to [`185d1a5`](https://github.com/VerusCoin/VerusCoin/tree/185d1a54b8d890c95fd2ce5dd622f099a99aae6e), build it and then restart it.
+
+- Build Verus Coin
+
+```bash
+cd ~/VerusCoin
+git pull
+git checkout 185d1a5
+./zcutil/build.sh -j$(expr $(nproc) - 1)
+```
+
+- Restart it
+
+```bash
+cd ~/VerusCoin/src
+./verus stop
+source ~/dPoW/iguana/pubkey.txt
+./verusd -pubkey=$pubkey &
+```
+
+- Update your dPoW repo
+
+```bash
+cd ~/dPoW
+git checkout master
+git pull
+```
+
+Make sure your iguana is running properly.

doc/update067.md

@@ -4,8 +4,8 @@
 
 ```bash
 cd ~/VerusCoin
-git pull
 git checkout ad8fb8d
+git pull
 ./zcutil/build.sh -j$(expr $(nproc) - 1)
 ```