Plugeth stack refactor (#448)

app/data/compose/docker-compose-fixturenet-plugeth.yml

@@ -9,7 +9,6 @@ services:
     image: cerc/fixturenet-plugeth-plugeth:local
     volumes:
       - fixturenet_plugeth_bootnode_geth_data:/root/ethdata
-      - ../config/fixturenet-plugeth/plugins:/root/ethdata/plugins
     ports:
       - "9898"
       - "30303"
@@ -66,7 +65,7 @@ services:
     hostname: fixturenet-eth-bootnode-lighthouse
     environment:
       RUN_BOOTNODE: "true"
-    image: cerc/fixturenet-plugeth-lighthouse:local
+    image: cerc/fixturenet-eth-lighthouse:local
 
   fixturenet-eth-lighthouse-1:
     restart: always
@@ -83,7 +82,7 @@ services:
       NODE_NUMBER: "1"
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-1:8545"
       EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-1:8551"
-    image: cerc/fixturenet-plugeth-lighthouse:local
+    image: cerc/fixturenet-eth-lighthouse:local
     volumes:
       - fixturenet_plugeth_lighthouse_1_data:/opt/testnet/build/cl
     depends_on:
@@ -110,7 +109,7 @@ services:
       ETH1_ENDPOINT: "http://fixturenet-eth-geth-2:8545"
       EXECUTION_ENDPOINT: "http://fixturenet-eth-geth-2:8551"
       LIGHTHOUSE_GENESIS_STATE_URL: "http://fixturenet-eth-lighthouse-1:8001/eth/v2/debug/beacon/states/0"
-    image: cerc/fixturenet-plugeth-lighthouse:local
+    image: cerc/fixturenet-eth-lighthouse:local
     volumes:
       - fixturenet_plugeth_lighthouse_2_data:/opt/testnet/build/cl
     depends_on:

app/data/config/fixturenet-plugeth/plugins/README.md

@@ -1 +0,0 @@
-See: https://docs.plugeth.org/

app/data/container-build/cerc-fixturenet-eth-genesis/Dockerfile

@@ -0,0 +1,27 @@
+FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
+
+FROM golang:1.20-alpine as builder
+
+RUN apk add --no-cache python3 py3-pip
+
+COPY genesis /opt/genesis
+
+# Install ethereum-genesis-generator tools
+COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
+COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
+COPY --from=ethgen /apps /apps
+RUN cd /apps/el-gen && pip3 install -r requirements.txt
+# web3==5.24.0 used by el-gen is broken on python 3.11
+RUN pip3 install --upgrade "web3==6.5.0"
+
+# Build genesis config
+RUN apk add --no-cache make bash envsubst jq
+RUN cd /opt/genesis && make genesis-el
+
+# Snag the genesis block info.
+RUN go install github.com/cerc-io/eth-dump-genblock@latest
+RUN eth-dump-genblock /opt/genesis/build/el/geth.json > /opt/genesis/build/el/genesis_block.json
+
+FROM alpine:latest
+
+COPY --from=builder /opt/genesis /opt/genesis

app/data/container-build/cerc-fixturenet-eth-genesis/build.sh

@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+# Build cerc/fixturenet-eth-genesis
+
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+
+docker build -t cerc/fixturenet-eth-genesis:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR

app/data/container-build/cerc-fixturenet-eth-geth/Dockerfile

@@ -1,39 +1,21 @@
-FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
+FROM cerc/fixturenet-eth-genesis:local as fnetgen
-
-# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
-FROM golang:1.18-alpine as delve
-RUN go install github.com/go-delve/delve/cmd/dlv@latest
-
 FROM cerc/go-ethereum:local as geth
 
+# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
+FROM golang:1.20-alpine as delve
+RUN go install github.com/go-delve/delve/cmd/dlv@latest
+
 FROM alpine:3.17
-RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client
 
-COPY --from=delve  /go/bin/dlv /usr/local/bin/
+RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
-COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
-COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
-COPY --from=ethgen /apps /apps
 
-RUN cd /apps/el-gen && pip3 install -r requirements.txt
-
-COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh
 
-RUN cd /opt/testnet && make genesis-el
+COPY --from=delve /go/bin/dlv /usr/local/bin/
+COPY --from=geth /usr/local/bin/geth /usr/local/bin/
+COPY --from=fnetgen /opt/genesis /opt/testnet
 
-COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
+# Initialize the geth db with our config
-
-# Snag the genesis block info.
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
-RUN cp -rp ~/ethdata ~/tmpeth && \
-    geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \
-    geth --datadir ~/tmpeth --http & \
-    sleep 5 && \
-    curl -q --location 'localhost:8545' \
-        --header 'Content-Type: application/json' \
-        --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \
-        -o /opt/testnet/build/el/genesis_block.json && \
-    killall -9 geth && \
-    rm -rf ~/tmpeth
 
 ENTRYPOINT ["/opt/testnet/run.sh"]

app/data/container-build/cerc-fixturenet-eth-lighthouse/Dockerfile

@@ -1,6 +1,6 @@
 FROM cerc/lighthouse-cli:local AS lcli
 FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-FROM cerc/fixturenet-eth-geth:local AS fnetgeth
+FROM cerc/fixturenet-eth-genesis:local AS fnetgen
 
 FROM cerc/lighthouse:local
 
@@ -19,8 +19,8 @@ COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
 COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
 COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
 COPY --from=ethgen /apps /apps
-COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el
+COPY --from=fnetgen /opt/genesis/el /opt/testnet/el
-COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el
+COPY --from=fnetgen /opt/genesis/build/el /opt/testnet/build/el
 
 RUN cd /opt/testnet && make genesis-cl
 

app/data/container-build/cerc-fixturenet-eth-lighthouse/genesis/cl/vars.env

@@ -44,7 +44,7 @@ EXECUTION_ENDPOINT=${EXECUTION_ENDPOINT:-http://localhost:8551}
 ETH1_GENESIS_JSON=${ETH1_GENESIS_JSON:-"../build/el/geth.json"}
 ETH1_GENESIS_BLOCK_JSON=${ETH1_GENESIS_BLOCK_JSON:-"../build/el/genesis_block.json"}
 ETH1_CONFIG_YAML=${ETH1_CONFIG_YAML:-"../el/el-config.yaml"}
-ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.result.hash' | cut -d'x' -f2`}
+ETH1_BLOCK_HASH=${ETH1_BLOCK_HASH:-`cat $ETH1_GENESIS_BLOCK_JSON | jq -r '.hash' | cut -d'x' -f2`}
 
 ETH1_CHAIN_ID=${ETH1_CHAIN_ID:-`cat $ETH1_GENESIS_JSON | jq -r '.config.chainId'`}
 ETH1_TTD=${ETH1_TTD:-`cat $ETH1_GENESIS_JSON | jq -r '.config.terminalTotalDifficulty'`}

app/data/container-build/cerc-fixturenet-plugeth-lighthouse/Dockerfile

@@ -1,34 +0,0 @@
-FROM cerc/lighthouse-cli:local AS lcli
-FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
-FROM cerc/fixturenet-plugeth-plugeth:local AS fnetgeth
-
-FROM cerc/lighthouse:local
-
-# cerc/lighthouse is based on Ubuntu
-RUN apt-get update && apt-get -y upgrade && apt-get install -y --no-install-recommends \
-  libssl-dev ca-certificates \
-  curl socat iproute2 telnet wget jq \
-  build-essential python3 python3-dev python3-pip gettext-base \
-  && apt-get clean \
-  && rm -rf /var/lib/apt/lists/*
-
-COPY genesis /opt/testnet
-COPY run-cl.sh /opt/testnet/run.sh
-
-COPY --from=lcli /usr/local/bin/lcli /usr/local/bin/lcli
-COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/eth2-testnet-genesis
-COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
-COPY --from=ethgen /apps /apps
-COPY --from=fnetgeth /opt/testnet/el /opt/testnet/el
-COPY --from=fnetgeth /opt/testnet/build/el /opt/testnet/build/el
-
-RUN cd /opt/testnet && make genesis-cl
-
-# Work around some bugs in lcli where the default path is always used.
-RUN mkdir -p /root/.lighthouse && cd /root/.lighthouse && ln -s /opt/testnet/build/cl/testnet
-
-RUN mkdir -p /scripts
-COPY scripts/status-internal.sh /scripts
-COPY scripts/status.sh /scripts
-
-ENTRYPOINT ["/opt/testnet/run.sh"]

app/data/container-build/cerc-fixturenet-plugeth-lighthouse/build.sh

@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-# Build cerc/fixturenet-plugeth-lighthouse
-
-source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
-
-SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
-
-if [ ! -d "${SCRIPT_DIR}/genesis" ]; then
-  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/genesis ${SCRIPT_DIR}/genesis
-fi
-
-if [ ! -e "${SCRIPT_DIR}/run-cl.sh" ]; then
-  cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/run-cl.sh ${SCRIPT_DIR}/
-fi
-
-if [ ! -d "${SCRIPT_DIR}/scripts" ]; then
-  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-lighthouse/scripts ${SCRIPT_DIR}/
-fi
-
-docker build -t cerc/fixturenet-plugeth-lighthouse:local -f ${SCRIPT_DIR}/Dockerfile ${build_command_args} $SCRIPT_DIR

app/data/container-build/cerc-fixturenet-plugeth-plugeth/Dockerfile

@@ -1,42 +1,25 @@
-FROM skylenet/ethereum-genesis-generator@sha256:210353ce7c898686bc5092f16c61220a76d357f51eff9c451e9ad1b9ad03d4d3 AS ethgen
+FROM cerc/fixturenet-eth-genesis:local as fnetgen
 
-FROM golang:1.19-alpine as delve
+# Using the same golang image as used to build geth: https://github.com/cerc-io/go-ethereum/blob/HEAD/Dockerfile
+FROM golang:1.20-alpine as delve
 RUN go install github.com/go-delve/delve/cmd/dlv@latest
 
-FROM cerc/plugeth:local as geth
 FROM cerc/plugeth-statediff:local as statediff
+# FIXME: fork of plugeth, use stock after upstreaming patches
+FROM cerc/plugeth:local as geth
 
 FROM alpine:3.17
-RUN apk add --no-cache python3 python3-dev py3-pip curl wget jq build-base gettext libintl openssl bash bind-tools postgresql-client
 
-COPY --from=delve  /go/bin/dlv /usr/local/bin/
+RUN apk add --no-cache bash wget python3 bind-tools postgresql-client
-COPY --from=ethgen /usr/local/bin/eth2-testnet-genesis /usr/local/bin/
-COPY --from=ethgen /usr/local/bin/eth2-val-tools /usr/local/bin/
-COPY --from=ethgen /apps /apps
 
-RUN cd /apps/el-gen && pip3 install -r requirements.txt
-
-COPY genesis /opt/testnet
 COPY run-el.sh /opt/testnet/run.sh
 
-RUN cd /opt/testnet && make genesis-el
+COPY --from=delve /go/bin/dlv /usr/local/bin/
-
+COPY --from=geth /usr/local/bin/geth /usr/local/bin/
-COPY --from=geth  /usr/local/bin/geth /usr/local/bin/
+COPY --from=fnetgen /opt/genesis /opt/testnet
-
-RUN mkdir -p /usr/local/lib/plugeth/
 COPY --from=statediff  /usr/local/lib/statediff.so /usr/local/lib/plugeth/
 
-# Snag the genesis block info.
+# Initialize the geth db with our config
 RUN geth --datadir ~/ethdata init /opt/testnet/build/el/geth.json && rm -f ~/ethdata/geth/nodekey
-RUN cp -rp ~/ethdata ~/tmpeth && \
-    geth --datadir ~/tmpeth init /opt/testnet/build/el/geth.json && \
-    geth --datadir ~/tmpeth --http & \
-    sleep 5 && \
-    curl -q --location 'localhost:8545' \
-        --header 'Content-Type: application/json' \
-        --data '{ "jsonrpc": "2.0", "id": 14, "method": "eth_getBlockByNumber", "params": ["0x0", false] }' \
-        -o /opt/testnet/build/el/genesis_block.json && \
-    killall -9 geth && \
-    rm -rf ~/tmpeth
 
 ENTRYPOINT ["/opt/testnet/run.sh"]

app/data/container-build/cerc-fixturenet-plugeth-plugeth/build.sh

@@ -6,10 +6,6 @@ source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
 
 SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 
-if [ ! -d "${SCRIPT_DIR}/genesis" ]; then
-  cp -frp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/genesis ${SCRIPT_DIR}/genesis
-fi
-
 if [ ! -e "${SCRIPT_DIR}/run-el.sh" ]; then
   cp -fp ${SCRIPT_DIR}/../cerc-fixturenet-eth-geth/run-el.sh ${SCRIPT_DIR}/
 fi

app/data/container-build/cerc-plugeth-statediff/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build cerc/plugeth-statediff
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/plugeth-statediff:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth-statediff

app/data/container-build/cerc-plugeth/build.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Build cerc/plugeth
+source ${CERC_CONTAINER_BASE_DIR}/build-base.sh
+docker build -t cerc/plugeth:local ${build_command_args} ${CERC_REPO_BASE_DIR}/plugeth

app/data/repository-list.txt

@@ -37,3 +37,5 @@ git.vdb.to/cerc-io/test-project
 github.com/Fantom-foundation/go-opera
 github.com/cerc-io/lasso
 github.com/paradigmxyz/reth
+git.vdb.to/cerc-io/plugeth
+git.vdb.to/cerc-io/plugeth-statediff

app/data/stacks/fixturenet-eth-loaded/stack.yml

@@ -11,6 +11,7 @@ containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/ipld-eth-server

app/data/stacks/fixturenet-eth-tx/stack.yml

@@ -10,6 +10,7 @@ containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/tx-spammer

app/data/stacks/fixturenet-eth/stack.yml

@@ -9,6 +9,7 @@ containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/foundry

app/data/stacks/fixturenet-optimism/stack.yml

@@ -11,6 +11,7 @@ containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/foundry

app/data/stacks/fixturenet-plugeth-tx/stack.yml

@@ -2,27 +2,28 @@ version: "1.2"
 name: fixturenet-plugeth-tx
 decription: "plugeth Ethereum Fixturenet w/ tx-spammer"
 repos:
-  - github.com/cerc-io/tx-spammer
+  - git.vdb.to/cerc-io/plugeth@statediff-wip
-  - github.com/dboreham/foundry
+  - git.vdb.to/cerc-io/plugeth-statediff
   - github.com/cerc-io/lighthouse
   - github.com/cerc-io/ipld-eth-db@v5
   - github.com/cerc-io/ipld-eth-server@v5
-  - git.vdb.to/cerc-io/plugeth@statediff-wip
+  - github.com/cerc-io/tx-spammer
-  - git.vdb.to/cerc-io/plugeth-statediff@dev-local-build
+  - github.com/dboreham/foundry
 containers:
-  - cerc/lighthouse
-  - cerc/lighthouse-cli
   - cerc/plugeth-statediff
   - cerc/plugeth
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-plugeth-plugeth
-  - cerc/fixturenet-plugeth-lighthouse
+  - cerc/lighthouse
+  - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-lighthouse
   - cerc/tx-spammer
   - cerc/foundry
   - cerc/ipld-eth-db
   - cerc/ipld-eth-server
 pods:
+  - fixturenet-plugeth
   - ipld-eth-db
   - ipld-eth-server
-  - fixturenet-plugeth
-  - foundry
   - tx-spammer
+  - foundry

app/data/stacks/fixturenet-pocket/stack.yml

@@ -10,6 +10,7 @@ containers:
   - cerc/go-ethereum
   - cerc/lighthouse
   - cerc/lighthouse-cli
+  - cerc/fixturenet-eth-genesis
   - cerc/fixturenet-eth-geth
   - cerc/fixturenet-eth-lighthouse
   - cerc/pocket