From 27a24dd4579ef241df8d6bddf1cef30ee499b91d Mon Sep 17 00:00:00 2001 From: Sandeep Nishad Date: Tue, 22 Oct 2024 13:23:16 +0530 Subject: [PATCH] chore(weaver): change github org from hyperledger to hyperledger-cacti in go modules and urls This PR is an intermediate step in getting the Weaver source code ready so that packages can be published in a subsequent minor release. Specifically, the import path references as well as publish namespaces for various packages (Go, NPM, Maven, Cargo) and images (Docker) need to be switched from the old hyperledger to the new hyperledger-cacti, reflecting the change of organization of this repository. Signed-off-by: Sandeep Nishad --- .../test_weaver-asset-exchange-corda.yaml | 4 +- .../workflows/test_weaver-asset-transfer.yaml | 2 +- .../workflows/test_weaver-data-sharing.yaml | 2 +- .../workflows/test_weaver-docker-build.yaml | 2 +- .../workflows/weaver_deploy_corda-pkgs.yml | 11 ++++-- .github/workflows/weaver_deploy_go-pkgs.yml | 23 ++++++----- .github/workflows/weaver_deploy_node-pkgs.yml | 23 +++++------ .../workflows/weaver_deploy_relay-server.yml | 12 +++--- weaver/common/policy-dsl/package.json | 2 +- weaver/common/protos-go/README.md | 2 +- .../protos-go/common/access_control.pb.go | 18 ++++----- weaver/common/protos-go/common/ack.pb.go | 12 +++--- .../common/protos-go/common/asset_locks.pb.go | 13 ++++--- .../protos-go/common/asset_transfer.pb.go | 18 ++++----- weaver/common/protos-go/common/events.pb.go | 12 +++--- .../protos-go/common/interop_payload.pb.go | 18 ++++----- .../common/protos-go/common/membership.pb.go | 13 ++++--- weaver/common/protos-go/common/proofs.pb.go | 12 +++--- weaver/common/protos-go/common/query.pb.go | 12 +++--- weaver/common/protos-go/common/state.pb.go | 13 ++++--- .../common/verification_policy.pb.go | 11 +++--- weaver/common/protos-go/corda/view_data.pb.go | 13 ++++--- weaver/common/protos-go/driver/driver.pb.go | 14 +++---- .../common/protos-go/driver/driver_grpc.pb.go | 2 +- .../common/protos-go/fabric/view_data.pb.go | 13 ++++--- weaver/common/protos-go/go.mod | 2 +- weaver/common/protos-go/identity/agent.pb.go | 15 ++++---- .../protos-go/identity/agent_grpc.pb.go | 2 +- .../common/protos-go/networks/networks.pb.go | 15 ++++---- .../protos-go/networks/networks_grpc.pb.go | 2 +- .../common/protos-go/relay/datatransfer.pb.go | 15 ++++---- .../protos-go/relay/datatransfer_grpc.pb.go | 2 +- weaver/common/protos-go/relay/events.pb.go | 14 +++---- .../common/protos-go/relay/events_grpc.pb.go | 2 +- weaver/common/protos-go/relay/satp.pb.go | 14 +++---- weaver/common/protos-go/relay/satp_grpc.pb.go | 2 +- .../protos-java-kt/github.properties.template | 2 +- weaver/common/protos-js/package.json | 4 +- weaver/common/protos/besu/view_data.proto | 2 +- .../common/protos/common/access_control.proto | 2 +- weaver/common/protos/common/ack.proto | 2 +- weaver/common/protos/common/asset_locks.proto | 2 +- .../common/protos/common/asset_transfer.proto | 2 +- weaver/common/protos/common/events.proto | 2 +- .../protos/common/interop_payload.proto | 2 +- weaver/common/protos/common/membership.proto | 2 +- weaver/common/protos/common/proofs.proto | 2 +- weaver/common/protos/common/query.proto | 2 +- weaver/common/protos/common/state.proto | 2 +- .../protos/common/verification_policy.proto | 2 +- weaver/common/protos/corda/view_data.proto | 2 +- weaver/common/protos/driver/driver.proto | 2 +- weaver/common/protos/fabric/view_data.proto | 2 +- weaver/common/protos/identity/agent.proto | 2 +- weaver/common/protos/networks/networks.proto | 2 +- weaver/common/protos/relay/datatransfer.proto | 2 +- weaver/common/protos/relay/events.proto | 2 +- weaver/common/protos/relay/satp.proto | 2 +- .../corda-driver/github.properties.template | 2 +- weaver/core/drivers/fabric-driver/.gitignore | 2 +- .../drivers/fabric-driver/package-local.json | 2 +- .../core/drivers/fabric-driver/package.json | 2 +- .../iin-agent/package-local.json | 2 +- .../iin-agent/package.json | 2 +- .../github.properties.template | 2 +- .../contracts/interop/Makefile | 16 ++++---- .../contracts/interop/access_control_cc.go | 4 +- .../interop/access_control_cc_test.go | 6 +-- .../contracts/interop/certificate_utils.go | 2 +- .../interop/certificate_utils_test.go | 2 +- .../contracts/interop/decoders.go | 4 +- .../contracts/interop/go.mod | 10 ++--- .../contracts/interop/go.sum | 38 ------------------- .../interop/handle_external_request.go | 4 +- .../interop/handle_external_request_test.go | 4 +- .../contracts/interop/main.go | 2 +- .../contracts/interop/manage_assets.go | 4 +- .../contracts/interop/manage_assets_test.go | 6 +-- .../contracts/interop/membership.go | 6 +-- .../contracts/interop/membership_test.go | 8 ++-- .../interop/verification_policy_cc.go | 4 +- .../interop/verification_policy_cc_test.go | 6 +-- .../contracts/interop/write_external_state.go | 6 +-- .../interop/write_external_state_test.go | 4 +- .../interfaces/asset-mgmt/Makefile | 8 ++-- .../interfaces/asset-mgmt/asset_locks.go | 2 +- .../asset-mgmt/asset_locks_contract.go | 2 +- .../asset-mgmt/asset_locks_contract_test.go | 4 +- .../interfaces/asset-mgmt/asset_locks_test.go | 4 +- .../interfaces/asset-mgmt/go.mod | 6 +-- .../interfaces/asset-mgmt/go.sum | 14 ------- .../libs/assetexchange/Makefile | 4 +- .../libs/assetexchange/README.md | 6 +-- .../libs/assetexchange/assetSwapContracts.go | 2 +- .../libs/assetexchange/go.mod | 4 +- .../libs/assetexchange/go.sum | 12 ------ .../libs/assetexchange/helpers.go | 2 +- .../libs/assetexchange/idGenerator.go | 2 +- .../libs/assetexchange/types.go | 2 +- .../libs/assetexchange/utility.go | 2 +- .../fabric-interop-cc/libs/testutils/go.mod | 2 +- .../fabric-interop-cc/libs/testutils/setup.go | 2 +- .../fabric-interop-cc/libs/utils/Makefile | 4 +- .../fabric-interop-cc/libs/utils/go.mod | 4 +- .../fabric-interop-cc/libs/utils/go.sum | 12 ------ .../fabric-interop-cc/libs/utils/utils.go | 2 +- .../github.properties.template | 2 +- weaver/samples/fabric/go-cli/Makefile | 8 ++-- .../fabric/go-cli/cmd/asset-exchange-all.go | 4 +- .../fabric/go-cli/cmd/asset-exchange-step.go | 4 +- .../fabric/go-cli/cmd/chaincode-invoke.go | 2 +- .../fabric/go-cli/cmd/chaincode-query.go | 2 +- .../samples/fabric/go-cli/cmd/config-get.go | 2 +- .../fabric/go-cli/cmd/config-set-file.go | 2 +- .../samples/fabric/go-cli/cmd/config-set.go | 2 +- .../fabric/go-cli/cmd/configure-asset-add.go | 2 +- weaver/samples/fabric/go-cli/cmd/env-get.go | 2 +- .../samples/fabric/go-cli/cmd/env-set-file.go | 2 +- weaver/samples/fabric/go-cli/cmd/env-set.go | 2 +- weaver/samples/fabric/go-cli/cmd/user-add.go | 2 +- weaver/samples/fabric/go-cli/configure/all.go | 4 +- weaver/samples/fabric/go-cli/exerciseSDK.go | 12 +++--- weaver/samples/fabric/go-cli/fabric-cli.go | 2 +- weaver/samples/fabric/go-cli/go.mod | 6 +-- weaver/samples/fabric/go-cli/go.sum | 24 ------------ .../helpers/interopsetup/configure-network.go | 2 +- .../samples/fabric/satpsimpleasset/Makefile | 16 ++++---- .../fabric/satpsimpleasset/assetmgmt.go | 4 +- .../fabric/satpsimpleasset/assetmgmt_test.go | 6 +-- .../fabric/satpsimpleasset/bondasset.go | 2 +- .../fabric/satpsimpleasset/bondasset_test.go | 6 +-- weaver/samples/fabric/satpsimpleasset/go.mod | 10 ++--- weaver/samples/fabric/satpsimpleasset/go.sum | 38 ------------------- weaver/samples/fabric/satpsimpleasset/main.go | 2 +- .../fabric/satpsimpleasset/tokenasset_test.go | 4 +- weaver/samples/fabric/simpleasset/Makefile | 12 +++--- .../samples/fabric/simpleasset/assetmgmt.go | 2 +- .../fabric/simpleasset/assetmgmt_test.go | 6 +-- .../samples/fabric/simpleasset/bondasset.go | 2 +- .../fabric/simpleasset/bondasset_test.go | 6 +-- weaver/samples/fabric/simpleasset/go.mod | 8 ++-- weaver/samples/fabric/simpleasset/go.sum | 26 ------------- weaver/samples/fabric/simpleasset/main.go | 2 +- .../fabric/simpleasset/tokenasset_test.go | 4 +- .../fabric/simpleassetandinterop/Makefile | 12 +++--- .../fabric/simpleassetandinterop/assetmgmt.go | 4 +- .../simpleassetandinterop/assetmgmt_test.go | 8 ++-- .../fabric/simpleassetandinterop/baseclass.go | 2 +- .../fabric/simpleassetandinterop/bondasset.go | 2 +- .../simpleassetandinterop/bondasset_test.go | 6 +-- .../fabric/simpleassetandinterop/go.mod | 8 ++-- .../fabric/simpleassetandinterop/go.sum | 26 ------------- .../simpleassetandinterop/tokenasset_test.go | 4 +- .../fabric/simpleassettransfer/Makefile | 16 ++++---- .../fabric/simpleassettransfer/assetmgmt.go | 4 +- .../simpleassettransfer/assetmgmt_test.go | 6 +-- .../fabric/simpleassettransfer/bondasset.go | 4 +- .../simpleassettransfer/bondasset_test.go | 8 ++-- .../samples/fabric/simpleassettransfer/go.mod | 10 ++--- .../samples/fabric/simpleassettransfer/go.sum | 38 ------------------- .../fabric/simpleassettransfer/helper.go | 2 +- .../fabric/simpleassettransfer/main.go | 2 +- .../fabric/simpleassettransfer/tokenasset.go | 2 +- .../simpleassettransfer/tokenasset_test.go | 8 ++-- weaver/samples/fabric/simplestate/Makefile | 4 +- weaver/samples/fabric/simplestate/go.mod | 4 +- weaver/samples/fabric/simplestate/go.sum | 2 - .../fabric/simplestate/simplestate_test.go | 2 +- .../fabric/simplestatewithacl/Makefile | 12 +++--- .../samples/fabric/simplestatewithacl/go.mod | 8 ++-- .../samples/fabric/simplestatewithacl/go.sum | 26 ------------- .../fabric/simplestatewithacl/simplestate.go | 2 +- .../simplestatewithacl/simplestate_test.go | 2 +- weaver/sdks/besu/node/package-local.json | 2 +- weaver/sdks/besu/node/package.json | 2 +- weaver/sdks/corda/README.md | 2 +- weaver/sdks/corda/github.properties.template | 2 +- weaver/sdks/fabric/go-sdk/Makefile | 4 +- .../go-sdk/asset-manager/assetManager.go | 2 +- .../go-sdk/asset-manager/assetManager_test.go | 2 +- weaver/sdks/fabric/go-sdk/go.mod | 4 +- weaver/sdks/fabric/go-sdk/go.sum | 12 ------ .../fabric/go-sdk/helpers/helpers_test.go | 2 +- .../interoperable-helper.go | 12 +++--- .../interoperable-helper_test.go | 2 +- .../membershipmanager/membership_manager.go | 2 +- .../membership_manager_test.go | 2 +- weaver/sdks/fabric/go-sdk/relay/relay.go | 4 +- .../package-local.json | 2 +- .../interoperation-node-sdk/package.json | 2 +- weaver/tests/network-setups/besu/package.json | 4 +- .../corda/github.properties.template | 2 +- .../fabric/dev/scripts/setupCC.sh | 2 +- 193 files changed, 478 insertions(+), 728 deletions(-) diff --git a/.github/workflows/test_weaver-asset-exchange-corda.yaml b/.github/workflows/test_weaver-asset-exchange-corda.yaml index 43cc3dfc0d..d145edfaa9 100644 --- a/.github/workflows/test_weaver-asset-exchange-corda.yaml +++ b/.github/workflows/test_weaver-asset-exchange-corda.yaml @@ -64,7 +64,7 @@ jobs: echo "Using ${GITHUB_ACTOR} user." echo "username=${GITHUB_ACTOR}" >> github.main.properties echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties - echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties + echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties ./scripts/get-cordapps.sh || mv github.main.properties github.properties @@ -265,7 +265,7 @@ jobs: echo "Using ${GITHUB_ACTOR} user." echo "username=${GITHUB_ACTOR}" >> github.main.properties echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties - echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties + echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties ./scripts/get-cordapps.sh || mv github.main.properties github.properties diff --git a/.github/workflows/test_weaver-asset-transfer.yaml b/.github/workflows/test_weaver-asset-transfer.yaml index 1c120be82d..3638527246 100644 --- a/.github/workflows/test_weaver-asset-transfer.yaml +++ b/.github/workflows/test_weaver-asset-transfer.yaml @@ -77,7 +77,7 @@ jobs: echo "Using ${GITHUB_ACTOR} user." echo "username=${GITHUB_ACTOR}" >> github.main.properties echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties - echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties + echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties ./scripts/get-cordapps.sh || mv github.main.properties github.properties diff --git a/.github/workflows/test_weaver-data-sharing.yaml b/.github/workflows/test_weaver-data-sharing.yaml index 82e2de6d03..888c115d1a 100644 --- a/.github/workflows/test_weaver-data-sharing.yaml +++ b/.github/workflows/test_weaver-data-sharing.yaml @@ -77,7 +77,7 @@ jobs: echo "Using ${GITHUB_ACTOR} user." echo "username=${GITHUB_ACTOR}" >> github.main.properties echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties - echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties + echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties ./scripts/get-cordapps.sh || mv github.main.properties github.properties diff --git a/.github/workflows/test_weaver-docker-build.yaml b/.github/workflows/test_weaver-docker-build.yaml index e7ae904e5f..2d53349c95 100644 --- a/.github/workflows/test_weaver-docker-build.yaml +++ b/.github/workflows/test_weaver-docker-build.yaml @@ -173,7 +173,7 @@ jobs: echo "Using ${GITHUB_ACTOR} user." echo "username=${GITHUB_ACTOR}" >> github.main.properties echo "password=${{ secrets.GITHUB_TOKEN }}" >> github.main.properties - echo "url=https://maven.pkg.github.com/hyperledger/cacti" >> github.main.properties + echo "url=https://maven.pkg.github.com/hyperledger-cacti/cacti" >> github.main.properties make build || mv github.main.properties github.properties make clean diff --git a/.github/workflows/weaver_deploy_corda-pkgs.yml b/.github/workflows/weaver_deploy_corda-pkgs.yml index 74319675cb..27f7eb5647 100644 --- a/.github/workflows/weaver_deploy_corda-pkgs.yml +++ b/.github/workflows/weaver_deploy_corda-pkgs.yml @@ -4,6 +4,9 @@ name: Deploy Corda Packages +env: + DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }} + on: push: tags: @@ -129,7 +132,7 @@ jobs: working-directory: weaver/sdks/corda publish-driver-image: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: always() needs: [publish-protos-java-kt, publish-interop-app, publish-sdk] runs-on: ubuntu-22.04 permissions: @@ -157,15 +160,15 @@ jobs: working-directory: weaver/core/drivers/corda-driver - name: Check if package already exists - run: (make check-if-tag-exists && echo "CORDA_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "CORDA_DRIVER_PUSH=false" >> $GITHUB_ENV + run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "CORDA_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "CORDA_DRIVER_PUSH=false" >> $GITHUB_ENV working-directory: weaver/core/drivers/corda-driver - name: Build and Push if: ${{ env.CORDA_DRIVER_PUSH == 'true' }} - run: make push-image + run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/drivers/corda-driver - name: Push latest tag if: ${{ env.CORDA_DRIVER_PUSH == 'true' }} - run: make push-image-latest + run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/drivers/corda-driver diff --git a/.github/workflows/weaver_deploy_go-pkgs.yml b/.github/workflows/weaver_deploy_go-pkgs.yml index 67e2567ffc..240d550976 100644 --- a/.github/workflows/weaver_deploy_go-pkgs.yml +++ b/.github/workflows/weaver_deploy_go-pkgs.yml @@ -4,6 +4,9 @@ name: Deploy Go Modules +env: + DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }} + on: push: tags: @@ -14,7 +17,7 @@ on: jobs: publish-protos-go: - if: github.repository_owner == 'hyperledger' + if: github.repository_owner == 'hyperledger-cacti' runs-on: ubuntu-22.04 steps: # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it @@ -70,7 +73,7 @@ jobs: run: sleep 300 publish-lib-utils: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: publish-protos-go runs-on: ubuntu-22.04 steps: @@ -136,7 +139,7 @@ jobs: run: sleep 300 publish-lib-asset-exchange: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: publish-protos-go runs-on: ubuntu-22.04 steps: @@ -202,7 +205,7 @@ jobs: run: sleep 300 publish-interface-asset-mgmt: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: [publish-protos-go] runs-on: ubuntu-22.04 steps: @@ -268,7 +271,7 @@ jobs: run: sleep 300 publish-interop-cc: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: [publish-protos-go, publish-lib-utils, publish-lib-asset-exchange] runs-on: ubuntu-22.04 steps: @@ -334,7 +337,7 @@ jobs: run: sleep 300 publish-go-sdk: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: [publish-protos-go] runs-on: ubuntu-22.04 steps: @@ -400,7 +403,7 @@ jobs: run: sleep 300 publish-weaver-fabric-cc-image: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: always() needs: [publish-protos-go, publish-lib-utils, publish-lib-asset-exchange] runs-on: ubuntu-22.04 steps: @@ -415,15 +418,15 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Check if package already exists - run: (make check-if-tag-exists && echo "WEAVER_FABRIC_CC_PUSH=true" >> $GITHUB_ENV) || echo "WEAVER_FABRIC_CC_PUSH=false" >> $GITHUB_ENV + run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "WEAVER_FABRIC_CC_PUSH=true" >> $GITHUB_ENV) || echo "WEAVER_FABRIC_CC_PUSH=false" >> $GITHUB_ENV working-directory: weaver/core/network/fabric-interop-cc - name: Build and Push if: ${{ env.WEAVER_FABRIC_CC_PUSH == 'true' }} - run: make push-image + run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/network/fabric-interop-cc - name: Push latest tag if: ${{ env.WEAVER_FABRIC_CC_PUSH == 'true' }} - run: make push-image-latest + run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/network/fabric-interop-cc diff --git a/.github/workflows/weaver_deploy_node-pkgs.yml b/.github/workflows/weaver_deploy_node-pkgs.yml index 3dd2964441..a25940d435 100644 --- a/.github/workflows/weaver_deploy_node-pkgs.yml +++ b/.github/workflows/weaver_deploy_node-pkgs.yml @@ -6,6 +6,7 @@ name: Deploy Node JS Packages env: NODEJS_VERSION: v18.18.2 + DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }} on: push: @@ -17,7 +18,7 @@ on: jobs: publish-protos-js: - if: github.repository_owner == 'hyperledger' + if: github.repository_owner == 'hyperledger-cacti' runs-on: ubuntu-22.04 permissions: packages: write @@ -70,7 +71,7 @@ jobs: working-directory: weaver/common/protos-js publish-fabric-sdk: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: [publish-protos-js] runs-on: ubuntu-22.04 permissions: @@ -115,7 +116,7 @@ jobs: working-directory: weaver/sdks/fabric/interoperation-node-sdk publish-besu-sdk: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: ${{ always() && github.repository_owner == 'hyperledger-cacti' }} needs: [publish-protos-js] runs-on: ubuntu-22.04 permissions: @@ -160,7 +161,7 @@ jobs: working-directory: weaver/sdks/besu/node publish-driver-image: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: always() needs: [publish-protos-js, publish-fabric-sdk] runs-on: ubuntu-22.04 permissions: @@ -186,21 +187,21 @@ jobs: working-directory: weaver/core/drivers/fabric-driver - name: Check if package already exists - run: (make check-if-tag-exists && echo "FABRIC_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "FABRIC_DRIVER_PUSH=false" >> $GITHUB_ENV + run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "FABRIC_DRIVER_PUSH=true" >> $GITHUB_ENV) || echo "FABRIC_DRIVER_PUSH=false" >> $GITHUB_ENV working-directory: weaver/core/drivers/fabric-driver - name: Build and Push if: ${{ env.FABRIC_DRIVER_PUSH == 'true' }} - run: make push-image + run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/drivers/fabric-driver - name: Push latest tag if: ${{ env.FABRIC_DRIVER_PUSH == 'true' }} - run: make push-image-latest + run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/drivers/fabric-driver publish-iin-agent-image: - if: ${{ always() && github.repository_owner == 'hyperledger' }} + if: always() needs: [publish-protos-js, publish-fabric-sdk] runs-on: ubuntu-22.04 permissions: @@ -226,15 +227,15 @@ jobs: working-directory: weaver/core/identity-management/iin-agent - name: Check if package already exists - run: (make check-if-tag-exists && echo "IINAGENT_PUSH=true" >> $GITHUB_ENV) || echo "IINAGENT_PUSH=false" >> $GITHUB_ENV + run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "IINAGENT_PUSH=true" >> $GITHUB_ENV) || echo "IINAGENT_PUSH=false" >> $GITHUB_ENV working-directory: weaver/core/identity-management/iin-agent - name: Build and Push if: ${{ env.IINAGENT_PUSH == 'true' }} - run: make push-image + run: make push-image DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/identity-management/iin-agent - name: Push latest tag if: ${{ env.IINAGENT_PUSH == 'true' }} - run: make push-image-latest + run: make push-image-latest DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/identity-management/iin-agent diff --git a/.github/workflows/weaver_deploy_relay-server.yml b/.github/workflows/weaver_deploy_relay-server.yml index dfbc52e7a9..b7fb81c4df 100644 --- a/.github/workflows/weaver_deploy_relay-server.yml +++ b/.github/workflows/weaver_deploy_relay-server.yml @@ -4,6 +4,9 @@ name: Deploy Relay Docker Image +env: + DOCKER_REGISTRY: ghcr.io/${{ github.repository_owner }} + on: push: tags: @@ -14,7 +17,7 @@ on: jobs: publish-protos-rs: - if: github.repository_owner == 'hyperledger' + if: github.repository_owner == 'hyperledger-cacti' runs-on: ubuntu-22.04 permissions: packages: write @@ -38,7 +41,6 @@ jobs: working-directory: weaver/common/protos-rs/pkg publish-relay-image: - if: github.repository_owner == 'hyperledger' needs: publish-protos-rs runs-on: ubuntu-22.04 permissions: @@ -69,15 +71,15 @@ jobs: working-directory: weaver/core/relay - name: Check if package already exists - run: (make check-if-tag-exists && echo "RELAY_PUSH=true" >> $GITHUB_ENV) || echo "RELAY_PUSH=false" >> $GITHUB_ENV + run: (make check-if-tag-exists DOCKER_REGISTRY=${DOCKER_REGISTRY} && echo "RELAY_PUSH=true" >> $GITHUB_ENV) || echo "RELAY_PUSH=false" >> $GITHUB_ENV working-directory: weaver/core/relay - name: Build and Push if: ${{ env.RELAY_PUSH == 'true' }} - run: make push-server + run: make push-server DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/relay - name: Push latest tag if: ${{ env.RELAY_PUSH == 'true' }} - run: (cat out | grep "exists") || make push-server-latest + run: (cat out | grep "exists") || make push-server-latest DOCKER_REGISTRY=${DOCKER_REGISTRY} working-directory: weaver/core/relay \ No newline at end of file diff --git a/weaver/common/policy-dsl/package.json b/weaver/common/policy-dsl/package.json index adc1c66f43..13924ce6bf 100644 --- a/weaver/common/policy-dsl/package.json +++ b/weaver/common/policy-dsl/package.json @@ -20,7 +20,7 @@ }, "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "author": "", "license": "Apache-2.0", diff --git a/weaver/common/protos-go/README.md b/weaver/common/protos-go/README.md index c9d528317e..9cec64ab9b 100644 --- a/weaver/common/protos-go/README.md +++ b/weaver/common/protos-go/README.md @@ -40,7 +40,7 @@ make clean-build ``` ## Steps to Use -* Just add `github.com/hyperledger/cacti/weaver/common/protos-go` to your imports, to use it. +* Just add `github.com/hyperledger-cacti/cacti/weaver/common/protos-go` to your imports, to use it. * Run `go mod tidy` to populate your `go.mod` with the latest version. ## Publish diff --git a/weaver/common/protos-go/common/access_control.pb.go b/weaver/common/protos-go/common/access_control.pb.go index fb5b821465..23a0aa5352 100644 --- a/weaver/common/protos-go/common/access_control.pb.go +++ b/weaver/common/protos-go/common/access_control.pb.go @@ -174,15 +174,15 @@ var file_common_access_control_proto_rawDesc = []byte{ 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x72, 0x65, 0x73, 0x6f, 0x75, 0x72, 0x63, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x72, 0x65, 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x08, 0x52, 0x04, 0x72, 0x65, - 0x61, 0x64, 0x42, 0x7b, 0x0a, 0x39, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, - 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, - 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, 0x5a, - 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, - 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, - 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x61, 0x64, 0x42, 0x81, 0x01, 0x0a, 0x39, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, + 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, + 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2e, 0x61, 0x63, 0x63, 0x65, 0x73, 0x73, 0x5f, 0x63, 0x6f, 0x6e, 0x74, 0x72, 0x6f, 0x6c, + 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, + 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, + 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, + 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, + 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/ack.pb.go b/weaver/common/protos-go/common/ack.pb.go index 42469752ac..4ab50f3894 100644 --- a/weaver/common/protos-go/common/ack.pb.go +++ b/weaver/common/protos-go/common/ack.pb.go @@ -150,15 +150,15 @@ var file_common_ack_proto_rawDesc = []byte{ 0x65, 0x73, 0x74, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x07, 0x6d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x22, 0x1b, 0x0a, 0x06, 0x53, 0x54, 0x41, 0x54, 0x55, 0x53, 0x12, 0x06, 0x0a, 0x02, 0x4f, 0x4b, 0x10, - 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x01, 0x42, 0x70, 0x0a, 0x2e, + 0x00, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x01, 0x42, 0x76, 0x0a, 0x2e, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, - 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x5a, 0x3e, + 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, - 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, - 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, + 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/asset_locks.pb.go b/weaver/common/protos-go/common/asset_locks.pb.go index db5a70aecf..a389b4718a 100644 --- a/weaver/common/protos-go/common/asset_locks.pb.go +++ b/weaver/common/protos-go/common/asset_locks.pb.go @@ -875,15 +875,16 @@ var file_common_asset_locks_proto_rawDesc = []byte{ 0x53, 0x48, 0x41, 0x32, 0x35, 0x36, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x53, 0x48, 0x41, 0x35, 0x31, 0x32, 0x10, 0x01, 0x2a, 0x23, 0x0a, 0x08, 0x54, 0x69, 0x6d, 0x65, 0x53, 0x70, 0x65, 0x63, 0x12, 0x09, 0x0a, 0x05, 0x45, 0x50, 0x4f, 0x43, 0x48, 0x10, 0x00, 0x12, 0x0c, 0x0a, 0x08, 0x44, - 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x42, 0x78, 0x0a, 0x36, 0x6f, 0x72, 0x67, + 0x55, 0x52, 0x41, 0x54, 0x49, 0x4f, 0x4e, 0x10, 0x01, 0x42, 0x7e, 0x0a, 0x36, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x73, 0x73, 0x65, 0x74, 0x5f, 0x6c, 0x6f, - 0x63, 0x6b, 0x73, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, - 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x63, 0x6b, 0x73, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, + 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, + 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/weaver/common/protos-go/common/asset_transfer.pb.go b/weaver/common/protos-go/common/asset_transfer.pb.go index f90cd76752..73903d194c 100644 --- a/weaver/common/protos-go/common/asset_transfer.pb.go +++ b/weaver/common/protos-go/common/asset_transfer.pb.go @@ -235,15 +235,15 @@ var file_common_asset_transfer_proto_rawDesc = []byte{ 0x65, 0x63, 0x73, 0x12, 0x2a, 0x0a, 0x10, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x18, 0x07, 0x20, 0x01, 0x28, 0x08, 0x52, 0x10, 0x65, 0x78, 0x70, 0x69, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x53, 0x74, 0x61, 0x74, 0x75, 0x73, 0x42, - 0x7b, 0x0a, 0x39, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x73, - 0x73, 0x65, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5a, 0x3e, 0x67, 0x69, - 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, - 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, - 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, - 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, - 0x6f, 0x74, 0x6f, 0x33, + 0x81, 0x01, 0x0a, 0x39, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, + 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, + 0x73, 0x73, 0x65, 0x74, 0x5f, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5a, 0x44, 0x67, + 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, + 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, + 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, + 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/events.pb.go b/weaver/common/protos-go/common/events.pb.go index 63e061ce0e..62ddb2e26f 100644 --- a/weaver/common/protos-go/common/events.pb.go +++ b/weaver/common/protos-go/common/events.pb.go @@ -819,15 +819,15 @@ var file_common_events_proto_rawDesc = []byte{ 0x4f, 0x70, 0x65, 0x72, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0d, 0x0a, 0x09, 0x53, 0x55, 0x42, 0x53, 0x43, 0x52, 0x49, 0x42, 0x45, 0x10, 0x00, 0x12, 0x0f, 0x0a, 0x0b, 0x55, 0x4e, 0x53, 0x55, 0x42, 0x53, 0x43, 0x52, 0x49, 0x42, 0x45, 0x10, 0x01, 0x12, 0x0a, 0x0a, 0x06, 0x55, 0x50, 0x44, - 0x41, 0x54, 0x45, 0x10, 0x02, 0x42, 0x73, 0x0a, 0x31, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, + 0x41, 0x54, 0x45, 0x10, 0x02, 0x42, 0x79, 0x0a, 0x31, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, + 0x6d, 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, - 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, + 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/interop_payload.pb.go b/weaver/common/protos-go/common/interop_payload.pb.go index a8c544c93d..7429c10cd8 100644 --- a/weaver/common/protos-go/common/interop_payload.pb.go +++ b/weaver/common/protos-go/common/interop_payload.pb.go @@ -299,15 +299,15 @@ var file_common_interop_payload_proto_rawDesc = []byte{ 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x72, 0x61, 0x6e, 0x64, 0x6f, 0x6d, 0x42, - 0x7c, 0x0a, 0x3a, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x69, 0x6e, - 0x74, 0x65, 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5a, 0x3e, 0x67, - 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, - 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, - 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, - 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x82, 0x01, 0x0a, 0x3a, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, + 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, + 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x69, + 0x6e, 0x74, 0x65, 0x72, 0x6f, 0x70, 0x5f, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x5a, 0x44, + 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, + 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, + 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/membership.pb.go b/weaver/common/protos-go/common/membership.pb.go index f37d953d7e..e78fe4f93d 100644 --- a/weaver/common/protos-go/common/membership.pb.go +++ b/weaver/common/protos-go/common/membership.pb.go @@ -169,15 +169,16 @@ var file_common_membership_proto_rawDesc = []byte{ 0x6c, 0x75, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, - 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x42, 0x77, 0x0a, 0x35, 0x6f, 0x72, + 0x03, 0x28, 0x09, 0x52, 0x05, 0x63, 0x68, 0x61, 0x69, 0x6e, 0x42, 0x7d, 0x0a, 0x35, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x6d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, - 0x68, 0x69, 0x70, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, - 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x68, 0x69, 0x70, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, + 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, + 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x33, } var ( diff --git a/weaver/common/protos-go/common/proofs.pb.go b/weaver/common/protos-go/common/proofs.pb.go index a2549c6861..320d92e1d5 100644 --- a/weaver/common/protos-go/common/proofs.pb.go +++ b/weaver/common/protos-go/common/proofs.pb.go @@ -139,15 +139,15 @@ var file_common_proofs_proto_rawDesc = []byte{ 0x06, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x12, 0x2c, 0x0a, 0x06, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x2e, 0x50, 0x72, 0x6f, 0x6f, 0x66, 0x52, 0x06, 0x70, - 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x42, 0x73, 0x0a, 0x31, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, + 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x42, 0x79, 0x0a, 0x31, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, + 0x6d, 0x6f, 0x6e, 0x2e, 0x70, 0x72, 0x6f, 0x6f, 0x66, 0x73, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, - 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x33, + 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, + 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, + 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/query.pb.go b/weaver/common/protos-go/common/query.pb.go index 8f157d33b0..69996ad504 100644 --- a/weaver/common/protos-go/common/query.pb.go +++ b/weaver/common/protos-go/common/query.pb.go @@ -171,15 +171,15 @@ var file_common_query_proto_rawDesc = []byte{ 0x72, 0x67, 0x18, 0x09, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0d, 0x72, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x69, 0x6e, 0x67, 0x4f, 0x72, 0x67, 0x12, 0x22, 0x0a, 0x0c, 0x63, 0x6f, 0x6e, 0x66, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x0c, 0x63, - 0x6f, 0x6e, 0x66, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x42, 0x72, 0x0a, 0x30, 0x6f, + 0x6f, 0x6e, 0x66, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x61, 0x6c, 0x42, 0x78, 0x0a, 0x30, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x71, 0x75, 0x65, 0x72, 0x79, 0x5a, - 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, - 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, - 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, + 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, + 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/state.pb.go b/weaver/common/protos-go/common/state.pb.go index f6e5d7229e..5d288455af 100644 --- a/weaver/common/protos-go/common/state.pb.go +++ b/weaver/common/protos-go/common/state.pb.go @@ -519,14 +519,15 @@ var file_common_state_proto_rawDesc = []byte{ 0x54, 0x54, 0x45, 0x4e, 0x10, 0x05, 0x12, 0x15, 0x0a, 0x11, 0x45, 0x56, 0x45, 0x4e, 0x54, 0x5f, 0x57, 0x52, 0x49, 0x54, 0x45, 0x5f, 0x45, 0x52, 0x52, 0x4f, 0x52, 0x10, 0x06, 0x12, 0x0b, 0x0a, 0x07, 0x44, 0x45, 0x4c, 0x45, 0x54, 0x45, 0x44, 0x10, 0x07, 0x42, 0x07, 0x0a, 0x05, 0x73, 0x74, - 0x61, 0x74, 0x65, 0x42, 0x72, 0x0a, 0x30, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, + 0x61, 0x74, 0x65, 0x42, 0x78, 0x0a, 0x30, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, - 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, - 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, + 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, + 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, + 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, + 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/common/verification_policy.pb.go b/weaver/common/protos-go/common/verification_policy.pb.go index a61ccbb757..676171eb9b 100644 --- a/weaver/common/protos-go/common/verification_policy.pb.go +++ b/weaver/common/protos-go/common/verification_policy.pb.go @@ -222,15 +222,16 @@ var file_common_verification_policy_proto_rawDesc = []byte{ 0x69, 0x63, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x22, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x2e, 0x50, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x52, 0x06, 0x70, - 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x80, 0x01, 0x0a, 0x3e, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, + 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x42, 0x86, 0x01, 0x0a, 0x3e, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x76, 0x65, 0x72, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x69, 0x6f, - 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, + 0x6e, 0x5f, 0x70, 0x6f, 0x6c, 0x69, 0x63, 0x79, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, - 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, - 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, - 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, + 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x62, 0x06, + 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/corda/view_data.pb.go b/weaver/common/protos-go/corda/view_data.pb.go index bcd72eca6c..afb0e98827 100644 --- a/weaver/common/protos-go/corda/view_data.pb.go +++ b/weaver/common/protos-go/corda/view_data.pb.go @@ -161,14 +161,15 @@ var file_corda_view_data_proto_rawDesc = []byte{ 0x01, 0x28, 0x09, 0x52, 0x0b, 0x63, 0x65, 0x72, 0x74, 0x69, 0x66, 0x69, 0x63, 0x61, 0x74, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, - 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x6a, 0x0a, 0x29, 0x6f, 0x72, + 0x0c, 0x52, 0x07, 0x70, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x42, 0x70, 0x0a, 0x29, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x73, 0x2e, 0x63, 0x6f, 0x72, 0x64, 0x61, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, - 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, - 0x2f, 0x63, 0x6f, 0x72, 0x64, 0x61, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x73, 0x2e, 0x63, 0x6f, 0x72, 0x64, 0x61, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, + 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, + 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, + 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x63, 0x6f, 0x72, 0x64, 0x61, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/driver/driver.pb.go b/weaver/common/protos-go/driver/driver.pb.go index 1a0b32b9dd..598a932a43 100644 --- a/weaver/common/protos-go/driver/driver.pb.go +++ b/weaver/common/protos-go/driver/driver.pb.go @@ -11,7 +11,7 @@ package driver import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -339,15 +339,15 @@ var file_driver_driver_proto_rawDesc = []byte{ 0x73, 0x73, 0x65, 0x74, 0x12, 0x21, 0x2e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x41, 0x73, 0x73, 0x69, 0x67, 0x6e, 0x41, 0x73, 0x73, 0x65, 0x74, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x73, 0x0a, 0x31, 0x6f, 0x72, + 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x79, 0x0a, 0x31, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x2e, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x5a, - 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, - 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, - 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, - 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x64, 0x72, 0x69, 0x76, 0x65, 0x72, 0x62, - 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, + 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, + 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, + 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x64, + 0x72, 0x69, 0x76, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/driver/driver_grpc.pb.go b/weaver/common/protos-go/driver/driver_grpc.pb.go index 9bfbb9819e..8476414635 100644 --- a/weaver/common/protos-go/driver/driver_grpc.pb.go +++ b/weaver/common/protos-go/driver/driver_grpc.pb.go @@ -12,7 +12,7 @@ package driver import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-go/fabric/view_data.pb.go b/weaver/common/protos-go/fabric/view_data.pb.go index b94fc8fb14..10ad459223 100644 --- a/weaver/common/protos-go/fabric/view_data.pb.go +++ b/weaver/common/protos-go/fabric/view_data.pb.go @@ -158,15 +158,16 @@ var file_fabric_view_data_proto_rawDesc = []byte{ 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x12, 0x35, 0x0a, 0x0b, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x73, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x13, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x45, 0x6e, 0x64, 0x6f, 0x72, 0x73, 0x65, 0x6d, 0x65, 0x6e, 0x74, - 0x52, 0x0b, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x73, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x76, 0x0a, + 0x52, 0x0b, 0x65, 0x6e, 0x64, 0x6f, 0x72, 0x73, 0x65, 0x6d, 0x65, 0x6e, 0x74, 0x42, 0x7c, 0x0a, 0x34, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x66, 0x61, 0x62, 0x72, 0x69, 0x63, 0x2e, 0x76, 0x69, 0x65, 0x77, - 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5a, 0x3e, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, - 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, - 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, - 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x66, - 0x61, 0x62, 0x72, 0x69, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x5f, 0x64, 0x61, 0x74, 0x61, 0x5a, 0x44, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, + 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, + 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, + 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, + 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x66, 0x61, 0x62, 0x72, 0x69, 0x63, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/go.mod b/weaver/common/protos-go/go.mod index 08e3d54c92..f17691e789 100644 --- a/weaver/common/protos-go/go.mod +++ b/weaver/common/protos-go/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/cacti/weaver/common/protos-go/v2 +module github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 go 1.20 diff --git a/weaver/common/protos-go/identity/agent.pb.go b/weaver/common/protos-go/identity/agent.pb.go index b378372970..b9db0aadf3 100644 --- a/weaver/common/protos-go/identity/agent.pb.go +++ b/weaver/common/protos-go/identity/agent.pb.go @@ -11,7 +11,7 @@ package identity import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -557,15 +557,16 @@ var file_identity_agent_proto_rawDesc = []byte{ 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x67, 0x65, 0x6e, 0x74, 0x2e, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x65, 0x72, 0x41, 0x74, 0x74, 0x65, 0x73, 0x74, 0x65, 0x64, 0x4d, 0x65, 0x6d, 0x62, 0x65, 0x72, 0x73, 0x68, 0x69, 0x70, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, - 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x76, 0x0a, 0x32, + 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x7c, 0x0a, 0x32, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x2e, 0x61, 0x67, 0x65, - 0x6e, 0x74, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, - 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x69, 0x64, 0x65, 0x6e, - 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6e, 0x74, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, + 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, + 0x32, 0x2f, 0x69, 0x64, 0x65, 0x6e, 0x74, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/identity/agent_grpc.pb.go b/weaver/common/protos-go/identity/agent_grpc.pb.go index 0bcade3f54..c7f8778c7a 100644 --- a/weaver/common/protos-go/identity/agent_grpc.pb.go +++ b/weaver/common/protos-go/identity/agent_grpc.pb.go @@ -12,7 +12,7 @@ package identity import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-go/networks/networks.pb.go b/weaver/common/protos-go/networks/networks.pb.go index a98c20fccd..8f45a2fbfd 100644 --- a/weaver/common/protos-go/networks/networks.pb.go +++ b/weaver/common/protos-go/networks/networks.pb.go @@ -11,7 +11,7 @@ package networks import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -650,15 +650,16 @@ var file_networks_networks_proto_rawDesc = []byte{ 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x47, 0x65, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x4d, 0x65, 0x73, 0x73, 0x61, 0x67, 0x65, 0x1a, 0x1a, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x2e, 0x45, 0x76, 0x65, - 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x00, 0x42, 0x79, 0x0a, 0x35, 0x6f, 0x72, + 0x6e, 0x74, 0x53, 0x74, 0x61, 0x74, 0x65, 0x73, 0x22, 0x00, 0x42, 0x7f, 0x0a, 0x35, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x2e, 0x6e, 0x65, 0x74, 0x77, 0x6f, - 0x72, 0x6b, 0x73, 0x5a, 0x40, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, - 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, - 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, - 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x6e, 0x65, 0x74, - 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x6b, 0x73, 0x5a, 0x46, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, + 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, + 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, + 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, + 0x76, 0x32, 0x2f, 0x6e, 0x65, 0x74, 0x77, 0x6f, 0x72, 0x6b, 0x73, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/networks/networks_grpc.pb.go b/weaver/common/protos-go/networks/networks_grpc.pb.go index 1edac21d87..2b7b4f9d61 100644 --- a/weaver/common/protos-go/networks/networks_grpc.pb.go +++ b/weaver/common/protos-go/networks/networks_grpc.pb.go @@ -12,7 +12,7 @@ package networks import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-go/relay/datatransfer.pb.go b/weaver/common/protos-go/relay/datatransfer.pb.go index dc8a474f77..6e8b4ac56e 100644 --- a/weaver/common/protos-go/relay/datatransfer.pb.go +++ b/weaver/common/protos-go/relay/datatransfer.pb.go @@ -11,7 +11,7 @@ package relay import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -45,15 +45,16 @@ var file_relay_datatransfer_proto_rawDesc = []byte{ 0x53, 0x65, 0x6e, 0x64, 0x44, 0x72, 0x69, 0x76, 0x65, 0x72, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x65, 0x77, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x77, 0x0a, + 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x7d, 0x0a, 0x36, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x74, - 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, - 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, - 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, - 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, - 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, + 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, + 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, + 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, + 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x62, 0x06, 0x70, 0x72, + 0x6f, 0x74, 0x6f, 0x33, } var file_relay_datatransfer_proto_goTypes = []interface{}{ diff --git a/weaver/common/protos-go/relay/datatransfer_grpc.pb.go b/weaver/common/protos-go/relay/datatransfer_grpc.pb.go index 1d75413d48..17c0fc9aff 100644 --- a/weaver/common/protos-go/relay/datatransfer_grpc.pb.go +++ b/weaver/common/protos-go/relay/datatransfer_grpc.pb.go @@ -12,7 +12,7 @@ package relay import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-go/relay/events.pb.go b/weaver/common/protos-go/relay/events.pb.go index 815744c4bd..8da9e176ea 100644 --- a/weaver/common/protos-go/relay/events.pb.go +++ b/weaver/common/protos-go/relay/events.pb.go @@ -11,7 +11,7 @@ package relay import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -55,15 +55,15 @@ var file_relay_events_proto_rawDesc = []byte{ 0x65, 0x6e, 0x64, 0x53, 0x74, 0x61, 0x74, 0x65, 0x12, 0x19, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x73, 0x74, 0x61, 0x74, 0x65, 0x2e, 0x56, 0x69, 0x65, 0x77, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, 0x63, 0x6b, - 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x71, 0x0a, 0x30, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, + 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x77, 0x0a, 0x30, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x72, 0x65, - 0x6c, 0x61, 0x79, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, + 0x6c, 0x61, 0x79, 0x2e, 0x65, 0x76, 0x65, 0x6e, 0x74, 0x73, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, - 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, - 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, - 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, - 0x33, + 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, + 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x62, + 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var file_relay_events_proto_goTypes = []interface{}{ diff --git a/weaver/common/protos-go/relay/events_grpc.pb.go b/weaver/common/protos-go/relay/events_grpc.pb.go index e84e45d934..1b3df20b03 100644 --- a/weaver/common/protos-go/relay/events_grpc.pb.go +++ b/weaver/common/protos-go/relay/events_grpc.pb.go @@ -12,7 +12,7 @@ package relay import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-go/relay/satp.pb.go b/weaver/common/protos-go/relay/satp.pb.go index fa869c902d..ee4a80f4ed 100644 --- a/weaver/common/protos-go/relay/satp.pb.go +++ b/weaver/common/protos-go/relay/satp.pb.go @@ -7,7 +7,7 @@ package relay import ( - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" protoreflect "google.golang.org/protobuf/reflect/protoreflect" protoimpl "google.golang.org/protobuf/runtime/protoimpl" reflect "reflect" @@ -1513,15 +1513,15 @@ var file_relay_satp_proto_rawDesc = []byte{ 0x24, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x73, 0x61, 0x74, 0x70, 0x2e, 0x54, 0x72, 0x61, 0x6e, 0x73, 0x66, 0x65, 0x72, 0x43, 0x6f, 0x6d, 0x70, 0x6c, 0x65, 0x74, 0x65, 0x64, 0x52, 0x65, 0x71, 0x75, 0x65, 0x73, 0x74, 0x1a, 0x0f, 0x2e, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2e, 0x61, - 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x77, 0x0a, 0x36, 0x6f, 0x72, 0x67, 0x2e, + 0x63, 0x6b, 0x2e, 0x41, 0x63, 0x6b, 0x22, 0x00, 0x42, 0x7d, 0x0a, 0x36, 0x6f, 0x72, 0x67, 0x2e, 0x68, 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2e, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2e, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2e, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x2e, 0x64, 0x61, 0x74, 0x61, 0x74, 0x72, 0x61, 0x6e, 0x73, 0x66, - 0x65, 0x72, 0x5a, 0x3d, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, - 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, - 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, - 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, 0x32, 0x2f, 0x72, 0x65, 0x6c, 0x61, - 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x65, 0x72, 0x5a, 0x43, 0x67, 0x69, 0x74, 0x68, 0x75, 0x62, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x68, + 0x79, 0x70, 0x65, 0x72, 0x6c, 0x65, 0x64, 0x67, 0x65, 0x72, 0x2d, 0x63, 0x61, 0x63, 0x74, 0x69, + 0x2f, 0x63, 0x61, 0x63, 0x74, 0x69, 0x2f, 0x77, 0x65, 0x61, 0x76, 0x65, 0x72, 0x2f, 0x63, 0x6f, + 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x73, 0x2d, 0x67, 0x6f, 0x2f, 0x76, + 0x32, 0x2f, 0x72, 0x65, 0x6c, 0x61, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, } var ( diff --git a/weaver/common/protos-go/relay/satp_grpc.pb.go b/weaver/common/protos-go/relay/satp_grpc.pb.go index c90cda158f..3e0cde0ed2 100644 --- a/weaver/common/protos-go/relay/satp_grpc.pb.go +++ b/weaver/common/protos-go/relay/satp_grpc.pb.go @@ -8,7 +8,7 @@ package relay import ( context "context" - common "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + common "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" diff --git a/weaver/common/protos-java-kt/github.properties.template b/weaver/common/protos-java-kt/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/common/protos-java-kt/github.properties.template +++ b/weaver/common/protos-java-kt/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/common/protos-js/package.json b/weaver/common/protos-js/package.json index 5bbbe4524f..54f80aac05 100644 --- a/weaver/common/protos-js/package.json +++ b/weaver/common/protos-js/package.json @@ -11,13 +11,13 @@ "nodejs", "js" ], - "homepage": "https://github.com/hyperledger/cacti#readme", + "homepage": "https://github.com/hyperledger-cacti/cacti#readme", "bugs": { "url": "https://github.com/hyperledger-cacti/cacti/issues" }, "repository": { "type": "git", - "url": "git+https://github.com/hyperledger/cacti.git" + "url": "git+https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "Sandeep Nishad", diff --git a/weaver/common/protos/besu/view_data.proto b/weaver/common/protos/besu/view_data.proto index 9f47c8e9d0..138776c713 100644 --- a/weaver/common/protos/besu/view_data.proto +++ b/weaver/common/protos/besu/view_data.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package besu; option java_package = "org.hyperledger.cacti.weaver.protos.besu"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/besu"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/besu"; // link below will take you to besu view rfc diff --git a/weaver/common/protos/common/access_control.proto b/weaver/common/protos/common/access_control.proto index 08e3f08f6e..da0000a287 100644 --- a/weaver/common/protos/common/access_control.proto +++ b/weaver/common/protos/common/access_control.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.access_control; option java_package = "org.hyperledger.cacti.weaver.protos.common.access_control"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // AccessControlPolicy specifies a set of data that can be accessed by some // SecurityGroup diff --git a/weaver/common/protos/common/ack.proto b/weaver/common/protos/common/ack.proto index 6184f798f6..edd6afaf54 100644 --- a/weaver/common/protos/common/ack.proto +++ b/weaver/common/protos/common/ack.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.ack; option java_package = "org.hyperledger.cacti.weaver.protos.common.ack"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // This message respresents "ACKs" sent between relay-relay, // relay-driver and relay-network diff --git a/weaver/common/protos/common/asset_locks.proto b/weaver/common/protos/common/asset_locks.proto index dda7599ef1..b1ffa89ae5 100644 --- a/weaver/common/protos/common/asset_locks.proto +++ b/weaver/common/protos/common/asset_locks.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.asset_locks; option java_package = "org.hyperledger.cacti.weaver.protos.common.asset_locks"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; enum LockMechanism { HTLC = 0; diff --git a/weaver/common/protos/common/asset_transfer.proto b/weaver/common/protos/common/asset_transfer.proto index 71e1907c5c..a2c27ac382 100644 --- a/weaver/common/protos/common/asset_transfer.proto +++ b/weaver/common/protos/common/asset_transfer.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.asset_transfer; option java_package = "org.hyperledger.cacti.weaver.protos.common.asset_transfer"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; message AssetPledge { bytes assetDetails = 1; diff --git a/weaver/common/protos/common/events.proto b/weaver/common/protos/common/events.proto index 4f4cc0fa9d..0602ac9261 100644 --- a/weaver/common/protos/common/events.proto +++ b/weaver/common/protos/common/events.proto @@ -10,7 +10,7 @@ import "common/query.proto"; import "common/state.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.common.events"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; enum EventType { LEDGER_STATE = 0; diff --git a/weaver/common/protos/common/interop_payload.proto b/weaver/common/protos/common/interop_payload.proto index bac95fe487..f99fc8f2df 100644 --- a/weaver/common/protos/common/interop_payload.proto +++ b/weaver/common/protos/common/interop_payload.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.interop_payload; option java_package = "org.hyperledger.cacti.weaver.protos.common.interop_payload"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; message InteropPayload { bytes payload = 1; diff --git a/weaver/common/protos/common/membership.proto b/weaver/common/protos/common/membership.proto index e51262687e..f52760495b 100644 --- a/weaver/common/protos/common/membership.proto +++ b/weaver/common/protos/common/membership.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.membership; option java_package = "org.hyperledger.cacti.weaver.protos.common.membership"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // Membership captures the members of an external entity such as a thing, // person, organization or groups of entities such as networks diff --git a/weaver/common/protos/common/proofs.proto b/weaver/common/protos/common/proofs.proto index e9ffc895d1..e5da5d7f48 100644 --- a/weaver/common/protos/common/proofs.proto +++ b/weaver/common/protos/common/proofs.proto @@ -6,7 +6,7 @@ syntax = "proto3"; package common.proofs; option java_package = "org.hyperledger.cacti.weaver.protos.common.proofs"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; message Proof { string signature = 1; diff --git a/weaver/common/protos/common/query.proto b/weaver/common/protos/common/query.proto index 8774b25c3a..12bd79a14c 100644 --- a/weaver/common/protos/common/query.proto +++ b/weaver/common/protos/common/query.proto @@ -6,7 +6,7 @@ syntax = "proto3"; package common.query; option java_package = "org.hyperledger.cacti.weaver.protos.common.query"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // the payload to define the data that is being requested message Query { diff --git a/weaver/common/protos/common/state.proto b/weaver/common/protos/common/state.proto index 5265ffa172..7eaa228b8b 100644 --- a/weaver/common/protos/common/state.proto +++ b/weaver/common/protos/common/state.proto @@ -6,7 +6,7 @@ syntax = "proto3"; package common.state; option java_package = "org.hyperledger.cacti.weaver.protos.common.state"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // Metadata for a View message Meta { diff --git a/weaver/common/protos/common/verification_policy.proto b/weaver/common/protos/common/verification_policy.proto index cd0ffc1d5d..bf88a5699a 100644 --- a/weaver/common/protos/common/verification_policy.proto +++ b/weaver/common/protos/common/verification_policy.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package common.verification_policy; option java_package = "org.hyperledger.cacti.weaver.protos.common.verification_policy"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common"; // VerificationPolicy stores the rules around which parties from a foreign // network need to provide proof of a view in order for it to be deemed valid by diff --git a/weaver/common/protos/corda/view_data.proto b/weaver/common/protos/corda/view_data.proto index 8d0686de95..1073679bc6 100644 --- a/weaver/common/protos/corda/view_data.proto +++ b/weaver/common/protos/corda/view_data.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package corda; option java_package = "org.hyperledger.cacti.weaver.protos.corda"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/corda"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/corda"; message ViewData { message NotarizedPayload { diff --git a/weaver/common/protos/driver/driver.proto b/weaver/common/protos/driver/driver.proto index b0681f8e4f..29edb7bb53 100644 --- a/weaver/common/protos/driver/driver.proto +++ b/weaver/common/protos/driver/driver.proto @@ -12,7 +12,7 @@ import "common/events.proto"; import "common/state.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.driver.driver"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/driver"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/driver"; // Data for a View processing by dest-driver message WriteExternalStateMessage { diff --git a/weaver/common/protos/fabric/view_data.proto b/weaver/common/protos/fabric/view_data.proto index 2d78c9144a..87a56161d8 100644 --- a/weaver/common/protos/fabric/view_data.proto +++ b/weaver/common/protos/fabric/view_data.proto @@ -7,7 +7,7 @@ syntax = "proto3"; package fabric.view_data; option java_package = "org.hyperledger.cacti.weaver.protos.fabric.view_data"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/fabric"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/fabric"; import "peer/proposal_response.proto"; diff --git a/weaver/common/protos/identity/agent.proto b/weaver/common/protos/identity/agent.proto index f128715f1e..38be5e86ef 100644 --- a/weaver/common/protos/identity/agent.proto +++ b/weaver/common/protos/identity/agent.proto @@ -9,7 +9,7 @@ package identity.agent; import "common/ack.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.identity.agent"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/identity"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/identity"; // definitions of all messages used in the datatransfer protocol service IINAgent { diff --git a/weaver/common/protos/networks/networks.proto b/weaver/common/protos/networks/networks.proto index 8a586d0252..cefd5e7691 100644 --- a/weaver/common/protos/networks/networks.proto +++ b/weaver/common/protos/networks/networks.proto @@ -11,7 +11,7 @@ import "common/state.proto"; import "common/events.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.networks.networks"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/networks"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/networks"; // This service is the interface for how the network communicates with // its relay. diff --git a/weaver/common/protos/relay/datatransfer.proto b/weaver/common/protos/relay/datatransfer.proto index 9c375507aa..7c953e6dc0 100644 --- a/weaver/common/protos/relay/datatransfer.proto +++ b/weaver/common/protos/relay/datatransfer.proto @@ -11,7 +11,7 @@ import "common/state.proto"; import "common/query.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.relay.datatransfer"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/relay"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/relay"; // definitions of all messages used in the datatransfer protocol service DataTransfer { diff --git a/weaver/common/protos/relay/events.proto b/weaver/common/protos/relay/events.proto index 33327ebe55..223b27e75b 100644 --- a/weaver/common/protos/relay/events.proto +++ b/weaver/common/protos/relay/events.proto @@ -11,7 +11,7 @@ import "common/events.proto"; import "common/state.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.relay.events"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/relay"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/relay"; service EventSubscribe { // the dest-relay forwards the request from client as EventSubscription to the src-relay diff --git a/weaver/common/protos/relay/satp.proto b/weaver/common/protos/relay/satp.proto index 4c25d8caad..22f3d0e67a 100644 --- a/weaver/common/protos/relay/satp.proto +++ b/weaver/common/protos/relay/satp.proto @@ -5,7 +5,7 @@ package relay.satp; import "common/ack.proto"; option java_package = "org.hyperledger.cacti.weaver.protos.relay.datatransfer"; -option go_package = "github.com/hyperledger/cacti/weaver/common/protos-go/v2/relay"; +option go_package = "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/relay"; service SATP { // Stage 1 endpoints diff --git a/weaver/core/drivers/corda-driver/github.properties.template b/weaver/core/drivers/corda-driver/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/core/drivers/corda-driver/github.properties.template +++ b/weaver/core/drivers/corda-driver/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/core/drivers/fabric-driver/.gitignore b/weaver/core/drivers/fabric-driver/.gitignore index 3c8dcef17e..f6f1c87250 100644 --- a/weaver/core/drivers/fabric-driver/.gitignore +++ b/weaver/core/drivers/fabric-driver/.gitignore @@ -12,4 +12,4 @@ wallet-network1/*.id !wallet-network1/relay.id wallet-network2/*.id !wallet-network2/relay.id -satp_info.txt +satp_info.txt \ No newline at end of file diff --git a/weaver/core/drivers/fabric-driver/package-local.json b/weaver/core/drivers/fabric-driver/package-local.json index 7897368d15..f0ec73e51a 100644 --- a/weaver/core/drivers/fabric-driver/package-local.json +++ b/weaver/core/drivers/fabric-driver/package-local.json @@ -4,7 +4,7 @@ "description": "", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/core/drivers/fabric-driver/package.json b/weaver/core/drivers/fabric-driver/package.json index 09c5ecd048..b1a616d45d 100644 --- a/weaver/core/drivers/fabric-driver/package.json +++ b/weaver/core/drivers/fabric-driver/package.json @@ -4,7 +4,7 @@ "description": "", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/core/identity-management/iin-agent/package-local.json b/weaver/core/identity-management/iin-agent/package-local.json index 6b25777a28..5ba3ab32a7 100644 --- a/weaver/core/identity-management/iin-agent/package-local.json +++ b/weaver/core/identity-management/iin-agent/package-local.json @@ -4,7 +4,7 @@ "description": "", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/core/identity-management/iin-agent/package.json b/weaver/core/identity-management/iin-agent/package.json index f098f89e3f..6de26288c3 100644 --- a/weaver/core/identity-management/iin-agent/package.json +++ b/weaver/core/identity-management/iin-agent/package.json @@ -4,7 +4,7 @@ "description": "", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/core/network/corda-interop-app/github.properties.template b/weaver/core/network/corda-interop-app/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/core/network/corda-interop-app/github.properties.template +++ b/weaver/core/network/corda-interop-app/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/Makefile b/weaver/core/network/fabric-interop-cc/contracts/interop/Makefile index f8e8fb90d6..c3eea77df8 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/Makefile +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/Makefile @@ -1,16 +1,16 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2=../../libs/assetexchange/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../libs/utils/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2=../../libs/assetexchange/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../libs/utils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils build-local: run-vendor build undo-vendor diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc.go b/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc.go index a8abd54916..c5b8575e4e 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc.go @@ -15,8 +15,8 @@ import ( "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const accessControlObjectType = "accessControl" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc_test.go index b0dd561ec2..f215d73066 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/access_control_cc_test.go @@ -11,10 +11,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" "github.com/stretchr/testify/require" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) var accessControlAsset = common.AccessControlPolicy{ diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils.go b/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils.go index af9f8d3f31..cb9f70c4cd 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils.go @@ -26,7 +26,7 @@ import ( "golang.org/x/crypto/ed25519" "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) const ( diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils_test.go index 0b46472fd4..99b3693684 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/certificate_utils_test.go @@ -28,7 +28,7 @@ import ( "github.com/stretchr/testify/require" "github.com/ethereum/go-ethereum/crypto/ecies" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) func TestVerifyCertificateChain(t *testing.T) { diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/decoders.go b/weaver/core/network/fabric-interop-cc/contracts/interop/decoders.go index 98b3894f48..d9462dd5c2 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/decoders.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/decoders.go @@ -17,8 +17,8 @@ import ( "strings" "fmt" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/identity" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/identity" protoV2 "google.golang.org/protobuf/proto" ) diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/go.mod b/weaver/core/network/fabric-interop-cc/contracts/interop/go.mod index d0755790e4..3e8afe0361 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/go.mod +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/go.mod @@ -1,14 +1,14 @@ -module github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/v2 +module github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/v2 go 1.20 require ( github.com/ethereum/go-ethereum v1.13.15 github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/go.sum b/weaver/core/network/fabric-interop-cc/contracts/interop/go.sum index a0296503f3..e4ac9a0cc0 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/go.sum +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/go.sum @@ -45,14 +45,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= github.com/holiman/uint256 v1.2.4 h1:jUc4Nk8fm9jZabQuqr2JzednajVmBpC+oiTiXZJEApU= github.com/holiman/uint256 v1.2.4/go.mod h1:EOMSn4q6Nyt9P6efbI3bueV4e1b3dGlUCXeiRV4ng7E= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.3 h1:lTZbT2BWQDeY4UAIcGQz/Isi/lgy/0RvSZFbXR2xzHE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.3/go.mod h1:ZCp3u+f2tLYEPpfXPF+X0g+UJyaDDoSNts+tEBn5s58= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3 h1:p/kmKz9o3mmbsV3d8zSmqIpt3xVEAsMBP4ByITNWJUE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3/go.mod h1:l8UQvJ9GuTQbxF1CJ5ywasGcJGTr3QM7VLteX7HVxLc= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -159,33 +151,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.4 h1:BsEIRS78AS4rrN/AR6npd5EVF3dK2HNsJd6xkA45nSE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.4/go.mod h1:HTWsvBnBib1o5uScrR18S5O9lKRlxof7WJq3DDxnNxg= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4 h1:/N9daeftDUg9Rr4EKM8xTrOBcjwbsTnu5CNL7HoLeQA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4/go.mod h1:kaYR0r/FsLI2puio2/nKuTyl31umJq1OeTYrCUIMOAA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.5 h1:CTxmv7vO8hVqJrdjdyAtG9U+erpA1mP0I0vll9TPSB8= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.5/go.mod h1:YA5Ly/bWlv571u5WOKNS2h/ZkGh3y9kPkA/VcWSYRu8= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5 h1:n+3yOsjQzu/LhvPUxbdmgGdRSmgjPbZdlsViF5Hu05U= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5/go.mod h1:0yg9YTPXeSIXJd0IWOHwZmWkA0c2aQBQlGrsDbw94kk= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.6 h1:qMPY3I8x0GGVrngbhE8Xyh59wcTFYt7BZcu/uWlkPeA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.6/go.mod h1:SdnHl6IurM6pO1LAtsNaHuD95F2Itsoo8LFMGefh/gM= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6 h1:6jf+iu+DIQ8xCYcPDOCTxzz1UNgVFOr0amnwndZK2i4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6/go.mod h1:COOxAwxTkW/Ow1MjIOBbjf6V9mxN1+u0hT+kQPDxlL4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 h1:lFmFOJgd1M/gm4tSB9S1k7H5X620/wnn0UT+Id0ejk4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7/go.mod h1:47hBkpf71KbrfA/YxUPJ82crC1q/ji1h5uaN25/U0Ns= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 h1:O0cnG/KHCpPQVtrPICKV3FUh3suvok0p+heEP8EOzFw= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0 h1:E3rGeMoW4koNYkiovcRF4L1FNSODbURkB8ElnroRPv4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0/go.mod h1:47hBkpf71KbrfA/YxUPJ82crC1q/ji1h5uaN25/U0Ns= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0 h1:79yUNNg1moRSP7wr6nC4/smI+/neziluDsDh+wrLhls= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go b/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go index 30218d3515..998ec89de7 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request.go @@ -14,8 +14,8 @@ import ( "fmt" "strings" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request_test.go index fa3c908510..50793328e7 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/handle_external_request_test.go @@ -24,8 +24,8 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" "github.com/hyperledger/fabric-chaincode-go/shim" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" pb "github.com/hyperledger/fabric-protos-go/peer" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/main.go b/weaver/core/network/fabric-interop-cc/contracts/interop/main.go index b4ad89ded8..89620222bb 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/main.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/main.go @@ -14,7 +14,7 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const e2eConfidentialityKey = "e2eConfidentialityFlag" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets.go b/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets.go index 6481950f1f..ac2325af3a 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets.go @@ -12,10 +12,10 @@ import ( "fmt" "errors" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const ( diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets_test.go index 861b1370df..869b8fa4b0 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/manage_assets_test.go @@ -15,12 +15,12 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" log "github.com/sirupsen/logrus" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) const ( diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go b/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go index bae0ec6d87..985295fbdd 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/membership.go @@ -15,10 +15,10 @@ import ( "fmt" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/identity" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/identity" protoV2 "google.golang.org/protobuf/proto" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const membershipObjectType = "membership" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/membership_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/membership_test.go index a154733b86..5ad0eca8d3 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/membership_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/membership_test.go @@ -22,12 +22,12 @@ import ( "testing" "time" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" "github.com/stretchr/testify/require" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/identity" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/identity" protoV2 "google.golang.org/protobuf/proto" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) var securityDomainId = "2345" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc.go b/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc.go index e3d9e7cc27..9915510fed 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc.go @@ -13,8 +13,8 @@ import ( "fmt" "github.com/hyperledger/fabric-contract-api-go/contractapi" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const verificationPolicyObjectType = "verificationPolicy" diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc_test.go index 39e0039fc4..b0ff5e0c87 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/verification_policy_cc_test.go @@ -11,10 +11,10 @@ import ( "fmt" "testing" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" "github.com/stretchr/testify/require" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) var identifier = common.Identifier{ diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state.go b/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state.go index bf9c9839e0..442f36da75 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state.go @@ -19,9 +19,9 @@ import ( "github.com/hyperledger/fabric-protos-go/msp" "github.com/hyperledger/fabric-protos-go/peer" log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/corda" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/fabric" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/corda" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/fabric" protoV2 "google.golang.org/protobuf/proto" ) diff --git a/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state_test.go b/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state_test.go index 4c663f90ee..4a1582d05f 100644 --- a/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state_test.go +++ b/weaver/core/network/fabric-interop-cc/contracts/interop/write_external_state_test.go @@ -15,8 +15,8 @@ import ( "github.com/hyperledger/fabric-protos-go/peer" "github.com/stretchr/testify/require" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/Makefile b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/Makefile index a4b2f8c288..120d25f8be 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/Makefile +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/Makefile @@ -1,12 +1,12 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils test: go test asset_locks_contract.go asset_locks_contract_test.go asset_locks.go -v diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks.go b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks.go index 9e289c7555..b7ff2d2438 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks.go +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks.go @@ -17,7 +17,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-chaincode-go/shim" log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract.go b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract.go index 88faf2ba0c..41a8e7985a 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract.go +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract.go @@ -13,7 +13,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract_test.go b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract_test.go index 6d098c2705..108e7020b8 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract_test.go +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_contract_test.go @@ -12,8 +12,8 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/stretchr/testify/require" - am "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + am "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) const ( diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_test.go b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_test.go index 98e8a0c3b7..6064c12b86 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_test.go +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/asset_locks_test.go @@ -21,8 +21,8 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shimtest" pb "github.com/hyperledger/fabric-protos-go/peer" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - am "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + am "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" ) diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod index 46f97060ef..e557e6373b 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod @@ -1,11 +1,11 @@ -module github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 +module github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum index fbdab4a1da..0efbac1c8c 100644 --- a/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum +++ b/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum @@ -34,10 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -146,13 +142,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/Makefile b/weaver/core/network/fabric-interop-cc/libs/assetexchange/Makefile index 6f904fe6f7..782ac206cb 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/Makefile +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/Makefile @@ -1,10 +1,10 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 clean: rm -rf vendor \ No newline at end of file diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md b/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md index aed15dfaa6..3d38092056 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/README.md @@ -11,8 +11,8 @@ To use this library, in you smart contract `go.mod`, add following in require (u ``` require( ... - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v1.5.3 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v1.5.3 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v1.5.3 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v1.5.3 ... ) ``` @@ -24,7 +24,7 @@ Atleast following 5 functions needs to be added in chaincode (Note: the function ```go import ( ... - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" ) func (s *SmartContract) LockAsset(ctx contractapi.TransactionContextInterface, assetExchangeAgreementSerializedProto64 string, lockInfoSerializedProto64 string) (string, error) { // Add some safety checks before calling LockAsset from library diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go b/weaver/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go index 36449fa53b..6b639981d3 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/assetSwapContracts.go @@ -15,7 +15,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" ) diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.mod b/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.mod index 73df0dd619..c396980ac8 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.mod +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.mod @@ -1,10 +1,10 @@ -module github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 +module github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-contract-api-go v1.1.1 github.com/hyperledger/fabric-protos-go v0.3.3 github.com/sirupsen/logrus v1.8.1 diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.sum b/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.sum index 4eb0a5dc04..41c82e127a 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.sum +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/go.sum @@ -44,8 +44,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212 h1:1i4lnpV8BDgKOLi1hgElfBqdHXjXieSuj8629mwBZ8o= github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc= github.com/hyperledger/fabric-contract-api-go v1.1.1 h1:gDhOC18gjgElNZ85kFWsbCQq95hyUP/21n++m0Sv6B0= @@ -157,13 +155,3 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/helpers.go b/weaver/core/network/fabric-interop-cc/libs/assetexchange/helpers.go index f2901da80a..3c5c36cd77 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/helpers.go +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/helpers.go @@ -17,7 +17,7 @@ import ( "fmt" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" log "github.com/sirupsen/logrus" diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/idGenerator.go b/weaver/core/network/fabric-interop-cc/libs/assetexchange/idGenerator.go index fce51d2401..f976bf0c92 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/idGenerator.go +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/idGenerator.go @@ -11,7 +11,7 @@ package assetexchange import ( "strconv" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/types.go b/weaver/core/network/fabric-interop-cc/libs/assetexchange/types.go index d1976c5a40..cd59d9b112 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/types.go +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/types.go @@ -9,7 +9,7 @@ package assetexchange import ( - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) type AssetLockInterface interface { diff --git a/weaver/core/network/fabric-interop-cc/libs/assetexchange/utility.go b/weaver/core/network/fabric-interop-cc/libs/assetexchange/utility.go index 32fac0a6fe..948cef7274 100644 --- a/weaver/core/network/fabric-interop-cc/libs/assetexchange/utility.go +++ b/weaver/core/network/fabric-interop-cc/libs/assetexchange/utility.go @@ -13,7 +13,7 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" ) diff --git a/weaver/core/network/fabric-interop-cc/libs/testutils/go.mod b/weaver/core/network/fabric-interop-cc/libs/testutils/go.mod index 9ab80a7b50..5c8fce0c7b 100644 --- a/weaver/core/network/fabric-interop-cc/libs/testutils/go.mod +++ b/weaver/core/network/fabric-interop-cc/libs/testutils/go.mod @@ -1,4 +1,4 @@ -module github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils +module github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils go 1.20 diff --git a/weaver/core/network/fabric-interop-cc/libs/testutils/setup.go b/weaver/core/network/fabric-interop-cc/libs/testutils/setup.go index 8b1e16cceb..e5fb9beb49 100644 --- a/weaver/core/network/fabric-interop-cc/libs/testutils/setup.go +++ b/weaver/core/network/fabric-interop-cc/libs/testutils/setup.go @@ -13,7 +13,7 @@ import ( "os" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" "github.com/hyperledger/fabric-chaincode-go/pkg/cid" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" diff --git a/weaver/core/network/fabric-interop-cc/libs/utils/Makefile b/weaver/core/network/fabric-interop-cc/libs/utils/Makefile index 6f904fe6f7..782ac206cb 100644 --- a/weaver/core/network/fabric-interop-cc/libs/utils/Makefile +++ b/weaver/core/network/fabric-interop-cc/libs/utils/Makefile @@ -1,10 +1,10 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../../../common/protos-go/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 clean: rm -rf vendor \ No newline at end of file diff --git a/weaver/core/network/fabric-interop-cc/libs/utils/go.mod b/weaver/core/network/fabric-interop-cc/libs/utils/go.mod index b9e8ec57aa..526263de6b 100644 --- a/weaver/core/network/fabric-interop-cc/libs/utils/go.mod +++ b/weaver/core/network/fabric-interop-cc/libs/utils/go.mod @@ -1,10 +1,10 @@ -module github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 +module github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9 github.com/hyperledger/fabric-contract-api-go v1.1.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/core/network/fabric-interop-cc/libs/utils/go.sum b/weaver/core/network/fabric-interop-cc/libs/utils/go.sum index a261045e1f..f1770dca85 100644 --- a/weaver/core/network/fabric-interop-cc/libs/utils/go.sum +++ b/weaver/core/network/fabric-interop-cc/libs/utils/go.sum @@ -44,8 +44,6 @@ github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= github.com/hyperledger/fabric-chaincode-go v0.0.0-20200424173110-d7076418f212/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc= github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9 h1:1cAZHHrBYFrX3bwQGhOZtOB4sCM9QWVppd81O8vsPXs= github.com/hyperledger/fabric-chaincode-go v0.0.0-20210718160520-38d29fabecb9/go.mod h1:N7H3sA7Tx4k/YzFq7U0EPdqJtqvM4Kild0JoCc7C0Dc= @@ -155,13 +153,3 @@ gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10= gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= honnef.co/go/tools v0.0.0-20190523083050-ea95bdfd59fc/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= diff --git a/weaver/core/network/fabric-interop-cc/libs/utils/utils.go b/weaver/core/network/fabric-interop-cc/libs/utils/utils.go index 8d7eea2d93..ffa121fa93 100644 --- a/weaver/core/network/fabric-interop-cc/libs/utils/utils.go +++ b/weaver/core/network/fabric-interop-cc/libs/utils/utils.go @@ -18,7 +18,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-chaincode-go/pkg/cid" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" diff --git a/weaver/samples/corda/corda-simple-application/github.properties.template b/weaver/samples/corda/corda-simple-application/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/samples/corda/corda-simple-application/github.properties.template +++ b/weaver/samples/corda/corda-simple-application/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/samples/fabric/go-cli/Makefile b/weaver/samples/fabric/go-cli/Makefile index 2f419f0a63..9754b68fbd 100644 --- a/weaver/samples/fabric/go-cli/Makefile +++ b/weaver/samples/fabric/go-cli/Makefile @@ -10,14 +10,14 @@ build: go build -o ./bin/fabric-cli fabric-cli.go run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2=../../../sdks/fabric/go-sdk/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2=../../../sdks/fabric/go-sdk/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2 .PHONY: build-local diff --git a/weaver/samples/fabric/go-cli/cmd/asset-exchange-all.go b/weaver/samples/fabric/go-cli/cmd/asset-exchange-all.go index f7a301d25b..b5e11f9d2f 100644 --- a/weaver/samples/fabric/go-cli/cmd/asset-exchange-all.go +++ b/weaver/samples/fabric/go-cli/cmd/asset-exchange-all.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" - am "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" + am "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/asset-exchange-step.go b/weaver/samples/fabric/go-cli/cmd/asset-exchange-step.go index 8f476f5e54..237edadab6 100644 --- a/weaver/samples/fabric/go-cli/cmd/asset-exchange-step.go +++ b/weaver/samples/fabric/go-cli/cmd/asset-exchange-step.go @@ -13,8 +13,8 @@ import ( "strings" "time" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" - am "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" + am "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/chaincode-invoke.go b/weaver/samples/fabric/go-cli/cmd/chaincode-invoke.go index ac1fe5af8d..c85745bbbe 100644 --- a/weaver/samples/fabric/go-cli/cmd/chaincode-invoke.go +++ b/weaver/samples/fabric/go-cli/cmd/chaincode-invoke.go @@ -10,7 +10,7 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" diff --git a/weaver/samples/fabric/go-cli/cmd/chaincode-query.go b/weaver/samples/fabric/go-cli/cmd/chaincode-query.go index d81826226d..5cbcb7c52c 100644 --- a/weaver/samples/fabric/go-cli/cmd/chaincode-query.go +++ b/weaver/samples/fabric/go-cli/cmd/chaincode-query.go @@ -10,7 +10,7 @@ import ( "encoding/json" "fmt" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" "github.com/spf13/cobra" log "github.com/sirupsen/logrus" diff --git a/weaver/samples/fabric/go-cli/cmd/config-get.go b/weaver/samples/fabric/go-cli/cmd/config-get.go index 7d88e8558a..26d0f7cce8 100644 --- a/weaver/samples/fabric/go-cli/cmd/config-get.go +++ b/weaver/samples/fabric/go-cli/cmd/config-get.go @@ -12,7 +12,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/config-set-file.go b/weaver/samples/fabric/go-cli/cmd/config-set-file.go index 6c8e0a398f..8b7fa6228c 100644 --- a/weaver/samples/fabric/go-cli/cmd/config-set-file.go +++ b/weaver/samples/fabric/go-cli/cmd/config-set-file.go @@ -11,7 +11,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/config-set.go b/weaver/samples/fabric/go-cli/cmd/config-set.go index 0c6d8e0df5..c91c82129e 100644 --- a/weaver/samples/fabric/go-cli/cmd/config-set.go +++ b/weaver/samples/fabric/go-cli/cmd/config-set.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/configure-asset-add.go b/weaver/samples/fabric/go-cli/cmd/configure-asset-add.go index 2ade308ea4..6033495ed6 100644 --- a/weaver/samples/fabric/go-cli/cmd/configure-asset-add.go +++ b/weaver/samples/fabric/go-cli/cmd/configure-asset-add.go @@ -9,7 +9,7 @@ package cmd import ( log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/env-get.go b/weaver/samples/fabric/go-cli/cmd/env-get.go index bfc7df1347..25ad14d313 100644 --- a/weaver/samples/fabric/go-cli/cmd/env-get.go +++ b/weaver/samples/fabric/go-cli/cmd/env-get.go @@ -12,7 +12,7 @@ import ( "path/filepath" "strings" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/env-set-file.go b/weaver/samples/fabric/go-cli/cmd/env-set-file.go index 15829e528f..f3f99d880b 100644 --- a/weaver/samples/fabric/go-cli/cmd/env-set-file.go +++ b/weaver/samples/fabric/go-cli/cmd/env-set-file.go @@ -11,7 +11,7 @@ import ( "io/ioutil" "path/filepath" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/env-set.go b/weaver/samples/fabric/go-cli/cmd/env-set.go index e1cc2ccb38..1f876fc94f 100644 --- a/weaver/samples/fabric/go-cli/cmd/env-set.go +++ b/weaver/samples/fabric/go-cli/cmd/env-set.go @@ -13,7 +13,7 @@ import ( "path/filepath" "strings" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/cmd/user-add.go b/weaver/samples/fabric/go-cli/cmd/user-add.go index ab2acff457..968058052f 100644 --- a/weaver/samples/fabric/go-cli/cmd/user-add.go +++ b/weaver/samples/fabric/go-cli/cmd/user-add.go @@ -7,7 +7,7 @@ package cmd import ( - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" log "github.com/sirupsen/logrus" "github.com/spf13/cobra" ) diff --git a/weaver/samples/fabric/go-cli/configure/all.go b/weaver/samples/fabric/go-cli/configure/all.go index 745ffd46b6..893542e540 100644 --- a/weaver/samples/fabric/go-cli/configure/all.go +++ b/weaver/samples/fabric/go-cli/configure/all.go @@ -11,8 +11,8 @@ import ( "fmt" "github.com/cloudflare/cfssl/log" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers/interopsetup" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers/interopsetup" ) // helper functions to log and return errors diff --git a/weaver/samples/fabric/go-cli/exerciseSDK.go b/weaver/samples/fabric/go-cli/exerciseSDK.go index 78b83b7e6a..ef28047337 100644 --- a/weaver/samples/fabric/go-cli/exerciseSDK.go +++ b/weaver/samples/fabric/go-cli/exerciseSDK.go @@ -21,12 +21,12 @@ import ( log "github.com/sirupsen/logrus" "google.golang.org/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers/interopsetup" - am "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" - "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/interoperablehelper" - "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/types" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers/interopsetup" + am "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" + "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/interoperablehelper" + "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/types" ) func connectSimpleStateWithSDK() { diff --git a/weaver/samples/fabric/go-cli/fabric-cli.go b/weaver/samples/fabric/go-cli/fabric-cli.go index c1b0cf9f24..2887bf2c03 100644 --- a/weaver/samples/fabric/go-cli/fabric-cli.go +++ b/weaver/samples/fabric/go-cli/fabric-cli.go @@ -6,7 +6,7 @@ package main -import "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/cmd" +import "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/cmd" func main() { cmd.Execute() diff --git a/weaver/samples/fabric/go-cli/go.mod b/weaver/samples/fabric/go-cli/go.mod index a6477c107b..de67b2c4ee 100644 --- a/weaver/samples/fabric/go-cli/go.mod +++ b/weaver/samples/fabric/go-cli/go.mod @@ -1,11 +1,11 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/go-cli +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli go 1.20 require ( github.com/cloudflare/cfssl v1.4.1 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-sdk-go v1.0.1-0.20221020141211-7af45cede6af github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.2.1 diff --git a/weaver/samples/fabric/go-cli/go.sum b/weaver/samples/fabric/go-cli/go.sum index 38fb54208d..246a746334 100644 --- a/weaver/samples/fabric/go-cli/go.sum +++ b/weaver/samples/fabric/go-cli/go.sum @@ -258,10 +258,6 @@ github.com/hashicorp/memberlist v0.1.3/go.mod h1:ajVTdAv/9Im8oMAAj5G31PhhMCZJV2p github.com/hashicorp/serf v0.8.2/go.mod h1:6hOLApaqBFA1NXqRQAsxw9QxuDEvNxSQRwA/JwenrHc= github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/hudl/fargo v1.3.0/go.mod h1:y3CKSmjA+wD2gak7sUSXTAoopbhU08POFhmITJgmKTg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.3 h1:BFogfPwx9P1zRNDLirY6bbaoAehN4ikatmVCwypbdbw= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.3/go.mod h1:TX0mUWisdz9YZgPmz5yWQDj7Z56iXlh2SkuNr7TBwRY= github.com/hyperledger/fabric-config v0.0.5 h1:khRkm8U9Ghdg8VmZfptgzCFlCzrka8bPfUkM+/j6Zlg= github.com/hyperledger/fabric-config v0.0.5/go.mod h1:YpITBI/+ZayA3XWY5lF302K7PAsFYjEEPM/zr3hegA8= github.com/hyperledger/fabric-lib-go v1.0.0 h1:UL1w7c9LvHZUSkIvHTDGklxFv2kTeva1QI2emOVc324= @@ -914,23 +910,3 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.4 h1:f8Jpc/Wh7r48sa2UL3ecOLQ6X6CxfwOTGUKO0lVuNEE= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.4/go.mod h1:+8UK+1V45LAP83Cf46vA05KD+yeB7fuNiYvYhDh5D+g= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.5 h1:6kna153r24xMTd/AlbaYJ9/wxw3+jrebhq3UVAwzW1o= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.5/go.mod h1:HNlgxzIiqVIq/aH2Qdsfh+YpfMsj7Qv9LLrhWlCrVjc= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.6 h1:IyUQ9HsQhLvfIdQdCzxQes87DJwUGJ7fXP2lR+l79ow= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.6/go.mod h1:nUXSzFkZII2p4l45NkNYI8l+IDjx5W4wAdROHlhwWx8= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.7 h1:jtBYHuJEAhjcKPAB7c8YdiAZw1ipGebaMwLIq/Tz4Hk= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0-rc.7/go.mod h1:cXWXIj4StOXMQXRLL1Qu8hpiIfLHpnQxlQ7lSZgBMh0= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0 h1:4v+YbeUv181yriMYFHBj0O3iYtdc5P0fxrkXyEOnb9U= -github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 v2.0.0/go.mod h1:cXWXIj4StOXMQXRLL1Qu8hpiIfLHpnQxlQ7lSZgBMh0= diff --git a/weaver/samples/fabric/go-cli/helpers/interopsetup/configure-network.go b/weaver/samples/fabric/go-cli/helpers/interopsetup/configure-network.go index 75c9666819..667d3a0549 100644 --- a/weaver/samples/fabric/go-cli/helpers/interopsetup/configure-network.go +++ b/weaver/samples/fabric/go-cli/helpers/interopsetup/configure-network.go @@ -13,7 +13,7 @@ import ( "path/filepath" log "github.com/sirupsen/logrus" - "github.com/hyperledger/cacti/weaver/samples/fabric/go-cli/helpers" + "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/go-cli/helpers" ) // helper functions to log and return errors diff --git a/weaver/samples/fabric/satpsimpleasset/Makefile b/weaver/samples/fabric/satpsimpleasset/Makefile index 940c69373d..00edd98bd9 100644 --- a/weaver/samples/fabric/satpsimpleasset/Makefile +++ b/weaver/samples/fabric/satpsimpleasset/Makefile @@ -1,16 +1,16 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/satpsimpleasset/assetmgmt.go b/weaver/samples/fabric/satpsimpleasset/assetmgmt.go index a187598bc3..fed6ded784 100644 --- a/weaver/samples/fabric/satpsimpleasset/assetmgmt.go +++ b/weaver/samples/fabric/satpsimpleasset/assetmgmt.go @@ -10,9 +10,9 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" log "github.com/sirupsen/logrus" ) diff --git a/weaver/samples/fabric/satpsimpleasset/assetmgmt_test.go b/weaver/samples/fabric/satpsimpleasset/assetmgmt_test.go index 83db59decd..8312e81774 100644 --- a/weaver/samples/fabric/satpsimpleasset/assetmgmt_test.go +++ b/weaver/samples/fabric/satpsimpleasset/assetmgmt_test.go @@ -12,9 +12,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/stretchr/testify/require" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/satpsimpleasset" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/satpsimpleasset" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) // function that supplies value that is to be returned by ctx.GetStub().GetCreator() in locker/recipient context diff --git a/weaver/samples/fabric/satpsimpleasset/bondasset.go b/weaver/samples/fabric/satpsimpleasset/bondasset.go index f57b80e65c..48d5acf14a 100644 --- a/weaver/samples/fabric/satpsimpleasset/bondasset.go +++ b/weaver/samples/fabric/satpsimpleasset/bondasset.go @@ -7,7 +7,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/samples/fabric/satpsimpleasset/bondasset_test.go b/weaver/samples/fabric/satpsimpleasset/bondasset_test.go index b43170e23a..7da207d505 100644 --- a/weaver/samples/fabric/satpsimpleasset/bondasset_test.go +++ b/weaver/samples/fabric/satpsimpleasset/bondasset_test.go @@ -7,10 +7,10 @@ import ( "time" "github.com/hyperledger/fabric-protos-go/ledger/queryresult" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/satpsimpleasset" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/satpsimpleasset" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" - wtestmocks "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtestmocks "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" ) const ( diff --git a/weaver/samples/fabric/satpsimpleasset/go.mod b/weaver/samples/fabric/satpsimpleasset/go.mod index abfaac4229..6575cdfa50 100644 --- a/weaver/samples/fabric/satpsimpleasset/go.mod +++ b/weaver/samples/fabric/satpsimpleasset/go.mod @@ -1,13 +1,13 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/satpsimpleasset +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/satpsimpleasset go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/samples/fabric/satpsimpleasset/go.sum b/weaver/samples/fabric/satpsimpleasset/go.sum index 2734e1d87e..0efbac1c8c 100644 --- a/weaver/samples/fabric/satpsimpleasset/go.sum +++ b/weaver/samples/fabric/satpsimpleasset/go.sum @@ -34,14 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3 h1:oJ/m/4UCIgICZJ7whmcMR+6arogpXvCIevdP1BmnSzM= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3/go.mod h1:w/CPnYlSSYi9eFKhmAuuIHvDk8iRQMKI0F1sAAZLUmk= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028 h1:IYGvhEekwbhhbSI9cNCcq7sdSCkEwiyRWY/Y7QCWZFs= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240513093210-cf641c80c028/go.mod h1:AM6B93C+yIr4TtjBrfnPQgkFQy0nyz3SjUYAwgQCWWc= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3 h1:p/kmKz9o3mmbsV3d8zSmqIpt3xVEAsMBP4ByITNWJUE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3/go.mod h1:l8UQvJ9GuTQbxF1CJ5ywasGcJGTr3QM7VLteX7HVxLc= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -150,33 +142,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4 h1:C7cLYvDbu8JmpZ6EMSgzNNvrKQiScB03T/gDVkhiQSo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4/go.mod h1:/onOl3s/TN0nYrhM2tTutM8UAOGWWVliNNmKGkslCWY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4 h1:/N9daeftDUg9Rr4EKM8xTrOBcjwbsTnu5CNL7HoLeQA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4/go.mod h1:kaYR0r/FsLI2puio2/nKuTyl31umJq1OeTYrCUIMOAA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5 h1:qBxFJJAl75eFkLlw7W4H42F/DuJhAyxZ8JT2iwClOEo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5/go.mod h1:5pNw+pQqqUi9E+9zUV2c07aiGg9htEJYIOUtHQbqvjo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5 h1:n+3yOsjQzu/LhvPUxbdmgGdRSmgjPbZdlsViF5Hu05U= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5/go.mod h1:0yg9YTPXeSIXJd0IWOHwZmWkA0c2aQBQlGrsDbw94kk= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6 h1:hKrdqULPXfbiGKFN+5y7M6JRf4nNWJwtDt5qNKeBZzI= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6/go.mod h1:yCYkdcI9SPrPu4NiIB3dzutGuM/PBBhwaKHalpYPSao= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6 h1:6jf+iu+DIQ8xCYcPDOCTxzz1UNgVFOr0amnwndZK2i4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6/go.mod h1:COOxAwxTkW/Ow1MjIOBbjf6V9mxN1+u0hT+kQPDxlL4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 h1:oBDxB6X0w/DaC6MUdAwJ0h/mVZpXMAlNIB6sqBvqioo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 h1:O0cnG/KHCpPQVtrPICKV3FUh3suvok0p+heEP8EOzFw= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0 h1:fTakpQnEHxn5xCWEEymBvW7F80mrzs86SMfVk9Bfqjo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0 h1:79yUNNg1moRSP7wr6nC4/smI+/neziluDsDh+wrLhls= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= diff --git a/weaver/samples/fabric/satpsimpleasset/main.go b/weaver/samples/fabric/satpsimpleasset/main.go index 0b8c5b9d71..d6280a00eb 100644 --- a/weaver/samples/fabric/satpsimpleasset/main.go +++ b/weaver/samples/fabric/satpsimpleasset/main.go @@ -6,7 +6,7 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - am "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" + am "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" ) // SmartContract provides functions for managing an BondAsset and TokenAsset diff --git a/weaver/samples/fabric/satpsimpleasset/tokenasset_test.go b/weaver/samples/fabric/satpsimpleasset/tokenasset_test.go index facbfb393f..81fffe17c9 100644 --- a/weaver/samples/fabric/satpsimpleasset/tokenasset_test.go +++ b/weaver/samples/fabric/satpsimpleasset/tokenasset_test.go @@ -9,9 +9,9 @@ import ( "github.com/golang/protobuf/proto" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/satpsimpleasset" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/satpsimpleasset" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) func TestInitTokenAssetLedger(t *testing.T) { diff --git a/weaver/samples/fabric/simpleasset/Makefile b/weaver/samples/fabric/simpleasset/Makefile index 378c218eff..e7a31a0565 100644 --- a/weaver/samples/fabric/simpleasset/Makefile +++ b/weaver/samples/fabric/simpleasset/Makefile @@ -1,14 +1,14 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/simpleasset/assetmgmt.go b/weaver/samples/fabric/simpleasset/assetmgmt.go index 91acfb78fb..2e9175b598 100644 --- a/weaver/samples/fabric/simpleasset/assetmgmt.go +++ b/weaver/samples/fabric/simpleasset/assetmgmt.go @@ -10,7 +10,7 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" ) diff --git a/weaver/samples/fabric/simpleasset/assetmgmt_test.go b/weaver/samples/fabric/simpleasset/assetmgmt_test.go index c9b70a4aa6..1ad63738c1 100644 --- a/weaver/samples/fabric/simpleasset/assetmgmt_test.go +++ b/weaver/samples/fabric/simpleasset/assetmgmt_test.go @@ -18,9 +18,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/stretchr/testify/require" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleasset" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleasset" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) // function that supplies value that is to be returned by ctx.GetStub().GetCreator() in locker/recipient context diff --git a/weaver/samples/fabric/simpleasset/bondasset.go b/weaver/samples/fabric/simpleasset/bondasset.go index ddbcb3a94a..dc861886e2 100644 --- a/weaver/samples/fabric/simpleasset/bondasset.go +++ b/weaver/samples/fabric/simpleasset/bondasset.go @@ -13,7 +13,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/samples/fabric/simpleasset/bondasset_test.go b/weaver/samples/fabric/simpleasset/bondasset_test.go index 01181de3ef..5951b81fa3 100644 --- a/weaver/samples/fabric/simpleasset/bondasset_test.go +++ b/weaver/samples/fabric/simpleasset/bondasset_test.go @@ -13,10 +13,10 @@ import ( "time" "github.com/hyperledger/fabric-protos-go/ledger/queryresult" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleasset" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleasset" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" - wtestmocks "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtestmocks "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" ) const ( diff --git a/weaver/samples/fabric/simpleasset/go.mod b/weaver/samples/fabric/simpleasset/go.mod index d6184fc11e..c97cc49845 100644 --- a/weaver/samples/fabric/simpleasset/go.mod +++ b/weaver/samples/fabric/simpleasset/go.mod @@ -1,12 +1,12 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/simpleasset +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleasset go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/samples/fabric/simpleasset/go.sum b/weaver/samples/fabric/simpleasset/go.sum index 89a6658871..0efbac1c8c 100644 --- a/weaver/samples/fabric/simpleasset/go.sum +++ b/weaver/samples/fabric/simpleasset/go.sum @@ -34,12 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3 h1:oJ/m/4UCIgICZJ7whmcMR+6arogpXvCIevdP1BmnSzM= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3/go.mod h1:w/CPnYlSSYi9eFKhmAuuIHvDk8iRQMKI0F1sAAZLUmk= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -148,23 +142,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4 h1:C7cLYvDbu8JmpZ6EMSgzNNvrKQiScB03T/gDVkhiQSo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4/go.mod h1:/onOl3s/TN0nYrhM2tTutM8UAOGWWVliNNmKGkslCWY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5 h1:qBxFJJAl75eFkLlw7W4H42F/DuJhAyxZ8JT2iwClOEo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5/go.mod h1:5pNw+pQqqUi9E+9zUV2c07aiGg9htEJYIOUtHQbqvjo= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6 h1:hKrdqULPXfbiGKFN+5y7M6JRf4nNWJwtDt5qNKeBZzI= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6/go.mod h1:yCYkdcI9SPrPu4NiIB3dzutGuM/PBBhwaKHalpYPSao= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 h1:oBDxB6X0w/DaC6MUdAwJ0h/mVZpXMAlNIB6sqBvqioo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0 h1:fTakpQnEHxn5xCWEEymBvW7F80mrzs86SMfVk9Bfqjo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= diff --git a/weaver/samples/fabric/simpleasset/main.go b/weaver/samples/fabric/simpleasset/main.go index f760269259..0adb139e8f 100644 --- a/weaver/samples/fabric/simpleasset/main.go +++ b/weaver/samples/fabric/simpleasset/main.go @@ -12,7 +12,7 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - am "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" + am "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" ) // SmartContract provides functions for managing an BondAsset and TokenAsset diff --git a/weaver/samples/fabric/simpleasset/tokenasset_test.go b/weaver/samples/fabric/simpleasset/tokenasset_test.go index 47a3944a37..8e1a7b4f30 100644 --- a/weaver/samples/fabric/simpleasset/tokenasset_test.go +++ b/weaver/samples/fabric/simpleasset/tokenasset_test.go @@ -15,9 +15,9 @@ import ( "github.com/golang/protobuf/proto" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleasset" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleasset" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) func TestInitTokenAssetLedger(t *testing.T) { diff --git a/weaver/samples/fabric/simpleassetandinterop/Makefile b/weaver/samples/fabric/simpleassetandinterop/Makefile index 25690c8bf3..347b035ab7 100644 --- a/weaver/samples/fabric/simpleassetandinterop/Makefile +++ b/weaver/samples/fabric/simpleassetandinterop/Makefile @@ -1,14 +1,14 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2=../../../core/network/fabric-interop-cc/libs/assetexchange/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2=../../../core/network/fabric-interop-cc/libs/assetexchange/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/simpleassetandinterop/assetmgmt.go b/weaver/samples/fabric/simpleassetandinterop/assetmgmt.go index 1c380acc02..78722aea24 100644 --- a/weaver/samples/fabric/simpleassetandinterop/assetmgmt.go +++ b/weaver/samples/fabric/simpleassetandinterop/assetmgmt.go @@ -11,8 +11,8 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" ) diff --git a/weaver/samples/fabric/simpleassetandinterop/assetmgmt_test.go b/weaver/samples/fabric/simpleassetandinterop/assetmgmt_test.go index 7bcea8e0f2..e96752f0fc 100644 --- a/weaver/samples/fabric/simpleassetandinterop/assetmgmt_test.go +++ b/weaver/samples/fabric/simpleassetandinterop/assetmgmt_test.go @@ -15,12 +15,12 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassetandinterop" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassetandinterop" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) // function that supplies value that is to be returned by ctx.GetStub().GetCreator() in locker/recipient context diff --git a/weaver/samples/fabric/simpleassetandinterop/baseclass.go b/weaver/samples/fabric/simpleassetandinterop/baseclass.go index 7f3f5da64b..efad60b146 100644 --- a/weaver/samples/fabric/simpleassetandinterop/baseclass.go +++ b/weaver/samples/fabric/simpleassetandinterop/baseclass.go @@ -11,7 +11,7 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" ) diff --git a/weaver/samples/fabric/simpleassetandinterop/bondasset.go b/weaver/samples/fabric/simpleassetandinterop/bondasset.go index fce763d322..1b85cd8542 100644 --- a/weaver/samples/fabric/simpleassetandinterop/bondasset.go +++ b/weaver/samples/fabric/simpleassetandinterop/bondasset.go @@ -13,7 +13,7 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/samples/fabric/simpleassetandinterop/bondasset_test.go b/weaver/samples/fabric/simpleassetandinterop/bondasset_test.go index 68513939bf..ddd4be715d 100644 --- a/weaver/samples/fabric/simpleassetandinterop/bondasset_test.go +++ b/weaver/samples/fabric/simpleassetandinterop/bondasset_test.go @@ -13,10 +13,10 @@ import ( "time" "github.com/hyperledger/fabric-protos-go/ledger/queryresult" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassetandinterop" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassetandinterop" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" - wtestmocks "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtestmocks "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" ) const ( diff --git a/weaver/samples/fabric/simpleassetandinterop/go.mod b/weaver/samples/fabric/simpleassetandinterop/go.mod index ef4bb33291..6b4b5ab176 100644 --- a/weaver/samples/fabric/simpleassetandinterop/go.mod +++ b/weaver/samples/fabric/simpleassetandinterop/go.mod @@ -1,12 +1,12 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/simpleassetandinterop +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassetandinterop go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/samples/fabric/simpleassetandinterop/go.sum b/weaver/samples/fabric/simpleassetandinterop/go.sum index c351ea6766..0efbac1c8c 100644 --- a/weaver/samples/fabric/simpleassetandinterop/go.sum +++ b/weaver/samples/fabric/simpleassetandinterop/go.sum @@ -34,12 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.3 h1:lTZbT2BWQDeY4UAIcGQz/Isi/lgy/0RvSZFbXR2xzHE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.3/go.mod h1:ZCp3u+f2tLYEPpfXPF+X0g+UJyaDDoSNts+tEBn5s58= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -148,23 +142,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.4 h1:BsEIRS78AS4rrN/AR6npd5EVF3dK2HNsJd6xkA45nSE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.4/go.mod h1:HTWsvBnBib1o5uScrR18S5O9lKRlxof7WJq3DDxnNxg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.5 h1:CTxmv7vO8hVqJrdjdyAtG9U+erpA1mP0I0vll9TPSB8= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.5/go.mod h1:YA5Ly/bWlv571u5WOKNS2h/ZkGh3y9kPkA/VcWSYRu8= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.6 h1:qMPY3I8x0GGVrngbhE8Xyh59wcTFYt7BZcu/uWlkPeA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.6/go.mod h1:SdnHl6IurM6pO1LAtsNaHuD95F2Itsoo8LFMGefh/gM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7 h1:lFmFOJgd1M/gm4tSB9S1k7H5X620/wnn0UT+Id0ejk4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0-rc.7/go.mod h1:47hBkpf71KbrfA/YxUPJ82crC1q/ji1h5uaN25/U0Ns= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0 h1:E3rGeMoW4koNYkiovcRF4L1FNSODbURkB8ElnroRPv4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/assetexchange/v2 v2.0.0/go.mod h1:47hBkpf71KbrfA/YxUPJ82crC1q/ji1h5uaN25/U0Ns= diff --git a/weaver/samples/fabric/simpleassetandinterop/tokenasset_test.go b/weaver/samples/fabric/simpleassetandinterop/tokenasset_test.go index 794ecabf8e..9296afdb94 100644 --- a/weaver/samples/fabric/simpleassetandinterop/tokenasset_test.go +++ b/weaver/samples/fabric/simpleassetandinterop/tokenasset_test.go @@ -14,10 +14,10 @@ import ( "testing" "github.com/golang/protobuf/proto" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassetandinterop" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassetandinterop" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) func TestInitTokenAssetLedger(t *testing.T) { diff --git a/weaver/samples/fabric/simpleassettransfer/Makefile b/weaver/samples/fabric/simpleassettransfer/Makefile index e916e1ff0e..2a01bae00d 100644 --- a/weaver/samples/fabric/simpleassettransfer/Makefile +++ b/weaver/samples/fabric/simpleassettransfer/Makefile @@ -1,16 +1,16 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2=../../../core/network/fabric-interop-cc/interfaces/asset-mgmt/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/simpleassettransfer/assetmgmt.go b/weaver/samples/fabric/simpleassettransfer/assetmgmt.go index 26fa14c7b5..e6f6561b71 100644 --- a/weaver/samples/fabric/simpleassettransfer/assetmgmt.go +++ b/weaver/samples/fabric/simpleassettransfer/assetmgmt.go @@ -10,10 +10,10 @@ import ( "encoding/json" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-contract-api-go/contractapi" log "github.com/sirupsen/logrus" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) // asset specific checks (ideally an asset in a different application might implement checks specific to that asset) diff --git a/weaver/samples/fabric/simpleassettransfer/assetmgmt_test.go b/weaver/samples/fabric/simpleassettransfer/assetmgmt_test.go index 4b42b32d95..d5a8b4826a 100644 --- a/weaver/samples/fabric/simpleassettransfer/assetmgmt_test.go +++ b/weaver/samples/fabric/simpleassettransfer/assetmgmt_test.go @@ -18,9 +18,9 @@ import ( "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/stretchr/testify/require" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassettransfer" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassettransfer" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) // function that supplies value that is to be returned by ctx.GetStub().GetCreator() in locker/recipient context diff --git a/weaver/samples/fabric/simpleassettransfer/bondasset.go b/weaver/samples/fabric/simpleassettransfer/bondasset.go index 847874af51..114cd56a02 100644 --- a/weaver/samples/fabric/simpleassettransfer/bondasset.go +++ b/weaver/samples/fabric/simpleassettransfer/bondasset.go @@ -13,8 +13,8 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/samples/fabric/simpleassettransfer/bondasset_test.go b/weaver/samples/fabric/simpleassettransfer/bondasset_test.go index 2a9a100bee..714f2213b9 100644 --- a/weaver/samples/fabric/simpleassettransfer/bondasset_test.go +++ b/weaver/samples/fabric/simpleassettransfer/bondasset_test.go @@ -16,13 +16,13 @@ import ( "encoding/hex" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" "github.com/hyperledger/fabric-protos-go/ledger/queryresult" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassettransfer" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassettransfer" "github.com/stretchr/testify/require" "github.com/hyperledger/fabric-chaincode-go/shim" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" - wtestmocks "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtestmocks "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils/mocks" ) const ( diff --git a/weaver/samples/fabric/simpleassettransfer/go.mod b/weaver/samples/fabric/simpleassettransfer/go.mod index 29c45e46b4..acce10b211 100644 --- a/weaver/samples/fabric/simpleassettransfer/go.mod +++ b/weaver/samples/fabric/simpleassettransfer/go.mod @@ -1,13 +1,13 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/simpleassettransfer +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassettransfer go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/samples/fabric/simpleassettransfer/go.sum b/weaver/samples/fabric/simpleassettransfer/go.sum index b3bcc8630c..0efbac1c8c 100644 --- a/weaver/samples/fabric/simpleassettransfer/go.sum +++ b/weaver/samples/fabric/simpleassettransfer/go.sum @@ -34,14 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3 h1:oJ/m/4UCIgICZJ7whmcMR+6arogpXvCIevdP1BmnSzM= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.3/go.mod h1:w/CPnYlSSYi9eFKhmAuuIHvDk8iRQMKI0F1sAAZLUmk= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3 h1:p/kmKz9o3mmbsV3d8zSmqIpt3xVEAsMBP4ByITNWJUE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3/go.mod h1:l8UQvJ9GuTQbxF1CJ5ywasGcJGTr3QM7VLteX7HVxLc= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -150,33 +142,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4 h1:C7cLYvDbu8JmpZ6EMSgzNNvrKQiScB03T/gDVkhiQSo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.4/go.mod h1:/onOl3s/TN0nYrhM2tTutM8UAOGWWVliNNmKGkslCWY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4 h1:/N9daeftDUg9Rr4EKM8xTrOBcjwbsTnu5CNL7HoLeQA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4/go.mod h1:kaYR0r/FsLI2puio2/nKuTyl31umJq1OeTYrCUIMOAA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5 h1:qBxFJJAl75eFkLlw7W4H42F/DuJhAyxZ8JT2iwClOEo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.5/go.mod h1:5pNw+pQqqUi9E+9zUV2c07aiGg9htEJYIOUtHQbqvjo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5 h1:n+3yOsjQzu/LhvPUxbdmgGdRSmgjPbZdlsViF5Hu05U= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5/go.mod h1:0yg9YTPXeSIXJd0IWOHwZmWkA0c2aQBQlGrsDbw94kk= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6 h1:hKrdqULPXfbiGKFN+5y7M6JRf4nNWJwtDt5qNKeBZzI= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.6/go.mod h1:yCYkdcI9SPrPu4NiIB3dzutGuM/PBBhwaKHalpYPSao= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6 h1:6jf+iu+DIQ8xCYcPDOCTxzz1UNgVFOr0amnwndZK2i4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6/go.mod h1:COOxAwxTkW/Ow1MjIOBbjf6V9mxN1+u0hT+kQPDxlL4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7 h1:oBDxB6X0w/DaC6MUdAwJ0h/mVZpXMAlNIB6sqBvqioo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0-rc.7/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 h1:O0cnG/KHCpPQVtrPICKV3FUh3suvok0p+heEP8EOzFw= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0 h1:fTakpQnEHxn5xCWEEymBvW7F80mrzs86SMfVk9Bfqjo= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2 v2.0.0/go.mod h1:09ODXr51AEw618p4mkVxc8575nPvpADtjvZbhocJ+X0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0 h1:79yUNNg1moRSP7wr6nC4/smI+/neziluDsDh+wrLhls= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= diff --git a/weaver/samples/fabric/simpleassettransfer/helper.go b/weaver/samples/fabric/simpleassettransfer/helper.go index 7494c12c04..ed91032e2e 100644 --- a/weaver/samples/fabric/simpleassettransfer/helper.go +++ b/weaver/samples/fabric/simpleassettransfer/helper.go @@ -18,7 +18,7 @@ import ( log "github.com/sirupsen/logrus" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) // functions to log and return errors diff --git a/weaver/samples/fabric/simpleassettransfer/main.go b/weaver/samples/fabric/simpleassettransfer/main.go index b358b2057f..68f3532d1d 100644 --- a/weaver/samples/fabric/simpleassettransfer/main.go +++ b/weaver/samples/fabric/simpleassettransfer/main.go @@ -12,7 +12,7 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - am "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" + am "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/interfaces/asset-mgmt/v2" ) // SmartContract provides functions for managing an BondAsset and TokenAsset diff --git a/weaver/samples/fabric/simpleassettransfer/tokenasset.go b/weaver/samples/fabric/simpleassettransfer/tokenasset.go index 0dc62d0dde..075ea156d4 100644 --- a/weaver/samples/fabric/simpleassettransfer/tokenasset.go +++ b/weaver/samples/fabric/simpleassettransfer/tokenasset.go @@ -11,7 +11,7 @@ import ( "fmt" "strconv" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" "github.com/hyperledger/fabric-contract-api-go/contractapi" ) diff --git a/weaver/samples/fabric/simpleassettransfer/tokenasset_test.go b/weaver/samples/fabric/simpleassettransfer/tokenasset_test.go index c2778ea201..0821bc100e 100644 --- a/weaver/samples/fabric/simpleassettransfer/tokenasset_test.go +++ b/weaver/samples/fabric/simpleassettransfer/tokenasset_test.go @@ -15,12 +15,12 @@ import ( "time" "github.com/golang/protobuf/proto" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" - sa "github.com/hyperledger/cacti/weaver/samples/fabric/simpleassettransfer" + sa "github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simpleassettransfer" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" - // wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + // wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) const ( diff --git a/weaver/samples/fabric/simplestate/Makefile b/weaver/samples/fabric/simplestate/Makefile index 693310de1b..447f055233 100644 --- a/weaver/samples/fabric/simplestate/Makefile +++ b/weaver/samples/fabric/simplestate/Makefile @@ -1,10 +1,10 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/simplestate/go.mod b/weaver/samples/fabric/simplestate/go.mod index 719201e43a..596f1bc0c0 100644 --- a/weaver/samples/fabric/simplestate/go.mod +++ b/weaver/samples/fabric/simplestate/go.mod @@ -1,9 +1,9 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/simplestate +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simplestate go 1.20 require ( - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/stretchr/testify v1.8.2 diff --git a/weaver/samples/fabric/simplestate/go.sum b/weaver/samples/fabric/simplestate/go.sum index d7238a7822..eaf305783f 100644 --- a/weaver/samples/fabric/simplestate/go.sum +++ b/weaver/samples/fabric/simplestate/go.sum @@ -36,8 +36,6 @@ github.com/golang/protobuf v1.5.3/go.mod h1:XVQd3VNwM+JqD3oG2Ue2ip4fOMUkwXdXDdiu github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.9 h1:O2Tfq5qg4qc4AmwVlvv0oLiVAGB7enBSJ2x2DqQFi38= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= diff --git a/weaver/samples/fabric/simplestate/simplestate_test.go b/weaver/samples/fabric/simplestate/simplestate_test.go index dd4bdec712..5bb0804f71 100644 --- a/weaver/samples/fabric/simplestate/simplestate_test.go +++ b/weaver/samples/fabric/simplestate/simplestate_test.go @@ -11,7 +11,7 @@ import ( "fmt" "github.com/stretchr/testify/require" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) func TestCreate(t *testing.T) { diff --git a/weaver/samples/fabric/simplestatewithacl/Makefile b/weaver/samples/fabric/simplestatewithacl/Makefile index 8aeab620a2..719a4e0337 100644 --- a/weaver/samples/fabric/simplestatewithacl/Makefile +++ b/weaver/samples/fabric/simplestatewithacl/Makefile @@ -1,14 +1,14 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ - go mod edit -replace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2=../../../core/network/fabric-interop-cc/libs/utils/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils=../../../core/network/fabric-interop-cc/libs/testutils/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 build-local: run-vendor build undo-vendor diff --git a/weaver/samples/fabric/simplestatewithacl/go.mod b/weaver/samples/fabric/simplestatewithacl/go.mod index 14abbb66a5..980e904129 100644 --- a/weaver/samples/fabric/simplestatewithacl/go.mod +++ b/weaver/samples/fabric/simplestatewithacl/go.mod @@ -1,11 +1,11 @@ -module github.com/hyperledger/cacti/weaver/samples/fabric/simplestatewithacl +module github.com/hyperledger-cacti/cacti/weaver/samples/fabric/simplestatewithacl go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 - github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 + github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a github.com/hyperledger/fabric-contract-api-go v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 @@ -21,7 +21,7 @@ require ( github.com/gobuffalo/envy v1.10.1 // indirect github.com/gobuffalo/packd v1.0.1 // indirect github.com/gobuffalo/packr v1.30.1 // indirect - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 // indirect + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 // indirect github.com/joho/godotenv v1.4.0 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/weaver/samples/fabric/simplestatewithacl/go.sum b/weaver/samples/fabric/simplestatewithacl/go.sum index 7edb041ffd..bde329d9a2 100644 --- a/weaver/samples/fabric/simplestatewithacl/go.sum +++ b/weaver/samples/fabric/simplestatewithacl/go.sum @@ -34,12 +34,6 @@ github.com/golang/protobuf v1.5.4 h1:i7eJL8qZTpSEXOPTxNKhASYpMn+8e5Q6AdndVa1dWek github.com/golang/protobuf v1.5.4/go.mod h1:lnTiLA8Wa4RWRcIUkrtSVa5nRhsEGBg48fD6rSs7xps= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4 h1:LMRbf40KwxvL/e7miffH4OsTlcbbcFkzUlo/Zie3UU0= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils v0.0.0-20230907062207-cd6eb2f89fb4/go.mod h1:PixaZlZfngbJ9MJp2mSkRgEOKSu30CvgnyW/etG/bBA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3 h1:p/kmKz9o3mmbsV3d8zSmqIpt3xVEAsMBP4ByITNWJUE= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.3/go.mod h1:l8UQvJ9GuTQbxF1CJ5ywasGcJGTr3QM7VLteX7HVxLc= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a h1:HwSCxEeiBthwcazcAykGATQ36oG9M+HEQvGLvB7aLvA= github.com/hyperledger/fabric-chaincode-go v0.0.0-20230228194215-b84622ba6a7a/go.mod h1:TDSu9gxURldEnaGSFbH1eMlfSQBWQcMQfnDBcpQv5lU= github.com/hyperledger/fabric-contract-api-go v1.2.1 h1:Ww9cKH/qHl5s6WqF+Ts5ju5eaBxC/awB/BJE+rOsEkM= @@ -146,23 +140,3 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4 h1:/N9daeftDUg9Rr4EKM8xTrOBcjwbsTnu5CNL7HoLeQA= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.4/go.mod h1:kaYR0r/FsLI2puio2/nKuTyl31umJq1OeTYrCUIMOAA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5 h1:n+3yOsjQzu/LhvPUxbdmgGdRSmgjPbZdlsViF5Hu05U= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.5/go.mod h1:0yg9YTPXeSIXJd0IWOHwZmWkA0c2aQBQlGrsDbw94kk= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6 h1:6jf+iu+DIQ8xCYcPDOCTxzz1UNgVFOr0amnwndZK2i4= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.6/go.mod h1:COOxAwxTkW/Ow1MjIOBbjf6V9mxN1+u0hT+kQPDxlL4= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7 h1:O0cnG/KHCpPQVtrPICKV3FUh3suvok0p+heEP8EOzFw= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0-rc.7/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0 h1:79yUNNg1moRSP7wr6nC4/smI+/neziluDsDh+wrLhls= -github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2 v2.0.0/go.mod h1:u84QGn03fQ2Xtr0wCJSU4TyVJ3tUK6QPcSkRdKv4FlA= diff --git a/weaver/samples/fabric/simplestatewithacl/simplestate.go b/weaver/samples/fabric/simplestatewithacl/simplestate.go index d13caa9391..e4f4987c23 100755 --- a/weaver/samples/fabric/simplestatewithacl/simplestate.go +++ b/weaver/samples/fabric/simplestatewithacl/simplestate.go @@ -12,7 +12,7 @@ import ( "github.com/hyperledger/fabric-chaincode-go/shim" "github.com/hyperledger/fabric-contract-api-go/contractapi" - wutils "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" + wutils "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/utils/v2" ) // SmartContract provides functions for managing arbitrary key-value pairs diff --git a/weaver/samples/fabric/simplestatewithacl/simplestate_test.go b/weaver/samples/fabric/simplestatewithacl/simplestate_test.go index a828f2cf12..2f9e1ae096 100644 --- a/weaver/samples/fabric/simplestatewithacl/simplestate_test.go +++ b/weaver/samples/fabric/simplestatewithacl/simplestate_test.go @@ -14,7 +14,7 @@ import ( "github.com/golang/protobuf/proto" "github.com/stretchr/testify/require" mspProtobuf "github.com/hyperledger/fabric-protos-go/msp" - wtest "github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" + wtest "github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/libs/testutils" ) // function that supplies value that is to be returned by ctx.GetStub().GetCreator() diff --git a/weaver/sdks/besu/node/package-local.json b/weaver/sdks/besu/node/package-local.json index 502f3b1556..437993865d 100644 --- a/weaver/sdks/besu/node/package-local.json +++ b/weaver/sdks/besu/node/package-local.json @@ -4,7 +4,7 @@ "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/sdks/besu/node/package.json b/weaver/sdks/besu/node/package.json index 27d5619ced..742fca2049 100644 --- a/weaver/sdks/besu/node/package.json +++ b/weaver/sdks/besu/node/package.json @@ -4,7 +4,7 @@ "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "", diff --git a/weaver/sdks/corda/README.md b/weaver/sdks/corda/README.md index 39fd630473..17afa97b85 100644 --- a/weaver/sdks/corda/README.md +++ b/weaver/sdks/corda/README.md @@ -56,7 +56,7 @@ To use the SDK, add following in your `build.gradle`: ``` repositories { maven { - url https://maven.pkg.github.com/hyperledger/cacti + url https://maven.pkg.github.com/hyperledger-cacti/cacti credentials { username password diff --git a/weaver/sdks/corda/github.properties.template b/weaver/sdks/corda/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/sdks/corda/github.properties.template +++ b/weaver/sdks/corda/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/sdks/fabric/go-sdk/Makefile b/weaver/sdks/fabric/go-sdk/Makefile index 1c949f3b46..bc9b289690 100644 --- a/weaver/sdks/fabric/go-sdk/Makefile +++ b/weaver/sdks/fabric/go-sdk/Makefile @@ -1,10 +1,10 @@ run-vendor: - go mod edit -replace github.com/hyperledger/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ + go mod edit -replace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2=../../../common/protos-go/ go mod vendor undo-vendor: rm -rf vendor - go mod edit -dropreplace github.com/hyperledger/cacti/weaver/common/protos-go/v2 + go mod edit -dropreplace github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 build-local: run-vendor build undo-vendor diff --git a/weaver/sdks/fabric/go-sdk/asset-manager/assetManager.go b/weaver/sdks/fabric/go-sdk/asset-manager/assetManager.go index 0c79e87cfb..fa35cc05bd 100644 --- a/weaver/sdks/fabric/go-sdk/asset-manager/assetManager.go +++ b/weaver/sdks/fabric/go-sdk/asset-manager/assetManager.go @@ -13,7 +13,7 @@ import ( "fmt" "time" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" log "github.com/sirupsen/logrus" "github.com/golang/protobuf/proto" diff --git a/weaver/sdks/fabric/go-sdk/asset-manager/assetManager_test.go b/weaver/sdks/fabric/go-sdk/asset-manager/assetManager_test.go index 399c455161..190c4b6ad4 100644 --- a/weaver/sdks/fabric/go-sdk/asset-manager/assetManager_test.go +++ b/weaver/sdks/fabric/go-sdk/asset-manager/assetManager_test.go @@ -12,7 +12,7 @@ import ( "time" "github.com/stretchr/testify/require" - assetmanager "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" + assetmanager "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/asset-manager" ) var submitTransactionMock func() ([]byte, error) diff --git a/weaver/sdks/fabric/go-sdk/go.mod b/weaver/sdks/fabric/go-sdk/go.mod index 1eb9589f59..beeb39365d 100644 --- a/weaver/sdks/fabric/go-sdk/go.mod +++ b/weaver/sdks/fabric/go-sdk/go.mod @@ -1,11 +1,11 @@ -module github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2 +module github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2 go 1.20 require ( github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 - github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 + github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 github.com/hyperledger/fabric-admin-sdk v0.0.0 github.com/hyperledger/fabric-gateway v1.2.1 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/weaver/sdks/fabric/go-sdk/go.sum b/weaver/sdks/fabric/go-sdk/go.sum index 245e3a7bdb..44c29dc7df 100644 --- a/weaver/sdks/fabric/go-sdk/go.sum +++ b/weaver/sdks/fabric/go-sdk/go.sum @@ -10,8 +10,6 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= github.com/google/pprof v0.0.0-20230207041349-798e818bf904 h1:4/hN5RUoecvl+RmJRE2YxKWtnnQls6rQjjW5oV7qg2U= github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0= github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3 h1:niQG/pUADBRo+o8Aa0C0fQxSnmT+icn6sMQVLPVWSQw= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.3/go.mod h1:AquykDDxS22prHjCilBzAQeioQ/BWTlla+FavMapGCY= github.com/hyperledger/fabric-admin-sdk v0.0.0 h1:SS/qekuUUOzvx1+1UzJCEcHD/UcCDpTxqrCjOVoy1Rg= github.com/hyperledger/fabric-admin-sdk v0.0.0/go.mod h1:AGAr/kVPWagaEh+bJeieTiajC4pbfcYXVySENqwk2Sc= github.com/hyperledger/fabric-gateway v1.2.1 h1:K6b7Q+y0x47SQ2TVnLih2mFNQ7/izmdAhnFgiylfSVQ= @@ -55,13 +53,3 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4 h1:0QNWfNWDL4eNb3gmYtnL4TPE9wkY3xR3apvE4KCUBqI= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.4/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5 h1:YMnqV3a5VuOKMiTF7PPBKWU4WBOBvctnVDiOI5Yx7wQ= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.5/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6 h1:PBLqa7tvhYNlWSQ6aI4cnmAXx/T2p2C+UA1huNLiMEY= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.6/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7 h1:89FQMNKL73wI0gaW7+fsHG4aVR1ghS3Gy6fHlGZO1Hg= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0-rc.7/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0 h1:0nLABzjWq+f8R0viPCOuxnZocK95OKruPIBXxKY/VVA= -github.com/hyperledger/cacti/weaver/common/protos-go/v2 v2.0.0/go.mod h1:UtCqRb0t+R1fC+SgqmLvj04bHx3o6O6ZDwaHHNl+k0s= diff --git a/weaver/sdks/fabric/go-sdk/helpers/helpers_test.go b/weaver/sdks/fabric/go-sdk/helpers/helpers_test.go index 42c1c0362b..04e84fe7e5 100644 --- a/weaver/sdks/fabric/go-sdk/helpers/helpers_test.go +++ b/weaver/sdks/fabric/go-sdk/helpers/helpers_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/require" - helpers "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/helpers" + helpers "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/helpers" ) func TestParseAddress(t *testing.T) { diff --git a/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper.go b/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper.go index a33addcd0e..a89ce89958 100644 --- a/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper.go +++ b/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper.go @@ -17,12 +17,12 @@ import ( "github.com/google/uuid" "github.com/golang/protobuf/proto" "github.com/hyperledger/fabric-protos-go/peer" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/corda" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/fabric" - "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/helpers" - "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/relay" - "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/types" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/corda" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/fabric" + "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/helpers" + "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/relay" + "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/types" log "github.com/sirupsen/logrus" protoV2 "google.golang.org/protobuf/proto" ) diff --git a/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper_test.go b/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper_test.go index 30be3b2585..6976d6340b 100644 --- a/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper_test.go +++ b/weaver/sdks/fabric/go-sdk/interoperablehelper/interoperable-helper_test.go @@ -11,7 +11,7 @@ import ( "testing" "github.com/stretchr/testify/require" - interoperablehelper "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/interoperablehelper" + interoperablehelper "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/interoperablehelper" ) func TestValidPatternString(t *testing.T) { diff --git a/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager.go b/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager.go index 09c1522063..a209930b4c 100644 --- a/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager.go +++ b/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager.go @@ -32,7 +32,7 @@ import ( "github.com/hyperledger/fabric-gateway/pkg/client" cidentity "github.com/hyperledger/fabric-gateway/pkg/identity" - cactiprotos "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" + cactiprotos "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" ) diff --git a/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager_test.go b/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager_test.go index 71c7f385a5..c348fad298 100644 --- a/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager_test.go +++ b/weaver/sdks/fabric/go-sdk/membershipmanager/membership_manager_test.go @@ -12,7 +12,7 @@ import ( "testing" "github.com/stretchr/testify/require" - mmsdk "github.com/hyperledger/cacti/weaver/sdks/fabric/go-sdk/v2/membershipmanager" + mmsdk "github.com/hyperledger-cacti/cacti/weaver/sdks/fabric/go-sdk/v2/membershipmanager" ) diff --git a/weaver/sdks/fabric/go-sdk/relay/relay.go b/weaver/sdks/fabric/go-sdk/relay/relay.go index 91654157bc..a0b077a4c1 100644 --- a/weaver/sdks/fabric/go-sdk/relay/relay.go +++ b/weaver/sdks/fabric/go-sdk/relay/relay.go @@ -12,8 +12,8 @@ import ( "fmt" "time" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/common" - "github.com/hyperledger/cacti/weaver/common/protos-go/v2/networks" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/common" + "github.com/hyperledger-cacti/cacti/weaver/common/protos-go/v2/networks" log "github.com/sirupsen/logrus" "google.golang.org/grpc" ) diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json index c285d4bcc8..67193e2fda 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json @@ -9,7 +9,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "V. Ramakrishna", diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json index 10eceba31e..066dc25465 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package.json @@ -9,7 +9,7 @@ ], "repository": { "type": "git", - "url": "https://github.com/hyperledger/cacti.git" + "url": "https://github.com/hyperledger-cacti/cacti.git" }, "license": "Apache-2.0", "author": "V. Ramakrishna", diff --git a/weaver/tests/network-setups/besu/package.json b/weaver/tests/network-setups/besu/package.json index f98840914e..b140eba78d 100644 --- a/weaver/tests/network-setups/besu/package.json +++ b/weaver/tests/network-setups/besu/package.json @@ -8,14 +8,14 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/hyperledger/cacti.git" + "url": "git+https://github.com/hyperledger-cacti/cacti.git" }, "author": "", "license": "Apache-2.0", "bugs": { "url": "https://github.com/hyperledger-cacti/cacti/issues" }, - "homepage": "https://github.com/hyperledger/cacti#readme", + "homepage": "https://github.com/hyperledger-cacti/cacti#readme", "dependencies": { "web3": "1.10.0" } diff --git a/weaver/tests/network-setups/corda/github.properties.template b/weaver/tests/network-setups/corda/github.properties.template index c84ce06186..3dd4ddf258 100644 --- a/weaver/tests/network-setups/corda/github.properties.template +++ b/weaver/tests/network-setups/corda/github.properties.template @@ -1,3 +1,3 @@ username= password= -url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger-cacti/cacti \ No newline at end of file diff --git a/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh b/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh index fb49c0d339..6e0744688e 100755 --- a/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh +++ b/weaver/tests/network-setups/fabric/dev/scripts/setupCC.sh @@ -10,7 +10,7 @@ CHAINCODE_PATH=$PWD/../shared/chaincode rm -rf $CHAINCODE_PATH/interop # interop cc module -INTEROPCC_MOD=github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/${CACTI_VERSION%%"."*} +INTEROPCC_MOD=github.com/hyperledger-cacti/cacti/weaver/core/network/fabric-interop-cc/contracts/interop/${CACTI_VERSION%%"."*} # custom gopath for convenient downloading mkdir $TMP_PATH