Merge branch 'add/vote2024' into dev

KomodoPlatform · May 18, 2024 · 25c39f3 · 25c39f3
2 parents a147b80 + e46c404
commit 25c39f3
Show file tree

Hide file tree

Showing 10 changed files with 8 additions and 130 deletions.
diff --git a/README.md b/README.md
@@ -77,4 +77,3 @@ General [Setup instructions](https://github.com/KomodoPlatform/Documentation/blo
 | 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)          | [07ff18a](https://github.com/VerusCoin/VerusCoin/commit/07ff18aa5a51be8bb1abbb4f9093e24b71e04109)      | [![dPOW Status](https://badges.komodo.earth/svg/VRSC_badge.svg?maxAge=60)](https://komodostats.com)     | dPoW-3P      |
diff --git a/doc/daemon_versions.json b/doc/daemon_versions.json
@@ -18,7 +18,6 @@
     "MCL": "4b73b24",
     "MIL": "5df2e4d",
     "TOKEL": "28939c1",
-    "VRSC": "dee30f3",
     "KIP0002": "41265fb",
     "KIP0003": "41265fb",
     "KIP0004": "41265fb"

diff --git a/doc/scoring_epochs.json b/doc/scoring_epochs.json
@@ -141,7 +141,12 @@
 					"start_time_comment": "commit 0d39f6d614756fb055578f236f2ba38acfec99d3 +24hrs"
 				}
 			},
-			"dPoW-3P": {}
+			"dPoW-3P": {
+				"VRSC": {
+					"end_time": "1716039985",
+					"end_time_comment": "commit TBA +24hrs"
+				}
+			}
 		}
 	}
 }
diff --git a/doc/update0715.md b/doc/update0715.md
@@ -28,8 +28,7 @@ tail -f ~/.komodo/VOTE2024/debug.log
 
 ## On your **3P node**
 
-- update your Verus Coin's codebase to [`07ff18a`](https://github.com/VerusCoin/VerusCoin/commit/07ff18aa5a51be8bb1abbb4f9093e24b71e04109), build it and then restart it
-
+- Remove VRSC
 
 #### Using docker setup
 
@@ -44,21 +43,9 @@ git pull
 
 - Build Verus Coin
 
-```bash
-vrsc_commit='07ff18a'
-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 &
+vrsc-cli stop
 ```
 
 ## Make sure all the chains are running smoothly. Don't forget to add `VOTE2024` to your utxo splitting scripts.

diff --git a/iguana/3p_coins.json b/iguana/3p_coins.json
@@ -114,49 +114,6 @@
       "tag": ""
     }
   },
-  {
-    "conf": "VRSC.conf",
-    "path": "${HOME#'/'}/.komodo/VRSC",
-    "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": "VRSC",
-    "name": "Verus",
-    "hasheaders": 1,
-    "useaddmultisig": 0,
-    "netmagic": "91db4d20",
-    "p2p": 27485,
-    "rpc": 27486,
-    "pubval": 60,
-    "p2shval": 85,
-    "wifval": 188,
-    "txfee_satoshis": "10000",
-    "isPoS": 0,
-    "minoutput": 10000,
-    "minconfirms": 2,
-    "genesishash": "027e3758c3a65b12aa1046462b486d0a63bfa1beae327897f56c5cfb7daaae71",
-    "protover": 170002,
-    "genesisblock": "0100000000000000000000000000000000000000000000000000000000000000000000003ba3edfd7a7b12b27ac72c3e67768f617fc81bc3888a51323a9fb8aa4b1e5e4a000000000000000000000000000000000000000000000000000000000000000029ab5f490f0f0f200b00000000000000000000000000000000000000000000000000000000000000fd4005000d5ba7cda5d473947263bf194285317179d2b0d307119c2e7cc4bd8ac456f0774bd52b0cd9249be9d40718b6397a4c7bbd8f2b3272fed2823cd2af4bd1632200ba4bf796727d6347b225f670f292343274cc35099466f5fb5f0cd1c105121b28213d15db2ed7bdba490b4cedc69742a57b7c25af24485e523aadbb77a0144fc76f79ef73bd8530d42b9f3b9bed1c135ad1fe152923fafe98f95f76f1615e64c4abb1137f4c31b218ba2782bc15534788dda2cc08a0ee2987c8b27ff41bd4e31cd5fb5643dfe862c9a02ca9f90c8c51a6671d681d04ad47e4b53b1518d4befafefe8cadfb912f3d03051b1efbf1dfe37b56e93a741d8dfd80d576ca250bee55fab1311fc7b3255977558cdda6f7d6f875306e43a14413facdaed2f46093e0ef1e8f8a963e1632dcbeebd8e49fd16b57d49b08f9762de89157c65233f60c8e38a1f503a48c555f8ec45dedecd574a37601323c27be597b956343107f8bd80f3a925afaf30811df83c402116bb9c1e5231c70fff899a7c82f73c902ba54da53cc459b7bf1113db65cc8f6914d3618560ea69abd13658fa7b6af92d374d6eca9529f8bd565166e4fcbf2a8dfb3c9b69539d4d2ee2e9321b85b331925df195915f2757637c2805e1d4131e1ad9ef9bc1bb1c732d8dba4738716d351ab30c996c8657bab39567ee3b29c6d054b711495c0d52e1cd5d8e55b4f0f0325b97369280755b46a02afd54be4ddd9f77c22272b8bbb17ff5118fedbae2564524e797bd28b5f74f7079d532ccc059807989f94d267f47e724b3f1ecfe00ec9e6541c961080d8891251b84b4480bc292f6a180bea089fef5bbda56e1e41390d7c0e85ba0ef530f7177413481a226465a36ef6afe1e2bca69d2078712b3912bba1a99b1fbff0d355d6ffe726d2bb6fbc103c4ac5756e5bee6e47e17424ebcbf1b63d8cb90ce2e40198b4f4198689daea254307e52a25562f4c1455340f0ffeb10f9d8e914775e37d0edca019fb1b9c6ef81255ed86bc51c5391e0591480f66e2d88c5f4fd7277697968656a9b113ab97f874fdd5f2465e5559533e01ba13ef4a8f7a21d02c30c8ded68e8c54603ab9c8084ef6d9eb4e92c75b078539e2ae786ebab6dab73a09e0aa9ac575bcefb29e930ae656e58bcb513f7e3c17e079dce4f05b5dbc18c2a872b22509740ebe6a3903e00ad1abc55076441862643f93606e3dc35e8d9f2caef3ee6be14d513b2e062b21d0061de3bd56881713a1a5c17f5ace05e1ec09da53f99442df175a49bd154aa96e4949decd52fed79ccf7ccbce32941419c314e374e4a396ac553e17b5340336a1a25c22f9e42a243ba5404450b650acfc826a6e432971ace776e15719515e1634ceb9a4a35061b668c74998d3dfb5827f6238ec015377e6f9c94f38108768cf6e5c8b132e0303fb5a200368f845ad9d46343035a6ff94031df8d8309415bb3f6cd5ede9c135fdabcc030599858d803c0f85be7661c88984d88faa3d26fb0e9aac0056a53f1b5d0baed713c853c4a2726869a0a124a8a5bbc0fc0ef80c8ae4cb53636aa02503b86a1eb9836fcc259823e2692d921d88e1ffc1e6cb2bde43939ceb3f32a611686f539f8f7c9f0bf00381f743607d40960f06d347d1cd8ac8a51969c25e37150efdf7aa4c2037a2fd0516fb444525ab157a0ed0a7412b2fa69b217fe397263153782c0f64351fbdf2678fa0dc8569912dcd8e3ccad38f34f23bbbce14c6a26ac24911b308b82c7e43062d180baeac4ba7153858365c72c63dcf5f6a5b08070b730adb017aeae925b7d0439979e2679f45ed2f25a7edcfd2fb77a8794630285ccb0a071f5cce410b46dbf9750b0354aae8b65574501cc69efb5b6a43444074fee116641bb29da56c2b4a7f456991fc92b2",
-    "debug": 0,
-    "seedipaddr": "54.39.23.248",
-    "sapling": 1,
-    "git": {
-      "repo": "https://github.com/VerusCoin/VerusCoin",
-      "branch": "master",
-      "commit": "81dac44",
-      "tag": "v0.9.1-1"
-    }
-  },
   {
     "conf": "MCL.conf",
     "path": "${HOME#'/'}/.komodo/MCL",

diff --git a/iguana/coins/vrsc_7779 b/iguana/coins/vrsc_7779
diff --git a/iguana/m_notary_3rdparty b/iguana/m_notary_3rdparty
@@ -50,6 +50,5 @@ curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dp
 curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"EMC2\",\"freq\":5,\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"AYA\",\"freq\":5,\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MCL\",\"pubkey\":\"$pubkey\"}"
-curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"VRSC\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"TOKEL\",\"pubkey\":\"$pubkey\"}"
 curl --url "http://127.0.0.1:7779" --data "{\"agent\":\"iguana\",\"method\":\"dpow\",\"symbol\":\"MIL\",\"freq\":5,\"pubkey\":\"$pubkey\"}"