Merge pull request #767 from cffls/jerryc/v0.3.5

v0.3.5
2026-07-27 23:26:44 +00:00 · 2023-03-06 12:32:30 -08:00 · 2023-03-06 12:32:30 -08:00 · 7db8c140fc
commit 7db8c140fc
parent 4561012af9 318b7fadc9
20 changed files with 125 additions and 124 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -29,7 +29,7 @@ jobs:

        - uses: actions/setup-go@v3
          with:
-            go-version: 1.20.x
+            go-version: 1.19.x

        - name: Install dependencies on Linux
          if: runner.os == 'Linux'
@ -51,10 +51,9 @@ jobs:
        - name: Build
          run: make all

-        # # TODO: fix LINT not working with go 1.20.x
-        # - name: Lint
-        #   if: runner.os == 'Linux'
-        #   run: make lint
+        - name: Lint
+          if: runner.os == 'Linux'
+          run: make lint

        - name: Test
          run: make test
@ -99,7 +98,7 @@ jobs:

        - uses: actions/setup-go@v3
          with:
-            go-version: 1.20.x
+            go-version: 1.18.x

        - name: Checkout matic-cli
          uses: actions/checkout@v3
--- a/.github/workflows/packager.yml
+++ b/.github/workflows/packager.yml
@ -21,7 +21,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@master
        with:
-          go-version: 1.20
+          go-version: 1.19
      - name: Adding TAG to ENV
        run: echo "GIT_TAG=`echo $(git describe --tags --abbrev=0)`" >> $GITHUB_ENV

--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -21,7 +21,7 @@ jobs:
      - name: Set up Go
        uses: actions/setup-go@master
        with:
-          go-version: 1.20.x
+          go-version: 1.19.x

      - name: Prepare
        id: prepare
--- a/.golangci.yml
+++ b/.golangci.yml
@ -1,7 +1,7 @@
 # This file configures github.com/golangci/golangci-lint.

 run:
-  go: '1.20'
+  go: '1.18'
  timeout: 20m
  tests: true
  # default is true. Enables skipping of directories:
@ -185,4 +185,4 @@ issues:
  max-issues-per-linter: 0
  max-same-issues: 0
  #new: true
-  new-from-rev: origin/master
+  new-from-rev: origin/master
--- a/.travis.yml
+++ b/.travis.yml
@ -16,7 +16,7 @@ jobs:
    - stage: lint
      os: linux
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - lint
      git:
@ -31,7 +31,7 @@ jobs:
      os: linux
      arch: amd64
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - docker
      services:
@ -48,7 +48,7 @@ jobs:
      os: linux
      arch: arm64
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - docker
      services:
@ -65,7 +65,7 @@ jobs:
      if: type = push
      os: linux
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - ubuntu-ppa
        - GO111MODULE=on
@ -90,7 +90,7 @@ jobs:
      os: linux
      dist: bionic
      sudo: required
-      go: 1.20.x
+      go: 1.18.x
      env:
        - azure-linux
        - GO111MODULE=on
@ -148,7 +148,7 @@ jobs:
        - sdkmanager "platform-tools" "platforms;android-15" "platforms;android-19" "platforms;android-24" "ndk-bundle"

        # Install Go to allow building with
-        - curl https://dl.google.com/go/go1.20.linux-amd64.tar.gz | tar -xz
+        - curl https://dl.google.com/go/go1.18.linux-amd64.tar.gz | tar -xz
        - export PATH=`pwd`/go/bin:$PATH
        - export GOROOT=`pwd`/go
        - export GOPATH=$HOME/go
@ -162,7 +162,7 @@ jobs:
    - stage: build
      if: type = push
      os: osx
-      go: 1.20.x
+      go: 1.18.x
      env:
        - azure-osx
        - azure-ios
@ -194,7 +194,7 @@ jobs:
      os: linux
      arch: amd64
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - GO111MODULE=on
      script:
@ -205,7 +205,7 @@ jobs:
      os: linux
      arch: arm64
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - GO111MODULE=on
      script:
@ -225,7 +225,7 @@ jobs:
      if: type = cron
      os: linux
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - azure-purge
        - GO111MODULE=on
@ -239,7 +239,7 @@ jobs:
      if: type = cron
      os: linux
      dist: bionic
-      go: 1.20.x
+      go: 1.18.x
      env:
        - GO111MODULE=on
      script:
--- a/Dockerfile.alltools
+++ b/Dockerfile.alltools
@ -1,5 +1,5 @@
 # Build Geth in a stock Go builder container
-FROM golang:1.20-alpine as builder
+FROM golang:1.18.1-alpine as builder

 RUN apk add --no-cache make gcc musl-dev linux-headers git

--- a/2
+++ b/2
@ -196,7 +196,7 @@ geth-windows-amd64:
 	@ls -ld $(GOBIN)/geth-windows-* | grep amd64

 PACKAGE_NAME          := github.com/maticnetwork/bor
-GOLANG_CROSS_VERSION  ?= v1.20.1
+GOLANG_CROSS_VERSION  ?= v1.19.1

 .PHONY: release-dry-run
 release-dry-run:
--- a/build/ci.go
+++ b/build/ci.go
@ -24,18 +24,19 @@ Usage: go run build/ci.go <command> <command flags/arguments>

 Available commands are:

-	install    [ -arch architecture ] [ -cc compiler ] [ packages... ]                          -- builds packages and executables
-	test       [ -coverage ] [ packages... ]                                                    -- runs the tests
-	lint                                                                                        -- runs certain pre-selected linters
-	archive    [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -signify key-envvar ] [ -upload dest ] -- archives build artifacts
-	importkeys                                                                                  -- imports signing keys from env
-	debsrc     [ -signer key-id ] [ -upload dest ]                                              -- creates a debian source package
-	nsis                                                                                        -- creates a Windows NSIS installer
-	aar        [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ]                      -- creates an Android archive
-	xcode      [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ]                      -- creates an iOS XCode framework
-	purge      [ -store blobstore ] [ -days threshold ]                                         -- purges old archives from the blobstore
+   install    [ -arch architecture ] [ -cc compiler ] [ packages... ]                          -- builds packages and executables
+   test       [ -coverage ] [ packages... ]                                                    -- runs the tests
+   lint                                                                                        -- runs certain pre-selected linters
+   archive    [ -arch architecture ] [ -type zip|tar ] [ -signer key-envvar ] [ -signify key-envvar ] [ -upload dest ] -- archives build artifacts
+   importkeys                                                                                  -- imports signing keys from env
+   debsrc     [ -signer key-id ] [ -upload dest ]                                              -- creates a debian source package
+   nsis                                                                                        -- creates a Windows NSIS installer
+   aar        [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ]                      -- creates an Android archive
+   xcode      [ -local ] [ -sign key-id ] [-deploy repo] [ -upload dest ]                      -- creates an iOS XCode framework
+   purge      [ -store blobstore ] [ -days threshold ]                                         -- purges old archives from the blobstore

 For all commands, -n prevents execution of external programs (dry run mode).
+
 */
 package main

@ -147,7 +148,7 @@ var (
 	// This is the version of go that will be downloaded by
 	//
 	//     go run ci.go install -dlgo
-	dlgoVersion = "1.20.1"
+	dlgoVersion = "1.18"
 )

 var GOBIN, _ = filepath.Abs(filepath.Join("build", "bin"))
--- a/core/vm/contracts.go
+++ b/core/vm/contracts.go
@ -30,7 +30,7 @@ import (
 	"github.com/ethereum/go-ethereum/crypto/bn256"
 	"github.com/ethereum/go-ethereum/params"

-	//lint:ignore SA1019 Needed for precompile
+	big2 "github.com/holiman/big"
 	"golang.org/x/crypto/ripemd160"
 )

@ -266,9 +266,10 @@ var (
 // modexpMultComplexity implements bigModexp multComplexity formula, as defined in EIP-198
 //
 // def mult_complexity(x):
-//    if x <= 64: return x ** 2
-//    elif x <= 1024: return x ** 2 // 4 + 96 * x - 3072
-//    else: return x ** 2 // 16 + 480 * x - 199680
+//
+//	if x <= 64: return x ** 2
+//	elif x <= 1024: return x ** 2 // 4 + 96 * x - 3072
+//	else: return x ** 2 // 16 + 480 * x - 199680
 //
 // where is x is max(length_of_MODULUS, length_of_BASE)
 func modexpMultComplexity(x *big.Int) *big.Int {
@ -379,15 +380,24 @@ func (c *bigModExp) Run(input []byte) ([]byte, error) {
 	}
 	// Retrieve the operands and execute the exponentiation
 	var (
-		base = new(big.Int).SetBytes(getData(input, 0, baseLen))
-		exp  = new(big.Int).SetBytes(getData(input, baseLen, expLen))
-		mod  = new(big.Int).SetBytes(getData(input, baseLen+expLen, modLen))
+		base = new(big2.Int).SetBytes(getData(input, 0, baseLen))
+		exp  = new(big2.Int).SetBytes(getData(input, baseLen, expLen))
+		mod  = new(big2.Int).SetBytes(getData(input, baseLen+expLen, modLen))
+		v    []byte
 	)
-	if mod.BitLen() == 0 {
+
+	switch {
+	case mod.BitLen() == 0:
 		// Modulo 0 is undefined, return zero
 		return common.LeftPadBytes([]byte{}, int(modLen)), nil
+	case base.BitLen() == 1: // a bit length of 1 means it's 1 (or -1).
+		//If base == 1, then we can just return base % mod (if mod >= 1, which it is)
+		v = base.Mod(base, mod).Bytes()
+	default:
+		v = base.Exp(base, exp, mod).Bytes()
 	}
-	return common.LeftPadBytes(base.Exp(base, exp, mod).Bytes(), int(modLen)), nil
+
+	return common.LeftPadBytes(v, int(modLen)), nil
 }

 // newCurvePoint unmarshals a binary blob into a bn256 elliptic curve point,
--- a/go.mod
+++ b/go.mod
@ -1,6 +1,6 @@
 module github.com/ethereum/go-ethereum

-go 1.20
+go 1.19

 require (
 	github.com/Azure/azure-sdk-for-go/sdk/storage/azblob v0.3.0
@ -71,7 +71,7 @@ require (
 	go.uber.org/goleak v1.1.12
 	golang.org/x/crypto v0.0.0-20220507011949-2cf3adece122
 	golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
-	golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10
+	golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43
 	golang.org/x/text v0.3.7
 	golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
 	golang.org/x/tools v0.1.12
@ -85,7 +85,10 @@ require (
 	pgregory.net/rapid v0.4.8
 )

-require github.com/gammazero/deque v0.2.1 // indirect
+require (
+	github.com/gammazero/deque v0.2.1 // indirect
+	github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e // indirect
+)

 require (
 	github.com/Azure/azure-sdk-for-go/sdk/azcore v0.21.1 // indirect
--- a/go.sum
+++ b/go.sum
@ -275,6 +275,8 @@ github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d h1:dg1dEPuW
 github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/hcl/v2 v2.10.1 h1:h4Xx4fsrRE26ohAk/1iGF/JBqRQbyUqu5Lvj60U54ys=
 github.com/hashicorp/hcl/v2 v2.10.1/go.mod h1:FwWsfWEjyV/CMj8s/gqAuiviY72rJ1/oayI9WftqcKg=
+github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e h1:pIYdhNkDh+YENVNi3gto8n9hAmRxKxoar0iE6BLucjw=
+github.com/holiman/big v0.0.0-20221017200358-a027dc42d04e/go.mod h1:j9cQbcqHQujT0oKJ38PylVfqohClLr3CvDC+Qcg+lhU=
 github.com/holiman/bloomfilter/v2 v2.0.3 h1:73e0e/V0tCydx14a0SCYS/EWCxgwLZ18CZcZKVu0fao=
 github.com/holiman/bloomfilter/v2 v2.0.3/go.mod h1:zpoh+gs7qcpqrHr3dB55AMiJwo0iURXE7ZOP9L9hSkA=
 github.com/holiman/uint256 v1.2.0 h1:gpSYcPLWGv4sG43I2mVLiDZCNDh/EpGjSk8tmtxitHM=
@ -660,6 +662,8 @@ golang.org/x/sys v0.0.0-20210423185535-09eb48e85fd7/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10 h1:WIoqL4EROvwiPdUtaip4VcDdpZ4kha7wBWZrbVKCIZg=
 golang.org/x/sys v0.0.0-20220728004956-3c1f35247d10/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43 h1:OK7RB6t2WQX54srQQYSXMW8dF5C6/8+oA/s5QBmmto4=
+golang.org/x/sys v0.0.0-20221013171732-95e765b1cc43/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
--- a/p2p/dnsdisc/client_test.go
+++ b/p2p/dnsdisc/client_test.go
@ -20,12 +20,12 @@ import (
 	"context"
 	"crypto/ecdsa"
 	"errors"
+	"math/rand"
 	"reflect"
 	"testing"
 	"time"

 	"github.com/davecgh/go-spew/spew"
-	"github.com/ethereum/go-ethereum/common/hexutil"
 	"github.com/ethereum/go-ethereum/common/mclock"
 	"github.com/ethereum/go-ethereum/crypto"
 	"github.com/ethereum/go-ethereum/internal/testlog"
@ -34,40 +34,42 @@ import (
 	"github.com/ethereum/go-ethereum/p2p/enr"
 )

-var signingKeyForTesting, _ = crypto.ToECDSA(hexutil.MustDecode("0xdc599867fc513f8f5e2c2c9c489cde5e71362d1d9ec6e693e0de063236ed1240"))
+const (
+	signingKeySeed = 0x111111
+	nodesSeed1     = 0x2945237
+	nodesSeed2     = 0x4567299
+)

 func TestClientSyncTree(t *testing.T) {
-
-	nodes := []string{
-		"enr:-HW4QOFzoVLaFJnNhbgMoDXPnOvcdVuj7pDpqRvh6BRDO68aVi5ZcjB3vzQRZH2IcLBGHzo8uUN3snqmgTiE56CH3AMBgmlkgnY0iXNlY3AyNTZrMaECC2_24YYkYHEgdzxlSNKQEnHhuNAbNlMlWJxrJxbAFvA",
-		"enr:-HW4QAggRauloj2SDLtIHN1XBkvhFZ1vtf1raYQp9TBW2RD5EEawDzbtSmlXUfnaHcvwOizhVYLtr7e6vw7NAf6mTuoCgmlkgnY0iXNlY3AyNTZrMaECjrXI8TLNXU0f8cthpAMxEshUyQlK-AM0PW2wfrnacNI",
-		"enr:-HW4QLAYqmrwllBEnzWWs7I5Ev2IAs7x_dZlbYdRdMUx5EyKHDXp7AV5CkuPGUPdvbv1_Ms1CPfhcGCvSElSosZmyoqAgmlkgnY0iXNlY3AyNTZrMaECriawHKWdDRk2xeZkrOXBQ0dfMFLHY4eENZwdufn1S1o",
-	}
-
 	r := mapResolver{
 		"n":                            "enrtree-root:v1 e=JWXYDBPXYWG6FX3GMDIBFA6CJ4 l=C7HRFPF3BLGF3YR4DY5KX3SMBE seq=1 sig=o908WmNp7LibOfPsr4btQwatZJ5URBr2ZAuxvK4UWHlsB9sUOTJQaGAlLPVAhM__XJesCHxLISo94z5Z2a463gA",
 		"C7HRFPF3BLGF3YR4DY5KX3SMBE.n": "enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@morenodes.example.org",
 		"JWXYDBPXYWG6FX3GMDIBFA6CJ4.n": "enrtree-branch:2XS2367YHAXJFGLZHVAWLQD4ZY,H4FHT4B454P6UXFD7JCYQ5PWDY,MHTDO6TMUBRIA2XWG5LUDACK24",
-		"2XS2367YHAXJFGLZHVAWLQD4ZY.n": nodes[0],
-		"H4FHT4B454P6UXFD7JCYQ5PWDY.n": nodes[1],
-		"MHTDO6TMUBRIA2XWG5LUDACK24.n": nodes[2]}
+		"2XS2367YHAXJFGLZHVAWLQD4ZY.n": "enr:-HW4QOFzoVLaFJnNhbgMoDXPnOvcdVuj7pDpqRvh6BRDO68aVi5ZcjB3vzQRZH2IcLBGHzo8uUN3snqmgTiE56CH3AMBgmlkgnY0iXNlY3AyNTZrMaECC2_24YYkYHEgdzxlSNKQEnHhuNAbNlMlWJxrJxbAFvA",
+		"H4FHT4B454P6UXFD7JCYQ5PWDY.n": "enr:-HW4QAggRauloj2SDLtIHN1XBkvhFZ1vtf1raYQp9TBW2RD5EEawDzbtSmlXUfnaHcvwOizhVYLtr7e6vw7NAf6mTuoCgmlkgnY0iXNlY3AyNTZrMaECjrXI8TLNXU0f8cthpAMxEshUyQlK-AM0PW2wfrnacNI",
+		"MHTDO6TMUBRIA2XWG5LUDACK24.n": "enr:-HW4QLAYqmrwllBEnzWWs7I5Ev2IAs7x_dZlbYdRdMUx5EyKHDXp7AV5CkuPGUPdvbv1_Ms1CPfhcGCvSElSosZmyoqAgmlkgnY0iXNlY3AyNTZrMaECriawHKWdDRk2xeZkrOXBQ0dfMFLHY4eENZwdufn1S1o",
+	}
 	var (
-		wantNodes = sortByID(parseNodes(nodes))
+		wantNodes = testNodes(0x29452, 3)
 		wantLinks = []string{"enrtree://AM5FCQLWIZX2QFPNJAP7VUERCCRNGRHWZG3YYHIUV7BVDQ5FDPRT2@morenodes.example.org"}
 		wantSeq   = uint(1)
 	)

 	c := NewClient(Config{Resolver: r, Logger: testlog.Logger(t, log.LvlTrace)})
 	stree, err := c.SyncTree("enrtree://AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@n")
+
 	if err != nil {
 		t.Fatal("sync error:", err)
 	}
-	if !reflect.DeepEqual(sortByID(stree.Nodes()), wantNodes) {
+
+	if !reflect.DeepEqual(sortByID(stree.Nodes()), sortByID(wantNodes)) {
 		t.Errorf("wrong nodes in synced tree:\nhave %v\nwant %v", spew.Sdump(stree.Nodes()), spew.Sdump(wantNodes))
 	}
+
 	if !reflect.DeepEqual(stree.Links(), wantLinks) {
 		t.Errorf("wrong links in synced tree: %v", stree.Links())
 	}
+
 	if stree.Seq() != wantSeq {
 		t.Errorf("synced tree has wrong seq: %d", stree.Seq())
 	}
@ -101,13 +103,9 @@ func TestClientSyncTreeBadNode(t *testing.T) {

 // This test checks that randomIterator finds all entries.
 func TestIterator(t *testing.T) {
-	var (
-		keys      = testKeys(30)
-		nodes     = testNodes(keys)
-		tree, url = makeTestTree("n", nodes, nil)
-		r         = mapResolver(tree.ToTXT("n"))
-	)
-
+	nodes := testNodes(nodesSeed1, 30)
+	tree, url := makeTestTree("n", nodes, nil)
+	r := mapResolver(tree.ToTXT("n"))
 	c := NewClient(Config{
 		Resolver:  r,
 		Logger:    testlog.Logger(t, log.LvlTrace),
@ -138,11 +136,8 @@ func TestIteratorCloseWithoutNext(t *testing.T) {

 // This test checks if closing randomIterator races.
 func TestIteratorClose(t *testing.T) {
-	var (
-		keys        = testKeys(500)
-		nodes       = testNodes(keys)
-		tree1, url1 = makeTestTree("t1", nodes, nil)
-	)
+	nodes := testNodes(nodesSeed1, 500)
+	tree1, url1 := makeTestTree("t1", nodes, nil)
 	c := NewClient(Config{Resolver: newMapResolver(tree1.ToTXT("t1"))})
 	it, err := c.NewIterator(url1)
 	if err != nil {
@ -164,12 +159,9 @@ func TestIteratorClose(t *testing.T) {

 // This test checks that randomIterator traverses linked trees as well as explicitly added trees.
 func TestIteratorLinks(t *testing.T) {
-	var (
-		keys        = testKeys(40)
-		nodes       = testNodes(keys)
-		tree1, url1 = makeTestTree("t1", nodes[:10], nil)
-		tree2, url2 = makeTestTree("t2", nodes[10:], []string{url1})
-	)
+	nodes := testNodes(nodesSeed1, 40)
+	tree1, url1 := makeTestTree("t1", nodes[:10], nil)
+	tree2, url2 := makeTestTree("t2", nodes[10:], []string{url1})
 	c := NewClient(Config{
 		Resolver:  newMapResolver(tree1.ToTXT("t1"), tree2.ToTXT("t2")),
 		Logger:    testlog.Logger(t, log.LvlTrace),
@ -188,8 +180,7 @@ func TestIteratorLinks(t *testing.T) {
 func TestIteratorNodeUpdates(t *testing.T) {
 	var (
 		clock    = new(mclock.Simulated)
-		keys     = testKeys(30)
-		nodes    = testNodes(keys)
+		nodes    = testNodes(nodesSeed1, 30)
 		resolver = newMapResolver()
 		c        = NewClient(Config{
 			Resolver:        resolver,
@ -210,7 +201,7 @@ func TestIteratorNodeUpdates(t *testing.T) {
 	checkIterator(t, it, nodes[:25])

 	// Ensure RandomNode returns the new nodes after the tree is updated.
-	updateSomeNodes(keys, nodes)
+	updateSomeNodes(nodesSeed1, nodes)
 	tree2, _ := makeTestTree("n", nodes, nil)
 	resolver.clear()
 	resolver.add(tree2.ToTXT("n"))
@ -226,8 +217,7 @@ func TestIteratorNodeUpdates(t *testing.T) {
 func TestIteratorRootRecheckOnFail(t *testing.T) {
 	var (
 		clock    = new(mclock.Simulated)
-		keys     = testKeys(30)
-		nodes    = testNodes(keys)
+		nodes    = testNodes(nodesSeed1, 30)
 		resolver = newMapResolver()
 		c        = NewClient(Config{
 			Resolver:        resolver,
@ -251,7 +241,7 @@ func TestIteratorRootRecheckOnFail(t *testing.T) {
 	checkIterator(t, it, nodes[:25])

 	// Ensure RandomNode returns the new nodes after the tree is updated.
-	updateSomeNodes(keys, nodes)
+	updateSomeNodes(nodesSeed1, nodes)
 	tree2, _ := makeTestTree("n", nodes, nil)
 	resolver.clear()
 	resolver.add(tree2.ToTXT("n"))
@ -264,8 +254,7 @@ func TestIteratorRootRecheckOnFail(t *testing.T) {
 func TestIteratorEmptyTree(t *testing.T) {
 	var (
 		clock    = new(mclock.Simulated)
-		keys     = testKeys(1)
-		nodes    = testNodes(keys)
+		nodes    = testNodes(nodesSeed1, 1)
 		resolver = newMapResolver()
 		c        = NewClient(Config{
 			Resolver:        resolver,
@ -309,7 +298,8 @@ func TestIteratorEmptyTree(t *testing.T) {
 }

 // updateSomeNodes applies ENR updates to some of the given nodes.
-func updateSomeNodes(keys []*ecdsa.PrivateKey, nodes []*enode.Node) {
+func updateSomeNodes(keySeed int64, nodes []*enode.Node) {
+	keys := testKeys(keySeed, len(nodes))
 	for i, n := range nodes[:len(nodes)/2] {
 		r := n.Record()
 		r.Set(enr.IP{127, 0, 0, 1})
@ -325,8 +315,7 @@ func updateSomeNodes(keys []*ecdsa.PrivateKey, nodes []*enode.Node) {
 func TestIteratorLinkUpdates(t *testing.T) {
 	var (
 		clock    = new(mclock.Simulated)
-		keys     = testKeys(30)
-		nodes    = testNodes(keys)
+		nodes    = testNodes(nodesSeed1, 30)
 		resolver = newMapResolver()
 		c        = NewClient(Config{
 			Resolver:        resolver,
@ -399,18 +388,21 @@ func makeTestTree(domain string, nodes []*enode.Node, links []string) (*Tree, st
 	if err != nil {
 		panic(err)
 	}
-	url, err := tree.Sign(signingKeyForTesting, domain)
+
+	url, err := tree.Sign(testKey(signingKeySeed), domain)
 	if err != nil {
 		panic(err)
 	}
+
 	return tree, url
 }

 // testKeys creates deterministic private keys for testing.
-func testKeys(n int) []*ecdsa.PrivateKey {
+func testKeys(seed int64, n int) []*ecdsa.PrivateKey {
+	rand := rand.New(rand.NewSource(seed))
 	keys := make([]*ecdsa.PrivateKey, n)
 	for i := 0; i < n; i++ {
-		key, err := crypto.GenerateKey()
+		key, err := ecdsa.GenerateKey(crypto.S256(), rand)
 		if err != nil {
 			panic("can't generate key: " + err.Error())
 		}
@ -419,8 +411,13 @@ func testKeys(n int) []*ecdsa.PrivateKey {
 	return keys
 }

-func testNodes(keys []*ecdsa.PrivateKey) []*enode.Node {
-	nodes := make([]*enode.Node, len(keys))
+func testKey(seed int64) *ecdsa.PrivateKey {
+	return testKeys(seed, 1)[0]
+}
+
+func testNodes(seed int64, n int) []*enode.Node {
+	keys := testKeys(seed, n)
+	nodes := make([]*enode.Node, n)
 	for i, key := range keys {
 		record := new(enr.Record)
 		record.SetSeq(uint64(i))
@ -434,6 +431,10 @@ func testNodes(keys []*ecdsa.PrivateKey) []*enode.Node {
 	return nodes
 }

+func testNode(seed int64) *enode.Node {
+	return testNodes(seed, 1)[0]
+}
+
 type mapResolver map[string]string

 func newMapResolver(maps ...map[string]string) mapResolver {
@ -462,15 +463,3 @@ func (mr mapResolver) LookupTXT(ctx context.Context, name string) ([]string, err
 	}
 	return nil, errors.New("not found")
 }
-
-func parseNodes(rec []string) []*enode.Node {
-	var ns []*enode.Node
-	for _, r := range rec {
-		var n enode.Node
-		if err := n.UnmarshalText([]byte(r)); err != nil {
-			panic(err)
-		}
-		ns = append(ns, &n)
-	}
-	return ns
-}
--- a/p2p/dnsdisc/tree_test.go
+++ b/p2p/dnsdisc/tree_test.go
@ -61,8 +61,7 @@ func TestParseRoot(t *testing.T) {
 }

 func TestParseEntry(t *testing.T) {
-	testENRs := []string{"enr:-HW4QES8QIeXTYlDzbfr1WEzE-XKY4f8gJFJzjJL-9D7TC9lJb4Z3JPRRz1lP4pL_N_QpT6rGQjAU9Apnc-C1iMP36OAgmlkgnY0iXNlY3AyNTZrMaED5IdwfMxdmR8W37HqSFdQLjDkIwBd4Q_MjxgZifgKSdM"}
-	testNodes := parseNodes(testENRs)
+	testkey := testKey(signingKeySeed)
 	tests := []struct {
 		input string
 		e     entry
@ -92,11 +91,8 @@ func TestParseEntry(t *testing.T) {
 		// Links
 		{
 			input: "enrtree://AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org",
-			e: &linkEntry{
-				str:    "AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org",
-				domain: "nodes.example.org",
-				pubkey: &signingKeyForTesting.PublicKey,
-			}},
+			e:     &linkEntry{"AKPYQIUQIL7PSIACI32J7FGZW56E5FKHEFCCOFHILBIMW3M6LWXS2@nodes.example.org", "nodes.example.org", &testkey.PublicKey},
+		},
 		{
 			input: "enrtree://nodes.example.org",
 			err:   entryError{"link", errNoPubkey},
@ -111,8 +107,8 @@ func TestParseEntry(t *testing.T) {
 		},
 		// ENRs
 		{
-			input: testENRs[0],
-			e:     &enrEntry{node: testNodes[0]},
+			input: "enr:-HW4QES8QIeXTYlDzbfr1WEzE-XKY4f8gJFJzjJL-9D7TC9lJb4Z3JPRRz1lP4pL_N_QpT6rGQjAU9Apnc-C1iMP36OAgmlkgnY0iXNlY3AyNTZrMaED5IdwfMxdmR8W37HqSFdQLjDkIwBd4Q_MjxgZifgKSdM",
+			e:     &enrEntry{node: testNode(nodesSeed1)},
 		},
 		{
 			input: "enr:-HW4QLZHjM4vZXkbp-5xJoHsKSbE7W39FPC8283X-y8oHcHPTnDDlIlzL5ArvDUlHZVDPgmFASrh7cWgLOLxj4wprRkHgmlkgnY0iXNlY3AyNTZrMaEC3t2jLMhDpCDX5mbSEwDn4L3iUfyXzoO8G28XvjGRkrAg=",
@ -136,8 +132,7 @@ func TestParseEntry(t *testing.T) {
 }

 func TestMakeTree(t *testing.T) {
-	keys := testKeys(50)
-	nodes := testNodes(keys)
+	nodes := testNodes(nodesSeed2, 50)
 	tree, err := MakeTree(2, nodes, nil)
 	if err != nil {
 		t.Fatal(err)
--- a/packaging/templates/package_scripts/control
+++ b/packaging/templates/package_scripts/control
@ -1,5 +1,5 @@
 Source: bor
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/packaging/templates/package_scripts/control.arm64
+++ b/packaging/templates/package_scripts/control.arm64
@ -1,5 +1,5 @@
 Source: bor
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/packaging/templates/package_scripts/control.profile.amd64
+++ b/packaging/templates/package_scripts/control.profile.amd64
@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/packaging/templates/package_scripts/control.profile.arm64
+++ b/packaging/templates/package_scripts/control.profile.arm64
@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/packaging/templates/package_scripts/control.validator
+++ b/packaging/templates/package_scripts/control.validator
@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/packaging/templates/package_scripts/control.validator.arm64
+++ b/packaging/templates/package_scripts/control.validator.arm64
@ -1,5 +1,5 @@
 Source: bor-profile
-Version: 0.3.4-stable
+Version: 0.3.5-stable
 Section: develop
 Priority: standard
 Maintainer: Polygon <release-team@polygon.technology>
--- a/params/version.go
+++ b/params/version.go
@ -23,7 +23,7 @@ import (
 const (
 	VersionMajor = 0        // Major version component of the current release
 	VersionMinor = 3        // Minor version component of the current release
-	VersionPatch = 4        // Patch version component of the current release
+	VersionPatch = 5        // Patch version component of the current release
 	VersionMeta  = "stable" // Version metadata to append to the version string
 )