Bump dependencies

.github/workflows/ci.yml

@@ -27,9 +27,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.21.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -59,9 +59,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.21.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -87,9 +87,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.21.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -138,9 +138,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.21.x
+            go-version: 1.22.x
 
         - name: Install dependencies on Linux
           if: runner.os == 'Linux'
@@ -194,9 +194,9 @@ jobs:
             git submodule update --init --recursive --force
             git fetch --no-tags --prune --depth=1 origin +refs/heads/master:refs/remotes/origin/master
 
-        - uses: actions/setup-go@v3
+        - uses: actions/setup-go@v5
           with:
-            go-version: 1.21.x
+            go-version: 1.22.x
 
         - name: Checkout matic-cli
           uses: actions/checkout@v3

.github/workflows/codeql.yml

@@ -28,7 +28,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install Go
-        uses: actions/setup-go@v4
+        uses: actions/setup-go@v5
         with:
           go-version-file: go.mod
 

.github/workflows/govuln.yml

@@ -13,7 +13,7 @@ jobs:
         env:
           DEBUG: "true"
         with:
-          go-version: 1.21
+          go-version: 1.22
           package: ./...
           github-token: ${{ secrets.GITHUB_TOKEN }}
           fail-on-vuln: true

.github/workflows/packager.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
       - name: Adding TAG to ENV
         run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV
 

.github/workflows/release.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@master
         with:
-          go-version: 1.21.x
+          go-version: 1.22.x
 
       - name: Prepare
         id: prepare

.travis.yml

@@ -13,7 +13,7 @@ jobs:
     - stage: lint
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - lint
       git:
@@ -28,7 +28,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -45,7 +45,7 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - docker
       services:
@@ -62,7 +62,7 @@ jobs:
       if: type = push
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
         - GO111MODULE=on
@@ -87,7 +87,7 @@ jobs:
       os: linux
       dist: bionic
       sudo: required
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-linux
       git:
@@ -159,7 +159,7 @@ jobs:
       if: type = push
       os: osx
       osx_image: xcode14.2
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-osx
       git:
@@ -175,7 +175,7 @@ jobs:
       os: linux
       arch: amd64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -184,14 +184,14 @@ jobs:
       os: linux
       arch: arm64
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
     - stage: build
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test $TEST_PACKAGES
 
@@ -200,7 +200,7 @@ jobs:
       if: type = cron || (type = push && tag ~= /^v[0-9]/)
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - ubuntu-ppa
       git:
@@ -223,7 +223,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       env:
         - azure-purge
       git:
@@ -236,7 +236,7 @@ jobs:
       if: type = cron
       os: linux
       dist: bionic
-      go: 1.21.x
+      go: 1.22.x
       script:
         - travis_wait 30 go run build/ci.go test  -race $TEST_PACKAGES
 

Dockerfile.alltools

@@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.21.4-alpine as builder
+FROM golang:1.22.1-alpine as builder
 
 RUN apk add --no-cache make gcc musl-dev linux-headers git
 

Makefile

@@ -65,7 +65,7 @@ test-txpool-race:
 
 test-race:
 	$(GOTEST) --timeout 15m -race -shuffle=on $(TESTALL)
-	
+
 gocovmerge-deps:
 	$(GOBUILD) -o $(GOBIN)/gocovmerge github.com/wadey/gocovmerge
 
@@ -201,7 +201,7 @@ geth-windows-amd64:
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64
 
 PACKAGE_NAME          := github.com/maticnetwork/bor
-GOLANG_CROSS_VERSION  ?= v1.21.4
+GOLANG_CROSS_VERSION  ?= v1.22.1
 
 .PHONY: release-dry-run
 release-dry-run:

cmd/geth/verkle.go

@@ -87,7 +87,7 @@ func checkChildren(root verkle.VerkleNode, resolver verkle.NodeResolverFn) error
 				return fmt.Errorf("could not find child %x in db: %w", childC, err)
 			}
 			// depth is set to 0, the tree isn't rebuilt so it's not a problem
-			childN, err := verkle.ParseNode(childS, 0, childC[:])
+			childN, err := verkle.ParseNode(childS, 0)
 			if err != nil {
 				return fmt.Errorf("decode error child %x in db: %w", child.Commitment().Bytes(), err)
 			}
@@ -154,7 +154,7 @@ func verifyVerkle(ctx *cli.Context) error {
 		return err
 	}
 
-	root, err := verkle.ParseNode(serializedRoot, 0, rootC[:])
+	root, err := verkle.ParseNode(serializedRoot, 0)
 
 	if err != nil {
 		return err
@@ -213,7 +213,7 @@ func expandVerkle(ctx *cli.Context) error {
 		return err
 	}
 
-	root, err := verkle.ParseNode(serializedRoot, 0, rootC[:])
+	root, err := verkle.ParseNode(serializedRoot, 0)
 
 	if err != nil {
 		return err

consensus/bor/snapshot_test.go

@@ -203,7 +203,7 @@ func TestRandomAddresses(t *testing.T) {
 	t.Parallel()
 
 	rapid.Check(t, func(t *rapid.T) {
-		length := rapid.IntMax(300).Draw(t, "length").(int)
+		length := rapid.IntMax(300).AsAny().Draw(t, "length").(int)
 
 		addrs := randomAddresses(length)
 		addressSet := unique.New(addrs)

eth/downloader/whitelist/service_test.go

@@ -689,9 +689,9 @@ func TestPropertyBasedTestingMilestone(t *testing.T) {
 		}
 
 		var (
-			milestoneEndNum = rapid.Uint64().Draw(t, "endBlock")
-			milestoneID     = rapid.String().Draw(t, "MilestoneID")
-			doLock          = rapid.Bool().Draw(t, "Voted")
+			milestoneEndNum = rapid.Uint64().AsAny().Draw(t, "endBlock")
+			milestoneID     = rapid.String().AsAny().Draw(t, "MilestoneID")
+			doLock          = rapid.Bool().AsAny().Draw(t, "Voted")
 		)
 
 		val := milestone.LockMutex(milestoneEndNum.(uint64))
@@ -760,8 +760,8 @@ func TestPropertyBasedTestingMilestone(t *testing.T) {
 		}
 
 		var (
-			start = rapid.Uint64Max(milestoneEndNum.(uint64)).Draw(t, "start for mock chain")
-			end   = rapid.Uint64Min(start.(uint64)).Filter(fitlerFn).Draw(t, "end for mock chain")
+			start = rapid.Uint64Max(milestoneEndNum.(uint64)).AsAny().Draw(t, "start for mock chain")
+			end   = rapid.Uint64Min(start.(uint64)).Filter(fitlerFn).AsAny().Draw(t, "end for mock chain")
 		)
 
 		chainTemp := createMockChain(start.(uint64), end.(uint64))
@@ -780,9 +780,9 @@ func TestPropertyBasedTestingMilestone(t *testing.T) {
 		}
 
 		var (
-			milestoneEndNum2 = rapid.Uint64().Draw(t, "endBlockNum 2")
-			milestoneID2     = rapid.String().Draw(t, "MilestoneID 2")
-			doLock2          = rapid.Bool().Draw(t, "Voted 2")
+			milestoneEndNum2 = rapid.Uint64().AsAny().Draw(t, "endBlockNum 2")
+			milestoneID2     = rapid.String().AsAny().Draw(t, "MilestoneID 2")
+			doLock2          = rapid.Bool().AsAny().Draw(t, "Voted 2")
 		)
 
 		val = milestone.LockMutex(milestoneEndNum2.(uint64))
@@ -862,7 +862,7 @@ func TestPropertyBasedTestingMilestone(t *testing.T) {
 		}
 
 		var (
-			milestoneNum = rapid.Uint64().Draw(t, "milestone Number")
+			milestoneNum = rapid.Uint64().AsAny().Draw(t, "milestone Number")
 		)
 
 		lockedValue := milestone.LockedMilestoneNumber
@@ -892,7 +892,7 @@ func TestPropertyBasedTestingMilestone(t *testing.T) {
 		}
 
 		var (
-			futureMilestoneNum = rapid.Uint64Min(milestoneNum.(uint64)).Draw(t, "future milestone Number")
+			futureMilestoneNum = rapid.Uint64Min(milestoneNum.(uint64)).AsAny().Draw(t, "future milestone Number")
 		)
 
 		isChainLocked = milestone.Locked

ethdb/pebble/pebble.go

@@ -627,7 +627,10 @@ func (b *batch) Replay(w ethdb.KeyValueWriter) error {
 	reader := b.b.Reader()
 
 	for {
-		kind, k, v, ok := reader.Next()
+		kind, k, v, ok, err := reader.Next()
+		if err != nil {
+			return err
+		}
 		if !ok {
 			break
 		}