From 5d5a1c81462374e36c87f0a64474e5dfdae1ce83 Mon Sep 17 00:00:00 2001
From: Sebastian <379651+czarly@users.noreply.github.com>
Date: Fri, 9 Dec 2022 18:02:38 +0100
Subject: [PATCH] fixes

---
 geth-mainnet.yml       | 43 +++++++++++++++++++++++++++++++++++-------
 nethermind-mainnet.yml | 16 ++++++++--------
 2 files changed, 44 insertions(+), 15 deletions(-)

diff --git a/geth-mainnet.yml b/geth-mainnet.yml
index 963121a0..0db1778a 100644
--- a/geth-mainnet.yml
+++ b/geth-mainnet.yml
@@ -7,22 +7,25 @@ services:
       # HTTP server / GraphQL API 
       - 8545                   
     ports:                      
-      - "30303:30303"                                                                                 
-      - "30303:30303/udp"  
+      - "49545:49545"                                                                                 
+      - "49545:49545/udp"  
     command:
       [                                                                                               
         # Blockchain sync mode ("snap", "full" or "light")                                            
-        "--syncmode=snap",                
+        "--syncmode=snap",
+        "--port=49545"
         # Megabytes of memory allocated to internal caching                                           
         "--cache=8192",
         # Enable the WS-RPC server         
-        "--ws",             
+        "--ws",
+        "--ws.port=8545"
         "--ws.addr=0.0.0.0",
         # Enable the HTTP-RPC server      
-        "--http",          
+        "--http",
+        "--http.port=8545",
         "--http.addr=0.0.0.0",                     
         "--http.vhosts=*",                         
-        # Enable GraphQL on the HTTP-RPC server. Note that GraphQL can only be started if an HTTP server is started as well.                                                                                
+        # Enable GraphQL on the HTTP-RPC server. Note that GraphQL can only be started if an HTTP server is started as well.                                                                               
         "--graphql",                               
         "--graphql.vhosts=*",             
         # Enable metrics collection and reporting                                                     
@@ -57,5 +60,31 @@ services:
       - "prometheus-scrape.job_name=geth-mainnet"
       - "prometheus-scrape.metrics_path=/debug/metrics/prometheus"
 
+  prysm-mainnet:
+    image: prysmaticlabs/prysm-beacon-chain:stable
+    ports:
+      #- "127.0.0.1:3500:3500"
+      - "13000:13000"
+      - "12000:12000/udp"
+    command:
+      [                                                                                               
+        "--datadir=/data",
+        "--jwt-secret=/jwtsecret",
+        "--rpc-host=0.0.0.0",
+        "--grpc-gateway-host=0.0.0.0",
+        "--monitoring-host=0.0.0.0",
+        "--checkpoint-sync-url=https://mainnet-checkpoint-sync.stakely.io",
+        "--execution-endpoint=http://geth-mainnet:8551",
+        "--accept-terms-of-use"
+      ]                                                                                               
+    networks:                            
+      - chains                                                                                        
+    volumes:                                                                                          
+      - "prysm-mainnet_data:/data"
+      - ".jwtsecret:/jwtsecret"
+    restart: unless-stopped
+    stop_grace_period: 1m
+
 volumes:
-    geth-mainnet_data:
\ No newline at end of file
+    prysm-mainnet_data:
+    geth-mainnet_data:
diff --git a/nethermind-mainnet.yml b/nethermind-mainnet.yml
index cd06f61c..bec41f88 100644
--- a/nethermind-mainnet.yml
+++ b/nethermind-mainnet.yml
@@ -7,15 +7,8 @@ services:
     stop_grace_period: 1m
     command: |
       --JsonRpc.Enabled=true
-      --JsonRpc.Host=0.0.0.0
       --JsonRpc.JwtSecretFile=/jwt.hex
-      --JsonRpc.EngineHost=0.0.0.0
-      --JsonRpc.EnginePort=8551
       --Metrics.Enabled=true
-      --TraceStore.Enabled=true
-      --TraceStore.BlocksToKeep=0
-      --TraceStore.TraceTypes=Trace,Rewards
-      --Sync.FastSync=false
     ports:
       - '34896:34896/tcp' # p2p
       - '34896:34896/udp' # p2p
@@ -29,11 +22,18 @@ services:
       - /etc/timezone:/etc/timezone:ro
       - /etc/localtime:/etc/localtime:ro
     environment:
-      - NETHERMIND_CONFIG=xdai_archive
+      - NETHERMIND_CONFIG=mainnet
       - NETHERMIND_JSONRPCCONFIG_ENGINEENABLEDMODULES=[Eth,AccountAbstraction,Subscribe,TxPool,Web3,Personal,Proof,Net,Parity,Health]
+      - NETHERMIND_JSONRPCCONFIG_ENGINEHOST=0.0.0.0
+      - NETHERMIND_JSONRPCCONFIG_ENGINEPORT=8551
+      - NETHERMIND_JSONRPCCONFIG_HOST=0.0.0.0
       - NETHERMIND_METRICSCONFIG_EXPOSEPORT=9091
       - NETHERMIND_NETWORKCONFIG_P2PPORT=34896
       - NETHERMIND_NETWORKCONFIG_MAXACTIVEPEERS=150
+      - NETHERMIND_SYNCCONFIG_FASTSYNC=true
+      - NETHERMIND_SYNCCONFIG_FASTBLOCKS=true
+      - NETHERMIND_SYNCCONFIG_DOWNLOADBODIESINFASTSYNC=true
+      - NETHERMIND_SYNCCONFIG_DOWNLOADRECEIPTSINFASTSYNC=true
     logging:
       options:
         max-size: "1000m"