Merge pull request #59 from BoostryJP/dev-2.2

Release v2.2.0

.github/workflows/codeql.yml

@@ -25,7 +25,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/pr.yml

@@ -6,7 +6,7 @@ on:
       - '**.md'
       - .gitignore
 env:
-  GO_VERSION: 1.19
+  GO_VERSION: 1.21
 jobs:
   lint:
     name: 'Code linters'
@@ -17,7 +17,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: 'Check out project files'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
           submodules: false
@@ -42,7 +42,7 @@ jobs:
         with:
           go-version: ${{ env.GO_VERSION }}
       - name: 'Check out project files'
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: '0'
           submodules: recursive

Dockerfile

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.19-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

Dockerfile.alltools

@@ -4,7 +4,7 @@ ARG VERSION=""
 ARG BUILDNUM=""
 
 # Build Geth in a stock Go builder container
-FROM golang:1.19-alpine as builder
+FROM golang:1.21-alpine as builder
 
 RUN apk add --no-cache gcc musl-dev linux-headers git
 

README.md

@@ -1,7 +1,7 @@
 # GoQuorum for ibet Network
 
 <p>
-  <img alt="Version" src="https://img.shields.io/badge/version-2.1-blue.svg?cacheSeconds=2592000" />
+  <img alt="Version" src="https://img.shields.io/badge/version-2.2-blue.svg?cacheSeconds=2592000" />
 </p>
 
 This project is [GoQuorum](https://github.com/ConsenSys/quorum) fork for [ibet Network](https://github.com/BoostryJP/ibet-Network)
@@ -17,14 +17,14 @@ The version control policy of this project follows that of ibet-Network.
 
 ## Reference GoQuorum version
 
-Currently, the ibet Network is built using a node client based on v22.7.6 of GoQuorum. 
+Currently, the ibet Network is built using a node client based on v23.4.0 of GoQuorum. 
 However, it has been variously patched to be optimized for ibet Network. For example:
 - The default block generation interval is set to 1 second.
-- Fully supports Go 1.19 and applies new 3rd party packages from a security perspective.
+- Fully supports Go 1.21 and applies new 3rd party packages from a security perspective.
 - Made temporary fixes for bugs before they were fixed in the original GoQuorum.
 
 ## Building the source
-Building quorum requires both a Go (version 1.19) and a C compiler. 
+Building quorum requires both a Go (version 1.21) and a C compiler. 
 You can install them using your favourite package manager. 
 Once the dependencies are installed, run
 ```

accounts/keystore/account_cache_test.go

@@ -94,7 +94,6 @@ func TestWatchNoDir(t *testing.T) {
 	t.Parallel()
 
 	// Create ks but not the directory that it watches.
-	rand.Seed(time.Now().UnixNano())
 	dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watch-test-%d-%d", os.Getpid(), rand.Int()))
 	ks := NewKeyStore(dir, LightScryptN, LightScryptP)
 
@@ -320,7 +319,6 @@ func TestUpdatedKeyfileContents(t *testing.T) {
 	t.Parallel()
 
 	// Create a temporary kesytore to test with
-	rand.Seed(time.Now().UnixNano())
 	dir := filepath.Join(os.TempDir(), fmt.Sprintf("eth-keystore-watch-test-%d-%d", os.Getpid(), rand.Int()))
 	ks := NewKeyStore(dir, LightScryptN, LightScryptP)
 

accounts/keystore/watch_fallback.go

@@ -14,6 +14,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
 
+//go:build (darwin && !cgo) || ios || (linux && arm64) || windows || (!darwin && !freebsd && !linux && !netbsd && !solaris)
 // +build darwin,!cgo ios linux,arm64 windows !darwin,!freebsd,!linux,!netbsd,!solaris
 
 // This is the fallback implementation of directory watching.

accounts/pluggable/wallet_test.go

@@ -1,8 +1,8 @@
 package pluggable
 
 import (
+	crand "crypto/rand"
 	"math/big"
-	"math/rand"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/accounts"
@@ -282,7 +282,7 @@ func TestWallet_SignTx(t *testing.T) {
 			hashToSign := tt.signer.Hash(toSign)
 
 			mockSig := make([]byte, 65)
-			rand.Read(mockSig)
+			crand.Read(mockSig)
 
 			mockClient := mock_plugin.NewMockService(ctrl)
 			mockClient.
@@ -370,7 +370,7 @@ func TestWallet_SignTxWithPassphrase(t *testing.T) {
 			hashToSign := tt.signer.Hash(toSign)
 
 			mockSig := make([]byte, 65)
-			rand.Read(mockSig)
+			crand.Read(mockSig)
 
 			mockClient := mock_plugin.NewMockService(ctrl)
 			mockClient.