From 0a18e092c73077d358824dfc7fba8be42af7316a Mon Sep 17 00:00:00 2001 From: Mario Vega Date: Thu, 5 Sep 2024 08:44:29 -0600 Subject: [PATCH 1/2] clients/besu,erigon,ethereumjs,go-ethereum,nethermind,reth,nimbus-el: Add `pragueTime` (#1161) * clients/besu: Add `pragueTime` * clients/erigon: Add `pragueTime` * clients/ethereumjs: Add `pragueTime` * clients/go-ethereum: Add `pragueTime` * clients/nethermind: Add `pragueTime` * clients/reth: Add `pragueTime` * clients/nimbus-el: Add `pragueTime` --- clients/besu/mapper.jq | 1 + clients/erigon/mapper.jq | 1 + clients/ethereumjs/mapper.jq | 1 + clients/go-ethereum/mapper.jq | 1 + clients/nethermind/mapper.jq | 9 +++++++++ clients/nimbus-el/mapper.jq | 1 + clients/reth/mapper.jq | 1 + 7 files changed, 15 insertions(+) diff --git a/clients/besu/mapper.jq b/clients/besu/mapper.jq index ab6ee6913b..4e21e497cb 100644 --- a/clients/besu/mapper.jq +++ b/clients/besu/mapper.jq @@ -49,5 +49,6 @@ def to_int: "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, }|remove_empty } diff --git a/clients/erigon/mapper.jq b/clients/erigon/mapper.jq index 89eb423989..7576d83079 100644 --- a/clients/erigon/mapper.jq +++ b/clients/erigon/mapper.jq @@ -57,5 +57,6 @@ def to_bool: "terminalTotalDifficultyPassed": (if env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED == null then true else env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED|to_bool end), "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, }|remove_empty } diff --git a/clients/ethereumjs/mapper.jq b/clients/ethereumjs/mapper.jq index db790c9cf0..1eee477af1 100644 --- a/clients/ethereumjs/mapper.jq +++ b/clients/ethereumjs/mapper.jq @@ -72,5 +72,6 @@ def pad_storage_keys: "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, } } | pad_storage_keys | remove_empty diff --git a/clients/go-ethereum/mapper.jq b/clients/go-ethereum/mapper.jq index 7e466ce338..569b74ac0f 100644 --- a/clients/go-ethereum/mapper.jq +++ b/clients/go-ethereum/mapper.jq @@ -56,6 +56,7 @@ def to_bool: "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, "terminalTotalDifficultyPassed": true, }|remove_empty } diff --git a/clients/nethermind/mapper.jq b/clients/nethermind/mapper.jq index be2d1028da..142d365686 100644 --- a/clients/nethermind/mapper.jq +++ b/clients/nethermind/mapper.jq @@ -151,6 +151,15 @@ def clique_engine: "eip5656TransitionTimestamp": env.HIVE_CANCUN_TIMESTAMP|to_hex, "eip6780TransitionTimestamp": env.HIVE_CANCUN_TIMESTAMP|to_hex, + # Prague + "eip2537TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip2935TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip6110TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip7002TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip7251TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip7685TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + "eip7702TransitionTimestamp": env.HIVE_PRAGUE_TIMESTAMP|to_hex, + # Other chain parameters "networkID": env.HIVE_NETWORK_ID|to_hex, "chainID": env.HIVE_CHAIN_ID|to_hex, diff --git a/clients/nimbus-el/mapper.jq b/clients/nimbus-el/mapper.jq index 2c763f65fb..11f4f607b5 100644 --- a/clients/nimbus-el/mapper.jq +++ b/clients/nimbus-el/mapper.jq @@ -77,6 +77,7 @@ def to_bool: "terminalTotalDifficulty": env.HIVE_TERMINAL_TOTAL_DIFFICULTY|to_int, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, "terminalTotalDifficultyPassed": true, }|remove_empty } diff --git a/clients/reth/mapper.jq b/clients/reth/mapper.jq index d21b3355c8..3a9b2ead87 100644 --- a/clients/reth/mapper.jq +++ b/clients/reth/mapper.jq @@ -57,5 +57,6 @@ def to_bool: "terminalTotalDifficultyPassed": env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED|to_bool, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, }|remove_empty } From 9b507ca9aea4fd494916a47c9dd231cf3d18fa51 Mon Sep 17 00:00:00 2001 From: Julian Ventura Date: Wed, 22 Jan 2025 16:09:41 -0300 Subject: [PATCH 2/2] Add prague tests update and update execution-api fetch commit --- clients/ethrex/mapper.jq | 1 + simulators/ethereum/rpc-compat/Dockerfile | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/clients/ethrex/mapper.jq b/clients/ethrex/mapper.jq index d21b3355c8..3a9b2ead87 100644 --- a/clients/ethrex/mapper.jq +++ b/clients/ethrex/mapper.jq @@ -57,5 +57,6 @@ def to_bool: "terminalTotalDifficultyPassed": env.HIVE_TERMINAL_TOTAL_DIFFICULTY_PASSED|to_bool, "shanghaiTime": env.HIVE_SHANGHAI_TIMESTAMP|to_int, "cancunTime": env.HIVE_CANCUN_TIMESTAMP|to_int, + "pragueTime": env.HIVE_PRAGUE_TIMESTAMP|to_int, }|remove_empty } diff --git a/simulators/ethereum/rpc-compat/Dockerfile b/simulators/ethereum/rpc-compat/Dockerfile index 9d481cdf0e..654e8c098d 100644 --- a/simulators/ethereum/rpc-compat/Dockerfile +++ b/simulators/ethereum/rpc-compat/Dockerfile @@ -3,7 +3,11 @@ FROM golang:1-alpine as builder RUN apk add --update git ca-certificates gcc musl-dev linux-headers # Clone the tests repo. -RUN git clone --depth 1 --branch v1.0.0-beta.4 https://github.com/ethereum/execution-apis.git /execution-apis +RUN git init /execution-apis \ + && cd /execution-apis \ + && git remote add origin https://github.com/ethereum/execution-apis.git \ + && git fetch --depth 1 origin 10f58fbface95676780ee7328091a494e9584a6e \ + && git checkout FETCH_HEAD # To run local tests, copy the directory into the same as the simulator and # uncomment the line below