updates

2022-12-04 15:05:08 +01:00
parent fd1bb7ddff
commit e0d684a014
3 changed files with 63 additions and 47 deletions
--- a/erigon-goerli.yml
+++ b/erigon-goerli.yml
@@ -1,12 +1,15 @@
 version: '3.1'

 services:
-  erigon-trace:
+  erigon-goerli:
    image: thorax/erigon:v2022.10.01
    expose:
-    - "30303"
-    - "30304"
+      - "21766"
      - "9090"
+      - "8545"
+    ports:
+      - "21766:21766"
+      - "21766:21766/udp"
    volumes:
      - erigon-trace:/home/erigon/.local/share/erigon
      - .jwtsecret:/jwtsecret
@@ -19,42 +22,25 @@ services:
      --pprof
      --pprof.addr=0.0.0.0
      --pprof.port=6061
+      --port=21766
      --authrpc.addr=0.0.0.0
      --authrpc.vhosts=*
      --authrpc.jwtsecret=/jwtsecret
      --snapshots=true
      --torrent.download.rate=1250mb
      --torrent.upload.rate=1250mb
-    restart: unless-stopped
-    stop_grace_period: 1m
-    labels:
-      - "prometheus-scrape.enabled=true"
-      - "prometheus-scrape.port=6060"
-      - "prometheus-scrape.job_name=erigon"
-      - "prometheus-scrape.metrics_path=/debug/metrics/prometheus"
-
-  rpcdaemon:
-    image: thorax/erigon:v2022.10.01
-    command: >
-      rpcdaemon --datadir=/home/erigon/.local/share/erigon/goerli
-      --private.api.addr=erigon-trace:9090
-      --txpool.api.addr=erigon-trace:9090
      --http.addr=0.0.0.0
      --http.vhosts=*
      --http.corsdomain=*
      --http.api=eth,erigon,web3,net,debug,trace,txpool
      --ws
-    pid: service:erigon-trace # Use erigon's PID namespace. It's required to open Erigon's DB from another process (RPCDaemon local-mode)
-    volumes:
-      - erigon-trace:/home/erigon/.local/share/erigon
-    networks:
-      - chains
-    expose:
-      - "8545"
    restart: unless-stopped
-    depends_on:
-      - "erigon-trace"
+    stop_grace_period: 1m
    labels:
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=6060"
+      - "prometheus-scrape.job_name=erigon-goerli"
+      - "prometheus-scrape.metrics_path=/debug/metrics/prometheus"
      - "traefik.enable=true"
      - "traefik.http.middlewares.rpcdaemon-stripprefix.stripprefix.prefixes=/erigon-goerli"
      - "traefik.http.services.rpcdaemon.loadbalancer.server.port=8545"
@@ -63,11 +49,15 @@ services:
      - "traefik.http.routers.rpcdaemon.rule=Host(`$DOMAIN`) && PathPrefix(`/erigon-goerli`)"
      - "traefik.http.routers.rpcdaemon.middlewares=rpcdaemon-stripprefix, ipwhitelist"

-  lighthouse:
+  lighthouse-goerli:
    image: sigp/lighthouse:latest-modern
+    expose:
+      - "5054" #metrics
+      - "4000" #http
+      - "63550" #p2p
    ports:
-      - "9000:9000"
-      - "127.0.0.1:5052:5052"
+      - "63550:63550"
+      - "63550:63550/udp"
    volumes:
      - .jwtsecret:/jwtsecret
      - lighthouse_data:/root/.lighthouse
@@ -75,21 +65,31 @@ services:
      lighthouse beacon_node
      --network prater
      --reconstruct-historic-states
-      --execution-endpoint http://erigon-trace:8551
+      --execution-endpoint http://erigon-goerli:8551
      --execution-jwt /jwtsecret
+      --port 63550
      --http
      --http-address=0.0.0.0
+      --http-port=4000
+      --metrics
+      --metrics-port=5054
+      --metrics-address=0.0.0.0
+      --checkpoint-sync-url https://prater.checkpoint.sigp.io
    restart: unless-stopped
    stop_grace_period: 1m
    networks:
      - chains
    labels:
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=5054"
+      - "prometheus-scrape.job_name=lighthouse-goerli"
+      - "prometheus-scrape.metrics_path=/metrics"
      - "traefik.enable=true"
-      - "traefik.http.middlewares.lighthouse-stripprefix.stripprefix.prefixes=/lighthouse"
-      - "traefik.http.services.lighthouse.loadbalancer.server.port=5052"
+      - "traefik.http.middlewares.lighthouse-stripprefix.stripprefix.prefixes=/lighthouse-goerli"
+      - "traefik.http.services.lighthouse.loadbalancer.server.port=4000"
      - "traefik.http.routers.lighthouse.entrypoints=websecure"
      - "traefik.http.routers.lighthouse.tls.certresolver=myresolver"
-      - "traefik.http.routers.lighthouse.rule=Host(`$DOMAIN`) && PathPrefix(`/lighthouse`)"
+      - "traefik.http.routers.lighthouse.rule=Host(`$DOMAIN`) && PathPrefix(`/lighthouse-goerli`)"
      - "traefik.http.routers.lighthouse.middlewares=lighthouse-stripprefix, ipwhitelist"


--- a/erigon.yml
+++ b/erigon.yml
@@ -76,6 +76,7 @@ services:
      --eth1-endpoints http://erigon-trace:8545
      --execution-endpoint http://erigon-trace:8551
      --execution-jwt /jwtsecret
+      --checkpoint-sync-url https://mainnet.checkpoint.sigp.io
      --http
      --http-address=0.0.0.0
    restart: unless-stopped
--- a/xdai-archive.yml
+++ b/xdai-archive.yml
@@ -7,7 +7,6 @@ version: '3.1'
 services:
  xdai-archive:
    hostname: xdai-archive
-    container_name: xdai-archive
    image: nethermindeth/nethermind:db-traces
    restart: always
    stop_grace_period: 1m
@@ -23,10 +22,8 @@ services:
      --TraceStore.TraceTypes=Trace,Rewards
      --Sync.FastSync=false
    ports:
-      - '30303:30303/tcp' # p2p
-      - '30303:30303/udp' # p2p
-      - '127.0.0.1:8545:8545'
-      - '127.0.0.1:9091:9091'
+      - '10652:10652/tcp' # p2p
+      - '10652:10652/udp' # p2p
    networks:
      - chains
    volumes:
@@ -40,31 +37,36 @@ services:
      - NETHERMIND_CONFIG=xdai_archive
      - NETHERMIND_JSONRPCCONFIG_ENGINEENABLEDMODULES=[Eth,AccountAbstraction,Subscribe,TxPool,Web3,Personal,Proof,Net,Parity,Health,Trace]
      - NETHERMIND_METRICSCONFIG_EXPOSEPORT=9091
+      - NETHERMIND_NETWORKCONFIG_P2PPORT=10652
      - NETHERMIND_NETWORKCONFIG_MAXACTIVEPEERS=150
    logging:
      options:
        max-size: "1000m"
    labels:
      - "traefik.enable=true"
-      - "traefik.http.middlewares.xdai-archive-stripprefix.stripprefix.prefixes=/xdai-archive"
+      - "traefik.http.middlewares.xdai-archive-stripprefix.stripprefix.prefixes=/gnosis-archive"
      - "traefik.http.services.xdai-archive.loadbalancer.server.port=8545"
      - "traefik.http.routers.xdai-archive.entrypoints=websecure"
      - "traefik.http.routers.xdai-archive.tls.certresolver=myresolver"
-      - "traefik.http.routers.xdai-archive.rule=Host(`$DOMAIN`) && PathPrefix(`/xdai-archive`)"
+      - "traefik.http.routers.xdai-archive.rule=Host(`$DOMAIN`) && PathPrefix(`/gnosis-archive`)"
      - "traefik.http.routers.xdai-archive.middlewares=xdai-archive-stripprefix, ipwhitelist"
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=9091"
+      - "prometheus-scrape.job_name=nethermind-xdai"
      
-  xdai_consensus:
-    container_name: xdai_consensus
+
+  lighthouse-gnosis:
    image: sigp/lighthouse:latest-modern
    restart: unless-stopped
    networks:
      - chains
    ports:
-      - 9001:9001/tcp # p2p
-      - 9001:9001/udp # p2p
+      - 46763:46763/tcp # p2p
+      - 46763:46763/udp # p2p
    expose:
      - 5054 # metrics
      - 4000 # http
+      - 46763 # p2p
    volumes:
      - xdai_consensus:/data
      - .jwtsecret:/jwt.hex
@@ -76,7 +78,7 @@ services:
      --network=gnosis
      --disable-upnp
      --datadir=/data
-      --port=9001
+      --port=46763
      --http
      --http-address=0.0.0.0
      --http-port=4000
@@ -91,6 +93,19 @@ services:
      --metrics-port=5054
      --metrics-address=0.0.0.0
      --checkpoint-sync-url=https://checkpoint.gnosischain.com/
+    labels:
+      - "prometheus-scrape.enabled=true"
+      - "prometheus-scrape.port=5054"
+      - "prometheus-scrape.job_name=lighthouse-gnosis"
+      - "prometheus-scrape.metrics_path=/metrics"
+      - "traefik.enable=true"
+      - "traefik.http.middlewares.lighthouse-gnosis-stripprefix.stripprefix.prefixes=/lighthouse-gnosis"
+      - "traefik.http.services.lighthouse-gnosis.loadbalancer.server.port=4000"
+      - "traefik.http.routers.lighthouse-gnosis.entrypoints=websecure"
+      - "traefik.http.routers.lighthouse-gnosis.tls.certresolver=myresolver"
+      - "traefik.http.routers.lighthouse-gnosis.rule=Host(`$DOMAIN`) && PathPrefix(`/lighthouse-gnosis`)"
+      - "traefik.http.routers.lighthouse-gnosis.middlewares=lighthouse-gnosis-stripprefix, ipwhitelist"
+

 volumes:
  nethermind_db: