Update go to 1.26 and replace org references

.goreleaser.yml

@@ -28,7 +28,7 @@ builds:
     main: ./ffperf
     binary: ffperf
     ldflags:
-      - "-s -w -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version={{.Version}}' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit={{.Commit}}' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date={{.Date}}'"
+      - "-s -w -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version={{.Version}}' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit={{.Commit}}' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date={{.Date}}'"
 archives:
   - name_template: >-
       {{ .ProjectName }}_{{ .Version }}_

GettingStarted.md

@@ -21,8 +21,8 @@
   ```bash
   # From the firefly-perf-cli folder
   mkdir ~/ffperf-testing
-  git clone git@github.com:hyperledger/firefly.git ~/ffperf-testing/firefly
-  git clone git@github.com:hyperledger/firefly-perf-cli.git ~/ffperf-testing/firefly-perf-cli
+  git clone git@github.com:hyperledger-firefly/firefly.git ~/ffperf-testing/firefly
+  git clone git@github.com:hyperledger-firefly/perf-cli.git ~/ffperf-testing/firefly-perf-cli
   cp scripts/getLogs.sh ~/ffperf-testing/getLogs.sh
   cp scripts/prep.sh ~/ffperf-testing/prep.sh
   ```
@@ -65,7 +65,7 @@ git checkout ...
   # ex: ./prep.sh oldStack newStack geth
   ```
 - Once script is done, you'll be given a command to run the perf test. Paste that in to the terminal to start the test.
-- \*\*Please save the markdown row that is printed. You will need to use this to create an issue in https://github.com/hyperledger/firefly/issues/519
+- \*\*Please save the markdown row that is printed. You will need to use this to create an issue in https://github.com/hyperledger-firefly/firefly/issues/519
 
 ## Getting Logs
 

GettingStartedRemoteNode.md

@@ -26,7 +26,7 @@ Note: you must create a FireFly token pool before running either of the remote e
   ```bash
   # From the firefly-perf-cli folder
   mkdir ~/ffperf-testing
-  git clone git@github.com:hyperledger/firefly-perf-cli.git ~/ffperf-testing/firefly-perf-cli
+  git clone git@github.com:hyperledger-firefly/perf-cli.git ~/ffperf-testing/firefly-perf-cli
   cp scripts/getLogs.sh ~/ffperf-testing/getLogs.sh
   cp scripts/prepForRemote.sh ~/ffperf-testing/prepForRemote.sh
   ```

Makefile

@@ -23,12 +23,12 @@ LINT := $(GOBIN)/golangci-lint
 
 all: build
 build: ## Builds all go code
-		cd ffperf && go build -ldflags="-X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit=$(GITREF)'"
+		cd ffperf && go build -ldflags="-X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit=$(GITREF)'"
 install: ## Installs the package
-		cd ffperf && go install -ldflags="-X 'github.com/hyperledger/firefly-perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger/firefly-perf-cli/internal/version.Commit=$(GITREF)'"
+		cd ffperf && go install -ldflags="-X 'github.com/hyperledger-firefly/perf-cli/internal/version.Version=$(VERSION)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Date=$(DATE)' -X 'github.com/hyperledger-firefly/perf-cli/internal/version.Commit=$(GITREF)'"
 
 docker:
-	docker build --platform linux/amd64 --build-arg BUILD_VERSION=$(VERSION) . -t ghcr.io/hyperledger/firefly-perf-cli
+	docker build --platform linux/amd64 --build-arg BUILD_VERSION=$(VERSION) . -t ghcr.io/hyperledger-firefly/perf-cli
 
 lint: ${LINT} ## Checks and reports lint errors
 		GOGC=20 $(LINT) run -v --timeout 5m

README.md

@@ -1,7 +1,7 @@
 # FireFly Performance CLI
 
-FireFly Performance CLI is a HTTP load testing tool that generates a constant request rate against a [FireFly](https://github.com/hyperledger/firefly)
-network and measure performance. This is used to confirm confidence that [FireFly](https://github.com/hyperledger/firefly)
+FireFly Performance CLI is a HTTP load testing tool that generates a constant request rate against a [FireFly](https://github.com/hyperledger-firefly/firefly)
+network and measure performance. This is used to confirm confidence that [FireFly](https://github.com/hyperledger-firefly/firefly)
 can perform under normal conditions for an extended period of time.
 
 ## Items Subject to Testing
@@ -39,7 +39,7 @@ See the [`Getting Started`](GettingStarted.md) guide for help running tests agai
 In the test configuration you define one or more test _instances_ for a single `ffperf` process to run. An instance then
 describes running one or more test _cases_ with a dedicated number of goroutine _workers_ against a _sender_ org and
 a _recipient_ org. The test configuration consumes a file reference to the stack JSON configuration produced by the
-[`ff` CLI](https://github.com/hyperledger/firefly-cli) (or can be defined manually) to understand the network topology, so that
+[`ff` CLI](https://github.com/hyperledger-firefly/cli) (or can be defined manually) to understand the network topology, so that
 sender's and recipient's just refer to indices within the stack.
 
 As a result, running the CLI consists of providing an `instances.yaml` file describe the test configuration

charts/ffperf/values.yaml

@@ -55,7 +55,7 @@ instances: []
 daemonModeEnabled: false
 
 image:
-  repository: ghcr.io/hyperledger/firefly-perf-cli
+  repository: ghcr.io/hyperledger-firefly/perf-cli
   pullPolicy: Always  # TODO
   # Overrides the image tag whose default is the chart appVersion.
   tag: "v0.0.1-alpha"  # TODO

cmd/run.go

@@ -24,12 +24,12 @@ import (
 	"path"
 	"time"
 
-	"github.com/hyperledger/firefly-perf-cli/internal/conf"
-	"github.com/hyperledger/firefly-perf-cli/internal/perf"
-	"github.com/hyperledger/firefly-perf-cli/internal/server"
-	"github.com/hyperledger/firefly-perf-cli/internal/types"
-	"github.com/hyperledger/firefly-perf-cli/internal/util"
-	"github.com/hyperledger/firefly/pkg/core"
+	"github.com/hyperledger-firefly/perf-cli/internal/conf"
+	"github.com/hyperledger-firefly/perf-cli/internal/perf"
+	"github.com/hyperledger-firefly/perf-cli/internal/server"
+	"github.com/hyperledger-firefly/perf-cli/internal/types"
+	"github.com/hyperledger-firefly/perf-cli/internal/util"
+	"github.com/hyperledger-firefly/firefly/pkg/core"
 	"github.com/pkg/errors"
 	log "github.com/sirupsen/logrus"
 	"github.com/spf13/cobra"

cmd/version.go

@@ -20,7 +20,7 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"github.com/hyperledger/firefly-perf-cli/internal/version"
+	"github.com/hyperledger-firefly/perf-cli/internal/version"
 	"gopkg.in/yaml.v3"
 
 	"github.com/spf13/cobra"

ffperf/main.go

@@ -19,7 +19,7 @@ package main
 import (
 	"os"
 
-	"github.com/hyperledger/firefly-perf-cli/cmd"
+	"github.com/hyperledger-firefly/perf-cli/cmd"
 )
 
 func main() {

go.mod

@@ -1,13 +1,13 @@
-module github.com/hyperledger/firefly-perf-cli
+module github.com/hyperledger-firefly/perf-cli
 
-go 1.21
+go 1.26.0
 
-toolchain go1.21.6
+toolchain go1.26.4
 
 require (
 	github.com/go-resty/resty/v2 v2.11.0
-	github.com/hyperledger/firefly v1.3.0-rc.1
-	github.com/hyperledger/firefly-common v1.4.6
+	github.com/hyperledger-firefly/common v1.6.3
+	github.com/hyperledger-firefly/firefly v1.5.0-rc.1
 	github.com/pkg/errors v0.9.1
 	github.com/prometheus/client_golang v1.18.0
 	github.com/prometheus/client_model v0.5.0
@@ -18,23 +18,27 @@ require (
 	gopkg.in/yaml.v3 v3.0.1
 )
 
+require (
+	github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
+	github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
+)
+
 require (
 	github.com/aidarkhanov/nanoid v1.0.8 // 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/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
 	github.com/docker/go-units v0.5.0 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
-	github.com/getkin/kin-openapi v0.122.0 // indirect
+	github.com/getkin/kin-openapi v0.131.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
-	github.com/go-openapi/jsonpointer v0.20.2 // indirect
-	github.com/go-openapi/swag v0.22.7 // indirect
-	github.com/google/uuid v1.5.0 // indirect
+	github.com/go-openapi/jsonpointer v0.21.0 // indirect
+	github.com/go-openapi/swag v0.23.0 // indirect
+	github.com/google/uuid v1.6.0 // indirect
 	github.com/gorilla/mux v1.8.1 // indirect
 	github.com/gorilla/websocket v1.5.1 // indirect
 	github.com/hashicorp/hcl v1.0.0 // indirect
 	github.com/inconshreveable/mousetrap v1.1.0 // indirect
-	github.com/invopop/yaml v0.2.0 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/magiconair/properties v1.8.7 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
@@ -50,27 +54,27 @@ require (
 	github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
 	github.com/prometheus/common v0.45.0 // indirect
 	github.com/prometheus/procfs v0.12.0 // indirect
-	github.com/rs/cors v1.10.1 // indirect
+	github.com/rs/cors v1.11.1 // indirect
 	github.com/sagikazarmark/locafero v0.4.0 // indirect
 	github.com/sagikazarmark/slog-shim v0.1.0 // indirect
 	github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 // indirect
 	github.com/sourcegraph/conc v0.3.0 // indirect
 	github.com/spf13/afero v1.11.0 // indirect
 	github.com/spf13/cast v1.6.0 // indirect
 	github.com/spf13/pflag v1.0.5 // indirect
-	github.com/stretchr/testify v1.8.4 // indirect
+	github.com/stretchr/testify v1.9.0 // indirect
 	github.com/subosito/gotenv v1.6.0 // indirect
 	github.com/x-cray/logrus-prefixed-formatter v0.5.2 // indirect
 	gitlab.com/hfuss/mux-prometheus v0.0.5 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	golang.org/x/crypto v0.18.0 // indirect
+	golang.org/x/crypto v0.52.0 // indirect
 	golang.org/x/exp v0.0.0-20240110193028-0dcbfd608b1e // indirect
-	golang.org/x/net v0.20.0 // indirect
-	golang.org/x/sync v0.7.0
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.16.0 // indirect
-	golang.org/x/text v0.14.0 // indirect
-	google.golang.org/protobuf v1.32.0 // indirect
+	golang.org/x/net v0.55.0 // indirect
+	golang.org/x/sync v0.20.0
+	golang.org/x/sys v0.45.0 // indirect
+	golang.org/x/term v0.43.0 // indirect
+	golang.org/x/text v0.37.0 // indirect
+	google.golang.org/protobuf v1.36.10 // indirect
 	gopkg.in/ini.v1 v1.67.0 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect