Skip to content

[migrate-subnet-evm][2] Add graft/subnet-evm/ #4654

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.

Sign up for GitHub

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

Jump to bottom
Draft
wants to merge 1,349 commits into
base: JonathanOppenheimer/migrate-subnet-evm-add-tooling
Choose a base branch
from
Draft

[migrate-subnet-evm][2] Add graft/subnet-evm/ #4654

wants to merge 1,349 commits into from

Conversation

@JonathanOppenheimer
Copy link
Member

@JonathanOppenheimer JonathanOppenheimer commented Dec 3, 2025 •
edited
Loading

Why this should be merged

Migrates subnet-evm to graft/subnet-evm as per #4645.

Note that this PR is not in it's final form and will be rebased as more code changes are made in Subnet-EVM to make it compliant with AvalancheGo. See #4645 for a list of PRs that still need to be merged.

This PR was made now to surface any unforeseen CI issues.

As per @maru-ava:

This is basically impossible to review directly, so reviewers are encouraged to review the script that performed the merge and to reproduce the branch locally to gain confidence that this PR represents the results of that script.

cd graft
task subnet-evm-subtree-merge

How this works

See #4531

How this was tested

  • CI will pass only once child PRs are merged into this one

Need to be documented in RELEASES.md?

N/A

qdm12 and others added 30 commits April 1, 2025 10:10
@qdm12
chore(core/rawdb): InspectDatabase uses libevm
292f3df 
- Part of the core/rawdb migration to use libevm
- Using libevm `InspectDatabase`
- Define options passed to libevm `InspectDatabase`

See original PR ava-labs/coreth#791
@qdm12 @ARR4N
chore(core/rawdb): use libevm core/rawdb
2768dd5 
- Move our own code to `_ext.go` files
- Import symbols from libevm in imports.go

See original PR ava-labs/coreth#772

Co-authored-by: Arran Schlosberg <[email protected]>
@qdm12
fix(core/evm): set difficulty post shanghai to 0
a183ff8 
See original PR ava-labs/coreth#832
@qdm12
chore(rawdb): migration to plugin/evm/rawdb
0ffb624 
See original PR ava-labs/coreth#851
@qdm12
refactor(core/types): add WithHeaderExtra helper function
c74aa9e 
See original PR ava-labs/coreth#855
@qdm12
chore(ci): check gencodec generated files are up to date
8664cbf 
- fix generation of code using type aliases and Go 1.23
- reproducible generation locally (pin gencodec version)
- CI keeps generated Go files up to date with other source code
- Generate missing files

See original PR ava-labs/coreth#856
@qdm12 @ARR4N
refactor(core/rawdb): table-driven InspectDatabase config
821575f 
See original PR ava-labs/coreth#850

Co-authored-by: Arran Schlosberg <[email protected]>
@ARR4N @qdm12
chore(plugin/evm): log libevm version during VM init
dc4f237 
See original PR ava-labs/coreth#871
@qdm12
refactor(core/types): separate subnet-evm and upstream identifiers
bded714 
Reduces overlap between subnet-evm and upstream files:
- Types and variables that are identical to `libevm` are moved to `imports.go`.
- Files that include only `subnet-evm` have the `_ext.go` suffix added.

See original PR ava-labs/coreth#872
@ARR4N @qdm12
chore: remove unused libevm directory
c5a9a76 
These packages are unused and were just copies from the `ava-labs/libevm` repo.

See original PR ava-labs/coreth#876
@ARR4N @qdm12
chore: disallow direct libevm/params import
f5364a1 
Until a complete transition to a `libevm` package, it shouldn't be allowed to be imported directly.

Remove the package from the allowed list and move a `types` test into `package types_test` to avoid a circular dependency.

See original PR ava-labs/coreth#874
@ARR4N @qdm12
refactor: use upstream core/types
b45b79a 
Complete the transition of `core/types` to upstream code.

Note that the previous commit results in _all_ upstream types / vars / consts being in the `imports.go` file. This results in a strict partition of upstream and local identifiers so it is safe to simply change import paths.

1. Globally change all imports from `subnet-evm/core/types` to `libevm/core/types`;
2. Rename all `subnet-evm/core/types` imports to `customtypes` for ease of review here;
3. Dot import `libevm/core/types` in tests only to avoid hundreds of noisy changes.

See original PR ava-labs/coreth#875
@ARR4N @qdm12
refactor: move core/types to plugin/evm/types
d393209 
The `types` package now only contains `coreth` logic an nothing from upstream so it shouldn't live in the same location in the repo.

Automated:

```shell
$ git mv core/types plugin/evm/types
$ find -name '*.go' | xargs sed -i 's|"github.com/ava-labs/coreth/core/types"|"github.com/ava-labs/coreth/plugin/evm/types"|'
$ golangci-lint run --fix
```

See original PR ava-labs/coreth#877
@qdm12
chore(rawdb): move plugin/evm/rawdb to plugin/evm/customrawdb
4395f6e 
See original PR ava-labs/coreth#888
@qdm12
chore(interfaces): use upstream code
fa576f0 
- import interfaces from github.com/ava-labs/libevm directly
- import `NotFound` error from github.com/ava-labs/libevm directly
- Keep our two subnet-evm-specific interfaces at interfaces/interfaces.go

See original PR ava-labs/coreth#883
@qdm12
chore(types): move plugin/evm/types to plugin/evm/customtypes
d6e4708 
See original PR ava-labs/coreth#890
@qdm12 @ARR4N
chore(all): final changes to the libevm branch
08e92ea 
Changes applied from comments on the review of ava-labs/coreth#820

See original PR ava-labs/coreth#862

Signed-off-by: Quentin McGaw <[email protected]>
Co-authored-by: Arran Schlosberg <[email protected]>
@qdm12
fix(cd): goreleaser picks non-rc tag and uses workflow config (#1544)
0abb00e
@qdm12 @maru-ava
chore(ci): simplify monitoring configuration (re-apply #1440) (#1545)
8b0ef32 
Signed-off-by: maru <[email protected]>
Co-authored-by: maru <[email protected]>
Co-authored-by: Darioush Jalali <[email protected]>
@qdm12
Merge branch 'master' into libevm
4f496a0
@qdm12
fix(all): critical fixes to the libevm branch (#1551)
220454e 
- add missing fee config block for `params.ChainConfig` `Description` method and add test
- add missing fee config block for `params.ChainConfig` `Verify` method and add test
- add test for `params.SetEthUpgrades`
- add comment on the usage of `params.SetEthUpgrades` in genesis
@dependabot
chore(ci): bump github/codeql-action from 3.28.13 to 3.28.15 (#1557)
637948c 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@Lubov66 @ceyonur
docs(readme): add release badge (#1511)
047cbd1 
Signed-off-by: Lubov66 <[email protected]>
Co-authored-by: Ceyhun Onur <[email protected]>
@operagxsasha
docs(readme): add license badge (#1444)
53dad3d 
Signed-off-by: Oleg <[email protected]>
@ceyonur
wrap corruptable db (#1565)
36cf93c
@ceyonur @martineckardt
@michaelkaplan13 @qdm12
Docker image combined tag (#1566)
1ab7114 
Signed-off-by: Martin Eckardt <[email protected]>
Signed-off-by: Ceyhun Onur <[email protected]>
Co-authored-by: Martin Eckardt <[email protected]>
Co-authored-by: Michael Kaplan <[email protected]>
Co-authored-by: Quentin McGaw <[email protected]>
@ceyonur
Fix docker image push (#1571)
c56a534
@qdm12
chore(all): use upstream protocol params (#1563)
28ea93a
@qdm12
chore(all): minor changes post-libevm merge (#1552)
b1d4d89
@qdm12
chore(github): dependabot ignore some actions and Go modules (#1527)
9dc0390
alarso16 and others added 9 commits December 1, 2025 20:13
@alarso16 @StephenButtolph
sync: coreth PR #1363,1384: test: Fix rpc flakes (#1833)
0ffc4e9 
Signed-off-by: Austin Larson <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@JonathanOppenheimer @alarso16
sync: coreth PR #1394: ci: Missing test import lint (#1869)
16086f9 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
@ceyonur
use vm connected/disconnected methods (#1884)
15ab729
@JonathanOppenheimer @alarso16 @ceyonur
sync: coreth PR #963,981,1009: sync package extension and related ite…
50ef4ab 
…ms (#1679)

Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Ceyhun Onur <[email protected]>
@JonathanOppenheimer @alarso16
sync: coreth PR #1404: ci: Filters test corrections (#1889)
41dcaf8 
Co-authored-by: Austin Larson <[email protected]>
@ceyonur @alarso16
sync: coreth PR #1421: chore: Update avalanchego and add Helicon (#1883)
11f83cb 
Co-authored-by: Austin Larson <[email protected]>
@JonathanOppenheimer @alarso16 @ceyonur
sync: coreth PR #1407 build: remove unneeded dependencies (#1888)
3df1285 
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Ceyhun Onur <[email protected]>
@JonathanOppenheimer @alarso16
sync: coreth PR #1424: fix license header (#1891)
cb45407 
Co-authored-by: Austin Larson <[email protected]>
@JonathanOppenheimer @ceyonur
feat: convert fee manager npm test to go test (#1885)
f51a213 
Co-authored-by: Ceyhun Onur <[email protected]>
@JonathanOppenheimer JonathanOppenheimer self-assigned this Dec 3, 2025
@JonathanOppenheimer JonathanOppenheimer changed the title [migrate-subnet-evm][2] Add 'graft/subnet-evm/' [migrate-subnet-evm][2] Add graft/subnet-evm/ Dec 3, 2025
@JonathanOppenheimer JonathanOppenheimer added the DO NOT MERGE This PR must not be merged in its current state label Dec 3, 2025
@JonathanOppenheimer JonathanOppenheimer moved this to Ready 🚦 in avalanchego Dec 3, 2025
@JonathanOppenheimer JonathanOppenheimer moved this from Ready 🚦 to In Progress 🏗️ in avalanchego Dec 3, 2025
JonathanOppenheimer and others added 11 commits December 4, 2025 15:53
@JonathanOppenheimer
chore: remove dead t8n code (#1901)
718aee3
@JonathanOppenheimer @alarso16 @StephenButtolph
sync: coreth PR #1271: style: enable depguard linter (#1886)
2aa48f2 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@alarso16
ci: Remove test retries (#1877)
d0c3738
@JonathanOppenheimer
sync: coreth PR #1371: remove customlogs package (#1887)
d3e9aa3 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
@JonathanOppenheimer @alarso16
sync: coreth PR #1303 style: Use require.ErrorIs whenever possible (#…
f18aa6f 
…1875)

Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
@alarso16 @JonathanOppenheimer @StephenButtolph
sync: coreth PR #1203: style: enable errcheck linter (#1876)
f47b419 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Stephen Buttolph <[email protected]>
@JonathanOppenheimer @ceyonur
sync: coreth PR #1423: add min delay metrics (#1890)
8934633 
Co-authored-by: Ceyhun Onur <[email protected]>
@JonathanOppenheimer @alarso16 @michaelkaplan13
sync: coreth PR #1392: chore: Add lint link check job (#1870)
6cb4b21 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
Co-authored-by: Austin Larson <[email protected]>
Co-authored-by: Michael Kaplan <[email protected]>
@ceyonur @StephenButtolph
chore: Update AvalancheGo version (#1896)
9debbd4 
Co-authored-by: Stephen Buttolph <[email protected]>
@JonathanOppenheimer
feat: convert tx allow list npm test to go test (#1897)
73a35d3 
Signed-off-by: Jonathan Oppenheimer <[email protected]>
@JonathanOppenheimer
Add 'graft/subnet-evm/' from commit '73a35d3cf7623df458475cb3946bc891…
4770bda 
…9a4455ba'

git-subtree-dir: graft/subnet-evm
git-subtree-mainline: aea2f58
git-subtree-split: 73a35d3
@JonathanOppenheimer JonathanOppenheimer force-pushed the JonathanOppenheimer/migrate-subnet-evm-subtree-merge branch from 445324f to 4770bda Compare December 4, 2025 22:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@meaghanfitzgerald meaghanfitzgerald Awaiting requested review from meaghanfitzgerald meaghanfitzgerald will be requested when the pull request is marked ready for review meaghanfitzgerald is a code owner

@StephenButtolph StephenButtolph Awaiting requested review from StephenButtolph StephenButtolph will be requested when the pull request is marked ready for review StephenButtolph is a code owner

Assignees

@JonathanOppenheimer JonathanOppenheimer

Labels

DO NOT MERGE This PR must not be merged in its current state evm monorepo subnet-evm

Projects

avalanchego
Status: In Progress 🏗️

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.