Merge Development into Master

.gitignore

@@ -34,3 +34,4 @@ test_result.txt
 
 **/auto-imports.d.ts
 **/components.d.ts
+ci-artifacts

MANIFEST.in

@@ -0,0 +1,6 @@
+# K8sTools uses importlib.resources to copy these templates into temporary
+# setup/running directories after users install the seedemu package.
+# Only portable source templates are matched here, so runtime caches such as
+# __pycache__, *.pyc, and image-cache/*.tar are left out of source packages.
+include seedemu/k8sTools/README.md
+recursive-include seedemu/k8sTools/resources *.py *.sh *.yml *.yaml README.md

development.env

@@ -1 +1 @@
-export PYTHONPATH="`pwd`:$PYTHONPATH"
+export PYTHONPATH="`pwd`:${PYTHONPATH:-}"

docker_images/seedemu-base/Dockerfile

@@ -1,7 +1,7 @@
-FROM ubuntu:20.04
+FROM ubuntu:24.04
 
 ARG DEBIAN_FRONTEND=noninteractive
 RUN echo 'exec zsh' > /root/.bashrc
 
-RUN apt-get update && apt-get install -y --no-install-recommends curl dnsutils ipcalc iproute2 iputils-ping jq mtr-tiny nano netcat tcpdump termshark vim-nox zsh
+RUN apt-get update && apt-get install -y --no-install-recommends curl dnsutils ipcalc iproute2 iputils-ping jq mtr-tiny nano netcat-openbsd tcpdump termshark vim-nox zsh
 COPY zshrc /root/.zshrc

docker_images/seedemu-base/docker-compose.yml

@@ -4,6 +4,6 @@ services:
         build:
             context: .
             dockerfile: Dockerfile
-        image: handsonsecurity/seedemu-base
+        image: handsonsecurity/seedemu-base:2.0
 
 

docker_images/seedemu-ethereum/docker-compose.yml

@@ -12,3 +12,9 @@ services:
       context: ./pos
       dockerfile: Dockerfile
     image: handsonsecurity/seedemu-ethereum:pos
+
+  seedemu-pos2.0:
+    build:
+      context: ./pos2.0
+      dockerfile: Dockerfile
+    image: handsonsecurity/seedemu-ethereum:pos2.0

docker_images/seedemu-ethereum/pos2.0/Dockerfile

@@ -0,0 +1,57 @@
+FROM ubuntu:20.04 AS builder1
+
+ENV DEBIAN_FRONTEND=noninteractive
+ENV GOLANG_VERSION=1.24.0
+ENV PATH="/usr/local/go/bin:$PATH"
+
+WORKDIR /
+
+# Install dependencies
+RUN apt-get update && apt-get install -y \
+    wget git build-essential curl make python3 python3-pip ca-certificates \
+    && apt-get clean
+
+# Install Go manually
+RUN curl -OL https://go.dev/dl/go${GOLANG_VERSION}.linux-amd64.tar.gz && \
+    tar -C /usr/local -xzf go${GOLANG_VERSION}.linux-amd64.tar.gz && \
+    rm go${GOLANG_VERSION}.linux-amd64.tar.gz
+
+RUN go version  # Just to confirm installation
+
+
+# Intalling eth-beacon-genesis and eth2-val-tools
+RUN git clone https://github.com/ethpandaops/eth-beacon-genesis.git  \
+    && cd eth-beacon-genesis && git checkout 703e97aaa244eec4b077f974e01d02449e1ba2ba && make \
+    && go install github.com/protolambda/eth2-val-tools@0d6d1ddb36479e73d7d876b29ac2d10ab3988e85
+
+# Downloading geth 
+RUN wget https://gethstore.blob.core.windows.net/builds/geth-linux-amd64-1.15.11-36b2371c.tar.gz \
+    && tar -xzf geth-linux-amd64-1.15.11-36b2371c.tar.gz 
+
+# Downloading lighthouse
+RUN wget https://github.com/sigp/lighthouse/releases/download/v8.1.3/lighthouse-v8.1.3-x86_64-unknown-linux-gnu.tar.gz \
+    && tar -xzf lighthouse-v8.1.3-x86_64-unknown-linux-gnu.tar.gz
+
+
+FROM golang:1.18 AS builder2
+ARG DEBIAN_FRONTEND=noninteractive
+WORKDIR /
+
+# Build bootnode from go-ethereum v1.10.26 source
+RUN go install github.com/ethereum/go-ethereum/cmd/bootnode@v1.10.26
+
+
+
+# Final image    
+
+FROM handsonsecurity/seedemu-base
+
+RUN apt-get update && apt-get install -y --no-install-recommends software-properties-common python3 python3-pip
+RUN pip install web3
+
+COPY --from=builder1 /eth-beacon-genesis/bin/eth-beacon-genesis /usr/local/bin/eth-beacon-genesis
+COPY --from=builder1 /root/go/bin/eth2-val-tools /usr/local/bin/eth2-val-tools
+COPY --from=builder1 /geth-linux-amd64-1.15.11-36b2371c/geth /usr/local/bin/geth
+COPY --from=builder1 /lighthouse /usr/local/bin/lighthouse
+
+COPY --from=builder2 /go/bin/bootnode /usr/local/bin/bootnode

docker_images/seedemu-ethexplorer/beaconchain/backend/Dockerfile

@@ -0,0 +1,38 @@
+# this is meant to be built with the root of this repo as build-context
+FROM golang:1.23-bookworm AS build-env
+
+WORKDIR /
+RUN git clone https://github.com/gobitfly/beaconchain.git
+WORKDIR /beaconchain/backend
+COPY . .
+RUN go mod download
+ARG target=all
+RUN git config --global --add safe.directory '*' && make -B $target
+
+
+# final stage
+FROM debian:bookworm-slim
+ENV POSTGRES_PORT=$POSTGRES_PORT\
+    ALLOY_PORT=$ALLOY_PORT\
+    LBT_PORT=$LBT_PORT\
+    RBT_PORT=$RBT_PORT\
+    EL_PORT=$EL_PORT\
+    CL_PORT=$CL_PORT\
+    REDIS_PORT=$REDIS_PORT\
+    REDIS_SESSIONS_PORT=$REDIS_SESSIONS_PORT\
+    SERVER_HOST=$SERVER_HOST
+RUN apt-get update && \
+    apt-get install -y \
+        curl \
+        jq \
+        ca-certificates \
+        postgresql-client \
+    && rm -rf /var/lib/apt/lists/*
+
+COPY --from=build-env /beaconchain/backend/bin /usr/local/bin/
+COPY --from=build-env /beaconchain/backend/local_deployment/provision-explorer-config-custom.sh /app/local_deployment/provision-explorer-config-custom.sh
+COPY --from=build-env /beaconchain/backend/local_deployment/mainnet.chain.yml /app/local_deployment/mainnet.chain.yml
+COPY start.sh /
+RUN chmod +x /start.sh \
+    && chmod +x /app/local_deployment/provision-explorer-config-custom.sh
+ENTRYPOINT ["/start.sh"]