Update script, docker bundler and instructions for Nova

.dockerignore

@@ -1,6 +0,0 @@
-node_modules
-.env
-.git
-build
-test
-.nyc_output

.editorconfig

@@ -1,9 +0,0 @@
-root = true
-
-[*]
-indent_style = space
-indent_size = 2
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true

.env.example

@@ -1,25 +0,0 @@
-NET_ID=1
-HTTP_RPC_URL=https://api.securerpc.com/v1
-# ORACLE_RPC_URL should always point to the mainnet
-ORACLE_RPC_URL=https://api.securerpc.com/v1
-REDIS_URL=redis://127.0.0.1:6379
-
-# DNS settings
-VIRTUAL_HOST=example.duckdns.org
-LETSENCRYPT_HOST=example.duckdns.org
-APP_PORT=8000
-
-# without 0x prefix
-PRIVATE_KEY=
-# 0.1 means 0.1%, we recommend 0.1 for sidechains and 0.4 for mainnet
-RELAYER_FEE=0.1
-REWARD_ACCOUNT=0x...
-CONFIRMATIONS=4
-
-# in GWEI
-MAX_GAS_PRICE=1000
-GAS_BUMP_PERCENTAGE=5
-AGGREGATOR=0x8cb1436F64a3c33aD17bb42F94e255c4c0E871b2
-# Telegram bot alerts
-TELEGRAM_NOTIFIER_BOT_TOKEN=
-TELEGRAM_NOTIFIER_CHAT_ID=

.eslintrc.json

@@ -1,21 +0,0 @@
-{
-  "env": {
-    "node": true,
-    "commonjs": true,
-    "es2020": true
-  },
-  "extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier"],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 11
-  },
-  "plugins": ["@typescript-eslint"],
-  "rules": {
-    "linebreak-style": ["error", "unix"],
-    "quotes": ["error", "single"],
-    "semi": ["error", "always"],
-    "no-useless-catch": "off",
-    "@typescript-eslint/no-var-requires": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off"
-  }
-}

.github/workflows/build.yml

@@ -1,95 +0,0 @@
-name: build
-
-on:
-  push:
-    branches: ['*']
-    tags: ['v[0-9]+.[0-9]+.[0-9]+']
-  pull_request:
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 16
-      - run: yarn install
-      - run: yarn lint
-      - name: Telegram Failure Notification
-        uses: appleboy/telegram-action@master
-        if: failure()
-        with:
-          message: ❗ Build failed for [${{ github.repository }}](https://github.com/${{ github.repository }}/actions) because of ${{ github.actor }}
-          format: markdown
-          to: ${{ secrets.TELEGRAM_CHAT_ID }}
-          token: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-  publish:
-    runs-on: ubuntu-latest
-    needs: build
-    if: startsWith(github.ref, 'refs/tags')
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v2
-
-      - name: Set vars
-        id: vars
-        run: |
-          echo "::set-output name=version::$(echo ${GITHUB_REF#refs/tags/v})"
-          echo "::set-output name=repo_name::$(echo ${GITHUB_REPOSITORY#*/})"
-
-      - name: Check package.json version vs tag
-        run: |
-          [ ${{ steps.vars.outputs.version }} = $(grep '"version":' package.json | grep -o "[0-9.]*") ] || (echo "Git tag doesn't match version in package.json" && false)
-
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v1.1.0
-        with:
-          dockerfile: Dockerfile
-          repository: tornadocash/relayer
-          tag_with_ref: true
-          tags: candidate
-          username: ${{ secrets.DOCKER_USERNAME }}
-          password: ${{ secrets.DOCKER_TOKEN }}
-
-      - name: Telegram Message Notify
-        uses: appleboy/telegram-action@master
-        with:
-          to: ${{ secrets.TELEGRAM_CHAT_ID }}
-          token: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-          message: 🚀 Published a [${{ steps.vars.outputs.repo_name }}](https://github.com/${{ github.repository }}) version ${{ steps.vars.outputs.version }} to docker hub
-          debug: true
-          format: markdown
-
-      - name: Telegram Relayer Channel Notification
-        uses: appleboy/telegram-action@master
-        with:
-          to: ${{ secrets.TELEGRAM_RELAYER_CHAT_ID }}
-          token: ${{ secrets.TELEGRAM_BOT_TOKEN }}
-          message: |
-            🚀 Published a new version of the relayer node service to docker hub: `tornadocash/relayer:v${{ steps.vars.outputs.version }}` and `tornadocash/relayer`.
-
-            ❗️Please update your nodes ❗️
-
-          debug: true
-          format: markdown
-
-      - name: Discord Relayer Channel Notification
-        env:
-          DISCORD_WEBHOOK: ${{ secrets.DISCORD_RELAYER_WEBHOOK }}
-        uses: Ilshidur/action-discord@master
-        with:
-          args: |
-            🚀 Published a new version of the relayer node service to docker hub: `tornadocash/relayer:v${{ steps.vars.outputs.version }}` and `tornadocash/relayer`.
-
-            ❗️Please update your nodes ❗️
-
-      - name: Telegram Failure Notification
-        uses: appleboy/telegram-action@master
-        if: failure()
-        with:
-          message: ❗ Failed to publish [${{ steps.vars.outputs.repo_name }}](https://github.com/${{ github.repository }}/actions):v${{ steps.vars.outputs.version }} for mainnet because of ${{ github.actor }}
-          format: markdown
-          to: ${{ secrets.TELEGRAM_CHAT_ID }}
-          token: ${{ secrets.TELEGRAM_BOT_TOKEN }}

.gitignore

@@ -1,10 +1,4 @@
-.vscode
-node_modules/
+node_modules
+
 .env
-.env.mainnet
-.env.kovan
-kovan.*
-dump.rdb
-.idea
-build
-.nyc_output
+.env*

.npmrc

@@ -1 +0,0 @@
-@tornado:registry=https://git.tornado.ws/api/packages/tornado-packages/npm/

.nvmrc

@@ -1 +0,0 @@
-v20.3.0

.prettierrc

@@ -1,7 +0,0 @@
-{
-  "semi": true,
-  "trailingComma": "all",
-  "singleQuote": true,
-  "printWidth": 130,
-  "tabWidth": 2
-}

Dockerfile

@@ -1,28 +0,0 @@
-FROM node:20-alpine as dev
-
-ENV NODE_ENV=development
-
-WORKDIR /usr/app
-
-COPY yarn.lock .
-COPY package.json .
-RUN apk update && apk add --no-cache g++ make python3 && rm -rf /var/cache/apk/*
-RUN yarn install
-COPY . ./
-
-RUN yarn build
-
-FROM node:20-alpine as prod
-ENV NODE_ENV=production
-
-WORKDIR /app
-
-RUN apk update && apk add --no-cache g++ make python3 && rm -rf /var/cache/apk/*
-
-COPY --from=dev /usr/app/ /app
-COPY --from=dev /usr/app/package.json /app/
-COPY --from=dev /usr/app/yarn.lock /app/
-
-RUN yarn install && yarn cache clean -f
-
-ENTRYPOINT ["yarn"]

README.md

@@ -1,4 +1,4 @@
-# Relayer for Tornado Cash [![Build Status](https://github.com/tornadocash/relayer/workflows/build/badge.svg)](https://github.com/tornadocash/relayer/actions) ![Static Badge](https://img.shields.io/badge/version-6.0.0-blue?logo=docker)
+# Relayer for Tornado Cash [![Build Status](https://github.com/tornadocash/relayer/workflows/build/badge.svg)](https://github.com/tornadocash/relayer/actions) [![Docker Image Version (latest semver)](https://img.shields.io/docker/v/tornadocash/relayer?logo=docker&logoColor=%23FFFFFF&sort=semver)](https://hub.docker.com/repository/docker/tornadocash/relayer)
 
 __*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.__
 
@@ -13,7 +13,7 @@ __*It is recommended to run your Relayer on a VPS instnace ([Virtual Private Ser
 Just run in terminal:
 
 ```bash
-curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/v6/install.sh | bash
+curl -s https://git.tornado.ws/tornadocash/tornado-relayer/raw/branch/main-v4/install.sh | bash
 ```
 
 #### Configuring environments:
@@ -24,112 +24,37 @@ curl -s https://git.tornado.ws/tornadocash/classic-relayer/raw/branch/v6/install
 ​	By default each network is preconfigured the naming of `.env.<NETWORK>`
 
 - `.env.eth` for Ethereum Mainnet 
-- `.env.goerli` for Goerli testnet
-- `.env.bsc` for Binance Smart Chain
-- `.env.arb` for Arbitrum
-- `.env.op` for Optimism
-- `.env.gnosis` for Gnosis (xdai)
-- `.env.polygon` for Polygon (matic)
-- `.env.avax` for Avalanche C-Chain
+
+  - `.env.bsc` for Binance Smart Chain
+  - `.env.arb` for Arbitrum
+  - `.env.op` for Optimism
+  - `.env.gnosis` for Gnosis (xdai)
+  - `.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:
 
   - 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*
-
   - Set `VIRTUAL_HOST` and `LETSENCRYPT_HOST` a unique subndomain for every network to each environment file
-
     - eg: `mainnet.example.com` for Ethereum, `binance.example.com` for Binance etc
     - add a A wildcard record DNS record with the value assigned to your instance IP address to configure subdomains
-
   - Set `RELAYER_FEE` to what you would like to charge as your fee (remember 0.3% is deducted from your staked relayer balance)
-
   - Set `RPC_URL` to a non-censoring RPC (You can [run your own](https://github.com/feshchenkod/rpc-nodes), or use a [free option](https://chainnodes.org/))
-
   - Set `ORACLE_RPC_URL` to an Ethereum native RPC endpoint
 
-  - Set `REWARD_ACCOUNT` - eth address that is used to collect fees
-
-  - Set `TELEGRAM_NOTIFIER_BOT_TOKEN` and `TELEGRAM_NOTIFIER_CHAT_ID` if your want get notify to telegram
-
-    
-
-  - Update `AGGREGATOR` if needed - Contract address of aggregator instance.
-
-  - Update `CONFIRMATIONS` if needed - how many block confirmations to wait before processing an event. Not recommended
-    to set less than 3
-
-  - Update `MAX_GAS_PRICE` if needed - maximum value of gwei value for relayer's transaction
-
-  - Update `GAS_BUMP_PERCENTAGE` if needed - how much in % will the network gas for transaction additionally increased
-
-    **NB!** Don't update these values if you not sure what you doing.
+4. Optional: if you want to run relayer for [Nova](https://nova.tornado.ws), fill `.env.nova` file by instructions in [Nova branch](https://git.tornado.ws/tornadocash/tornado-relayer/src/branch/nova), because config is very specific
 
 
 
 #### Deployment:
 
-1. Build and deploy the docker source for the configured neworks specified via `--profile <NETWORK_SYMBOL>`, for example (if you run relayer only for Ethereum Mainnet, Binance Smart Chain and Arbitrum):
+1. Build and deploy the docker source for the configured networks specified via `--profile <NETWORK_SYMBOL>`, for example (if you run relayer only for Ethereum Mainnet, Binance Smart Chain and Arbitrum):
 
   - `docker-compose --profile eth --profile bsc --profile arb up -d`
 
 2. Visit your domain addresses and check each `/status` endpoint to ensure there is no errors in the `status` fields
-
-## Run locally
-
-1. `yarn`
-2. `cp .env.example .env`
-3. Modify `.env` as needed
-4. `yarn start`
-5. Go to `http://127.0.0.1:8000`
-6. In order to execute withdraw request, you can run following command
-
-```bash
-curl -X POST -H 'content-type:application/json' --data '<input data>' http://127.0.0.1:8000/v1/tornadoWithdraw
-
-```
-
-Relayer should return a job id in uuid v4 format.
-
-In that case you will need to add https termination yourself because browsers with default settings will prevent https
-Tornado Cash UI from submitting your request over http connection
-
-## Run geth node
-
-It is strongly recommended that you use your own RPC node. Instruction on how to run full node with `geth` can be
-found [here](https://github.com/tornadocash/rpc-nodes).
-
-## Monitoring
-
-### Basic
-
-For basic monitoring setup telegram bot and fill variables in .env file
-
-Alerts about:
-
-- Main relayer currency balance
-- Torn staked balance in relayer contract
-- Withdraw transactions send errors
-
-How to create bot: https://core.telegram.org/bots#3-how-do-i-create-a-bot
-
-How to get chat id: https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/32572159#32572159
-
-### Advanced
-
-You can find the guide on how to install the Zabbix server in the [/monitoring/README.md](/monitoring/README.md).
-
-## Compatible networks
-
-- Ethereum Mainnet (1)
-- Binance Smart Chain (56)
-- Polygon (Matic) Network (137)
-- Optimism (10)
-- Arbitrum One (42161)
-- Gnosis Chain (100)
-- Avalanche Mainnet (43114)
-- Ethereum Goerli (5)
+2. Optional: if you want to run Nova relayer, just add `--profile nova` to docker-compose command 
 
 
 

abis/Aggregator.abi.json

@@ -1,334 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "contract MultiWrapper",
-        "name": "_multiWrapper",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IOracle[]",
-        "name": "existingOracles",
-        "type": "address[]"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType[]",
-        "name": "oracleTypes",
-        "type": "uint8[]"
-      },
-      {
-        "internalType": "contract IERC20[]",
-        "name": "existingConnectors",
-        "type": "address[]"
-      },
-      {
-        "internalType": "contract IERC20",
-        "name": "wBase",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "ConnectorAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "ConnectorRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract MultiWrapper",
-        "name": "multiWrapper",
-        "type": "address"
-      }
-    ],
-    "name": "MultiWrapperUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleType",
-        "type": "uint8"
-      }
-    ],
-    "name": "OracleAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleType",
-        "type": "uint8"
-      }
-    ],
-    "name": "OracleRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "addConnector",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleKind",
-        "type": "uint8"
-      }
-    ],
-    "name": "addOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "connectors",
-    "outputs": [
-      {
-        "internalType": "contract IERC20[]",
-        "name": "allConnectors",
-        "type": "address[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "srcToken",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IERC20",
-        "name": "dstToken",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "useWrappers",
-        "type": "bool"
-      }
-    ],
-    "name": "getRate",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "weightedRate",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "srcToken",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "useSrcWrappers",
-        "type": "bool"
-      }
-    ],
-    "name": "getRateToEth",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "weightedRate",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "multiWrapper",
-    "outputs": [
-      {
-        "internalType": "contract MultiWrapper",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "oracles",
-    "outputs": [
-      {
-        "internalType": "contract IOracle[]",
-        "name": "allOracles",
-        "type": "address[]"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType[]",
-        "name": "oracleTypes",
-        "type": "uint8[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "removeConnector",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleKind",
-        "type": "uint8"
-      }
-    ],
-    "name": "removeOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract MultiWrapper",
-        "name": "_multiWrapper",
-        "type": "address"
-      }
-    ],
-    "name": "setMultiWrapper",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

abis/ERC20.abi.json

@@ -1,256 +0,0 @@
-[
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "totalSupply",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "_totalSupply",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "who",
-        "type": "address"
-      }
-    ],
-    "name": "balanceOf",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transfer",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Approval",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "Transfer",
-    "type": "event"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      }
-    ],
-    "name": "allowance",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "from",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "transferFrom",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "value",
-        "type": "uint256"
-      }
-    ],
-    "name": "approve",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      }
-    ],
-    "name": "nonces",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "owner",
-        "type": "address"
-      },
-      {
-        "internalType": "address",
-        "name": "spender",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "amount",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "deadline",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint8",
-        "name": "v",
-        "type": "uint8"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "r",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "s",
-        "type": "bytes32"
-      }
-    ],
-    "name": "permit",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

abis/Multicall.abi.json

@@ -1,38 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "components": [
-          {
-            "internalType": "address",
-            "name": "to",
-            "type": "address"
-          },
-          {
-            "internalType": "bytes",
-            "name": "data",
-            "type": "bytes"
-          }
-        ],
-        "internalType": "struct MultiCall.Call[]",
-        "name": "calls",
-        "type": "tuple[]"
-      }
-    ],
-    "name": "multicall",
-    "outputs": [
-      {
-        "internalType": "bytes[]",
-        "name": "results",
-        "type": "bytes[]"
-      },
-      {
-        "internalType": "bool[]",
-        "name": "success",
-        "type": "bool[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]

abis/OffchainOracle.abi.json

@@ -1,292 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "contract MultiWrapper",
-        "name": "_multiWrapper",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IOracle[]",
-        "name": "existingOracles",
-        "type": "address[]"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType[]",
-        "name": "oracleTypes",
-        "type": "uint8[]"
-      },
-      {
-        "internalType": "contract IERC20[]",
-        "name": "existingConnectors",
-        "type": "address[]"
-      },
-      { "internalType": "contract IERC20", "name": "wBase", "type": "address" }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "ConnectorAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "ConnectorRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract MultiWrapper",
-        "name": "multiWrapper",
-        "type": "address"
-      }
-    ],
-    "name": "MultiWrapperUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleType",
-        "type": "uint8"
-      }
-    ],
-    "name": "OracleAdded",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleType",
-        "type": "uint8"
-      }
-    ],
-    "name": "OracleRemoved",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "previousOwner",
-        "type": "address"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "newOwner",
-        "type": "address"
-      }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "addConnector",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleKind",
-        "type": "uint8"
-      }
-    ],
-    "name": "addOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "connectors",
-    "outputs": [
-      {
-        "internalType": "contract IERC20[]",
-        "name": "allConnectors",
-        "type": "address[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "srcToken",
-        "type": "address"
-      },
-      {
-        "internalType": "contract IERC20",
-        "name": "dstToken",
-        "type": "address"
-      },
-      { "internalType": "bool", "name": "useWrappers", "type": "bool" }
-    ],
-    "name": "getRate",
-    "outputs": [{ "internalType": "uint256", "name": "weightedRate", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "srcToken",
-        "type": "address"
-      },
-      { "internalType": "bool", "name": "useSrcWrappers", "type": "bool" }
-    ],
-    "name": "getRateToEth",
-    "outputs": [{ "internalType": "uint256", "name": "weightedRate", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "multiWrapper",
-    "outputs": [{ "internalType": "contract MultiWrapper", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "oracles",
-    "outputs": [
-      {
-        "internalType": "contract IOracle[]",
-        "name": "allOracles",
-        "type": "address[]"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType[]",
-        "name": "oracleTypes",
-        "type": "uint8[]"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IERC20",
-        "name": "connector",
-        "type": "address"
-      }
-    ],
-    "name": "removeConnector",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IOracle",
-        "name": "oracle",
-        "type": "address"
-      },
-      {
-        "internalType": "enum OffchainOracle.OracleType",
-        "name": "oracleKind",
-        "type": "uint8"
-      }
-    ],
-    "name": "removeOracle",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "renounceOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract MultiWrapper",
-        "name": "_multiWrapper",
-        "type": "address"
-      }
-    ],
-    "name": "setMultiWrapper",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

abis/OvmGasPriceOracle.abi.json

@@ -1,145 +0,0 @@
-[
-  {
-    "inputs": [{ "internalType": "address", "name": "_owner", "type": "address" }],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
-    "name": "DecimalsUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
-    "name": "GasPriceUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
-    "name": "L1BaseFeeUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
-    "name": "OverheadUpdated",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": true, "internalType": "address", "name": "previousOwner", "type": "address" },
-      { "indexed": true, "internalType": "address", "name": "newOwner", "type": "address" }
-    ],
-    "name": "OwnershipTransferred",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "", "type": "uint256" }],
-    "name": "ScalarUpdated",
-    "type": "event"
-  },
-  {
-    "inputs": [],
-    "name": "decimals",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "gasPrice",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }],
-    "name": "getL1Fee",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes", "name": "_data", "type": "bytes" }],
-    "name": "getL1GasUsed",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "l1BaseFee",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "overhead",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "owner",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  { "inputs": [], "name": "renounceOwnership", "outputs": [], "stateMutability": "nonpayable", "type": "function" },
-  {
-    "inputs": [],
-    "name": "scalar",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_decimals", "type": "uint256" }],
-    "name": "setDecimals",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_gasPrice", "type": "uint256" }],
-    "name": "setGasPrice",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_baseFee", "type": "uint256" }],
-    "name": "setL1BaseFee",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_overhead", "type": "uint256" }],
-    "name": "setOverhead",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "_scalar", "type": "uint256" }],
-    "name": "setScalar",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "newOwner", "type": "address" }],
-    "name": "transferOwnership",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  }
-]

abis/ProxyLight.abi.json

@@ -1,105 +0,0 @@
-[
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "sender",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes",
-        "name": "encryptedNote",
-        "type": "bytes"
-      }
-    ],
-    "name": "EncryptedNote",
-    "type": "event"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes[]",
-        "name": "_encryptedNotes",
-        "type": "bytes[]"
-      }
-    ],
-    "name": "backupNotes",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornadoInstance",
-        "name": "_tornado",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_commitment",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_encryptedNote",
-        "type": "bytes"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornadoInstance",
-        "name": "_tornado",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "_proof",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_root",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_nullifierHash",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_relayer",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_fee",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_refund",
-        "type": "uint256"
-      }
-    ],
-    "name": "withdraw",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]

abis/RelayerRegistry.abi.json

@@ -1,297 +0,0 @@
-[
-  {
-    "inputs": [
-      { "internalType": "address", "name": "_torn", "type": "address" },
-      { "internalType": "address", "name": "_governance", "type": "address" },
-      { "internalType": "address", "name": "_ens", "type": "address" },
-      { "internalType": "address", "name": "_staking", "type": "address" },
-      { "internalType": "address", "name": "_feeManager", "type": "address" }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "uint256", "name": "minStakeAmount", "type": "uint256" }],
-    "name": "MinimumStakeAmount",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "address", "name": "relayer", "type": "address" }],
-    "name": "RelayerBalanceNullified",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": false, "internalType": "bytes32", "name": "relayer", "type": "bytes32" },
-      { "indexed": false, "internalType": "string", "name": "ensName", "type": "string" },
-      { "indexed": false, "internalType": "address", "name": "relayerAddress", "type": "address" },
-      { "indexed": false, "internalType": "uint256", "name": "stakedAmount", "type": "uint256" }
-    ],
-    "name": "RelayerRegistered",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [{ "indexed": false, "internalType": "address", "name": "tornadoRouter", "type": "address" }],
-    "name": "RouterRegistered",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": false, "internalType": "address", "name": "relayer", "type": "address" },
-      { "indexed": false, "internalType": "uint256", "name": "amountStakeAdded", "type": "uint256" }
-    ],
-    "name": "StakeAddedToRelayer",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": false, "internalType": "address", "name": "relayer", "type": "address" },
-      { "indexed": false, "internalType": "uint256", "name": "amountBurned", "type": "uint256" }
-    ],
-    "name": "StakeBurned",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": false, "internalType": "address", "name": "relayer", "type": "address" },
-      { "indexed": false, "internalType": "address", "name": "worker", "type": "address" }
-    ],
-    "name": "WorkerRegistered",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      { "indexed": false, "internalType": "address", "name": "relayer", "type": "address" },
-      { "indexed": false, "internalType": "address", "name": "worker", "type": "address" }
-    ],
-    "name": "WorkerUnregistered",
-    "type": "event"
-  },
-  {
-    "inputs": [{ "internalType": "bytes32[]", "name": "domains", "type": "bytes32[]" }],
-    "name": "bulkResolve",
-    "outputs": [{ "internalType": "address[]", "name": "result", "type": "address[]" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "sender", "type": "address" },
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "contract ITornadoInstance", "name": "pool", "type": "address" }
-    ],
-    "name": "burn",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "ens",
-    "outputs": [{ "internalType": "contract IENS", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "feeManager",
-    "outputs": [{ "internalType": "contract IFeeManager", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "relayer", "type": "address" }],
-    "name": "getRelayerBalance",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "relayer", "type": "address" }],
-    "name": "getRelayerEnsHash",
-    "outputs": [{ "internalType": "bytes32", "name": "", "type": "bytes32" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "governance",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes32", "name": "_tornadoRouter", "type": "bytes32" }],
-    "name": "initialize",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "toResolve", "type": "address" }],
-    "name": "isRelayer",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "address", "name": "toResolve", "type": "address" }
-    ],
-    "name": "isRelayerRegistered",
-    "outputs": [{ "internalType": "bool", "name": "", "type": "bool" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "minStakeAmount",
-    "outputs": [{ "internalType": "uint256", "name": "", "type": "uint256" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "relayer", "type": "address" }],
-    "name": "nullifyBalance",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "string", "name": "ensName", "type": "string" },
-      { "internalType": "uint256", "name": "stake", "type": "uint256" },
-      { "internalType": "address[]", "name": "workersToRegister", "type": "address[]" }
-    ],
-    "name": "register",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "string", "name": "ensName", "type": "string" },
-      { "internalType": "uint256", "name": "stake", "type": "uint256" },
-      { "internalType": "address[]", "name": "workersToRegister", "type": "address[]" },
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "uint256", "name": "deadline", "type": "uint256" },
-      { "internalType": "uint8", "name": "v", "type": "uint8" },
-      { "internalType": "bytes32", "name": "r", "type": "bytes32" },
-      { "internalType": "bytes32", "name": "s", "type": "bytes32" }
-    ],
-    "name": "registerPermit",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "address", "name": "worker", "type": "address" }
-    ],
-    "name": "registerWorker",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "relayers",
-    "outputs": [
-      { "internalType": "uint256", "name": "balance", "type": "uint256" },
-      { "internalType": "bytes32", "name": "ensHash", "type": "bytes32" }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "bytes32", "name": "node", "type": "bytes32" }],
-    "name": "resolve",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "uint256", "name": "minAmount", "type": "uint256" }],
-    "name": "setMinStakeAmount",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "tornadoRouterAddress", "type": "address" }],
-    "name": "setTornadoRouter",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "uint256", "name": "stake", "type": "uint256" }
-    ],
-    "name": "stakeToRelayer",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      { "internalType": "address", "name": "relayer", "type": "address" },
-      { "internalType": "uint256", "name": "stake", "type": "uint256" },
-      { "internalType": "address", "name": "staker", "type": "address" },
-      { "internalType": "uint256", "name": "deadline", "type": "uint256" },
-      { "internalType": "uint8", "name": "v", "type": "uint8" },
-      { "internalType": "bytes32", "name": "r", "type": "bytes32" },
-      { "internalType": "bytes32", "name": "s", "type": "bytes32" }
-    ],
-    "name": "stakeToRelayerPermit",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "staking",
-    "outputs": [{ "internalType": "contract TornadoStakingRewards", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "torn",
-    "outputs": [{ "internalType": "contract TORN", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "tornadoRouter",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "worker", "type": "address" }],
-    "name": "unregisterWorker",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "name": "workers",
-    "outputs": [{ "internalType": "address", "name": "", "type": "address" }],
-    "stateMutability": "view",
-    "type": "function"
-  }
-]

abis/TornadoInstance.abi.json

@@ -1,498 +0,0 @@
-[
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_newOperator",
-        "type": "address"
-      }
-    ],
-    "name": "changeOperator",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "nullifierHashes",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "bytes",
-        "name": "_proof",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_root",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_nullifierHash",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "_relayer",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_fee",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_refund",
-        "type": "uint256"
-      }
-    ],
-    "name": "withdraw",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "verifier",
-    "outputs": [
-      {
-        "internalType": "contract IVerifier",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_left",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_right",
-        "type": "bytes32"
-      }
-    ],
-    "name": "hashLeftRight",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "pure",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "FIELD_SIZE",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "levels",
-    "outputs": [
-      {
-        "internalType": "uint32",
-        "name": "",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "operator",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_root",
-        "type": "bytes32"
-      }
-    ],
-    "name": "isKnownRoot",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "name": "commitments",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "denomination",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "currentRootIndex",
-    "outputs": [
-      {
-        "internalType": "uint32",
-        "name": "",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "address",
-        "name": "_newVerifier",
-        "type": "address"
-      }
-    ],
-    "name": "updateVerifier",
-    "outputs": [],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "constant": false,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_commitment",
-        "type": "bytes32"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [],
-    "payable": true,
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "getLastRoot",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "roots",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "ROOT_HISTORY_SIZE",
-    "outputs": [
-      {
-        "internalType": "uint32",
-        "name": "",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_nullifierHash",
-        "type": "bytes32"
-      }
-    ],
-    "name": "isSpent",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "zeros",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "ZERO_VALUE",
-    "outputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [
-      {
-        "internalType": "uint256",
-        "name": "",
-        "type": "uint256"
-      }
-    ],
-    "name": "filledSubtrees",
-    "outputs": [
-      {
-        "internalType": "bytes32",
-        "name": "",
-        "type": "bytes32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "constant": true,
-    "inputs": [],
-    "name": "nextIndex",
-    "outputs": [
-      {
-        "internalType": "uint32",
-        "name": "",
-        "type": "uint32"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract IVerifier",
-        "name": "_verifier",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "_denomination",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint32",
-        "name": "_merkleTreeHeight",
-        "type": "uint32"
-      },
-      {
-        "internalType": "address",
-        "name": "_operator",
-        "type": "address"
-      }
-    ],
-    "payable": false,
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": true,
-        "internalType": "bytes32",
-        "name": "commitment",
-        "type": "bytes32"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint32",
-        "name": "leafIndex",
-        "type": "uint32"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "timestamp",
-        "type": "uint256"
-      }
-    ],
-    "name": "Deposit",
-    "type": "event"
-  },
-  {
-    "anonymous": false,
-    "inputs": [
-      {
-        "indexed": false,
-        "internalType": "address",
-        "name": "to",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "bytes32",
-        "name": "nullifierHash",
-        "type": "bytes32"
-      },
-      {
-        "indexed": true,
-        "internalType": "address",
-        "name": "relayer",
-        "type": "address"
-      },
-      {
-        "indexed": false,
-        "internalType": "uint256",
-        "name": "fee",
-        "type": "uint256"
-      }
-    ],
-    "name": "Withdrawal",
-    "type": "event"
-  }
-]

abis/TornadoProxy.abi.json

@@ -1,171 +0,0 @@
-[
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "_tornadoTrees",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "_governance",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "contract ITornado[]",
-        "name": "_instances",
-        "type": "address[]"
-      }
-    ],
-    "stateMutability": "nonpayable",
-    "type": "constructor"
-  },
-  {
-    "inputs": [],
-    "name": "governance",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornado",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "name": "instances",
-    "outputs": [
-      {
-        "internalType": "bool",
-        "name": "",
-        "type": "bool"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "bytes32",
-        "name": "node",
-        "type": "bytes32"
-      }
-    ],
-    "name": "resolve",
-    "outputs": [
-      {
-        "internalType": "address",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [],
-    "name": "tornadoTrees",
-    "outputs": [
-      {
-        "internalType": "contract ITornadoTrees",
-        "name": "",
-        "type": "address"
-      }
-    ],
-    "stateMutability": "view",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornado",
-        "name": "tornado",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "commitment",
-        "type": "bytes32"
-      }
-    ],
-    "name": "deposit",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornado",
-        "name": "instance",
-        "type": "address"
-      },
-      {
-        "internalType": "bool",
-        "name": "update",
-        "type": "bool"
-      }
-    ],
-    "name": "updateInstances",
-    "outputs": [],
-    "stateMutability": "nonpayable",
-    "type": "function"
-  },
-  {
-    "inputs": [
-      {
-        "internalType": "contract ITornado",
-        "name": "tornado",
-        "type": "address"
-      },
-      {
-        "internalType": "bytes",
-        "name": "proof",
-        "type": "bytes"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "root",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "bytes32",
-        "name": "nullifierHash",
-        "type": "bytes32"
-      },
-      {
-        "internalType": "address payable",
-        "name": "recipient",
-        "type": "address"
-      },
-      {
-        "internalType": "address payable",
-        "name": "relayer",
-        "type": "address"
-      },
-      {
-        "internalType": "uint256",
-        "name": "fee",
-        "type": "uint256"
-      },
-      {
-        "internalType": "uint256",
-        "name": "refund",
-        "type": "uint256"
-      }
-    ],
-    "name": "withdraw",
-    "outputs": [],
-    "stateMutability": "payable",
-    "type": "function"
-  }
-]

docker-compose.yml

@@ -1,415 +1,471 @@
-version: '2'
+version: "2"
 
 services:
-  redis:
-    image: redis
-    restart: always
-    command: [redis-server, --appendonly, 'yes']
-    volumes:
-      - redis:/data
-    ports:
-      - '127.0.0.1:6379:6379'
+    redis:
+        image: redis
+        restart: always
+        command: [redis-server, --appendonly, "yes"]
+        volumes:
+            - redis:/data
 
-  nginx:
-    image: nginx:alpine
-    container_name: nginx
-    restart: always
-    ports:
-      - 80:80
-      - 443:443
-    volumes:
-      - conf:/etc/nginx/conf.d
-      - vhost:/etc/nginx/vhost.d
-      - html:/usr/share/nginx/html
-      - certs:/etc/nginx/certs
-    logging:
-      driver: none
+    nginx:
+        image: nginx:alpine
+        container_name: nginx
+        restart: always
+        ports:
+            - 80:80
+            - 443:443
+        volumes:
+            - conf:/etc/nginx/conf.d
+            - vhost:/etc/nginx/vhost.d
+            - html:/usr/share/nginx/html
+            - certs:/etc/nginx/certs
+        logging:
+            driver: none
 
-  dockergen:
-    image: poma/docker-gen
-    container_name: dockergen
-    restart: always
-    command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
-    volumes_from:
-      - nginx
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock:ro
+    dockergen:
+        image: poma/docker-gen
+        container_name: dockergen
+        restart: always
+        command: -notify-sighup nginx -watch /etc/docker-gen/templates/nginx.tmpl /etc/nginx/conf.d/default.conf
+        volumes_from:
+            - nginx
+        volumes:
+            - /var/run/docker.sock:/var/run/docker.sock:ro
 
-  letsencrypt:
-    image: jrcs/letsencrypt-nginx-proxy-companion
-    container_name: letsencrypt
-    restart: always
-    environment:
-      NGINX_DOCKER_GEN_CONTAINER: dockergen
-    volumes_from:
-      - nginx
-      - dockergen
+    letsencrypt:
+        image: jrcs/letsencrypt-nginx-proxy-companion
+        container_name: letsencrypt
+        restart: always
+        environment:
+            NGINX_DOCKER_GEN_CONTAINER: dockergen
+        volumes_from:
+            - nginx
+            - dockergen
 
-  # ---------------------- ETH Mainnet ----------------------- #
+    # ---------------------- ETH Mainnet ----------------------- #
 
-  eth-server:
-    image: tornadocash/relayer:v6
-    profiles: ['eth']
-    restart: always
-    command: server
-    env_file: .env.eth
-    environment:
-      NET_ID: 1
-      REDIS_URL: redis://redis/0
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    eth-server:
+        build: .
+        image: tornadocash/relayer:mainnet-v4
+        profiles: ["eth"]
+        restart: always
+        command: server
+        env_file: .env.eth
+        environment:
+            NET_ID: 1
+            REDIS_URL: redis://redis/0
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  eth-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['eth']
-    restart: always
-    command: healthWorker
-    env_file: .env.eth
-    environment:
-      NET_ID: 1
-      REDIS_URL: redis://redis/0
-    depends_on: [redis, eth-server]
+    eth-treeWatcher:
+        image: tornadocash/relayer:mainnet-v4
+        profiles: ["eth"]
+        restart: always
+        command: treeWatcher
+        env_file: .env.eth
+        environment:
+            NET_ID: 1
+            REDIS_URL: redis://redis/0
+        depends_on: [redis, eth-server]
 
-  eth-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['eth']
-    restart: always
-    command: txWorker
-    env_file: .env.eth
-    environment:
-      NET_ID: 1
-      REDIS_URL: redis://redis/0
-    depends_on: [redis, eth-server]
+    eth-priceWatcher:
+        image: tornadocash/relayer:mainnet-v4
+        profiles: ["eth"]
+        restart: always
+        command: priceWatcher
+        env_file: .env.eth
+        environment:
+            NET_ID: 1
+            REDIS_URL: redis://redis/0
+        depends_on: [redis, eth-server]
 
-  # # This is additional txWorker for ethereum mainnet
-  # # So you can process transactions from multiple addresses, but before it you need to set up those addresses as txWorkers
-  #  eth-txWorker2:
-  #    image: tornadocash/relayer:v6
-  #    profiles: [ 'eth' ]
-  #    restart: always
-  #    command: txWorker
-  #    env_file: .env2.eth
-  #    environment:
-  #      REDIS_URL: redis://redis/0
+    eth-healthWatcher:
+        image: tornadocash/relayer:mainnet-v4
+        profiles: ["eth"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.eth
+        environment:
+            NET_ID: 1
+            REDIS_URL: redis://redis/0
+        depends_on: [redis, eth-server]
 
-  #  # this container will proxy *.onion domain to the server container
-  #  # if you want to run *only* as .onion service, you don't need `nginx`, `letsencrypt`, `dockergen` containers
-  #  tor:
-  #    image: strm/tor
-  #    restart: always
-  #    depends_on: [server]
-  #    environment:
-  #      LISTEN_PORT: 80
-  #      REDIRECT: server:8000
-  #      # Generate a new key with
-  #      # docker run --rm --entrypoint shallot strm/tor-hiddenservice-nginx ^foo
-  #      PRIVATE_KEY: |
-  #        -----BEGIN RSA PRIVATE KEY-----
-  #        ...
-  #        -----END RSA PRIVATE KEY-----
+    eth-worker1:
+        image: tornadocash/relayer:mainnet-v4
+        profiles: ["eth"]
+        restart: always
+        command: worker
+        env_file: .env.eth
+        environment:
+            NET_ID: 1
+            REDIS_URL: redis://redis/0
+        depends_on: [redis, eth-server]
 
-  #  # auto update docker containers when new image is pushed to docker hub (be careful with that)
-  #  watchtower:
-  #    image: v2tec/watchtower
-  #    restart: always
-  #    volumes:
-  #      - /var/run/docker.sock:/var/run/docker.sock
+    # # 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: tornadorelayer:mainnet
+    #    profiles: [ 'eth' ]
+    #    restart: always
+    #    command: worker
+    #    env_file: .env2.eth
+    #    environment:
+    #      REDIS_URL: redis://redis/0
 
-  #  # this container will send Telegram notifications when other containers are stopped/restarted
-  #  # it's best to run this container on some other instance, otherwise it can't notify if the whole instance goes down
-  #  notifier:
-  #    image: poma/docker-telegram-notifier
-  #    restart: always
-  #    volumes:
-  #      - /var/run/docker.sock:/var/run/docker.sock:ro
-  #    environment:
-  #      # How to create bot: https://core.telegram.org/bots#3-how-do-i-create-a-bot
-  #      # How to get chat id: https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/32572159#32572159
-  #      TELEGRAM_NOTIFIER_BOT_TOKEN: ...
-  #      TELEGRAM_NOTIFIER_CHAT_ID: ...
+    #  # this container will proxy *.onion domain to the server container
+    #  # if you want to run *only* as .onion service, you don't need `nginx`, `letsencrypt`, `dockergen` containers
+    #  tor:
+    #    image: strm/tor
+    #    restart: always
+    #    depends_on: [server]
+    #    environment:
+    #      LISTEN_PORT: 80
+    #      REDIRECT: server:8000
+    #      # Generate a new key with
+    #      # docker run --rm --entrypoint shallot strm/tor-hiddenservice-nginx ^foo
+    #      PRIVATE_KEY: |
+    #        -----BEGIN RSA PRIVATE KEY-----
+    #        ...
+    #        -----END RSA PRIVATE KEY-----
 
-  #  # this container will send Telegram notifications if specified address doesn't have enough funds
-  #  monitor_mainnet:
-  #    image: peppersec/monitor_eth
-  #    restart: always
-  #    environment:
-  #      TELEGRAM_NOTIFIER_BOT_TOKEN: ...
-  #      TELEGRAM_NOTIFIER_CHAT_ID: ...
-  #      ADDRESS: '0x0000000000000000000000000000000000000000'
-  #      THRESHOLD: 0.5 # ETH
-  #      RPC_URL: https://mainnet.infura.io
-  #      BLOCK_EXPLORER: etherscan.io
+    #  # auto update docker containers when new image is pushed to docker hub (be careful with that)
+    #  watchtower:
+    #    image: v2tec/watchtower
+    #    restart: always
+    #    volumes:
+    #      - /var/run/docker.sock:/var/run/docker.sock
 
-  # -------------------------------------------------- #
+    #  # this container will send Telegram notifications when other containers are stopped/restarted
+    #  # it's best to run this container on some other instance, otherwise it can't notify if the whole instance goes down
+    #  notifier:
+    #    image: poma/docker-telegram-notifier
+    #    restart: always
+    #    volumes:
+    #      - /var/run/docker.sock:/var/run/docker.sock:ro
+    #    environment:
+    #      # How to create bot: https://core.telegram.org/bots#3-how-do-i-create-a-bot
+    #      # How to get chat id: https://stackoverflow.com/questions/32423837/telegram-bot-how-to-get-a-group-chat-id/32572159#32572159
+    #      TELEGRAM_NOTIFIER_BOT_TOKEN: ...
+    #      TELEGRAM_NOTIFIER_CHAT_ID: ...
 
-  # ---------------------- BSC (Binance Smart Chain) ----------------------- #
+    #  # this container will send Telegram notifications if specified address doesn't have enough funds
+    #  monitor_mainnet:
+    #    image: peppersec/monitor_eth
+    #    restart: always
+    #    environment:
+    #      TELEGRAM_NOTIFIER_BOT_TOKEN: ...
+    #      TELEGRAM_NOTIFIER_CHAT_ID: ...
+    #      ADDRESS: '0x0000000000000000000000000000000000000000'
+    #      THRESHOLD: 0.5 # ETH
+    #      RPC_URL: https://mainnet.infura.io
+    #      BLOCK_EXPLORER: etherscan.io
 
-  bsc-server:
-    image: tornadocash/relayer:v6
-    profiles: ['bsc']
-    restart: always
-    command: server
-    env_file: .env.bsc
-    environment:
-      NET_ID: 56
-      REDIS_URL: redis://redis/1
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  bsc-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['bsc']
-    restart: always
-    command: healthWorker
-    env_file: .env.bsc
-    environment:
-      NET_ID: 56
-      REDIS_URL: redis://redis/1
-    depends_on: [redis, bsc-server]
+    # ---------------------- BSC (Binance Smart Chain) ----------------------- #
 
-  bsc-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['bsc']
-    restart: always
-    command: txWorker
-    env_file: .env.bsc
-    environment:
-      NET_ID: 56
-      REDIS_URL: redis://redis/1
-    depends_on: [redis, bsc-server]
+    bsc-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["bsc"]
+        restart: always
+        command: server
+        env_file: .env.bsc
+        environment:
+            NET_ID: 56
+            REDIS_URL: redis://redis/1
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    bsc-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["bsc"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.bsc
+        environment:
+            NET_ID: 56
+            REDIS_URL: redis://redis/1
+        depends_on: [redis, bsc-server]
 
-  # ---------------------- Polygon (MATIC) --------------------- #
+    bsc-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["bsc"]
+        restart: always
+        command: worker
+        env_file: .env.bsc
+        environment:
+            NET_ID: 56
+            REDIS_URL: redis://redis/1
+        depends_on: [redis, bsc-server]
 
-  polygon-server:
-    image: tornadocash/relayer:v6
-    profiles: ['polygon']
-    restart: always
-    command: server
-    env_file: .env.polygon
-    environment:
-      NET_ID: 137
-      REDIS_URL: redis://redis/2
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  polygon-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['polygon']
-    restart: always
-    command: healthWorker
-    env_file: .env.polygon
-    environment:
-      NET_ID: 137
-      REDIS_URL: redis://redis/2
-    depends_on: [redis, polygon-server]
+    # ---------------------- Polygon (MATIC) --------------------- #
 
-  polygon-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['polygon']
-    restart: always
-    command: txWorker
-    env_file: .env.polygon
-    environment:
-      NET_ID: 137
-      REDIS_URL: redis://redis/2
-    depends_on: [redis, polygon-server]
+    polygon-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["polygon"]
+        restart: always
+        command: server
+        env_file: .env.polygon
+        environment:
+            NET_ID: 137
+            REDIS_URL: redis://redis/2
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    polygon-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["polygon"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.polygon
+        environment:
+            NET_ID: 137
+            REDIS_URL: redis://redis/2
+        depends_on: [redis, polygon-server]
 
-  # ---------------------- Gnosis (XDAI) ---------------------- #
+    polygon-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["polygon"]
+        restart: always
+        command: worker
+        env_file: .env.polygon
+        environment:
+            NET_ID: 137
+            REDIS_URL: redis://redis/2
+        depends_on: [redis, polygon-server]
 
-  gnosis-server:
-    image: tornadocash/relayer:v6
-    profiles: ['gnosis']
-    restart: always
-    command: server
-    env_file: .env.gnosis
-    environment:
-      NET_ID: 100
-      REDIS_URL: redis://redis/3
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  gnosis-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['gnosis']
-    restart: always
-    command: healthWorker
-    env_file: .env.gnosis
-    environment:
-      NET_ID: 100
-      REDIS_URL: redis://redis/3
-    depends_on: [redis, gnosis-server]
+    # ---------------------- Gnosis (XDAI) ---------------------- #
 
-  gnosis-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['gnosis']
-    restart: always
-    command: txWorker
-    env_file: .env.gnosis
-    environment:
-      NET_ID: 100
-      REDIS_URL: redis://redis/3
-    depends_on: [redis, gnosis-server]
+    gnosis-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["gnosis"]
+        restart: always
+        command: server
+        env_file: .env.gnosis
+        environment:
+            NET_ID: 100
+            REDIS_URL: redis://redis/3
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    gnosis-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["gnosis"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.gnosis
+        environment:
+            NET_ID: 100
+            REDIS_URL: redis://redis/3
+        depends_on: [redis, gnosis-server]
 
-  # ---------------------- AVAX ---------------------- #
+    gnosis-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["gnosis"]
+        restart: always
+        command: worker
+        env_file: .env.gnosis
+        environment:
+            NET_ID: 100
+            REDIS_URL: redis://redis/3
+        depends_on: [redis, gnosis-server]
 
-  avax-server:
-    image: tornadocash/relayer:v6
-    profiles: ['avax']
-    restart: always
-    command: server
-    env_file: .env.avax
-    environment:
-      NET_ID: 43114
-      REDIS_URL: redis://redis/4
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  avax-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['avax']
-    restart: always
-    command: healthWorker
-    env_file: .env.avax
-    environment:
-      NET_ID: 43114
-      REDIS_URL: redis://redis/4
-    depends_on: [redis, avax-server]
+    # ---------------------- AVAX ---------------------- #
 
-  avax-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['avax']
-    restart: always
-    command: txWorker
-    env_file: .env.avax
-    environment:
-      NET_ID: 43114
-      REDIS_URL: redis://redis/4
-    depends_on: [redis, avax-server]
+    avax-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["avax"]
+        restart: always
+        command: server
+        env_file: .env.avax
+        environment:
+            NET_ID: 43114
+            REDIS_URL: redis://redis/4
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    avax-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["avax"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.avax
+        environment:
+            NET_ID: 43114
+            REDIS_URL: redis://redis/4
+        depends_on: [redis, avax-server]
 
-  # ---------------------- OP ------------------------ #
+    avax-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["avax"]
+        restart: always
+        command: worker
+        env_file: .env.avax
+        environment:
+            NET_ID: 43114
+            REDIS_URL: redis://redis/4
+        depends_on: [redis, avax-server]
 
-  op-server:
-    image: tornadocash/relayer:v6
-    profiles: ['op']
-    restart: always
-    command: server
-    env_file: .env.op
-    environment:
-      NET_ID: 10
-      REDIS_URL: redis://redis/5
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  op-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['op']
-    restart: always
-    command: healthWorker
-    env_file: .env.op
-    environment:
-      NET_ID: 10
-      REDIS_URL: redis://redis/5
-    depends_on: [redis, op-server]
+    # ---------------------- OP ------------------------ #
 
-  op-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['op']
-    restart: always
-    command: txWorker
-    env_file: .env.op
-    environment:
-      NET_ID: 10
-      REDIS_URL: redis://redis/5
-    depends_on: [redis, op-server]
+    op-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["op"]
+        restart: always
+        command: server
+        env_file: .env.op
+        environment:
+            NET_ID: 10
+            REDIS_URL: redis://redis/5
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    op-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["op"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.op
+        environment:
+            NET_ID: 10
+            REDIS_URL: redis://redis/5
+        depends_on: [redis, op-server]
 
-  # ---------------------- Arbitrum ----------------------- #
+    op-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["op"]
+        restart: always
+        command: worker
+        env_file: .env.op
+        environment:
+            NET_ID: 10
+            REDIS_URL: redis://redis/5
+        depends_on: [redis, op-server]
 
-  arb-server:
-    image: tornadocash/relayer:v6
-    profiles: ['arb']
-    restart: always
-    command: server
-    env_file: .env.arb
-    environment:
-      NET_ID: 42161
-      REDIS_URL: redis://redis/6
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  arb-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['arb']
-    restart: always
-    command: healthWorker
-    env_file: .env.arb
-    environment:
-      NET_ID: 42161
-      REDIS_URL: redis://redis/6
-    depends_on: [redis, arb-server]
+    # ---------------------- Arbitrum ----------------------- #
 
-  arb-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['arb']
-    restart: always
-    command: txWorker
-    env_file: .env.arb
-    environment:
-      NET_ID: 42161
-      REDIS_URL: redis://redis/6
-    depends_on: [redis, arb-server]
+    arb-server:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["arb"]
+        restart: always
+        command: server
+        env_file: .env.arb
+        environment:
+            NET_ID: 42161
+            REDIS_URL: redis://redis/6
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
-  # -------------------------------------------------- #
+    arb-healthWatcher:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["arb"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.arb
+        environment:
+            NET_ID: 42161
+            REDIS_URL: redis://redis/6
+        depends_on: [redis, arb-server]
 
-  # ---------------------- Goerli (Ethereum Testnet) ---------------------- #
+    arb-worker1:
+        image: tornadocash/relayer:sidechain-beta
+        profiles: ["arb"]
+        restart: always
+        command: worker
+        env_file: .env.arb
+        environment:
+            NET_ID: 42161
+            REDIS_URL: redis://redis/6
+        depends_on: [redis, arb-server]
 
-  goerli-server:
-    image: tornadocash/relayer:v6
-    profiles: ['geth']
-    restart: always
-    command: server
-    env_file: .env.goerli
-    environment:
-      NET_ID: 5
-      REDIS_URL: redis://redis/7
-      nginx_proxy_read_timeout: 600
-    depends_on: [redis]
+    # -------------------------------------------------- #
 
-  goerli-healthWorker:
-    image: tornadocash/relayer:v6
-    profiles: ['goerli']
-    restart: always
-    command: healthWorker
-    env_file: .env.goerli
-    environment:
-      NET_ID: 5
-      REDIS_URL: redis://redis/7
-    depends_on: [redis, goerli-server]
+    # ---------------------- Goerli (Ethereum Testnet) ---------------------- #
 
-  goerli-txWorker1:
-    image: tornadocash/relayer:v6
-    profiles: ['goerli']
-    restart: always
-    command: txWorker
-    env_file: .env.goerli
-    environment:
-      NET_ID: 5
-      REDIS_URL: redis://redis/7
-    depends_on: [redis, goerli-server]
-  # -------------------------------------------------- #
+    goerli-server:
+        image: tornadorelayer:mainnet
+        profiles: ["geth"]
+        restart: always
+        command: server
+        env_file: .env.goerli
+        environment:
+            NET_ID: 5
+            REDIS_URL: redis://redis/7
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
+
+    goerli-treeWatcher:
+        image: tornadorelayer:mainnet
+        profiles: ["goerli"]
+        restart: always
+        command: treeWatcher
+        env_file: .env.goerli
+        environment:
+            NET_ID: 5
+            REDIS_URL: redis://redis/7
+        depends_on: [redis, goerli-server]
+
+    goerli-priceWatcher:
+        image: tornadorelayer:mainnet
+        profiles: ["goerli"]
+        restart: always
+        command: priceWatcher
+        env_file: .env.goerli
+        environment:
+            NET_ID: 5
+            REDIS_URL: redis://redis/7
+        depends_on: [redis, goerli-server]
+
+    goerli-healthWatcher:
+        image: tornadorelayer:mainnet
+        profiles: ["goerli"]
+        restart: always
+        command: healthWatcher
+        env_file: .env.goerli
+        environment:
+            NET_ID: 5
+            REDIS_URL: redis://redis/7
+        depends_on: [redis, goerli-server]
+
+    goerli-worker1:
+        image: tornadorelayer:mainnet
+        profiles: ["goerli"]
+        restart: always
+        command: worker
+        env_file: .env.goerli
+        environment:
+            NET_ID: 5
+            REDIS_URL: redis://redis/7
+        depends_on: [redis, goerli-server]
+    # -------------------------------------------------- #
+
+    # ---------------------- Tornado Nova (Gnosis Chain) ----------------------- #
+
+    server:
+        image: tornadocash/relayer:nova
+        profiles: ["nova"]
+        restart: always
+        command: start:prod
+        env_file: .env.nova
+        environment:
+            REDIS_URL: redis://redis/8
+            nginx_proxy_read_timeout: 600
+        depends_on: [redis]
 
 volumes:
-  conf:
-  vhost:
-  html:
-  certs:
-  redis:
+    conf:
+    vhost:
+    html:
+    certs:
+    redis:

install.sh

@@ -5,11 +5,14 @@ if [ "$EUID" -ne 0 ];
   exit 1;
 fi;
 
-relayer_soft_git_repo="https://git.tornado.ws/tornadocash/classic-relayer";
+relayer_soft_git_repo="https://git.tornado.ws/tornadocash/tornado-relayer";
 
 user_home_dir=$(eval echo ~$USER);
 relayer_folder="$user_home_dir/tornado-relayer";
-script_log_file="/tmp/tornado-classic-relayer-installation.log"
+relayer_mainnet_soft_source_folder="$relayer_folder/mainnet-soft-source";
+relayer_sidechains_soft_source_folder="$relayer_folder/sidechains-soft-source";
+nova_relayer_soft_source_folder="$relayer_folder/nova-soft-source";
+script_log_file="/tmp/tornado-relayer-installation.log"
 if [ -f $script_log_file ]; then rm $script_log_file; fi;
 
 function echo_log_err(){
@@ -50,11 +53,14 @@ function install_node(){
   . ~/.nvm/nvm.sh;
   . ~/.profile;
   . ~/.bashrc;
-  nvm install 20.3.0;
+  nvm install 14.21.3;
 }
 
-function install_relayer_repo(){
-    git clone $relayer_soft_git_repo -b v6 $relayer_folder
+function install_repositories(){
+    git clone $relayer_soft_git_repo -b main-v4 $relayer_folder
+    git clone $relayer_soft_git_repo -b mainnet-v4 $relayer_mainnet_soft_source_folder;
+    git clone $relayer_soft_git_repo -b sidechain-v4 $relayer_sidechains_soft_source_folder;
+    git clone $relayer_soft_git_repo -b nova $nova_relayer_soft_source_folder;
 }
 
 function install_docker_utilities(){
@@ -86,23 +92,27 @@ function configure_nginx_reverse_proxy(){
   systemctl stop nginx;
 }
 
-function build_relayer_docker_container(){
-    cd $relayer_folder && npm run build:docker;
+function build_relayer_docker_containers(){
+    cd $relayer_mainnet_soft_source_folder && npm run build;
+    cd $relayer_sidechains_soft_source_folder && npm run build;
+    cd $nova_relayer_soft_source_folder && npm run build:docker;
 }
 
 function prepare_environments(){
-    tee $relayer_folder/.env.bsc $relayer_folder/.env.arb $relayer_folder/.env.goerli $relayer_folder/.env.eth $relayer_folder/.env.polygon $relayer_folder/.env.op \
-        $relayer_folder/.env.avax $relayer_folder/.env.gnosis < $relayer_folder/.env.example > /dev/null;
+    cp $relayer_mainnet_soft_source_folder/.env.example $relayer_folder/.env.eth;
+    cp $nova_relayer_soft_source_folder/.env.example $relayer_folder/.env.nova;
+    tee $relayer_folder/.env.bsc $relayer_folder/.env.arb $relayer_folder/.env.goerli $relayer_folder/.env.polygon $relayer_folder/.env.op \
+        $relayer_folder/.env.avax $relayer_folder/.env.gnosis < $relayer_sidechains_soft_source_folder/.env.example > /dev/null;
 }
 
 function main(){
   install_requred_packages;
   install_node;
-  install_relayer_repo;
+  install_repositories;
   configure_firewall;
   configure_nginx_reverse_proxy;
   install_docker_utilities;
-  build_relayer_docker_container;
+  build_relayer_docker_containers;
   prepare_environments;
   cd $relayer_folder;
 }

monitoring/.POSTGRES_PASSWORD

@@ -1 +0,0 @@
-zabbix

monitoring/.POSTGRES_USER

@@ -1 +0,0 @@
-zabbix

monitoring/.env_agent

@@ -1,37 +0,0 @@
-ZBX_HOSTNAME=Zabbix
-# ZBX_SOURCEIP=
-# ZBX_DEBUGLEVEL=3
-# ZBX_ENABLEREMOTECOMMANDS=0 # Deprecated since 5.0.0
-# ZBX_LOGREMOTECOMMANDS=0
-# ZBX_HOSTINTERFACE= # Available since 4.4.0
-# ZBX_HOSTINTERFACEITEM= # Available since 4.4.0
-# ZBX_SERVER_HOST=10.110.0.5
-# ZBX_PASSIVE_ALLOW=true
-# ZBX_PASSIVESERVERS=
-# ZBX_ACTIVE_ALLOW=true
-# ZBX_ACTIVESERVERS=
-# ZBX_LISTENIP=
-# ZBX_STARTAGENTS=3
-# ZBX_HOSTNAMEITEM=system.hostname
-# ZBX_METADATA=
-# ZBX_METADATAITEM=
-# ZBX_REFRESHACTIVECHECKS=120
-# ZBX_BUFFERSEND=5
-# ZBX_BUFFERSIZE=100
-# ZBX_MAXLINESPERSECOND=20
-# ZBX_ALIAS=""
-# ZBX_TIMEOUT=3
-# ZBX_UNSAFEUSERPARAMETERS=0
-# ZBX_LOADMODULE="dummy1.so,dummy2.so,dummy10.so"
-# ZBX_TLSCONNECT=unencrypted
-# ZBX_TLSACCEPT=unencrypted
-# ZBX_TLSCAFILE=
-# ZBX_TLSCRLFILE=
-# ZBX_TLSSERVERCERTISSUER=
-# ZBX_TLSSERVERCERTSUBJECT=
-# ZBX_TLSCERTFILE=
-# ZBX_TLSKEYFILE=
-# ZBX_TLSPSKIDENTITY=
-# ZBX_TLSPSKFILE=
-# ZBX_DENYKEY=system.run[*]
-# ZBX_ALLOWKEY=

monitoring/.env_db_pgsql

@@ -1,9 +0,0 @@
-# DB_SERVER_HOST=postgres-server
-# DB_SERVER_PORT=5432
-# POSTGRES_USER=zabbix
-POSTGRES_USER_FILE=/run/secrets/POSTGRES_USER
-# POSTGRES_PASSWORD=zabbix
-POSTGRES_PASSWORD_FILE=/run/secrets/POSTGRES_PASSWORD
-POSTGRES_DB=zabbix
-# DB_SERVER_SCHEMA=public
-# ENABLE_TIMESCALEDB=tru

monitoring/.env_srv

@@ -1,60 +0,0 @@
-# ZBX_LISTENIP=
-# ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
-# ZBX_HISTORYSTORAGETYPES=uint,dbl,str,log,text # Available since 3.4.5
-# ZBX_DBTLSCONNECT=required # Available since 5.0.0
-# ZBX_DBTLSCAFILE=/run/secrets/root-ca.pem # Available since 5.0.0
-# ZBX_DBTLSCERTFILE=/run/secrets/client-cert.pem # Available since 5.0.0
-# ZBX_DBTLSKEYFILE=/run/secrets/client-key.pem # Available since 5.0.0
-# ZBX_DBTLSCIPHER= # Available since 5.0.0
-# ZBX_DBTLSCIPHER13= # Available since 5.0.0
-# ZBX_DEBUGLEVEL=3
-# ZBX_STARTPOLLERS=5
-# ZBX_IPMIPOLLERS=0
-# ZBX_STARTPREPROCESSORS=3 # Available since 3.4.0
-# ZBX_STARTPOLLERSUNREACHABLE=1
-# ZBX_STARTTRAPPERS=5
-# ZBX_STARTPINGERS=1
-# ZBX_STARTDISCOVERERS=1
-# ZBX_STARTHTTPPOLLERS=1
-# ZBX_STARTTIMERS=1
-# ZBX_STARTESCALATORS=1
-# ZBX_STARTALERTERS=3 # Available since 3.4.0
-# ZBX_JAVAGATEWAY_ENABLE=true
-# ZBX_JAVAGATEWAY=zabbix-java-gateway
-# ZBX_JAVAGATEWAYPORT=10052
-# ZBX_STARTJAVAPOLLERS=5
-# ZBX_STARTVMWARECOLLECTORS=0
-# ZBX_VMWAREFREQUENCY=60
-# ZBX_VMWAREPERFFREQUENCY=60
-# ZBX_VMWARECACHESIZE=8M
-# ZBX_VMWARETIMEOUT=10
-# ZBX_ENABLE_SNMP_TRAPS=true
-# ZBX_SOURCEIP=
-# ZBX_HOUSEKEEPINGFREQUENCY=1
-# ZBX_MAXHOUSEKEEPERDELETE=5000
-# ZBX_SENDERFREQUENCY=30
-# ZBX_CACHESIZE=8M
-# ZBX_CACHEUPDATEFREQUENCY=60
-# ZBX_STARTDBSYNCERS=4
-# ZBX_HISTORYCACHESIZE=16M
-# ZBX_HISTORYINDEXCACHESIZE=4M
-# ZBX_TRENDCACHESIZE=4M
-# ZBX_VALUECACHESIZE=8M
-# ZBX_TIMEOUT=4
-# ZBX_TRAPPERIMEOUT=300
-# ZBX_UNREACHABLEPERIOD=45
-# ZBX_UNAVAILABLEDELAY=60
-# ZBX_UNREACHABLEDELAY=15
-# ZBX_LOGSLOWQUERIES=3000
-# ZBX_EXPORTFILESIZE=
-# ZBX_STARTPROXYPOLLERS=1
-# ZBX_PROXYCONFIGFREQUENCY=3600
-# ZBX_PROXYDATAFREQUENCY=1
-# ZBX_LOADMODULE="dummy1.so,dummy2.so,dummy10.so"
-# ZBX_TLSCAFILE=
-# ZBX_TLSCRLFILE=
-# ZBX_TLSCERTFILE=
-# ZBX_TLSKEYFILE=
-# ZBX_VAULTDBPATH=
-# ZBX_VAULTURL=https://127.0.0.1:8200
-# VAULT_TOKEN=

monitoring/.env_web

@@ -1,26 +0,0 @@
-# ZBX_SERVER_HOST=zabbix-server
-# ZBX_SERVER_PORT=10051
-# ZBX_SERVER_NAME=Monitoring
-# ZBX_DB_ENCRYPTION=true # Available since 5.0.0
-# ZBX_DB_KEY_FILE=/run/secrets/client-key.pem # Available since 5.0.0
-# ZBX_DB_CERT_FILE=/run/secrets/client-cert.pem # Available since 5.0.0
-# ZBX_DB_CA_FILE=/run/secrets/root-ca.pem # Available since 5.0.0
-# ZBX_DB_VERIFY_HOST=false # Available since 5.0.0
-# ZBX_DB_CIPHER_LIST= # Available since 5.0.0
-# ZBX_VAULTDBPATH=
-# ZBX_VAULTURL=https://127.0.0.1:8200
-# VAULT_TOKEN=
-# ZBX_HISTORYSTORAGEURL=http://elasticsearch:9200/ # Available since 3.4.5
-# ZBX_HISTORYSTORAGETYPES=['uint', 'dbl', 'str', 'text', 'log'] # Available since 3.4.5
-# ENABLE_WEB_ACCESS_LOG=true
-# ZBX_MAXEXECUTIONTIME=600
-# ZBX_MEMORYLIMIT=128M
-# ZBX_POSTMAXSIZE=16M
-# ZBX_UPLOADMAXFILESIZE=2M
-# ZBX_MAXINPUTTIME=300
-# ZBX_SESSION_NAME=zbx_sessionid
-# Timezone one of: http://php.net/manual/en/timezones.php
-# PHP_TZ=Europe/Riga
-# ZBX_DENY_GUI_ACCESS=false
-# ZBX_GUI_ACCESS_IP_RANGE=['127.0.0.1']
-# ZBX_GUI_WARNING_MSG=Zabbix is under maintenance.

monitoring/README.md

@@ -1,67 +0,0 @@
-# Installing the Zabbix server
-
-Change default passwords, ports and set listen IP (ports `8080/tcp` and `10051/tcp` will be open on all interfaces, use a firewall or specify the address of the required interface), then run:
-
-```bash
-wget https://github.com/tornadocash/tornado-relayer/raw/master/monitoring/zabbix.tar.gz
-mkdir $HOME/monitoring/
-tar -xzf zabbix.tar.gz -C $HOME/monitoring/
-cd $HOME/monitoring/
-docker-compose up -d
-```
-
-# Installing the Zabbix agent
-
-Download package from repository [https://repo.zabbix.com/zabbix/5.2/ubuntu/pool/main/z/zabbix/](https://repo.zabbix.com/zabbix/5.2/ubuntu/pool/main/z/zabbix/) and run:
-
-```bash
-sudo dpkg -i zabbix-agent_5.2.*.deb
-sudo usermod -aG docker zabbix
-```
-
-Change default values in `/etc/zabbix/zabbix_agent2.conf`:
-
-- `Hostname` the same as in the zabbix-server web interface;
-- `Server` and `ServerActive` set zabbix server IP or DNS name;
-- `ListenIP` to local network IP available from zabbix server or set firewall rules to restrict access to port `10050`;
-- uncomment `Plugins.Docker.Endpoint=unix:///var/run/docker.sock`.
-
-Then run:
-
-```bash
-sudo systemctl enable zabbix-agent2.service
-sudo systemctl restart zabbix-agent2.service
-```
-
-# Adding the host
-
-Log into your Zabbix server (defaul login and passord: `Admin` - `zabbix`) and click on the Configuration tab and then the Hosts tab. Click the Create host button near the top right corner. In the resulting page, change the Host name and IP ADDRESS sections to match the information for your remote server. Set `{$URL}` macros to relayer host, example `http://localhost/v1/status` or `https://domain.name/v1/status`.
-
-# Import templates
-
-Import templates using the WebUI:
-
-- [Docker-template.yaml](/monitoring/templates/Docker-template.yaml);
-- [Tornado-relayer-template.yaml](/monitoring/templates/Tornado-relayer-template.yaml).
-
-Link templates with added host. It is also recommended to link `Linux CPU by Zabbix agent`, `Linux filesystems by Zabbix agent` and `Linux memory by Zabbix agent` templates to the host.
-
-# Alerts
-
-In WebUI - Administration -> Media types -> Telegram:
-
-```
-https://git.zabbix.com/projects/ZBX/repos/zabbix/browse/templates/media/telegram
-
-1. Register bot: send "/newbot" to @BotFather and follow instructions
-2. Copy and paste the obtained token into the "Token" field above
-3. If you want to send personal notifications, you need to get chat id of the user you want to send messages to:
-    3.1. Send "/getid" to "@myidbot" in Telegram messenger
-    3.2. Copy returned chat id and save it in the "Telegram Webhook" media for the user
-    3.3. Ask the user to send "/start" to your bot (Telegram bot won't send anything to the user without it)
-4. If you want to send group notifications, you need to get group id of the group you want to send messages to:
-    4.1. Add "@myidbot" to your group
-    4.2. Send "/getgroupid@myidbot" in your group
-    4.3. Copy returned group id save it in the "Telegram Webhook" media for the user you created for  group notifications
-    4.4. Send "/start@your_bot_name_here" in your group (Telegram bot won't send anything to the group without it)
-```

monitoring/docker-compose.yml

@@ -1,186 +0,0 @@
-# Restrict access to 10051/tcp on public ip
-
-version: '3.5'
-services:
-  zabbix-server:
-    image: zabbix/zabbix-server-pgsql:alpine-5.2-latest
-    restart: always
-    ports:
-      - '10051:10051'
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /etc/timezone:/etc/timezone:ro
-      - ./zbx_env/usr/lib/zabbix/alertscripts:/usr/lib/zabbix/alertscripts:ro
-      - ./zbx_env/usr/lib/zabbix/externalscripts:/usr/lib/zabbix/externalscripts:ro
-      - ./zbx_env/var/lib/zabbix/export:/var/lib/zabbix/export:rw
-      - ./zbx_env/var/lib/zabbix/modules:/var/lib/zabbix/modules:ro
-      - ./zbx_env/var/lib/zabbix/enc:/var/lib/zabbix/enc:ro
-      - ./zbx_env/var/lib/zabbix/ssh_keys:/var/lib/zabbix/ssh_keys:ro
-      - ./zbx_env/var/lib/zabbix/mibs:/var/lib/zabbix/mibs:ro
-      - ./zbx_env/var/lib/zabbix/snmptraps:/var/lib/zabbix/snmptraps:ro
-    ulimits:
-      nproc: 65535
-      nofile:
-        soft: 20000
-        hard: 40000
-    deploy:
-      resources:
-        limits:
-          cpus: '0.70'
-          memory: 1G
-        reservations:
-          cpus: '0.5'
-          memory: 512M
-    env_file:
-      - .env_db_pgsql
-      - .env_srv
-    secrets:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-    depends_on:
-      - postgres-server
-    networks:
-      zbx_net_backend:
-        aliases:
-          - zabbix-server
-          - zabbix-server-pgsql
-          - zabbix-server-alpine-pgsql
-          - zabbix-server-pgsql-alpine
-      zbx_net_frontend:
-    stop_grace_period: 30s
-    sysctls:
-      - net.ipv4.ip_local_port_range=1024 65000
-      - net.ipv4.conf.all.accept_redirects=0
-      - net.ipv4.conf.all.secure_redirects=0
-      - net.ipv4.conf.all.send_redirects=0
-    labels:
-      com.zabbix.description: 'Zabbix server with PostgreSQL database support'
-      com.zabbix.company: 'Zabbix LLC'
-      com.zabbix.component: 'zabbix-server'
-      com.zabbix.dbtype: 'pgsql'
-      com.zabbix.os: 'alpine'
-
-  zabbix-web:
-    image: zabbix/zabbix-web-nginx-pgsql:alpine-5.2-latest
-    restart: always
-    ports:
-      - '8080:8080'
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /etc/timezone:/etc/timezone:ro
-      - ./zbx_env/etc/ssl/nginx:/etc/ssl/nginx:ro
-      - ./zbx_env/usr/share/zabbix/modules/:/usr/share/zabbix/modules/:ro
-    deploy:
-      resources:
-        limits:
-          cpus: '0.70'
-          memory: 512M
-        reservations:
-          cpus: '0.5'
-          memory: 256M
-    env_file:
-      - .env_db_pgsql
-      - .env_web
-    secrets:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-    depends_on:
-      - postgres-server
-      - zabbix-server
-    healthcheck:
-      test: ['CMD', 'curl', '-f', 'http://localhost:8080/']
-      interval: 10s
-      timeout: 5s
-      retries: 3
-    networks:
-      zbx_net_backend:
-        aliases:
-          - zabbix-web-nginx-pgsql
-          - zabbix-web-nginx-alpine-pgsql
-          - zabbix-web-nginx-pgsql-alpine
-      zbx_net_frontend:
-    stop_grace_period: 10s
-    sysctls:
-      - net.core.somaxconn=65535
-    labels:
-      com.zabbix.description: 'Zabbix frontend on Nginx web-server with PostgreSQL database support'
-      com.zabbix.company: 'Zabbix LLC'
-      com.zabbix.component: 'zabbix-frontend'
-      com.zabbix.webserver: 'nginx'
-      com.zabbix.dbtype: 'pgsql'
-      com.zabbix.os: 'alpine'
-
-  zabbix-agent:
-    image: zabbix/zabbix-agent2:alpine-5.2-latest
-    restart: always
-    volumes:
-      - /etc/localtime:/etc/localtime:ro
-      - /etc/timezone:/etc/timezone:ro
-      - /var/run/docker.sock:/var/run/docker.sock
-    env_file:
-      - .env_agent
-    privileged: true
-    user: root
-    pid: 'host'
-    networks:
-      zbx_net_backend:
-        aliases:
-          - zabbix-agent
-          - zabbix-agent-passive
-          - zabbix-agent-alpine
-    stop_grace_period: 5s
-
-  postgres-server:
-    image: postgres:alpine
-    restart: always
-    volumes:
-      - ./zbx_env/var/lib/postgresql/data:/var/lib/postgresql/data:rw
-    env_file:
-      - .env_db_pgsql
-    secrets:
-      - POSTGRES_USER
-      - POSTGRES_PASSWORD
-    stop_grace_period: 1m
-    networks:
-      zbx_net_backend:
-        aliases:
-          - postgres-server
-          - pgsql-server
-          - pgsql-database
-
-  portainer:
-    image: portainer/portainer:latest
-    restart: always
-    ports:
-      - '9000:9000'
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - portainer-data:/data
-
-networks:
-  zbx_net_frontend:
-    driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: 'false'
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.16.238.0/24
-  zbx_net_backend:
-    driver: bridge
-    driver_opts:
-      com.docker.network.enable_ipv6: 'false'
-    internal: true
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.16.239.0/24
-
-secrets:
-  POSTGRES_USER:
-    file: ./.POSTGRES_USER
-  POSTGRES_PASSWORD:
-    file: ./.POSTGRES_PASSWORD
-
-volumes:
-  portainer-data:

monitoring/templates/Docker-template.yaml

@@ -1,393 +0,0 @@
-zabbix_export:
-  version: '5.2'
-  date: '2021-11-29T12:29:17Z'
-  groups:
-    - name: Docker
-  templates:
-    - template: Docker
-      name: Docker
-      description: |
-        Get Docker engine metrics from plugin for the New Zabbix Agent (zabbix-agent2).
-
-        You can discuss this template or leave feedback on our forum 
-
-        Template tooling version used: 0.38
-      groups:
-        - name: Docker
-      applications:
-        - name: Docker
-        - name: 'Zabbix raw items'
-      items:
-        - name: 'Docker: Get containers'
-          key: docker.containers
-          history: '0'
-          trends: '0'
-          value_type: TEXT
-          applications:
-            - name: 'Zabbix raw items'
-        - name: 'Docker: Containers paused'
-          type: DEPENDENT
-          key: docker.containers.paused
-          delay: '0'
-          history: 7d
-          description: 'Total number of containers paused on this host'
-          applications:
-            - name: Docker
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.ContainersPaused
-          master_item:
-            key: docker.info
-        - name: 'Docker: Containers running'
-          type: DEPENDENT
-          key: docker.containers.running
-          delay: '0'
-          history: 7d
-          description: 'Total number of containers running on this host'
-          applications:
-            - name: Docker
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.ContainersRunning
-          master_item:
-            key: docker.info
-        - name: 'Docker: Containers stopped'
-          type: DEPENDENT
-          key: docker.containers.stopped
-          delay: '0'
-          history: 7d
-          description: 'Total number of containers stopped on this host'
-          applications:
-            - name: Docker
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.ContainersStopped
-          master_item:
-            key: docker.info
-          triggers:
-            - expression: '{avg(5m)}>=1'
-              name: 'Docker: containers is stopped'
-              priority: HIGH
-        - name: 'Docker: Containers total'
-          type: DEPENDENT
-          key: docker.containers.total
-          delay: '0'
-          history: 7d
-          description: 'Total number of containers on this host'
-          applications:
-            - name: Docker
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.Containers
-          master_item:
-            key: docker.info
-        - name: 'Docker: Get images'
-          key: docker.images
-          history: '0'
-          trends: '0'
-          status: DISABLED
-          value_type: TEXT
-          applications:
-            - name: 'Zabbix raw items'
-        - name: 'Docker: Get info'
-          key: docker.info
-          history: '0'
-          trends: '0'
-          value_type: TEXT
-          applications:
-            - name: 'Zabbix raw items'
-        - name: 'Docker: Memory total'
-          type: DEPENDENT
-          key: docker.mem.total
-          delay: '0'
-          history: 7d
-          status: DISABLED
-          units: B
-          applications:
-            - name: Docker
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.MemTotal
-          master_item:
-            key: docker.info
-        - name: 'Docker: Ping'
-          key: docker.ping
-          history: 7h
-          applications:
-            - name: Docker
-          valuemap:
-            name: 'Service state'
-          preprocessing:
-            - type: DISCARD_UNCHANGED_HEARTBEAT
-              parameters:
-                - 10m
-          triggers:
-            - expression: '{last()}=0'
-              name: 'Docker: Service is down'
-              priority: AVERAGE
-              manual_close: 'YES'
-      discovery_rules:
-        - name: 'Containers discovery'
-          key: 'docker.containers.discovery[true]'
-          delay: 15m
-          filter:
-            evaltype: AND
-            conditions:
-              - macro: '{#NAME}'
-                value: '{$DOCKER.LLD.FILTER.CONTAINER.MATCHES}'
-                formulaid: A
-              - macro: '{#NAME}'
-                value: '{$DOCKER.LLD.FILTER.CONTAINER.NOT_MATCHES}'
-                operator: NOT_MATCHES_REGEX
-                formulaid: B
-          description: |
-            Discovery for containers metrics
-
-            Parameter:
-            true  - Returns all containers
-            false - Returns only running containers
-          item_prototypes:
-            - name: 'Container {#NAME}: Finished at'
-              type: DEPENDENT
-              key: 'docker.container_info.finished["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              value_type: FLOAT
-              units: unixtime
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.FinishedAt
-                - type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1d
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Restart count'
-              type: DEPENDENT
-              key: 'docker.container_info.restart_count["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.RestartCount
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-              trigger_prototypes:
-                - expression: '{last()}>5'
-                  name: 'Container {#NAME}: restarting constantly'
-                  opdata: '{ITEM.VALUE}'
-                  priority: HIGH
-            - name: 'Container {#NAME}: Started at'
-              type: DEPENDENT
-              key: 'docker.container_info.started["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              value_type: FLOAT
-              units: unixtime
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.StartedAt
-                - type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1d
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Error'
-              type: DEPENDENT
-              key: 'docker.container_info.state.error["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              trends: '0'
-              value_type: CHAR
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.Error
-                - type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1d
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-              trigger_prototypes:
-                - expression: '{diff()}=1 and {strlen()}>0'
-                  name: 'Container {#NAME}: An error has occurred in the container'
-                  priority: WARNING
-                  description: 'Container {#NAME} has an error. Ack to close.'
-                  manual_close: 'YES'
-            - name: 'Container {#NAME}: Exit code'
-              type: DEPENDENT
-              key: 'docker.container_info.state.exitcode["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.ExitCode
-                - type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1d
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Paused'
-              type: DEPENDENT
-              key: 'docker.container_info.state.paused["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              valuemap:
-                name: 'Docker flag'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.Paused
-                - type: BOOL_TO_DECIMAL
-                  parameters:
-                    - ''
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Restarting'
-              type: DEPENDENT
-              key: 'docker.container_info.state.restarting["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              valuemap:
-                name: 'Docker flag'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.Restarting
-                - type: BOOL_TO_DECIMAL
-                  parameters:
-                    - ''
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Running'
-              type: DEPENDENT
-              key: 'docker.container_info.state.running["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              valuemap:
-                name: 'Docker flag'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.Running
-                - type: BOOL_TO_DECIMAL
-                  parameters:
-                    - ''
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Status'
-              type: DEPENDENT
-              key: 'docker.container_info.state.status["{#NAME}"]'
-              delay: '0'
-              history: 7d
-              trends: '0'
-              value_type: CHAR
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-              preprocessing:
-                - type: JSONPATH
-                  parameters:
-                    - $.State.Status
-                - type: DISCARD_UNCHANGED_HEARTBEAT
-                  parameters:
-                    - 1h
-              master_item:
-                key: 'docker.container_info["{#NAME}"]'
-            - name: 'Container {#NAME}: Get info'
-              key: 'docker.container_info["{#NAME}"]'
-              history: '0'
-              trends: '0'
-              value_type: CHAR
-              description: 'Return low-level information about a container'
-              application_prototypes:
-                - name: 'Docker: Container {#NAME}'
-          trigger_prototypes:
-            - expression: '{Docker:docker.container_info.state.exitcode["{#NAME}"].last()}>0 and {Docker:docker.container_info.state.running["{#NAME}"].last()}=0'
-              name: 'Container {#NAME}: Container has been stopped with error code'
-              opdata: 'Exit code: {ITEM.LASTVALUE1}'
-              priority: AVERAGE
-              manual_close: 'YES'
-      macros:
-        - macro: '{$DOCKER.LLD.FILTER.CONTAINER.MATCHES}'
-          value: '.*'
-          description: 'Filter of discoverable containers'
-        - macro: '{$DOCKER.LLD.FILTER.CONTAINER.NOT_MATCHES}'
-          value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered containers'
-        - macro: '{$DOCKER.LLD.FILTER.IMAGE.MATCHES}'
-          value: '.*'
-          description: 'Filter of discoverable images'
-        - macro: '{$DOCKER.LLD.FILTER.IMAGE.NOT_MATCHES}'
-          value: CHANGE_IF_NEEDED
-          description: 'Filter to exclude discovered images'
-  graphs:
-    - name: 'Docker: Containers'
-      graph_items:
-        - drawtype: GRADIENT_LINE
-          color: 1A7C11
-          item:
-            host: Docker
-            key: docker.containers.running
-        - sortorder: '1'
-          drawtype: BOLD_LINE
-          color: 2774A4
-          item:
-            host: Docker
-            key: docker.containers.paused
-        - sortorder: '2'
-          drawtype: BOLD_LINE
-          color: F63100
-          item:
-            host: Docker
-            key: docker.containers.stopped
-        - sortorder: '3'
-          drawtype: BOLD_LINE
-          color: A54F10
-          item:
-            host: Docker
-            key: docker.containers.total
-    - name: 'Docker: Memory total'
-      graph_items:
-        - drawtype: BOLD_LINE
-          color: 1A7C11
-          item:
-            host: Docker
-            key: docker.mem.total
-  value_maps:
-    - name: 'Docker flag'
-      mappings:
-        - value: '0'
-          newvalue: 'False'
-        - value: '1'
-          newvalue: 'True'
-    - name: 'Service state'
-      mappings:
-        - value: '0'
-          newvalue: Down
-        - value: '1'
-          newvalue: Up

monitoring/templates/Tornado-relayer-template.yaml

@@ -1,70 +0,0 @@
-zabbix_export:
-  version: '5.2'
-  date: '2021-12-01T13:26:59Z'
-  groups:
-    - name: Templates/Applications
-  templates:
-    - template: Tornado-relayer
-      name: Tornado-relayer
-      groups:
-        - name: Templates/Applications
-      items:
-        - name: 'tornado-relayer: health.error'
-          type: DEPENDENT
-          key: tornado-relayer.health.error
-          delay: '0'
-          trends: '0'
-          value_type: TEXT
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.health.error
-          master_item:
-            key: 'web.page.get[{$URL}]'
-          triggers:
-            - expression: '{last()}<>""'
-              name: 'tornado-relayer: health error'
-              priority: AVERAGE
-        - name: 'tornado-relayer: health.status'
-          type: DEPENDENT
-          key: tornado-relayer.health.status
-          delay: '0'
-          trends: '0'
-          value_type: TEXT
-          preprocessing:
-            - type: JSONPATH
-              parameters:
-                - $.health.status
-          master_item:
-            key: 'web.page.get[{$URL}]'
-          triggers:
-            - expression: '{last(#3)}<>"true"'
-              name: 'tornado-relayer: health status <> true'
-              priority: HIGH
-        - name: 'tornado-relayer: data'
-          type: ZABBIX_ACTIVE
-          key: 'web.page.get[{$URL}]'
-          history: '0'
-          trends: '0'
-          value_type: TEXT
-          preprocessing:
-            - type: REGEX
-              parameters:
-                - '\n\s?\n([\s\S]*)'
-                - \1
-      httptests:
-        - name: 'tornado-relayer: status page'
-          agent: 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/80.0.3987.87 Chrome/80.0.3987.87 Safari/537.36'
-          steps:
-            - name: 'status page'
-              url: '{$URL}'
-              follow_redirects: 'NO'
-              required: status
-              status_codes: '200'
-  triggers:
-    - expression: '{Tornado-relayer:web.test.fail[tornado-relayer: status page].last()}>0'
-      name: 'tornado-relayer: status page failed'
-      priority: AVERAGE
-    - expression: '{Tornado-relayer:web.test.rspcode[tornado-relayer: status page,status page].last(#3)}<>200'
-      name: 'tornado-relayer: status page rspcode <>200'
-      priority: HIGH

package.json

@@ -1,67 +0,0 @@
-{
-  "name": "classic-relay",
-  "version": "6.0.0",
-  "description": "Relayer for Tornado.cash privacy solution. https://tornado.cash",
-  "scripts": {
-    "start": "yarn build && docker-compose up -d redis && concurrently \"yarn server\" \"yarn txWorker\" \"yarn healthWorker\"",
-    "server": "node build/src/app/index.js",
-    "txWorker": "node build/src/txWorker.js",
-    "healthWorker": "node build/src/healthWorker.js",
-    "dev": "docker-compose up -d redis && concurrently \"yarn dev:server\" \"yarn dev:txWorker\" \"yarn dev:healthWorker\"",
-    "dev:server": "nodemon --watch './src/**/*.ts' --exec ts-node src/app/index.ts",
-    "dev:healthWorker": "nodemon --watch './src/**/*.ts' --exec ts-node src/healthWorker.ts",
-    "dev:txWorker": "nodemon --watch './src/**/*.ts' --exec ts-node src/txWorker.ts",
-    "build": "tsc",
-    "build:abi": "yarn typechain --target ethers-v5  --out-dir src/contracts ./abis/*.abi.json",
-    "build:docker": "docker build -t tornadocash/relayer:v6 .",
-    "test": "tap --node-arg=--require=ts-node/register --no-check-coverage",
-    "eslint": "eslint --ext .ts --ignore-path .gitignore .",
-    "prettier:check": "npx prettier --check . --config .prettierrc --ignore-path .gitignore",
-    "prettier:fix": "npx prettier --write . --config .prettierrc --ignore-path .gitignore",
-    "lint": "yarn eslint && yarn prettier:check"
-  },
-  "author": "tornado.cash",
-  "license": "MIT",
-  "dependencies": {
-    "@fastify/cors": "^8.0.0",
-    "@fastify/helmet": "^9.1.0",
-    "@fastify/sensible": "^5.1.0",
-    "@tornado/gas-price-oracle": "^0.5.3",
-    "ajv": "^8.11.0",
-    "bullmq": "^1.80.6",
-    "compare-versions": "^4.1.3",
-    "concurrently": "^8.2.0",
-    "dotenv": "^8.2.0",
-    "ethers": "^5.6.4",
-    "fastify": "^4.2.0",
-    "ioredis": "^5.0.6",
-    "json-schema-to-ts": "^2.2.0",
-    "node-fetch": "2",
-    "reflect-metadata": "^0.1.13",
-    "telegraf": "^4.12.3-canary.1",
-    "torn-token": "^1.0.8",
-    "tsyringe": "^4.8.0",
-    "tx-manager": "^0.4.9",
-    "uuid": "^8.3.0"
-  },
-  "devDependencies": {
-    "@typechain/ethers-v5": "^11.0.0",
-    "@types/ioredis": "^4.28.10",
-    "@types/node": "^20.4.1",
-    "@types/tap": "^15.0.7",
-    "@types/uuid": "^8.3.4",
-    "@typescript-eslint/eslint-plugin": "^5.20.0",
-    "@typescript-eslint/parser": "^5.20.0",
-    "chai": "^4.2.0",
-    "eslint": "^8.19.0",
-    "eslint-config-prettier": "^8.5.0",
-    "mocha": "^10.0.0",
-    "nodemon": "^2.0.19",
-    "pino-pretty": "^8.1.0",
-    "prettier": "^2.7.1",
-    "tap": "^16.3.0",
-    "ts-node": "^10.7.0",
-    "typechain": "^8.2.0",
-    "typescript": "^4.7.4"
-  }
-}

src/app/index.ts

@@ -1,24 +0,0 @@
-import 'reflect-metadata';
-import createServer from './server';
-import { utils } from 'ethers';
-import { port, relayerVersion, rewardAccount } from '../config';
-import { configService, getJobService, getNotifierService } from '../services';
-
-if (!utils.isAddress(rewardAccount)) {
-  throw new Error('No REWARD_ACCOUNT specified');
-}
-const server = createServer();
-server.listen({ port, host: '0.0.0.0' }, async (err, address) => {
-  if (err) throw err;
-  await configService.init();
-  await configService.clearRedisState();
-  await getJobService().setupRepeatableJobs();
-  await getNotifierService().subscribe();
-
-  console.log(`Relayer ${relayerVersion} started on port ${address}`);
-});
-
-process.on('uncaughtException', (e) => {
-  console.log('uncaughtException', e);
-  process.exit(1);
-});

src/app/plugins/validator.ts

@@ -1,52 +0,0 @@
-import Ajv from 'ajv';
-import fp from 'fastify-plugin';
-import { rewardAccount } from '../../config';
-import { getAddress, isAddress } from 'ethers/lib/utils';
-import { configService } from '../../services';
-import addFormats from 'ajv-formats';
-
-export default fp(async (server) => {
-  const ajv = new Ajv();
-  addFormats(ajv);
-  ajv.addKeyword({
-    keyword: 'isAddress',
-    validate: (schema, data) => {
-      try {
-        return isAddress(data);
-      } catch (e) {
-        return false;
-      }
-    },
-    errors: true,
-  });
-
-  ajv.addKeyword({
-    keyword: 'isKnownContract',
-    validate: (schema, data) => {
-      try {
-        return !!configService.getInstance(data);
-      } catch (e) {
-        return false;
-      }
-    },
-    errors: true,
-  });
-
-  ajv.addKeyword({
-    keyword: 'isFeeRecipient',
-    validate: (schema, data) => {
-      try {
-        return getAddress(rewardAccount) === getAddress(data);
-      } catch (e) {
-        return false;
-      }
-    },
-    errors: true,
-  });
-
-  server.setValidatorCompiler(({ schema }) => {
-    return ajv.compile(schema);
-  });
-  console.log('validator plugin registered');
-  return Promise.resolve();
-});

src/app/routes.ts

@@ -1,55 +0,0 @@
-import { FastifyInstance } from 'fastify';
-import { jobsSchema, statusSchema, withdrawSchema } from './schema';
-import { relayerVersion, rewardAccount, tornadoServiceFee } from '../config';
-import { configService, getHealthService, getJobService, getPriceService } from '../services';
-import { RelayerJobType } from '../types';
-import { WithdrawalData } from '../services/tx.service';
-
-export function mainHandler(server: FastifyInstance, options, next) {
-  const jobService = getJobService();
-  const priceService = getPriceService();
-  const healthService = getHealthService();
-
-  server.get('/', async (req, res) => {
-    res
-      .type('text/html')
-      .send(
-        '<h1>This is <a href=https://tornado.cash>tornado.cash</a> Relayer service.' +
-          ' Check the <a href=/v1/status>/status</a> for settings</h1>',
-      );
-  });
-
-  server.get('/status', { schema: statusSchema }, async (req, res) => {
-    const ethPrices = await priceService.getPrices();
-    const currentQueue = await jobService.getQueueCount();
-    const health = await healthService.getStatus();
-    const version = relayerVersion;
-    res.send({
-      rewardAccount,
-      instances: configService.instances,
-      netId: configService.netId,
-      ethPrices,
-      tornadoServiceFee,
-      version,
-      health,
-      currentQueue,
-    });
-  });
-  next();
-}
-
-export function relayerHandler(server: FastifyInstance, options, next) {
-  const jobService = getJobService();
-  server.get<{ Params: { id: string } }>('/jobs/:id', { schema: jobsSchema }, async (req, res) => {
-    const job = await jobService.getJob(req.params.id);
-    if (!job) return server.httpErrors.notFound();
-    res.send({ ...job.data, failedReason: job.failedReason });
-  });
-
-  server.post<{ Body: WithdrawalData }>('/tornadoWithdraw', { schema: withdrawSchema }, async (req, res) => {
-    server.log.info(`Withdrawal request: ${JSON.stringify(req.body)}`);
-    const id = await jobService.postJob(RelayerJobType.TORNADO_WITHDRAW, req.body);
-    res.send({ id });
-  });
-  next();
-}

src/app/schema.ts

@@ -1,80 +0,0 @@
-const addressType = {
-  type: 'string',
-  pattern: '^0x[a-fA-F0-9]{40}$',
-  isAddress: true,
-} as const;
-const proofType = { type: 'string', pattern: '^0x[a-fA-F0-9]{512}$' } as const;
-// const encryptedAccountType = { type: 'string', pattern: '^0x[a-fA-F0-9]{392}$' } as const;
-const bytes32Type = { type: 'string', pattern: '^0x[a-fA-F0-9]{64}$' } as const;
-const instanceType = { ...addressType, isKnownContract: true } as const;
-const relayerType = { ...addressType, isFeeRecipient: true } as const;
-
-export const idParamsSchema = {
-  type: 'object',
-  properties: {
-    id: { type: 'string', format: 'uuid' },
-  },
-  required: ['id'],
-  additionalProperties: false,
-} as const;
-
-export const withdrawBodySchema = {
-  type: 'object',
-  properties: {
-    proof: proofType,
-    contract: instanceType,
-    args: {
-      type: 'array',
-      maxItems: 6,
-      minItems: 6,
-      items: [bytes32Type, bytes32Type, addressType, relayerType, bytes32Type, bytes32Type],
-    },
-  },
-  additionalProperties: false,
-  required: ['proof', 'contract', 'args'],
-} as const;
-
-export const jobsResponseSchema = {
-  ...withdrawBodySchema,
-  properties: {
-    id: { type: 'string' },
-    status: { type: 'string' },
-    type: { type: 'string' },
-    confirmations: { type: 'integer' },
-    txHash: { type: 'string' },
-    ...withdrawBodySchema.properties,
-    failedReason: { type: 'string' },
-  },
-} as const;
-
-export const jobsSchema = {
-  params: idParamsSchema,
-  response: {
-    200: jobsResponseSchema,
-  },
-};
-export const withdrawSchema = {
-  body: withdrawBodySchema,
-  response: {
-    200: idParamsSchema,
-  },
-};
-const statusResponseSchema = {
-  type: 'object',
-  properties: {
-    rewardAccount: addressType,
-    netId: { type: 'integer' },
-    version: { type: 'string' },
-    tornadoServiceFee: { type: 'number' },
-    currentQueue: { type: 'number' },
-    ethPrices: { type: 'object', additionalProperties: true },
-    instances: { type: 'object', additionalProperties: true },
-    health: { type: 'object', additionalProperties: true },
-  },
-} as const;
-
-export const statusSchema = {
-  response: {
-    200: statusResponseSchema,
-  },
-};

src/app/server.ts

@@ -1,35 +0,0 @@
-import fastify from 'fastify';
-import cors from '@fastify/cors';
-import fastifySensible from '@fastify/sensible';
-import helmet from '@fastify/helmet';
-
-import validator from './plugins/validator';
-import { mainHandler, relayerHandler } from './routes';
-
-function createServer() {
-  const server = fastify({
-    logger: true,
-    trustProxy: true,
-    pluginTimeout: 5000,
-    bodyLimit: 1048576, // 1 mb
-  });
-  server.register(cors);
-  server.register(validator);
-  server.register(helmet, { contentSecurityPolicy: false, frameguard: true });
-  server.register(fastifySensible);
-  server.register(mainHandler);
-  server.register(mainHandler, { prefix: '/v1' });
-  server.register(relayerHandler, { prefix: '/v1' });
-
-  server.setErrorHandler((error, req, res) => {
-    req.log.error(error.toString());
-    let statusCode = 500;
-    if ('validation' in error) {
-      statusCode = 400;
-    }
-    res.code(statusCode).send({ error: error.toString() });
-  });
-  return server;
-}
-
-export default createServer;

src/config.ts

@@ -1,112 +0,0 @@
-import { RelayerJobType } from './types';
-import tornConfig, { availableIds } from 'torn-token';
-import { config } from 'dotenv';
-import { version } from '../package.json';
-import { BigNumber } from 'ethers';
-
-config();
-const isProduction = process.env.NODE_ENV === 'production';
-export const relayerVersion = version;
-export const netId = <availableIds>Number(process.env.NET_ID ?? 1);
-export const redisUrl = process.env.REDIS_URL || 'redis://127.0.0.1:6379';
-export const rpcUrl = process.env.HTTP_RPC_URL;
-export const CONFIRMATIONS = Number(process.env.CONFIRMATIONS ?? 4);
-export const MAX_GAS_PRICE = Number(process.env.MAX_GAS_PRICE ?? 1000);
-export const GAS_BUMP_PERCENTAGE = Number(process.env.GAS_BUMP_PERCENTAGE ?? 5);
-export const mainnetRpcUrl = process.env.MAINNET_RPC_URL || process.env.ORACLE_RPC_URL || 'https://api.securerpc.com/v1';
-export const oracleRpcUrl = process.env.ORACLE_RPC_URL || 'https://api.securerpc.com/v1';
-export const offchainOracleAddress = '0x07D91f5fb9Bf7798734C3f606dB065549F6893bb';
-export const multiCallAddress = '0xda3c19c6fe954576707fa24695efb830d9cca1ca';
-export const privateKey = process.env.PRIVATE_KEY;
-export const instances = tornConfig.instances;
-export const torn = tornConfig;
-export const port = Number(process.env.APP_PORT) || 8000;
-export const host = isProduction ? 'https://' + process.env.VIRTUAL_HOST : `http://localhost:${port}`;
-export const tornadoServiceFee = Number(process.env.RELAYER_FEE);
-export const rewardAccount = process.env.REWARD_ACCOUNT;
-export const tornadoGoerliProxy = '0x454d870a72e29d5E5697f635128D18077BD04C60';
-export const ovmGasPriceOracleContract = '0x420000000000000000000000000000000000000F';
-export const txJobAttempts = 3;
-export const gasLimits = {
-  [RelayerJobType.TORNADO_WITHDRAW]: 390000,
-  [RelayerJobType.WITHDRAW_WITH_EXTRA]: 700000,
-  [RelayerJobType.OP_TORNADO_WITHDRAW]: 440000,
-  [RelayerJobType.ARB_TORNADO_WITHDRAW]: 1900000,
-};
-const minimumBalances: { [availableId in availableIds]: number } = {
-  1: 0.5, // 0.5 ETH on Ethereum mainnet
-  5: 10, // 10 ETH on Goerli testnet (because of high gas spikes)
-  10: 0.1, // 0.1 ETH on Optimism
-  56: 0.1, // 0.1 BNB on Binance Smart Chain
-  100: 100, // 100 XDAI on Gnosis (~ 100$)
-  137: 10, // 10 MATIC on Polygon
-  42161: 0.1, // 0.1 ETH on Arbitrum
-  43114: 10, // 10 AVAX on Avalanche C-Chain
-};
-const decimals = BigNumber.from(10).pow(18);
-export const minimumBalance = BigNumber.from(minimumBalances[netId] * 10) // BN don't accept float values
-  .mul(decimals.div(10))
-  .toString();
-export const minimumTornBalance = BigNumber.from(500).mul(decimals).toString();
-export const tornToken = {
-  tokenAddress: '0x77777FeDdddFfC19Ff86DB637967013e6C6A116C',
-  symbol: 'TORN',
-  decimals: 18,
-};
-
-export const networkConfig = {
-  netId56: {
-    gasPrices: {
-      instant: 5,
-      fast: 5,
-      standard: 5,
-      low: 5,
-    },
-    nativeCurrency: 'bnb',
-  },
-  netId10: {
-    gasPrices: {
-      instant: 0.001,
-      fast: 0.001,
-      standard: 0.001,
-      low: 0.001,
-    },
-    nativeCurrency: 'eth',
-  },
-  netId100: {
-    gasPrices: {
-      instant: 6,
-      fast: 5,
-      standard: 4,
-      low: 1,
-    },
-    nativeCurrency: 'xdai',
-  },
-  netId137: {
-    gasPrices: {
-      instant: 100,
-      fast: 75,
-      standard: 50,
-      low: 30,
-    },
-    nativeCurrency: 'matic',
-  },
-  netId42161: {
-    gasPrices: {
-      instant: 4,
-      fast: 3,
-      standard: 2.52,
-      low: 2.29,
-    },
-    nativeCurrency: 'eth',
-  },
-  netId43114: {
-    gasPrices: {
-      instant: 225,
-      fast: 35,
-      standard: 25,
-      low: 25,
-    },
-    nativeCurrency: 'avax',
-  },
-};

src/contracts/AggregatorAbi.ts

@@ -1,592 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface AggregatorAbiInterface extends utils.Interface {
-  functions: {
-    "addConnector(address)": FunctionFragment;
-    "addOracle(address,uint8)": FunctionFragment;
-    "connectors()": FunctionFragment;
-    "getRate(address,address,bool)": FunctionFragment;
-    "getRateToEth(address,bool)": FunctionFragment;
-    "multiWrapper()": FunctionFragment;
-    "oracles()": FunctionFragment;
-    "owner()": FunctionFragment;
-    "removeConnector(address)": FunctionFragment;
-    "removeOracle(address,uint8)": FunctionFragment;
-    "renounceOwnership()": FunctionFragment;
-    "setMultiWrapper(address)": FunctionFragment;
-    "transferOwnership(address)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "addConnector"
-      | "addOracle"
-      | "connectors"
-      | "getRate"
-      | "getRateToEth"
-      | "multiWrapper"
-      | "oracles"
-      | "owner"
-      | "removeConnector"
-      | "removeOracle"
-      | "renounceOwnership"
-      | "setMultiWrapper"
-      | "transferOwnership"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "addConnector",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addOracle",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "connectors",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getRate",
-    values: [string, string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getRateToEth",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "multiWrapper",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "oracles", values?: undefined): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "removeConnector",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "removeOracle",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "renounceOwnership",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setMultiWrapper",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferOwnership",
-    values: [string]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "addConnector",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "addOracle", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "connectors", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getRate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getRateToEth",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "multiWrapper",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "oracles", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "removeConnector",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "removeOracle",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "renounceOwnership",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setMultiWrapper",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferOwnership",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ConnectorAdded(address)": EventFragment;
-    "ConnectorRemoved(address)": EventFragment;
-    "MultiWrapperUpdated(address)": EventFragment;
-    "OracleAdded(address,uint8)": EventFragment;
-    "OracleRemoved(address,uint8)": EventFragment;
-    "OwnershipTransferred(address,address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ConnectorAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ConnectorRemoved"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MultiWrapperUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OracleAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OracleRemoved"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
-}
-
-export interface ConnectorAddedEventObject {
-  connector: string;
-}
-export type ConnectorAddedEvent = TypedEvent<
-  [string],
-  ConnectorAddedEventObject
->;
-
-export type ConnectorAddedEventFilter = TypedEventFilter<ConnectorAddedEvent>;
-
-export interface ConnectorRemovedEventObject {
-  connector: string;
-}
-export type ConnectorRemovedEvent = TypedEvent<
-  [string],
-  ConnectorRemovedEventObject
->;
-
-export type ConnectorRemovedEventFilter =
-  TypedEventFilter<ConnectorRemovedEvent>;
-
-export interface MultiWrapperUpdatedEventObject {
-  multiWrapper: string;
-}
-export type MultiWrapperUpdatedEvent = TypedEvent<
-  [string],
-  MultiWrapperUpdatedEventObject
->;
-
-export type MultiWrapperUpdatedEventFilter =
-  TypedEventFilter<MultiWrapperUpdatedEvent>;
-
-export interface OracleAddedEventObject {
-  oracle: string;
-  oracleType: number;
-}
-export type OracleAddedEvent = TypedEvent<
-  [string, number],
-  OracleAddedEventObject
->;
-
-export type OracleAddedEventFilter = TypedEventFilter<OracleAddedEvent>;
-
-export interface OracleRemovedEventObject {
-  oracle: string;
-  oracleType: number;
-}
-export type OracleRemovedEvent = TypedEvent<
-  [string, number],
-  OracleRemovedEventObject
->;
-
-export type OracleRemovedEventFilter = TypedEventFilter<OracleRemovedEvent>;
-
-export interface OwnershipTransferredEventObject {
-  previousOwner: string;
-  newOwner: string;
-}
-export type OwnershipTransferredEvent = TypedEvent<
-  [string, string],
-  OwnershipTransferredEventObject
->;
-
-export type OwnershipTransferredEventFilter =
-  TypedEventFilter<OwnershipTransferredEvent>;
-
-export interface AggregatorAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: AggregatorAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    connectors(
-      overrides?: CallOverrides
-    ): Promise<[string[]] & { allConnectors: string[] }>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { weightedRate: BigNumber }>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { weightedRate: BigNumber }>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<[string]>;
-
-    oracles(
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-    >;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  addConnector(
-    connector: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  addOracle(
-    oracle: string,
-    oracleKind: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  connectors(overrides?: CallOverrides): Promise<string[]>;
-
-  getRate(
-    srcToken: string,
-    dstToken: string,
-    useWrappers: boolean,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getRateToEth(
-    srcToken: string,
-    useSrcWrappers: boolean,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  multiWrapper(overrides?: CallOverrides): Promise<string>;
-
-  oracles(
-    overrides?: CallOverrides
-  ): Promise<
-    [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-  >;
-
-  owner(overrides?: CallOverrides): Promise<string>;
-
-  removeConnector(
-    connector: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  removeOracle(
-    oracle: string,
-    oracleKind: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  renounceOwnership(
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setMultiWrapper(
-    _multiWrapper: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  transferOwnership(
-    newOwner: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    addConnector(connector: string, overrides?: CallOverrides): Promise<void>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    connectors(overrides?: CallOverrides): Promise<string[]>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<string>;
-
-    oracles(
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-    >;
-
-    owner(overrides?: CallOverrides): Promise<string>;
-
-    removeConnector(
-      connector: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    renounceOwnership(overrides?: CallOverrides): Promise<void>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {
-    "ConnectorAdded(address)"(connector?: null): ConnectorAddedEventFilter;
-    ConnectorAdded(connector?: null): ConnectorAddedEventFilter;
-
-    "ConnectorRemoved(address)"(connector?: null): ConnectorRemovedEventFilter;
-    ConnectorRemoved(connector?: null): ConnectorRemovedEventFilter;
-
-    "MultiWrapperUpdated(address)"(
-      multiWrapper?: null
-    ): MultiWrapperUpdatedEventFilter;
-    MultiWrapperUpdated(multiWrapper?: null): MultiWrapperUpdatedEventFilter;
-
-    "OracleAdded(address,uint8)"(
-      oracle?: null,
-      oracleType?: null
-    ): OracleAddedEventFilter;
-    OracleAdded(oracle?: null, oracleType?: null): OracleAddedEventFilter;
-
-    "OracleRemoved(address,uint8)"(
-      oracle?: null,
-      oracleType?: null
-    ): OracleRemovedEventFilter;
-    OracleRemoved(oracle?: null, oracleType?: null): OracleRemovedEventFilter;
-
-    "OwnershipTransferred(address,address)"(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-    OwnershipTransferred(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-  };
-
-  estimateGas: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    connectors(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<BigNumber>;
-
-    oracles(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    connectors(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    oracles(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/ERC20Abi.ts

@@ -1,429 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface ERC20AbiInterface extends utils.Interface {
-  functions: {
-    "totalSupply()": FunctionFragment;
-    "_totalSupply()": FunctionFragment;
-    "balanceOf(address)": FunctionFragment;
-    "transfer(address,uint256)": FunctionFragment;
-    "allowance(address,address)": FunctionFragment;
-    "transferFrom(address,address,uint256)": FunctionFragment;
-    "approve(address,uint256)": FunctionFragment;
-    "nonces(address)": FunctionFragment;
-    "permit(address,address,uint256,uint256,uint8,bytes32,bytes32)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "totalSupply"
-      | "_totalSupply"
-      | "balanceOf"
-      | "transfer"
-      | "allowance"
-      | "transferFrom"
-      | "approve"
-      | "nonces"
-      | "permit"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "_totalSupply",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "balanceOf", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "transfer",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "allowance",
-    values: [string, string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferFrom",
-    values: [string, string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "approve",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "nonces", values: [string]): string;
-  encodeFunctionData(
-    functionFragment: "permit",
-    values: [
-      string,
-      string,
-      BigNumberish,
-      BigNumberish,
-      BigNumberish,
-      BytesLike,
-      BytesLike
-    ]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "_totalSupply",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "balanceOf", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "transfer", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "allowance", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "transferFrom",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "approve", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "nonces", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "permit", data: BytesLike): Result;
-
-  events: {
-    "Approval(address,address,uint256)": EventFragment;
-    "Transfer(address,address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Approval"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Transfer"): EventFragment;
-}
-
-export interface ApprovalEventObject {
-  owner: string;
-  spender: string;
-  value: BigNumber;
-}
-export type ApprovalEvent = TypedEvent<
-  [string, string, BigNumber],
-  ApprovalEventObject
->;
-
-export type ApprovalEventFilter = TypedEventFilter<ApprovalEvent>;
-
-export interface TransferEventObject {
-  from: string;
-  to: string;
-  value: BigNumber;
-}
-export type TransferEvent = TypedEvent<
-  [string, string, BigNumber],
-  TransferEventObject
->;
-
-export type TransferEventFilter = TypedEventFilter<TransferEvent>;
-
-export interface ERC20Abi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ERC20AbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    _totalSupply(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    balanceOf(who: string, overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    transfer(
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    allowance(
-      owner: string,
-      spender: string,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    transferFrom(
-      from: string,
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    approve(
-      spender: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    nonces(owner: string, overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    permit(
-      owner: string,
-      spender: string,
-      amount: BigNumberish,
-      deadline: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  _totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-  balanceOf(who: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  transfer(
-    to: string,
-    value: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  allowance(
-    owner: string,
-    spender: string,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  transferFrom(
-    from: string,
-    to: string,
-    value: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  approve(
-    spender: string,
-    value: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-  permit(
-    owner: string,
-    spender: string,
-    amount: BigNumberish,
-    deadline: BigNumberish,
-    v: BigNumberish,
-    r: BytesLike,
-    s: BytesLike,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(who: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      to: string,
-      value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    allowance(
-      owner: string,
-      spender: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      from: string,
-      to: string,
-      value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    approve(
-      spender: string,
-      value: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    permit(
-      owner: string,
-      spender: string,
-      amount: BigNumberish,
-      deadline: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {
-    "Approval(address,address,uint256)"(
-      owner?: string | null,
-      spender?: string | null,
-      value?: null
-    ): ApprovalEventFilter;
-    Approval(
-      owner?: string | null,
-      spender?: string | null,
-      value?: null
-    ): ApprovalEventFilter;
-
-    "Transfer(address,address,uint256)"(
-      from?: string | null,
-      to?: string | null,
-      value?: null
-    ): TransferEventFilter;
-    Transfer(
-      from?: string | null,
-      to?: string | null,
-      value?: null
-    ): TransferEventFilter;
-  };
-
-  estimateGas: {
-    totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    _totalSupply(overrides?: CallOverrides): Promise<BigNumber>;
-
-    balanceOf(who: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    transfer(
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    allowance(
-      owner: string,
-      spender: string,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    transferFrom(
-      from: string,
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    approve(
-      spender: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    nonces(owner: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    permit(
-      owner: string,
-      spender: string,
-      amount: BigNumberish,
-      deadline: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    _totalSupply(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    balanceOf(
-      who: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    transfer(
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    allowance(
-      owner: string,
-      spender: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    transferFrom(
-      from: string,
-      to: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    approve(
-      spender: string,
-      value: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    nonces(
-      owner: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    permit(
-      owner: string,
-      spender: string,
-      amount: BigNumberish,
-      deadline: BigNumberish,
-      v: BigNumberish,
-      r: BytesLike,
-      s: BytesLike,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/MulticallAbi.ts

@@ -1,112 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BytesLike,
-  CallOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export declare namespace MultiCall {
-  export type CallStruct = { to: string; data: BytesLike };
-
-  export type CallStructOutput = [string, string] & {
-    to: string;
-    data: string;
-  };
-}
-
-export interface MulticallAbiInterface extends utils.Interface {
-  functions: {
-    "multicall((address,bytes)[])": FunctionFragment;
-  };
-
-  getFunction(nameOrSignatureOrTopic: "multicall"): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "multicall",
-    values: [MultiCall.CallStruct[]]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "multicall", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface MulticallAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: MulticallAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    multicall(
-      calls: MultiCall.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], boolean[]] & { results: string[]; success: boolean[] }
-    >;
-  };
-
-  multicall(
-    calls: MultiCall.CallStruct[],
-    overrides?: CallOverrides
-  ): Promise<[string[], boolean[]] & { results: string[]; success: boolean[] }>;
-
-  callStatic: {
-    multicall(
-      calls: MultiCall.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], boolean[]] & { results: string[]; success: boolean[] }
-    >;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    multicall(
-      calls: MultiCall.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    multicall(
-      calls: MultiCall.CallStruct[],
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/OffchainOracleAbi.ts

@@ -1,592 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface OffchainOracleAbiInterface extends utils.Interface {
-  functions: {
-    "addConnector(address)": FunctionFragment;
-    "addOracle(address,uint8)": FunctionFragment;
-    "connectors()": FunctionFragment;
-    "getRate(address,address,bool)": FunctionFragment;
-    "getRateToEth(address,bool)": FunctionFragment;
-    "multiWrapper()": FunctionFragment;
-    "oracles()": FunctionFragment;
-    "owner()": FunctionFragment;
-    "removeConnector(address)": FunctionFragment;
-    "removeOracle(address,uint8)": FunctionFragment;
-    "renounceOwnership()": FunctionFragment;
-    "setMultiWrapper(address)": FunctionFragment;
-    "transferOwnership(address)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "addConnector"
-      | "addOracle"
-      | "connectors"
-      | "getRate"
-      | "getRateToEth"
-      | "multiWrapper"
-      | "oracles"
-      | "owner"
-      | "removeConnector"
-      | "removeOracle"
-      | "renounceOwnership"
-      | "setMultiWrapper"
-      | "transferOwnership"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "addConnector",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "addOracle",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "connectors",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getRate",
-    values: [string, string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "getRateToEth",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "multiWrapper",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "oracles", values?: undefined): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "removeConnector",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "removeOracle",
-    values: [string, BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "renounceOwnership",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setMultiWrapper",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferOwnership",
-    values: [string]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "addConnector",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "addOracle", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "connectors", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getRate", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getRateToEth",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "multiWrapper",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "oracles", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "removeConnector",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "removeOracle",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "renounceOwnership",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setMultiWrapper",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "transferOwnership",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "ConnectorAdded(address)": EventFragment;
-    "ConnectorRemoved(address)": EventFragment;
-    "MultiWrapperUpdated(address)": EventFragment;
-    "OracleAdded(address,uint8)": EventFragment;
-    "OracleRemoved(address,uint8)": EventFragment;
-    "OwnershipTransferred(address,address)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "ConnectorAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ConnectorRemoved"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "MultiWrapperUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OracleAdded"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OracleRemoved"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
-}
-
-export interface ConnectorAddedEventObject {
-  connector: string;
-}
-export type ConnectorAddedEvent = TypedEvent<
-  [string],
-  ConnectorAddedEventObject
->;
-
-export type ConnectorAddedEventFilter = TypedEventFilter<ConnectorAddedEvent>;
-
-export interface ConnectorRemovedEventObject {
-  connector: string;
-}
-export type ConnectorRemovedEvent = TypedEvent<
-  [string],
-  ConnectorRemovedEventObject
->;
-
-export type ConnectorRemovedEventFilter =
-  TypedEventFilter<ConnectorRemovedEvent>;
-
-export interface MultiWrapperUpdatedEventObject {
-  multiWrapper: string;
-}
-export type MultiWrapperUpdatedEvent = TypedEvent<
-  [string],
-  MultiWrapperUpdatedEventObject
->;
-
-export type MultiWrapperUpdatedEventFilter =
-  TypedEventFilter<MultiWrapperUpdatedEvent>;
-
-export interface OracleAddedEventObject {
-  oracle: string;
-  oracleType: number;
-}
-export type OracleAddedEvent = TypedEvent<
-  [string, number],
-  OracleAddedEventObject
->;
-
-export type OracleAddedEventFilter = TypedEventFilter<OracleAddedEvent>;
-
-export interface OracleRemovedEventObject {
-  oracle: string;
-  oracleType: number;
-}
-export type OracleRemovedEvent = TypedEvent<
-  [string, number],
-  OracleRemovedEventObject
->;
-
-export type OracleRemovedEventFilter = TypedEventFilter<OracleRemovedEvent>;
-
-export interface OwnershipTransferredEventObject {
-  previousOwner: string;
-  newOwner: string;
-}
-export type OwnershipTransferredEvent = TypedEvent<
-  [string, string],
-  OwnershipTransferredEventObject
->;
-
-export type OwnershipTransferredEventFilter =
-  TypedEventFilter<OwnershipTransferredEvent>;
-
-export interface OffchainOracleAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: OffchainOracleAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    connectors(
-      overrides?: CallOverrides
-    ): Promise<[string[]] & { allConnectors: string[] }>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { weightedRate: BigNumber }>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber] & { weightedRate: BigNumber }>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<[string]>;
-
-    oracles(
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-    >;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  addConnector(
-    connector: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  addOracle(
-    oracle: string,
-    oracleKind: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  connectors(overrides?: CallOverrides): Promise<string[]>;
-
-  getRate(
-    srcToken: string,
-    dstToken: string,
-    useWrappers: boolean,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  getRateToEth(
-    srcToken: string,
-    useSrcWrappers: boolean,
-    overrides?: CallOverrides
-  ): Promise<BigNumber>;
-
-  multiWrapper(overrides?: CallOverrides): Promise<string>;
-
-  oracles(
-    overrides?: CallOverrides
-  ): Promise<
-    [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-  >;
-
-  owner(overrides?: CallOverrides): Promise<string>;
-
-  removeConnector(
-    connector: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  removeOracle(
-    oracle: string,
-    oracleKind: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  renounceOwnership(
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setMultiWrapper(
-    _multiWrapper: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  transferOwnership(
-    newOwner: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    addConnector(connector: string, overrides?: CallOverrides): Promise<void>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    connectors(overrides?: CallOverrides): Promise<string[]>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<string>;
-
-    oracles(
-      overrides?: CallOverrides
-    ): Promise<
-      [string[], number[]] & { allOracles: string[]; oracleTypes: number[] }
-    >;
-
-    owner(overrides?: CallOverrides): Promise<string>;
-
-    removeConnector(
-      connector: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    renounceOwnership(overrides?: CallOverrides): Promise<void>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {
-    "ConnectorAdded(address)"(connector?: null): ConnectorAddedEventFilter;
-    ConnectorAdded(connector?: null): ConnectorAddedEventFilter;
-
-    "ConnectorRemoved(address)"(connector?: null): ConnectorRemovedEventFilter;
-    ConnectorRemoved(connector?: null): ConnectorRemovedEventFilter;
-
-    "MultiWrapperUpdated(address)"(
-      multiWrapper?: null
-    ): MultiWrapperUpdatedEventFilter;
-    MultiWrapperUpdated(multiWrapper?: null): MultiWrapperUpdatedEventFilter;
-
-    "OracleAdded(address,uint8)"(
-      oracle?: null,
-      oracleType?: null
-    ): OracleAddedEventFilter;
-    OracleAdded(oracle?: null, oracleType?: null): OracleAddedEventFilter;
-
-    "OracleRemoved(address,uint8)"(
-      oracle?: null,
-      oracleType?: null
-    ): OracleRemovedEventFilter;
-    OracleRemoved(oracle?: null, oracleType?: null): OracleRemovedEventFilter;
-
-    "OwnershipTransferred(address,address)"(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-    OwnershipTransferred(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-  };
-
-  estimateGas: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    connectors(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<BigNumber>;
-
-    oracles(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    addConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    addOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    connectors(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getRate(
-      srcToken: string,
-      dstToken: string,
-      useWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getRateToEth(
-      srcToken: string,
-      useSrcWrappers: boolean,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    multiWrapper(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    oracles(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    removeConnector(
-      connector: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    removeOracle(
-      oracle: string,
-      oracleKind: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setMultiWrapper(
-      _multiWrapper: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/OvmGasPriceOracleAbi.ts

@@ -1,543 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface OvmGasPriceOracleAbiInterface extends utils.Interface {
-  functions: {
-    "decimals()": FunctionFragment;
-    "gasPrice()": FunctionFragment;
-    "getL1Fee(bytes)": FunctionFragment;
-    "getL1GasUsed(bytes)": FunctionFragment;
-    "l1BaseFee()": FunctionFragment;
-    "overhead()": FunctionFragment;
-    "owner()": FunctionFragment;
-    "renounceOwnership()": FunctionFragment;
-    "scalar()": FunctionFragment;
-    "setDecimals(uint256)": FunctionFragment;
-    "setGasPrice(uint256)": FunctionFragment;
-    "setL1BaseFee(uint256)": FunctionFragment;
-    "setOverhead(uint256)": FunctionFragment;
-    "setScalar(uint256)": FunctionFragment;
-    "transferOwnership(address)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "decimals"
-      | "gasPrice"
-      | "getL1Fee"
-      | "getL1GasUsed"
-      | "l1BaseFee"
-      | "overhead"
-      | "owner"
-      | "renounceOwnership"
-      | "scalar"
-      | "setDecimals"
-      | "setGasPrice"
-      | "setL1BaseFee"
-      | "setOverhead"
-      | "setScalar"
-      | "transferOwnership"
-  ): FunctionFragment;
-
-  encodeFunctionData(functionFragment: "decimals", values?: undefined): string;
-  encodeFunctionData(functionFragment: "gasPrice", values?: undefined): string;
-  encodeFunctionData(functionFragment: "getL1Fee", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "getL1GasUsed",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(functionFragment: "l1BaseFee", values?: undefined): string;
-  encodeFunctionData(functionFragment: "overhead", values?: undefined): string;
-  encodeFunctionData(functionFragment: "owner", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "renounceOwnership",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "scalar", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "setDecimals",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setGasPrice",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setL1BaseFee",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setOverhead",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "setScalar",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "transferOwnership",
-    values: [string]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "decimals", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "gasPrice", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "getL1Fee", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getL1GasUsed",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "l1BaseFee", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "overhead", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "owner", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "renounceOwnership",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "scalar", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "setDecimals",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setGasPrice",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setL1BaseFee",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "setOverhead",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "setScalar", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "transferOwnership",
-    data: BytesLike
-  ): Result;
-
-  events: {
-    "DecimalsUpdated(uint256)": EventFragment;
-    "GasPriceUpdated(uint256)": EventFragment;
-    "L1BaseFeeUpdated(uint256)": EventFragment;
-    "OverheadUpdated(uint256)": EventFragment;
-    "OwnershipTransferred(address,address)": EventFragment;
-    "ScalarUpdated(uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "DecimalsUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "GasPriceUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "L1BaseFeeUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OverheadUpdated"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "OwnershipTransferred"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "ScalarUpdated"): EventFragment;
-}
-
-export interface DecimalsUpdatedEventObject {
-  arg0: BigNumber;
-}
-export type DecimalsUpdatedEvent = TypedEvent<
-  [BigNumber],
-  DecimalsUpdatedEventObject
->;
-
-export type DecimalsUpdatedEventFilter = TypedEventFilter<DecimalsUpdatedEvent>;
-
-export interface GasPriceUpdatedEventObject {
-  arg0: BigNumber;
-}
-export type GasPriceUpdatedEvent = TypedEvent<
-  [BigNumber],
-  GasPriceUpdatedEventObject
->;
-
-export type GasPriceUpdatedEventFilter = TypedEventFilter<GasPriceUpdatedEvent>;
-
-export interface L1BaseFeeUpdatedEventObject {
-  arg0: BigNumber;
-}
-export type L1BaseFeeUpdatedEvent = TypedEvent<
-  [BigNumber],
-  L1BaseFeeUpdatedEventObject
->;
-
-export type L1BaseFeeUpdatedEventFilter =
-  TypedEventFilter<L1BaseFeeUpdatedEvent>;
-
-export interface OverheadUpdatedEventObject {
-  arg0: BigNumber;
-}
-export type OverheadUpdatedEvent = TypedEvent<
-  [BigNumber],
-  OverheadUpdatedEventObject
->;
-
-export type OverheadUpdatedEventFilter = TypedEventFilter<OverheadUpdatedEvent>;
-
-export interface OwnershipTransferredEventObject {
-  previousOwner: string;
-  newOwner: string;
-}
-export type OwnershipTransferredEvent = TypedEvent<
-  [string, string],
-  OwnershipTransferredEventObject
->;
-
-export type OwnershipTransferredEventFilter =
-  TypedEventFilter<OwnershipTransferredEvent>;
-
-export interface ScalarUpdatedEventObject {
-  arg0: BigNumber;
-}
-export type ScalarUpdatedEvent = TypedEvent<
-  [BigNumber],
-  ScalarUpdatedEventObject
->;
-
-export type ScalarUpdatedEventFilter = TypedEventFilter<ScalarUpdatedEvent>;
-
-export interface OvmGasPriceOracleAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: OvmGasPriceOracleAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    decimals(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    gasPrice(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    getL1Fee(_data: BytesLike, overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    getL1GasUsed(
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[BigNumber]>;
-
-    l1BaseFee(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    overhead(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    owner(overrides?: CallOverrides): Promise<[string]>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    scalar(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    setDecimals(
-      _decimals: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setGasPrice(
-      _gasPrice: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setL1BaseFee(
-      _baseFee: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setOverhead(
-      _overhead: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    setScalar(
-      _scalar: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-  gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
-
-  getL1Fee(_data: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-  getL1GasUsed(_data: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-  l1BaseFee(overrides?: CallOverrides): Promise<BigNumber>;
-
-  overhead(overrides?: CallOverrides): Promise<BigNumber>;
-
-  owner(overrides?: CallOverrides): Promise<string>;
-
-  renounceOwnership(
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  scalar(overrides?: CallOverrides): Promise<BigNumber>;
-
-  setDecimals(
-    _decimals: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setGasPrice(
-    _gasPrice: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setL1BaseFee(
-    _baseFee: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setOverhead(
-    _overhead: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  setScalar(
-    _scalar: BigNumberish,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  transferOwnership(
-    newOwner: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getL1Fee(_data: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getL1GasUsed(
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    l1BaseFee(overrides?: CallOverrides): Promise<BigNumber>;
-
-    overhead(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<string>;
-
-    renounceOwnership(overrides?: CallOverrides): Promise<void>;
-
-    scalar(overrides?: CallOverrides): Promise<BigNumber>;
-
-    setDecimals(
-      _decimals: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setGasPrice(
-      _gasPrice: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setL1BaseFee(
-      _baseFee: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setOverhead(
-      _overhead: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    setScalar(_scalar: BigNumberish, overrides?: CallOverrides): Promise<void>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {
-    "DecimalsUpdated(uint256)"(arg0?: null): DecimalsUpdatedEventFilter;
-    DecimalsUpdated(arg0?: null): DecimalsUpdatedEventFilter;
-
-    "GasPriceUpdated(uint256)"(arg0?: null): GasPriceUpdatedEventFilter;
-    GasPriceUpdated(arg0?: null): GasPriceUpdatedEventFilter;
-
-    "L1BaseFeeUpdated(uint256)"(arg0?: null): L1BaseFeeUpdatedEventFilter;
-    L1BaseFeeUpdated(arg0?: null): L1BaseFeeUpdatedEventFilter;
-
-    "OverheadUpdated(uint256)"(arg0?: null): OverheadUpdatedEventFilter;
-    OverheadUpdated(arg0?: null): OverheadUpdatedEventFilter;
-
-    "OwnershipTransferred(address,address)"(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-    OwnershipTransferred(
-      previousOwner?: string | null,
-      newOwner?: string | null
-    ): OwnershipTransferredEventFilter;
-
-    "ScalarUpdated(uint256)"(arg0?: null): ScalarUpdatedEventFilter;
-    ScalarUpdated(arg0?: null): ScalarUpdatedEventFilter;
-  };
-
-  estimateGas: {
-    decimals(overrides?: CallOverrides): Promise<BigNumber>;
-
-    gasPrice(overrides?: CallOverrides): Promise<BigNumber>;
-
-    getL1Fee(_data: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    getL1GasUsed(
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    l1BaseFee(overrides?: CallOverrides): Promise<BigNumber>;
-
-    overhead(overrides?: CallOverrides): Promise<BigNumber>;
-
-    owner(overrides?: CallOverrides): Promise<BigNumber>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    scalar(overrides?: CallOverrides): Promise<BigNumber>;
-
-    setDecimals(
-      _decimals: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setGasPrice(
-      _gasPrice: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setL1BaseFee(
-      _baseFee: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setOverhead(
-      _overhead: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    setScalar(
-      _scalar: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    decimals(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    gasPrice(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    getL1Fee(
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    getL1GasUsed(
-      _data: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    l1BaseFee(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    overhead(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    owner(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    renounceOwnership(
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    scalar(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    setDecimals(
-      _decimals: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setGasPrice(
-      _gasPrice: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setL1BaseFee(
-      _baseFee: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setOverhead(
-      _overhead: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    setScalar(
-      _scalar: BigNumberish,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    transferOwnership(
-      newOwner: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/ProxyLightAbi.ts

@@ -1,252 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface ProxyLightAbiInterface extends utils.Interface {
-  functions: {
-    "backupNotes(bytes[])": FunctionFragment;
-    "deposit(address,bytes32,bytes)": FunctionFragment;
-    "withdraw(address,bytes,bytes32,bytes32,address,address,uint256,uint256)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic: "backupNotes" | "deposit" | "withdraw"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "backupNotes",
-    values: [BytesLike[]]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "deposit",
-    values: [string, BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "withdraw",
-    values: [
-      string,
-      BytesLike,
-      BytesLike,
-      BytesLike,
-      string,
-      string,
-      BigNumberish,
-      BigNumberish
-    ]
-  ): string;
-
-  decodeFunctionResult(
-    functionFragment: "backupNotes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
-
-  events: {
-    "EncryptedNote(address,bytes)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "EncryptedNote"): EventFragment;
-}
-
-export interface EncryptedNoteEventObject {
-  sender: string;
-  encryptedNote: string;
-}
-export type EncryptedNoteEvent = TypedEvent<
-  [string, string],
-  EncryptedNoteEventObject
->;
-
-export type EncryptedNoteEventFilter = TypedEventFilter<EncryptedNoteEvent>;
-
-export interface ProxyLightAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: ProxyLightAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    backupNotes(
-      _encryptedNotes: BytesLike[],
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    deposit(
-      _tornado: string,
-      _commitment: BytesLike,
-      _encryptedNote: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    withdraw(
-      _tornado: string,
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  backupNotes(
-    _encryptedNotes: BytesLike[],
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  deposit(
-    _tornado: string,
-    _commitment: BytesLike,
-    _encryptedNote: BytesLike,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  withdraw(
-    _tornado: string,
-    _proof: BytesLike,
-    _root: BytesLike,
-    _nullifierHash: BytesLike,
-    _recipient: string,
-    _relayer: string,
-    _fee: BigNumberish,
-    _refund: BigNumberish,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    backupNotes(
-      _encryptedNotes: BytesLike[],
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    deposit(
-      _tornado: string,
-      _commitment: BytesLike,
-      _encryptedNote: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    withdraw(
-      _tornado: string,
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {
-    "EncryptedNote(address,bytes)"(
-      sender?: string | null,
-      encryptedNote?: null
-    ): EncryptedNoteEventFilter;
-    EncryptedNote(
-      sender?: string | null,
-      encryptedNote?: null
-    ): EncryptedNoteEventFilter;
-  };
-
-  estimateGas: {
-    backupNotes(
-      _encryptedNotes: BytesLike[],
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    deposit(
-      _tornado: string,
-      _commitment: BytesLike,
-      _encryptedNote: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    withdraw(
-      _tornado: string,
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    backupNotes(
-      _encryptedNotes: BytesLike[],
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    deposit(
-      _tornado: string,
-      _commitment: BytesLike,
-      _encryptedNote: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    withdraw(
-      _tornado: string,
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/TornadoInstanceAbi.ts

@@ -1,691 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type {
-  FunctionFragment,
-  Result,
-  EventFragment,
-} from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface TornadoInstanceAbiInterface extends utils.Interface {
-  functions: {
-    "changeOperator(address)": FunctionFragment;
-    "nullifierHashes(bytes32)": FunctionFragment;
-    "withdraw(bytes,bytes32,bytes32,address,address,uint256,uint256)": FunctionFragment;
-    "verifier()": FunctionFragment;
-    "hashLeftRight(bytes32,bytes32)": FunctionFragment;
-    "FIELD_SIZE()": FunctionFragment;
-    "levels()": FunctionFragment;
-    "operator()": FunctionFragment;
-    "isKnownRoot(bytes32)": FunctionFragment;
-    "commitments(bytes32)": FunctionFragment;
-    "denomination()": FunctionFragment;
-    "currentRootIndex()": FunctionFragment;
-    "updateVerifier(address)": FunctionFragment;
-    "deposit(bytes32)": FunctionFragment;
-    "getLastRoot()": FunctionFragment;
-    "roots(uint256)": FunctionFragment;
-    "ROOT_HISTORY_SIZE()": FunctionFragment;
-    "isSpent(bytes32)": FunctionFragment;
-    "zeros(uint256)": FunctionFragment;
-    "ZERO_VALUE()": FunctionFragment;
-    "filledSubtrees(uint256)": FunctionFragment;
-    "nextIndex()": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "changeOperator"
-      | "nullifierHashes"
-      | "withdraw"
-      | "verifier"
-      | "hashLeftRight"
-      | "FIELD_SIZE"
-      | "levels"
-      | "operator"
-      | "isKnownRoot"
-      | "commitments"
-      | "denomination"
-      | "currentRootIndex"
-      | "updateVerifier"
-      | "deposit"
-      | "getLastRoot"
-      | "roots"
-      | "ROOT_HISTORY_SIZE"
-      | "isSpent"
-      | "zeros"
-      | "ZERO_VALUE"
-      | "filledSubtrees"
-      | "nextIndex"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "changeOperator",
-    values: [string]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "nullifierHashes",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "withdraw",
-    values: [
-      BytesLike,
-      BytesLike,
-      BytesLike,
-      string,
-      string,
-      BigNumberish,
-      BigNumberish
-    ]
-  ): string;
-  encodeFunctionData(functionFragment: "verifier", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "hashLeftRight",
-    values: [BytesLike, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "FIELD_SIZE",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "levels", values?: undefined): string;
-  encodeFunctionData(functionFragment: "operator", values?: undefined): string;
-  encodeFunctionData(
-    functionFragment: "isKnownRoot",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "commitments",
-    values: [BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "denomination",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "currentRootIndex",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "updateVerifier",
-    values: [string]
-  ): string;
-  encodeFunctionData(functionFragment: "deposit", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "getLastRoot",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "roots", values: [BigNumberish]): string;
-  encodeFunctionData(
-    functionFragment: "ROOT_HISTORY_SIZE",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "isSpent", values: [BytesLike]): string;
-  encodeFunctionData(functionFragment: "zeros", values: [BigNumberish]): string;
-  encodeFunctionData(
-    functionFragment: "ZERO_VALUE",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "filledSubtrees",
-    values: [BigNumberish]
-  ): string;
-  encodeFunctionData(functionFragment: "nextIndex", values?: undefined): string;
-
-  decodeFunctionResult(
-    functionFragment: "changeOperator",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "nullifierHashes",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "verifier", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "hashLeftRight",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "FIELD_SIZE", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "levels", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "operator", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "isKnownRoot",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "commitments",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "denomination",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "currentRootIndex",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(
-    functionFragment: "updateVerifier",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "getLastRoot",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "roots", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "ROOT_HISTORY_SIZE",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "isSpent", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "zeros", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "ZERO_VALUE", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "filledSubtrees",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "nextIndex", data: BytesLike): Result;
-
-  events: {
-    "Deposit(bytes32,uint32,uint256)": EventFragment;
-    "Withdrawal(address,bytes32,address,uint256)": EventFragment;
-  };
-
-  getEvent(nameOrSignatureOrTopic: "Deposit"): EventFragment;
-  getEvent(nameOrSignatureOrTopic: "Withdrawal"): EventFragment;
-}
-
-export interface DepositEventObject {
-  commitment: string;
-  leafIndex: number;
-  timestamp: BigNumber;
-}
-export type DepositEvent = TypedEvent<
-  [string, number, BigNumber],
-  DepositEventObject
->;
-
-export type DepositEventFilter = TypedEventFilter<DepositEvent>;
-
-export interface WithdrawalEventObject {
-  to: string;
-  nullifierHash: string;
-  relayer: string;
-  fee: BigNumber;
-}
-export type WithdrawalEvent = TypedEvent<
-  [string, string, string, BigNumber],
-  WithdrawalEventObject
->;
-
-export type WithdrawalEventFilter = TypedEventFilter<WithdrawalEvent>;
-
-export interface TornadoInstanceAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: TornadoInstanceAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    changeOperator(
-      _newOperator: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    nullifierHashes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    withdraw(
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    verifier(overrides?: CallOverrides): Promise<[string]>;
-
-    hashLeftRight(
-      _left: BytesLike,
-      _right: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    FIELD_SIZE(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    levels(overrides?: CallOverrides): Promise<[number]>;
-
-    operator(overrides?: CallOverrides): Promise<[string]>;
-
-    isKnownRoot(
-      _root: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    commitments(arg0: BytesLike, overrides?: CallOverrides): Promise<[boolean]>;
-
-    denomination(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    currentRootIndex(overrides?: CallOverrides): Promise<[number]>;
-
-    updateVerifier(
-      _newVerifier: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    deposit(
-      _commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    getLastRoot(overrides?: CallOverrides): Promise<[string]>;
-
-    roots(arg0: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
-
-    ROOT_HISTORY_SIZE(overrides?: CallOverrides): Promise<[number]>;
-
-    isSpent(
-      _nullifierHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<[boolean]>;
-
-    zeros(arg0: BigNumberish, overrides?: CallOverrides): Promise<[string]>;
-
-    ZERO_VALUE(overrides?: CallOverrides): Promise<[BigNumber]>;
-
-    filledSubtrees(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<[string]>;
-
-    nextIndex(overrides?: CallOverrides): Promise<[number]>;
-  };
-
-  changeOperator(
-    _newOperator: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  nullifierHashes(arg0: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-  withdraw(
-    _proof: BytesLike,
-    _root: BytesLike,
-    _nullifierHash: BytesLike,
-    _recipient: string,
-    _relayer: string,
-    _fee: BigNumberish,
-    _refund: BigNumberish,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  verifier(overrides?: CallOverrides): Promise<string>;
-
-  hashLeftRight(
-    _left: BytesLike,
-    _right: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  FIELD_SIZE(overrides?: CallOverrides): Promise<BigNumber>;
-
-  levels(overrides?: CallOverrides): Promise<number>;
-
-  operator(overrides?: CallOverrides): Promise<string>;
-
-  isKnownRoot(_root: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-  commitments(arg0: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-  denomination(overrides?: CallOverrides): Promise<BigNumber>;
-
-  currentRootIndex(overrides?: CallOverrides): Promise<number>;
-
-  updateVerifier(
-    _newVerifier: string,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  deposit(
-    _commitment: BytesLike,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  getLastRoot(overrides?: CallOverrides): Promise<string>;
-
-  roots(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  ROOT_HISTORY_SIZE(overrides?: CallOverrides): Promise<number>;
-
-  isSpent(
-    _nullifierHash: BytesLike,
-    overrides?: CallOverrides
-  ): Promise<boolean>;
-
-  zeros(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-  ZERO_VALUE(overrides?: CallOverrides): Promise<BigNumber>;
-
-  filledSubtrees(
-    arg0: BigNumberish,
-    overrides?: CallOverrides
-  ): Promise<string>;
-
-  nextIndex(overrides?: CallOverrides): Promise<number>;
-
-  callStatic: {
-    changeOperator(
-      _newOperator: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    nullifierHashes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    withdraw(
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    verifier(overrides?: CallOverrides): Promise<string>;
-
-    hashLeftRight(
-      _left: BytesLike,
-      _right: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    FIELD_SIZE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    levels(overrides?: CallOverrides): Promise<number>;
-
-    operator(overrides?: CallOverrides): Promise<string>;
-
-    isKnownRoot(_root: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-    commitments(arg0: BytesLike, overrides?: CallOverrides): Promise<boolean>;
-
-    denomination(overrides?: CallOverrides): Promise<BigNumber>;
-
-    currentRootIndex(overrides?: CallOverrides): Promise<number>;
-
-    updateVerifier(
-      _newVerifier: string,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    deposit(_commitment: BytesLike, overrides?: CallOverrides): Promise<void>;
-
-    getLastRoot(overrides?: CallOverrides): Promise<string>;
-
-    roots(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-    ROOT_HISTORY_SIZE(overrides?: CallOverrides): Promise<number>;
-
-    isSpent(
-      _nullifierHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<boolean>;
-
-    zeros(arg0: BigNumberish, overrides?: CallOverrides): Promise<string>;
-
-    ZERO_VALUE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    filledSubtrees(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<string>;
-
-    nextIndex(overrides?: CallOverrides): Promise<number>;
-  };
-
-  filters: {
-    "Deposit(bytes32,uint32,uint256)"(
-      commitment?: BytesLike | null,
-      leafIndex?: null,
-      timestamp?: null
-    ): DepositEventFilter;
-    Deposit(
-      commitment?: BytesLike | null,
-      leafIndex?: null,
-      timestamp?: null
-    ): DepositEventFilter;
-
-    "Withdrawal(address,bytes32,address,uint256)"(
-      to?: null,
-      nullifierHash?: null,
-      relayer?: string | null,
-      fee?: null
-    ): WithdrawalEventFilter;
-    Withdrawal(
-      to?: null,
-      nullifierHash?: null,
-      relayer?: string | null,
-      fee?: null
-    ): WithdrawalEventFilter;
-  };
-
-  estimateGas: {
-    changeOperator(
-      _newOperator: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    nullifierHashes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    withdraw(
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    verifier(overrides?: CallOverrides): Promise<BigNumber>;
-
-    hashLeftRight(
-      _left: BytesLike,
-      _right: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    FIELD_SIZE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    levels(overrides?: CallOverrides): Promise<BigNumber>;
-
-    operator(overrides?: CallOverrides): Promise<BigNumber>;
-
-    isKnownRoot(
-      _root: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    commitments(arg0: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    denomination(overrides?: CallOverrides): Promise<BigNumber>;
-
-    currentRootIndex(overrides?: CallOverrides): Promise<BigNumber>;
-
-    updateVerifier(
-      _newVerifier: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    deposit(
-      _commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    getLastRoot(overrides?: CallOverrides): Promise<BigNumber>;
-
-    roots(arg0: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-
-    ROOT_HISTORY_SIZE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    isSpent(
-      _nullifierHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    zeros(arg0: BigNumberish, overrides?: CallOverrides): Promise<BigNumber>;
-
-    ZERO_VALUE(overrides?: CallOverrides): Promise<BigNumber>;
-
-    filledSubtrees(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<BigNumber>;
-
-    nextIndex(overrides?: CallOverrides): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    changeOperator(
-      _newOperator: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    nullifierHashes(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    withdraw(
-      _proof: BytesLike,
-      _root: BytesLike,
-      _nullifierHash: BytesLike,
-      _recipient: string,
-      _relayer: string,
-      _fee: BigNumberish,
-      _refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    verifier(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    hashLeftRight(
-      _left: BytesLike,
-      _right: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    FIELD_SIZE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    levels(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    operator(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    isKnownRoot(
-      _root: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    commitments(
-      arg0: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    denomination(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    currentRootIndex(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    updateVerifier(
-      _newVerifier: string,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    deposit(
-      _commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    getLastRoot(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    roots(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    ROOT_HISTORY_SIZE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    isSpent(
-      _nullifierHash: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    zeros(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    ZERO_VALUE(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    filledSubtrees(
-      arg0: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    nextIndex(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/TornadoProxyAbi.ts

@@ -1,298 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type {
-  BaseContract,
-  BigNumber,
-  BigNumberish,
-  BytesLike,
-  CallOverrides,
-  ContractTransaction,
-  Overrides,
-  PayableOverrides,
-  PopulatedTransaction,
-  Signer,
-  utils,
-} from "ethers";
-import type { FunctionFragment, Result } from "@ethersproject/abi";
-import type { Listener, Provider } from "@ethersproject/providers";
-import type {
-  TypedEventFilter,
-  TypedEvent,
-  TypedListener,
-  OnEvent,
-} from "./common";
-
-export interface TornadoProxyAbiInterface extends utils.Interface {
-  functions: {
-    "governance()": FunctionFragment;
-    "instances(address)": FunctionFragment;
-    "resolve(bytes32)": FunctionFragment;
-    "tornadoTrees()": FunctionFragment;
-    "deposit(address,bytes32)": FunctionFragment;
-    "updateInstances(address,bool)": FunctionFragment;
-    "withdraw(address,bytes,bytes32,bytes32,address,address,uint256,uint256)": FunctionFragment;
-  };
-
-  getFunction(
-    nameOrSignatureOrTopic:
-      | "governance"
-      | "instances"
-      | "resolve"
-      | "tornadoTrees"
-      | "deposit"
-      | "updateInstances"
-      | "withdraw"
-  ): FunctionFragment;
-
-  encodeFunctionData(
-    functionFragment: "governance",
-    values?: undefined
-  ): string;
-  encodeFunctionData(functionFragment: "instances", values: [string]): string;
-  encodeFunctionData(functionFragment: "resolve", values: [BytesLike]): string;
-  encodeFunctionData(
-    functionFragment: "tornadoTrees",
-    values?: undefined
-  ): string;
-  encodeFunctionData(
-    functionFragment: "deposit",
-    values: [string, BytesLike]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "updateInstances",
-    values: [string, boolean]
-  ): string;
-  encodeFunctionData(
-    functionFragment: "withdraw",
-    values: [
-      string,
-      BytesLike,
-      BytesLike,
-      BytesLike,
-      string,
-      string,
-      BigNumberish,
-      BigNumberish
-    ]
-  ): string;
-
-  decodeFunctionResult(functionFragment: "governance", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "instances", data: BytesLike): Result;
-  decodeFunctionResult(functionFragment: "resolve", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "tornadoTrees",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "deposit", data: BytesLike): Result;
-  decodeFunctionResult(
-    functionFragment: "updateInstances",
-    data: BytesLike
-  ): Result;
-  decodeFunctionResult(functionFragment: "withdraw", data: BytesLike): Result;
-
-  events: {};
-}
-
-export interface TornadoProxyAbi extends BaseContract {
-  connect(signerOrProvider: Signer | Provider | string): this;
-  attach(addressOrName: string): this;
-  deployed(): Promise<this>;
-
-  interface: TornadoProxyAbiInterface;
-
-  queryFilter<TEvent extends TypedEvent>(
-    event: TypedEventFilter<TEvent>,
-    fromBlockOrBlockhash?: string | number | undefined,
-    toBlock?: string | number | undefined
-  ): Promise<Array<TEvent>>;
-
-  listeners<TEvent extends TypedEvent>(
-    eventFilter?: TypedEventFilter<TEvent>
-  ): Array<TypedListener<TEvent>>;
-  listeners(eventName?: string): Array<Listener>;
-  removeAllListeners<TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>
-  ): this;
-  removeAllListeners(eventName?: string): this;
-  off: OnEvent<this>;
-  on: OnEvent<this>;
-  once: OnEvent<this>;
-  removeListener: OnEvent<this>;
-
-  functions: {
-    governance(overrides?: CallOverrides): Promise<[string]>;
-
-    instances(arg0: string, overrides?: CallOverrides): Promise<[boolean]>;
-
-    resolve(node: BytesLike, overrides?: CallOverrides): Promise<[string]>;
-
-    tornadoTrees(overrides?: CallOverrides): Promise<[string]>;
-
-    deposit(
-      tornado: string,
-      commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    updateInstances(
-      instance: string,
-      update: boolean,
-      overrides?: Overrides & { from?: string }
-    ): Promise<ContractTransaction>;
-
-    withdraw(
-      tornado: string,
-      proof: BytesLike,
-      root: BytesLike,
-      nullifierHash: BytesLike,
-      recipient: string,
-      relayer: string,
-      fee: BigNumberish,
-      refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<ContractTransaction>;
-  };
-
-  governance(overrides?: CallOverrides): Promise<string>;
-
-  instances(arg0: string, overrides?: CallOverrides): Promise<boolean>;
-
-  resolve(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-  tornadoTrees(overrides?: CallOverrides): Promise<string>;
-
-  deposit(
-    tornado: string,
-    commitment: BytesLike,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  updateInstances(
-    instance: string,
-    update: boolean,
-    overrides?: Overrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  withdraw(
-    tornado: string,
-    proof: BytesLike,
-    root: BytesLike,
-    nullifierHash: BytesLike,
-    recipient: string,
-    relayer: string,
-    fee: BigNumberish,
-    refund: BigNumberish,
-    overrides?: PayableOverrides & { from?: string }
-  ): Promise<ContractTransaction>;
-
-  callStatic: {
-    governance(overrides?: CallOverrides): Promise<string>;
-
-    instances(arg0: string, overrides?: CallOverrides): Promise<boolean>;
-
-    resolve(node: BytesLike, overrides?: CallOverrides): Promise<string>;
-
-    tornadoTrees(overrides?: CallOverrides): Promise<string>;
-
-    deposit(
-      tornado: string,
-      commitment: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    updateInstances(
-      instance: string,
-      update: boolean,
-      overrides?: CallOverrides
-    ): Promise<void>;
-
-    withdraw(
-      tornado: string,
-      proof: BytesLike,
-      root: BytesLike,
-      nullifierHash: BytesLike,
-      recipient: string,
-      relayer: string,
-      fee: BigNumberish,
-      refund: BigNumberish,
-      overrides?: CallOverrides
-    ): Promise<void>;
-  };
-
-  filters: {};
-
-  estimateGas: {
-    governance(overrides?: CallOverrides): Promise<BigNumber>;
-
-    instances(arg0: string, overrides?: CallOverrides): Promise<BigNumber>;
-
-    resolve(node: BytesLike, overrides?: CallOverrides): Promise<BigNumber>;
-
-    tornadoTrees(overrides?: CallOverrides): Promise<BigNumber>;
-
-    deposit(
-      tornado: string,
-      commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    updateInstances(
-      instance: string,
-      update: boolean,
-      overrides?: Overrides & { from?: string }
-    ): Promise<BigNumber>;
-
-    withdraw(
-      tornado: string,
-      proof: BytesLike,
-      root: BytesLike,
-      nullifierHash: BytesLike,
-      recipient: string,
-      relayer: string,
-      fee: BigNumberish,
-      refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<BigNumber>;
-  };
-
-  populateTransaction: {
-    governance(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    instances(
-      arg0: string,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    resolve(
-      node: BytesLike,
-      overrides?: CallOverrides
-    ): Promise<PopulatedTransaction>;
-
-    tornadoTrees(overrides?: CallOverrides): Promise<PopulatedTransaction>;
-
-    deposit(
-      tornado: string,
-      commitment: BytesLike,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    updateInstances(
-      instance: string,
-      update: boolean,
-      overrides?: Overrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-
-    withdraw(
-      tornado: string,
-      proof: BytesLike,
-      root: BytesLike,
-      nullifierHash: BytesLike,
-      recipient: string,
-      relayer: string,
-      fee: BigNumberish,
-      refund: BigNumberish,
-      overrides?: PayableOverrides & { from?: string }
-    ): Promise<PopulatedTransaction>;
-  };
-}

src/contracts/common.ts

@@ -1,44 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-import type { Listener } from "@ethersproject/providers";
-import type { Event, EventFilter } from "ethers";
-
-export interface TypedEvent<
-  TArgsArray extends Array<any> = any,
-  TArgsObject = any
-> extends Event {
-  args: TArgsArray & TArgsObject;
-}
-
-export interface TypedEventFilter<_TEvent extends TypedEvent>
-  extends EventFilter {}
-
-export interface TypedListener<TEvent extends TypedEvent> {
-  (...listenerArg: [...__TypechainArgsArray<TEvent>, TEvent]): void;
-}
-
-type __TypechainArgsArray<T> = T extends TypedEvent<infer U> ? U : never;
-
-export interface OnEvent<TRes> {
-  <TEvent extends TypedEvent>(
-    eventFilter: TypedEventFilter<TEvent>,
-    listener: TypedListener<TEvent>
-  ): TRes;
-  (eventName: string, listener: Listener): TRes;
-}
-
-export type MinEthersFactory<C, ARGS> = {
-  deploy(...a: ARGS[]): Promise<C>;
-};
-
-export type GetContractTypeFromFactory<F> = F extends MinEthersFactory<
-  infer C,
-  any
->
-  ? C
-  : never;
-
-export type GetARGsTypeFromFactory<F> = F extends MinEthersFactory<any, any>
-  ? Parameters<F["deploy"]>
-  : never;

src/contracts/factories/AggregatorAbi__factory.ts

@@ -1,355 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { AggregatorAbi, AggregatorAbiInterface } from "../AggregatorAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "_multiWrapper",
-        type: "address",
-      },
-      {
-        internalType: "contract IOracle[]",
-        name: "existingOracles",
-        type: "address[]",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType[]",
-        name: "oracleTypes",
-        type: "uint8[]",
-      },
-      {
-        internalType: "contract IERC20[]",
-        name: "existingConnectors",
-        type: "address[]",
-      },
-      {
-        internalType: "contract IERC20",
-        name: "wBase",
-        type: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "ConnectorAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "ConnectorRemoved",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract MultiWrapper",
-        name: "multiWrapper",
-        type: "address",
-      },
-    ],
-    name: "MultiWrapperUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleType",
-        type: "uint8",
-      },
-    ],
-    name: "OracleAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleType",
-        type: "uint8",
-      },
-    ],
-    name: "OracleRemoved",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "previousOwner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "OwnershipTransferred",
-    type: "event",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "addConnector",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleKind",
-        type: "uint8",
-      },
-    ],
-    name: "addOracle",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "connectors",
-    outputs: [
-      {
-        internalType: "contract IERC20[]",
-        name: "allConnectors",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "srcToken",
-        type: "address",
-      },
-      {
-        internalType: "contract IERC20",
-        name: "dstToken",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "useWrappers",
-        type: "bool",
-      },
-    ],
-    name: "getRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "weightedRate",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "srcToken",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "useSrcWrappers",
-        type: "bool",
-      },
-    ],
-    name: "getRateToEth",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "weightedRate",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "multiWrapper",
-    outputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "oracles",
-    outputs: [
-      {
-        internalType: "contract IOracle[]",
-        name: "allOracles",
-        type: "address[]",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType[]",
-        name: "oracleTypes",
-        type: "uint8[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "owner",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "removeConnector",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleKind",
-        type: "uint8",
-      },
-    ],
-    name: "removeOracle",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "renounceOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "_multiWrapper",
-        type: "address",
-      },
-    ],
-    name: "setMultiWrapper",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "transferOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class AggregatorAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): AggregatorAbiInterface {
-    return new utils.Interface(_abi) as AggregatorAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): AggregatorAbi {
-    return new Contract(address, _abi, signerOrProvider) as AggregatorAbi;
-  }
-}

src/contracts/factories/ERC20Abi__factory.ts

@@ -1,277 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { ERC20Abi, ERC20AbiInterface } from "../ERC20Abi";
-
-const _abi = [
-  {
-    constant: true,
-    inputs: [],
-    name: "totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "_totalSupply",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "address",
-        name: "who",
-        type: "address",
-      },
-    ],
-    name: "balanceOf",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "transfer",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "spender",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "Approval",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "from",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "Transfer",
-    type: "event",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address",
-      },
-    ],
-    name: "allowance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "from",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "transferFrom",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "value",
-        type: "uint256",
-      },
-    ],
-    name: "approve",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-    ],
-    name: "nonces",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "owner",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "spender",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "amount",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "deadline",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "v",
-        type: "uint8",
-      },
-      {
-        internalType: "bytes32",
-        name: "r",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "s",
-        type: "bytes32",
-      },
-    ],
-    name: "permit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class ERC20Abi__factory {
-  static readonly abi = _abi;
-  static createInterface(): ERC20AbiInterface {
-    return new utils.Interface(_abi) as ERC20AbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): ERC20Abi {
-    return new Contract(address, _abi, signerOrProvider) as ERC20Abi;
-  }
-}

src/contracts/factories/MulticallAbi__factory.ts

@@ -1,59 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { MulticallAbi, MulticallAbiInterface } from "../MulticallAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        components: [
-          {
-            internalType: "address",
-            name: "to",
-            type: "address",
-          },
-          {
-            internalType: "bytes",
-            name: "data",
-            type: "bytes",
-          },
-        ],
-        internalType: "struct MultiCall.Call[]",
-        name: "calls",
-        type: "tuple[]",
-      },
-    ],
-    name: "multicall",
-    outputs: [
-      {
-        internalType: "bytes[]",
-        name: "results",
-        type: "bytes[]",
-      },
-      {
-        internalType: "bool[]",
-        name: "success",
-        type: "bool[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class MulticallAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): MulticallAbiInterface {
-    return new utils.Interface(_abi) as MulticallAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): MulticallAbi {
-    return new Contract(address, _abi, signerOrProvider) as MulticallAbi;
-  }
-}

src/contracts/factories/OffchainOracleAbi__factory.ts

@@ -1,358 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  OffchainOracleAbi,
-  OffchainOracleAbiInterface,
-} from "../OffchainOracleAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "_multiWrapper",
-        type: "address",
-      },
-      {
-        internalType: "contract IOracle[]",
-        name: "existingOracles",
-        type: "address[]",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType[]",
-        name: "oracleTypes",
-        type: "uint8[]",
-      },
-      {
-        internalType: "contract IERC20[]",
-        name: "existingConnectors",
-        type: "address[]",
-      },
-      {
-        internalType: "contract IERC20",
-        name: "wBase",
-        type: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "ConnectorAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "ConnectorRemoved",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract MultiWrapper",
-        name: "multiWrapper",
-        type: "address",
-      },
-    ],
-    name: "MultiWrapperUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleType",
-        type: "uint8",
-      },
-    ],
-    name: "OracleAdded",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleType",
-        type: "uint8",
-      },
-    ],
-    name: "OracleRemoved",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "previousOwner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "OwnershipTransferred",
-    type: "event",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "addConnector",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleKind",
-        type: "uint8",
-      },
-    ],
-    name: "addOracle",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "connectors",
-    outputs: [
-      {
-        internalType: "contract IERC20[]",
-        name: "allConnectors",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "srcToken",
-        type: "address",
-      },
-      {
-        internalType: "contract IERC20",
-        name: "dstToken",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "useWrappers",
-        type: "bool",
-      },
-    ],
-    name: "getRate",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "weightedRate",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "srcToken",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "useSrcWrappers",
-        type: "bool",
-      },
-    ],
-    name: "getRateToEth",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "weightedRate",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "multiWrapper",
-    outputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "oracles",
-    outputs: [
-      {
-        internalType: "contract IOracle[]",
-        name: "allOracles",
-        type: "address[]",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType[]",
-        name: "oracleTypes",
-        type: "uint8[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "owner",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IERC20",
-        name: "connector",
-        type: "address",
-      },
-    ],
-    name: "removeConnector",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IOracle",
-        name: "oracle",
-        type: "address",
-      },
-      {
-        internalType: "enum OffchainOracle.OracleType",
-        name: "oracleKind",
-        type: "uint8",
-      },
-    ],
-    name: "removeOracle",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "renounceOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract MultiWrapper",
-        name: "_multiWrapper",
-        type: "address",
-      },
-    ],
-    name: "setMultiWrapper",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "transferOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class OffchainOracleAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): OffchainOracleAbiInterface {
-    return new utils.Interface(_abi) as OffchainOracleAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): OffchainOracleAbi {
-    return new Contract(address, _abi, signerOrProvider) as OffchainOracleAbi;
-  }
-}

src/contracts/factories/OvmGasPriceOracleAbi__factory.ts

@@ -1,326 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  OvmGasPriceOracleAbi,
-  OvmGasPriceOracleAbiInterface,
-} from "../OvmGasPriceOracleAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_owner",
-        type: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "DecimalsUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "GasPriceUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "L1BaseFeeUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "OverheadUpdated",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "previousOwner",
-        type: "address",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "OwnershipTransferred",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "ScalarUpdated",
-    type: "event",
-  },
-  {
-    inputs: [],
-    name: "decimals",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "gasPrice",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes",
-        name: "_data",
-        type: "bytes",
-      },
-    ],
-    name: "getL1Fee",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes",
-        name: "_data",
-        type: "bytes",
-      },
-    ],
-    name: "getL1GasUsed",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "l1BaseFee",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "overhead",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "owner",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "renounceOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "scalar",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_decimals",
-        type: "uint256",
-      },
-    ],
-    name: "setDecimals",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_gasPrice",
-        type: "uint256",
-      },
-    ],
-    name: "setGasPrice",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_baseFee",
-        type: "uint256",
-      },
-    ],
-    name: "setL1BaseFee",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_overhead",
-        type: "uint256",
-      },
-    ],
-    name: "setOverhead",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "_scalar",
-        type: "uint256",
-      },
-    ],
-    name: "setScalar",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "newOwner",
-        type: "address",
-      },
-    ],
-    name: "transferOwnership",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-] as const;
-
-export class OvmGasPriceOracleAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): OvmGasPriceOracleAbiInterface {
-    return new utils.Interface(_abi) as OvmGasPriceOracleAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): OvmGasPriceOracleAbi {
-    return new Contract(
-      address,
-      _abi,
-      signerOrProvider
-    ) as OvmGasPriceOracleAbi;
-  }
-}

src/contracts/factories/ProxyLightAbi__factory.ts

@@ -1,126 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type { ProxyLightAbi, ProxyLightAbiInterface } from "../ProxyLightAbi";
-
-const _abi = [
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "address",
-        name: "sender",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "bytes",
-        name: "encryptedNote",
-        type: "bytes",
-      },
-    ],
-    name: "EncryptedNote",
-    type: "event",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes[]",
-        name: "_encryptedNotes",
-        type: "bytes[]",
-      },
-    ],
-    name: "backupNotes",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornadoInstance",
-        name: "_tornado",
-        type: "address",
-      },
-      {
-        internalType: "bytes32",
-        name: "_commitment",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes",
-        name: "_encryptedNote",
-        type: "bytes",
-      },
-    ],
-    name: "deposit",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornadoInstance",
-        name: "_tornado",
-        type: "address",
-      },
-      {
-        internalType: "bytes",
-        name: "_proof",
-        type: "bytes",
-      },
-      {
-        internalType: "bytes32",
-        name: "_root",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "_nullifierHash",
-        type: "bytes32",
-      },
-      {
-        internalType: "address payable",
-        name: "_recipient",
-        type: "address",
-      },
-      {
-        internalType: "address payable",
-        name: "_relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "_fee",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "_refund",
-        type: "uint256",
-      },
-    ],
-    name: "withdraw",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-] as const;
-
-export class ProxyLightAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): ProxyLightAbiInterface {
-    return new utils.Interface(_abi) as ProxyLightAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): ProxyLightAbi {
-    return new Contract(address, _abi, signerOrProvider) as ProxyLightAbi;
-  }
-}

src/contracts/factories/RelayerRegistryAbi__factory.ts

@@ -1,694 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  RelayerRegistryAbi,
-  RelayerRegistryAbiInterface,
-} from "../RelayerRegistryAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "_torn",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "_governance",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "_ens",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "_staking",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "_feeManager",
-        type: "address",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "minStakeAmount",
-        type: "uint256",
-      },
-    ],
-    name: "MinimumStakeAmount",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-    ],
-    name: "RelayerBalanceNullified",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "bytes32",
-        name: "relayer",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "string",
-        name: "ensName",
-        type: "string",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayerAddress",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "stakedAmount",
-        type: "uint256",
-      },
-    ],
-    name: "RelayerRegistered",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "tornadoRouter",
-        type: "address",
-      },
-    ],
-    name: "RouterRegistered",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amountStakeAdded",
-        type: "uint256",
-      },
-    ],
-    name: "StakeAddedToRelayer",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "amountBurned",
-        type: "uint256",
-      },
-    ],
-    name: "StakeBurned",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "worker",
-        type: "address",
-      },
-    ],
-    name: "WorkerRegistered",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "address",
-        name: "worker",
-        type: "address",
-      },
-    ],
-    name: "WorkerUnregistered",
-    type: "event",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32[]",
-        name: "domains",
-        type: "bytes32[]",
-      },
-    ],
-    name: "bulkResolve",
-    outputs: [
-      {
-        internalType: "address[]",
-        name: "result",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "sender",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "contract ITornadoInstance",
-        name: "pool",
-        type: "address",
-      },
-    ],
-    name: "burn",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "ens",
-    outputs: [
-      {
-        internalType: "contract IENS",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "feeManager",
-    outputs: [
-      {
-        internalType: "contract IFeeManager",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-    ],
-    name: "getRelayerBalance",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-    ],
-    name: "getRelayerEnsHash",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "governance",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_tornadoRouter",
-        type: "bytes32",
-      },
-    ],
-    name: "initialize",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "toResolve",
-        type: "address",
-      },
-    ],
-    name: "isRelayer",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "toResolve",
-        type: "address",
-      },
-    ],
-    name: "isRelayerRegistered",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "minStakeAmount",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-    ],
-    name: "nullifyBalance",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "string",
-        name: "ensName",
-        type: "string",
-      },
-      {
-        internalType: "uint256",
-        name: "stake",
-        type: "uint256",
-      },
-      {
-        internalType: "address[]",
-        name: "workersToRegister",
-        type: "address[]",
-      },
-    ],
-    name: "register",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "string",
-        name: "ensName",
-        type: "string",
-      },
-      {
-        internalType: "uint256",
-        name: "stake",
-        type: "uint256",
-      },
-      {
-        internalType: "address[]",
-        name: "workersToRegister",
-        type: "address[]",
-      },
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "deadline",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "v",
-        type: "uint8",
-      },
-      {
-        internalType: "bytes32",
-        name: "r",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "s",
-        type: "bytes32",
-      },
-    ],
-    name: "registerPermit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "address",
-        name: "worker",
-        type: "address",
-      },
-    ],
-    name: "registerWorker",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "relayers",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "balance",
-        type: "uint256",
-      },
-      {
-        internalType: "bytes32",
-        name: "ensHash",
-        type: "bytes32",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "resolve",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "minAmount",
-        type: "uint256",
-      },
-    ],
-    name: "setMinStakeAmount",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "tornadoRouterAddress",
-        type: "address",
-      },
-    ],
-    name: "setTornadoRouter",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "stake",
-        type: "uint256",
-      },
-    ],
-    name: "stakeToRelayer",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "stake",
-        type: "uint256",
-      },
-      {
-        internalType: "address",
-        name: "staker",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "deadline",
-        type: "uint256",
-      },
-      {
-        internalType: "uint8",
-        name: "v",
-        type: "uint8",
-      },
-      {
-        internalType: "bytes32",
-        name: "r",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "s",
-        type: "bytes32",
-      },
-    ],
-    name: "stakeToRelayerPermit",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "staking",
-    outputs: [
-      {
-        internalType: "contract TornadoStakingRewards",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "torn",
-    outputs: [
-      {
-        internalType: "contract TORN",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tornadoRouter",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "worker",
-        type: "address",
-      },
-    ],
-    name: "unregisterWorker",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "workers",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-] as const;
-
-export class RelayerRegistryAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): RelayerRegistryAbiInterface {
-    return new utils.Interface(_abi) as RelayerRegistryAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): RelayerRegistryAbi {
-    return new Contract(address, _abi, signerOrProvider) as RelayerRegistryAbi;
-  }
-}

src/contracts/factories/TornadoInstanceAbi__factory.ts

@@ -1,522 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  TornadoInstanceAbi,
-  TornadoInstanceAbiInterface,
-} from "../TornadoInstanceAbi";
-
-const _abi = [
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "_newOperator",
-        type: "address",
-      },
-    ],
-    name: "changeOperator",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    name: "nullifierHashes",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes",
-        name: "_proof",
-        type: "bytes",
-      },
-      {
-        internalType: "bytes32",
-        name: "_root",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "_nullifierHash",
-        type: "bytes32",
-      },
-      {
-        internalType: "address payable",
-        name: "_recipient",
-        type: "address",
-      },
-      {
-        internalType: "address payable",
-        name: "_relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "_fee",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "_refund",
-        type: "uint256",
-      },
-    ],
-    name: "withdraw",
-    outputs: [],
-    payable: true,
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "verifier",
-    outputs: [
-      {
-        internalType: "contract IVerifier",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_left",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "_right",
-        type: "bytes32",
-      },
-    ],
-    name: "hashLeftRight",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "pure",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "FIELD_SIZE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "levels",
-    outputs: [
-      {
-        internalType: "uint32",
-        name: "",
-        type: "uint32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "operator",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_root",
-        type: "bytes32",
-      },
-    ],
-    name: "isKnownRoot",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    name: "commitments",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "denomination",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "currentRootIndex",
-    outputs: [
-      {
-        internalType: "uint32",
-        name: "",
-        type: "uint32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "address",
-        name: "_newVerifier",
-        type: "address",
-      },
-    ],
-    name: "updateVerifier",
-    outputs: [],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    constant: false,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_commitment",
-        type: "bytes32",
-      },
-    ],
-    name: "deposit",
-    outputs: [],
-    payable: true,
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "getLastRoot",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "roots",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "ROOT_HISTORY_SIZE",
-    outputs: [
-      {
-        internalType: "uint32",
-        name: "",
-        type: "uint32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_nullifierHash",
-        type: "bytes32",
-      },
-    ],
-    name: "isSpent",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "zeros",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "ZERO_VALUE",
-    outputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [
-      {
-        internalType: "uint256",
-        name: "",
-        type: "uint256",
-      },
-    ],
-    name: "filledSubtrees",
-    outputs: [
-      {
-        internalType: "bytes32",
-        name: "",
-        type: "bytes32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    constant: true,
-    inputs: [],
-    name: "nextIndex",
-    outputs: [
-      {
-        internalType: "uint32",
-        name: "",
-        type: "uint32",
-      },
-    ],
-    payable: false,
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract IVerifier",
-        name: "_verifier",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "_denomination",
-        type: "uint256",
-      },
-      {
-        internalType: "uint32",
-        name: "_merkleTreeHeight",
-        type: "uint32",
-      },
-      {
-        internalType: "address",
-        name: "_operator",
-        type: "address",
-      },
-    ],
-    payable: false,
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: true,
-        internalType: "bytes32",
-        name: "commitment",
-        type: "bytes32",
-      },
-      {
-        indexed: false,
-        internalType: "uint32",
-        name: "leafIndex",
-        type: "uint32",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "timestamp",
-        type: "uint256",
-      },
-    ],
-    name: "Deposit",
-    type: "event",
-  },
-  {
-    anonymous: false,
-    inputs: [
-      {
-        indexed: false,
-        internalType: "address",
-        name: "to",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "bytes32",
-        name: "nullifierHash",
-        type: "bytes32",
-      },
-      {
-        indexed: true,
-        internalType: "address",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        indexed: false,
-        internalType: "uint256",
-        name: "fee",
-        type: "uint256",
-      },
-    ],
-    name: "Withdrawal",
-    type: "event",
-  },
-] as const;
-
-export class TornadoInstanceAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): TornadoInstanceAbiInterface {
-    return new utils.Interface(_abi) as TornadoInstanceAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): TornadoInstanceAbi {
-    return new Contract(address, _abi, signerOrProvider) as TornadoInstanceAbi;
-  }
-}

src/contracts/factories/TornadoProxyAbi__factory.ts

@@ -1,195 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-
-import { Contract, Signer, utils } from "ethers";
-import type { Provider } from "@ethersproject/providers";
-import type {
-  TornadoProxyAbi,
-  TornadoProxyAbiInterface,
-} from "../TornadoProxyAbi";
-
-const _abi = [
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "_tornadoTrees",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "_governance",
-        type: "bytes32",
-      },
-      {
-        internalType: "contract ITornado[]",
-        name: "_instances",
-        type: "address[]",
-      },
-    ],
-    stateMutability: "nonpayable",
-    type: "constructor",
-  },
-  {
-    inputs: [],
-    name: "governance",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornado",
-        name: "",
-        type: "address",
-      },
-    ],
-    name: "instances",
-    outputs: [
-      {
-        internalType: "bool",
-        name: "",
-        type: "bool",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "bytes32",
-        name: "node",
-        type: "bytes32",
-      },
-    ],
-    name: "resolve",
-    outputs: [
-      {
-        internalType: "address",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [],
-    name: "tornadoTrees",
-    outputs: [
-      {
-        internalType: "contract ITornadoTrees",
-        name: "",
-        type: "address",
-      },
-    ],
-    stateMutability: "view",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornado",
-        name: "tornado",
-        type: "address",
-      },
-      {
-        internalType: "bytes32",
-        name: "commitment",
-        type: "bytes32",
-      },
-    ],
-    name: "deposit",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornado",
-        name: "instance",
-        type: "address",
-      },
-      {
-        internalType: "bool",
-        name: "update",
-        type: "bool",
-      },
-    ],
-    name: "updateInstances",
-    outputs: [],
-    stateMutability: "nonpayable",
-    type: "function",
-  },
-  {
-    inputs: [
-      {
-        internalType: "contract ITornado",
-        name: "tornado",
-        type: "address",
-      },
-      {
-        internalType: "bytes",
-        name: "proof",
-        type: "bytes",
-      },
-      {
-        internalType: "bytes32",
-        name: "root",
-        type: "bytes32",
-      },
-      {
-        internalType: "bytes32",
-        name: "nullifierHash",
-        type: "bytes32",
-      },
-      {
-        internalType: "address payable",
-        name: "recipient",
-        type: "address",
-      },
-      {
-        internalType: "address payable",
-        name: "relayer",
-        type: "address",
-      },
-      {
-        internalType: "uint256",
-        name: "fee",
-        type: "uint256",
-      },
-      {
-        internalType: "uint256",
-        name: "refund",
-        type: "uint256",
-      },
-    ],
-    name: "withdraw",
-    outputs: [],
-    stateMutability: "payable",
-    type: "function",
-  },
-] as const;
-
-export class TornadoProxyAbi__factory {
-  static readonly abi = _abi;
-  static createInterface(): TornadoProxyAbiInterface {
-    return new utils.Interface(_abi) as TornadoProxyAbiInterface;
-  }
-  static connect(
-    address: string,
-    signerOrProvider: Signer | Provider
-  ): TornadoProxyAbi {
-    return new Contract(address, _abi, signerOrProvider) as TornadoProxyAbi;
-  }
-}

src/contracts/factories/index.ts

@@ -1,12 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-export { AggregatorAbi__factory } from "./AggregatorAbi__factory";
-export { ERC20Abi__factory } from "./ERC20Abi__factory";
-export { MulticallAbi__factory } from "./MulticallAbi__factory";
-export { OffchainOracleAbi__factory } from "./OffchainOracleAbi__factory";
-export { OvmGasPriceOracleAbi__factory } from "./OvmGasPriceOracleAbi__factory";
-export { ProxyLightAbi__factory } from "./ProxyLightAbi__factory";
-export { RelayerRegistryAbi__factory } from "./RelayerRegistryAbi__factory";
-export { TornadoInstanceAbi__factory } from "./TornadoInstanceAbi__factory";
-export { TornadoProxyAbi__factory } from "./TornadoProxyAbi__factory";

src/contracts/index.ts

@@ -1,22 +0,0 @@
-/* Autogenerated file. Do not edit manually. */
-/* tslint:disable */
-/* eslint-disable */
-export type { AggregatorAbi } from "./AggregatorAbi";
-export type { ERC20Abi } from "./ERC20Abi";
-export type { MulticallAbi } from "./MulticallAbi";
-export type { OffchainOracleAbi } from "./OffchainOracleAbi";
-export type { OvmGasPriceOracleAbi } from "./OvmGasPriceOracleAbi";
-export type { ProxyLightAbi } from "./ProxyLightAbi";
-export type { RelayerRegistryAbi } from "./RelayerRegistryAbi";
-export type { TornadoInstanceAbi } from "./TornadoInstanceAbi";
-export type { TornadoProxyAbi } from "./TornadoProxyAbi";
-export * as factories from "./factories";
-export { AggregatorAbi__factory } from "./factories/AggregatorAbi__factory";
-export { ERC20Abi__factory } from "./factories/ERC20Abi__factory";
-export { MulticallAbi__factory } from "./factories/MulticallAbi__factory";
-export { OffchainOracleAbi__factory } from "./factories/OffchainOracleAbi__factory";
-export { OvmGasPriceOracleAbi__factory } from "./factories/OvmGasPriceOracleAbi__factory";
-export { ProxyLightAbi__factory } from "./factories/ProxyLightAbi__factory";
-export { RelayerRegistryAbi__factory } from "./factories/RelayerRegistryAbi__factory";
-export { TornadoInstanceAbi__factory } from "./factories/TornadoInstanceAbi__factory";
-export { TornadoProxyAbi__factory } from "./factories/TornadoProxyAbi__factory";

src/healthWorker.ts

@@ -1,4 +0,0 @@
-import { healthWorker, priceWorker } from './queue/worker';
-
-priceWorker();
-healthWorker();

src/modules/contracts.ts

@@ -1,52 +0,0 @@
-import {
-  ERC20Abi__factory,
-  MulticallAbi__factory,
-  OffchainOracleAbi__factory,
-  OvmGasPriceOracleAbi__factory,
-  ProxyLightAbi__factory,
-  RelayerRegistryAbi__factory,
-  TornadoProxyAbi__factory,
-} from '../contracts';
-import { providers } from 'ethers';
-import {
-  mainnetRpcUrl,
-  multiCallAddress,
-  netId,
-  offchainOracleAddress,
-  oracleRpcUrl,
-  ovmGasPriceOracleContract,
-  rpcUrl,
-} from '../config';
-
-export function getProvider(isStatic = true, customRpcUrl?: string, chainId = netId) {
-  const url = customRpcUrl || rpcUrl;
-  if (isStatic) return new providers.StaticJsonRpcProvider(url, chainId);
-  else return new providers.JsonRpcProvider(url, chainId);
-}
-
-export const getTornadoProxyContract = (proxyAddress: string) => {
-  return TornadoProxyAbi__factory.connect(proxyAddress, getProvider());
-};
-export const getTornadoProxyLightContract = (proxyAddress: string) => {
-  return ProxyLightAbi__factory.connect(proxyAddress, getProvider());
-};
-
-export const getOffchainOracleContract = () => {
-  return OffchainOracleAbi__factory.connect(offchainOracleAddress, getProvider(true, oracleRpcUrl));
-};
-
-export const getMultiCallContract = () => {
-  return MulticallAbi__factory.connect(multiCallAddress, getProvider(true, mainnetRpcUrl));
-};
-
-export const getTornTokenContract = (tokenAddress: string) => {
-  return ERC20Abi__factory.connect(tokenAddress, getProvider(true, mainnetRpcUrl));
-};
-
-export const getOvmGasPriceOracle = () => {
-  return OvmGasPriceOracleAbi__factory.connect(ovmGasPriceOracleContract, getProvider());
-};
-
-export const getRelayerRegistryContract = (relayerRegistryAddress: string) => {
-  return RelayerRegistryAbi__factory.connect(relayerRegistryAddress, getProvider(true, mainnetRpcUrl));
-};

src/modules/ensResolver.ts

@@ -1,21 +0,0 @@
-import { getProvider } from './contracts';
-import { mainnetRpcUrl } from '../config';
-import { ChainIds } from '../types';
-
-const addresses = new Map<string, string>();
-
-async function resolve(domain: string) {
-  try {
-    const provider = getProvider(true, mainnetRpcUrl, ChainIds.ethereum);
-    if (!addresses.has(domain)) {
-      const resolved = await provider.resolveName(domain);
-      addresses.set(domain, resolved);
-    }
-    return addresses.get(domain);
-  } catch (e) {
-    console.log(e);
-    return null;
-  }
-}
-
-export { resolve };

src/modules/index.ts

@@ -1,2 +0,0 @@
-export { default as redisStore } from './redis';
-export { resolve } from './ensResolver';

src/modules/redis.ts

@@ -1,35 +0,0 @@
-import IORedis, { Redis } from 'ioredis';
-import { redisUrl } from '../config';
-import { container, singleton } from 'tsyringe';
-
-const getNewInstance: () => Redis = () => new IORedis(redisUrl, { maxRetriesPerRequest: null });
-
-@singleton()
-export class RedisStore {
-  get publisher(): Redis {
-    if (!this._publisher) {
-      this._publisher = getNewInstance();
-    }
-    return this._publisher;
-  }
-
-  get client() {
-    if (!this._client) {
-      this._client = getNewInstance();
-    }
-    return this._client;
-  }
-
-  get subscriber() {
-    if (!this._subscriber) {
-      this._subscriber = getNewInstance();
-    }
-    return this._subscriber;
-  }
-
-  private _subscriber: Redis;
-  private _publisher: Redis;
-  private _client: Redis;
-}
-
-export default () => container.resolve(RedisStore);

src/modules/utils.ts

@@ -1,18 +0,0 @@
-import { BigNumber, BigNumberish } from 'ethers';
-
-export const parseJSON = (str: string) => {
-  let parsed = null;
-  try {
-    parsed = JSON.parse(str);
-    if (typeof parsed === 'string') parsed = parseJSON(parsed);
-    return parsed;
-  } catch (e) {
-    return parsed;
-  }
-};
-
-export const bump = (value: BigNumberish, percent: number | BigNumber): BigNumber => {
-  const hundredPercents = BigNumber.from(100);
-
-  return BigNumber.from(value).mul(hundredPercents.add(percent)).div(hundredPercents);
-};

src/queue/health.processor.ts

@@ -1,24 +0,0 @@
-import { getHealthService } from '../services';
-import { HealthProcessor } from './index';
-
-export const healthProcessor: HealthProcessor = async (job) => {
-  const healthService = getHealthService();
-  try {
-    switch (job.name) {
-      case 'checkHealth': {
-        const status = await healthService.check();
-        await healthService.clearErrorCodes();
-        await healthService.setStatus({ status: true, error: '' });
-        return status;
-      }
-      case 'checkUpdate': {
-        const status = await healthService.checkUpdate();
-        return status;
-      }
-    }
-  } catch (e) {
-    await healthService.saveError(e);
-    await healthService.setStatus({ status: false, error: e.message });
-    return { error: e.message };
-  }
-};

src/queue/index.ts

@@ -1,182 +0,0 @@
-import { Processor, Queue, QueueScheduler, Worker } from 'bullmq';
-import { TransactionReceipt } from '@ethersproject/abstract-provider';
-import { JobStatus, RelayerJobType, Token } from '../types';
-import { WithdrawalData } from '../services/tx.service';
-import { priceProcessor } from './price.processor';
-import { autoInjectable } from 'tsyringe';
-import { RedisStore } from '../modules/redis';
-import { ConfigService } from '../services/config.service';
-import { relayerProcessor } from './relayer.processor';
-import { healthProcessor } from './health.processor';
-import { txJobAttempts } from '../config';
-
-type PriceJobData = Token[];
-type PriceJobReturn = number;
-
-type HealthStatusInfo = { level: 'OK' | 'CRITICAL' | 'WARN'; time: number; type: string; message: string };
-
-type HealthJobReturn =
-  | { tornStatus: HealthStatusInfo; mainStatus: HealthStatusInfo }
-  | { isUpToDate: boolean; lastVersion: string }
-  | { error: string };
-type HealthJobData = null;
-type HealthJobType = 'checkHealth' | 'checkUpdate';
-export type HealthProcessor = Processor<HealthJobData, HealthJobReturn, HealthJobType>;
-export type RelayerJobData = WithdrawalData & {
-  id: string;
-  status: JobStatus;
-  type: RelayerJobType;
-  txHash?: string;
-  confirmations?: number;
-};
-export type RelayerJobReturn = TransactionReceipt;
-
-export type RelayerProcessor = Processor<RelayerJobData, RelayerJobReturn, RelayerJobType>;
-export type PriceProcessor = Processor<PriceJobData, PriceJobReturn, 'updatePrice'>;
-
-@autoInjectable()
-export class PriceQueueHelper {
-  _queue: Queue<PriceJobData, PriceJobReturn, 'updatePrice'>;
-  _worker: Worker<PriceJobData, PriceJobReturn, 'updatePrice'>;
-  _scheduler: QueueScheduler;
-  interval = 30000;
-
-  constructor(private store?: RedisStore) {}
-
-  get queue() {
-    if (!this._queue) {
-      this._queue = new Queue<Token[], PriceJobReturn, 'updatePrice'>('price', {
-        connection: this.store.client,
-        defaultJobOptions: {
-          removeOnFail: 10,
-          removeOnComplete: 10,
-        },
-      });
-    }
-    return this._queue;
-  }
-
-  get worker() {
-    if (!this._worker) {
-      this._worker = new Worker<PriceJobData, PriceJobReturn, 'updatePrice'>('price', priceProcessor, {
-        connection: this.store.client,
-        concurrency: 1,
-      });
-    }
-    return this._worker;
-  }
-
-  get scheduler() {
-    if (!this._scheduler) {
-      this._scheduler = new QueueScheduler('price', {
-        connection: this.store.client,
-      });
-    }
-    return this._scheduler;
-  }
-
-  async addRepeatable(tokens: PriceJobData) {
-    await this.queue.add('updatePrice', tokens, {
-      repeat: {
-        every: this.interval,
-        immediately: true,
-      },
-    });
-  }
-}
-
-@autoInjectable()
-export class RelayerQueueHelper {
-  private _queue: Queue<RelayerJobData, RelayerJobReturn, RelayerJobType>;
-  private _worker: Worker<RelayerJobData, RelayerJobReturn, RelayerJobType>;
-  private _scheduler: QueueScheduler;
-
-  constructor(private store?: RedisStore, private config?: ConfigService) {}
-
-  get queue() {
-    if (!this._queue) {
-      this._queue = new Queue<RelayerJobData, RelayerJobReturn, RelayerJobType>(this.config.queueName, {
-        connection: this.store.client,
-        defaultJobOptions: {
-          stackTraceLimit: 100,
-          attempts: txJobAttempts,
-          backoff: 1000,
-        },
-      });
-    }
-    return this._queue;
-  }
-
-  get worker() {
-    if (!this._worker) {
-      this._worker = new Worker<RelayerJobData, RelayerJobReturn, RelayerJobType>(this.config.queueName, relayerProcessor, {
-        connection: this.store.client,
-        concurrency: 1,
-      });
-    }
-    return this._worker;
-  }
-
-  get scheduler() {
-    if (!this._scheduler) {
-      this._scheduler = new QueueScheduler(this.config.queueName, {
-        connection: this.store.client,
-      });
-    }
-    return this._scheduler;
-  }
-}
-
-@autoInjectable()
-export class HealthQueueHelper {
-  private _queue: Queue<HealthJobData, HealthJobReturn, HealthJobType>;
-  private _worker: Worker<HealthJobData, HealthJobReturn, HealthJobType>;
-  private _scheduler: QueueScheduler;
-  interval = 30000;
-
-  constructor(private store?: RedisStore) {}
-
-  get scheduler(): QueueScheduler {
-    if (!this._scheduler) {
-      this._scheduler = new QueueScheduler('health', {
-        connection: this.store.client,
-      });
-    }
-    return this._scheduler;
-  }
-
-  get worker() {
-    if (!this._worker) {
-      this._worker = new Worker<HealthJobData, HealthJobReturn, HealthJobType>('health', healthProcessor, {
-        connection: this.store.client,
-        concurrency: 1,
-      });
-    }
-    return this._worker;
-  }
-
-  get queue() {
-    if (!this._queue) {
-      this._queue = new Queue<HealthJobData, HealthJobReturn, HealthJobType>('health', {
-        connection: this.store.client,
-        defaultJobOptions: { stackTraceLimit: 100 },
-      });
-    }
-    return this._queue;
-  }
-
-  async addRepeatable() {
-    await this.queue.add('checkHealth', null, {
-      repeat: {
-        every: this.interval,
-        immediately: true,
-      },
-    });
-    await this.queue.add('checkUpdate', null, {
-      repeat: {
-        every: this.interval * 2 * 60, // once per hour
-        immediately: true,
-      },
-    });
-  }
-}

src/queue/price.processor.ts

@@ -1,9 +0,0 @@
-import { getPriceService } from '../services';
-import { PriceProcessor } from './index';
-
-export const priceProcessor: PriceProcessor = async (job) => {
-  const priceService = getPriceService();
-  const result = await priceService.fetchPrices(job.data);
-  if (result) return await priceService.savePrices(result);
-  return null;
-};

src/queue/relayer.processor.ts

@@ -1,37 +0,0 @@
-import { RelayerProcessor } from './index';
-import { getTxService } from '../services';
-import { JobStatus } from '../types';
-import { UnrecoverableError } from 'bullmq';
-import { ExecutionError } from '../services/tx.service';
-import { txJobAttempts } from '../config';
-
-class RevertError extends UnrecoverableError {
-  code: string;
-
-  constructor(message: string, code: string) {
-    super(message);
-    this.name = this.constructor.name;
-    this.code = code;
-    Object.setPrototypeOf(this, new.target.prototype);
-  }
-}
-
-export const relayerProcessor: RelayerProcessor = async (job) => {
-  try {
-    await job.update({ ...job.data, status: JobStatus.ACCEPTED });
-    console.log(`Start processing a new ${job.data.type} job ${job.id}`);
-    const txService = getTxService();
-    txService.currentJob = job;
-    const withdrawalData = job.data;
-    const txData = await txService.prepareTxData(withdrawalData);
-    await txService.checkTornadoFee(withdrawalData, txData);
-    return await txService.sendTx(txData);
-  } catch (e) {
-    if ((e instanceof ExecutionError && e.code === 'REVERTED') || job.attemptsMade === txJobAttempts) {
-      await job.update({ ...job.data, status: JobStatus.FAILED });
-      throw new RevertError(e.message, e.code);
-    }
-    await job.update({ ...job.data, status: JobStatus.RESUBMITTED });
-    throw e;
-  }
-};

src/queue/worker.ts

@@ -1,49 +0,0 @@
-import 'reflect-metadata';
-import { HealthQueueHelper, PriceQueueHelper, RelayerQueueHelper } from './';
-import { configService, getHealthService } from '../services';
-
-export const priceWorker = async () => {
-  await configService.init();
-  if (configService.isLightMode) return;
-  const healthService = getHealthService();
-
-  const price = new PriceQueueHelper();
-  console.log(price.queue.name, 'worker started');
-
-  price.scheduler.on('stalled', (jobId, prev) => console.log({ jobId, prev }));
-  price.worker.on('active', () => console.log('worker active'));
-  price.worker.on('completed', async (job, result) => {
-    console.log(`Job ${job.name} completed with result: `, result);
-  });
-  price.worker.on('failed', (job, error) => healthService.saveError(error));
-};
-
-export const relayerWorker = async () => {
-  await configService.init();
-  const relayer = new RelayerQueueHelper();
-  const healthService = getHealthService();
-  console.log(relayer.queue.name, 'worker started');
-
-  relayer.worker.on('completed', (job, result) => {
-    console.log(`Job ${job.id} completed with result: `, result);
-  });
-  relayer.worker.on('failed', (job, error) => {
-    healthService.saveError(error, job.id);
-    console.log(`Failed job ${job.id}: `, error);
-  });
-  relayer.scheduler.on('stalled', (jobId, prev) => console.log({ jobId, prev }));
-};
-
-export const healthWorker = async () => {
-  await configService.init();
-  const health = new HealthQueueHelper();
-  console.log(health.queue.name, 'worker started');
-
-  health.scheduler.on('stalled', (jobId, prev) => console.log({ jobId, prev }));
-  health.worker.on('completed', (job, result) => {
-    console.log(`Job ${job.name} completed with result: `, result);
-  });
-  health.worker.on('failed', (job, error) => {
-    console.log(`Failed job ${job.id}: `, error);
-  });
-};

src/services/config.service.ts

@@ -1,192 +0,0 @@
-import {
-  host,
-  instances,
-  mainnetRpcUrl,
-  minimumBalance,
-  minimumTornBalance,
-  netId,
-  networkConfig,
-  privateKey,
-  relayerVersion,
-  rpcUrl,
-  torn,
-  tornadoGoerliProxy,
-  tornToken,
-} from '../config';
-import { ChainIds, Token } from '../types';
-import {
-  getProvider,
-  getRelayerRegistryContract,
-  getTornadoProxyContract,
-  getTornadoProxyLightContract,
-  getTornTokenContract,
-} from '../modules/contracts';
-import { resolve } from '../modules';
-import { ERC20Abi, ProxyLightAbi, RelayerRegistryAbi, TornadoProxyAbi } from '../contracts';
-import { availableIds, netIds, NetInstances } from 'torn-token';
-import { getAddress } from 'ethers/lib/utils';
-import { BigNumber, providers, Wallet } from 'ethers';
-import { container, singleton } from 'tsyringe';
-import { FallbackGasPrices } from '@tornado/gas-price-oracle';
-import { RedisStore } from '../modules/redis';
-
-type relayerQueueName = `relayer_${availableIds}`;
-
-@singleton()
-export class ConfigService {
-  netIdKey: netIds;
-  queueName: relayerQueueName;
-  tokens: Token[];
-  private _proxyAddress: string;
-  private _proxyContract: TornadoProxyAbi | ProxyLightAbi;
-  addressMap = new Map<string, InstanceProps>();
-  isLightMode: boolean;
-  instances: NetInstances;
-  provider: providers.JsonRpcProvider;
-  mainnentProvider: providers.JsonRpcProvider;
-  wallet: Wallet;
-  public readonly netId: availableIds = netId;
-  public readonly privateKey = privateKey;
-  public readonly rpcUrl = rpcUrl;
-  isInit: boolean;
-  nativeCurrency: string;
-  fallbackGasPrices: FallbackGasPrices;
-  private _tokenAddress: string;
-  private _tokenContract: ERC20Abi;
-  private _relayerRegistryAddress: string;
-  private _relayerRegistryContract: RelayerRegistryAbi;
-  balances: {
-    MAIN: { warn: string; critical: string };
-    TORN: { warn: string; critical: string };
-  };
-  host: string;
-  version: string;
-
-  constructor(private store: RedisStore) {
-    this.netIdKey = `netId${this.netId}`;
-    this.queueName = `relayer_${this.netId}`;
-    this.version = relayerVersion;
-    this.isLightMode = ![ChainIds.ethereum, ChainIds.goerli].includes(netId);
-    this.host = host;
-    this.instances = instances[this.netIdKey];
-    this.provider = getProvider(false);
-    this.mainnentProvider = getProvider(false, mainnetRpcUrl, 1);
-    this.wallet = new Wallet(this.privateKey, this.provider);
-    this.balances = {
-      MAIN: {
-        warn: BigNumber.from(minimumBalance).mul(150).div(100).toString(),
-        critical: minimumBalance,
-      },
-      TORN: {
-        warn: BigNumber.from(minimumTornBalance).mul(2).toString(),
-        critical: minimumTornBalance,
-      },
-    };
-    this._fillInstanceMap();
-  }
-
-  get proxyContract(): TornadoProxyAbi | ProxyLightAbi {
-    return this._proxyContract;
-  }
-
-  get tokenContract(): ERC20Abi {
-    return this._tokenContract;
-  }
-
-  get relayerRegistryContract(): RelayerRegistryAbi {
-    return this._relayerRegistryContract;
-  }
-
-  private _fillInstanceMap() {
-    if (!this.instances) throw new Error('config mismatch, check your environment variables');
-    for (const [currency, { instanceAddress, symbol, decimals }] of Object.entries(this.instances)) {
-      for (const [amount, address] of Object.entries(instanceAddress)) {
-        if (address)
-          this.addressMap.set(getAddress(address), {
-            currency,
-            amount,
-            symbol,
-            decimals,
-          });
-      }
-    }
-  }
-
-  async checkNetwork() {
-    console.log('Checking network...');
-    await this.provider.getNetwork();
-    if (this.isLightMode) {
-      await this.mainnentProvider.getNetwork();
-    }
-  }
-
-  async init() {
-    try {
-      if (this.isInit) return;
-      await this.checkNetwork();
-      console.log('Initializing...');
-
-      this._tokenAddress = await resolve(torn.torn.address);
-      this._tokenContract = getTornTokenContract(this._tokenAddress);
-
-      this._relayerRegistryAddress = await resolve(torn.relayerRegistry.address);
-      this._relayerRegistryContract = getRelayerRegistryContract(this._relayerRegistryAddress);
-
-      if (this.isLightMode) {
-        this._proxyAddress = torn.tornadoProxyLight.address;
-        this._proxyContract = getTornadoProxyLightContract(this._proxyAddress);
-        const { gasPrices, nativeCurrency } = networkConfig[this.netIdKey];
-        this.nativeCurrency = nativeCurrency;
-        this.fallbackGasPrices = gasPrices;
-      } else {
-        this._proxyAddress = tornadoGoerliProxy;
-        this.nativeCurrency = 'eth';
-        if (this.netId === ChainIds.ethereum) {
-          this._proxyAddress = await resolve(torn.tornadoRouter.address);
-        }
-        this._proxyContract = getTornadoProxyContract(this._proxyAddress);
-        this.tokens = [tornToken, ...Object.values(torn.instances['netId1'])]
-          .map<Token>(
-            (el) =>
-              el.tokenAddress && {
-                address: getAddress(el.tokenAddress),
-                decimals: el.decimals,
-                symbol: el.symbol,
-              },
-          )
-          .filter(Boolean);
-      }
-      console.log(
-        'Configuration completed\n',
-        `-- netId: ${this.netId}\n`,
-        `-- rpcUrl: ${this.rpcUrl}\n`,
-        `-- relayer Address: ${this.wallet.address}\n`,
-      );
-      this.isInit = true;
-    } catch (e) {
-      console.error(`${this.constructor.name} Error:`, e.message);
-      process.exit(1);
-    }
-  }
-
-  async clearRedisState() {
-    const queueKeys = (await this.store.client.keys('bull:*')).filter((s) => s.indexOf('relayer') === -1);
-    const errorKeys = await this.store.client.keys('errors:*');
-    const alertKeys = await this.store.client.keys('alerts:*');
-    const keys = [...queueKeys, ...errorKeys, ...alertKeys];
-    if (keys.length) await this.store.client.del(keys);
-  }
-
-  getInstance(address: string) {
-    return this.addressMap.get(getAddress(address));
-  }
-}
-
-type InstanceProps = {
-  currency: string;
-  amount: string;
-  symbol: string;
-  decimals: number;
-};
-
-export default container.resolve(ConfigService);

src/services/health.service.ts

@@ -1,164 +0,0 @@
-import { autoInjectable, container } from 'tsyringe';
-import compareVersions from 'compare-versions';
-import fetch from 'node-fetch';
-import { ConfigService } from './config.service';
-import { RedisStore } from '../modules/redis';
-import { formatEther } from 'ethers/lib/utils';
-import { Levels } from './notifier.service';
-
-class RelayerError extends Error {
-  constructor(message: string, code: string) {
-    super(message);
-    this.code = code;
-  }
-
-  code: string;
-}
-
-@autoInjectable()
-export class HealthService {
-  constructor(private config: ConfigService, private store: RedisStore) {}
-
-  async clearErrorCodes() {
-    await this.store.client.del('errors:code');
-  }
-
-  private async _getErrors(): Promise<{
-    errorsLog: { message: string; score: number }[];
-    errorsCode: Record<string, number>;
-  }> {
-    const logSet = await this.store.client.zrevrange('errors:log', 0, -1, 'WITHSCORES');
-    const codeSet = await this.store.client.zrevrange('errors:code', 0, -1, 'WITHSCORES');
-
-    return {
-      errorsLog: HealthService._parseSet(logSet),
-      errorsCode: HealthService._parseSet(codeSet, 'object'),
-    };
-  }
-
-  private async _getStatus() {
-    const status = await this.store.client.hgetall('health:status');
-    if (Object.keys(status).length === 0) {
-      return { health: 'false', error: 'Service is not running' };
-    }
-    return status;
-  }
-
-  private static _parseSet(log, to = 'array', keys = ['message', 'score']) {
-    let out;
-    if (to === 'array') {
-      out = [];
-      while (log.length) {
-        const [a, b] = log.splice(0, 2);
-        out.push({ [keys[0]]: a, [keys[1]]: b });
-      }
-    } else {
-      out = {};
-      while (log.length) {
-        const [a, b] = log.splice(0, 2);
-        out[a] = Number(b);
-      }
-    }
-
-    return out;
-  }
-
-  async setStatus(status: { status: boolean; error: string }) {
-    await this.store.client.hset('health:status', status);
-  }
-
-  async getStatus() {
-    const { errorsLog, errorsCode } = await this._getErrors();
-    if (errorsCode['NETWORK_ERROR'] > 10) {
-      await this.setStatus({ status: false, error: 'Network error' });
-    }
-    const heathStatus = await this._getStatus();
-
-    return {
-      ...heathStatus,
-      errorsLog,
-      errorsCode,
-    };
-  }
-
-  async saveError(e, jobId?: string) {
-    await this.store.client.zadd('errors:code', 'INCR', 1, e.code || 'RUNTIME_ERROR');
-    await this.store.client.zadd('errors:log', 'INCR', 1, e.message);
-
-    if (e.code === 'REVERTED' || e.code === 'SEND_ERROR') {
-      const jobUrl = `${this.config.host}/v1/jobs/${jobId}`;
-      await this.pushAlert({
-        message: `${e.message} \n ${jobUrl}`,
-        type: 'REVERTED',
-        level: 'WARN',
-        time: new Date().getTime(),
-      });
-    }
-  }
-
-  async pushAlert(alert: Alert) {
-    const channel = `${this.config.netId}/user-notify`;
-    await this.store.publisher.publish(channel, JSON.stringify(alert));
-  }
-
-  private async _checkBalance(value, currency: 'MAIN' | 'TORN') {
-    let level: Levels = 'OK';
-    const type = 'BALANCE';
-    const time = new Date().getTime();
-    if (value.lt(this.config.balances[currency].critical)) {
-      level = 'CRITICAL';
-    } else if (value.lt(this.config.balances[currency].warn)) {
-      level = 'WARN';
-    }
-    const msg = { WARN: 'Please refill your balance', CRITICAL: 'Insufficient balance', OK: 'ok' };
-    const alert = {
-      type: `${type}_${currency}_${level}`,
-      message: `${msg[level]} ${formatEther(value)} ${currency === 'MAIN' ? this.config.nativeCurrency : 'torn'}`,
-      level,
-      time,
-    };
-    await this.pushAlert(alert);
-
-    return alert;
-  }
-
-  async checkUpdate() {
-    console.log('Checking version...');
-    const lastVersion =
-      (await fetch('https://api.github.com/repos/tornadocash/tornado-relayer/releases').then((res) => res.json()))[0]?.tag_name ||
-      this.config.version;
-    const isUpToDate = compareVersions(this.config.version, lastVersion) >= 0;
-    if (!isUpToDate) {
-      await this.pushAlert({
-        type: 'VERSION_UPDATE_WARN',
-        message: `New version available: ${lastVersion}`,
-        level: 'WARN',
-        time: new Date().getTime(),
-      });
-    }
-    return { isUpToDate, lastVersion };
-  }
-
-  async check() {
-    await this.config.checkNetwork();
-    const mainBalance = await this.config.wallet.getBalance();
-    const tornBalance = await this.config.relayerRegistryContract.getRelayerBalance(this.config.wallet.address);
-    const mainStatus = await this._checkBalance(mainBalance, 'MAIN');
-    const tornStatus = await this._checkBalance(tornBalance, 'TORN');
-    if (mainStatus.level === 'CRITICAL') {
-      throw new RelayerError(mainStatus.message, 'INSUFFICIENT_MAIN_BALANCE');
-    }
-    if (tornStatus.level === 'CRITICAL') {
-      throw new RelayerError(tornStatus.message, 'INSUFFICIENT_TORN_BALANCE');
-    }
-    return { mainStatus, tornStatus };
-  }
-}
-
-type Alert = {
-  type: string;
-  message: string;
-  level: Levels;
-  time?: number;
-};
-export default () => container.resolve(HealthService);

src/services/index.ts

@@ -1,6 +0,0 @@
-export { default as configService } from './config.service';
-export { default as getPriceService } from './price.service';
-export { default as getJobService } from './job.service';
-export { default as getTxService } from './tx.service';
-export { default as getNotifierService } from './notifier.service';
-export { default as getHealthService } from './health.service';

src/services/job.service.ts

@@ -1,49 +0,0 @@
-import { v4 } from 'uuid';
-import { JobStatus, RelayerJobType } from '../types';
-import { HealthQueueHelper, PriceQueueHelper, RelayerQueueHelper } from '../queue';
-import { WithdrawalData } from './tx.service';
-import { container, injectable } from 'tsyringe';
-import { ConfigService } from './config.service';
-
-@injectable()
-export class JobService {
-  constructor(
-    private price?: PriceQueueHelper,
-    private relayer?: RelayerQueueHelper,
-    private health?: HealthQueueHelper,
-    public config?: ConfigService,
-  ) {}
-
-  async postJob(type: RelayerJobType, data: WithdrawalData) {
-    const id = v4();
-
-    const job = await this.relayer.queue.add(
-      type,
-      {
-        id,
-        type,
-        status: JobStatus.QUEUED,
-        ...data,
-      },
-      { jobId: id },
-    );
-    return job.id;
-  }
-
-  async getJob(jobId: string) {
-    return await this.relayer.queue.getJob(jobId);
-  }
-
-  async getQueueCount() {
-    return await this.relayer.queue.getJobCountByTypes('active', 'waiting', 'delayed');
-  }
-
-  async setupRepeatableJobs() {
-    if (!this.config.isLightMode) {
-      await this.price.addRepeatable(this.config.tokens);
-    }
-    await this.health.addRepeatable();
-  }
-}
-
-export default () => container.resolve(JobService);

src/services/notifier.service.ts

@@ -1,88 +0,0 @@
-import { Telegram } from 'telegraf';
-import { autoInjectable, container } from 'tsyringe';
-import { RedisStore } from '../modules/redis';
-import { ExtraReplyMessage } from 'telegraf/typings/telegram-types';
-import { netId } from '../config';
-import { ConfigService } from './config.service';
-
-export type Levels = keyof typeof AlertLevel;
-
-export enum AlertLevel {
-  'INFO' = 'ℹ️️',
-  'WARN' = '⚠️',
-  'CRITICAL' = '‼️',
-  'ERROR' = '💩',
-  'OK' = '✅',
-}
-
-export enum AlertType {
-  'INSUFFICIENT_BALANCE',
-  'INSUFFICIENT_TORN_BALANCE',
-  'RPC',
-}
-
-class MockTelegram {
-  async sendMessage(chatId, text: string, extra?: ExtraReplyMessage) {
-    console.log(text, extra);
-  }
-
-  async getMe() {
-    return {
-      id: 1,
-      first_name: 'test',
-      is_bot: true,
-    };
-  }
-}
-
-@autoInjectable()
-export class NotifierService {
-  private telegram: Telegram | MockTelegram;
-  private readonly token: string;
-  private readonly chatId: string;
-  host: string;
-
-  constructor(private store: RedisStore, private config: ConfigService) {
-    this.token = process.env.TELEGRAM_NOTIFIER_BOT_TOKEN;
-    this.chatId = process.env.TELEGRAM_NOTIFIER_CHAT_ID;
-    this.telegram = this.token ? new Telegram(this.token) : new MockTelegram();
-    this.host = this.config.host;
-  }
-
-  async processAlert(message: string) {
-    const alert = JSON.parse(message);
-    const [a, b, c] = alert.type.split('_');
-    const isSent = await this.store.client.sismember('alerts:sent', `${a}_${b}_${c}`);
-    if (!isSent) {
-      if (alert.level === 'OK') {
-        this.store.client.srem('alerts:sent', ...['WARN', 'CRITICAL'].map((c) => `${a}_${b}_${c}`));
-      } else {
-        await this.send(alert.message, alert.level);
-        this.store.client.sadd('alerts:sent', alert.type);
-      }
-    }
-  }
-
-  async subscribe() {
-    const channel = `${netId}/user-notify`;
-    this.store.subscriber.subscribe(channel);
-    this.store.subscriber.on('message', async (channel, message) => {
-      await this.processAlert(<string>message);
-    });
-  }
-
-  send(message: string, level: Levels) {
-    const text = `${AlertLevel[level]} ${this.host}: ${message}`;
-    return this.telegram.sendMessage(this.chatId, text, { parse_mode: 'HTML' });
-  }
-
-  sendError(e: Error) {
-    return this.telegram.sendMessage(this.chatId, `Error: ${e}`);
-  }
-
-  check() {
-    return this.telegram.getMe();
-  }
-}
-
-export default () => container.resolve(NotifierService);

src/services/price.service.ts

@@ -1,66 +0,0 @@
-import { getMultiCallContract, getOffchainOracleContract } from '../modules/contracts';
-import { MulticallAbi, OffchainOracleAbi } from '../contracts';
-import { MultiCall } from '../contracts/MulticallAbi';
-import { BigNumber } from 'ethers';
-import { defaultAbiCoder } from 'ethers/lib/utils';
-import { Token } from '../types';
-import { container, injectable } from 'tsyringe';
-import { RedisStore } from '../modules/redis';
-
-@injectable()
-export class PriceService {
-  private oracle: OffchainOracleAbi;
-  private multiCall: MulticallAbi;
-
-  constructor(private store: RedisStore) {
-    this.oracle = getOffchainOracleContract();
-    this.multiCall = getMultiCallContract();
-  }
-
-  prepareCallData(tokens: Token[]): MultiCall.CallStruct[] {
-    return tokens.map((token) => ({
-      to: this.oracle.address,
-      data: this.oracle.interface.encodeFunctionData('getRateToEth', [token.address, true]),
-    }));
-  }
-
-  async fetchPrices(tokens: Token[]) {
-    try {
-      if (!tokens?.length) return;
-      const names = tokens.reduce((p, c) => {
-        p[c.address] = c.symbol.toLowerCase();
-        return p;
-      }, {});
-      const callData = this.prepareCallData(tokens);
-      const { results, success } = await this.multiCall.multicall(callData);
-      const prices: Record<string, string> = {};
-      for (let i = 0; i < results.length; i++) {
-        if (!success[i]) {
-          continue;
-        }
-        const decodedRate = defaultAbiCoder.decode(['uint256'], results[i]).toString();
-        const numerator = BigNumber.from(10).pow(tokens[i].decimals);
-        const denominator = BigNumber.from(10).pow(18); // eth decimals
-        const price = BigNumber.from(decodedRate).mul(numerator).div(denominator);
-        prices[names[tokens[i].address]] = price.toString();
-      }
-      return prices;
-    } catch (e) {
-      console.log(e);
-    }
-  }
-
-  async getPrice(currency: string) {
-    return this.store.client.hget('prices', currency);
-  }
-
-  async getPrices() {
-    return this.store.client.hgetall('prices');
-  }
-
-  async savePrices(prices: Record<string, string>) {
-    return this.store.client.hset('prices', prices);
-  }
-}
-
-export default () => container.resolve(PriceService);

src/services/tx.service.ts

@@ -1,236 +0,0 @@
-import { TransactionData, TxManager } from 'tx-manager';
-import { GasPriceOracle } from '@tornado/gas-price-oracle';
-import { Provider } from '@ethersproject/providers';
-import { serialize } from '@ethersproject/transactions';
-import { formatEther, parseUnits } from 'ethers/lib/utils';
-import { BigNumber, BigNumberish, BytesLike } from 'ethers';
-import { ProxyLightAbi, TornadoProxyAbi } from '../contracts';
-import { GAS_BUMP_PERCENTAGE, CONFIRMATIONS, gasLimits, MAX_GAS_PRICE, netId, tornadoServiceFee } from '../config';
-import { ChainIds, JobStatus, RelayerJobType } from '../types';
-import { PriceService } from './price.service';
-import { Job } from 'bullmq';
-import { RelayerJobData } from '../queue';
-import { ConfigService } from './config.service';
-import { container, injectable } from 'tsyringe';
-import { parseJSON, bump } from '../modules/utils';
-import { getOvmGasPriceOracle } from '../modules/contracts';
-
-export type WithdrawalData = {
-  contract: string;
-  proof: BytesLike;
-  args: [BytesLike, BytesLike, string, string, BigNumberish, BigNumberish];
-};
-
-export class ExecutionError extends Error {
-  constructor(message: string, code?: string) {
-    super(message);
-    this.code = code;
-  }
-
-  code: string;
-}
-
-@injectable()
-export class TxService {
-  set currentJob(value: Job) {
-    this._currentJob = value;
-  }
-
-  gasLimit: number;
-  txManager: TxManager;
-  tornadoProxy: TornadoProxyAbi | ProxyLightAbi;
-  oracle: GasPriceOracle;
-  provider: Provider;
-  private _currentJob: Job;
-
-  constructor(private config: ConfigService, private priceService: PriceService) {
-    const { privateKey, rpcUrl, netId } = this.config;
-    this.tornadoProxy = this.config.proxyContract;
-    this.provider = this.tornadoProxy.provider;
-    const gasPriceOracleConfig = {
-      defaultRpc: rpcUrl,
-      chainId: netId,
-      minPriority: netId === ChainIds.ethereum || ChainIds.goerli ? 2 : 0.05,
-      percentile: 5,
-      blocksCount: 20,
-      fallbackGasPrices: this.config?.fallbackGasPrices,
-    };
-    this.txManager = new TxManager({
-      privateKey,
-      rpcUrl,
-      config: { THROW_ON_REVERT: true, CONFIRMATIONS, MAX_GAS_PRICE, GAS_BUMP_PERCENTAGE },
-      gasPriceOracleConfig,
-      provider: this.provider,
-    });
-    this.oracle = new GasPriceOracle(gasPriceOracleConfig);
-
-    switch (netId) {
-      case ChainIds.ethereum:
-      case ChainIds.goerli:
-        this.gasLimit = gasLimits[RelayerJobType.WITHDRAW_WITH_EXTRA];
-        break;
-      case ChainIds.optimism:
-        this.gasLimit = gasLimits[RelayerJobType.OP_TORNADO_WITHDRAW];
-        break;
-      case ChainIds.arbitrum:
-        this.gasLimit = gasLimits[RelayerJobType.ARB_TORNADO_WITHDRAW];
-        break;
-      default:
-        this.gasLimit = gasLimits[RelayerJobType.TORNADO_WITHDRAW];
-    }
-  }
-
-  async updateJobData(data: Partial<RelayerJobData>) {
-    const updatedData = { ...this._currentJob.data, ...data };
-    console.log({ updatedData });
-    await this._currentJob.update(updatedData);
-  }
-
-  async sendTx(tx: TransactionData) {
-    try {
-      const currentTx = this.txManager.createTx(tx);
-
-      const receipt = await currentTx
-        .send()
-        .on('transactionHash', async (txHash) => {
-          console.log('Transaction sent, txHash: ', txHash);
-          await this.updateJobData({ txHash, status: JobStatus.SENT });
-        })
-        .on('mined', async (receipt) => {
-          console.log('Transaction mined in block', receipt.blockNumber);
-          await this.updateJobData({ status: JobStatus.MINED });
-        })
-        .on('confirmations', async (confirmations) => {
-          console.log('Transaction confirmations: ', confirmations);
-          await this.updateJobData({ confirmations });
-        });
-      if (receipt.status === 1) {
-        await this.updateJobData({ status: JobStatus.CONFIRMED });
-      } else {
-        throw new ExecutionError('Submitted transaction failed', 'REVERTED');
-      }
-      return receipt;
-    } catch (e) {
-      const regex = /body=("\{.*}}")/;
-      if (regex.test(e.message)) {
-        const { error } = parseJSON(regex.exec(e.message)[1]);
-        throw new ExecutionError(error.message, 'REVERTED');
-      } else throw new ExecutionError(e.message, 'SEND_ERROR');
-    }
-  }
-
-  async getGasPrice(): Promise<BigNumber> {
-    let bumpPercent: number;
-    switch (netId) {
-      case ChainIds.goerli:
-        bumpPercent = 50;
-        break;
-      case ChainIds.polygon:
-      case ChainIds.avalanche:
-      case ChainIds.xdai:
-        bumpPercent = 30;
-        break;
-      default:
-        bumpPercent = 10;
-    }
-
-    try {
-      const gasParams = await this.oracle.getTxGasParams({
-        legacySpeed: 'fast',
-        bumpPercent,
-      });
-
-      console.log(BigNumber.from(gasParams['maxFeePerGas']).toString());
-
-      return BigNumber.from(gasParams['maxFeePerGas'] || gasParams['gasPrice']);
-    } catch (e) {
-      const feeData = await this.provider.getFeeData();
-      return bump(feeData.maxFeePerGas, bumpPercent);
-    }
-  }
-
-  async estimateGasLimit(txData: TransactionData): Promise<BigNumber> {
-    try {
-      const fetchedGasLimit = await this.provider.estimateGas(txData);
-      const bumped = bump(fetchedGasLimit, 10);
-      console.log('Gas limit: ', bumped.toString());
-      return bumped;
-    } catch (e) {
-      console.log('Estimation error: ', e);
-      return BigNumber.from(this.gasLimit);
-    }
-  }
-
-  async prepareTxData(data: WithdrawalData): Promise<TransactionData> {
-    const { contract, proof, args } = data;
-    const calldata = this.tornadoProxy.interface.encodeFunctionData('withdraw', [contract, proof, ...args]);
-
-    const gasPrice = await this.getGasPrice();
-    const incompleteTxData: TransactionData = {
-      value: args[5],
-      to: this.tornadoProxy.address,
-      from: this.txManager.address, // Required to estimate relayerRegistry.burn for Ethereum Mainnet withdrawals
-      data: calldata,
-      gasLimit: this.gasLimit,
-      gasPrice: gasPrice,
-    };
-    const gasLimit = await this.estimateGasLimit(incompleteTxData);
-
-    return Object.assign(incompleteTxData, { gasLimit });
-  }
-
-  async getL1Fee(data: WithdrawalData, gasPrice: BigNumber) {
-    const { contract, proof, args } = data;
-    const ovmOracle = getOvmGasPriceOracle();
-    const calldata = this.tornadoProxy.interface.encodeFunctionData('withdraw', [contract, proof, ...args]);
-    const nonce = await this.config.wallet.getTransactionCount();
-    const tx = serialize({
-      nonce,
-      type: 0,
-      data: calldata,
-      chainId: netId,
-      value: data.args[5],
-      to: this.tornadoProxy.address,
-      gasLimit: this.gasLimit,
-      gasPrice: BigNumber.from(gasPrice),
-    });
-    return await ovmOracle.getL1Fee(tx);
-  }
-
-  async checkTornadoFee(data: WithdrawalData, txData: TransactionData) {
-    const { contract, args } = data;
-    const instance = this.config.getInstance(contract);
-    if (!instance) throw new Error('Instance not found');
-    const { currency, amount, decimals } = instance;
-    const [fee, refund] = [args[4], args[5]].map(BigNumber.from);
-    const gasPrice = BigNumber.from(txData.gasPrice);
-    let operationCost = gasPrice.mul(txData.gasLimit);
-
-    if (netId === ChainIds.optimism) {
-      const l1Fee = await this.getL1Fee(data, gasPrice);
-      operationCost = operationCost.add(l1Fee);
-    }
-
-    const serviceFee = parseUnits(amount, decimals)
-      .mul(`${tornadoServiceFee * 1e10}`)
-      .div(`${100 * 1e10}`);
-
-    let desiredFee = operationCost.add(serviceFee);
-
-    if (!this.config.isLightMode && currency !== 'eth') {
-      const ethPrice = await this.priceService.getPrice(currency);
-      const numerator = BigNumber.from(10).pow(decimals);
-      desiredFee = operationCost.add(refund).mul(numerator).div(ethPrice).add(serviceFee);
-    }
-    console.log({
-      sentFee: formatEther(fee),
-      desiredFee: formatEther(desiredFee),
-      serviceFee: formatEther(serviceFee),
-    });
-    if (fee.lt(desiredFee)) {
-      throw new Error('Provided fee is not enough. Probably it is a Gas Price spike, try to resubmit.');
-    }
-  }
-}
-
-export default () => container.resolve(TxService);

src/txWorker.ts

@@ -1,3 +0,0 @@
-import { relayerWorker } from './queue/worker';
-
-relayerWorker();

src/types.ts

@@ -1,80 +0,0 @@
-export enum RelayerJobType {
-  TORNADO_WITHDRAW = 'TORNADO_WITHDRAW',
-  WITHDRAW_WITH_EXTRA = 'WITHDRAW_WITH_EXTRA',
-  OP_TORNADO_WITHDRAW = 'OP_TORNADO_WITHDRAW',
-  ARB_TORNADO_WITHDRAW = 'ARB_TORNADO_WITHDRAW',
-}
-
-export enum JobStatus {
-  QUEUED = 'QUEUED',
-  ACCEPTED = 'ACCEPTED',
-  SENT = 'SENT',
-  MINED = 'MINED',
-  RESUBMITTED = 'RESUBMITTED',
-  CONFIRMED = 'CONFIRMED',
-  FAILED = 'FAILED',
-}
-
-export type Token = { address: string; decimals: number; symbol?: string };
-
-export enum ChainIds {
-  'kardia' = 0,
-  'ethereum' = 1,
-  'goerli' = 5,
-  'ubiq' = 8,
-  'optimism' = 10,
-  'songbird' = 19,
-  'elastos' = 20,
-  'cronos' = 25,
-  'rsk' = 30,
-  'telos' = 40,
-  'csc' = 52,
-  'zyx' = 55,
-  'binance' = 56,
-  'syscoin' = 57,
-  'gochain' = 60,
-  'ethclassic' = 61,
-  'okexchain' = 66,
-  'hoo' = 70,
-  'meter' = 82,
-  'tomochain' = 88,
-  'xdai' = 100,
-  'velas' = 106,
-  'thundercore' = 108,
-  'fuse' = 122,
-  'heco' = 128,
-  'polygon' = 137,
-  'xdaiarb' = 200,
-  'energyweb' = 246,
-  'fantom' = 250,
-  'hpb' = 269,
-  'boba' = 288,
-  'kucoin' = 321,
-  'shiden' = 336,
-  'theta' = 361,
-  'candle' = 534,
-  'astar' = 592,
-  'callisto' = 820,
-  'wanchain' = 888,
-  'metis' = 1088,
-  'moonbeam' = 1284,
-  'moonriver' = 1285,
-  'ronin' = 2020,
-  'ezchain' = 2612,
-  'iotex' = 4689,
-  'xlc' = 5050,
-  'nahmii' = 5551,
-  'klaytn' = 8217,
-  'smartbch' = 10000,
-  'fusion' = 32659,
-  'arbitrum' = 42161,
-  'celo' = 42220,
-  'oasis' = 42262,
-  'avalanche' = 43114,
-  'godwoken' = 71394,
-  'polis' = 333999,
-  'aurora' = 1313161554,
-  'harmony' = 1666600000,
-  'palm' = 11297108109,
-  'curio' = 836542336838601,
-}

test/app.test.ts

@@ -1,48 +0,0 @@
-import 'reflect-metadata';
-import { test } from 'tap';
-import createServer from '../src/app/server';
-
-const withdrawData = {
-  proof:
-    '0x0f8cb4c2ca9cbb23a5f21475773e19e39d3470436d7296f25c8730d19d88fcef2986ec694ad094f4c5fff79a4e5043bd553df20b23108bc023ec3670718143c20cc49c6d9798e1ae831fd32a878b96ff8897728f9b7963f0d5a4b5574426ac6203b2456d360b8e825d8f5731970bf1fc1b95b9713e3b24203667ecdd5939c2e40dec48f9e51d9cc8dc2f7f3916f0e9e31519c7df2bea8c51a195eb0f57beea4924cb846deaa78cdcbe361a6c310638af6f6157317bc27d74746bfaa2e1f8d2e9088fd10fa62100740874cdffdd6feb15c95c5a303f6bc226d5e51619c5b825471a17ddfeb05b250c0802261f7d05cf29a39a72c13e200e5bc721b0e4c50d55e6',
-  args: [
-    '0x1579d41e5290ab5bcec9a7df16705e49b5c0b869095299196c19c5e14462c9e3',
-    '0x0cf7f49c5b35c48b9e1d43713e0b46a75977e3d10521e9ac1e4c3cd5e3da1c5d',
-    '0xbd4369dc854c5d5b79fe25492e3a3cfcb5d02da5',
-    '0x090D03d9f18e9336416A515EfC1E47dB68bC270E',
-    '0x000000000000000000000000000000000000000000000000058d15e176280000',
-    '0x0000000000000000000000000000000000000000000000000000000000000000',
-  ],
-  contract: '0x47CE0C6eD5B0Ce3d3A51fdb1C52DC66a7c3c2936',
-};
-(async () => {
-  await test('requests the "/v1/status" route', async (t) => {
-    const fastify = await createServer();
-    t.teardown(() => fastify.close());
-    await fastify.ready();
-    const response = await fastify.inject({
-      method: 'GET',
-      url: '/v1/status',
-    });
-    t.equal(response.statusCode, 200, 'returns a status code of 200');
-    t.equal(response.headers['content-type'], 'application/json; charset=utf-8');
-    t.same(response.json().health.status, 'false');
-    t.end();
-  });
-
-  await test('requests the "/v1/tornadoWithdraw" route', async (t) => {
-    const fastify = await createServer();
-    t.teardown(() => fastify.close());
-    await fastify.ready();
-    const response = await fastify.inject({
-      method: 'POST',
-      url: '/v1/tornadoWithdraw',
-      headers: { 'Content-Type': 'application/json' },
-      payload: withdrawData,
-    });
-    t.equal(response.statusCode, 200, 'returns a status code of 200');
-    t.equal(response.headers['content-type'], 'application/json; charset=utf-8');
-    t.end();
-  });
-  process.exit(0);
-})();

tsconfig.json

@@ -1,15 +0,0 @@
-{
-  "compilerOptions": {
-    "lib": ["es6", "es2020"],
-    "target": "es2020",
-    "module": "commonjs",
-    "moduleResolution": "node",
-    "outDir": "./build",
-    "emitDecoratorMetadata": true,
-    "experimentalDecorators": true,
-    "allowSyntheticDefaultImports": true,
-    "esModuleInterop": true,
-    "resolveJsonModule": true
-  },
-  "include": ["src/**/*"]
-}