From 021ad0e83bcc3a14298a7eca1c29307998a75419 Mon Sep 17 00:00:00 2001 From: Theo Date: Mon, 28 Aug 2023 01:52:33 -0700 Subject: [PATCH] Use v4 relayer for mainnet and v5 for sidechains for backwards compatibility --- README.md | 10 +++++----- docker-compose.yml | 22 +++++++++++----------- install.sh | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 50f27a6..5670faf 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ **\*Tornado Cash was sanctioned by the US Treasury on 08/08/2022, this makes it illegal for US citizens to interact with Tornado Cash and all of it's associated deployed smart contracts. Please understand the laws where you live and take all necessary steps to protect and anonymize yourself.** -**\*It is recommended to run your Relayer on a VPS instnace ([Virtual Private Server](https://njal.la/)). Ensure SSH configuration is enabled for security, you can find information about SSH keygen and management [here](https://www.ssh.com/academy/ssh/keygen).** +**\*It is recommended to run your Relayer on a VPS instnace (Virtual Private Server). Ensure SSH configuration is enabled for security, you can find information about SSH keygen and management [here](https://www.ssh.com/academy/ssh/keygen).** ## Deploy with script and docker-compose @@ -13,7 +13,7 @@ _The following instructions are for Ubuntu 22.10, other operating systems may va Just run in terminal: ```bash -curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/main-v5/install.sh | bash +curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/main/install.sh | bash ``` #### Configuring environments: @@ -21,7 +21,7 @@ curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/main-v5/in 1. Go to `tornado-relayer` folder on the server home directory 2. Check environment files: -​ By default each network is preconfigured the naming of `.env.` + By default each network is preconfigured the naming of `.env.` - `.env.eth` for Ethereum Mainnet - `.env.bsc` for Binance Smart Chain @@ -31,7 +31,7 @@ curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/main-v5/in - `.env.polygon` for Polygon (matic) - `.env.avax` for Avalanche C-Chain -​ 3. Configure (fill) environment files for those networks on which the relayer will be deployed: + 3. Configure (fill) environment files for those networks on which the relayer will be deployed: - Set `PRIVATE_KEY` to your relayer address (remove the 0x from your private key) to each environment file - _It is recommended not to reuse the same private keys for each network as a security measure_ @@ -50,6 +50,6 @@ curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/main-v5/in 2. Visit your domain addresses and check each `/status` endpoint to ensure there is no errors in the `status` fields -Disclaimer: +#### Disclaimer: THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/docker-compose.yml b/docker-compose.yml index 670d9a4..db8d21d 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -47,7 +47,7 @@ services: eth-server: build: . - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["eth"] restart: always command: server @@ -59,7 +59,7 @@ services: depends_on: [redis] eth-treeWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["eth"] restart: always command: treeWatcher @@ -70,7 +70,7 @@ services: depends_on: [redis, eth-server] eth-priceWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["eth"] restart: always command: priceWatcher @@ -81,7 +81,7 @@ services: depends_on: [redis, eth-server] eth-healthWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["eth"] restart: always command: healthWatcher @@ -92,7 +92,7 @@ services: depends_on: [redis, eth-server] eth-worker1: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["eth"] restart: always command: worker @@ -105,7 +105,7 @@ services: # # This is additional worker for ethereum mainnet # # So you can process transactions from multiple addresses, but before it you need to set up those addresses as workers # eth-worker2: - # image: tornadocash/relayer:mainnet-v5 + # image: tornadocash/relayer:mainnet-v4 # profiles: [ 'eth' ] # restart: always # command: worker @@ -394,7 +394,7 @@ services: # ---------------------- Goerli (Ethereum Testnet) ---------------------- # goerli-server: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["geth"] restart: always command: server @@ -406,7 +406,7 @@ services: depends_on: [redis] goerli-treeWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["goerli"] restart: always command: treeWatcher @@ -417,7 +417,7 @@ services: depends_on: [redis, goerli-server] goerli-priceWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["goerli"] restart: always command: priceWatcher @@ -428,7 +428,7 @@ services: depends_on: [redis, goerli-server] goerli-healthWatcher: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["goerli"] restart: always command: healthWatcher @@ -439,7 +439,7 @@ services: depends_on: [redis, goerli-server] goerli-worker1: - image: tornadocash/relayer:mainnet-v5 + image: tornadocash/relayer:mainnet-v4 profiles: ["goerli"] restart: always command: worker diff --git a/install.sh b/install.sh index 79aa923..04d5626 100644 --- a/install.sh +++ b/install.sh @@ -57,7 +57,7 @@ function install_node(){ function install_repositories(){ git clone $relayer_soft_git_repo -b main-v5 $relayer_folder - git clone $relayer_soft_git_repo -b mainnet-v5 $relayer_mainnet_soft_source_folder; + git clone $relayer_soft_git_repo -b mainnet-v4 $relayer_mainnet_soft_source_folder; git clone $relayer_soft_git_repo -b sidechain-v5 $relayer_sidechains_soft_source_folder; }