Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ parameters:
# go-cache-version can be used as a cache buster when making breaking changes to caching strategy
go-cache-version:
type: string
default: "v0.0"
default: "v0.1"

orbs:
continuation: circleci/continuation@2.0.1
Expand Down
6 changes: 1 addition & 5 deletions .circleci/continue/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ parameters:
# go-cache-version can be used as a cache buster when making breaking changes to caching strategy
c-go-cache-version:
type: string
default: "v0.0"
default: "v0.1"
# Workflow activation flags (set by the decision tree in config.yml)
c-run_main:
type: boolean
Expand Down Expand Up @@ -896,10 +896,6 @@ jobs:
command: |
mkdir -p ./tmp/test-results
mkdir -p ./tmp/testlogs
- run:
name: build Cannon example binaries
command: just elf # only compile ELF binaries with Go, we do not have MIPS GCC for creating the debug-dumps.
working_directory: cannon/testdata
- run:
name: Cannon Go lint
command: |
Expand Down
2 changes: 1 addition & 1 deletion .circleci/continue/rust-e2e.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ parameters:
default: us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-base-clang@sha256:852cb2dcd64eb5c039abf857a2217f341351eb7e4ef1a989ba9eefb86f158105
c-go-cache-version:
type: string
default: "v0.0"
default: "v0.1"
# Workflow activation flags (set by the decision tree in config.yml)
c-run_rust_e2e_ci:
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion cannon/Dockerfile.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.24.13-alpine3.22 AS builder
FROM golang:1.26.4-alpine3.22 AS builder

# Install just from GitHub releases to match the version pinned in mise.toml.
# The Alpine package is too old and doesn't support the [script] attribute
Expand Down
2 changes: 1 addition & 1 deletion cannon/Makefile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
DEPRECATED_TARGETS := cannon cannon64-impl cannon-embeds clean elf elf-go-current sanitize-program contract test cannon-stf-verify fuzz lint
DEPRECATED_TARGETS := cannon cannon64-impl cannon-embeds clean diff-hello-elf sanitize-program contract test cannon-stf-verify fuzz lint

include ../justfiles/deprecated.mk

Expand Down
18 changes: 7 additions & 11 deletions cannon/justfile
Original file line number Diff line number Diff line change
Expand Up @@ -31,13 +31,9 @@ cannon-embeds: cannon64-impl
clean:
rm -rf bin multicannon/embeds/cannon*

# Build ELF test binaries
elf:
just ./testdata/elf

# Build ELF test binaries for current Go version
elf-go-current:
just ./testdata/go-1-24/elf
# Build minimal hello ELF for diff-cannon parity checks
diff-hello-elf:
just ./testdata/diff-hello-elf

# Check guest program for unsupported MIPS instructions
sanitize-program:
Expand All @@ -56,18 +52,18 @@ contract:
cd ../packages/contracts-bedrock && forge build

# Run tests
test: elf contract
test: contract
@just go_test "./..."

# Compare cannon output against OTHER_CANNON for a given VM type
diff-cannon VM: cannon elf-go-current
diff-cannon VM: cannon diff-hello-elf
#!/usr/bin/env bash
set -euo pipefail
VM="{{VM}}"
echo "Running diff for VM type ${VM}"
# Load an elf file to create a prestate, and check that both cannon versions generate the same prestate
$OTHER_CANNON load-elf --type "$VM" --path ./testdata/go-1-24/bin/hello.64.elf --out ./bin/prestate-other.bin.gz --meta ""
./bin/cannon load-elf --type "$VM" --path ./testdata/go-1-24/bin/hello.64.elf --out ./bin/prestate.bin.gz --meta ""
$OTHER_CANNON load-elf --type "$VM" --path ./testdata/bin/hello.64.elf --out ./bin/prestate-other.bin.gz --meta ""
./bin/cannon load-elf --type "$VM" --path ./testdata/bin/hello.64.elf --out ./bin/prestate.bin.gz --meta ""
cmp ./bin/prestate-other.bin.gz ./bin/prestate.bin.gz
if [ $? -eq 0 ]; then
echo "Generated identical prestates"
Expand Down
Loading
Loading