chore: update module path for hyperledger-firefly org migration and bump go version

.github/workflows/docker_main.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set build tag
         id: build_tag_generator
         run: |
-          RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger/firefly-fabconnect/releases/latest -s | jq .tag_name -r)
+          RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger-firefly/fabconnect/releases/latest -s | jq .tag_name -r)
           BUILD_TAG=$RELEASE_TAG-$(date +"%Y%m%d")-$GITHUB_RUN_NUMBER
           echo ::set-output name=BUILD_TAG::$BUILD_TAG
 
@@ -28,18 +28,18 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.23-alpine3.19 \
-            --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
+            --build-arg BUILD_IMAGE=golang:1.26.4-alpine3.24 \
+            --tag ghcr.io/hyperledger-firefly/fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
 
       - name: Tag release
-        run: docker tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger/firefly-fabconnect:head
+        run: docker tag ghcr.io/hyperledger-firefly/fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} ghcr.io/hyperledger-firefly/fabconnect:head
 
       - name: Push docker image
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
+          docker push ghcr.io/hyperledger-firefly/fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }}
 
       - name: Push head tag
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-fabconnect:head
+          docker push ghcr.io/hyperledger-firefly/fabconnect:head

.github/workflows/docker_release.yml

@@ -20,27 +20,27 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${GITHUB_REF##*/} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.23-alpine3.19 \
-            --tag ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/} \
-            --tag ghcr.io/hyperledger/firefly-fabconnect:head \
+            --build-arg BUILD_IMAGE=golang:1.26.4-alpine3.24 \
+            --tag ghcr.io/hyperledger-firefly/fabconnect:${GITHUB_REF##*/} \
+            --tag ghcr.io/hyperledger-firefly/fabconnect:head \
             .
 
       - name: Tag release
         if: github.event.action == 'released'
-        run: docker tag ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/} ghcr.io/hyperledger/firefly-fabconnect:latest
+        run: docker tag ghcr.io/hyperledger-firefly/fabconnect:${GITHUB_REF##*/} ghcr.io/hyperledger-firefly/fabconnect:latest
 
       - name: Push docker image
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-fabconnect:${GITHUB_REF##*/}
+          docker push ghcr.io/hyperledger-firefly/fabconnect:${GITHUB_REF##*/}
 
       - name: Push head tag
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-fabconnect:head
+          docker push ghcr.io/hyperledger-firefly/fabconnect:head
 
       - name: Push latest tag
         if: github.event.action == 'released'
         run: |
           echo ${{ secrets.GITHUB_TOKEN }} | docker login ghcr.io -u $GITHUB_ACTOR --password-stdin
-          docker push ghcr.io/hyperledger/firefly-fabconnect:latest
+          docker push ghcr.io/hyperledger-firefly/fabconnect:latest

.github/workflows/go.yml

@@ -16,7 +16,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v6
         with:
-          go-version: "1.23"
+          go-version: "1.26.4"
           check-latest: true
 
       - name: Build and Test
@@ -32,7 +32,7 @@ jobs:
       - name: Set build tag
         id: build_tag_generator
         run: |
-          RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger/firefly-fabconnect/releases/latest -s | jq .tag_name -r)
+          RELEASE_TAG=$(curl https://api.github.com/repos/hyperledger-firefly/fabconnect/releases/latest -s | jq .tag_name -r)
           BUILD_TAG=$RELEASE_TAG-$(date +"%Y%m%d")-$GITHUB_RUN_NUMBER
           echo ::set-output name=BUILD_TAG::$BUILD_TAG
 
@@ -43,5 +43,5 @@ jobs:
             --label build_date=$(date -u +"%Y-%m-%dT%H:%M:%SZ") \
             --label tag=${{ steps.build_tag_generator.outputs.BUILD_TAG }} \
             --build-arg BASE_IMAGE=alpine:3.19 \
-            --build-arg BUILD_IMAGE=golang:1.23-alpine3.19 \
-            --tag ghcr.io/hyperledger/firefly-fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .
+            --build-arg BUILD_IMAGE=golang:1.26.4-alpine3.24 \
+            --tag ghcr.io/hyperledger-firefly/fabconnect:${{ steps.build_tag_generator.outputs.BUILD_TAG }} .

.trivyignore

@@ -1,3 +1,3 @@
 # not relevant to the way grpc is used in fabconnect
-# see https://github.com/hyperledger/firefly-fabconnect/pull/123#discussion_r1543748524
+# see https://github.com/hyperledger-firefly/fabconnect/pull/123#discussion_r1543748524
 GHSA-m425-mq94-257g

CONTRIBUTING.md

@@ -4,7 +4,7 @@ We welcome contributions to the FireFly Project in many forms, and
 there's always plenty to do!
 
 Please visit the
-[contributors guide](https://hyperledger.github.io/firefly/contributors/contributors.html) in the
+[contributors guide](https://hyperledger-firefly.github.io/firefly/contributors/contributors.html) in the
 docs to learn how to make contributions to this exciting project.
 
 <a rel="license" href="http://creativecommons.org/licenses/by/4.0/"><img alt="Creative Commons License" style="border-width:0" src="https://i.creativecommons.org/l/by/4.0/88x31.png" /></a><br />This work is licensed under a <a rel="license" href="http://creativecommons.org/licenses/by/4.0/">Creative Commons Attribution 4.0 International License</a>.

Makefile

@@ -19,22 +19,22 @@ coverage: test coverage.html
 lint: ${LINT}
 		GOGC=20 $(LINT) run -v --timeout 5m
 ${LINT}:
-		$(VGO) install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+		$(VGO) install github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
 firefly-fabconnect-nocgo: ${GOFILES}		
 	CGO_ENABLED=0 $(VGO) build -o ${BINARY_NAME}-nocgo -ldflags "-X main.buildDate=`date -u +\"%Y-%m-%dT%H:%M:%SZ\"` -X main.buildVersion=$(BUILD_VERSION)" -tags=prod -tags=prod -v
 firefly-fabconnect: ${GOFILES}
 	$(VGO) build -o ${BINARY_NAME} -ldflags "-X main.buildDate=`date -u +\"%Y-%m-%dT%H:%M:%SZ\"` -X main.buildVersion=$(BUILD_VERSION)" -tags=prod -tags=prod -v
 go-mod-tidy: .ALWAYS
 	go mod tidy
 docker:
-	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.23-alpine3.19 -t hyperledger/firefly-fabconnect .
+	docker build --build-arg BASE_IMAGE=alpine:3.19  --build-arg BUILD_IMAGE=golang:1.23-alpine3.19 -t hyperledger-firefly/fabconnect .
 build: firefly-fabconnect-nocgo firefly-fabconnect
 .ALWAYS: ;
 clean: 
 	$(VGO) clean
 	rm -f *.so ${BINARY_NAME}
 builddeps:
-	$(VGO) get github.com/golangci/golangci-lint/cmd/golangci-lint@v1.55.2
+	$(VGO) get github.com/golangci/golangci-lint/v2/cmd/golangci-lint@v2.12.2
 deps: builddeps
 	$(VGO) get
 mockery: .ALWAYS

cmd/fabconnect.go

@@ -25,8 +25,8 @@ import (
 
 	yaml "gopkg.in/yaml.v2"
 
-	"github.com/hyperledger/firefly-fabconnect/internal/conf"
-	"github.com/hyperledger/firefly-fabconnect/internal/rest"
+	"github.com/hyperledger-firefly/fabconnect/internal/conf"
+	"github.com/hyperledger-firefly/fabconnect/internal/rest"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"

cmd/fabconnect_test.go

@@ -21,7 +21,7 @@ import (
 	"regexp"
 	"testing"
 
-	"github.com/hyperledger/firefly-fabconnect/internal/rest/test"
+	"github.com/hyperledger-firefly/fabconnect/internal/rest/test"
 	"github.com/spf13/cobra"
 
 	"github.com/stretchr/testify/assert"

docs/getting-started/test-network.md

@@ -86,7 +86,7 @@ networks:
 services:
     fabconnect_0:
         container_name: firefly_fabconnect_0
-        image: ghcr.io/hyperledger/firefly-fabconnect:latest
+        image: ghcr.io/hyperledger-firefly/fabconnect:latest
         command: -f /fabconnect/fabconnect.yaml
         volumes:
             - fabconnect_receipts_0:/fabconnect/receipts
@@ -280,7 +280,7 @@ cd $HOME
 
 Download the fabconnect repository
 ```bash
-git clone https://github.com/hyperledger/firefly-fabconnect.git
+git clone https://github.com/hyperledger-firefly/fabconnect.git
 ```
 
 Compile fabconnect
@@ -570,8 +570,8 @@ As a result, the client should respond with a JSON similar to this:
  ```
 ## Documentation <a name="doc"></a>
 
-- [FireFly Fabconnect - Github](https://github.com/hyperledger/firefly-fabconnect)
-- [FireFly Cli - Github](https://github.com/hyperledger/firefly-cli/)
-- [Firefly - Doc](https://hyperledger.github.io/firefly/)
+- [FireFly Fabconnect - Github](https://github.com/hyperledger-firefly/fabconnect)
+- [FireFly Cli - Github](https://github.com/hyperledger-firefly/cli/)
+- [Firefly - Doc](https://hyperledger-firefly.github.io/firefly/)
 
 ## Troubleshooting <a name="troubleshooting"></a>

go.mod

@@ -1,11 +1,11 @@
-module github.com/hyperledger/firefly-fabconnect
+module github.com/hyperledger-firefly/fabconnect
 
-go 1.23.0
+go 1.26.4
 
 require (
 	github.com/Shopify/sarama v1.38.1
 	github.com/globalsign/mgo v0.0.0-20181015135952-eeefdecb41b8
-	github.com/golang/protobuf v1.5.3
+	github.com/golang/protobuf v1.5.4
 	github.com/google/certificate-transparency-go v1.1.7 // indirect
 	github.com/gorilla/websocket v1.5.1
 	github.com/hashicorp/golang-lru v1.0.2
@@ -31,7 +31,7 @@ require (
 require (
 	github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.2.0 // indirect
+	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudflare/cfssl v1.6.4 // indirect
 	github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/eapache/go-resiliency v1.5.0 // indirect
@@ -88,18 +88,16 @@ require (
 	github.com/zmap/zcrypto v0.0.0-20231219022726-a1f61fb1661c // indirect
 	github.com/zmap/zlint/v3 v3.6.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.35.0 // indirect
+	golang.org/x/crypto v0.53.0 // indirect
 	golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
-	golang.org/x/net v0.33.0 // indirect
-	golang.org/x/sync v0.11.0 // indirect
-	golang.org/x/sys v0.30.0 // indirect
-	golang.org/x/term v0.29.0 // indirect
-	golang.org/x/text v0.22.0 // indirect
-	google.golang.org/genproto/googleapis/rpc v0.0.0-20240108191215-35c7eff3a6b1 // indirect
-	google.golang.org/grpc v1.60.1 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	golang.org/x/net v0.56.0 // indirect
+	golang.org/x/sync v0.21.0 // indirect
+	golang.org/x/sys v0.46.0 // indirect
+	golang.org/x/term v0.44.0 // indirect
+	golang.org/x/text v0.38.0 // indirect
+	google.golang.org/genproto/googleapis/rpc v0.0.0-20251202230838-ff82c1b0f217 // indirect
+	google.golang.org/grpc v1.79.3 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
-
-replace google.golang.org/grpc => google.golang.org/grpc v1.58.3