Skip to content

Commit 6ba2f38

Browse files
joshklopInphi
andauthored
all: upgrade op-geth (#18214)
* lsp fixes * update go versions, delete cannon go1.23 modules * remove dead code that was panicking * go mod tidy in cannon modules * op-program: Update baseline cannon report * update geth to synctest tag --------- Co-authored-by: inphi <[email protected]>
1 parent 33c206c commit 6ba2f38

File tree

110 files changed

+4976
-10969
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+4976
-10969
lines changed

cannon/Dockerfile.diff

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.23.8-alpine3.21 AS builder
1+
FROM golang:1.24.10-alpine3.21 AS builder
22

33
RUN apk add --no-cache make bash
44

cannon/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ elf:
4242
make -C ./testdata elf
4343

4444
elf-go-current:
45-
make -C ./testdata/go-1-23 elf
45+
make -C ./testdata/go-1-24 elf
4646

4747
sanitize-program:
4848
mips-linux-gnu-objdump -d -j .text $$GUEST_PROGRAM > ./bin/dump.txt
@@ -64,8 +64,8 @@ diff-%-cannon: cannon elf-go-current
6464
# Load an elf file to create a prestate, and check that both cannon versions generate the same prestate
6565
@VM=$*; \
6666
echo "Running diff for VM type $${VM}"; \
67-
$$OTHER_CANNON load-elf --type $$VM --path ./testdata/go-1-23/bin/hello.64.elf --out ./bin/prestate-other.bin.gz --meta ""; \
68-
./bin/cannon load-elf --type $$VM --path ./testdata/go-1-23/bin/hello.64.elf --out ./bin/prestate.bin.gz --meta "";
67+
$$OTHER_CANNON load-elf --type $$VM --path ./testdata/go-1-24/bin/hello.64.elf --out ./bin/prestate-other.bin.gz --meta ""; \
68+
./bin/cannon load-elf --type $$VM --path ./testdata/go-1-24/bin/hello.64.elf --out ./bin/prestate.bin.gz --meta "";
6969
@cmp ./bin/prestate-other.bin.gz ./bin/prestate.bin.gz;
7070
@if [ $$? -eq 0 ]; then \
7171
echo "Generated identical prestates"; \

cannon/mipsevm/multithreaded/instrumented_test.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,6 @@ func runTestsAcrossVms[T any](t *testing.T, testNamer TestNamer[T], testCases []
447447
}
448448

449449
variations := []VMVariations{
450-
{name: "Go 1.23 VM", goTarget: testutil.Go1_23, features: mipsevm.FeatureToggles{}},
451450
{name: "Go 1.24 VM", goTarget: testutil.Go1_24, features: allFeaturesEnabled()},
452451
{name: "Go 1.25 VM", goTarget: testutil.Go1_25, features: allFeaturesEnabled()},
453452
}

cannon/mipsevm/multithreaded/state_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ func TestState_EncodeWitness(t *testing.T) {
101101
}
102102

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

140140
func TestState_Binary(t *testing.T) {
141-
elfProgram, err := elf.Open("../../testdata/go-1-23/bin/hello.64.elf")
141+
elfProgram, err := elf.Open("../../testdata/go-1-24/bin/hello.64.elf")
142142
require.NoError(t, err, "open ELF file")
143143
state, err := program.LoadELF(elfProgram, CreateInitialState)
144144
require.NoError(t, err, "load ELF into state")

cannon/mipsevm/tests/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func GetMipsVersionTestCases(t require.TestingT) []VersionedVMTestCase {
8888
var cases []VersionedVMTestCase
8989
for _, version := range versions.StateVersionTypes {
9090
if !arch.IsMips32 && versions.IsSupportedMultiThreaded64(version) {
91-
goTarget := testutil.Go1_23
91+
goTarget := testutil.Go1_24
9292
features := versions.FeaturesForVersion(version)
9393
if features.SupportWorkingSysGetRandom {
9494
goTarget = testutil.Go1_25

cannon/mipsevm/testutil/elf.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ import (
1313
type GoTarget string
1414

1515
const (
16-
Go1_23 GoTarget = "go-1-23"
1716
Go1_24 GoTarget = "go-1-24"
1817
Go1_25 GoTarget = "go-1-25"
1918
)

cannon/mipsevm/testutil/evm.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ func NewEVMEnv(t testing.TB, contracts *ContractMetadata) (*vm.EVM, *state.State
107107

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

112112
var ctorArgs []byte
113113
if contracts.Version == 0 { // Old MIPS.sol doesn't specify the state version in the constructor

cannon/testdata/Makefile

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,5 @@
11
all: elf
22

3-
go1-23:
4-
make -C ./go-1-23 elf
5-
.PHONY: go1-23
6-
73
go1-24:
84
make -C ./go-1-24 elf
95
.PHONY: go1-24
@@ -13,10 +9,9 @@ go1-25:
139
.PHONY: go1-25
1410

1511
.PHONY: elf
16-
elf: go1-23 go1-24 go1-25
12+
elf: go1-24 go1-25
1713

1814
.PHONY: clean
1915
clean:
20-
make -C ./go-1-23 clean
2116
make -C ./go-1-24 clean
2217
make -C ./go-1-25 clean

cannon/testdata/common/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module common
22

3-
go 1.23
3+
go 1.24
44

5-
toolchain go1.23.8
5+
toolchain go1.24.10

cannon/testdata/go-1-23/Makefile

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)