Merge branch 'evm-upgrades' into pedro/eip-7883

Author: otherview

.github/workflows/go-mod-check.yaml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
           cache: false
 
       - name: go mod tidy

.github/workflows/gosec.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
           cache: false
       - name: Run Gosec
         id: gosec-run

.github/workflows/lint-go.yaml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
           cache: false
 
       - name: Check `builtins` directory
@@ -31,7 +31,7 @@ jobs:
       - name: golangci-lint
         uses: golangci/golangci-lint-action@4afd733a84b1f43292c63897423277bb7f4313a9 # v8
         with:
-          version: v2.6.2
+          version: v2.11.3
           # use the default if on main branch, otherwise use the pull request config
           args: --timeout=30m --config=.golangci.yml
           only-new-issues: false

.github/workflows/permutation-testing.yaml

@@ -26,7 +26,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
 
       - name: Run Permutation Tests
         env:

.github/workflows/release-binaries.yaml

@@ -51,7 +51,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
 
       - name: Build Binary
         shell: bash
@@ -105,7 +105,7 @@ jobs:
 
       - uses: actions/setup-go@v5
         with:
-          go-version: 1.25
+          go-version: 1.26
 
       - name: Build Binary
         shell: pwsh

.github/workflows/test-rosetta.yaml

@@ -16,11 +16,11 @@ permissions:
 
 jobs:
   run-solo-tests:
-    name: Run Solo e2e Tests
+    name: Run Rosetta e2e Tests
     runs-on: ubuntu-latest
     env:
-      NETWORK: solo
-      TEST_NETWORK: solo
+      NETWORK: custom
+      TEST_NETWORK: custom
       MODE: online
     steps:
       - name: Set Rosetta repo reference

.github/workflows/test-smoke.yaml

@@ -61,7 +61,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: '1.25.x'
+          go-version: '1.26.x'
       - name: Start Thor Node
         run: |
           docker run -d --name thor-node \

.github/workflows/test.yaml

@@ -14,7 +14,7 @@ jobs:
   unit_tests:
     strategy:
       matrix:
-        go-version: [1.25.x]
+        go-version: [1.26.x]
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
@@ -42,7 +42,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.x
+          go-version: 1.26.x
 
       - name: Make all
         run: make all
@@ -72,7 +72,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v5
         with:
-          go-version: 1.25.x
+          go-version: 1.26.x
 
       - name: Make all
         run: make thor

Dockerfile

@@ -1,5 +1,5 @@
 # Build thor in a stock Go builder container
-FROM golang:1.25.4-alpine3.21 AS builder
+FROM golang:1.26.1-alpine AS builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 WORKDIR  /go/thor

Makefile

@@ -91,7 +91,7 @@ lint-fix: | go_version_check lint_command_check #@ Attempt to fix linting issues
 	@echo "running golangci-lint..."
 	@golangci-lint run --config .golangci.yml --fix
 	@echo "running modernize..."
-	@go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.20.0 --fix ./...
+	@go run golang.org/x/tools/gopls/internal/analysis/modernize/cmd/modernize@v0.21.1 --fix ./...
 	@echo "running builtin generator..."
 	@go generate ./builtin/gen
 	@echo "done."