Skip to content

Commit

Permalink
Deneb support
Browse files Browse the repository at this point in the history
  • Loading branch information
mksh committed Jan 17, 2024
1 parent c42a4f6 commit 8364a2a
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 13 deletions.
18 changes: 9 additions & 9 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,13 @@
ARG DEBIAN_RELEASE="bookworm"

# Lighthouse testnet bakery helper
ARG LCLI_VERSION="4.5.0"
ARG LCLI_VERSION="4.6.0-rc.0"

# Ethereum clients
ARG GETH_VERSION="1.13.2"
ARG LIGHTHOUSE_VERSION="4.5.0"
ARG TEKU_VERSION="23.10.0"
ARG MEV_BOOST_VERSION="1.6"
ARG GETH_VERSION="1.13.10"
ARG LIGHTHOUSE_VERSION="4.6.0-rc.0"
ARG TEKU_VERSION="24.1.0"
ARG MEV_BOOST_VERSION="1.7a1"

# prysm image
FROM bitnami/minideb:${DEBIAN_RELEASE} AS prysmbuilder
Expand All @@ -38,7 +38,7 @@ FROM bitnami/minideb:${DEBIAN_RELEASE} AS prysmbuilder
ARG BAZELISK_VERSION="1.17.0"
ARG BAZELISK_SHA256="61699e22abb2a26304edfa1376f65ad24191f94a4ffed68a58d42b6fee01e124"

ARG PRYSM_REF="refs/tags/v4.0.8"
ARG PRYSM_REF="refs/tags/v4.2.0"

ENV BAZELISK_VERSION="${BAZELISK_VERSION}"
ENV PRYSM_REF="${PRYSM_REF}"
Expand All @@ -62,7 +62,7 @@ RUN find -L /usr/local/prysm

# builder and relay
FROM bitnami/minideb:${DEBIAN_RELEASE} AS mevbuilder
ARG FLASHBOTS_BUILDER_REF="v1.11.5-0.2.1"
ARG FLASHBOTS_BUILDER_REF="b2dcbddfb1c81b1c20f0870d6fca414b9016433b"
ARG MAINIFOLD_FREELAY_REF="support-privatenet"
ENV GO_1_20_SHA256="5a9ebcc65c1cce56e0d2dc616aff4c4cedcfbda8cc6f0288cc08cda3b18dcbf1"

Expand Down Expand Up @@ -93,7 +93,7 @@ RUN PATH="/usr/local/go/bin/:$PATH" go run build/ci.go install -static ./cmd/get
FROM bitnami/minideb:${DEBIAN_RELEASE} AS genesisbuilder
# Testnet baking accessories
ARG ZCLI_REF="refs/tags/v0.6.0"
ARG ETH2_TESTNET_GENESIS_REF="refs/tags/v0.8.0"
ARG ETH2_TESTNET_GENESIS_REF="955d4a81095c019dd712ba96316c426330133240"
ENV GO_1_19_SHA256="464b6b66591f6cf055bc5df90a9750bf5fbc9d038722bb84a9d56a2bea974be6"
ENV ZCLI_REF="${ZCLI_REF}"
ENV ETH2_TESTNET_GENESIS_REF="${ETH2_TESTNET_GENESIS_REF}"
Expand All @@ -111,7 +111,7 @@ RUN git clone https://github.com/protolambda/zcli.git && cd zcli && git fetch or
RUN cd zcli && PATH="/usr/local/go/bin/:$PATH" go build

# Build genesis tool
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 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 cd eth2-testnet-genesis && PATH="/usr/local/go/bin/:$PATH" go build

# builder and relay
Expand Down
12 changes: 12 additions & 0 deletions eth_possim/resources/cl/minimal.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,3 +95,15 @@ DEPOSIT_CHAIN_ID: 5
DEPOSIT_NETWORK_ID: 5
# Configured on a per testnet basis
DEPOSIT_CONTRACT_ADDRESS: 0xde1802CF413AC060F06abB158b15762016c196ad


# Misc
# ---------------------------------------------------------------
# [customized]
FIELD_ELEMENTS_PER_BLOB: 4096
# [customized]
MAX_BLOB_COMMITMENTS_PER_BLOCK: 16
# `uint64(6)`
MAX_BLOBS_PER_BLOCK: 6
# [customized] `floorlog2(BLOB_KZG_COMMITMENTS_GINDEX) + 1 + ceillog2(MAX_BLOB_COMMITMENTS_PER_BLOCK)` = 4 + 1 + 4 = 9
KZG_COMMITMENT_INCLUSION_PROOF_DEPTH: 9
3 changes: 2 additions & 1 deletion eth_possim/resources/cl/privatenet.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@ GENESIS_DELAY: 0
ALTAIR_FORK_EPOCH: 0
BELLATRIX_FORK_EPOCH: 0
CAPELLA_FORK_EPOCH: 0
DENEB_FORK_EPOCH: 0

EPOCHS_PER_SYNC_COMMITTEE_PERIOD: 8

# A.K.A. EIP4844
DENEB_FORK_VERSION: "0x04000001"
DENEB_FORK_EPOCH: 18446744073709551615


# Very fast deposit discovery
ETH1_FOLLOW_DISTANCE: 6
Expand Down
1 change: 1 addition & 0 deletions eth_possim/resources/el/genesis.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"terminalTotalDifficulty": 0,
"terminalTotalDifficultyPassed": true,
"shanghaiTime": 0,
"cancunTime": 0,
"ethash": {}
},
"difficulty": "1",
Expand Down
4 changes: 2 additions & 2 deletions eth_possim/resources/shell/cl/__init/eth2-genesis.sh
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ set -euxo pipefail

# Generate post-merge (Capella-enabled) genesis
genesis_args=(
capella
deneb
--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
Expand All @@ -20,7 +20,7 @@ genesis_args=(
)

pretty_args=(
capella
deneb
BeaconState
--config {{ cfg.meta.dir.cl }}/etc/config-prysm.yaml
--preset-phase0 minimal
Expand Down
3 changes: 2 additions & 1 deletion requirements-dev.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
pytest
pytest-ordering
pytest-timeout
pytest-timeout
typing-extensions

0 comments on commit 8364a2a

Please sign in to comment.