Upgrade to go 1.21 (#2676)

* upgrade to go 1.21 * go.mod * fix gosec
0xPolygonHermez · Oct 17, 2023 · 496d4a1 · 496d4a1
1 parent 1b8ba45
commit 496d4a1
Show file tree

Hide file tree

Showing 17 changed files with 69 additions and 18 deletions.
diff --git a/.github/workflows/jsonschema.yml b/.github/workflows/jsonschema.yml
@@ -14,7 +14,7 @@ jobs:
   json-schema:
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -15,7 +15,7 @@ jobs:
       - name: Install Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19.x
+          go-version: 1.21.x
       - name: Checkout code
         uses: actions/checkout@v3
       - name: Lint

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v3
         with:
-          go-version: 1.19
+          go-version: 1.21
 
       - name: Get packr
         run: go install github.com/gobuffalo/packr/v2/packr2@v2.8.3

diff --git a/.github/workflows/test-e2e.yml b/.github/workflows/test-e2e.yml
@@ -15,7 +15,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
         e2e-group: [ 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 ]
     runs-on: ubuntu-latest

diff --git a/.github/workflows/test-from-prover.yml b/.github/workflows/test-from-prover.yml
@@ -17,7 +17,7 @@ jobs:
 
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
         e2e-group: [ 2 ]
 

diff --git a/.github/workflows/test-full-non-e2e.yml b/.github/workflows/test-full-non-e2e.yml
@@ -14,7 +14,7 @@ jobs:
   test-full-non-e2e:
     strategy:
       matrix:
-        go-version: [ 1.19.x ]
+        go-version: [ 1.21.x ]
         goarch: [ "amd64" ]
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/updatedeps.yml b/.github/workflows/updatedeps.yml
@@ -14,7 +14,7 @@ jobs:
     - name: Install Go
       uses: actions/setup-go@v3
       with:
-        go-version: "1.19.x"
+        go-version: "1.21.x"
       env:
         GOARCH: "amd64"
 

diff --git a/Dockerfile b/Dockerfile
@@ -1,5 +1,5 @@
 # CONTAINER FOR BUILDING BINARY
-FROM golang:1.19 AS build
+FROM golang:1.21 AS build
 
 # INSTALL DEPENDENCIES
 RUN go install github.com/gobuffalo/packr/v2/packr2@v2.8.3

diff --git a/Makefile b/Makefile
@@ -102,7 +102,7 @@ stop: ## Stops all services
 
 .PHONY: install-linter
 install-linter: ## Installs the linter
-	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.52.2
+	curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $$(go env GOPATH)/bin v1.54.2
 
 .PHONY: lint
 lint: ## Runs the linter

diff --git a/README.md b/README.md
@@ -107,7 +107,7 @@ It's recommended to use `make` for building, and testing the code, ... Run `make
 
 ### Requirements
 
-- Go 1.19
+- Go 1.21
 - Docker
 - Docker Compose
 - Make

diff --git a/docs/ci/groups.md b/docs/ci/groups.md
@@ -37,7 +37,7 @@ for each of the jobs looks like this:
 ```
 strategy:
   matrix:
-    go-version: [ 1.19.x ]
+    go-version: [ 1.21.x ]
     goarch: [ "amd64" ]
     e2e-group: [ 1, 2, 3 ]
 ```
@@ -54,15 +54,15 @@ groups 1 and 3, the matrix strategy config should look like:
 ```
 strategy:
   matrix:
-    go-version: [ 1.19.x ]
+    go-version: [ 1.21.x ]
     goarch: [ "amd64" ]
     e2e-group: [ 2 ]
 ```
 If we want to re-add group 1:
 ```
 strategy:
   matrix:
-    go-version: [ 1.19.x ]
+    go-version: [ 1.21.x ]
     goarch: [ "amd64" ]
     e2e-group: [ 1, 2 ]
 ```

diff --git a/etherman/etherman_test.go b/etherman/etherman_test.go
@@ -431,7 +431,7 @@ func TestProof(t *testing.T) {
 	proof := "0x20227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a0520227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a05"
 	p, err := convertProof(proof)
 	require.NoError(t, err)
-	str := "20227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a05"
+	str := "20227cbcef731b6cbdc0edd5850c63dc7fbc27fb58d12cd4d08298799cf66a05" //nolint:gosec
 	proofReference, err := encoding.DecodeBytes(&str)
 	require.NoError(t, err)
 	var expected [32]byte

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/0xPolygonHermez/zkevm-node
 
-go 1.19
+go 1.21
 
 require (
 	github.com/0xPolygonHermez/zkevm-data-streamer v0.0.12
-Original file line number
+Diff line change
@@ Expand Up @@
     ### Requirements
-    - Go 1.19
+    - Go 1.21
     - Docker
     - Docker Compose
     - Make
@@ Expand Down @@