Skip to content

Commit e321b62

Browse files
committed
Merge remote-tracking branch 'upstream/forks/amsterdam' into devnets/bal/7
# Conflicts: # docs/CHANGELOG.md # packages/testing/src/execution_testing/tools/utility/generators.py # src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py # tests/cancun/eip1153_tstore/test_tstorage_create_contexts.py # tests/ported_static/stQuadraticComplexityTest/test_call20_kbytes_contract50_2.py # tests/ported_static/stQuadraticComplexityTest/test_call50000.py # tests/ported_static/stQuadraticComplexityTest/test_callcode50000.py # tests/prague/eip6110_deposits/conftest.py # tests/prague/eip7002_el_triggerable_withdrawals/conftest.py
2 parents 7546b83 + e45c0ed commit e321b62

408 files changed

Lines changed: 24492 additions & 32829 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/configs/feature.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Unless filling for special features, all features should fill for previous forks (starting from Frontier) too
22
mainnet:
33
evm-type: eels
4-
fill-params: --until=BPO2
4+
fill-params: --until=BPO2 --generate-all-formats
55

66
benchmark:
77
evm-type: benchmark

.github/workflows/docs-build.yaml

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,19 +71,10 @@ jobs:
7171
docs/**/*.md
7272
*.md
7373
74-
changelog:
75-
name: "Validate Changelog Entries"
76-
runs-on: ubuntu-latest
77-
steps:
78-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
79-
- uses: ./.github/actions/setup-uv
80-
- name: Run changelog validation
81-
run: just changelog
82-
8374
check-should-publish:
8475
name: "Check Should Publish"
8576
runs-on: ubuntu-latest
86-
needs: [lint-md, changelog]
77+
needs: [lint-md]
8778
outputs:
8879
should_publish: ${{ steps.check.outputs.should_publish }}
8980
branch: ${{ steps.check.outputs.branch }}

Justfile

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,11 +302,6 @@ docs-serve *args:
302302
docs-serve-fast *args:
303303
FAST_DOCS=True uv run mkdocs serve "$@"
304304

305-
# Validate docs/CHANGELOG.md entries
306-
[group('docs')]
307-
changelog:
308-
uv run validate_changelog
309-
310305
# Lint markdown files (markdownlint)
311306
[group('docs')]
312307
lint-md:

docs/CHANGELOG.md

Lines changed: 0 additions & 1134 deletions
This file was deleted.

docs/changelog_section_template.md

Lines changed: 0 additions & 19 deletions
This file was deleted.

docs/dev/docs.md

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ Run all docs related checks:
2222
just spellcheck
2323
just lint-md
2424
just docs
25-
just changelog
2625
```
2726

2827
### Local Deployment and Test

docs/dev/test_actions_locally.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,3 +111,13 @@ It's possible to specify the Docker image used by the `act` tool for a specific
111111
```
112112
113113
This can be added to any `gh act` command.
114+
115+
## Debugging CI Failures
116+
117+
The pytest-based CLIs (`fill`, `execute`, ...) print the resolved `pytest ...` invocation at startup whenever the `CI` environment variable is set:
118+
119+
```text
120+
Executing: pytest ...
121+
```
122+
123+
When run under Github Actions, the same command is also appended to the job summary (via `$GITHUB_STEP_SUMMARY`), so it can be copied directly from the "Summary" panel of the failing run without scrolling through the log.

packages/testing/pyproject.toml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ Homepage = "https://github.com/ethereum/execution-specs"
6060
Documentation = "https://eest.ethereum.org"
6161
Repository = "https://github.com/ethereum/execution-specs"
6262
Issues = "https://github.com/ethereum/execution-specs/issues"
63-
Changelog = "https://eest.ethereum.org/main/CHANGELOG/"
6463

6564
[dependency-groups]
6665
test = [
@@ -99,7 +98,6 @@ groupstats = "execution_testing.cli.show_pre_alloc_group_stats:main"
9998
extract_config = "execution_testing.cli.extract_config:extract_config"
10099
compare_fixtures = "execution_testing.cli.compare_fixtures:main"
101100
modify_static_test_gas_limits = "execution_testing.cli.modify_static_test_gas_limits:main"
102-
validate_changelog = "execution_testing.cli.ci_helpers:validate_changelog"
103101
benchmark_parser = "execution_testing.cli.benchmark_parser:main"
104102

105103
[tool.setuptools.packages.find]

packages/testing/src/execution_testing/__init__.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@
5252
EOA,
5353
Alloc,
5454
AuthorizationTuple,
55+
BalAccountAbsentValues,
5556
BalAccountChange,
5657
BalAccountExpectation,
5758
BalBalanceChange,
@@ -125,6 +126,7 @@
125126
"Address",
126127
"Alloc",
127128
"AuthorizationTuple",
129+
"BalAccountAbsentValues",
128130
"BalAccountChange",
129131
"BalAccountExpectation",
130132
"BalBalanceChange",

packages/testing/src/execution_testing/cli/ci_helpers.py

Lines changed: 1 addition & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
"""
22
CLI helper commands for CI static checks.
33
4-
Contains wrappers to markdownlint-cli2 and changelog validation that fail
4+
Contains a wrapper to markdownlint-cli2 validation which fails
55
silently if external tools are not available, to avoid disruption to
66
external contributors.
77
"""
@@ -96,53 +96,3 @@ def markdownlint(args: tuple[str, ...]) -> None:
9696

9797
command = ["node", markdownlint] + args_list
9898
sys.exit(subprocess.run(command).returncode)
99-
100-
101-
@click.command()
102-
def validate_changelog() -> None:
103-
"""
104-
Validate changelog formatting to ensure bullet points end with proper
105-
punctuation.
106-
107-
Check that all bullet points (including nested ones) end with either:
108-
- A period (.) for regular entries
109-
- A colon (:) for section headers that introduce lists
110-
"""
111-
project_root = find_project_root()
112-
changelog_path = Path(project_root / "docs/CHANGELOG.md")
113-
114-
if not changelog_path.exists():
115-
click.echo(f"❌ Changelog file not found: {changelog_path}")
116-
sys.exit(1)
117-
118-
try:
119-
with open(changelog_path, "r", encoding="utf-8") as f:
120-
content = f.read()
121-
except Exception as e:
122-
click.echo(f"❌ Error reading changelog: {e}.")
123-
sys.exit(1)
124-
125-
# Find bullet points that don't end with period or colon
126-
invalid_lines = []
127-
for line_num, line in enumerate(content.splitlines(), 1):
128-
if re.match(r"^\s*-\s+", line) and re.search(
129-
r"[^\.:]$", line.rstrip()
130-
):
131-
invalid_lines.append((line_num, line.strip()))
132-
133-
if invalid_lines:
134-
click.echo(
135-
f"❌ Found bullet points in {changelog_path} without proper "
136-
"punctuation:"
137-
)
138-
click.echo()
139-
for line_num, line in invalid_lines:
140-
click.echo(f"Line {line_num}: {line}")
141-
click.echo()
142-
click.echo("💡 All bullet points should end with:")
143-
click.echo(" - A period (.) for regular entries.")
144-
click.echo(" - A colon (:) for paragraphs that introduce lists.")
145-
sys.exit(1)
146-
else:
147-
click.echo("✅ All bullet points have proper punctuation!")
148-
sys.exit(0)

0 commit comments

Comments
 (0)