From 42e05be4283d114e7e094c2c580bf466e119e88e Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 26 Oct 2023 00:45:33 +0200 Subject: [PATCH 1/5] Remove references to `getblocktemplate-rpcs` --- book/src/user/mining-testnet-s-nomp.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/book/src/user/mining-testnet-s-nomp.md b/book/src/user/mining-testnet-s-nomp.md index 70fbc7a7647..ebfcd62f1b8 100644 --- a/book/src/user/mining-testnet-s-nomp.md +++ b/book/src/user/mining-testnet-s-nomp.md @@ -73,9 +73,9 @@ These fixes disable mining pool operator payments and miner payments: they just -2. [Build](https://github.com/ZcashFoundation/zebra#build-instructions) and [Run Zebra](https://zebra.zfnd.org/user/run.html) with the `getblocktemplate-rpcs` feature: +2. [Run Zebra](https://zebra.zfnd.org/user/run.html) with the config you created: ```sh - cargo run --release --features "getblocktemplate-rpcs" --bin zebrad -- -c zebrad.toml + zebrad -c zebrad.toml ``` 3. Wait a few hours for Zebra to sync to the testnet tip (on mainnet this takes 2-3 days) From e93938c42b05af573e187e5933989098047ace1b Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 26 Oct 2023 00:46:39 +0200 Subject: [PATCH 2/5] Refactor the sync description --- book/src/user/mining-testnet-s-nomp.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/book/src/user/mining-testnet-s-nomp.md b/book/src/user/mining-testnet-s-nomp.md index ebfcd62f1b8..53eb9a1a5ab 100644 --- a/book/src/user/mining-testnet-s-nomp.md +++ b/book/src/user/mining-testnet-s-nomp.md @@ -77,7 +77,8 @@ These fixes disable mining pool operator payments and miner payments: they just ```sh zebrad -c zebrad.toml ``` -3. Wait a few hours for Zebra to sync to the testnet tip (on mainnet this takes 2-3 days) +3. Wait for Zebra to sync to the testnet tip. This takes 2-3 days on Mainnet at + the time of writing this manual. ## Install `s-nomp` From d538511a5222737f940bed125dcb9d86f2ad906c Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 26 Oct 2023 01:12:49 +0200 Subject: [PATCH 3/5] Refactor the instructions for installing `s-nomp` --- book/src/user/mining-testnet-s-nomp.md | 44 +++++++++++++++----------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/book/src/user/mining-testnet-s-nomp.md b/book/src/user/mining-testnet-s-nomp.md index 53eb9a1a5ab..3caa7ee87ec 100644 --- a/book/src/user/mining-testnet-s-nomp.md +++ b/book/src/user/mining-testnet-s-nomp.md @@ -138,43 +138,49 @@ These fixes disable mining pool operator payments and miner payments: they just
Arch-specific instructions -#### Install dependencies +#### Install `s-nomp` -1. Install [`redis`](https://redis.io/docs/getting-started/) and run it on the default port: +1. Install Redis, and development libraries required by S-nomp ```sh - sudo pacman -S redis - sudo systemctl start redis + sudo pacman -S redis boost libsodium ``` - -2. Install and activate [`nvm`](https://github.com/nvm-sh/nvm#installing-and-updating): + +2. Install `nvm`, Python 3.10 and `virtualenv` ```sh - sudo pacman -S nvm - unset npm_config_prefix - source /usr/share/nvm/init-nvm.sh + paru -S python310 nvm + sudo pacman -S python-virtualenv ``` -3. Install `boost` and `libsodium` development libraries: - +3. Start Redis ```sh - sudo pacman -S boost libsodium + sudo systemctl start redis ``` -#### Install `s-nomp` +4. Clone the repository + + ```sh + git clone https://github.com/ZcashFoundation/s-nomp && cd s-nomp + ``` -1. `git clone https://github.com/ZcashFoundation/s-nomp && cd s-nomp` +5. Use Node 8.11: -2. Use the Zebra configs: `git checkout zebra-mining` + ```sh + unset npm_config_prefix + source /usr/share/nvm/init-nvm.sh + nvm install 10 + nvm use 10 + ``` -3. Use node 8.11.0: +6. Use Python 3.10 ```sh - nvm install 8.11.0 - nvm use 8.11.0 + virtualenv -p 3.10 s-nomp + source s-nomp/bin/activate ``` -4. Update dependencies and install: +7. Update dependencies and install: ```sh npm update From c19c8eb2812d81d3a00597faa264cc5141d340fe Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 26 Oct 2023 01:31:47 +0200 Subject: [PATCH 4/5] Mention Node 10 instead of 8.11 --- book/src/user/mining-testnet-s-nomp.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/src/user/mining-testnet-s-nomp.md b/book/src/user/mining-testnet-s-nomp.md index 3caa7ee87ec..3b4ad70e9f0 100644 --- a/book/src/user/mining-testnet-s-nomp.md +++ b/book/src/user/mining-testnet-s-nomp.md @@ -164,7 +164,7 @@ These fixes disable mining pool operator payments and miner payments: they just git clone https://github.com/ZcashFoundation/s-nomp && cd s-nomp ``` -5. Use Node 8.11: +5. Use Node 10: ```sh unset npm_config_prefix From 5b25e176f511b75dbb236298e9bd4f73a501c148 Mon Sep 17 00:00:00 2001 From: Marek Date: Thu, 26 Oct 2023 01:34:16 +0200 Subject: [PATCH 5/5] Refactor the description of Zebra's sync Co-authored-by: teor --- book/src/user/mining-testnet-s-nomp.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/book/src/user/mining-testnet-s-nomp.md b/book/src/user/mining-testnet-s-nomp.md index 3b4ad70e9f0..fbffdb14d71 100644 --- a/book/src/user/mining-testnet-s-nomp.md +++ b/book/src/user/mining-testnet-s-nomp.md @@ -77,8 +77,7 @@ These fixes disable mining pool operator payments and miner payments: they just ```sh zebrad -c zebrad.toml ``` -3. Wait for Zebra to sync to the testnet tip. This takes 2-3 days on Mainnet at - the time of writing this manual. +3. Wait for Zebra to sync to the testnet tip. This takes 8-12 hours on testnet (or 2-3 days on mainnet) as of October 2023. ## Install `s-nomp`