Skip to content

cannon: Default to cannon VM version 8 #18062

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 3 commits into from
Oct 28, 2025
Merged

cannon: Default to cannon VM version 8 #18062

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7254694
Bump 'current' cannon vm to version 8
mbaxter Oct 28, 2025
dbec19d
Update docker diff check
mbaxter Oct 28, 2025
71ea701
Always build "next" version of cannon
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
12 changes: 6 additions & 6 deletions cannon/Dockerfile.diff
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,14 @@ ARG GIT_DATE

ARG TARGETOS TARGETARCH

FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.5.0-alpha.1 AS cannon-multithreaded64-4
FROM --platform=$BUILDPLATFORM us-docker.pkg.dev/oplabs-tools-artifacts/images/cannon:v1.6.0 AS cannon-multithreaded64-5

FROM --platform=$BUILDPLATFORM builder AS cannon-verify
COPY --from=cannon-multithreaded64-4 /usr/local/bin/cannon /usr/local/bin/cannon-multithreaded64-4
COPY --from=cannon-multithreaded64-5 /usr/local/bin/cannon /usr/local/bin/cannon-multithreaded64-5

# Check cannon-multithreaded64-4
# verify the latest multithreaded VM behavior against multithreaded64-4
RUN cd cannon && make diff-multithreaded64-4-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-4
# Check cannon-multithreaded64-5
# verify the latest multithreaded VM behavior against multithreaded64-5
RUN cd cannon && make diff-multithreaded64-5-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-5
RUN --mount=type=cache,target=/root/.cache/go-build cd cannon && \
make diff-multithreaded64-4-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-4 \
make diff-multithreaded64-5-cannon -e OTHER_CANNON=/usr/local/bin/cannon-multithreaded64-5 \
GOOS=$TARGETOS GOARCH=$TARGETARCH GITCOMMIT=$GIT_COMMIT GITDATE=$GIT_DATE
2 changes: 1 addition & 1 deletion cannon/mipsevm/versions/version.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func GetStateVersionStrings() []string {

// GetCurrentVersion returns the current default version.
func GetCurrentVersion() StateVersion {
return VersionMultiThreaded64_v4
return VersionMultiThreaded64_v5
}

// GetExperimentalVersion returns the newest in-development version of Cannon if it exists, otherwise returns the same
Expand Down
2 changes: 1 addition & 1 deletion op-program/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ check-custom-chains: op-program-host

reproducible-prestate: check-custom-chains
@docker build --build-arg GO_VERSION=1.24.2-alpine3.21 --build-arg EXPORT_TARGET=next --output ./bin/ --progress plain -f Dockerfile.repro ../
@docker build --build-arg GO_VERSION=1.23.8-alpine3.21 --build-arg EXPORT_TARGET=current --output ./bin/ --progress plain -f Dockerfile.repro ../
@docker build --build-arg GO_VERSION=1.24.2-alpine3.21 --build-arg EXPORT_TARGET=current --output ./bin/ --progress plain -f Dockerfile.repro ../
@echo "-------------------- Production Prestates --------------------"
@echo "\nCannon64 Absolute prestate hash: "
@cat ./bin/prestate-proof-mt64.json | jq -r .pre
Expand Down
5 changes: 2 additions & 3 deletions op-program/builder/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,6 @@ 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 @@ -107,7 +106,7 @@ func runBuildPrestates(cliCtx *cli.Context) error {
{programELF, versions.GetCurrentVersion(), "-mt64"},
{interopProgramELF, versions.GetCurrentVersion(), "-interop"},
}
if !releasesOnly && buildNext {
if !releasesOnly {
prestates = append(prestates, prestateInfo{programELF, versions.GetExperimentalVersion(), "-mt64Next"})
prestates = append(prestates, prestateInfo{interopProgramELF, versions.GetExperimentalVersion(), "-interopNext"})
}
Expand All @@ -118,7 +117,7 @@ func runBuildPrestates(cliCtx *cli.Context) error {
}
}

if !releasesOnly && !buildNext {
if !releasesOnly {
// 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
4 changes: 2 additions & 2 deletions op-program/repro.justfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ prestate TYPE CLIENT_SUFFIX PRESTATE_SUFFIX: cannon op-program-client-mips
--version {{TYPE}}\
--suffix {{PRESTATE_SUFFIX}}

build-mt64: (prestate "multithreaded64-4" "64" "-mt64")
build-mt64: (prestate "multithreaded64-5" "64" "-mt64")
build-mt64Next: (prestate "multithreaded64-5" "64" "-mt64Next")
build-interop: (prestate "multithreaded64-4" "-interop" "-interop")
build-interop: (prestate "multithreaded64-5" "-interop" "-interop")
build-interopNext: (prestate "multithreaded64-5" "-interop" "-interopNext")

build-current: build-mt64 build-interop
Expand Down