Resolve all Tornado dependencies via self-hosted registry on Gitea

Dockerfile

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

package.json

@@ -19,21 +19,21 @@
   "author": "Tornado Cash team",
   "license": "MIT",
   "dependencies": {
-    "@tornado/tornado-config": "^2.0.0",
+    "@tornado/anonymity-mining": "^2.1.5",
+    "@tornado/circomlib": "^0.0.21",
+    "@tornado/fixed-merkle-tree": "0.4.0",
+    "@tornado/tornado-config": "^1",
     "@tornado/tornado-oracles": "^3.3.0",
+    "@tornado/tx-manager": "^0.4.9",
     "ajv": "^6.12.5",
     "async-mutex": "^0.2.4",
     "bull": "^3.12.1",
-    "circomlib": "git+https://git.tornado.ws/tornado-packages/circomlib.git#3b492f9801573eebcfe1b6c584afe8a3beecf2b4",
     "concurrently": "^8.2.0",
     "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",
-    "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

@@ -14,7 +14,7 @@ module.exports = {
   instances: tornConfig.instances,
   torn: tornConfig,
   port: process.env.APP_PORT || 8000,
-  tornadoServiceFee: Number(process.env.REGULAR_TORNADO_WITHDRAW_FEE),
+  tornadoServiceFee: Number(process.env.RELAYER_FEE),
   rewardAccount: process.env.REWARD_ACCOUNT,
   governanceAddress: '0x5efda50f22d34F262c29268506C5Fa42cB56A1Ce',
   tornadoGoerliProxy: '0x454d870a72e29d5E5697f635128D18077BD04C60',

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

@@ -1,5 +1,5 @@
 const { instances, netId } = require('./config')
-const { poseidon } = require('circomlib')
+const { poseidon } = require('@tornado/circomlib')
 const { toBN, toChecksumAddress, BN, fromWei, isAddress, toWei, toHex } = require('web3-utils')
 
 const addressMap = new Map()

src/worker.js

@@ -1,6 +1,6 @@
 const fs = require('fs')
-const MerkleTree = require('fixed-merkle-tree')
+const MerkleTree = require('@tornado/fixed-merkle-tree')
-const { Utils, Controller } = require('tornado-anonymity-mining')
+const { Utils, Controller } = require('@tornado/anonymity-mining')
 const { TornadoFeeOracleV5 } = require('@tornado/tornado-oracles')
 const swapABI = require('../abis/swap.abi.json')
 const miningABI = require('../abis/mining.abi.json')
@@ -12,8 +12,6 @@ const {
   getInstance,
   sleep,
   toBN,
-  toWei,
-  toHex,
   fromWei,
   toChecksumAddress,
   RelayerError,
@@ -33,7 +31,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')