refactor(test): rename gas cost constants#2094
refactor(test): rename gas cost constants#2094Carsons-Eels merged 19 commits intoethereum:forks/amsterdamfrom
Conversation
88b35c0 to
5211a81
Compare
|
Okay, I figured out something that was wrong here. There used to be only |
be51118 to
a58e103
Compare
075209e to
4366c80
Compare
Codecov Report❌ Patch coverage is Additional details and impacted files@@ Coverage Diff @@
## forks/amsterdam #2094 +/- ##
================================================
Coverage 85.85% 85.85%
================================================
Files 599 599
Lines 39428 39428
Branches 3776 3776
================================================
Hits 33851 33851
Misses 4946 4946
Partials 631 631
Flags with carried forward coverage won't be shown. Click here to find out more. ☔ View full report in Codecov by Sentry. 🚀 New features to boost your workflow:
|
marioevz
left a comment
There was a problem hiding this comment.
LGTM. I think we should merge as soon as possible to avoid having to rebase.
It's potentially going to break branches based on forks/amsterdam, but I think this is a one-time operation.
We will have to make sure the names do not deviate when we add new constants to the protocol.
|
I assume that the code coverage wants the new lines to be covered, but if these were not covered prior to this PR, they are not going to be covered afterwards. |
|
Yes, I thought the same about the coverage. Just going to tweak the description a bit then merge this. |
66ba4a5 to
9680b7d
Compare
a29b9aa to
8c05626
Compare
- rename gas constants - rename base gas cost - rename very low gas cost - rename memory gas cost - rename copy gas cost - rename low gas cost - rename medium gas cost - rename high gas cost - rename warm access gas cost - rename cold access gas cost - rename storage reset gas cost - rename storage clear gas cost - rename storage set gas cost - rename warm account gas cost - rename cold account gas cost - rename initcode word gas cost - rename code deposit gas cost - rename create gas cost - rename call stipen gas cost - rename selfdestruct gas cost - rename call value gas cost - rename new account gas cost - rename exp gas cost - rename exp per byte gas cost - rename keccak256 gas cost - rename keccak256 word gas cost - rename blockhash gas cost - rename log data gas cost - rename log gas cost - rename log topic gas cost - rename tx based gas cost - rename contract creation gas cost - rename access list addr gas cost - rename access list storage gas cost - rename floor calldata gas cost - rename token standard gas cost - rename authorize gas cost - rename authorize base cost - rename data zero gas cost - rename non-zero data gas cost - rename blob gas per block gas cost - rename blob min price gas cost - rename all precompile gas costs fix: linting issues
3ca9315 to
cc3262d
Compare
7329095
into
ethereum:forks/amsterdam
commit a48c892 Author: Kevaundray Wedderburn <kevtheappdev@gmail.com> Date: Fri Feb 27 17:39:02 2026 +0000 introduce BlockDiff commit a4a4b47 Merge: e801c45 5034aa2 Author: Kevaundray Wedderburn <kevtheappdev@gmail.com> Date: Tue Feb 24 23:25:33 2026 +0000 Merge remote-tracking branch 'upstream/forks/amsterdam' into kw/extract-stateless-functionality commit e801c45 Author: Kevaundray Wedderburn <kevtheappdev@gmail.com> Date: Tue Feb 24 23:14:11 2026 +0000 add doc comments for ChainContext fields commit de68f63 Author: Kevaundray Wedderburn <kevtheappdev@gmail.com> Date: Tue Feb 24 22:57:06 2026 +0000 initial commit commit 5034aa2 Author: kevaundray <kevtheappdev@gmail.com> Date: Tue Feb 24 22:56:44 2026 +0000 chore(ci): Skip diffs if not on default branch (ethereum#2304) * skip diffs * Update .github/workflows/gh-pages.yaml Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com> * revert: actionlint --------- Co-authored-by: Sam Wilson <57262657+SamWilsn@users.noreply.github.com> commit 7ca499e Author: danceratopz <danceratopz@gmail.com> Date: Tue Feb 24 20:06:22 2026 +0100 feat(test-fill,test-benchmark): organize fixtures into fork and gas-limit subdirs (ethereum#2134) * feat(test-benchmark): split gas benchmark outputs by subdir * docs(test-benchmark): document gas benchmark output layout * test(test-benchmark): verify gas benchmark subdir layout * feat(test-benchmark): update folder structure according to review * refactor(test-filler): move fixture_output to shared Move FixtureOutput from filler/ to shared/ and absorb fixture_naming.py. This prepares for future build-tool plugins that also generate fixtures. * feat(test-filler): organize fill fixture output by target fork Always include the gas-limit suffix in the fork output subdirectory, not just for benchmark tests. Non-benchmark (consensus) tests now also get a subdirectory like `for_prague_at_0120M/` using the environment default gas limit (respecting `--block-gas-limit`). The `_at_` separator makes the directory name unambiguous: for_{fork}_at_{gas}M (e.g. for_prague_at_0120M) * docs(releases): document fixture output directory layout Add a "Fixture Output Directory Structure" section explaining the for_{fork}_at_{gas}M subdirectory convention, default gas limit, and how benchmark tests use --gas-benchmark-values. * feat(test-filler): drop gas limit from consensus fixture subdirs Consensus fixtures now use `for_{fork}/` (e.g. `for_prague/`) instead of `for_{fork}_at_{gas}M/`. Benchmark fixtures keep the gas limit suffix. * feat(test-filler): use fixture_subfolder marker for output subdirs Replace manual gas-benchmark detection in the filler with a composable pytest.mark.fixture_subfolder(level, prefix) marker: - Add level-0 marker (fork prefix) in fork parametrization. - Add level-1 marker in GasBenchmarkValues and OpcodeCountsConfig. - Resolve output subdirs from markers in filler instead of hard-coding. - Break circular import so collector can share the separator constant. - Register the marker in execute_fill alongside other shared markers. * feat(test-tests): add fixed-opcode-count subdirectory output test - Verify --fixed-opcode-count splits fixtures into per-count subdirs. - Mirror the existing gas-benchmark subdir test for opcode counts. * fix(test-fill): fix-up typehints for mypy * fix(test-fill): remove dead code and tighten types - Remove unused `should_auto_enable_all_formats` property. - Remove unused `format_gas_limit_subdir()` function. - Remove unreachable `FORK_SUBDIR_PREFIX` check in post-merge verification (format dir is always at `parts[0]`). - Tighten `resolve_fixture_subfolder` parameter from `list` to `list[pytest.Mark]`. - Clarify "benchmark" prefix stripping in collector with comment. * docs(test-fill): update docs for fixed-opcode-count fixture dir layout * fix: static tests --------- Co-authored-by: Mario Vega <marioevz@gmail.com> commit 84025b7 Author: Sam Wilson <57262657+SamWilsn@users.noreply.github.com> Date: Tue Feb 24 14:05:19 2026 -0500 chore: bump docc version (ethereum#2303) commit 4fff5eb Author: Mario Vega <marioevz@gmail.com> Date: Tue Feb 24 19:30:35 2026 +0100 feat(test-execute): Support `testing_buildBlockV1` (ethereum#2295) * feat(test-rpc): Add `Testing` namespace * nit: transactions parameter * feat(test-execute): Support `testing_buildBlockV1` * docs * refactor(execute): Testing endpoint non-auth * review comments Co-authored-by: fselmo <fselmo2@gmail.com> --------- Co-authored-by: fselmo <fselmo2@gmail.com> commit 7329095 Author: Carson <carson@ethereum.org> Date: Tue Feb 24 12:29:35 2026 -0500 refactor(test): rename/align gas cost constants (ethereum#2094) - rename base gas cost - rename very low gas cost - rename memory gas cost - rename copy gas cost - rename low gas cost - rename medium gas cost - rename high gas cost - rename warm access gas cost - rename cold access gas cost - rename storage reset gas cost - rename storage clear gas cost - rename storage set gas cost - rename warm account gas cost - rename cold account gas cost - rename initcode word gas cost - rename code deposit gas cost - rename create gas cost - rename call stipen gas cost - rename selfdestruct gas cost - rename call value gas cost - rename new account gas cost - rename exp gas cost - rename exp per byte gas cost - rename keccak256 gas cost - rename keccak256 word gas cost - rename blockhash gas cost - rename log data gas cost - rename log gas cost - rename log topic gas cost - rename tx based gas cost - rename contract creation gas cost - rename access list addr gas cost - rename access list storage gas cost - rename floor calldata gas cost - rename token standard gas cost - rename authorize gas cost - rename authorize base cost - rename data zero gas cost - rename non-zero data gas cost - rename blob gas per block gas cost - rename blob min price gas cost - rename all precompile gas costs - (refactor) TX_ACCESS_LIST_ADDRESS_COST => GAS_TX_ACCESS_LIST_ADDRESS - (refactor) GAS_CODE_DEPOSIT => GAS_CODE_DEPOSIT_PER_BYTE - (refactor) remove unnecessary Uint cast for REFUND_STORAGE_CLEAR - (refactor) TX_ACCESS_LIST_STORAGE_KEY_COST => GAS_TX_ACCESS_LIST_STORAGE_KEY - (refactor) GAS_KECCAK256_WORD => GAS_KECCAK256_PER_WORD - (refactor) TX_BASE_COST => GAS_TX_BASE - (refactor) TX_CREATE_COST => GAS_TX_CREATE - (refactor) TX_DATA_STANDARD_TOKEN_COST => GAS_TX_DATA_TOKEN_STANDARD - (refactor) => TX_DATA_FLOOR_TOKEN_COST => GAS_TX_DATA_TOKEN_FLOOR - (refactor) GAS_INIT_CODE_WORD_COST => GAS_CODE_INIT_PER_WORD - (refactor) TX_DATA_COST_PER_ZERO => GAS_TX_DATA_PER_ZERO - (refactor) TX_DATA_COST_PER_NON_ZERO => GAS_TX_DATA_PER_NON_ZERO - (refactor) GAS_AUTH_PER_EMPTY_ACCOUNT_COST => GAS_AUTH_PER_EMPTY_ACCOUNT - (refactor) GAS_LOG_DATA => GAS_LOG_DATA_PER_BYTE - (refactor) GAS_PRECOMPILE_SHA256_WORD => GAS_PRECOMPILE_SHA256_PER_WORD - (refactor) GAS_PRECOMPILE_RIPEMD160_WORD => GAS_PRECOMPILE_RIPEMD160_PER_WORD - (refactor) GAS_PRECOMPILE_IDENTITY_WORD => GAS_PRECOMPILE_IDENTITY_PER_WORD - (refactor) REFUND_PER_AUTH_BASE_COST => REFUND_AUTH_PER_EXISTING_ACCOUNT --------- Co-authored-by: LouisTsai <q1030176@gmail.com> commit cdf9add Author: Paweł Bylica <pawel@hepcolgum.band> Date: Tue Feb 24 16:53:55 2026 +0100 feat(tests): port EXTCODEHASH dynamicAccountOverwriteEmpty (ethereum#2032) Port the legacy static test: stExtCodeHash/dynamicAccountOverwriteEmpty_Paris for EIP-1052 EXTCODEHASH testing. The test verifies EXTCODEHASH correctly updates when an empty account is overwritten by CREATE2. Modified from original: target account has no storage to avoid EIP-7610 collision behavior. commit 9bd111a Author: felix <felix314159@users.noreply.github.com> Date: Tue Feb 24 14:20:18 2026 +0100 fix: failing test in ci for 7981 (ethereum#2297) commit 6f80f72 Author: Jochem Brouwer <jochembrouwer96@gmail.com> Date: Tue Feb 24 10:25:24 2026 +0100 refactor(test-benchmarks): ensure `SSTORE` N->N writes nonzero key/value (ethereum#2255) commit 04fb242 Author: Paweł Bylica <pawel@hepcolgum.band> Date: Mon Feb 23 23:24:31 2026 +0100 feat(tests): port EXTCODEHASH codeless account with storage test (ethereum#2291) Port sub-case from dynamicAccountOverwriteEmpty_ParisFiller.yml: a codeless account with storage returns keccak256("") for EXTCODEHASH and 0 for EXTCODESIZE. Parametrized over three non-empty variants (balance only, nonce only, both). commit 7add493 Author: Sam Wilson <57262657+SamWilsn@users.noreply.github.com> Date: Mon Feb 23 15:45:25 2026 -0500 chore: expand docstring guide (ethereum#2195) Co-authored-by: danceratopz <danceratopz@gmail.com>
🗒️ Description
Changes:
Uintcast for REFUND_STORAGE_CLEARNote
Cherry picked PR#1870 onto
forks/amsterdamOrder matches gas_costs.py
G_JUMPDESTGAS_JUMPDESTG_BASEGAS_BASEG_VERY_LOWGAS_VERY_LOWG_LOWGAS_LOWG_MIDGAS_MIDG_HIGHGAS_HIGHG_WARM_ACCOUNT_ACCESSGAS_WARM_ACCOUNT_ACCESSG_COLD_ACCOUNT_ACCESSGAS_COLD_ACCOUNT_ACCESSG_ACCESS_LIST_ADDRESSGAS_TX_ACCESS_LIST_ADDRESSG_ACCESS_LIST_STORAGEGAS_TX_ACCESS_LIST_STORAGE_KEYG_WARM_SLOADGAS_WARM_SLOADG_COLD_SLOADGAS_COLD_SLOADG_STORAGE_SETGAS_STORAGE_SETG_STORAGE_UPDATEGAS_STORAGE_UPDATEG_STORAGE_RESETGAS_STORAGE_RESETG_SELF_DESTRUCTGAS_SELF_DESTRUCTG_CREATEGAS_CREATEG_CODE_DEPOSIT_BYTEGAS_CODE_DEPOSIT_PER_BYTEG_INITCODE_WORDGAS_CODE_INIT_PER_WORDG_CALL_VALUEGAS_CALL_VALUEG_CALL_STIPENDGAS_CALL_STIPENDG_NEW_ACCOUNTGAS_NEW_ACCOUNTG_EXPGAS_EXPONENTIATIONG_EXP_BYTEGAS_EXPONENTIATION_PER_BYTEG_MEMORYGAS_MEMORYG_TRANSACTIONGAS_TX_BASEG_TRANSACTION_CREATEGAS_TX_CREATEG_TX_DATA_ZEROGAS_TX_DATA_PER_ZEROG_TX_DATA_NON_ZEROGAS_TX_DATA_PER_NON_ZEROG_TX_DATA_STANDARD_TOKEN_COSTGAS_TX_DATA_TOKEN_STANDARDG_TX_DATA_FLOOR_TOKEN_COSTGAS_TX_DATA_TOKEN_FLOORG_LOGGAS_LOGG_LOG_DATAGAS_LOG_DATA_PER_BYTEG_LOG_TOPICGAS_LOG_TOPICG_KECCAK_256GAS_KECCAK256G_KECCAK_256_WORDGAS_KECCAK256_PER_WORDG_COPYGAS_COPYG_BLOCKHASHGAS_BLOCK_HASHG_AUTHORIZATIONGAS_AUTH_PER_EMPTY_ACCOUNTG_PRECOMPILE_ECRECOVERGAS_PRECOMPILE_ECRECOVERG_PRECOMPILE_SHA256_BASEGAS_PRECOMPILE_SHA256_BASEG_PRECOMPILE_SHA256_WORDGAS_PRECOMPILE_SHA256_PER_WORDG_PRECOMPILE_RIPEMD160_BASEGAS_PRECOMPILE_RIPEMD160_BASEG_PRECOMPILE_RIPEMD160_WORDGAS_PRECOMPILE_RIPEMD160_PER_WORDG_PRECOMPILE_IDENTITY_BASEG_PRECOMPILE_IDENTITY_BASEG_PRECOMPILE_IDENTITY_WORDGAS_PRECOMPILE_IDENTITY_PER_WORDG_PRECOMPILE_ECADDGAS_PRECOMPILE_ECADDG_PRECOMPILE_ECMULGAS_PRECOMPILE_ECMULG_PRECOMPILE_ECPAIRING_BASEGAS_PRECOMPILE_ECPAIRING_BASEG_PRECOMPILE_ECPAIRING_PER_POINTGAS_PRECOMPILE_ECPAIRING_PER_POINTG_PRECOMPILE_BLAKE2F_BASEGAS_PRECOMPILE_BLAKE2F_BASEG_PRECOMPILE_BLAKE2F_PER_ROUNDGAS_PRECOMPILE_BLAKE2F_PER_ROUNDG_PRECOMPILE_BLS_G1ADDGAS_PRECOMPILE_BLS_G1ADDG_PRECOMPILE_BLS_G1MULGAS_PRECOMPILE_BLS_G1MULG_PRECOMPILE_BLS_G1MAPGAS_PRECOMPILE_BLS_G1MAPG_PRECOMPILE_BLS_G2ADDGAS_PRECOMPILE_BLS_G2ADDG_PRECOMPILE_BLS_G2MULGAS_PRECOMPILE_BLS_G2MULG_PRECOMPILE_BLS_G2MAPGAS_PRECOMPILE_BLS_G2MAPG_PRECOMPILE_BLS_PAIRING_BASEGAS_PRECOMPILE_BLS_PAIRING_BASEG_PRECOMPILE_BLS_PAIRING_PER_PAIRGAS_PRECOMPILE_BLS_PAIRING_PER_PAIRG_PRECOMPILE_P256VERIFYGAS_PRECOMPILE_P256VERIFYR_STORAGE_CLEARREFUND_STORAGE_CLEARR_AUTHORIZATION_EXISTING_AUTHORITYREFUND_AUTH_PER_EXISTING_ACCOUNT🔗 Related Issues or PRs
Issue #1879
✅ Checklist
toxchecks to avoid unnecessary CI fails, see also Code Standards and Enabling Pre-commit Checks:uvx tox -e statictype(scope):.Cute Animal Picture
I (Louis) like Junji Ito.