Remove unneccessary web-providers-http lib after fix errors in new web3.js version & fix websocket and ipc providers connection

Update self-hosted Tornado packages versions to actual
Normalize relayer URL before using & fix relayer status check
2023-09-23 11:10:21 -07:00 · 2023-09-12 20:38:13 -07:00 · 2023-09-12 20:37:42 -07:00 · 2023-09-07 14:29:17 -07:00
4 changed files with 747 additions and 738 deletions
--- a/README.md
+++ b/README.md
@ -2,10 +2,8 @@

 Command line tool to interact with [Tornado Cash](https://tornado.ws).

-### Warning!
-Current cli version doesn't support [Anonymity Mining](https://tornado-cash.medium.com/tornado-cash-governance-proposal-a55c5c7d0703)
-
 ### How to install tornado cli
+
 Download and install [node.js](https://nodejs.org/en/download/).

 You also need to install C++ build tools in order to do 'npm install', for more information please checkout https://github.com/nodejs/node-gyp#on-unix.
@ -36,6 +34,7 @@ If you want to use Tor connection to conceal ip address, install [Tor Browser](h
 Note that you should reset your tor connection by restarting the browser every time when you deposit & withdraw otherwise you will have the same exit node used for connection.

 ### Goerli, Mainnet, Binance Smart Chain, Gnosis Chain, Polygon Network, Arbitrum, Avalanche
+
 1. `node cli.js --help`
 2. If you want to use secure, anonymous tor connection add `--tor <torPort>` behind the command.
 3. Add `PRIVATE_KEY` to `.env` file (optional, only if you want to use it for many operations) - open `.env.example` file, add private key after `PRIVATE_KEY=` and rename file to `.env`.
@ -51,6 +50,7 @@ Note that `--tor <torPort>` is optional, and use `--private-key <private key>` o
 For RPC nodes please refer to the list of public RPC nodes below.

 ##### Example:
+
 ```bash
 $ node cli.js deposit ETH 0.1 --rpc https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607 --tor 9150

@ -91,6 +91,7 @@ Done
 ```

 ### (Optional) Creating Deposit Notes & Invoices offline
+
 One of the main features of tornado-cli is that it supports creating deposit notes & invoices inside the offline computing environment.

 After the private-key like notes are backed up somewhere safe, you can copy the created deposit invoices and use them to create new deposit transaction on online environment.
@ -144,13 +145,13 @@ Sender account balance is x.xxxxxxx ETH

 ```json
 {
-   "netId1":{
-      "rpcUrls":{
-         "publicRpc1":{
-            "name":"1RPC",
-            "url":"https://1rpc.io/eth"
+  "netId1": {
+    "rpcUrls": {
+      "publicRpc1": {
+        "name": "1RPC",
+        "url": "https://1rpc.io/eth"
      },
-         "Chainnodes":{
+      "Chainnodes": {
        "name": "Chainnodes",
        "url": "https://mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
      }
@ -248,20 +249,20 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId56":{
-      "rpcUrls":{
-         "publicRpc1":{
-            "name":"BSC Public RPC 1",
-            "url":"https://1rpc.io/bnb"
+  "netId56": {
+    "rpcUrls": {
+      "publicRpc1": {
+        "name": "BSC Public RPC 1",
+        "url": "https://1rpc.io/bnb"
      },
-         "publicRpc2":{
-            "name":"BSC Public RPC 2",
-            "url":"https://bsc-dataseed1.defibit.io"
-         },
-         "publicRpc3":{
-            "name":"BSC Public RPC 3",
-            "url":"https://bsc-dataseed1.ninicoin.io"
+      "publicRpc2": {
+        "name": "BSC Public RPC 2",
+        "url": "https://bsc-dataseed1.defibit.io"
      },
+      "publicRpc3": {
+        "name": "BSC Public RPC 3",
+        "url": "https://bsc-dataseed1.ninicoin.io"
+      }
    },
    "relayers": {
      "0xproxy.eth": {
@ -336,14 +337,14 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId100":{
-      "rpcUrls":{
-         "publicRpc":{
-            "name":"Gnosis Chain RPC",
-            "url":"https://rpc.gnosischain.com"
+  "netId100": {
+    "rpcUrls": {
+      "publicRpc": {
+        "name": "Gnosis Chain RPC",
+        "url": "https://rpc.gnosischain.com"
      }
    },
-      "relayers":{
+    "relayers": {
      "torndao.eth": {
        "url": "torndao.eth",
        "name": "torndao.eth",
@ -351,13 +352,13 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId137":{
-      "rpcUrls":{
-         "publicRpc1":{
-            "name":"1RPC",
-            "url":"https://1rpc.io/matic"
+  "netId137": {
+    "rpcUrls": {
+      "publicRpc1": {
+        "name": "1RPC",
+        "url": "https://1rpc.io/matic"
      },
-         "Chainnodes":{
+      "Chainnodes": {
        "name": "Chainnodes",
        "url": "https://polygon-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
      }
@ -405,18 +406,18 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId42161":{
-      "rpcUrls":{
-         "publicRpc1":{
-            "name":"Arbitrum Public RPC",
-            "url":"https://arb1.arbitrum.io/rpc"
+  "netId42161": {
+    "rpcUrls": {
+      "publicRpc1": {
+        "name": "Arbitrum Public RPC",
+        "url": "https://arb1.arbitrum.io/rpc"
      },
-         "publicRpc2":{
+      "publicRpc2": {
        "name": "ChainnodesRPC",
        "url": "https://arbitrum-one.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
      }
    },
-      "relayers":{
+    "relayers": {
      "tornado-crypto-bot-exchange.eth": {
        "url": "tornado-crypto-bot-exchange.eth",
        "name": "tornado-crypto-bot-exchange.eth",
@ -429,14 +430,14 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId43114":{
-      "rpcUrls":{
-         "publicRpc":{
-            "name":"1RPC",
-            "url":"https://1rpc.io/avax/c"
+  "netId43114": {
+    "rpcUrls": {
+      "publicRpc": {
+        "name": "1RPC",
+        "url": "https://1rpc.io/avax/c"
      }
    },
-      "relayers":{
+    "relayers": {
      "cheap-relayer.eth": {
        "url": "cheap-relayer.eth",
        "name": "cheap-relayer.eth",
@ -459,18 +460,18 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId10":{
-      "rpcUrls":{
-         "publicRpc1":{
-            "name":"1RPC",
-            "url":"https://1rpc.io/op"
+  "netId10": {
+    "rpcUrls": {
+      "publicRpc1": {
+        "name": "1RPC",
+        "url": "https://1rpc.io/op"
      },
-         "Chainnodes":{
+      "Chainnodes": {
        "name": "Chainnodes",
        "url": "https://optimism-mainnet.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
      }
    },
-      "relayers":{
+    "relayers": {
      "tornado-crypto-bot-exchange.eth": {
        "url": "tornado-crypto-bot-exchange.eth",
        "name": "tornado-crypto-bot-exchange.eth",
@ -478,14 +479,14 @@ Sender account balance is x.xxxxxxx ETH
      }
    }
  },
-   "netId5":{
-      "rpcUrls":{
-         "Chainnodes":{
-            "name":"Chainnodes RPC",
-            "url":"https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
+  "netId5": {
+    "rpcUrls": {
+      "Chainnodes": {
+        "name": "Chainnodes RPC",
+        "url": "https://goerli.chainnodes.org/d692ae63-0a7e-43e0-9da9-fe4f4cc6c607"
      }
    },
-      "relayers":{}
+    "relayers": {}
  }
 }
 ```
--- a/cli.js
+++ b/cli.js
@ -10,14 +10,13 @@ const circomlib = require('@tornado/circomlib');
 const bigInt = snarkjs.bigInt;
 const merkleTree = require('@tornado/fixed-merkle-tree');
 const Web3 = require('web3');
-const Web3HttpProvider = require('@tornado/web3-providers-http');
 const buildGroth16 = require('@tornado/websnark/src/groth16');
 const websnarkUtils = require('@tornado/websnark/src/utils');
 const { toWei, fromWei, toBN, BN } = require('web3-utils');
 const BigNumber = require('bignumber.js');
 const config = require('./config');
 const program = require('commander');
-const { TornadoFeeOracleV4, TornadoFeeOracleV5, TokenPriceOracle } = require('@tornado/tornado-oracles');
+const { TornadoFeeOracleV4, TornadoFeeOracleV5 } = require('@tornado/tornado-oracles');
 const { SocksProxyAgent } = require('socks-proxy-agent');
 const is_ip_private = require('private-ip');
 const readline = require('readline');
@ -486,7 +485,15 @@ async function withdraw({ deposit, currency, amount, recipient, relayerURL, refu
        headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' }
      };
    }
-    const relayerStatus = await axios.get(relayerURL + '/status', options);
+
+    let relayerStatus;
+    try {
+      relayerURL = new URL(relayerURL).origin;
+      relayerStatus = await axios.get(relayerURL + '/status', options);
+    } catch (err) {
+      console.error(err);
+      throw new Error('Cannot get relayer status');
+    }

    const { rewardAccount, netId, ethPrices, tornadoServiceFee } = relayerStatus.data;
    assert(netId === (await web3.eth.net.getId()) || netId === '*', 'This relay is for different network');
@ -1359,7 +1366,7 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
    console.log('Using tor network');
    web3Options = { agent: { https: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 };
    // Use forked web3-providers-http from local file to modify user-agent header value which improves privacy.
-    web3 = new Web3(new Web3HttpProvider(rpc, web3Options), null, { transactionConfirmationBlocks: 1 });
+    web3 = new Web3(new Web3.providers.HttpProvider(rpc, web3Options), null, { transactionConfirmationBlocks: 1 });
    ipOptions = {
      httpsAgent: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort),
      headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' }
@ -1368,21 +1375,22 @@ async function init({ rpc, noteNetId, currency = 'dai', amount = '100', balanceC
    console.log('Using tor network');
    web3Options = { agent: { http: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort) }, timeout: 60000 };
    // Use forked web3-providers-http from local file to modify user-agent header value which improves privacy.
-    web3 = new Web3(new Web3HttpProvider(rpc, web3Options), null, { transactionConfirmationBlocks: 1 });
+    web3 = new Web3(new Web3.providers.HttpProvider(rpc, web3Options), null, { transactionConfirmationBlocks: 1 });
    ipOptions = {
      httpsAgent: new SocksProxyAgent('socks5h://127.0.0.1:' + torPort),
      headers: { 'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; rv:91.0) Gecko/20100101 Firefox/91.0' }
    };
  } else if (rpc.includes('ipc')) {
    console.log('Using ipc connection');
-    web3 = new Web3(new Web3.providers.IpcProvider(rpc, net), null, { transactionConfirmationBlocks: 1 });
+    web3 = new Web3(new Web3.providers.IpcProvider(rpc, {}), null, { transactionConfirmationBlocks: 1 });
  } else if (rpc.startsWith('ws') || rpc.startsWith('wss')) {
    console.log('Using websocket connection (Note: Tor is not supported for Websocket providers)');
    web3Options = {
      clientConfig: { keepalive: true, keepaliveInterval: -1 },
      reconnect: { auto: true, delay: 1000, maxAttempts: 10, onTimeout: false }
    };
-    web3 = new Web3(new Web3.providers.WebsocketProvider(rpc, web3Options), net, { transactionConfirmationBlocks: 1 });
+    web3 = new Web3(new Web3.providers.WebsocketProvider(rpc, web3Options), null, { transactionConfirmationBlocks: 1 });
+    if (!(await web3.eth.net.isListening())) throw new Error('Cannot connect to websocket provider');
  } else {
    console.log('Connecting to remote node');
    web3 = new Web3(rpc, null, { transactionConfirmationBlocks: 1 });
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -11,12 +11,11 @@
  "license": "ISC",
  "dependencies": {
    "@ethersproject/transactions": "^5.7.0",
-    "@tornado/circomlib": "0.0.20-p2",
-    "@tornado/fixed-merkle-tree": "0.6.1-p1",
-    "@tornado/snarkjs": "0.1.20-p2",
+    "@tornado/circomlib": "0.0.21",
+    "@tornado/fixed-merkle-tree": "0.6.1",
+    "@tornado/snarkjs": "0.1.20",
    "@tornado/tornado-oracles": "^3.3.0",
-    "@tornado/web3-providers-http": "1.6.5-p1",
-    "@tornado/websnark": "0.0.4-p1",
+    "@tornado/websnark": "0.0.4",
    "axios": "^0.19.2",
    "bignumber.js": "^9.0.0",
    "circom": "0.0.35",
@ -25,7 +24,7 @@
    "es5-ext": "0.10.53",
    "private-ip": "^2.3.3",
    "socks-proxy-agent": "^6.1.1",
-    "web3": "^1.6.1"
+    "web3": "^1.10.2"
  },
  "devDependencies": {
    "eslint": "^7.0.0"
Author	SHA1	Message	Date
Theo	c0b9a98486	Remove unneccessary web-providers-http lib after fix errors in new web3.js version & fix websocket and ipc providers connection	2023-09-23 11:10:21 -07:00
Theo	8f1bb32701	Update self-hosted Tornado packages versions to actual	2023-09-12 20:38:13 -07:00
Theo	0b4e6e37d9	Normalize relayer URL before using & fix relayer status check	2023-09-12 20:37:42 -07:00
Theo	5ad9b5ef05	Remove deprecated info about Anonymity Mining (ended in 2021)	2023-09-07 14:29:17 -07:00