Working deneb support

ChorusOne · Feb 26, 2024 · fe75a6c · fe75a6c
1 parent 8364a2a
commit fe75a6c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 10 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -62,7 +62,7 @@ RUN find -L /usr/local/prysm
 
 # builder and relay
 FROM bitnami/minideb:${DEBIAN_RELEASE} AS mevbuilder
-ARG FLASHBOTS_BUILDER_REF="b2dcbddfb1c81b1c20f0870d6fca414b9016433b"
+ARG FLASHBOTS_BUILDER_REF="7845c515c32ef08f15c420fda0f5de4f2e6800cd"
 ARG MAINIFOLD_FREELAY_REF="support-privatenet"
 ENV GO_1_20_SHA256="5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1"
 
@@ -92,26 +92,26 @@ RUN PATH="/usr/local/go/bin/:$PATH" go run build/ci.go install -static ./cmd/get
 # genesis & zcli tools
 FROM bitnami/minideb:${DEBIAN_RELEASE} AS genesisbuilder
 # Testnet baking accessories
-ARG ZCLI_REF="refs/tags/v0.6.0"
-ARG ETH2_TESTNET_GENESIS_REF="955d4a81095c019dd712ba96316c426330133240"
-ENV GO_1_19_SHA256="464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6"
+ARG ZCLI_REF="refs/tags/v0.7.1"
+ARG ETH2_TESTNET_GENESIS_REF="4b3498476f14b872b43080eee319adea45286daf"
+ENV GO_1_21_SHA256="13b76a9b2a26823e53062fa841b07087d48ae2ef2936445dc34c4ae03293702c"
 ENV ZCLI_REF="${ZCLI_REF}"
 ENV ETH2_TESTNET_GENESIS_REF="${ETH2_TESTNET_GENESIS_REF}"
 WORKDIR /usr/local/src/
 
 RUN install_packages curl ca-certificates git build-essential
 
 # Install golang
-RUN cd /tmp && curl -OL https://golang.org/dl/go1.19.linux-amd64.tar.gz
-RUN echo "${GO_1_19_SHA256} /tmp/go1.19.linux-amd64.tar.gz" | sha256sum -c
-RUN cd /tmp && tar -C /usr/local -xvf go1.19.linux-amd64.tar.gz
+RUN cd /tmp && curl -OL https://golang.org/dl/go1.21.7.linux-amd64.tar.gz
+RUN echo "${GO_1_21_SHA256} /tmp/go1.21.7.linux-amd64.tar.gz" | sha256sum -c
+RUN cd /tmp && tar -C /usr/local -xvf go1.21.7.linux-amd64.tar.gz
 
 # Build zcli
 RUN git clone https://github.com/protolambda/zcli.git && cd zcli && git fetch origin "${ZCLI_REF}" && git checkout "${ZCLI_REF}"
 RUN cd zcli && PATH="/usr/local/go/bin/:$PATH" go build
 
 # Build genesis tool
-RUN git clone https://github.com/pk910/eth2-testnet-genesis.git && cd eth2-testnet-genesis && git fetch origin "${ETH2_TESTNET_GENESIS_REF}" && git checkout "${ETH2_TESTNET_GENESIS_REF}"
+RUN git clone https://github.com/protolambda/eth2-testnet-genesis.git && cd eth2-testnet-genesis && git fetch origin "${ETH2_TESTNET_GENESIS_REF}" && git checkout "${ETH2_TESTNET_GENESIS_REF}"
 RUN cd eth2-testnet-genesis && PATH="/usr/local/go/bin/:$PATH" go build
 
 # builder and relay

diff --git a/eth_possim/resources/cl/minimal.yaml b/eth_possim/resources/cl/minimal.yaml
@@ -11,7 +11,8 @@ PRESET_BASE: 'minimal'
 # * 'mainnet' - there can be only one
 # * 'prater' - testnet
 # Must match the regex: [a-z0-9\-]
-CONFIG_NAME: 'minimal'
+# CONFIG_NAME: 'minimal'
+# read from privatenet.yaml
 
 # Transition
 # ---------------------------------------------------------------

diff --git a/eth_possim/resources/shell/cl/__init/eth2-genesis.sh b/eth_possim/resources/shell/cl/__init/eth2-genesis.sh
@@ -5,7 +5,7 @@ set -euxo pipefail
 # Generate post-merge (Capella-enabled) genesis
 genesis_args=(
     deneb
-    --legacy-config {{ cfg.meta.dir.cl }}/etc/config-prysm.yaml
+    # --legacy-config {{ cfg.meta.dir.cl }}/etc/config-prysm.yaml
     --config {{ cfg.meta.dir.cl }}/etc/config-prysm.yaml
     --mnemonics {{ cfg.meta.dir.cl }}/etc/mnemonics.yaml
     --tranches-dir {{ cfg.meta.dir.cl }}/etc/tranches