Update dependencies & bump required node version to 16

.gitignore

@@ -6,3 +6,4 @@ node_modules/
 kovan.*
 dump.rdb
 .idea
+yarn-error.log

Dockerfile

@@ -1,4 +1,4 @@
-FROM node:14
+FROM node:16
 WORKDIR /app
 
 COPY package.json yarn.lock ./

package.json

@@ -19,8 +19,12 @@
   "author": "tornado.cash",
   "license": "MIT",
   "dependencies": {
+    "@tornado/anonymity-mining": "^2.1.5",
     "@tornado/circomlib": "^0.0.21",
+    "@tornado/fixed-merkle-tree": "^0.4",
+    "@tornado/tornado-config": "^1",
     "@tornado/tornado-oracles": "1.2.2",
+    "@tornado/tx-manager": "^0.4.9",
     "ajv": "^6.12.5",
     "async-mutex": "^0.2.4",
     "bull": "^3.12.1",
@@ -28,12 +32,8 @@
     "dotenv": "^8.2.0",
     "eth-ens-namehash": "^2.0.8",
     "express": "^4.17.1",
-    "fixed-merkle-tree": "^0.4.0",
     "ioredis": "^4.14.1",
     "node-fetch": "^2.6.7",
-    "torn-token": "1.0.6",
-    "tornado-anonymity-mining": "^2.1.2",
-    "tx-manager": "^0.4.8",
     "uuid": "^8.3.0",
     "web3": "^1.3.0",
     "web3-core-promievent": "^1.3.0",

src/config.js

@@ -1,7 +1,7 @@
 require('dotenv').config()
 
 const { jobType } = require('./constants')
-const tornConfig = require('torn-token')
+const tornConfig = require('@tornado/tornado-config')
 module.exports = {
   netId: Number(process.env.NET_ID) || 1,
   redisUrl: process.env.REDIS_URL || 'redis://127.0.0.1:6379',

src/contollers/status.js

@@ -12,7 +12,7 @@ async function status(req, res) {
 
   res.json({
     rewardAccount,
-    instances: instances[`netId${netId}`],
+    instances: instances[netId],
     netId,
     ethPrices,
     tornadoServiceFee,

src/treeWatcher.js

@@ -1,4 +1,4 @@
-const MerkleTree = require('fixed-merkle-tree')
+const MerkleTree = require('@tornado/fixed-merkle-tree')
 const { minerMerkleTreeHeight, torn, netId } = require('./config')
 const { poseidonHash2, toBN, logRelayerError } = require('./utils')
 const resolver = require('./modules/resolver')

src/utils.js

@@ -3,7 +3,7 @@ const { poseidon } = require('@tornado/circomlib')
 const { toBN, toChecksumAddress, BN, fromWei, isAddress, toWei } = require('web3-utils')
 
 const addressMap = new Map()
-const instance = instances[`netId${netId}`]
+const instance = instances[netId]
 
 for (const [currency, { instanceAddress, symbol, decimals }] of Object.entries(instance)) {
   Object.entries(instanceAddress).forEach(([amount, address]) =>

src/worker.js

@@ -1,7 +1,7 @@
 const fs = require('fs')
-const MerkleTree = require('fixed-merkle-tree')
+const MerkleTree = require('@tornado/fixed-merkle-tree')
 const { TornadoFeeOracleV4, bump } = require('@tornado/tornado-oracles')
-const { Utils, Controller } = require('tornado-anonymity-mining')
+const { Utils, Controller } = require('@tornado/anonymity-mining')
 
 const swapABI = require('../abis/swap.abi.json')
 const miningABI = require('../abis/mining.abi.json')
@@ -34,7 +34,7 @@ const {
   tornadoGoerliProxy,
 } = require('./config')
 const resolver = require('./modules/resolver')
-const { TxManager } = require('tx-manager')
+const { TxManager } = require('@tornado/tx-manager')
 const { redis, redisSubscribe } = require('./modules/redis')
 const getWeb3 = require('./modules/web3')