Update go, hedera-sdk, go-ethereum versions (#911)

* Update go, hedera-sdk, go-ethereum versions * Update go workflow files versions --------- Signed-off-by: Stanislav Viyachev <[email protected]>
LimeChain · Nov 21, 2023 · 4f8f07f · 4f8f07f
1 parent b96b334
commit 4f8f07f
Show file tree

Hide file tree

Showing 21 changed files with 1,070 additions and 204 deletions.
diff --git a/.github/workflows/go-build.yaml b/.github/workflows/go-build.yaml
@@ -6,11 +6,11 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v4
+      - uses: actions/setup-go@v4
         name: Setup GO Env
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - name: Cache Go modules
         uses: actions/cache@v2
         with:
@@ -19,7 +19,7 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-go-
       - name: Build hedera-eth-bridge-validator
-        run: go build -i -o validator cmd/*
+        run: go build -o validator cmd/*
       - name: Upload Binary as artifact
         uses: actions/upload-artifact@master
         with:

diff --git a/.github/workflows/go-test.yaml b/.github/workflows/go-test.yaml
@@ -6,11 +6,11 @@ jobs:
   unit-tests:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         name: Setup GO Env
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - name: Cache Go Test modules
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/mainnet-deploy-to-vms.yaml b/.github/workflows/mainnet-deploy-to-vms.yaml
@@ -13,7 +13,7 @@ jobs:
   deploy_mainnet_dave:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]

diff --git a/.github/workflows/mainnet-release-gcr-publish.yaml b/.github/workflows/mainnet-release-gcr-publish.yaml
@@ -10,7 +10,7 @@ jobs:
     if: |
       ! contains(github.event.release.tag_name, '-rc-')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]

diff --git a/.github/workflows/outdated-dependencies.yaml b/.github/workflows/outdated-dependencies.yaml
@@ -8,10 +8,10 @@ jobs:
   go-mod-outdated:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         name: Setup GO Env
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - name: Run go-mod-outdated
         run: go list -u -m -json all | docker run --rm -i psampaz/go-mod-outdated -update -direct -ci
diff --git a/.github/workflows/run-e2e.yaml b/.github/workflows/run-e2e.yaml
@@ -11,11 +11,11 @@ jobs:
   e2e:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-go@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-go@v4
         name: Setup GO Env
         with:
-          go-version: '1.18'
+          go-version: '1.20'
       - name: Cache Go E2E Test modules
         uses: actions/cache@v2
         with:

diff --git a/.github/workflows/staticcheck.yaml b/.github/workflows/staticcheck.yaml
@@ -9,11 +9,11 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: WillAbides/setup-go-faster@v1.8.0
+      - uses: WillAbides/setup-go-faster@v1.9.1
         with:
-          go-version: "1.18.x"
+          go-version: "1.20"
       - uses: dominikh/[email protected]
         with:
           checks: "all,-ST*,-S1002,-S1005,-S1008,-S1023,-S1039,-U1000"
           version: "2022.1.3"
-          install-go: false
+          install-go: true
diff --git a/.github/workflows/testnet-deploy-to-vms.yaml b/.github/workflows/testnet-deploy-to-vms.yaml
@@ -13,7 +13,7 @@ jobs:
   deploy_testnet_alice:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]
@@ -47,7 +47,7 @@ jobs:
   deploy_testnet_bob:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]
@@ -81,7 +81,7 @@ jobs:
   deploy_testnet_carol:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]
@@ -115,7 +115,7 @@ jobs:
   deploy_testnet_dave:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]

diff --git a/.github/workflows/testnet-release-gcr-publish.yaml b/.github/workflows/testnet-release-gcr-publish.yaml
@@ -10,7 +10,7 @@ jobs:
     if: |
       contains(github.event.release.tag_name, '-rc-')
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Setup GCloud SDK
         uses: google-github-actions/[email protected]

diff --git a/app/clients/hedera/mirror-node/client.go b/app/clients/hedera/mirror-node/client.go
@@ -19,7 +19,7 @@ package mirror_node
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"time"
@@ -242,7 +242,7 @@ func (c Client) GetNftTransactions(tokenID string, serialNum int64) (transaction
 	}
 
 	if httpResponse.StatusCode != http.StatusOK {
-		return transaction.NftTransactionsResponse{}, fmt.Errorf("Mirror Node API [%s] ended with Status Code [%d]. Body bytes: [%s]", query, httpResponse.StatusCode, bodyBytes)
+		return transaction.NftTransactionsResponse{}, fmt.Errorf("mirror Node API [%s] ended with Status Code [%d]. Body bytes: [%s]", query, httpResponse.StatusCode, bodyBytes)
 	}
 
 	var response *transaction.NftTransactionsResponse
@@ -291,7 +291,7 @@ func (c Client) GetSchedule(scheduleID string) (*transaction.Schedule, error) {
 		return nil, e
 	}
 	if httpResponse.StatusCode >= 400 {
-		return nil, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, query)
+		return nil, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, query)
 	}
 
 	bodyBytes, e := readResponseBody(httpResponse)
@@ -318,7 +318,7 @@ func (c Client) GetStateProof(transactionID string) ([]byte, error) {
 	}
 
 	if response.StatusCode != http.StatusOK {
-		return nil, fmt.Errorf("State Proof HTTP GET for TransactionID [%s] ended with Status Code [%d].", transactionID, response.StatusCode)
+		return nil, fmt.Errorf("state Proof HTTP GET for TransactionID [%s] ended with Status Code [%d]", transactionID, response.StatusCode)
 	}
 
 	return readResponseBody(response)
@@ -333,7 +333,7 @@ func (c Client) GetNft(tokenID string, serialNum int64) (*transaction.Nft, error
 		return nil, e
 	}
 	if httpResponse.StatusCode >= 400 {
-		return nil, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, query)
+		return nil, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, query)
 	}
 
 	bodyBytes, e := readResponseBody(httpResponse)
@@ -372,7 +372,7 @@ func (c Client) GetAccountByPublicKey(publicKey string) (*account.AccountsQueryR
 		return nil, e
 	}
 	if httpResponse.StatusCode >= 400 {
-		return nil, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, query)
+		return nil, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, query)
 	}
 
 	bodyBytes, e := readResponseBody(httpResponse)
@@ -400,7 +400,7 @@ func (c Client) GetAccount(accountID string) (*account.AccountsResponse, error)
 		return nil, e
 	}
 	if httpResponse.StatusCode >= 400 {
-		return nil, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, query)
+		return nil, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, query)
 	}
 
 	bodyBytes, e := readResponseBody(httpResponse)
@@ -429,7 +429,7 @@ func (c Client) GetToken(tokenID string) (*token.TokenResponse, error) {
 		return nil, e
 	}
 	if httpResponse.StatusCode >= 400 {
-		return nil, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, query)
+		return nil, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, query)
 	}
 
 	bodyBytes, e := readResponseBody(httpResponse)
@@ -594,7 +594,7 @@ func (c Client) getAndParse(query string) (*transaction.Response, error) {
 		return nil, fmt.Errorf("failed to unmarshal response body: [%s]. Error: [%s]", string(bodyBytes), e.Error())
 	}
 	if httpResponse.StatusCode >= 400 {
-		return response, fmt.Errorf(`Failed to execute query: [%s]. Error: [%s]`, query, response.Status.String())
+		return response, fmt.Errorf(`failed to execute query: [%s]. Error: [%s]`, query, response.Status.String())
 	}
 
 	return response, nil
@@ -622,5 +622,5 @@ func (c Client) getTopicMessagesByQuery(query string) ([]message.Message, error)
 func readResponseBody(response *http.Response) ([]byte, error) {
 	defer response.Body.Close()
 
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }
diff --git a/app/clients/hedera/mirror-node/client_test.go b/app/clients/hedera/mirror-node/client_test.go
@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"strings"
 	"testing"
@@ -63,18 +63,6 @@ var (
 		Topic: 2,
 	}
 
-	scheduleId = hedera.ScheduleID{
-		Shard:    0,
-		Realm:    0,
-		Schedule: 3,
-	}
-
-	tokenId = hedera.TokenID{
-		Shard: 0,
-		Realm: 0,
-		Token: 4,
-	}
-
 	c *Client
 )
 
@@ -128,7 +116,7 @@ func Test_GetSchedule_Fails(t *testing.T) {
 func Test_AccountExists_Status400(t *testing.T) {
 	setup()
 	stringReader := strings.NewReader("error")
-	stringReadCloser := ioutil.NopCloser(stringReader)
+	stringReadCloser := io.NopCloser(stringReader)
 	response := &http.Response{
 		StatusCode: 400,
 		Body:       stringReadCloser,
@@ -179,7 +167,7 @@ func Test_GetToken_Fails(t *testing.T) {
 func Test_TopicExists_Status400(t *testing.T) {
 	setup()
 	stringReader := strings.NewReader("error")
-	stringReadCloser := ioutil.NopCloser(stringReader)
+	stringReadCloser := io.NopCloser(stringReader)
 	response := &http.Response{
 		StatusCode: 400,
 		Body:       stringReadCloser,
@@ -687,7 +675,7 @@ func Test_GetAccountByPublicKey_Err(t *testing.T) {
 	mocks.MHTTPClient.On("Get", mock.Anything).Return(&http.Response{StatusCode: 400, Body: encodedContent}, nil)
 	response, err := c.GetAccountByPublicKey("1234")
 	assert.Nil(t, response)
-	assert.Contains(t, err.Error(), "Failed to execute query")
+	assert.Contains(t, err.Error(), "failed to execute query")
 }
 
 func Test_GetToken_HttpErr(t *testing.T) {

diff --git a/app/helper/http/encode.go b/app/helper/http/encode.go
@@ -20,7 +20,6 @@ import (
 	"bytes"
 	"encoding/json"
 	"io"
-	"io/ioutil"
 )
 
 func EncodeBodyContent(content interface{}) (io.ReadCloser, error) {
@@ -30,7 +29,7 @@ func EncodeBodyContent(content interface{}) (io.ReadCloser, error) {
 		return nil, encodeErr
 	}
 	encodedResponseReader := bytes.NewReader(encodedResponseBuffer.Bytes())
-	encodedResponseReaderCloser := ioutil.NopCloser(encodedResponseReader)
+	encodedResponseReaderCloser := io.NopCloser(encodedResponseReader)
 
 	return encodedResponseReaderCloser, nil
 }
diff --git a/app/router/transfer-reset/transfer-reset_test.go b/app/router/transfer-reset/transfer-reset_test.go
@@ -4,7 +4,7 @@ import (
 	"bytes"
 	"encoding/json"
 	"errors"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"net/http/httptest"
 	"testing"
@@ -51,7 +51,7 @@ func Test_GetTransferSuccess(t *testing.T) {
 	handler(w, req)
 	res := w.Result()
 	defer res.Body.Close()
-	data, _ := ioutil.ReadAll(res.Body)
+	data, _ := io.ReadAll(res.Body)
 
 	assert.Equal(t, http.StatusOK, res.StatusCode)
 	assert.Equal(t, "OK", string(data))
@@ -146,7 +146,7 @@ func Test_GetTransferSuccess_FailsWithEmptyPassword(t *testing.T) {
 		"SourceChainId": 1,
 		"TargetChainId": 2,
 		"SourceToken":   "token",
-		"Password": 	"",
+		"Password":      "",
 	}
 
 	reqBody, _ := json.Marshal(body)

diff --git a/build/Dockerfile b/build/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.18 as build
+FROM golang:1.20 as build
 WORKDIR /tmp/src/hedera-eth-bridge-validator
 COPY . .
 RUN go build -o main ./cmd

diff --git a/config/config.go b/config/config.go
@@ -17,7 +17,6 @@
 package config
 
 import (
-	"io/ioutil"
 	"os"
 	"path/filepath"
 
@@ -64,7 +63,7 @@ func GetConfig(config interface{}, path string) error {
 		log.Fatal(err)
 	}
 
-	yamlFile, err := ioutil.ReadFile(filename)
+	yamlFile, err := os.ReadFile(filename)
 	if err != nil {
 		log.Fatal(err)
 	}

diff --git a/config/loggcp.go b/config/loggcp.go
@@ -142,4 +142,4 @@ func (f *GCEFormatter) Format(entry *logrus.Entry) ([]byte, error) {
 		return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
 	}
 	return append(serialized, '\n'), nil
-}
+}
diff --git a/e2e/clients/validator.go b/e2e/clients/validator.go
@@ -19,7 +19,7 @@ package clients
 import (
 	"encoding/json"
 	"fmt"
-	"io/ioutil"
+	"io"
 	"net/http"
 	"time"
 )
@@ -68,5 +68,5 @@ func (v *Validator) get(url string) ([]byte, error) {
 		return nil, fmt.Errorf("GET resolved with status [%d].", response.StatusCode)
 	}
 
-	return ioutil.ReadAll(response.Body)
+	return io.ReadAll(response.Body)
 }