Skip to content

chore: apply gnosis-specific changes on top of latest upstream sync#20

Open
chetna-mittal wants to merge 13 commits intosync/amsterdam-upstreamfrom
sync-upstream
Open

chore: apply gnosis-specific changes on top of latest upstream sync#20
chetna-mittal wants to merge 13 commits intosync/amsterdam-upstreamfrom
sync-upstream

Conversation

@chetna-mittal
Copy link
Copy Markdown

@chetna-mittal chetna-mittal commented Mar 28, 2026

🗒️ Description

Upstream File Replacements

During the upstream sync, a small subset of files was not updated. These files have been fully replaced with their upstream versions to ensure correctness and avoid partial merges.

  1. CI / Workflow Configuration
    .github/workflows/benchmark.yaml

  2. Testing Framework / CLI Plugins
    packages/testing/.../execute/rpc/chain_builder_eth_rpc.py
    packages/testing/.../execute/rpc/remote.py
    packages/testing/.../filler/filler.py
    packages/testing/.../filler/tests/test_prealloc_group.py

  3. Benchmark Tests
    tests/benchmark/compute/instruction/test_account_query.py
    tests/benchmark/stateful/bloatnet/test_single_opcode.py

  4. Fork Implementation
    src/ethereum/forks/amsterdam/state.py

  5. Fixtures / Testing Infrastructure
    packages/testing/.../fixtures/base.py
    packages/testing/.../fixtures/tests/test_collector.py

Gnosis Changes

  • Add cache-docker-images and load-docker-images action (taken from upstream -> modified for gnosis)
  • Deleted .github/configs/hive/gnosis.yaml and updated .github/configs/hive/latest.yaml for Gnosis
  • Adjusted forks.py to match the updated structure for system_contracts and pre_allocation_blockchain functions
  • Updated account code retrieval to align with upstream changes for paris and shanghai fork
  • Update tests/osaka/eip7825_transaction_gas_limit_cap/test_tx_gas_limit.py to match upstream (it passes in CI)
  • Updated tests/ported_static for cancun fork
  • Synced test.yaml workflow with upstream and reapplied Gnosis-specific changes on top

✅ Checklist

@chetna-mittal chetna-mittal self-assigned this Mar 28, 2026
@chetna-mittal chetna-mittal changed the base branch from forks/amsterdam to sync/amsterdam-upstream April 1, 2026 13:35
@chetna-mittal chetna-mittal changed the title chore: merge upstream changes chore: apply gnosis-specific changes on top of latest upstream sync Apr 1, 2026
@chetna-mittal chetna-mittal marked this pull request as ready for review April 2, 2026 08:57
@chetna-mittal chetna-mittal requested a review from dapplion April 2, 2026 08:57
Comment on lines +97 to +99
# - label: amsterdam
# from_fork: Amsterdam
# until_fork: Amsterdam
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Why comment out amsterdam?

Copy link
Copy Markdown
Author

@chetna-mittal chetna-mittal Apr 3, 2026

Choose a reason for hiding this comment

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

Gnosis-specific changes for the Amsterdam fork are still pending for t8n tool and will be addressed in a follow-up PR. Will enable this once those changes are in place.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants