Add indexer service & make relayer stateless

.prettierignore

@@ -23,6 +23,5 @@ zp-relayer/poolTxs.db
 
 *.md
 *.yml
-**/lib/
 **/build/
 **/*.json

docker-compose.yaml

@@ -1,47 +1,62 @@
 version: '3.8'
 
 services:
-  ganache:
-    image: trufflesuite/ganache-cli
-    command: >
-      --deterministic
-      --gasLimit 20000000
-      --allowUnlimitedContractSize
-      --networkId 1337
-      --chainId 1337
-    ports:
-      - 8545:8545
-  contracts:
-    image: lok52/zp-contracts:latest
-  verifier:
-    image: lok52/verifier:latest
-    build:
-      context: ./docker
-      dockerfile: Dockerfile.verifier
-  redis:
+  redis_indexer:
     command: [redis-server, --appendonly, 'yes']
     image: redis:6.2.6
+  indexer:
+    image: ghcr.io/zkbob/zkbob-relayer:${RELAYER_VERSION:-latest}
+    build:
+      context: .
+      dockerfile: docker/Dockerfile.relayer
+    command: yarn run start:indexer:prod
+    volumes:
+      - ./zp-relayer/params:/app/zp-relayer/params/
+    env_file: ./zp-relayer/indexer.env
+    environment:
+      - INDEXER_PORT=80
+      - COMMON_REDIS_URL=redis_indexer:6379
     ports:
-      - 6379:6379
+      - 8000:80
+    depends_on:
+      - redis_indexer
+  redis_relayer:
+    command: [redis-server, --appendonly, 'yes']
+    image: redis:6.2.6
   relayer:
     image: ghcr.io/zkbob/zkbob-relayer:${RELAYER_VERSION:-latest}
     build:
       context: .
       dockerfile: docker/Dockerfile.relayer
     volumes:
-      - relayer_tree:/app/tree.db
-      - relayer_txs:/app/txs.db
-      - $PARAMS_PATH:/app/zp-relayer/params/
-    env_file: ./zp-relayer/relayer.env
+      - ./zp-relayer/params:/app/zp-relayer/params/
+    env_file: ./zp-relayer/relayer-decentralized.env
+    environment:
+      - RELAYER_PORT=80
+      - RELAYER_PROVER_URL=http://commitment_watcher:80
+      - COMMON_INDEXER_URL=http://indexer:80
+      - COMMON_REDIS_URL=redis_relayer:6379
     ports:
-      - 8000:8000
-  watcher:
+      - 8001:80
+    depends_on:
+      - redis_relayer
+  redis_prover:
+    command: [redis-server, --appendonly, 'yes']
+    image: redis:6.2.6
+  commitment_watcher:
     image: ghcr.io/zkbob/zkbob-relayer:${RELAYER_VERSION:-latest}
     build:
       context: .
       dockerfile: docker/Dockerfile.relayer
-    command: yarn run start:direct-deposit-watcher:prod
-    env_file: ./zp-relayer/watcher.env
-volumes:
-  relayer_tree:
-  relayer_txs:
+    command: yarn run start:commitment-watcher:prod
+    volumes:
+      - ./zp-relayer/params:/app/zp-relayer/params/
+    env_file: ./zp-relayer/commitment-watcher.env
+    environment:
+      - COMMITMENT_WATCHER_PORT=80
+      - COMMON_INDEXER_URL=http://indexer:80
+      - COMMON_REDIS_URL=redis_prover:6379
+    ports:
+      - 8002:80
+    depends_on:
+      - redis_prover

docker/Dockerfile.relayer

@@ -1,10 +1,10 @@
-FROM rust:1.69.0-slim-buster as base
+FROM rust:1.77.0-slim-buster as base
 
 WORKDIR /app
 
 RUN apt-get update && \
     apt-get -y install curl && \
-    curl -sL https://deb.nodesource.com/setup_18.x | bash && \
+    curl -sL https://deb.nodesource.com/setup_20.x | bash && \
     apt-get -y install nodejs libclang-dev clang && \
     npm install -g yarn cargo-cp-artifact
 
@@ -29,7 +29,7 @@ RUN yarn build:relayer
 RUN yarn install --frozen-lockfile --production
 
 
-FROM node:18
+FROM node:20
 
 ARG RELAYER_REF
 ARG RELAYER_SHA

zp-memo-parser/memo.ts

@@ -28,6 +28,7 @@ export type TxData<T extends TxType> = BaseTxData &
   (T extends TxType.WITHDRAWAL ? WithdrawTxData : T extends TxType.PERMITTABLE_DEPOSIT ? PermittableDepositTxData : {})
 
 interface BaseTxDataProverV2 {
+  proxyAddress: Uint8Array
   proverAddress: Uint8Array
   treeUpdateFee: string
 }
@@ -138,6 +139,9 @@ export function getTxData<T extends TxType>(m: Buffer, txType: Option<T>): TxDat
 export function getTxDataProverV2<T extends TxType>(m: Buffer, txType: Option<T>): TxDataProverV2<T> {
   let offset = 0
 
+  const proxyAddress = getAddress(m, offset)
+  offset += 20
+
   const proverAddress = getAddress(m, offset)
   offset += 20
 
@@ -148,6 +152,7 @@ export function getTxDataProverV2<T extends TxType>(m: Buffer, txType: Option<T>
   offset += 8
 
   const base = {
+    proxyAddress,
     proverAddress,
     transactFee,
     treeUpdateFee,