diff --git a/Dockerfile b/Dockerfile index 693aa0d..203be2c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,6 +23,6 @@ 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 --network-concurrency 2 && yarn cache clean -f +RUN yarn install && yarn cache clean -f ENTRYPOINT ["yarn"] diff --git a/README.md b/README.md index e8bdf99..2004eb9 100644 --- a/README.md +++ b/README.md @@ -63,10 +63,9 @@ docker-compose up -d --pull 1. `yarn` 2. `cp .env.example .env` 3. Modify `.env` as needed -4. `docker-compose up -d redis` -5. `yarn start` -6. Go to `http://127.0.0.1:8000` -7. In order to execute withdraw request, you can run following command +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 '' http://127.0.0.1:8000/v1/tornadoWithdraw diff --git a/docker-compose.test.yml b/docker-compose.test.yml index e562bd7..b1bcc29 100644 --- a/docker-compose.test.yml +++ b/docker-compose.test.yml @@ -2,7 +2,7 @@ version: '3.7' services: server: - image: tornadocash/relayer:v5.0.0 + image: tornadocash/relayer restart: always command: 'server' env_file: .env @@ -14,14 +14,14 @@ services: depends_on: [redis] txWorker: - image: tornadocash/relayer:v5.0.0 + image: tornadocash/relayer restart: unless-stopped command: 'txWorker' env_file: .env depends_on: [redis] healthWorker: - image: tornadocash/relayer:v5.0.0 + image: tornadocash/relayer restart: unless-stopped command: 'healthWorker' env_file: .env diff --git a/package.json b/package.json index 6c9c37c..3d5adcd 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "5.0.0", "description": "Relayer for Tornado.cash privacy solution. https://tornado.cash", "scripts": { - "start": "yarn build && yarn server & yarn txWorker & yarn healthWorker", + "start": "yarn build; docker-compose up -d redis; 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", diff --git a/src/app/routes.ts b/src/app/routes.ts index e788b38..bbe558a 100644 --- a/src/app/routes.ts +++ b/src/app/routes.ts @@ -30,7 +30,6 @@ export function mainHandler(server: FastifyInstance, options, next) { netId: configService.netId, ethPrices, tornadoServiceFee, - miningServiceFee: 0, version, health, currentQueue, diff --git a/src/app/schema.ts b/src/app/schema.ts index 11179b8..e1e4d7a 100644 --- a/src/app/schema.ts +++ b/src/app/schema.ts @@ -66,7 +66,6 @@ const statusResponseSchema = { netId: { type: 'integer' }, version: { type: 'string' }, tornadoServiceFee: { type: 'number' }, - miningServiceFee: { type: 'number' }, currentQueue: { type: 'number' }, ethPrices: { type: 'object', additionalProperties: true }, instances: { type: 'object', additionalProperties: true },