Skip to content

cannon: Rework cannon "next" vm handling in e2e tests #18064

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

Merged
mbaxter merged 2 commits into from
Oct 29, 2025
Merged

cannon: Rework cannon "next" vm handling in e2e tests #18064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
298d625
Revert "Always build "next" version of cannon"
mbaxter Oct 28, 2025
47892b1
Only use 'next' cannon prestate if it differs from the current prestate
mbaxter Oct 28, 2025
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
7 changes: 6 additions & 1 deletion op-e2e/config/init.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import (
"sync"
"time"

"github.com/ethereum-optimism/optimism/cannon/mipsevm/versions"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/artifacts"
"github.com/ethereum-optimism/optimism/op-deployer/pkg/deployer/inspect"
Expand Down Expand Up @@ -488,7 +489,11 @@ func cannonPrestate(monorepoRoot string, allocType AllocType) common.Hash {
once = &cannonPrestateMTOnce
cacheVar = &cannonPrestateMT
} else if cannonVmType == state.VMTypeCannonNext {
filename = "prestate-proof-mt64Next.json"
if versions.GetCurrentVersion() != versions.GetExperimentalVersion() {
filename = "prestate-proof-mt64Next.json"
} else {
filename = "prestate-proof-mt64.json"
}
once = &cannonPrestateMTNextOnce
cacheVar = &cannonPrestateMTNext
} else {
Expand Down
5 changes: 3 additions & 2 deletions op-program/builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ func runBuildPrestates(cliCtx *cli.Context) error {
logger := setupLogger()
ctx := cliCtx.Context
releasesOnly := cliCtx.Bool("releases-only")
buildNext := versions.GetCurrentVersion() != versions.GetExperimentalVersion()

root, err := opservice.FindMonorepoRoot(".")
if err != nil {
Expand All @@ -106,7 +107,7 @@ func runBuildPrestates(cliCtx *cli.Context) error {
{programELF, versions.GetCurrentVersion(), "-mt64"},
{interopProgramELF, versions.GetCurrentVersion(), "-interop"},
}
if !releasesOnly {
if !releasesOnly && buildNext {
prestates = append(prestates, prestateInfo{programELF, versions.GetExperimentalVersion(), "-mt64Next"})
prestates = append(prestates, prestateInfo{interopProgramELF, versions.GetExperimentalVersion(), "-interopNext"})
}
Expand All @@ -117,7 +118,7 @@ func runBuildPrestates(cliCtx *cli.Context) error {
}
}

if !releasesOnly {
if !releasesOnly && !buildNext {
// some tests expect a "next" prestate to exist. So let's fake them if they weren't built.
copies := []struct {
src, dst string
Expand Down