Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

simulators/ethereum: add eest-engine/block-rlp for pectra devnet-3 #1162

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion clients/erigon/erigon.sh
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ FLAGS="$FLAGS --ws --ws.port=8546"
FLAGS="$FLAGS --txpool.blobslots=1000 --txpool.totalblobpoollimit=10000"

# Disable performance optimization incompatible with the tests
FLAGS="$FLAGS --sync.parallel-state-flushing=false"
# FLAGS="$FLAGS --sync.parallel-state-flushing=false"
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required for current erigon pectra branch. Can be added back in the future once updated in erigon.


if [ "$HIVE_TERMINAL_TOTAL_DIFFICULTY" != "" ]; then
JWT_SECRET="0x7365637265747365637265747365637265747365637265747365637265747365"
Expand Down
1 change: 1 addition & 0 deletions clients/go-ethereum/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ def to_bool:
"cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int,
"pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int,
"terminalTotalDifficultyPassed": true,
"depositContractAddress": "0x00000000219ab540356cBB839Cbe05303d7705Fa",
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Required for geth.

}|remove_empty
}
9 changes: 6 additions & 3 deletions clients/reth/Dockerfile.git
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@

### Build Reth From Git:
## Pulls reth from a git repository and builds it from source.

Expand All @@ -8,11 +7,15 @@ FROM rust:latest as builder
ARG github=paradigmxyz/reth
ARG tag=main

# Update system and install necessary dependencies
RUN apt-get update && apt-get install -y libclang-dev pkg-config build-essential \
&& echo "Cloning: $github - $tag" \
&& git clone --depth 1 --branch $tag https://github.com/$github reth \
&& cd reth && cargo build --release \
&& cp target/release/reth /usr/local/bin/reth
&& cd reth \
&& cargo build --release \
&& ls -lh target/release \
&& cp target/release/reth /usr/local/bin/reth \
|| { echo "Cargo build or copy failed"; exit 1; }

## Final stage: Sets up the environment for running reth
FROM debian:latest
Expand Down
2 changes: 1 addition & 1 deletion cmd/hiveview/assets/lib/app-suite.js
Original file line number Diff line number Diff line change
Expand Up @@ -359,7 +359,7 @@ function formatTestDetails(suiteData, row) {

if (d.description != '') {
let p = document.createElement('p');
let description = html.urlsToLinks(html.encode(d.description.trim()));
let description = html.urlsToLinks(d.description.trim());
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Minor hiveview tweak as mentioned in the PR description.

let txt = '<b>Description:</b><br/>' + description;
p.innerHTML = txt;
container.appendChild(p);
Expand Down
84 changes: 0 additions & 84 deletions configs/cancun.yaml

This file was deleted.

37 changes: 37 additions & 0 deletions configs/develop.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
- client: go-ethereum
nametag: prague-devnet-3
dockerfile: git
build_args:
github: lightclient/go-ethereum
tag: prague-devnet-3

- client: nethermind
nametag: prague-devnet-3
build_args:
baseimage: nethermindeth/nethermind
tag: pectra

- client: reth
nametag: prague-devnet-3
dockerfile: git
build_args:
github: paradigmxyz/reth
tag: onbjerg/devnet-3

- client: besu
nametag: prague-devnet-3
build_args:
baseimage: ethpandaops/besu
tag: main

- client: ethereumjs
nametag: prague-devnet-3
build_args:
github: ethereumjs/ethereumjs-monorepo
tag: t8ntool

- client: erigon
nametag: prague-devnet-3
build_args:
baseimage: thorax/erigon
tag: docker_pectra
17 changes: 17 additions & 0 deletions simulators/ethereum/eest-block-rlp/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Builds and runs the EEST (execution-spec-tests) consume rlp simulator
FROM python:3.10-slim

## Install dependencies
RUN apt-get update && \
apt-get install -y git wget tar && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

## Clone and install EEST
RUN git clone https://github.com/ethereum/execution-spec-tests.git --depth 1
WORKDIR execution-spec-tests
RUN pip install uv && uv sync

## Define `consume rlp` entry point using the local fixtures
ENTRYPOINT ["uv", "run", "consume", "rlp", "-v", "--input", "https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-3%40v1.5.0/fixtures_pectra-devnet-3.tar.gz"]

16 changes: 16 additions & 0 deletions simulators/ethereum/eest-engine/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Builds and runs the EEST (execution-spec-tests) consume engine simulator
FROM python:3.10-slim

## Install dependencies
RUN apt-get update && \
apt-get install -y git wget tar && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

## Clone and install EEST
RUN git clone https://github.com/ethereum/execution-spec-tests.git --depth 1
WORKDIR execution-spec-tests
RUN pip install uv && uv sync

## Define `consume engine` entry point using the local fixtures
ENTRYPOINT ["uv", "run", "consume", "engine", "-v", "--input", "https://github.com/ethereum/execution-spec-tests/releases/download/pectra-devnet-3%40v1.5.0/fixtures_pectra-devnet-3.tar.gz"]
16 changes: 16 additions & 0 deletions simulators/ethereum/eest-execute/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# Builds and runs the EEST (execution-spec-tests) execute
FROM python:3.10-slim

## Install dependencies
RUN apt-get update && \
apt-get install -y git wget tar && \
apt-get clean && \
rm -rf /var/lib/apt/lists/*

## Clone and install EEST
RUN git clone -b fill-execute-modes-updates https://github.com/spencer-tb/execution-spec-tests.git
WORKDIR execution-spec-tests
RUN pip install uv && uv sync

## Define `execute` entry point using python tests
ENTRYPOINT ["uv", "run", "execute", "--hive-mode", "--fork", "Prague"]