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 cannon/Dockerfile.diff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM golang:1.23.8-alpine3.21 AS builder
FROM golang:1.24.10-alpine3.21 AS builder

RUN apk add --no-cache make bash

Expand Down
6 changes: 3 additions & 3 deletions cannon/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ elf:
make -C ./testdata elf

elf-go-current:
make -C ./testdata/go-1-23 elf
make -C ./testdata/go-1-24 elf

sanitize-program:
mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM > ./bin/dump.txt
Expand All @@ -64,8 +64,8 @@ diff-%-cannon: cannon elf-go-current
# Load an elf file to create a prestate, and check that both cannon versions generate the same prestate
@VM=$*; \
echo "Running diff for VM type $${VM}"; \
$$OTHER_CANNON load-elf --type $$VM --path ./testdata/go-1-23/bin/hello.64.elf --out ./bin/prestate-other.bin.gz --meta ""; \
./bin/cannon load-elf --type $$VM --path ./testdata/go-1-23/bin/hello.64.elf --out ./bin/prestate.bin.gz --meta "";
$$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 "";
@cmp ./bin/prestate-other.bin.gz ./bin/prestate.bin.gz;
@if [ $$? -eq 0 ]; then \
echo "Generated identical prestates"; \
Expand Down
1 change: 0 additions & 1 deletion cannon/mipsevm/multithreaded/instrumented_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,6 @@ func runTestsAcrossVms[T any](t *testing.T, testNamer TestNamer[T], testCases []
}

variations := []VMVariations{
{name: "Go 1.23 VM", goTarget: testutil.Go1_23, features: mipsevm.FeatureToggles{}},
{name: "Go 1.24 VM", goTarget: testutil.Go1_24, features: allFeaturesEnabled()},
{name: "Go 1.25 VM", goTarget: testutil.Go1_25, features: allFeaturesEnabled()},
}
Expand Down
4 changes: 2 additions & 2 deletions cannon/mipsevm/multithreaded/state_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ func TestState_EncodeWitness(t *testing.T) {
}

func TestState_JSONCodec(t *testing.T) {
elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.64.elf")
elfProgram, err := elf.Open("../../testdata/go-1-24/bin/hello.64.elf")
require.NoError(t, err, "open ELF file")
state, err := program.LoadELF(elfProgram, CreateInitialState)
require.NoError(t, err, "load ELF into state")
Expand Down Expand Up @@ -138,7 +138,7 @@ func TestState_JSONCodec(t *testing.T) {
}

func TestState_Binary(t *testing.T) {
elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.64.elf")
elfProgram, err := elf.Open("../../testdata/go-1-24/bin/hello.64.elf")
require.NoError(t, err, "open ELF file")
state, err := program.LoadELF(elfProgram, CreateInitialState)
require.NoError(t, err, "load ELF into state")
Expand Down
2 changes: 1 addition & 1 deletion cannon/mipsevm/tests/helpers.go
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ func GetMipsVersionTestCases(t require.TestingT) []VersionedVMTestCase {
var cases []VersionedVMTestCase
for _, version := range versions.StateVersionTypes {
if !arch.IsMips32 && versions.IsSupportedMultiThreaded64(version) {
goTarget := testutil.Go1_23
goTarget := testutil.Go1_24
features := versions.FeaturesForVersion(version)
if features.SupportWorkingSysGetRandom {
goTarget = testutil.Go1_25
Expand Down
1 change: 0 additions & 1 deletion cannon/mipsevm/testutil/elf.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import (
type GoTarget string

const (
Go1_23 GoTarget = "go-1-23"
Go1_24 GoTarget = "go-1-24"
Go1_25 GoTarget = "go-1-25"
)
Expand Down
2 changes: 1 addition & 1 deletion cannon/mipsevm/testutil/evm.go
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func NewEVMEnv(t testing.TB, contracts *ContractMetadata) (*vm.EVM, *state.State

env := vm.NewEVM(blockContext, state, chainCfg, vmCfg)
// pre-deploy the contracts
env.StateDB.SetCode(contracts.Addresses.Oracle, contracts.Artifacts.Oracle.DeployedBytecode.Object)
env.StateDB.SetCode(contracts.Addresses.Oracle, contracts.Artifacts.Oracle.DeployedBytecode.Object, tracing.CodeChangeUnspecified)

var ctorArgs []byte
if contracts.Version == 0 { // Old MIPS.sol doesn't specify the state version in the constructor
Expand Down
7 changes: 1 addition & 6 deletions cannon/testdata/Makefile
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
all: elf

go1-23:
make -C ./go-1-23 elf
.PHONY: go1-23

go1-24:
make -C ./go-1-24 elf
.PHONY: go1-24
Expand All @@ -13,10 +9,9 @@ go1-25:
.PHONY: go1-25

.PHONY: elf
elf: go1-23 go1-24 go1-25
elf: go1-24 go1-25

.PHONY: clean
clean:
make -C ./go-1-23 clean
make -C ./go-1-24 clean
make -C ./go-1-25 clean
4 changes: 2 additions & 2 deletions cannon/testdata/common/go.mod
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
module common

go 1.23
go 1.24

toolchain go1.23.8
toolchain go1.24.10
28 changes: 0 additions & 28 deletions cannon/testdata/go-1-23/Makefile

This file was deleted.

14 changes: 0 additions & 14 deletions cannon/testdata/go-1-23/alloc/go.mod

This file was deleted.

12 changes: 0 additions & 12 deletions cannon/testdata/go-1-23/alloc/go.sum

This file was deleted.

38 changes: 0 additions & 38 deletions cannon/testdata/go-1-23/alloc/main.go

This file was deleted.

14 changes: 0 additions & 14 deletions cannon/testdata/go-1-23/claim/go.mod

This file was deleted.

12 changes: 0 additions & 12 deletions cannon/testdata/go-1-23/claim/go.sum

This file was deleted.

54 changes: 0 additions & 54 deletions cannon/testdata/go-1-23/claim/main.go

This file was deleted.

5 changes: 0 additions & 5 deletions cannon/testdata/go-1-23/entry/go.mod

This file was deleted.

30 changes: 0 additions & 30 deletions cannon/testdata/go-1-23/entry/main.go

This file was deleted.

5 changes: 0 additions & 5 deletions cannon/testdata/go-1-23/hello/go.mod

This file was deleted.

7 changes: 0 additions & 7 deletions cannon/testdata/go-1-23/hello/main.go

This file was deleted.

11 changes: 0 additions & 11 deletions cannon/testdata/go-1-23/keccak/go.mod

This file was deleted.

4 changes: 0 additions & 4 deletions cannon/testdata/go-1-23/keccak/go.sum

This file was deleted.

16 changes: 0 additions & 16 deletions cannon/testdata/go-1-23/keccak/main.go

This file was deleted.

Loading