Merge branch 'main' into typo-fix

vineshtk · web-flow · commit ce06fe626b8e · 2025-03-17T22:44:35.000+05:30
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -30,7 +30,6 @@ Fixes # <issue_number_here>
 - [ ] I have performed a self-review of my own code or work.
 - [ ] I have commented my code, particularly in hard-to-understand areas.
 - [ ] My changes generates no new warnings.
-- [ ] My Pull Request title is in format <code>< issue name ></code> eg <code>Added links in the documentation</code>.
 - [ ] I have added tests that prove my fix is effective or that my feature works.
 - [ ] My changes have sufficient code coverage (unit, integration, e2e tests).
 
diff --git a/auditevents/main.go b/auditevents/main.go
@@ -18,6 +18,7 @@ package main
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"io"
 	"net/http"
@@ -94,7 +95,7 @@ func run(host string) error {
 			protocolID := event.BlockchainEvent.ProtocolID
 			fmt.Printf("%-10d %s\n", lastSequence, protocolID)
 			if protocolID <= lastProtocolID {
-				return fmt.Errorf("out of order events detected")
+				return errors.New("out of order events detected")
 			}
 			lastProtocolID = protocolID
 			validated++
diff --git a/ffconfig/main.go b/ffconfig/main.go
@@ -17,6 +17,7 @@
 package main
 
 import (
+	"errors"
 	"fmt"
 	"os"
 
@@ -29,7 +30,7 @@ var rootCmd = &cobra.Command{
 	Short: "FireFly configuration tool",
 	Long:  "Tool for managing and migrating config files for Hyperledger FireFly",
 	RunE: func(cmd *cobra.Command, args []string) error {
-		return fmt.Errorf("a command is required")
+		return errors.New("a command is required")
 	},
 }
 
diff --git a/go.mod b/go.mod
@@ -18,7 +18,7 @@ require (
 	github.com/gorilla/mux v1.8.1
 	github.com/gorilla/websocket v1.5.1
 	github.com/hyperledger/firefly-common v1.4.15
-	github.com/hyperledger/firefly-signer v1.1.19
+	github.com/hyperledger/firefly-signer v1.1.20
 	github.com/jarcoal/httpmock v1.2.0
 	github.com/lib/pq v1.10.9
 	github.com/mattn/go-sqlite3 v1.14.19
diff --git a/go.sum b/go.sum
@@ -79,8 +79,8 @@ github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
 github.com/hyperledger/firefly-common v1.4.15 h1:dp4Mo2JQRPMbL7hoMw8T/ktvIUgematOLkXIppQtBp0=
 github.com/hyperledger/firefly-common v1.4.15/go.mod h1:bA7tAJxcpfQMrHN3/YycTSpyk4g2WlnDlpHx8WOUtAY=
-github.com/hyperledger/firefly-signer v1.1.19 h1:Gq5HqUp9/7egLrahJY9WMk4Y9dZVPIl99aSIged93HM=
-github.com/hyperledger/firefly-signer v1.1.19/go.mod h1:XTwaPRkAfVxk2G3PQOYHLbuvMOiBs0px/4vwXTsUtsA=
+github.com/hyperledger/firefly-signer v1.1.20 h1:U/oGj+QuHdFp4NVZyYOzt3RW51m9nsdYQAGGeChG7g0=
+github.com/hyperledger/firefly-signer v1.1.20/go.mod h1:4S8Ki1f1d8U+Ujojea/a3mkXnJ5Fuz+JBfrf9HBdyO0=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
 github.com/invopop/yaml v0.2.0 h1:7zky/qH+O0DwAyoobXUqvVBwgBFRxKoQ/3FjcVpjTMY=
diff --git a/go.work.sum b/go.work.sum
@@ -356,6 +356,8 @@ github.com/hashicorp/golang-lru v0.5.4 h1:YDjusn29QI/Das2iO9M0BHnIbxPeyuCHsjMW+l
 github.com/hashicorp/golang-lru v0.5.4/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
 github.com/hashicorp/serf v0.10.1 h1:Z1H2J60yRKvfDYAOZLd2MU0ND4AH/WDz7xYHDWQsIPY=
 github.com/hashicorp/serf v0.10.1/go.mod h1:yL2t6BqATOLGc5HF7qbFkTfXoPIY0WZdWHfEvMqbG+4=
+github.com/hyperledger/firefly-signer v1.1.20 h1:U/oGj+QuHdFp4NVZyYOzt3RW51m9nsdYQAGGeChG7g0=
+github.com/hyperledger/firefly-signer v1.1.20/go.mod h1:4S8Ki1f1d8U+Ujojea/a3mkXnJ5Fuz+JBfrf9HBdyO0=
 github.com/jackc/chunkreader/v2 v2.0.1 h1:i+RDz65UE+mmpjTfyz0MoVTnzeYxroil2G82ki7MGG8=
 github.com/jackc/chunkreader/v2 v2.0.1/go.mod h1:odVSm741yZoC3dpHEUXIqA9tQRhFrgOHwnPIn9lDKlk=
 github.com/jackc/pgconn v1.14.0 h1:vrbA9Ud87g6JdFWkHTJXppVce58qPIdP7N8y0Ml/A7Q=
diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go
@@ -21,6 +21,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strconv"
 	"strings"
@@ -1197,7 +1198,7 @@ func (e *Ethereum) GetTransactionStatus(ctx context.Context, operation *core.Ope
 		SetResult(&statusResponse).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgEthConnectorRESTErr)
diff --git a/internal/blockchain/ethereum/eventstream.go b/internal/blockchain/ethereum/eventstream.go
@@ -21,6 +21,7 @@ import (
 	"crypto/sha256"
 	"encoding/hex"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
@@ -161,7 +162,7 @@ func (s *streamManager) deleteEventStream(ctx context.Context, esID string, okNo
 		SetContext(ctx).
 		Delete("/eventstreams/" + esID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
@@ -186,7 +187,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
@@ -282,7 +283,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgEthConnectorRESTErr)
diff --git a/internal/blockchain/fabric/eventstream.go b/internal/blockchain/fabric/eventstream.go
@@ -19,6 +19,7 @@ package fabric
 import (
 	"context"
 	"fmt"
+	"net/http"
 	"strconv"
 	"strings"
 
@@ -137,7 +138,7 @@ func (s *streamManager) deleteEventStream(ctx context.Context, esID string, okNo
 		SetContext(ctx).
 		Delete("/eventstreams/" + esID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
@@ -162,7 +163,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
@@ -261,7 +262,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgFabconnectRESTErr)
diff --git a/internal/blockchain/fabric/fabric.go b/internal/blockchain/fabric/fabric.go
@@ -22,6 +22,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 	"strings"
 
@@ -1118,7 +1119,7 @@ func (f *Fabric) GetTransactionStatus(ctx context.Context, operation *core.Opera
 		SetQueryParam("fly-signer", defaultSigner).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgFabconnectRESTErr)
diff --git a/internal/blockchain/tezos/eventstream.go b/internal/blockchain/tezos/eventstream.go
@@ -22,6 +22,7 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
+	"net/http"
 
 	"github.com/go-resty/resty/v2"
 	"github.com/hyperledger/firefly-common/pkg/ffresty"
@@ -155,7 +156,7 @@ func (s *streamManager) getSubscription(ctx context.Context, subID string, okNot
 		SetResult(&sub).
 		Get(fmt.Sprintf("/subscriptions/%s", subID))
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgTezosconnectRESTErr)
@@ -206,7 +207,7 @@ func (s *streamManager) deleteSubscription(ctx context.Context, subID string, ok
 		SetContext(ctx).
 		Delete("/subscriptions/" + subID)
 	if err != nil || !res.IsSuccess() {
-		if okNotFound && res.StatusCode() == 404 {
+		if okNotFound && res.StatusCode() == http.StatusNotFound {
 			return nil
 		}
 		return ffresty.WrapRestErr(ctx, res, err, coremsgs.MsgTezosconnectRESTErr)
diff --git a/internal/blockchain/tezos/tezos.go b/internal/blockchain/tezos/tezos.go
@@ -20,6 +20,7 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
+	"net/http"
 	"regexp"
 
 	"blockwatch.cc/tzgo/micheline"
@@ -564,7 +565,7 @@ func (t *Tezos) GetTransactionStatus(ctx context.Context, operation *core.Operat
 		SetResult(&statusResponse).
 		Get(transactionRequestPath)
 	if err != nil || !res.IsSuccess() {
-		if res.StatusCode() == 404 {
+		if res.StatusCode() == http.StatusNotFound {
 			return nil, nil
 		}
 		return nil, common.WrapRESTError(ctx, &resErr, res, err, coremsgs.MsgTezosconnectRESTErr)
diff --git a/internal/dataexchange/ffdx/ffdx_test.go b/internal/dataexchange/ffdx/ffdx_test.go
@@ -22,14 +22,15 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/hyperledger/firefly/internal/metrics"
 	"io/ioutil"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
 	"time"
 
+	"github.com/hyperledger/firefly/internal/metrics"
+
 	"github.com/hyperledger/firefly/mocks/metricsmocks"
 
 	"github.com/hyperledger/firefly-common/pkg/config"
@@ -780,6 +781,12 @@ func TestEventsWithManifest(t *testing.T) {
 	h, toServer, fromServer, _, done := newTestFFDX(t, true)
 	defer done()
 
+	mcb := &dataexchangemocks.Callbacks{}
+	mcb.On("DXConnect", h).Return(nil)
+	h.SetHandler("ns1", "node1", mcb)
+	ocb := &coremocks.OperationCallbacks{}
+	h.SetOperationHandler("ns1", ocb)
+
 	err := h.Start()
 	assert.NoError(t, err)
 
@@ -788,11 +795,6 @@ func TestEventsWithManifest(t *testing.T) {
 	msg := <-toServer
 	assert.Equal(t, `{"action":"ack","id":"0"}`, string(msg))
 
-	mcb := &dataexchangemocks.Callbacks{}
-	h.SetHandler("ns1", "node1", mcb)
-	ocb := &coremocks.OperationCallbacks{}
-	h.SetOperationHandler("ns1", ocb)
-
 	namespacedID1 := fmt.Sprintf("ns1:%s", fftypes.NewUUID())
 	ocb.On("OperationUpdate", mock.MatchedBy(func(ev *core.OperationUpdateAsync) bool {
 		return ev.NamespacedOpID == namespacedID1 &&
diff --git a/internal/events/persist_batch.go b/internal/events/persist_batch.go
@@ -19,6 +19,7 @@ package events
 import (
 	"context"
 	"database/sql/driver"
+	"errors"
 
 	"github.com/hyperledger/firefly-common/pkg/ffapi"
 	"github.com/hyperledger/firefly-common/pkg/fftypes"
@@ -276,7 +277,7 @@ func (em *eventManager) persistBatchContent(ctx context.Context, batch *core.Bat
 		// Fall back to individual upserts
 		for i, data := range batch.Payload.Data {
 			if err := em.database.UpsertData(ctx, data, database.UpsertOptimizationExisting); err != nil {
-				if err == database.HashMismatch {
+				if errors.Is(err, database.HashMismatch) {
 					log.L(ctx).Errorf("Invalid data entry %d in batch '%s'. Hash mismatch with existing record with same UUID '%s' Hash=%s", i, batch.ID, data.ID, data.Hash)
 					return false, nil
 				}
diff --git a/internal/tokens/fftokens/fftokens.go b/internal/tokens/fftokens/fftokens.go
@@ -806,7 +806,7 @@ func (ft *FFTokens) CreateTokenPool(ctx context.Context, nsOpID string, pool *co
 	if err != nil || !res.IsSuccess() {
 		return core.OpPhaseInitializing, wrapError(ctx, &errRes, res, err)
 	}
-	if res.StatusCode() == 200 {
+	if res.StatusCode() == http.StatusOK {
 		// HTTP 200: Creation was successful, and pool details are in response body
 		var obj fftypes.JSONObject
 		if err := json.Unmarshal(res.Body(), &obj); err != nil {
@@ -841,7 +841,7 @@ func (ft *FFTokens) ActivateTokenPool(ctx context.Context, pool *core.TokenPool)
 	if err != nil || !res.IsSuccess() {
 		return core.OpPhaseInitializing, err
 	}
-	if res.StatusCode() == 200 {
+	if res.StatusCode() == http.StatusOK {
 		// HTTP 200: Activation was successful, and pool details are in response body
 		var obj fftypes.JSONObject
 		if err := json.Unmarshal(res.Body(), &obj); err != nil {
@@ -851,7 +851,7 @@ func (ft *FFTokens) ActivateTokenPool(ctx context.Context, pool *core.TokenPool)
 			TX:     pool.TX.ID,
 			TXType: pool.TX.Type,
 		})
-	} else if res.StatusCode() == 204 {
+	} else if res.StatusCode() == http.StatusNoContent {
 		// HTTP 204: Activation was successful, but pool details are not available
 		// This will resolve the operation, but connector is responsible for re-delivering pool details on the websocket.
 		return core.OpPhaseComplete, nil
@@ -871,7 +871,7 @@ func (ft *FFTokens) DeactivateTokenPool(ctx context.Context, pool *core.TokenPoo
 		}).
 		SetError(&errRes).
 		Post("/api/v1/deactivatepool")
-	if err == nil && (res.IsSuccess() || res.StatusCode() == 404) {
+	if err == nil && (res.IsSuccess() || res.StatusCode() == http.StatusNotFound) {
 		return nil
 	}
 	return wrapError(ctx, &errRes, res, err)
diff --git a/manifest.json b/manifest.json
@@ -1,43 +1,43 @@
 {
   "ethconnect": {
     "image": "ghcr.io/hyperledger/firefly-ethconnect",
-    "tag": "v3.3.2",
-    "sha": "bdbfa05a0bc1610813ba0ef65b2c8f9f7df4a5ead5643a580e3ba5927747c2cf"
+    "tag": "v3.3.3",
+    "sha": "250509a54bbd3251598a807071b388492c0157df02a3b06bfa64e14e791c0633"
   },
   "evmconnect": {
     "image": "ghcr.io/hyperledger/firefly-evmconnect",
-    "tag": "v1.3.18",
-    "sha": "11a782c778227d198c0bff2fc94ad7e52ceea5a9994728ba05e781541680c32d"
+    "tag": "v1.3.20",
+    "sha": "514ee0e0d3f6054e1f2c46a474c968f18725af5edd4dc6dac85dc104004c1272"
   },
   "fabconnect": {
     "image": "ghcr.io/hyperledger/firefly-fabconnect",
-    "tag": "v0.9.21",
-    "sha": "394262c5888fb6647a7b8b1f3f8d652e1db941b67e3c68bccfbedfa53c4d874d"
+    "tag": "v0.9.22",
+    "sha": "1984166545d476b9f8ea8eb04120fed406beb936cb95c97a728bbf4585860523"
   },
   "tezosconnect": {
     "image": "ghcr.io/hyperledger/firefly-tezosconnect",
-    "tag": "v0.2.7",
-    "sha": "cee6ecda8208e24989a6db2c1a2dd1b0defb89363e7728571b8858e794a295be"
+    "tag": "v0.2.8",
+    "sha": "895c0a22b64fbe42ecaf3e017b40b71c8911c4c7032728c778723cbef987b5de"
   },
   "dataexchange-https": {
     "image": "ghcr.io/hyperledger/firefly-dataexchange-https",
-    "tag": "v1.3.0",
-    "sha": "1e01b0d5fc3cfd95de150d47c09ba419b8ec98345d105a6d67d7bc7101aeea89"
+    "tag": "v1.3.1",
+    "sha": "5688fd57c52588f55230800e2a13743626da6ce4b40eb7ce3dd4578494418479"
   },
   "tokens-erc1155": {
     "image": "ghcr.io/hyperledger/firefly-tokens-erc1155",
-    "tag": "v1.3.3",
-    "sha": "5efbe76ce2c484d86e9e3cc2cfe3cee85d91ee8712b31dfc592a2de771749e78"
+    "tag": "v1.3.4",
+    "sha": "700d1d0d461b55641ea21e4028456e904a6f652798335ad0e067d7e6ab1438f1"
   },
   "tokens-erc20-erc721": {
     "image": "ghcr.io/hyperledger/firefly-tokens-erc20-erc721",
-    "tag": "v1.3.3",
-    "sha": "5cfa10432c1cd885f3cbe5934799d692ba7186013e03a6b92bd6aa53ddf4f414"
+    "tag": "v1.3.4",
+    "sha": "d93b55daf9a4404a3d26996cb2dffcc3660b3ef3cbe3b0be5bab03a8f745d952"
   },
   "signer": {
     "image": "ghcr.io/hyperledger/firefly-signer",
-    "tag": "v1.1.17",
-    "sha": "4391674f66dadb42ef29f3ea0ac62b130bad041675ff25ad3f8c7c0c8eda3854"
+    "tag": "v1.1.20",
+    "sha": "270f3749f8fa4326de08890d667651a80ff3dfe86c05ad5387671ad0d5b17fe9"
   },
   "build": {
     "firefly-builder": {
@@ -51,14 +51,14 @@
       "image": "ethereum/solc:0.8.11-alpine"
     },
     "base": {
-      "image": "alpine:3.19"
+      "image": "alpine:3.19.7"
     }
   },
   "ui": {
     "tag": "v1.3.1",
-    "release": "v1.3.1"
+    "release": "v1.3.1" 
   },
   "cli": {
-    "tag": "v1.3.2"
+    "tag": "v1.3.3-rc.1"
   }
 }
diff --git a/test/e2e/client/restclient.go b/test/e2e/client/restclient.go
@@ -370,7 +370,7 @@ func (client *FireFlyClient) GetOrganization(t *testing.T, idOrName string) *cor
 		SetResult(&identity).
 		Get(client.namespaced(fmt.Sprintf("%s/%s", urlGetOrganizations, idOrName)))
 	assert.NoError(t, err)
-	if res.StatusCode() == 404 {
+	if res.StatusCode() == http.StatusNotFound {
 		return nil
 	}
 	assert.True(t, res.IsSuccess())
diff --git a/test/e2e/e2e.go b/test/e2e/e2e.go
