From be3b53e93f061b720392d2111de0f2570eb63863 Mon Sep 17 00:00:00 2001
From: Roy Crihfield <roy@manteia.ltd>
Date: Sat, 3 Aug 2024 14:34:29 -0500
Subject: [PATCH] add ipld-eth-server to plugeth fixturenet

---
 .../docker-compose-fixturenet-plugeth.yml     |  2 +
 .../docker-compose-ipld-eth-server.yml        | 43 +++++++++++++++++++
 .../Dockerfile                                |  4 +-
 .../stacks/fixturenet-plugeth/stack.yml       |  3 ++
 4 files changed, 51 insertions(+), 1 deletion(-)
 create mode 100644 stack-orchestrator/compose/docker-compose-ipld-eth-server.yml

diff --git a/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml b/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml
index 88cc25c..e2a7e4e 100644
--- a/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml
+++ b/stack-orchestrator/compose/docker-compose-fixturenet-plugeth.yml
@@ -10,6 +10,7 @@ services:
     image: cerc/fixturenet-plugeth-plugeth:local
     volumes:
       - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
+      - fixturenet_plugeth_bootnode_geth_config:/opt/testnet/build/el
     ports:
       - "9898"
       - "30303"
@@ -127,6 +128,7 @@ services:
 
 volumes:
   fixturenet_plugeth_bootnode_geth_data:
+  fixturenet_plugeth_bootnode_geth_config:
   fixturenet_plugeth_geth_1_data:
   fixturenet_plugeth_geth_2_data:
   fixturenet_plugeth_lighthouse_1_data:
diff --git a/stack-orchestrator/compose/docker-compose-ipld-eth-server.yml b/stack-orchestrator/compose/docker-compose-ipld-eth-server.yml
new file mode 100644
index 0000000..9a9a224
--- /dev/null
+++ b/stack-orchestrator/compose/docker-compose-ipld-eth-server.yml
@@ -0,0 +1,43 @@
+services:
+  ipld-eth-server:
+    restart: unless-stopped
+    depends_on:
+      ipld-eth-db:
+        condition: service_healthy
+    image: cerc/ipld-eth-server:local
+    environment:
+      SERVER_HTTP_PATH: 0.0.0.0:8081
+      SERVER_GRAPHQL: "true"
+      SERVER_GRAPHQLPATH: 0.0.0.0:8082
+      ETH_CHAIN_CONFIG: "/opt/config/chain.json"
+      DATABASE_NAME: cerc_testing
+      DATABASE_HOSTNAME: ipld-eth-db
+      DATABASE_PORT: 5432
+      DATABASE_USER: "vdbm"
+      DATABASE_PASSWORD: "password"
+      ETH_FORWARD_ETH_CALLS: "false"
+      ETH_FORWARD_GET_STORAGE_AT: "false"
+      ETH_PROXY_ON_ERROR: "false"
+      METRICS: "true"
+      PROM_HTTP: "true"
+      PROM_HTTP_ADDR: "0.0.0.0"
+      PROM_HTTP_PORT: "8090"
+      LOG_LEVEL: "debug"
+      CERC_REMOTE_DEBUG: ${CERC_REMOTE_DEBUG:-true}
+    volumes:
+      - fixturenet_plugeth_bootnode_geth_config:/opt/config
+    ports:
+      - "8081"
+      - "8082"
+      - "8090"
+      - "40000"
+    healthcheck:
+      test: ["CMD", "nc", "-v", "localhost", "8081"]
+      interval: 20s
+      timeout: 5s
+      retries: 15
+      start_period: 5s
+
+volumes:
+  fixturenet_plugeth_bootnode_geth_config:
+
diff --git a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile
index caabc93..8ca8f5d 100644
--- a/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile
+++ b/stack-orchestrator/container-build/cerc-fixturenet-eth-genesis-postmerge/Dockerfile
@@ -2,7 +2,9 @@ FROM ethpandaops/ethereum-genesis-generator:3.0.0 AS ethgen
 
 # Build genesis config
 ADD genesis /opt/genesis
-RUN cd /opt/genesis && make genesis-el
+WORKDIR /opt/genesis
+RUN make genesis-el
+RUN jq ".config" build/el/geth.json > build/el/chain.json
 
 FROM golang:1.21-alpine as builder
 
diff --git a/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml b/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml
index ef1119f..afb7780 100644
--- a/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml
+++ b/stack-orchestrator/stacks/fixturenet-plugeth/stack.yml
@@ -6,6 +6,7 @@ repos:
   - git.vdb.to/cerc-io/plugeth-statediff
   - git.vdb.to/cerc-io/lighthouse
   - git.vdb.to/cerc-io/ipld-eth-db
+  - git.vdb.to/cerc-io/ipld-eth-server@v5
 containers:
   - cerc/plugeth-statediff
   - cerc/plugeth
@@ -15,6 +16,8 @@ containers:
   - cerc/lighthouse-cli
   - cerc/fixturenet-eth-lighthouse
   - cerc/ipld-eth-db
+  - cerc/ipld-eth-server
 pods:
   - fixturenet-plugeth
   - ipld-eth-db
+  - ipld-eth-server