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

prague update #17

Draft
wants to merge 2 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
1 change: 1 addition & 0 deletions clients/besu/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 1 addition & 0 deletions clients/erigon/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 1 addition & 0 deletions clients/ethereumjs/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions clients/ethrex/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 1 addition & 0 deletions clients/go-ethereum/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
9 changes: 9 additions & 0 deletions clients/nethermind/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
1 change: 1 addition & 0 deletions clients/nimbus-el/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
1 change: 1 addition & 0 deletions clients/reth/mapper.jq
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
6 changes: 5 additions & 1 deletion simulators/ethereum/rpc-compat/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down