diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 3edfbe88..4d5ca5ff 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -20,6 +20,6 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.26.4" - name: Compile FireFly CLI run: make diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 66e41b5c..595a2e74 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -85,13 +85,13 @@ jobs: - name: Checkout FireFly Core repo uses: actions/checkout@v4 with: - repository: hyperledger/firefly + repository: hyperledger-firefly/firefly path: firefly - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.26.4" - name: Compile FireFly CLI working-directory: firefly-cli diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index f1e96937..f5ddc18b 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -19,7 +19,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v4 with: - go-version: "1.22" + go-version: "1.26.4" - name: Run GoReleaser uses: goreleaser/goreleaser-action@v4 with: diff --git a/.goreleaser.yml b/.goreleaser.yml index 7eced22e..247778f6 100644 --- a/.goreleaser.yml +++ b/.goreleaser.yml @@ -26,7 +26,7 @@ builds: main: ./ff binary: ff ldflags: - - "-s -w -X 'github.com/hyperledger/firefly-cli/cmd.BuildVersionOverride={{.Version}}' -X 'github.com/hyperledger/firefly-cli/cmd.BuildDate={{.Date}}' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit={{.Commit}}'" + - "-s -w -X 'github.com/hyperledger-firefly/cli/cmd.BuildVersionOverride={{.Version}}' -X 'github.com/hyperledger-firefly/cli/cmd.BuildDate={{.Date}}' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit={{.Commit}}'" archives: - name_template: >- {{ .ProjectName }}_{{ .Version }}_ diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 5aec049b..d076cee2 100644 --- a/CONTRIBUTING.md +++ b/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/latest/contributors/index) in the +[contributors guide](https://hyperledger-firefly.github.io/firefly/latest/contributors/index) in the docs to learn how to make contributions to this exciting project. Creative Commons License
This work is licensed under a Creative Commons Attribution 4.0 International License. diff --git a/Makefile b/Makefile index 86b77898..31b15b88 100644 --- a/Makefile +++ b/Makefile @@ -26,9 +26,9 @@ format: ## Formats all go code test: deps $(VGO) test ./internal/... ./pkg/... ./cmd/... -cover -coverprofile=coverage.txt -covermode=atomic -timeout=30s ${TEST_ARGS} build: ## Builds all go code - cd ff && go build -ldflags="-X 'github.com/hyperledger/firefly-cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit=$(GITREF)'" + cd ff && go build -ldflags="-X 'github.com/hyperledger-firefly/cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit=$(GITREF)'" install: ## Installs the package - cd ff && go install -ldflags="-X 'github.com/hyperledger/firefly-cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger/firefly-cli/cmd.BuildCommit=$(GITREF)'" + cd ff && go install -ldflags="-X 'github.com/hyperledger-firefly/cli/cmd.BuildDate=$(DATE)' -X 'github.com/hyperledger-firefly/cli/cmd.BuildCommit=$(GITREF)'" lint: ${LINT} ## Checks and reports lint errors GOGC=20 $(LINT) run -v --timeout 5m diff --git a/README.md b/README.md index 2b919fef..5acf54e1 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ # FireFly CLI -![build](https://github.com/hyperledger/firefly-cli/actions/workflows/build.yml/badge.svg?branch=main) +![build](https://github.com/hyperledger-firefly/cli/actions/workflows/build.yml/badge.svg?branch=main) -The FireFly CLI can be used to create local [FireFly](https://github.com/hyperledger/firefly) stacks +The FireFly CLI can be used to create local [FireFly](https://github.com/hyperledger-firefly/firefly) stacks for offline development of blockchain apps. This allows developers to rapidly iterate on their idea without needing to set up a bunch of infrastructure before they can write the first line of code. @@ -21,7 +21,7 @@ In order to run the FireFly CLI, you will need a few things installed on your de The easiest way to get up and running with the FireFly CLI is to download a pre-compiled binary of the latest release. ### Download the package for your OS -Go to the [latest release page](https://github.com/hyperledger/firefly-cli/releases/latest) and download the package for your OS and CPU architecture. +Go to the [latest release page](https://github.com/hyperledger-firefly/cli/releases/latest) and download the package for your OS and CPU architecture. ### Extract the binary and move it to `/usr/local/bin` @@ -47,7 +47,7 @@ If you downloaded the package from GitHub into a different directory, you will n If you have a local Go development environment, and you have included `${GOPATH}/bin` in your path, you can install with: ```sh -go install github.com/hyperledger/firefly-cli/ff@latest +go install github.com/hyperledger-firefly/cli/ff@latest ``` ## Create a new stack diff --git a/cmd/accounts_create.go b/cmd/accounts_create.go index ecaa7ce0..86286726 100644 --- a/cmd/accounts_create.go +++ b/cmd/accounts_create.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/accounts_create_test.go b/cmd/accounts_create_test.go index 0fbf6f71..53ec1360 100644 --- a/cmd/accounts_create_test.go +++ b/cmd/accounts_create_test.go @@ -4,7 +4,7 @@ import ( "os" "testing" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/accounts_list.go b/cmd/accounts_list.go index 92367eff..c6294343 100644 --- a/cmd/accounts_list.go +++ b/cmd/accounts_list.go @@ -21,9 +21,9 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/accounts_list_test.go b/cmd/accounts_list_test.go index 42f76f07..6518ce73 100644 --- a/cmd/accounts_list_test.go +++ b/cmd/accounts_list_test.go @@ -3,7 +3,7 @@ package cmd import ( "testing" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/deploy_ethereum.go b/cmd/deploy_ethereum.go index 5268136f..61de8372 100644 --- a/cmd/deploy_ethereum.go +++ b/cmd/deploy_ethereum.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/deploy_ethereum_test.go b/cmd/deploy_ethereum_test.go index 15189b75..0be6118f 100644 --- a/cmd/deploy_ethereum_test.go +++ b/cmd/deploy_ethereum_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/deploy_fabric.go b/cmd/deploy_fabric.go index f1f23eff..348680fa 100644 --- a/cmd/deploy_fabric.go +++ b/cmd/deploy_fabric.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/deploy_fabric_test.go b/cmd/deploy_fabric_test.go index 348b9453..2220cfe9 100644 --- a/cmd/deploy_fabric_test.go +++ b/cmd/deploy_fabric_test.go @@ -7,7 +7,7 @@ import ( "testing" "time" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/info.go b/cmd/info.go index e0f7c37a..8367322e 100644 --- a/cmd/info.go +++ b/cmd/info.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/info_test.go b/cmd/info_test.go index 39edd310..e0fe7bf1 100644 --- a/cmd/info_test.go +++ b/cmd/info_test.go @@ -3,7 +3,7 @@ package cmd import ( "testing" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/stretchr/testify/assert" ) diff --git a/cmd/init.go b/cmd/init.go index 34ed1c0c..727bf1d8 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -29,10 +29,10 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) var initOptions types.InitOptions diff --git a/cmd/init_cardano.go b/cmd/init_cardano.go index 2c4dc242..954fca58 100644 --- a/cmd/init_cardano.go +++ b/cmd/init_cardano.go @@ -21,9 +21,9 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/init_ethereum.go b/cmd/init_ethereum.go index 8a68c1a4..bce725bf 100644 --- a/cmd/init_ethereum.go +++ b/cmd/init_ethereum.go @@ -23,11 +23,11 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) var initEthereumCmd = &cobra.Command{ diff --git a/cmd/init_fabric.go b/cmd/init_fabric.go index 53379217..980cdcb6 100644 --- a/cmd/init_fabric.go +++ b/cmd/init_fabric.go @@ -23,10 +23,10 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" ) var initFabricCmd = &cobra.Command{ diff --git a/cmd/init_tezos.go b/cmd/init_tezos.go index a8af84a2..1ebc315d 100644 --- a/cmd/init_tezos.go +++ b/cmd/init_tezos.go @@ -23,9 +23,9 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" ) var initTezosCmd = &cobra.Command{ diff --git a/cmd/list.go b/cmd/list.go index 3a23ab9d..bf4e2b54 100644 --- a/cmd/list.go +++ b/cmd/list.go @@ -21,7 +21,7 @@ import ( "github.com/spf13/cobra" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/stacks" ) var listCommand = &cobra.Command{ diff --git a/cmd/logs.go b/cmd/logs.go index d09e419c..1e8d160c 100644 --- a/cmd/logs.go +++ b/cmd/logs.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/prompt.go b/cmd/prompt.go index 5fe1feb7..4c0a4609 100644 --- a/cmd/prompt.go +++ b/cmd/prompt.go @@ -23,7 +23,7 @@ import ( "strconv" "strings" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/ps.go b/cmd/ps.go index f4a28755..8f81cce1 100644 --- a/cmd/ps.go +++ b/cmd/ps.go @@ -21,8 +21,8 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/pull.go b/cmd/pull.go index c45b3250..a1f00300 100644 --- a/cmd/pull.go +++ b/cmd/pull.go @@ -22,10 +22,10 @@ import ( "time" "github.com/briandowns/spinner" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/remove.go b/cmd/remove.go index dde282a4..61e79d52 100644 --- a/cmd/remove.go +++ b/cmd/remove.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/reset.go b/cmd/reset.go index 2a7c567d..77e8dffb 100644 --- a/cmd/reset.go +++ b/cmd/reset.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/root.go b/cmd/root.go index a7ba8628..e79e4c1a 100644 --- a/cmd/root.go +++ b/cmd/root.go @@ -27,7 +27,7 @@ import ( homedir "github.com/mitchellh/go-homedir" "github.com/spf13/viper" - "github.com/hyperledger/firefly-cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/log" ) var cfgFile string diff --git a/cmd/start.go b/cmd/start.go index 95e0f496..ef649446 100644 --- a/cmd/start.go +++ b/cmd/start.go @@ -23,10 +23,10 @@ import ( "time" "github.com/briandowns/spinner" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/spf13/cobra" ) diff --git a/cmd/stop.go b/cmd/stop.go index c6ce0bea..fa9e01e0 100644 --- a/cmd/stop.go +++ b/cmd/stop.go @@ -20,9 +20,9 @@ import ( "context" "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/cmd/upgrade.go b/cmd/upgrade.go index ef90fc41..5afea747 100644 --- a/cmd/upgrade.go +++ b/cmd/upgrade.go @@ -22,9 +22,9 @@ import ( "time" "github.com/briandowns/spinner" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/stacks" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/stacks" "github.com/spf13/cobra" ) diff --git a/ff/main.go b/ff/main.go index 62a76396..1e4d25ec 100644 --- a/ff/main.go +++ b/ff/main.go @@ -17,7 +17,7 @@ package main import ( - "github.com/hyperledger/firefly-cli/cmd" + "github.com/hyperledger-firefly/cli/cmd" ) func main() { diff --git a/go.mod b/go.mod index 85600213..29608d54 100644 --- a/go.mod +++ b/go.mod @@ -14,20 +14,18 @@ // See the License for the specific language governing permissions and // limitations under the License. -module github.com/hyperledger/firefly-cli +module github.com/hyperledger-firefly/cli -go 1.22 - -toolchain go1.22.6 +go 1.26.0 require ( blockwatch.cc/tzgo v1.17.4 github.com/blinklabs-io/bursa v0.7.2 github.com/briandowns/spinner v1.23.0 - github.com/btcsuite/btcd/btcec/v2 v2.3.2 + github.com/btcsuite/btcd/btcec/v2 v2.3.5 github.com/google/go-containerregistry v0.17.0 - github.com/hyperledger/firefly-common v1.4.10 - github.com/hyperledger/firefly-signer v1.1.15 + github.com/hyperledger-firefly/common v1.6.3 + github.com/hyperledger-firefly/signer v1.2.1 github.com/jarcoal/httpmock v1.3.1 github.com/mattn/go-isatty v0.0.20 github.com/miracl/conflate v1.3.2 @@ -36,7 +34,7 @@ require ( github.com/spf13/cobra v1.8.0 github.com/spf13/viper v1.18.2 github.com/stretchr/testify v1.9.0 - golang.org/x/crypto v0.21.0 + golang.org/x/crypto v0.36.0 gopkg.in/yaml.v2 v2.4.0 gopkg.in/yaml.v3 v3.0.1 ) @@ -113,12 +111,12 @@ require ( go.opentelemetry.io/otel/trace v1.21.0 // indirect go.uber.org/multierr v1.11.0 // indirect golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 // indirect - golang.org/x/net v0.23.0 // indirect + golang.org/x/net v0.38.0 // indirect golang.org/x/oauth2 v0.16.0 // indirect - golang.org/x/sync v0.7.0 // indirect - golang.org/x/sys v0.18.0 // indirect - golang.org/x/term v0.18.0 // indirect - golang.org/x/text v0.14.0 // indirect + golang.org/x/sync v0.12.0 // indirect + golang.org/x/sys v0.31.0 // indirect + golang.org/x/term v0.30.0 // indirect + golang.org/x/text v0.23.0 // indirect golang.org/x/time v0.5.0 // indirect golang.org/x/xerrors v0.0.0-20231012003039-104605ab7028 // indirect google.golang.org/api v0.156.0 // indirect diff --git a/go.sum b/go.sum index 131bd75e..f485a316 100644 --- a/go.sum +++ b/go.sum @@ -23,8 +23,8 @@ github.com/blinklabs-io/bursa v0.7.2/go.mod h1:f/VQphNyrDROQKHbsnm1y8jFg7jxmZEM9 github.com/briandowns/spinner v1.23.0 h1:alDF2guRWqa/FOZZYWjlMIx2L6H0wyewPxo/CH4Pt2A= github.com/briandowns/spinner v1.23.0/go.mod h1:rPG4gmXeN3wQV/TsAY4w8lPdIM6RX3yqeBQJSrbXjuE= github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ= -github.com/btcsuite/btcd/btcec/v2 v2.3.2 h1:5n0X6hX0Zk+6omWcihdYvdAlGf2DfasC0GMf7DClJ3U= -github.com/btcsuite/btcd/btcec/v2 v2.3.2/go.mod h1:zYzJ8etWJQIv1Ogk7OzpWjowwOdXY1W/17j2MW85J04= +github.com/btcsuite/btcd/btcec/v2 v2.3.5 h1:dpAlnAwmT1yIBm3exhT1/8iUSD98RDJM5vqJVQDQLiU= +github.com/btcsuite/btcd/btcec/v2 v2.3.5/go.mod h1:m22FrOAiuxl/tht9wIqAoGHcbnCCaPWyauO8y2LGGtQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0 h1:59Kx4K6lzOW5w6nFlA0v5+lk/6sjybR934QNHSJZPTQ= github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0/go.mod h1:7SFka0XMvUgj3hfZtydOrQY2mwhPclbT2snogU7SQQc= github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f/go.mod h1:TdznJufoqS23FtqVCzL0ZqgP5MqXbb4fg/WgDys70nA= @@ -138,10 +138,10 @@ github.com/googleapis/gax-go/v2 v2.12.0/go.mod h1:y+aIqrI5eb1YGMVJfuV3185Ts/D7qK 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/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= -github.com/hyperledger/firefly-common v1.4.10 h1:NgUYorxZF3tNkL7bBqe3PlwA42pPAYlj0wStnUsjN9Y= -github.com/hyperledger/firefly-common v1.4.10/go.mod h1:E7w/RxNtVnX52WXLQW9f2xVAgZnW70voZeE9sZrx/q0= -github.com/hyperledger/firefly-signer v1.1.15 h1:oJXrX1ziDIxzSbRX+risVEmprx3McD1yi0S1S5La4zc= -github.com/hyperledger/firefly-signer v1.1.15/go.mod h1:E/TO0Koi4BqSr8hRhKJVTxiynwX/EQYjqqKrlnsQK7o= +github.com/hyperledger-firefly/common v1.6.3 h1:z9Jm6ttwy7AJvrHw0FbjtPT5wLG8n3K8Rrf3MUkifdY= +github.com/hyperledger-firefly/common v1.6.3/go.mod h1:UiHXY2QdM8UUYHDpFpOAt2hwrVL559G8wZ3b68kAEx8= +github.com/hyperledger-firefly/signer v1.2.1 h1:YmnCfiOPhrP/6WIGt5KwV3wiDEI61k7h282MpagSNnI= +github.com/hyperledger-firefly/signer v1.2.1/go.mod h1:qLBLnXZZHk83x68WLvDjx8q80+6lQzx57FPeRyI6jmo= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= github.com/jarcoal/httpmock v1.3.1 h1:iUx3whfZWVf3jT01hQTO/Eo5sAYtB2/rqaUuOtpInww= @@ -279,8 +279,8 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20200115085410-6d4e4cb37c7d/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= -golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA= -golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs= +golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34= +golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3 h1:hNQpMuAJe5CtcUqCXaWga3FHu+kQvCqcsoVaQgSV60o= golang.org/x/exp v0.0.0-20240112132812-db7319d0e0e3/go.mod h1:idGWGoKP1toJGkd5/ig9ZLuPcZBC3ewk7SzmH0uou08= @@ -298,8 +298,8 @@ golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLL golang.org/x/net v0.0.0-20201110031124-69a78807bb2b/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= -golang.org/x/net v0.23.0 h1:7EYJ93RZ9vYSZAIb2x3lnuvqO5zneoD6IvWjuhfxjTs= -golang.org/x/net v0.23.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg= +golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8= +golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/oauth2 v0.16.0 h1:aDkGMBSYxElaoP81NpoUoz2oo2R2wHdZpGToUxfyQrQ= golang.org/x/oauth2 v0.16.0/go.mod h1:hqZ+0LWXsiVoZpeld6jVt06P3adbS2Uu911W1SsJv2o= @@ -307,8 +307,8 @@ golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= -golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= -golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw= +golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= @@ -322,18 +322,18 @@ golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBc golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.0.0-20220906165534-d0df966e6959/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4= -golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik= +golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= -golang.org/x/term v0.18.0 h1:FcHjZXDMxI8mM3nwhX9HlKop4C0YQvCVCdwYl2wOtE8= -golang.org/x/term v0.18.0/go.mod h1:ILwASektA3OnRv7amZ1xhE/KTR+u50pbXfZ03+6Nx58= +golang.org/x/term v0.30.0 h1:PQ39fJZ+mfadBm0y5WlL4vlM7Sx1Hgf13sMIY2+QS9Y= +golang.org/x/term v0.30.0/go.mod h1:NYYFdzHoI5wRh/h5tDMdMqCqPJZEuNqVR5xJLd/n67g= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= +golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY= +golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4= golang.org/x/time v0.5.0 h1:o7cqy6amK/52YcAKIPlM3a+Fpj35zvRj2TP+e1xFSfk= golang.org/x/time v0.5.0/go.mod h1:3BpzKBy/shNhVucY/MWOyx10tF3SFh9QdLuxbVysPQM= golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ= diff --git a/internal/blockchain/blockchain_provider.go b/internal/blockchain/blockchain_provider.go index 2834ad76..a2d9ef18 100644 --- a/internal/blockchain/blockchain_provider.go +++ b/internal/blockchain/blockchain_provider.go @@ -17,8 +17,8 @@ package blockchain import ( - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type IBlockchainProvider interface { diff --git a/internal/blockchain/cardano/cardanosigner/cardanosigner.go b/internal/blockchain/cardano/cardanosigner/cardanosigner.go index 1a409d26..49008205 100644 --- a/internal/blockchain/cardano/cardanosigner/cardanosigner.go +++ b/internal/blockchain/cardano/cardanosigner/cardanosigner.go @@ -24,10 +24,10 @@ import ( "path/filepath" "github.com/blinklabs-io/bursa" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type CardanoSignerProvider struct { diff --git a/internal/blockchain/cardano/connector/cardanoconnect/config.go b/internal/blockchain/cardano/connector/cardanoconnect/config.go index 44b879de..0d48ae0f 100644 --- a/internal/blockchain/cardano/connector/cardanoconnect/config.go +++ b/internal/blockchain/cardano/connector/cardanoconnect/config.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano/connector" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano/connector" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/miracl/conflate" "gopkg.in/yaml.v2" ) diff --git a/internal/blockchain/cardano/connector/cardanoconnect/docker.go b/internal/blockchain/cardano/connector/cardanoconnect/docker.go index d39e6d07..9a790a2a 100644 --- a/internal/blockchain/cardano/connector/cardanoconnect/docker.go +++ b/internal/blockchain/cardano/connector/cardanoconnect/docker.go @@ -20,8 +20,8 @@ import ( "fmt" "strings" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) func (c *Cardanoconnect) GetServiceDefinitions(s *types.Stack, dependentServices map[string]string) []*docker.ServiceDefinition { diff --git a/internal/blockchain/cardano/connector/connector_interface.go b/internal/blockchain/cardano/connector/connector_interface.go index 698beea9..ae285d08 100644 --- a/internal/blockchain/cardano/connector/connector_interface.go +++ b/internal/blockchain/cardano/connector/connector_interface.go @@ -17,8 +17,8 @@ package connector import ( - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type Connector interface { diff --git a/internal/blockchain/cardano/remoterpc/remoterpc_provider.go b/internal/blockchain/cardano/remoterpc/remoterpc_provider.go index 2fe180c6..34ff3939 100644 --- a/internal/blockchain/cardano/remoterpc/remoterpc_provider.go +++ b/internal/blockchain/cardano/remoterpc/remoterpc_provider.go @@ -22,13 +22,13 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano/cardanosigner" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/cardano/connector/cardanoconnect" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano/cardanosigner" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/cardano/connector/cardanoconnect" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type RemoteRPCProvider struct { diff --git a/internal/blockchain/ethereum/accounts.go b/internal/blockchain/ethereum/accounts.go index 505e0cef..2b4d8165 100644 --- a/internal/blockchain/ethereum/accounts.go +++ b/internal/blockchain/ethereum/accounts.go @@ -22,9 +22,9 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-signer/pkg/keystorev3" - "github.com/hyperledger/firefly-signer/pkg/secp256k1" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/signer/pkg/keystorev3" + "github.com/hyperledger-firefly/signer/pkg/secp256k1" ) func CreateWalletFile(outputDirectory, prefix, password string) (*secp256k1.KeyPair, string, error) { diff --git a/internal/blockchain/ethereum/besu/besu_provider.go b/internal/blockchain/ethereum/besu/besu_provider.go index 158e075d..69343aff 100644 --- a/internal/blockchain/ethereum/besu/besu_provider.go +++ b/internal/blockchain/ethereum/besu/besu_provider.go @@ -23,14 +23,14 @@ import ( "path" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/ethconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/evmconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethsigner" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/ethconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/evmconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethsigner" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) var besuImage = "hyperledger/besu:22.4" diff --git a/internal/blockchain/ethereum/besu/besu_provider_test.go b/internal/blockchain/ethereum/besu/besu_provider_test.go index d4284455..ef680f5d 100644 --- a/internal/blockchain/ethereum/besu/besu_provider_test.go +++ b/internal/blockchain/ethereum/besu/besu_provider_test.go @@ -6,10 +6,10 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/besu/genesis_test.go b/internal/blockchain/ethereum/besu/genesis_test.go index 7530ea0d..fd8f75c6 100644 --- a/internal/blockchain/ethereum/besu/genesis_test.go +++ b/internal/blockchain/ethereum/besu/genesis_test.go @@ -7,8 +7,8 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/connector/connector_interface.go b/internal/blockchain/ethereum/connector/connector_interface.go index 9be85729..072d9d73 100644 --- a/internal/blockchain/ethereum/connector/connector_interface.go +++ b/internal/blockchain/ethereum/connector/connector_interface.go @@ -17,9 +17,9 @@ package connector import ( - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethtypes" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type Connector interface { diff --git a/internal/blockchain/ethereum/connector/ethconnect/client.go b/internal/blockchain/ethereum/connector/ethconnect/client.go index e0d70fc5..caeec7b9 100644 --- a/internal/blockchain/ethereum/connector/ethconnect/client.go +++ b/internal/blockchain/ethereum/connector/ethconnect/client.go @@ -25,11 +25,11 @@ import ( "path" "strings" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes" - "github.com/hyperledger/firefly-cli/internal/core" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethtypes" + "github.com/hyperledger-firefly/cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type Ethconnect struct { diff --git a/internal/blockchain/ethereum/connector/ethconnect/config.go b/internal/blockchain/ethereum/connector/ethconnect/config.go index 03df319c..4e869e3f 100644 --- a/internal/blockchain/ethereum/connector/ethconnect/config.go +++ b/internal/blockchain/ethereum/connector/ethconnect/config.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/miracl/conflate" "gopkg.in/yaml.v3" ) diff --git a/internal/blockchain/ethereum/connector/ethconnect/docker.go b/internal/blockchain/ethereum/connector/ethconnect/docker.go index 55858098..28cff735 100644 --- a/internal/blockchain/ethereum/connector/ethconnect/docker.go +++ b/internal/blockchain/ethereum/connector/ethconnect/docker.go @@ -19,8 +19,8 @@ package ethconnect import ( "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) func (e *Ethconnect) GetServiceDefinitions(s *types.Stack, dependentServices map[string]string) []*docker.ServiceDefinition { diff --git a/internal/blockchain/ethereum/connector/ethconnect/docker_test.go b/internal/blockchain/ethereum/connector/ethconnect/docker_test.go index fec8444b..f9290283 100644 --- a/internal/blockchain/ethereum/connector/ethconnect/docker_test.go +++ b/internal/blockchain/ethereum/connector/ethconnect/docker_test.go @@ -3,7 +3,7 @@ package ethconnect import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/connector/evmconnect/client.go b/internal/blockchain/ethereum/connector/evmconnect/client.go index 23cd5b6a..7cc1fed9 100644 --- a/internal/blockchain/ethereum/connector/evmconnect/client.go +++ b/internal/blockchain/ethereum/connector/evmconnect/client.go @@ -23,11 +23,11 @@ import ( "path" "time" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes" - "github.com/hyperledger/firefly-cli/internal/core" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethtypes" + "github.com/hyperledger-firefly/cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type EvmconnectRequest struct { diff --git a/internal/blockchain/ethereum/connector/evmconnect/config.go b/internal/blockchain/ethereum/connector/evmconnect/config.go index 877a9c23..539e0a5e 100644 --- a/internal/blockchain/ethereum/connector/evmconnect/config.go +++ b/internal/blockchain/ethereum/connector/evmconnect/config.go @@ -21,8 +21,8 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/miracl/conflate" "gopkg.in/yaml.v3" ) diff --git a/internal/blockchain/ethereum/connector/evmconnect/docker.go b/internal/blockchain/ethereum/connector/evmconnect/docker.go index 99675f30..5c279c75 100644 --- a/internal/blockchain/ethereum/connector/evmconnect/docker.go +++ b/internal/blockchain/ethereum/connector/evmconnect/docker.go @@ -19,8 +19,8 @@ package evmconnect import ( "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) func (e *Evmconnect) GetServiceDefinitions(s *types.Stack, dependentServices map[string]string) []*docker.ServiceDefinition { diff --git a/internal/blockchain/ethereum/connector/evmconnect/docker_test.go b/internal/blockchain/ethereum/connector/evmconnect/docker_test.go index c872d4d4..a9deed1e 100644 --- a/internal/blockchain/ethereum/connector/evmconnect/docker_test.go +++ b/internal/blockchain/ethereum/connector/evmconnect/docker_test.go @@ -3,7 +3,7 @@ package evmconnect import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/contracts.go b/internal/blockchain/ethereum/contracts.go index e70518ad..1a07708b 100644 --- a/internal/blockchain/ethereum/contracts.go +++ b/internal/blockchain/ethereum/contracts.go @@ -21,8 +21,8 @@ import ( "encoding/json" "os" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes" - "github.com/hyperledger/firefly-cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethtypes" + "github.com/hyperledger-firefly/cli/internal/docker" ) type truffleCompiledContract struct { diff --git a/internal/blockchain/ethereum/ethereum.go b/internal/blockchain/ethereum/ethereum.go index 4e8de22c..55d9fcf3 100644 --- a/internal/blockchain/ethereum/ethereum.go +++ b/internal/blockchain/ethereum/ethereum.go @@ -24,11 +24,11 @@ import ( "path/filepath" secp256k1 "github.com/btcsuite/btcd/btcec/v2" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "golang.org/x/crypto/sha3" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethtypes" - "github.com/hyperledger/firefly-cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethtypes" + "github.com/hyperledger-firefly/cli/internal/log" ) type Account struct { diff --git a/internal/blockchain/ethereum/ethereum_test.go b/internal/blockchain/ethereum/ethereum_test.go index 25459c58..efef0c51 100644 --- a/internal/blockchain/ethereum/ethereum_test.go +++ b/internal/blockchain/ethereum/ethereum_test.go @@ -5,8 +5,8 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/ethsigner/accounts.go b/internal/blockchain/ethereum/ethsigner/accounts.go index 6bfa15ba..72ac0791 100644 --- a/internal/blockchain/ethereum/ethsigner/accounts.go +++ b/internal/blockchain/ethereum/ethsigner/accounts.go @@ -22,7 +22,7 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/docker" ) func (p *EthSignerProvider) writeTomlKeyFile(walletFilePath string) (string, error) { diff --git a/internal/blockchain/ethereum/ethsigner/ethsigner.go b/internal/blockchain/ethereum/ethsigner/ethsigner.go index 643166f2..706d2f40 100644 --- a/internal/blockchain/ethereum/ethsigner/ethsigner.go +++ b/internal/blockchain/ethereum/ethsigner/ethsigner.go @@ -26,10 +26,10 @@ import ( "path/filepath" "strings" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) // TODO: Probably randomize this and make it different per member? diff --git a/internal/blockchain/ethereum/ethsigner/ethsigner_test.go b/internal/blockchain/ethereum/ethsigner/ethsigner_test.go index f5e7b5a2..27b4149f 100644 --- a/internal/blockchain/ethereum/ethsigner/ethsigner_test.go +++ b/internal/blockchain/ethereum/ethsigner/ethsigner_test.go @@ -3,7 +3,7 @@ package ethsigner import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" ) func TestWriteSignerConfig(t *testing.T) { diff --git a/internal/blockchain/ethereum/geth/geth_provider.go b/internal/blockchain/ethereum/geth/geth_provider.go index 9b5a8af5..86de8c29 100644 --- a/internal/blockchain/ethereum/geth/geth_provider.go +++ b/internal/blockchain/ethereum/geth/geth_provider.go @@ -26,14 +26,14 @@ import ( "strconv" "time" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/ethconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/evmconnect" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/ethconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/evmconnect" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" ) var gethImage = "ethereum/client-go:release-1.10" diff --git a/internal/blockchain/ethereum/geth/geth_provider_test.go b/internal/blockchain/ethereum/geth/geth_provider_test.go index ea8340fc..a20831d0 100644 --- a/internal/blockchain/ethereum/geth/geth_provider_test.go +++ b/internal/blockchain/ethereum/geth/geth_provider_test.go @@ -8,9 +8,9 @@ import ( "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/quorum/client_test.go b/internal/blockchain/ethereum/quorum/client_test.go index 11e42ce8..1e957fff 100644 --- a/internal/blockchain/ethereum/quorum/client_test.go +++ b/internal/blockchain/ethereum/quorum/client_test.go @@ -5,7 +5,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/quorum/quorum.go b/internal/blockchain/ethereum/quorum/quorum.go index e2f7ca8d..ab9d8602 100644 --- a/internal/blockchain/ethereum/quorum/quorum.go +++ b/internal/blockchain/ethereum/quorum/quorum.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/tessera" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/tessera" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) var DockerEntrypoint = "docker-entrypoint.sh" diff --git a/internal/blockchain/ethereum/quorum/quorum_provider.go b/internal/blockchain/ethereum/quorum/quorum_provider.go index 7ad2c2a7..740c2b2a 100644 --- a/internal/blockchain/ethereum/quorum/quorum_provider.go +++ b/internal/blockchain/ethereum/quorum/quorum_provider.go @@ -27,14 +27,14 @@ import ( "strconv" "time" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/ethconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/evmconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/tessera" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/ethconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/evmconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/tessera" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" ) var quorumImage = "quorumengineering/quorum:24.4" diff --git a/internal/blockchain/ethereum/quorum/quorum_provider_test.go b/internal/blockchain/ethereum/quorum/quorum_provider_test.go index 2bee16cc..4583c2fb 100644 --- a/internal/blockchain/ethereum/quorum/quorum_provider_test.go +++ b/internal/blockchain/ethereum/quorum/quorum_provider_test.go @@ -9,12 +9,12 @@ import ( "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/docker/mocks" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/utils" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/docker/mocks" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/utils" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/quorum/quorum_test.go b/internal/blockchain/ethereum/quorum/quorum_test.go index df1f0208..8481652c 100644 --- a/internal/blockchain/ethereum/quorum/quorum_test.go +++ b/internal/blockchain/ethereum/quorum/quorum_test.go @@ -8,9 +8,9 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go b/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go index 1324070b..731ff10f 100644 --- a/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go +++ b/internal/blockchain/ethereum/remoterpc/remoterpc_provider.go @@ -21,14 +21,14 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/ethconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/connector/evmconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/ethsigner" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/ethconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/connector/evmconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/ethsigner" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type RemoteRPCProvider struct { diff --git a/internal/blockchain/ethereum/remoterpc/remoterpc_provider_test.go b/internal/blockchain/ethereum/remoterpc/remoterpc_provider_test.go index e91d0b62..d8cedd7d 100644 --- a/internal/blockchain/ethereum/remoterpc/remoterpc_provider_test.go +++ b/internal/blockchain/ethereum/remoterpc/remoterpc_provider_test.go @@ -4,9 +4,9 @@ import ( "context" "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/ethereum/tessera/tessera.go b/internal/blockchain/ethereum/tessera/tessera.go index 251b6fc0..ac6138ed 100644 --- a/internal/blockchain/ethereum/tessera/tessera.go +++ b/internal/blockchain/ethereum/tessera/tessera.go @@ -25,7 +25,7 @@ import ( "runtime" "strings" - "github.com/hyperledger/firefly-cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/docker" ) var DockerEntrypoint = "docker-entrypoint.sh" diff --git a/internal/blockchain/ethereum/tessera/tessera_test.go b/internal/blockchain/ethereum/tessera/tessera_test.go index d96422cc..b00c019d 100644 --- a/internal/blockchain/ethereum/tessera/tessera_test.go +++ b/internal/blockchain/ethereum/tessera/tessera_test.go @@ -8,8 +8,8 @@ import ( "strings" "testing" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/fabric/constants.go b/internal/blockchain/fabric/constants.go index 3c86622b..3d81b3b2 100644 --- a/internal/blockchain/fabric/constants.go +++ b/internal/blockchain/fabric/constants.go @@ -18,7 +18,7 @@ package fabric // Note: Any change of image tag should be checked if it is published in arm64 format. // Refer to this commit for when arm64 support was added and the code workaround was removed: -// https://github.com/hyperledger/firefly-cli/pull/323/commits/71237b73b07bfee72b355dea83af9cd874b2a2de +// https://github.com/hyperledger-firefly/cli/pull/323/commits/71237b73b07bfee72b355dea83af9cd874b2a2de var FabricToolsImageName = "hyperledger/fabric-tools:2.5.6" var FabricCAImageName = "hyperledger/fabric-ca:1.5" var FabricOrdererImageName = "hyperledger/fabric-orderer:2.5" diff --git a/internal/blockchain/fabric/fabconnect/client_test.go b/internal/blockchain/fabric/fabconnect/client_test.go index 229db04a..1b12810e 100644 --- a/internal/blockchain/fabric/fabconnect/client_test.go +++ b/internal/blockchain/fabric/fabconnect/client_test.go @@ -4,7 +4,7 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-cli/internal/utils" + "github.com/hyperledger-firefly/cli/internal/utils" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/fabric/fabric_docker.go b/internal/blockchain/fabric/fabric_docker.go index f2d56122..195ee5c3 100644 --- a/internal/blockchain/fabric/fabric_docker.go +++ b/internal/blockchain/fabric/fabric_docker.go @@ -19,8 +19,8 @@ package fabric import ( "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) func GenerateDockerServiceDefinitions(s *types.Stack) []*docker.ServiceDefinition { diff --git a/internal/blockchain/fabric/fabric_docker_test.go b/internal/blockchain/fabric/fabric_docker_test.go index f604c821..05a86f96 100644 --- a/internal/blockchain/fabric/fabric_docker_test.go +++ b/internal/blockchain/fabric/fabric_docker_test.go @@ -3,7 +3,7 @@ package fabric import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/fabric/fabric_provider.go b/internal/blockchain/fabric/fabric_provider.go index 42d70ad2..420488ee 100644 --- a/internal/blockchain/fabric/fabric_provider.go +++ b/internal/blockchain/fabric/fabric_provider.go @@ -28,10 +28,10 @@ import ( "regexp" "strings" - "github.com/hyperledger/firefly-cli/internal/blockchain/fabric/fabconnect" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/fabric/fabconnect" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" cp "github.com/otiai10/copy" ) diff --git a/internal/blockchain/fabric/fabric_provider_test.go b/internal/blockchain/fabric/fabric_provider_test.go index 9d7c17e5..b0ba5650 100644 --- a/internal/blockchain/fabric/fabric_provider_test.go +++ b/internal/blockchain/fabric/fabric_provider_test.go @@ -7,11 +7,11 @@ import ( "path/filepath" "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/utils" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/utils" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/jarcoal/httpmock" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/tezos/connector/connector_interface.go b/internal/blockchain/tezos/connector/connector_interface.go index 12418374..8dd6591a 100644 --- a/internal/blockchain/tezos/connector/connector_interface.go +++ b/internal/blockchain/tezos/connector/connector_interface.go @@ -17,8 +17,8 @@ package connector import ( - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type Connector interface { diff --git a/internal/blockchain/tezos/connector/tezosconnect/config.go b/internal/blockchain/tezos/connector/tezosconnect/config.go index 33967d69..afc7f129 100644 --- a/internal/blockchain/tezos/connector/tezosconnect/config.go +++ b/internal/blockchain/tezos/connector/tezosconnect/config.go @@ -21,8 +21,8 @@ import ( "os" "strings" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos/connector" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos/connector" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/miracl/conflate" "gopkg.in/yaml.v2" ) diff --git a/internal/blockchain/tezos/connector/tezosconnect/docker.go b/internal/blockchain/tezos/connector/tezosconnect/docker.go index 65c6ce23..643be94e 100644 --- a/internal/blockchain/tezos/connector/tezosconnect/docker.go +++ b/internal/blockchain/tezos/connector/tezosconnect/docker.go @@ -19,8 +19,8 @@ package tezosconnect import ( "fmt" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) func (t *Tezosconnect) GetServiceDefinitions(s *types.Stack, dependentServices map[string]string) []*docker.ServiceDefinition { diff --git a/internal/blockchain/tezos/connector/tezosconnect/docker_test.go b/internal/blockchain/tezos/connector/tezosconnect/docker_test.go index c7e3cc96..2b710b42 100644 --- a/internal/blockchain/tezos/connector/tezosconnect/docker_test.go +++ b/internal/blockchain/tezos/connector/tezosconnect/docker_test.go @@ -3,7 +3,7 @@ package tezosconnect import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/tezos/remoterpc/remoterpc_provider.go b/internal/blockchain/tezos/remoterpc/remoterpc_provider.go index 803f0983..1b5de93f 100644 --- a/internal/blockchain/tezos/remoterpc/remoterpc_provider.go +++ b/internal/blockchain/tezos/remoterpc/remoterpc_provider.go @@ -22,14 +22,14 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos/connector" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos/connector/tezosconnect" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos/tezossigner" - - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos/connector" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos/connector/tezosconnect" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos/tezossigner" + + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type RemoteRPCProvider struct { diff --git a/internal/blockchain/tezos/remoterpc/remoterpc_provider_test.go b/internal/blockchain/tezos/remoterpc/remoterpc_provider_test.go index 3c52f5ca..f58df53e 100644 --- a/internal/blockchain/tezos/remoterpc/remoterpc_provider_test.go +++ b/internal/blockchain/tezos/remoterpc/remoterpc_provider_test.go @@ -5,9 +5,9 @@ import ( "fmt" "testing" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/stretchr/testify/assert" ) diff --git a/internal/blockchain/tezos/tezossigner/tezossigner.go b/internal/blockchain/tezos/tezossigner/tezossigner.go index ab18ec36..07c061ca 100644 --- a/internal/blockchain/tezos/tezossigner/tezossigner.go +++ b/internal/blockchain/tezos/tezossigner/tezossigner.go @@ -22,10 +22,10 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain/tezos" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain/tezos" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type TezosSignerProvider struct { diff --git a/internal/constants/constants.go b/internal/constants/constants.go index db206f14..ac2d7bbf 100644 --- a/internal/constants/constants.go +++ b/internal/constants/constants.go @@ -22,11 +22,11 @@ import ( ) var StacksDir = checkHome() -var FireFlyCoreImageName = "ghcr.io/hyperledger/firefly" +var FireFlyCoreImageName = "ghcr.io/hyperledger-firefly/firefly" var IPFSImageName = "ipfs/go-ipfs:v0.10.0" var PostgresImageName = "postgres" var PrometheusImageName = "prom/prometheus" -var SandboxImageName = "ghcr.io/hyperledger/firefly-sandbox:latest" +var SandboxImageName = "ghcr.io/hyperledger-firefly/sandbox:latest" func checkHome() string { var homeDir, _ = os.UserHomeDir() diff --git a/internal/core/config.go b/internal/core/config.go index 1e020b53..ca19a673 100644 --- a/internal/core/config.go +++ b/internal/core/config.go @@ -21,7 +21,7 @@ import ( "os" "path" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/miracl/conflate" "gopkg.in/yaml.v2" ) diff --git a/internal/core/http.go b/internal/core/http.go index b7f43091..9b98e050 100644 --- a/internal/core/http.go +++ b/internal/core/http.go @@ -25,7 +25,7 @@ import ( "net/http" "time" - "github.com/hyperledger/firefly-cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/log" ) var requestTimeout int = -1 diff --git a/internal/core/manifest.go b/internal/core/manifest.go index 6820ea60..0117a535 100644 --- a/internal/core/manifest.go +++ b/internal/core/manifest.go @@ -23,11 +23,11 @@ import ( "os" "strings" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) func GetManifestForChannel(releaseChannel fftypes.FFEnum) (*types.VersionManifest, error) { @@ -56,7 +56,7 @@ func GetManifestForChannel(releaseChannel fftypes.FFEnum) (*types.VersionManifes if manifest.FireFly == nil { // Fill in the FireFly version number manifest.FireFly = &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly", + Image: "ghcr.io/hyperledger-firefly/firefly", Tag: dockerTag, SHA: sha, } @@ -83,7 +83,7 @@ func GetManifestForRelease(version string) (*types.VersionManifest, error) { if manifest.FireFly == nil { // Fill in the FireFly version number manifest.FireFly = &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly", + Image: "ghcr.io/hyperledger-firefly/firefly", Tag: tag, SHA: sha, } @@ -94,7 +94,7 @@ func GetManifestForRelease(version string) (*types.VersionManifest, error) { func getManifest(version string) (*types.VersionManifest, error) { manifest := &types.VersionManifest{} - if err := request("GET", fmt.Sprintf("https://raw.githubusercontent.com/hyperledger/firefly/%s/manifest.json", version), nil, &manifest); err != nil { + if err := request("GET", fmt.Sprintf("https://raw.githubusercontent.com/hyperledger-firefly/firefly/%s/manifest.json", version), nil, &manifest); err != nil { return nil, err } return manifest, nil @@ -122,7 +122,7 @@ func ReadManifestFile(ctx context.Context, p string) (*types.VersionManifest, er log := log.LoggerFromContext(ctx) log.Warn("No FireFly image present in manifest provided, using local image hypeledger/firefly") manifest.FireFly = &types.ManifestEntry{ - Image: "hyperledger/firefly", + Image: "hyperledger-firefly/firefly", Local: true, } } diff --git a/internal/core/manifest_test.go b/internal/core/manifest_test.go index 63a4da19..c97f0de9 100644 --- a/internal/core/manifest_test.go +++ b/internal/core/manifest_test.go @@ -19,7 +19,7 @@ package core import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/docker/docker.go b/internal/docker/docker.go index 6b81df3b..26f732c5 100644 --- a/internal/docker/docker.go +++ b/internal/docker/docker.go @@ -27,7 +27,7 @@ import ( "strings" "github.com/google/go-containerregistry/pkg/crane" - "github.com/hyperledger/firefly-cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/log" ) type ( diff --git a/internal/docker/docker_config.go b/internal/docker/docker_config.go index b6ae786f..97088d5a 100644 --- a/internal/docker/docker_config.go +++ b/internal/docker/docker_config.go @@ -20,8 +20,8 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/pkg/types" ) type DependsOn map[string]map[string]string diff --git a/internal/docker/docker_config_test.go b/internal/docker/docker_config_test.go index b2acdcfb..021d51e3 100644 --- a/internal/docker/docker_config_test.go +++ b/internal/docker/docker_config_test.go @@ -3,7 +3,7 @@ package docker import ( "testing" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/pkg/types" "github.com/stretchr/testify/assert" ) diff --git a/internal/stacks/firefly_identity.go b/internal/stacks/firefly_identity.go index f643f795..57da90a3 100644 --- a/internal/stacks/firefly_identity.go +++ b/internal/stacks/firefly_identity.go @@ -20,7 +20,7 @@ import ( "fmt" "net/http" - "github.com/hyperledger/firefly-cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/core" ) func (s *StackManager) registerFireflyIdentities() error { diff --git a/internal/stacks/stack_manager.go b/internal/stacks/stack_manager.go index 04582d31..f27eb2e0 100644 --- a/internal/stacks/stack_manager.go +++ b/internal/stacks/stack_manager.go @@ -33,23 +33,23 @@ import ( "text/tabwriter" "time" - "github.com/hyperledger/firefly-cli/internal/blockchain" - cardanoremoterpc "github.com/hyperledger/firefly-cli/internal/blockchain/cardano/remoterpc" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/besu" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/geth" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/quorum" - ethremoterpc "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum/remoterpc" - "github.com/hyperledger/firefly-cli/internal/blockchain/fabric" - tezosremoterpc "github.com/hyperledger/firefly-cli/internal/blockchain/tezos/remoterpc" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-cli/internal/core" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/internal/tokens" - "github.com/hyperledger/firefly-cli/internal/tokens/erc1155" - "github.com/hyperledger/firefly-cli/internal/tokens/erc20erc721" - "github.com/hyperledger/firefly-cli/pkg/types" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/blockchain" + cardanoremoterpc "github.com/hyperledger-firefly/cli/internal/blockchain/cardano/remoterpc" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/besu" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/geth" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/quorum" + ethremoterpc "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum/remoterpc" + "github.com/hyperledger-firefly/cli/internal/blockchain/fabric" + tezosremoterpc "github.com/hyperledger-firefly/cli/internal/blockchain/tezos/remoterpc" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/internal/tokens" + "github.com/hyperledger-firefly/cli/internal/tokens/erc1155" + "github.com/hyperledger-firefly/cli/internal/tokens/erc20erc721" + "github.com/hyperledger-firefly/cli/pkg/types" + "github.com/hyperledger-firefly/common/pkg/fftypes" "github.com/miracl/conflate" "gopkg.in/yaml.v3" @@ -321,27 +321,27 @@ func (s *StackManager) LoadStack(stackName string) error { if s.Stack.VersionManifest == nil { s.Stack.VersionManifest = &types.VersionManifest{ FireFly: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly", + Image: "ghcr.io/hyperledger-firefly/firefly", Tag: "latest", }, Ethconnect: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-ethconnect", + Image: "ghcr.io/hyperledger-firefly/ethconnect", Tag: "latest", }, Fabconnect: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-fabconnect", + Image: "ghcr.io/hyperledger-firefly/fabconnect", Tag: "latest", }, DataExchange: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-dataexchange-https", + Image: "ghcr.io/hyperledger-firefly/dataexchange-https", Tag: "latest", }, TokensERC1155: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-tokens-erc1155", + Image: "ghcr.io/hyperledger-firefly/tokens-erc1155", Tag: "latest", }, TokensERC20ERC721: &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-tokens-erc20-erc721", + Image: "ghcr.io/hyperledger-firefly/tokens-erc20-erc721", Tag: "latest", }, } @@ -350,7 +350,7 @@ func (s *StackManager) LoadStack(stackName string) error { // If signer is not specified in the manifest, use the previously hardcoded default if s.Stack.VersionManifest.Signer == nil { s.Stack.VersionManifest.Signer = &types.ManifestEntry{ - Image: "ghcr.io/hyperledger/firefly-signer", + Image: "ghcr.io/hyperledger-firefly/signer", Tag: "v0.9.6", } } diff --git a/internal/tokens/erc1155/erc1155_provider.go b/internal/tokens/erc1155/erc1155_provider.go index dbc07aea..0d61ed43 100644 --- a/internal/tokens/erc1155/erc1155_provider.go +++ b/internal/tokens/erc1155/erc1155_provider.go @@ -22,12 +22,12 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/core" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" ) const tokenProviderName = "erc1155" diff --git a/internal/tokens/erc20erc721/erc20_erc721_provider.go b/internal/tokens/erc20erc721/erc20_erc721_provider.go index ea1dfd31..aedf002e 100644 --- a/internal/tokens/erc20erc721/erc20_erc721_provider.go +++ b/internal/tokens/erc20erc721/erc20_erc721_provider.go @@ -22,12 +22,12 @@ import ( "fmt" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/blockchain" - "github.com/hyperledger/firefly-cli/internal/blockchain/ethereum" - "github.com/hyperledger/firefly-cli/internal/core" - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/internal/log" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/blockchain" + "github.com/hyperledger-firefly/cli/internal/blockchain/ethereum" + "github.com/hyperledger-firefly/cli/internal/core" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/internal/log" + "github.com/hyperledger-firefly/cli/pkg/types" ) //nolint:gosec // These are not credentials diff --git a/internal/tokens/tokens_provider.go b/internal/tokens/tokens_provider.go index 82cfe907..7da36b43 100644 --- a/internal/tokens/tokens_provider.go +++ b/internal/tokens/tokens_provider.go @@ -17,8 +17,8 @@ package tokens import ( - "github.com/hyperledger/firefly-cli/internal/docker" - "github.com/hyperledger/firefly-cli/pkg/types" + "github.com/hyperledger-firefly/cli/internal/docker" + "github.com/hyperledger-firefly/cli/pkg/types" ) type ITokensProvider interface { diff --git a/pkg/types/options.go b/pkg/types/options.go index 53fae843..ea23190e 100644 --- a/pkg/types/options.go +++ b/pkg/types/options.go @@ -19,7 +19,7 @@ package types import ( "context" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type PullOptions struct { diff --git a/pkg/types/stack.go b/pkg/types/stack.go index 7106d0d6..d5362094 100644 --- a/pkg/types/stack.go +++ b/pkg/types/stack.go @@ -20,8 +20,8 @@ import ( "os" "path/filepath" - "github.com/hyperledger/firefly-cli/internal/constants" - "github.com/hyperledger/firefly-common/pkg/fftypes" + "github.com/hyperledger-firefly/cli/internal/constants" + "github.com/hyperledger-firefly/common/pkg/fftypes" ) type Stack struct {