From b56fdf2e21010f5f28c95cab631e016e37297e7f Mon Sep 17 00:00:00 2001 From: Sandeep Nishad Date: Tue, 11 Apr 2023 11:07:03 +0530 Subject: [PATCH] refactor(weaver): prefix cacti to all weaver packages, set publish target to cacti - Update relay, drivers, iin-agent image registry to hyperledger/cacti - Update npm packages (protos-js and sdks) registry to cacti - Update maven packages registry to cacti - Rename sdks/besu/interoperation-node-sdk to sdks/besu/node - Rename modules with following convention `-`: - For SDKs: `sdk.corda`, `sdk-fabric`, `sdk-besu` - For drivers: `driver-corda`, `driver-fabric` - For imodule: `imodule.corda` - Change all packages version to v2.0.0-alpha-prerelease Signed-off-by: Sandeep Nishad --- .dcilintignore | 2 +- .../test_weaver-asset-exchange-besu.yaml | 2 +- .../workflows/test_weaver-data-sharing.yaml | 28 +-- weaver/.github/workflows/deploy_node-pkgs.yml | 10 +- weaver/common/protos-go/VERSION | 2 +- weaver/common/protos-java-kt/README.md | 4 +- .../protos-java-kt/github.properties.template | 2 +- .../common/protos-java-kt/gradle.properties | 4 +- weaver/common/protos-js/.npmrc.template | 2 +- weaver/common/protos-js/Makefile | 2 +- weaver/common/protos-js/README.md | 2 +- weaver/common/protos-js/package.json | 6 +- weaver/common/protos-rs/pkg/Cargo.toml | 6 +- .../drivers/corda-driver/.env.docker.template | 4 +- .../drivers/corda-driver/Dockerfile.local | 8 +- .../drivers/corda-driver/Dockerfile.remote | 6 +- weaver/core/drivers/corda-driver/README.md | 47 +--- weaver/core/drivers/corda-driver/VERSION | 2 +- weaver/core/drivers/corda-driver/build.gradle | 13 +- .../drivers/corda-driver/docker-compose.yaml | 8 +- .../docker-testnet-envs/.env.corda | 2 +- .../docker-testnet-envs/.env.corda.tls | 10 +- .../docker-testnet-envs/.env.corda2 | 2 +- .../docker-testnet-envs/.env.corda2.tls | 10 +- .../corda-driver/github.properties.template | 2 +- .../drivers/corda-driver/gradle.properties | 8 +- weaver/core/drivers/corda-driver/makefile | 6 +- .../drivers/corda-driver/settings.gradle.kts | 2 +- .../src/main/kotlin/CordaDriver.kt | 8 +- .../src/main/kotlin/CordaNodeRPCConnection.kt | 2 +- .../kotlin/CustomSerializationWhitelist.kt | 2 +- .../src/main/kotlin/GrpcClient.kt | 2 +- .../src/main/kotlin/GrpcServer.kt | 2 +- ....core.serialization.SerializationWhitelist | 2 +- .../fabric-driver/.env.docker.template | 4 +- weaver/core/drivers/fabric-driver/.gitignore | 2 +- .../drivers/fabric-driver/.npmrc.template | 2 +- weaver/core/drivers/fabric-driver/VERSION | 2 +- .../drivers/fabric-driver/docker-compose.yml | 16 +- .../fabric-driver/docker-testnet-envs/.env.n1 | 2 +- .../docker-testnet-envs/.env.n1.tls | 8 +- .../fabric-driver/docker-testnet-envs/.env.n2 | 2 +- .../docker-testnet-envs/.env.n2.tls | 8 +- .../fabric-driver/fabricDriver.dockerfile | 22 +- .../fabricDriver.dockerfile.local | 26 +-- weaver/core/drivers/fabric-driver/makefile | 20 +- .../drivers/fabric-driver/package-local.json | 8 +- .../core/drivers/fabric-driver/package.json | 8 +- weaver/core/drivers/fabric-driver/readme.md | 4 +- .../drivers/fabric-driver/server/events.ts | 14 +- .../fabric-driver/server/fabric-code.ts | 10 +- .../drivers/fabric-driver/server/listener.ts | 4 +- .../drivers/fabric-driver/server/server.ts | 18 +- .../drivers/fabric-driver/server/tests.ts | 4 +- .../drivers/fabric-driver/server/utils.ts | 4 +- .../fabric-driver/server/walletSetup.ts | 2 +- .../core/drivers/fabric-driver/tsconfig.json | 2 +- .../iin-agent/.env.docker.template | 4 +- .../identity-management/iin-agent/.gitignore | 2 +- .../iin-agent/.npmrc.template | 2 +- .../identity-management/iin-agent/VERSION | 2 +- .../docker-testnet/envs/.env.n1.org1 | 2 +- .../docker-testnet/envs/.env.n1.org1.tls | 2 +- .../docker-testnet/envs/.env.n1.org2 | 2 +- .../docker-testnet/envs/.env.n1.org2.tls | 2 +- .../docker-testnet/envs/.env.n2.org1 | 2 +- .../docker-testnet/envs/.env.n2.org1.tls | 2 +- .../docker-testnet/envs/.env.n2.org2 | 2 +- .../docker-testnet/envs/.env.n2.org2.tls | 2 +- .../iin-agent/iinagent.local.Dockerfile | 4 +- .../identity-management/iin-agent/makefile | 22 +- .../iin-agent/package-local.json | 6 +- .../iin-agent/package.json | 6 +- .../iin-agent/src/common/ledgerBase.ts | 2 +- .../iin-agent/src/common/utils.ts | 8 +- .../iin-agent/src/fabric-ledger/connector.ts | 4 +- .../src/fabric-ledger/networkUtils.ts | 4 +- .../src/protocols/externalOperations.ts | 2 +- .../src/protocols/localOperations.ts | 2 +- .../iin-agent/src/server.ts | 6 +- .../iin-agent/test/membershipTest.js | 2 +- .../iin-agent/test/utilsTest.js | 4 +- .../core/network/corda-interop-app/README.md | 6 +- .../network/corda-interop-app/build.gradle | 2 +- .../corda-interop-app/constants.properties | 3 +- .../github.properties.template | 2 +- .../corda-interop-app/gradle.properties | 4 +- .../interop-contracts/build.gradle | 2 +- .../AccessControlPolicyStateContract.kt | 6 +- .../AssetExchangeHTLCStateContract.kt | 16 +- .../corda}/contracts/AssetTransferContract.kt | 10 +- .../corda}/contracts/ExternalStateContract.kt | 6 +- .../contracts/MembershipStateContract.kt | 6 +- .../contracts/NetworkIdStateContract.kt | 6 +- .../VerificationPolicyStateContract.kt | 6 +- .../corda}/states/AccessControlPolicyState.kt | 4 +- .../corda}/states/AssetClaimStatusState.kt | 4 +- .../corda}/states/AssetExchangeHTLCState.kt | 6 +- .../corda}/states/AssetPledgeState.kt | 4 +- .../corda}/states/ExternalState.kt | 4 +- .../corda}/states/HashExtensions.kt | 2 +- .../corda}/states/MembershipState.kt | 4 +- .../corda}/states/NetworkIdState.kt | 4 +- .../corda}/states/VerificationPolicyState.kt | 4 +- .../app/interop/contracts/ContractTests.kt | 2 +- .../interop-workflows/build.gradle | 2 +- .../cacti/cordaInteropApp/DriverBasedTest.kt | 2 +- .../corda}/flows/AccessControlFlows.kt | 8 +- .../corda}/flows/AssetExchangeHTLCFlows.kt | 14 +- .../flows/AssetExchangeHTLCWrapperFlows.kt | 10 +- .../corda}/flows/AssetTransferFlows.kt | 10 +- .../corda}/flows/AssetTransferWrapperFlows.kt | 12 +- .../corda}/flows/CertUtils.kt | 6 +- .../corda}/flows/CommonHelperFunctions.kt | 4 +- .../flows/CreateExternalRequestFlows.kt | 2 +- .../corda}/flows/HandleExternalRequest.kt | 2 +- .../corda}/flows/HelperTypes.kt | 2 +- .../corda}/flows/MembershipFlows.kt | 8 +- .../corda}/flows/NetworkIdFlows.kt | 6 +- .../corda}/flows/NodeSignatureFlows.kt | 2 +- .../corda}/flows/VerificationPolicyFlows.kt | 10 +- .../corda}/flows/ViewVerification.kt | 2 +- .../corda}/flows/WriteExternalStateFlows.kt | 6 +- .../AssetClaimHTLCSerializer.kt | 2 +- .../customSerializers/AssetClaimSerializer.kt | 2 +- .../AssetClaimStatusSerializer.kt | 2 +- .../AssetExchangeAgreementSerializer.kt | 2 +- .../AssetLockHTLCSerializer.kt | 2 +- .../customSerializers/AssetLockSerializer.kt | 2 +- .../AssetPledgeSerializer.kt | 2 +- .../CustomSerializationWhitelist.kt | 2 +- ...ungibleAssetExchangeAgreementSerializer.kt | 2 +- .../HashMechanismSerializer.kt | 2 +- .../LockMechanismSerializer.kt | 2 +- .../flows/customSerializers/MetaSerializer.kt | 2 +- .../customSerializers/ProtocolSerializer.kt | 2 +- .../customSerializers/QuerySerializer.kt | 2 +- .../customSerializers/TimeSpecSerializer.kt | 2 +- .../flows/customSerializers/ViewSerializer.kt | 2 +- ....core.serialization.SerializationWhitelist | 2 +- .../corda}/AccessControlPolicyTests.kt | 12 +- .../corda}/AssetExchangeHTLCSHA256Tests.kt | 32 +-- .../corda}/AssetExchangeHTLCSHA512Tests.kt | 36 ++-- .../corda}/AssetExchangeHTLCWrapperTests.kt | 22 +- .../corda}/CertUtilsTests.kt | 10 +- .../corda}/CommonHelperFunctionTests.kt | 4 +- .../corda}/CreateExternalRequestTests.kt | 20 +- .../corda}/HandleExternalRequestTests.kt | 22 +- .../corda}/MembershipTests.kt | 16 +- .../interop => imodule/corda}/NodeDriver.kt | 2 +- .../corda}/NodeSignatureTests.kt | 4 +- .../corda}/VerificationPolicyTests.kt | 18 +- .../corda}/WriteExternalStateTest.kt | 10 +- .../corda}/WriteExternalStateTest2.kt | 10 +- .../core/network/corda-interop-app/makefile | 9 +- .../src/main/kotlin/TestAssetFlow.kt | 4 +- .../network/fabric-interop-cc/.env.template | 4 +- .../fabric-interop-cc/libs/utils/LICENSE | 201 ++++++++++++++++++ .../core/network/fabric-interop-cc/makefile | 4 +- weaver/core/relay/.env.template | 4 +- weaver/core/relay/.env.template.2 | 4 +- weaver/core/relay/Cargo.toml | 6 +- weaver/core/relay/Dockerfile.server | 4 +- weaver/core/relay/Makefile | 4 +- weaver/core/relay/VERSION | 2 +- .../core/relay/docker/testnet-envs/.env.corda | 6 +- .../relay/docker/testnet-envs/.env.corda.tls | 6 +- .../relay/docker/testnet-envs/.env.corda2 | 6 +- .../relay/docker/testnet-envs/.env.corda2.tls | 6 +- weaver/core/relay/docker/testnet-envs/.env.n1 | 6 +- .../relay/docker/testnet-envs/.env.n1.tls | 6 +- weaver/core/relay/docker/testnet-envs/.env.n2 | 6 +- .../relay/docker/testnet-envs/.env.n2.tls | 6 +- weaver/samples/besu/besu-cli/.npmrc.template | 2 +- .../samples/besu/besu-cli/package-local.json | 4 +- weaver/samples/besu/besu-cli/package.json | 4 +- .../besu/besu-cli/src/commands/asset/claim.ts | 4 +- .../besu-cli/src/commands/asset/is-locked.ts | 2 +- .../besu/besu-cli/src/commands/asset/lock.ts | 4 +- .../besu-cli/src/commands/asset/unlock.ts | 2 +- .../besu/besu-cli/src/commands/hash-helper.ts | 2 +- weaver/samples/besu/simpleasset/package.json | 4 +- .../corda-simple-application/build.gradle | 3 +- .../clients/build.gradle | 8 +- .../client/AccessControlPolicyManager.kt | 2 +- .../client/AssetExchangeManager.kt | 4 +- .../client/AssetTransferManager.kt | 10 +- .../client/ConfigureNetwork.kt | 2 +- .../client/HouseTokenExchangeManager.kt | 4 +- .../client/HouseTokenTransferManager.kt | 10 +- .../client/InteropManager.kt | 2 +- .../client/MembershipManager.kt | 2 +- .../client/NetworkIdStateManager.kt | 6 +- .../client/UtilsManager.kt | 4 +- .../client/VerificationPolicyManager.kt | 2 +- .../constants.properties | 3 +- .../github.properties.template | 2 +- .../workflows-kotlin/build.gradle | 4 +- .../main/kotlin/com/example/flow/AssetFlow.kt | 8 +- .../kotlin/com/example/flow/BondAssetFlow.kt | 8 +- .../corda/fungible-house-token/build.gradle | 6 +- .../fungible-house-token/constants.properties | 2 +- .../AssetTransferHelperFlows.kt | 8 +- .../samples/fabric/fabric-cli/.npmrc.template | 2 +- .../fabric/fabric-cli/package-local.json | 4 +- weaver/samples/fabric/fabric-cli/package.json | 4 +- weaver/samples/fabric/fabric-cli/readme.md | 2 +- .../src/commands/asset/exchange-all.ts | 2 +- .../src/commands/asset/exchange/claim.ts | 2 +- .../src/commands/asset/exchange/is-locked.ts | 2 +- .../src/commands/asset/exchange/lock.ts | 2 +- .../src/commands/asset/exchange/unlock.ts | 2 +- .../src/commands/configure/membership.ts | 2 +- .../fabric-cli/src/commands/event/get-all.ts | 4 +- .../commands/event/get-subscription-status.ts | 4 +- .../fabric-cli/src/commands/event/receive.ts | 4 +- .../src/commands/event/subscribe.ts | 4 +- .../src/commands/event/unsubscribe.ts | 4 +- .../fabric-cli/src/commands/hash-helper.ts | 2 +- .../fabric-cli/src/commands/relay/get.ts | 2 +- .../fabric-cli/src/commands/relay/poll.ts | 2 +- .../fabric-cli/src/commands/relay/send.ts | 2 +- .../src/helpers/fabric-functions.ts | 6 +- .../fabric/fabric-cli/src/helpers/helpers.ts | 4 +- .../interop-setup/configure-network.ts | 2 +- .../interoperation-node-sdk/.npmrc.template | 2 - .../.gitignore | 0 .../.npmignore | 0 weaver/sdks/besu/node/.npmrc.template | 2 + .../README.md | 4 +- .../index.js | 0 .../makefile | 0 .../package-local.json | 6 +- .../package.json | 8 +- .../src/AssetManager.ts | 2 +- .../src/HashFunctions.ts | 2 +- .../tsconfig.json | 0 weaver/sdks/corda/README.md | 8 +- weaver/sdks/corda/build.gradle | 9 +- weaver/sdks/corda/github.properties.template | 2 +- weaver/sdks/corda/gradle.properties | 6 +- weaver/sdks/corda/settings.gradle | 2 +- .../corda}/AccessControlPolicyManager.kt | 8 +- .../{corda/sdk => sdk/corda}/AssetManager.kt | 6 +- .../sdk => sdk/corda}/AssetTransferSDK.kt | 12 +- .../sdk => sdk/corda}/CredentialsCreator.kt | 2 +- .../corda}/CredentialsExtractor.java | 2 +- .../{corda/sdk => sdk/corda}/HashFunctions.kt | 4 +- .../sdk => sdk/corda}/InteroperableHelper.kt | 8 +- .../sdk => sdk/corda}/MembershipManager.kt | 8 +- .../{corda/sdk => sdk/corda}/RelayClient.kt | 2 +- .../corda}/VerificationPolicyManager.kt | 10 +- weaver/sdks/fabric/go-sdk/VERSION | 2 +- .../interoperation-node-sdk/.npmrc.template | 2 +- .../fabric/interoperation-node-sdk/README.md | 4 +- .../package-local.json | 8 +- .../interoperation-node-sdk/package.json | 8 +- .../src/AssetManager.ts | 2 +- .../src/EventsManager.ts | 2 +- .../src/HashFunctions.ts | 2 +- .../src/InteroperableHelper.ts | 14 +- .../src/MembershipManager.ts | 8 +- .../interoperation-node-sdk/src/Relay.ts | 10 +- .../test/AssetManager.js | 2 +- .../test/InteroperableHelper.js | 2 +- .../interoperation-node-sdk/test/Relay.js | 8 +- .../interoperation-node-sdk/types/index.d.ts | 6 +- .../corda/github.properties.template | 2 +- .../corda/scripts/get-cordapps.sh | 27 ++- .../corda/scripts/start-nodes.sh | 9 +- 270 files changed, 930 insertions(+), 772 deletions(-) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/AccessControlPolicyStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/AssetExchangeHTLCStateContract.kt (91%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/AssetTransferContract.kt (94%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/ExternalStateContract.kt (89%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/MembershipStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/NetworkIdStateContract.kt (89%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/contracts/VerificationPolicyStateContract.kt (92%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/AccessControlPolicyState.kt (90%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/AssetClaimStatusState.kt (95%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/AssetExchangeHTLCState.kt (91%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/AssetPledgeState.kt (95%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/ExternalState.kt (86%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/HashExtensions.kt (82%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/MembershipState.kt (93%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/NetworkIdState.kt (87%) rename weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/states/VerificationPolicyState.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/AccessControlFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/AssetExchangeHTLCFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/AssetExchangeHTLCWrapperFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/AssetTransferFlows.kt (99%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/AssetTransferWrapperFlows.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/CertUtils.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/CommonHelperFunctions.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/CreateExternalRequestFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/HandleExternalRequest.kt (99%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/HelperTypes.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/MembershipFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/NetworkIdFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/NodeSignatureFlows.kt (98%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/VerificationPolicyFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/ViewVerification.kt (99%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/WriteExternalStateFlows.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetClaimHTLCSerializer.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetClaimSerializer.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetClaimStatusSerializer.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetExchangeAgreementSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetLockHTLCSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetLockSerializer.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/AssetPledgeSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/CustomSerializationWhitelist.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/HashMechanismSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/LockMechanismSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/MetaSerializer.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/ProtocolSerializer.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/QuerySerializer.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/TimeSpecSerializer.kt (95%) rename weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/flows/customSerializers/ViewSerializer.kt (93%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/AccessControlPolicyTests.kt (97%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/AssetExchangeHTLCSHA256Tests.kt (90%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/AssetExchangeHTLCSHA512Tests.kt (90%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/AssetExchangeHTLCWrapperTests.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/CertUtilsTests.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/CommonHelperFunctionTests.kt (99%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/CreateExternalRequestTests.kt (87%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/HandleExternalRequestTests.kt (93%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/MembershipTests.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/NodeDriver.kt (94%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/NodeSignatureTests.kt (92%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/VerificationPolicyTests.kt (91%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/WriteExternalStateTest.kt (96%) rename weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/{corda/app/interop => imodule/corda}/WriteExternalStateTest2.kt (96%) create mode 100644 weaver/core/network/fabric-interop-cc/libs/utils/LICENSE delete mode 100644 weaver/sdks/besu/interoperation-node-sdk/.npmrc.template rename weaver/sdks/besu/{interoperation-node-sdk => node}/.gitignore (100%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/.npmignore (100%) create mode 100644 weaver/sdks/besu/node/.npmrc.template rename weaver/sdks/besu/{interoperation-node-sdk => node}/README.md (94%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/index.js (100%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/makefile (100%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/package-local.json (89%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/package.json (84%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/src/AssetManager.ts (99%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/src/HashFunctions.ts (96%) rename weaver/sdks/besu/{interoperation-node-sdk => node}/tsconfig.json (100%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/AccessControlPolicyManager.kt (96%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/AssetManager.kt (98%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/AssetTransferSDK.kt (97%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/CredentialsCreator.kt (99%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/CredentialsExtractor.java (99%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/HashFunctions.kt (96%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/InteroperableHelper.kt (98%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/MembershipManager.kt (96%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/RelayClient.kt (98%) rename weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/{corda/sdk => sdk/corda}/VerificationPolicyManager.kt (96%) diff --git a/.dcilintignore b/.dcilintignore index 1b1b0accf1..d06a458b3d 100644 --- a/.dcilintignore +++ b/.dcilintignore @@ -22,7 +22,7 @@ examples/cactus-example-carbon-accounting-backend/src/main/json/generated/build- # Cannot be edited as its a name of a imported Corda library, and Corda syntax weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/CustomSerializationWhitelist.kt -weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt +weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/CustomSerializationWhitelist.kt # Corda test network files that are generated and therefore cannot be altered to comply with DCI-Lint weaver/tests/network-setups/corda/shared diff --git a/.github/workflows/test_weaver-asset-exchange-besu.yaml b/.github/workflows/test_weaver-asset-exchange-besu.yaml index 4db135afe2..4bebccd4f7 100644 --- a/.github/workflows/test_weaver-asset-exchange-besu.yaml +++ b/.github/workflows/test_weaver-asset-exchange-besu.yaml @@ -247,7 +247,7 @@ jobs: # BESU SDK - name: Setup BESU SDK run: make build-local - working-directory: weaver/sdks/besu/interoperation-node-sdk + working-directory: weaver/sdks/besu/node # BESU NETWORK - name: Start Besu Network diff --git a/.github/workflows/test_weaver-data-sharing.yaml b/.github/workflows/test_weaver-data-sharing.yaml index b64fb5d968..9daf1d0a1e 100644 --- a/.github/workflows/test_weaver-data-sharing.yaml +++ b/.github/workflows/test_weaver-data-sharing.yaml @@ -450,34 +450,34 @@ jobs: - name: Start Relay for network1 run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-relay-server#g" docker/testnet-envs/.env.n1 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-relay-server#g" docker/testnet-envs/.env.n1 make start-server COMPOSE_ARG='--env-file docker/testnet-envs/.env.n1' working-directory: weaver/core/relay - name: Start Relay for network2 run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-relay-server#g" docker/testnet-envs/.env.n2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-relay-server#g" docker/testnet-envs/.env.n2 make start-server COMPOSE_ARG='--env-file docker/testnet-envs/.env.n2' working-directory: weaver/core/relay - name: Start Relay for Corda_Network run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-relay-server#g" docker/testnet-envs/.env.corda + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-relay-server#g" docker/testnet-envs/.env.corda make start-server COMPOSE_ARG='--env-file docker/testnet-envs/.env.corda' working-directory: weaver/core/relay - name: Start Relay for Corda_Network2 run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-relay-server#g" docker/testnet-envs/.env.corda2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-relay-server#g" docker/testnet-envs/.env.corda2 make start-server COMPOSE_ARG='--env-file docker/testnet-envs/.env.corda2' working-directory: weaver/core/relay # FABRIC DRIVER - name: Setup Fabric Driver .env run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-fabric-driver#g" docker-testnet-envs/.env.n1 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-driver-fabric#g" docker-testnet-envs/.env.n1 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet-envs/.env.n1 - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-fabric-driver#g" docker-testnet-envs/.env.n2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-driver-fabric#g" docker-testnet-envs/.env.n2 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet-envs/.env.n2 working-directory: weaver/core/drivers/fabric-driver @@ -492,19 +492,19 @@ jobs: # IIN AGENT - name: Setup Fabric IIN Env run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-iin-agent#g" docker-testnet/envs/.env.n1.org1 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-iin-agent#g" docker-testnet/envs/.env.n1.org1 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet/envs/.env.n1.org1 sed -i "s#^AUTO_SYNC=true#AUTO_SYNC=false#g" docker-testnet/envs/.env.n1.org1 sed -i "s#^DNS_CONFIG_PATH=.*#DNS_CONFIG_PATH=./docker-testnet/configs/dnsconfig-2-nodes.json#g" docker-testnet/envs/.env.n1.org1 - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-iin-agent#g" docker-testnet/envs/.env.n1.org2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-iin-agent#g" docker-testnet/envs/.env.n1.org2 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet/envs/.env.n1.org2 sed -i "s#^AUTO_SYNC=true#AUTO_SYNC=false#g" docker-testnet/envs/.env.n1.org2 sed -i "s#^DNS_CONFIG_PATH=.*#DNS_CONFIG_PATH=./docker-testnet/configs/dnsconfig-2-nodes.json#g" docker-testnet/envs/.env.n1.org2 - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-iin-agent#g" docker-testnet/envs/.env.n2.org1 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-iin-agent#g" docker-testnet/envs/.env.n2.org1 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet/envs/.env.n2.org1 sed -i "s#^AUTO_SYNC=true#AUTO_SYNC=false#g" docker-testnet/envs/.env.n2.org1 sed -i "s#^DNS_CONFIG_PATH=.*#DNS_CONFIG_PATH=./docker-testnet/configs/dnsconfig-2-nodes.json#g" docker-testnet/envs/.env.n2.org1 - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-iin-agent#g" docker-testnet/envs/.env.n2.org2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-iin-agent#g" docker-testnet/envs/.env.n2.org2 sed -i "s##${GITHUB_WORKSPACE}/weaver#g" docker-testnet/envs/.env.n2.org2 sed -i "s#^AUTO_SYNC=true#AUTO_SYNC=false#g" docker-testnet/envs/.env.n2.org2 sed -i "s#^DNS_CONFIG_PATH=.*#DNS_CONFIG_PATH=./docker-testnet/configs/dnsconfig-2-nodes.json#g" docker-testnet/envs/.env.n2.org2 @@ -525,13 +525,13 @@ jobs: # CORDA DRIVER - name: Start Corda Driver run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-corda-driver#g" docker-testnet-envs/.env.corda + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-driver-corda#g" docker-testnet-envs/.env.corda make deploy COMPOSE_ARG='--env-file docker-testnet-envs/.env.corda' working-directory: weaver/core/drivers/corda-driver - name: Start Corda_Network2 Driver run: | - sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=weaver-corda-driver#g" docker-testnet-envs/.env.corda2 + sed -i "s#^DOCKER_IMAGE_NAME=.*#DOCKER_IMAGE_NAME=cacti-weaver-driver-corda#g" docker-testnet-envs/.env.corda2 make deploy COMPOSE_ARG='--env-file docker-testnet-envs/.env.corda2' working-directory: weaver/core/drivers/corda-driver @@ -899,11 +899,11 @@ jobs: # CORDA DRIVER - name: Start Corda_Network Driver - run: ./build/install/corda-driver/bin/corda-driver &> corda-driver.out & + run: ./build/install/driver-corda/bin/driver-corda &> corda-driver.out & working-directory: weaver/core/drivers/corda-driver - name: Start Corda_Network2 Driver - run: DRIVER_PORT=9098 ./build/install/corda-driver/bin/corda-driver &> corda2-driver.out & + run: DRIVER_PORT=9098 ./build/install/driver-corda/bin/driver-corda &> corda2-driver.out & working-directory: weaver/core/drivers/corda-driver # FABRIC CLI diff --git a/weaver/.github/workflows/deploy_node-pkgs.yml b/weaver/.github/workflows/deploy_node-pkgs.yml index 0df4842ccf..7d5227cfda 100644 --- a/weaver/.github/workflows/deploy_node-pkgs.yml +++ b/weaver/.github/workflows/deploy_node-pkgs.yml @@ -11,7 +11,7 @@ on: paths: - 'common/protos-js/package.json' - 'sdks/fabric/interoperation-node-sdk/package.json' - - 'sdks/besu/interoperation-node-sdk/package.json' + - 'sdks/besu/node/package.json' - 'core/drivers/fabric-driver/VERSION' - 'core/identity-management/iin-agent/VERSION' @@ -125,11 +125,11 @@ jobs: cp .npmrc.template .npmrc sed -i "s//${{ secrets.GITHUB_TOKEN }}/g" .npmrc cat .npmrc - working-directory: sdks/besu/interoperation-node-sdk + working-directory: weaver/sdks/besu/node - name: Build run: make build - working-directory: sdks/besu/interoperation-node-sdk + working-directory: weaver/sdks/besu/node - name: Check if package already exists run : | @@ -141,12 +141,12 @@ jobs: else echo "WEAVER_BESU_SDK_PUBLISH=true" >> $GITHUB_ENV fi - working-directory: sdks/besu/interoperation-node-sdk + working-directory: weaver/sdks/besu/node - name: Publish if: ${{ env.WEAVER_BESU_SDK_PUBLISH == 'true' }} run: make publish - working-directory: sdks/besu/interoperation-node-sdk + working-directory: weaver/sdks/besu/node publish-driver-image: if: ${{ always() && github.repository_owner == 'hyperledger-labs' }} diff --git a/weaver/common/protos-go/VERSION b/weaver/common/protos-go/VERSION index f01291b87f..3c8319c258 100644 --- a/weaver/common/protos-go/VERSION +++ b/weaver/common/protos-go/VERSION @@ -1 +1 @@ -1.5.7 +v2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/common/protos-java-kt/README.md b/weaver/common/protos-java-kt/README.md index cc7c37b8cd..9d465e2db8 100644 --- a/weaver/common/protos-java-kt/README.md +++ b/weaver/common/protos-java-kt/README.md @@ -23,7 +23,7 @@ after PR approval, publish it to `hyperledger/cacti`. To publish to your fork, replace `` with your github username in `github.properties`: ``` ... -url=https://maven.pkg.github.com//weaver-dlt-interoperability +url=https://maven.pkg.github.com//cacti ``` and then follow above 4 steps. @@ -38,6 +38,6 @@ and then follow above 4 steps. 5) Add this to your build.gradle (change the version accordingly): ``` dependencies { - compile(group: 'com.weaver', name: 'protos-java-kt', version: "1.2.1") + compile(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "1.2.1") } ``` diff --git a/weaver/common/protos-java-kt/github.properties.template b/weaver/common/protos-java-kt/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/common/protos-java-kt/gradle.properties b/weaver/common/protos-java-kt/gradle.properties index 45c725e513..c6bb828ab0 100644 --- a/weaver/common/protos-java-kt/gradle.properties +++ b/weaver/common/protos-java-kt/gradle.properties @@ -1,4 +1,4 @@ name=Interop Protos -group=com.weaver -version=1.5.7 +group=org.hyperledger.cacti.weaver.protos +version=2.0.0-alpha-prerelease kotlin.incremental=false diff --git a/weaver/common/protos-js/.npmrc.template b/weaver/common/protos-js/.npmrc.template index b3197a2f00..14ca0a1e2c 100644 --- a/weaver/common/protos-js/.npmrc.template +++ b/weaver/common/protos-js/.npmrc.template @@ -1,2 +1,2 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs +@hyperledger:registry=https://npm.pkg.github.com/hyperledger //npm.pkg.github.com/:_authToken= diff --git a/weaver/common/protos-js/Makefile b/weaver/common/protos-js/Makefile index d086fde110..b57fb22adb 100644 --- a/weaver/common/protos-js/Makefile +++ b/weaver/common/protos-js/Makefile @@ -5,7 +5,7 @@ build: npm run build .PHONY: publish -publish: +publish: build npm publish .PHONY: clean-build diff --git a/weaver/common/protos-js/README.md b/weaver/common/protos-js/README.md index d7ae610fdf..696a6ba21f 100644 --- a/weaver/common/protos-js/README.md +++ b/weaver/common/protos-js/README.md @@ -23,4 +23,4 @@ and then follow above 4 steps. 2) Create a copy of `.npmrc.template` as `.npmrc`. 3) Replace in copied `.npmrc` file with your personal access token. 4) Now put this `.npmrc` file in your application in same level as package.json. -5) Now you can run `npm install @hyperledger-labs/weaver-protos-js` in your application directory to install the latest version. +5) Now you can run `npm install @hyperledger/cacti-weaver-protos-js` in your application directory to install the latest version. diff --git a/weaver/common/protos-js/package.json b/weaver/common/protos-js/package.json index 0e07f8eb1f..46911d8ef8 100644 --- a/weaver/common/protos-js/package.json +++ b/weaver/common/protos-js/package.json @@ -1,6 +1,6 @@ { - "name": "@hyperledger-labs/weaver-protos-js", - "version": "1.5.7", + "name": "@hyperledger/cacti-weaver-protos-js", + "version": "2.0.0-alpha-prerelease", "description": "Interop protos for Node JS (Weaver)", "main": "index.js", "exports": { @@ -54,6 +54,6 @@ }, "homepage": "https://github.com/hyperledger/cacti/weaver#readme", "publishConfig": { - "registry": "https://npm.pkg.github.com/hyperledger-labs" + "registry": "https://npm.pkg.github.com/hyperledger" } } diff --git a/weaver/common/protos-rs/pkg/Cargo.toml b/weaver/common/protos-rs/pkg/Cargo.toml index e6db31fd95..4fc35caf2e 100644 --- a/weaver/common/protos-rs/pkg/Cargo.toml +++ b/weaver/common/protos-rs/pkg/Cargo.toml @@ -1,6 +1,6 @@ [package] -name = "weaver_protos_rs" -version = "1.5.4" +name = "cacti_weaver_protos_rs" +version = "2.0.0-alpha-prerelease" authors = ["Peter Somogyvari ", "Sandeep Nishad DRIVER_RPC_USERNAME=driverUser1 DRIVER_RPC_PASSWORD=test EXTERNAL_NETWORK= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver -DOCKER_TAG=1.2.9 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-corda +DOCKER_TAG=2.0.0-alpha-prerelease COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= RELAY_TLS= diff --git a/weaver/core/drivers/corda-driver/Dockerfile.local b/weaver/core/drivers/corda-driver/Dockerfile.local index 9fef3b2860..aefcd806b1 100644 --- a/weaver/core/drivers/corda-driver/Dockerfile.local +++ b/weaver/core/drivers/corda-driver/Dockerfile.local @@ -1,17 +1,17 @@ # Local build FROM gradle:4.10.3-jdk8 AS builder-local -WORKDIR /corda-driver -ADD build /corda-driver/build +WORKDIR /driver/corda +ADD build /driver/corda/build FROM builder-local as builder # Deployment Image FROM openjdk:8-jre -COPY --from=builder /corda-driver/build/install/corda-driver /corda-driver/ +COPY --from=builder /driver/corda/build/install/driver-corda /driver/corda/ -WORKDIR /corda-driver +WORKDIR /driver/corda ARG GIT_URL LABEL org.opencontainers.image.source ${GIT_URL} diff --git a/weaver/core/drivers/corda-driver/Dockerfile.remote b/weaver/core/drivers/corda-driver/Dockerfile.remote index 74d96733b6..7a968b23c1 100644 --- a/weaver/core/drivers/corda-driver/Dockerfile.remote +++ b/weaver/core/drivers/corda-driver/Dockerfile.remote @@ -4,7 +4,7 @@ FROM gradle:4.10.3-jdk8 AS builder-remote USER root RUN apt-get update && apt-get install -y maven -WORKDIR /corda-driver +WORKDIR /driver/corda ADD . . RUN ./gradlew clean installDist @@ -13,9 +13,9 @@ FROM builder-remote as builder # Deployment Image FROM openjdk:8-jre -COPY --from=builder /corda-driver/build/install/corda-driver /corda-driver/ +COPY --from=builder /driver/corda/build/install/driver-corda /driver/corda/ -WORKDIR /corda-driver +WORKDIR /driver/corda ARG GIT_URL LABEL org.opencontainers.image.source ${GIT_URL} diff --git a/weaver/core/drivers/corda-driver/README.md b/weaver/core/drivers/corda-driver/README.md index 37a9ead00e..0d5e8c3fd4 100644 --- a/weaver/core/drivers/corda-driver/README.md +++ b/weaver/core/drivers/corda-driver/README.md @@ -1,9 +1,9 @@ - -# corda-driver +# Corda Driver The Corda driver is used by the relays to interface with the Corda nodes. It triggers flows from the interoperation CorDapp to retrieve state given the query @@ -52,14 +52,14 @@ make build-refresh-dependencies[-local] To run the driver, use the following: ``` -./build/install/corda-driver/bin/corda-driver +./build/install/driver-corda/bin/driver-corda ``` The driver gRPC server will be listening on port `9099`. ### With TLS -If the relay expects a TLS connection over gRPC, you need to specify the following environment variables in the `corda-driver` command: +If the relay expects a TLS connection over gRPC, you need to specify the following environment variables in the `driver-corda` command: - `RELAY_TLS`: should be set to `true` - One of the following: * If the relay server TLS CA certificates are in a password-protected Java Key Store (JKS file): @@ -67,17 +67,17 @@ If the relay expects a TLS connection over gRPC, you need to specify the followi - `RELAY_TLSCA_TRUST_STORE_PASSWORD`: password used to create the JKS file * If the relay server TLS CA certificates are in separate PEM files in the filesystem: - `RELAY_TLSCA_CERT_PATHS`: colon-separated list of CA certificate file paths -If you wish to run the driver service with TLS enabled, you need to specify the following environment variables in the `corda-driver` command: +If you wish to run the driver service with TLS enabled, you need to specify the following environment variables in the `driver-corda` command: - `DRIVER_TLS`: should be set to `true` - `DRIVER_TLS_CERT_PATH`: driver's TLS certificate file path - `DRIVER_TLS_KEY_PATH`: driver's TLS private key file path - Example: both relay and driver are TLS-enabled, and a trust store is used as a certificate repository: ```bash - RELAY_TLS=true RELAY_TLSCA_TRUST_STORE_PASSWORD=password RELAY_TLSCA_TRUST_STORE=trust_store.jks DRIVER_TLS=true DRIVER_TLS_CERT_PATH=cert.pem DRIVER_TLS_KEY_PATH=key.pem ./build/install/corda-driver/bin/corda-driver + RELAY_TLS=true RELAY_TLSCA_TRUST_STORE_PASSWORD=password RELAY_TLSCA_TRUST_STORE=trust_store.jks DRIVER_TLS=true DRIVER_TLS_CERT_PATH=cert.pem DRIVER_TLS_KEY_PATH=key.pem ./build/install/driver-corda/bin/driver-corda ``` - Example: only relay is TLS-enabled, and the driver's trusted certificates are in separate files in the filesystem: ```bash - RELAY_TLS=true RELAY_TLSCA_CERT_PATHS=ca_cert1.pem:ca_cert2.pem ./build/install/corda-driver/bin/corda-driver + RELAY_TLS=true RELAY_TLSCA_CERT_PATHS=ca_cert1.pem:ca_cert2.pem ./build/install/driver-corda/bin/driver-corda ``` If the driver is deployed within a Docker container, set the same variables as above in the appropriate `.env` file. The following sample files in [./docker-testnet-envs/](./docker-testnet-envs) can be used and tweaked for Fabric drivers associated with particular testnets: @@ -114,13 +114,13 @@ To push image to github container registry: ### Docker-Compose Deployment * Copy `.env.docker.template` to `.env` - - `NETWORK_NAME`: Used as suffix to corda-driver container name, i.e. `corda-driver-` will be the name of the container. + - `NETWORK_NAME`: Used as suffix to driver-corda container name, i.e. `driver-corda-` will be the name of the container. - `DRIVER_PORT`: Driver server port. - `DRIVER_RPC_USERNAME`: RPC user registered for Driver. - `DRIVER_RPC_PASSWORD`: Password for the above RPC user. - `EXTERNAL_NETWORK`: Name of the docker network in which the Corda containers are deployed. - `DOCKER_IMAGE_NAME`: _Keep this unchanged_. - - `DOCKER_TAG`: Refer here for the image tags available: [weaver-corda-driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/pkgs/container/weaver-corda-driver) + - `DOCKER_TAG`: Refer here for the image tags available: [cacti-weaver-driver-corda](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-driver-corda) - `COMPOSE_PROJECT_NAME`: Docker project name for the Corda network to which this driver is supposed to attach. By default, the folder name of the Corda network's `docker-compose.yml`, is the project name. - `COMPOSE_PROJECT_NETWORK`: Docker project network name for the Corda network to which this driver is supposed to attach. By default, `default` is the project network name. - `RELAY_TLS`: Boolean flag indicating whether or not the local relay requires TLS connections @@ -144,37 +144,10 @@ generate the code docs, run the following: ./gradlew dokka ``` -The docs are then located in `build/dokka/corda-driver`. Opening +The docs are then located in `build/dokka/driver-corda`. Opening `index.html` in your browser will allow you to navigate through the project structure. -## Notes on the proto dependencies - -This repo relies on data structures defined in -[protos](../../../common/protos). It -also has a dependency on the [interop -CorDapp](../../../core/network/corda-interop-app), which -itself has a dependency on the same proto files. Generating the java and Kotlin -files from the proto files locally in this repository therefore creates some -problems. Firstly, because the generated java and kotlin files are created under -the namespace provided in the proto files (e.g. `common.state`), this creates -two sets of the same source files in the classpath under the same namespace. -Compiling the project then fails with conflicting dependencies. The other -problem is that if the proto files do change, they need to be updated in two -separate repositories. - -A workaround (or arguably, a cleaner solution) is for the corda-testnet project -to use the generated java and kotlin source files that comes from the interop -CorDapp. This means that there is guaranteed to be one consistent version of the -files and we don't need to worry about conflicting dependencies. When the proto -files are updated, they need to be updated in a single repo, instead of across -multiple. - -To update the version number of the interop CorDapps that should be pulled from -Github Maven Repository, change the version number of the `interop_cordapps_version` at the -top of the `build.gradle` file. - ## TODO 1. Create an Error class -2. Make a script for pulling the latest interop cordapp (add to make) diff --git a/weaver/core/drivers/corda-driver/VERSION b/weaver/core/drivers/corda-driver/VERSION index d79a5f8c99..eca2b7d195 100644 --- a/weaver/core/drivers/corda-driver/VERSION +++ b/weaver/core/drivers/corda-driver/VERSION @@ -1 +1 @@ -1.2.14 \ No newline at end of file +2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/core/drivers/corda-driver/build.gradle b/weaver/core/drivers/corda-driver/build.gradle index 353c174b07..5422fc4a5f 100644 --- a/weaver/core/drivers/corda-driver/build.gradle +++ b/weaver/core/drivers/corda-driver/build.gradle @@ -10,8 +10,7 @@ buildscript { ext.corda_version = "4.8" ext.corda_core_version = "4.8" ext.arrow_version = "0.10.4" - ext.weaver_protos_version = "1.5.7" - ext.weaver_corda_version = "1.2.14" + ext.cacti_version = "2.0.0-alpha-prerelease" repositories { mavenCentral() @@ -92,10 +91,10 @@ dependencies { implementation "net.corda:corda:$corda_version" implementation "net.corda:corda-rpc:$corda_version" - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.sdk.corda', name: 'weaver-sdk-corda', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version") // gRPC and protobuf dependencies implementation "io.grpc:grpc-kotlin-stub:$grpc_kotlin_version" @@ -123,7 +122,7 @@ dokka { } -mainClassName = "org.hyperledger.cacti.weaver.corda.driver.CordaDriverKt" +mainClassName = "org.hyperledger.cacti.weaver.driver.corda.CordaDriverKt" tasks.test { useJUnitPlatform() diff --git a/weaver/core/drivers/corda-driver/docker-compose.yaml b/weaver/core/drivers/corda-driver/docker-compose.yaml index 9f478f9dd7..0210b5e08a 100644 --- a/weaver/core/drivers/corda-driver/docker-compose.yaml +++ b/weaver/core/drivers/corda-driver/docker-compose.yaml @@ -6,9 +6,9 @@ version: '2' services: - corda-driver: + driver-corda: image: ${DOCKER_IMAGE_NAME}:${DOCKER_TAG} - container_name: corda-driver-${NETWORK_NAME} + container_name: driver-corda-${NETWORK_NAME} environment: - DRIVER_PORT=${DRIVER_PORT} - DRIVER_RPC_USERNAME=${DRIVER_RPC_USERNAME} @@ -23,8 +23,8 @@ services: ports: - "${DRIVER_PORT}:${DRIVER_PORT}" volumes: - - ${TLS_CREDENTIALS_DIR}:/corda-driver/credentials - command: sh -c "./bin/corda-driver" + - ${TLS_CREDENTIALS_DIR}:/corda/driver/credentials + command: sh -c "./bin/driver-corda" networks: default: diff --git a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda index 3cd1484dde..881bd0e730 100644 --- a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda +++ b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda @@ -2,7 +2,7 @@ NETWORK_NAME=Corda_Network DRIVER_PORT=9099 DRIVER_RPC_USERNAME=driverUser1 DRIVER_RPC_PASSWORD=test -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-corda DOCKER_TAG=latest EXTERNAL_NETWORK=corda_default COMPOSE_PROJECT_NAME=corda diff --git a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls index f8a2e3ded9..de44c0c4e1 100644 --- a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls +++ b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda.tls @@ -2,16 +2,16 @@ NETWORK_NAME=Corda_Network DRIVER_PORT=9099 DRIVER_RPC_USERNAME=driverUser1 DRIVER_RPC_PASSWORD=test -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-corda DOCKER_TAG=latest EXTERNAL_NETWORK=corda_default COMPOSE_PROJECT_NAME=corda COMPOSE_PROJECT_NETWORK=default RELAY_TLS=true -RELAY_TLSCA_TRUST_STORE=/corda-driver/credentials/docker/relay_drivers_trust_store.jks +RELAY_TLSCA_TRUST_STORE=/driver/corda/credentials/docker/relay_drivers_trust_store.jks RELAY_TLSCA_TRUST_STORE_PASSWORD=trelay -RELAY_TLSCA_CERT_PATHS=/corda-driver/credentials/docker/ca-cert.pem +RELAY_TLSCA_CERT_PATHS=/driver/corda/credentials/docker/ca-cert.pem DRIVER_TLS=true -DRIVER_TLS_CERT_PATH=/corda-driver/credentials/docker/corda-driver-cert.pem -DRIVER_TLS_KEY_PATH=/corda-driver/credentials/docker/corda-driver-key.pem +DRIVER_TLS_CERT_PATH=/driver/corda/credentials/docker/corda-driver-cert.pem +DRIVER_TLS_KEY_PATH=/driver/corda/credentials/docker/corda-driver-key.pem TLS_CREDENTIALS_DIR=../../relay/credentials diff --git a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2 b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2 index f0de19c499..de62eafe2c 100644 --- a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2 +++ b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2 @@ -2,7 +2,7 @@ NETWORK_NAME=Corda_Network2 DRIVER_PORT=9098 DRIVER_RPC_USERNAME=driverUser1 DRIVER_RPC_PASSWORD=test -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-corda DOCKER_TAG=latest EXTERNAL_NETWORK=corda_network2_default COMPOSE_PROJECT_NAME=corda_network2 diff --git a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls index dc308c909d..745602dcfa 100644 --- a/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls +++ b/weaver/core/drivers/corda-driver/docker-testnet-envs/.env.corda2.tls @@ -2,16 +2,16 @@ NETWORK_NAME=Corda_Network2 DRIVER_PORT=9098 DRIVER_RPC_USERNAME=driverUser1 DRIVER_RPC_PASSWORD=test -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-corda DOCKER_TAG=latest EXTERNAL_NETWORK=corda_network2_default COMPOSE_PROJECT_NAME=corda_network2 COMPOSE_PROJECT_NETWORK=default RELAY_TLS=true -RELAY_TLSCA_TRUST_STORE=/corda-driver/credentials/docker/relay_drivers_trust_store.jks +RELAY_TLSCA_TRUST_STORE=/driver/corda/credentials/docker/relay_drivers_trust_store.jks RELAY_TLSCA_TRUST_STORE_PASSWORD=trelay -RELAY_TLSCA_CERT_PATHS=/corda-driver/credentials/docker/ca-cert.pem +RELAY_TLSCA_CERT_PATHS=/driver/corda/credentials/docker/ca-cert.pem DRIVER_TLS=true -DRIVER_TLS_CERT_PATH=/corda-driver/credentials/docker/corda2-driver-cert.pem -DRIVER_TLS_KEY_PATH=/corda-driver/credentials/docker/corda2-driver-key.pem +DRIVER_TLS_CERT_PATH=/driver/corda/credentials/docker/corda2-driver-cert.pem +DRIVER_TLS_KEY_PATH=/driver/corda/credentials/docker/corda2-driver-key.pem TLS_CREDENTIALS_DIR=../../relay/credentials diff --git a/weaver/core/drivers/corda-driver/github.properties.template b/weaver/core/drivers/corda-driver/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/core/drivers/corda-driver/gradle.properties b/weaver/core/drivers/corda-driver/gradle.properties index ad1cb07f62..9d64e415b6 100644 --- a/weaver/core/drivers/corda-driver/gradle.properties +++ b/weaver/core/drivers/corda-driver/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -name=corda-driver -group=org.hyperledger.cacti.weaver.corda.driver -version=1.2.14 -kotlin.incremental=false +name=driver-corda +group=org.hyperledger.cacti.weaver.driver.corda +version=2.0.0-alpha-prerelease +kotlin.incremental=false \ No newline at end of file diff --git a/weaver/core/drivers/corda-driver/makefile b/weaver/core/drivers/corda-driver/makefile index 5f155c05ed..cc595174a1 100644 --- a/weaver/core/drivers/corda-driver/makefile +++ b/weaver/core/drivers/corda-driver/makefile @@ -1,6 +1,6 @@ -DOCKER_IMAGE_NAME ?= weaver-corda-driver +DOCKER_IMAGE_NAME ?= cacti-weaver-driver-corda DOCKER_TAG ?= `cat ./VERSION` -DOCKER_REGISTRY ?= ghcr.io/hyperledger-labs +DOCKER_REGISTRY ?= ghcr.io/hyperledger GIT_URL = https://github.com/hyperledger/cacti/weaver/core/drivers/corda-driver COMPOSE_ARG ?= @@ -48,7 +48,7 @@ push-image-latest: .PHONY: run run: - ./build/install/corda-driver/bin/corda-driver + ./build/install/driver-corda/bin/driver-corda .PHONY: deploy deploy: diff --git a/weaver/core/drivers/corda-driver/settings.gradle.kts b/weaver/core/drivers/corda-driver/settings.gradle.kts index 03c552c5c3..ad2a3ad45c 100644 --- a/weaver/core/drivers/corda-driver/settings.gradle.kts +++ b/weaver/core/drivers/corda-driver/settings.gradle.kts @@ -1,2 +1,2 @@ -rootProject.name = "corda-driver" +rootProject.name = "driver-corda" diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt index 8aea9d27f9..eaaa2b3f8f 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaDriver.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.driver +package org.hyperledger.cacti.weaver.driver.corda import arrow.core.* import arrow.core.extensions.either.applicative.applicative @@ -16,8 +16,8 @@ import com.google.protobuf.ByteString import net.corda.core.messaging.CordaRPCOps import java.util.* -import org.hyperledger.cacti.weaver.corda.app.interop.flows.HandleExternalRequest -import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.imodule.corda.flows.HandleExternalRequest +import org.hyperledger.cacti.weaver.sdk.corda.InteroperableHelper import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import org.hyperledger.cacti.weaver.protos.common.state.State import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass @@ -182,8 +182,6 @@ fun createCordaNodeConnection(rpcAddress: RpcAddress) = try { * useHandleExternalRequest function uses the interoperation CorDapp flow HandleExternalRequest to process the * external network query and returns a View. * - * This function is currently breaking the corda-driver code because of conflicting dependencies with the proto libraries. - * * @property proxy The Corda RPC connection proxy. * @property query The Query supplied by the requesting network. * @return Returns an Either with an Error if the flow failed, or the View. diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt index fa67e9e25d..cf987841a7 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CordaNodeRPCConnection.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.driver +package org.hyperledger.cacti.weaver.driver.corda import net.corda.client.rpc.CordaRPCClient import net.corda.core.utilities.NetworkHostAndPort diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt index 9656a71d32..54a4c32f10 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/CustomSerializationWhitelist.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.driver +package org.hyperledger.cacti.weaver.driver.corda import arrow.core.Either import net.corda.core.serialization.SerializationWhitelist diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt index 48a6f2cea0..e1208163fa 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcClient.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.driver +package org.hyperledger.cacti.weaver.driver.corda import io.grpc.ManagedChannel import io.grpc.Status diff --git a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt index 8470cd0cf2..c8de89c9a9 100644 --- a/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt +++ b/weaver/core/drivers/corda-driver/src/main/kotlin/GrpcServer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.driver +package org.hyperledger.cacti.weaver.driver.corda import java.io.File import io.grpc.Server diff --git a/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist b/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist index 9d7ab3798f..df9b20bc82 100644 --- a/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist +++ b/weaver/core/drivers/corda-driver/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist @@ -1 +1 @@ -org.hyperledger.cacti.weaver.corda.driver.CustomSerializationWhitelist \ No newline at end of file +org.hyperledger.cacti.weaver.driver.corda.CustomSerializationWhitelist \ No newline at end of file diff --git a/weaver/core/drivers/fabric-driver/.env.docker.template b/weaver/core/drivers/fabric-driver/.env.docker.template index 89421845f4..4161bd7d8b 100644 --- a/weaver/core/drivers/fabric-driver/.env.docker.template +++ b/weaver/core/drivers/fabric-driver/.env.docker.template @@ -16,8 +16,8 @@ LEVELDB_LOCKED_MAX_RETRIES= LEVELDB_LOCKED_RETRY_BACKOFF_MSEC= ENABLE_MONITOR= MONITOR_SYNC_PERIOD= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver -DOCKER_TAG=1.4.0 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-fabric +DOCKER_TAG=2.0.0-alpha-prerelease EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/weaver/core/drivers/fabric-driver/.gitignore b/weaver/core/drivers/fabric-driver/.gitignore index 2d0ec87542..397a379c7b 100644 --- a/weaver/core/drivers/fabric-driver/.gitignore +++ b/weaver/core/drivers/fabric-driver/.gitignore @@ -7,7 +7,7 @@ package-lock.json .npmrc driverdbs -weaver-fabric-interop-sdk +cacti-weaver-sdk-fabric wallet-network1/*.id !wallet-network1/relay.id wallet-network2/*.id diff --git a/weaver/core/drivers/fabric-driver/.npmrc.template b/weaver/core/drivers/fabric-driver/.npmrc.template index b3197a2f00..14ca0a1e2c 100644 --- a/weaver/core/drivers/fabric-driver/.npmrc.template +++ b/weaver/core/drivers/fabric-driver/.npmrc.template @@ -1,2 +1,2 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs +@hyperledger:registry=https://npm.pkg.github.com/hyperledger //npm.pkg.github.com/:_authToken= diff --git a/weaver/core/drivers/fabric-driver/VERSION b/weaver/core/drivers/fabric-driver/VERSION index 2b26b8d213..eca2b7d195 100644 --- a/weaver/core/drivers/fabric-driver/VERSION +++ b/weaver/core/drivers/fabric-driver/VERSION @@ -1 +1 @@ -1.5.9 +2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/core/drivers/fabric-driver/docker-compose.yml b/weaver/core/drivers/fabric-driver/docker-compose.yml index e2a64f9f27..4b3c7aab48 100644 --- a/weaver/core/drivers/fabric-driver/docker-compose.yml +++ b/weaver/core/drivers/fabric-driver/docker-compose.yml @@ -6,15 +6,15 @@ version: '2' services: - fabric-driver: + driver-fabric: image: ${DOCKER_IMAGE_NAME}:${DOCKER_TAG} - container_name: fabric-driver-${NETWORK_NAME} + container_name: driver-fabric-${NETWORK_NAME} environment: - NETWORK_NAME=${NETWORK_NAME} - RELAY_ENDPOINT=${RELAY_ENDPOINT} - DRIVER_ENDPOINT=0.0.0.0:${DRIVER_PORT} - - CONNECTION_PROFILE=/fabric-driver/ccp.json - - DRIVER_CONFIG=/fabric-driver/config.json + - CONNECTION_PROFILE=/driver/fabric/ccp.json + - DRIVER_CONFIG=/driver/fabric/config.json - INTEROP_CHAINCODE=${INTEROP_CHAINCODE} - local=false - RELAY_TLS=${RELAY_TLS} @@ -29,10 +29,10 @@ services: - ENABLE_MONITOR=${ENABLE_MONITOR} - MONITOR_SYNC_PERIOD=${MONITOR_SYNC_PERIOD} volumes: - - ${CONNECTION_PROFILE}:/fabric-driver/ccp.json - - ${DRIVER_CONFIG}:/fabric-driver/config.json - - ./wallet-${NETWORK_NAME}:/fabric-driver/wallet-${NETWORK_NAME} - - ${TLS_CREDENTIALS_DIR}:/fabric-driver/credentials + - ${CONNECTION_PROFILE}:/driver/fabric/ccp.json + - ${DRIVER_CONFIG}:/driver/fabric/config.json + - ./wallet-${NETWORK_NAME}:/driver/fabric/wallet-${NETWORK_NAME} + - ${TLS_CREDENTIALS_DIR}:/driver/fabric/credentials ports: - "${DRIVER_PORT}:${DRIVER_PORT}" command: sh -c "npm run start" diff --git a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1 b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1 index d6d5e19bd8..e597cdf4fa 100644 --- a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1 +++ b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1 @@ -4,7 +4,7 @@ RELAY_ENDPOINT=relay-network1:9080 NETWORK_NAME=network1 DRIVER_PORT=9090 INTEROP_CHAINCODE=interop -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-fabric DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1 diff --git a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1.tls b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1.tls index d16d9d975b..a73db0b54c 100644 --- a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1.tls +++ b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n1.tls @@ -4,14 +4,14 @@ RELAY_ENDPOINT=relay-network1:9080 NETWORK_NAME=network1 DRIVER_PORT=9090 INTEROP_CHAINCODE=interop -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-fabric DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1 COMPOSE_PROJECT_NETWORK=net RELAY_TLS=true -RELAY_TLSCA_CERT_PATH=/fabric-driver/credentials/docker/ca-cert.pem +RELAY_TLSCA_CERT_PATH=/driver/fabric/credentials/docker/ca-cert.pem DRIVER_TLS=true -DRIVER_TLS_CERT_PATH=/fabric-driver/credentials/docker/fabric-driver-network1-cert.pem -DRIVER_TLS_KEY_PATH=/fabric-driver/credentials/docker/fabric-driver-network1-key.pem +DRIVER_TLS_CERT_PATH=/driver/fabric/credentials/docker/fabric-driver-network1-cert.pem +DRIVER_TLS_KEY_PATH=/driver/fabric/credentials/docker/fabric-driver-network1-key.pem TLS_CREDENTIALS_DIR=../../relay/credentials diff --git a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2 b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2 index b895f9e00b..4b131e6b68 100644 --- a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2 +++ b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2 @@ -4,7 +4,7 @@ RELAY_ENDPOINT=relay-network2:9083 NETWORK_NAME=network2 DRIVER_PORT=9095 INTEROP_CHAINCODE=interop -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-fabric DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2 diff --git a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2.tls b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2.tls index 576f87838e..8ca8c719f7 100644 --- a/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2.tls +++ b/weaver/core/drivers/fabric-driver/docker-testnet-envs/.env.n2.tls @@ -4,14 +4,14 @@ RELAY_ENDPOINT=relay-network2:9083 NETWORK_NAME=network2 DRIVER_PORT=9095 INTEROP_CHAINCODE=interop -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-driver-fabric DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2 COMPOSE_PROJECT_NETWORK=net RELAY_TLS=true -RELAY_TLSCA_CERT_PATH=/fabric-driver/credentials/docker/ca-cert.pem +RELAY_TLSCA_CERT_PATH=/driver/fabric/credentials/docker/ca-cert.pem DRIVER_TLS=true -DRIVER_TLS_CERT_PATH=/fabric-driver/credentials/docker/fabric-driver-network2-cert.pem -DRIVER_TLS_KEY_PATH=/fabric-driver/credentials/docker/fabric-driver-network2-key.pem +DRIVER_TLS_CERT_PATH=/driver/fabric/credentials/docker/fabric-driver-network2-cert.pem +DRIVER_TLS_KEY_PATH=/driver/fabric/credentials/docker/fabric-driver-network2-key.pem TLS_CREDENTIALS_DIR=../../relay/credentials diff --git a/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile b/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile index c977787e28..4c0ea3ceac 100644 --- a/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile +++ b/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile @@ -3,21 +3,21 @@ ARG BUILD_TAG # Local Build # FROM node:16 AS builder-local # -# WORKDIR /fabric-driver +# WORKDIR /driver/fabric -# ADD protos-js /fabric-driver/protos-js +# ADD protos-js /driver/fabric/protos-js # Remote build FROM node:16 AS builder-remote -WORKDIR /fabric-driver +WORKDIR /driver/fabric ADD .npmrc . ADD package.json . RUN npm install --unsafe-perm -ADD server /fabric-driver/server -ADD constants /fabric-driver/constants +ADD server /driver/fabric/server +ADD constants /driver/fabric/constants ADD tsconfig.json . ADD .eslintrc . ADD .prettierrc . @@ -36,16 +36,16 @@ RUN adduser -D -s /bin/sh -u 1001 -G relay relay ENV NODE_ENV production -WORKDIR /fabric-driver +WORKDIR /driver/fabric ADD package.json . -COPY --from=builder /fabric-driver/package-lock.json /fabric-driver/ -COPY --from=builder /fabric-driver/node_modules /fabric-driver/node_modules -COPY --from=builder /fabric-driver/out /fabric-driver/out -COPY --from=builder /fabric-driver/constants /fabric-driver/constants +COPY --from=builder /driver/fabric/package-lock.json /driver/fabric/ +COPY --from=builder /driver/fabric/node_modules /driver/fabric/node_modules +COPY --from=builder /driver/fabric/out /driver/fabric/out +COPY --from=builder /driver/fabric/constants /driver/fabric/constants -RUN chown -R relay:relay /fabric-driver +RUN chown -R relay:relay /driver/fabric USER relay diff --git a/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile.local b/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile.local index 61101afbc2..c91e344085 100644 --- a/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile.local +++ b/weaver/core/drivers/fabric-driver/fabricDriver.dockerfile.local @@ -3,15 +3,15 @@ ARG BUILD_TAG # Local Build FROM node:16 AS builder-local -WORKDIR /fabric-driver +WORKDIR /driver/fabric -ADD protos-js /fabric-driver/protos-js -ADD weaver-fabric-interop-sdk /fabric-driver/weaver-fabric-interop-sdk +ADD protos-js /driver/fabric/protos-js +ADD cacti-weaver-sdk-fabric /driver/fabric/cacti-weaver-sdk-fabric ADD package.json . RUN npm install --unsafe-perm -ADD server /fabric-driver/server -ADD constants /fabric-driver/constants +ADD server /driver/fabric/server +ADD constants /driver/fabric/constants ADD config.json . ADD tsconfig.json . ADD .eslintrc . @@ -31,18 +31,18 @@ RUN adduser -D -s /bin/sh -u 1001 -G relay relay ENV NODE_ENV production -WORKDIR /fabric-driver +WORKDIR /driver/fabric ADD package.json . -ADD protos-js /fabric-driver/protos-js -ADD weaver-fabric-interop-sdk /fabric-driver/weaver-fabric-interop-sdk +ADD protos-js /driver/fabric/protos-js +ADD cacti-weaver-sdk-fabric /driver/fabric/cacti-weaver-sdk-fabric -COPY --from=builder /fabric-driver/package-lock.json /fabric-driver/ -COPY --from=builder /fabric-driver/node_modules /fabric-driver/node_modules -COPY --from=builder /fabric-driver/out /fabric-driver/out -COPY --from=builder /fabric-driver/constants /fabric-driver/constants +COPY --from=builder /driver/fabric/package-lock.json /driver/fabric/ +COPY --from=builder /driver/fabric/node_modules /driver/fabric/node_modules +COPY --from=builder /driver/fabric/out /driver/fabric/out +COPY --from=builder /driver/fabric/constants /driver/fabric/constants -RUN chown -R relay:relay /fabric-driver +RUN chown -R relay:relay /driver/fabric USER relay diff --git a/weaver/core/drivers/fabric-driver/makefile b/weaver/core/drivers/fabric-driver/makefile index de284e1d27..6aaad4e2c6 100644 --- a/weaver/core/drivers/fabric-driver/makefile +++ b/weaver/core/drivers/fabric-driver/makefile @@ -1,4 +1,4 @@ -DOCKER_IMAGE_NAME ?= weaver-fabric-driver +DOCKER_IMAGE_NAME ?= cacti-weaver-driver-fabric DOCKER_TAG ?= `cat ./VERSION` DOCKER_REGISTRY ?= ghcr.io/hyperledger GIT_URL = https://github.com/hyperledger/cacti/cacti/core/drivers/fabric-driver @@ -22,13 +22,13 @@ protos-js: cp -r ../../../common/protos-js/relay ./protos-js/ && \ cp -r ../../../common/protos-js/package.json ./protos-js/ -weaver-fabric-interop-sdk: protos-js - mkdir -p weaver-fabric-interop-sdk && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/build ./weaver-fabric-interop-sdk/ && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/index.js ./weaver-fabric-interop-sdk/ && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/package.json ./weaver-fabric-interop-sdk/package.json +cacti-weaver-sdk-fabric: protos-js + mkdir -p cacti-weaver-sdk-fabric && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/build ./cacti-weaver-sdk-fabric/ && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/index.js ./cacti-weaver-sdk-fabric/ && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/package.json ./cacti-weaver-sdk-fabric/package.json -build-local: weaver-fabric-interop-sdk +build-local: cacti-weaver-sdk-fabric cp package.json package-remote.json cp package-local.json package.json (npm install --unsafe-perm) || \ @@ -36,13 +36,13 @@ build-local: weaver-fabric-interop-sdk mv package-remote.json package.json # Only if success npm run build -build-image-local: weaver-fabric-interop-sdk +build-image-local: cacti-weaver-sdk-fabric cp package.json package-remote.json cp package-local.json package.json (docker build --build-arg BUILD_TAG="local" --build-arg GIT_URL=$(GIT_URL) -t ${DOCKER_IMAGE_NAME}:$(DOCKER_TAG) -f fabricDriver.dockerfile.local . ) || \ (mv package-remote.json package.json && exit 1) # Only if fails mv package-remote.json package.json # Only if success - rm -rf protos-js weaver-fabric-interop-sdk + rm -rf protos-js cacti-weaver-sdk-fabric docker tag ${DOCKER_IMAGE_NAME}:$(DOCKER_TAG) $(DOCKER_IMAGE_NAME):latest build-image: .npmrc @@ -72,4 +72,4 @@ clean: rm -rf node_modules package-lock.json out clean-local: - rm -rf node_modules package-lock.json out protos-js weaver-fabric-interop-sdk + rm -rf node_modules package-lock.json out protos-js cacti-weaver-sdk-fabric diff --git a/weaver/core/drivers/fabric-driver/package-local.json b/weaver/core/drivers/fabric-driver/package-local.json index 3f31815447..2ef8d40888 100644 --- a/weaver/core/drivers/fabric-driver/package-local.json +++ b/weaver/core/drivers/fabric-driver/package-local.json @@ -1,6 +1,6 @@ { - "name": "fabric-driver", - "version": "1.5.9", + "name": "driver-fabric", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "out/server.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "file:./protos-js", - "@hyperledger-labs/weaver-fabric-interop-sdk": "file:./weaver-fabric-interop-sdk", + "@hyperledger/cacti-weaver-protos-js": "file:./protos-js", + "@hyperledger/cacti-weaver-sdk-fabric": "file:./cacti-weaver-sdk-fabric", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^4.29.1", diff --git a/weaver/core/drivers/fabric-driver/package.json b/weaver/core/drivers/fabric-driver/package.json index c77ea9dba5..f3517c7193 100644 --- a/weaver/core/drivers/fabric-driver/package.json +++ b/weaver/core/drivers/fabric-driver/package.json @@ -1,6 +1,6 @@ { - "name": "fabric-driver", - "version": "1.5.9", + "name": "driver-fabric", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "out/server.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "~1.5.0", - "@hyperledger-labs/weaver-fabric-interop-sdk": "~1.5.0", + "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha-prerelease", + "@hyperledger/cacti-weaver-sdk-fabric": "2.0.0-alpha-prerelease", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^4.29.1", diff --git a/weaver/core/drivers/fabric-driver/readme.md b/weaver/core/drivers/fabric-driver/readme.md index a2b29d9bf9..894396e622 100644 --- a/weaver/core/drivers/fabric-driver/readme.md +++ b/weaver/core/drivers/fabric-driver/readme.md @@ -65,7 +65,7 @@ To deploy, run `make deploy` * Create a Personal Access Token with read packages access in github. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help. * Run `docker login ghcr.io` and use your github username and personal access token as password. -* Copy `.env.docker.template` to `.env` and make changes appropriately (like correcting the base path of repo, changing network name if required etc, check image details here: [weaver-fabric-driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/pkgs/container/weaver-fabric-driver)). +* Copy `.env.docker.template` to `.env` and make changes appropriately (like correcting the base path of repo, changing network name if required etc, check image details here: [cacti-weaver-fabric-driver](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-fabric-driver)). * Make sure connection profile used for docker, containers correct hostnames instead of localhost in urls. * If deploying more than one driver on same host, make sure to change service name in docker-compose to avoid conflicts. * Finally run `docker-compose up -d` to deploy the fabric driver. @@ -101,7 +101,7 @@ NOTE: When specifying ensure that they match the config that the relay is using. **For docker-compose:*** -* `DOCKER_IMAGE_NAME`, and `DOCKER_TAG` needs to specified based on [weaver-fabric-driver](https://github.com/hyperledger-labs/weaver-dlt-interoperability/pkgs/container/weaver-fabric-driver) image. +* `DOCKER_IMAGE_NAME`, and `DOCKER_TAG` needs to specified based on [cacti-weaver-fabric-driver](https://github.com/hyperledger/cacti/pkgs/container/cacti-weaver-fabric-driver) image. * `DRIVER_PORT` is the driver server port. * `EXTERNAL_NETWORK` is the docker network in which fabric-network is running. diff --git a/weaver/core/drivers/fabric-driver/server/events.ts b/weaver/core/drivers/fabric-driver/server/events.ts index 7389892e71..fb5879706d 100644 --- a/weaver/core/drivers/fabric-driver/server/events.ts +++ b/weaver/core/drivers/fabric-driver/server/events.ts @@ -4,19 +4,19 @@ * SPDX-License-Identifier: Apache-2.0 */ -import ack_pb from '@hyperledger-labs/weaver-protos-js/common/ack_pb'; -import eventsPb from '@hyperledger-labs/weaver-protos-js/common/events_pb'; -import events_grpc_pb from '@hyperledger-labs/weaver-protos-js/relay/events_grpc_pb'; -import queryPb from '@hyperledger-labs/weaver-protos-js/common/query_pb'; -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk'; +import ack_pb from '@hyperledger/cacti-weaver-protos-js/common/ack_pb'; +import eventsPb from '@hyperledger/cacti-weaver-protos-js/common/events_pb'; +import events_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/events_grpc_pb'; +import queryPb from '@hyperledger/cacti-weaver-protos-js/common/query_pb'; +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric'; import { getDriverKeyCert } from "./walletSetup"; import { DBConnector, DBKeyNotFoundError, LevelDBConnector } from "./dbConnector"; import { checkIfArraysAreEqual, handlePromise, relayCallback } from "./utils"; import { registerListenerForEventSubscription, unregisterListenerForEventSubscription } from "./listener"; import { getNetworkGateway } from "./fabric-code"; import { Gateway, Network, Contract } from "fabric-network"; -import state_pb from '@hyperledger-labs/weaver-protos-js/common/state_pb'; -import driverPb from '@hyperledger-labs/weaver-protos-js/driver/driver_pb'; +import state_pb from '@hyperledger/cacti-weaver-protos-js/common/state_pb'; +import driverPb from '@hyperledger/cacti-weaver-protos-js/driver/driver_pb'; import logger from './logger'; import fs from 'fs'; diff --git a/weaver/core/drivers/fabric-driver/server/fabric-code.ts b/weaver/core/drivers/fabric-driver/server/fabric-code.ts index 234d7523ce..a60f2c7b9f 100644 --- a/weaver/core/drivers/fabric-driver/server/fabric-code.ts +++ b/weaver/core/drivers/fabric-driver/server/fabric-code.ts @@ -8,11 +8,11 @@ import { Gateway, Wallets } from 'fabric-network'; import { Endorser } from 'fabric-common'; import * as path from 'path'; import * as fs from 'fs'; -import query_pb from '@hyperledger-labs/weaver-protos-js/common/query_pb'; -import view_data from '@hyperledger-labs/weaver-protos-js/fabric/view_data_pb'; -import proposalResponse from '@hyperledger-labs/weaver-protos-js/peer/proposal_response_pb'; -import interopPayload from '@hyperledger-labs/weaver-protos-js/common/interop_payload_pb'; -import state_pb from '@hyperledger-labs/weaver-protos-js/common/state_pb'; +import query_pb from '@hyperledger/cacti-weaver-protos-js/common/query_pb'; +import view_data from '@hyperledger/cacti-weaver-protos-js/fabric/view_data_pb'; +import proposalResponse from '@hyperledger/cacti-weaver-protos-js/peer/proposal_response_pb'; +import interopPayload from '@hyperledger/cacti-weaver-protos-js/common/interop_payload_pb'; +import state_pb from '@hyperledger/cacti-weaver-protos-js/common/state_pb'; import { Certificate } from '@fidm/x509'; import { getConfig } from './walletSetup'; import logger from './logger'; diff --git a/weaver/core/drivers/fabric-driver/server/listener.ts b/weaver/core/drivers/fabric-driver/server/listener.ts index 7e881642ec..39d9a0e027 100644 --- a/weaver/core/drivers/fabric-driver/server/listener.ts +++ b/weaver/core/drivers/fabric-driver/server/listener.ts @@ -7,8 +7,8 @@ import * as fabproto6 from 'fabric-protos'; import { BlockDecoder } from 'fabric-common/index'; import { Gateway, Network, Contract, ContractEvent, BlockListener, ContractListener, BlockEvent, ListenerOptions } from 'fabric-network'; -import query_pb from '@hyperledger-labs/weaver-protos-js/common/query_pb'; -import events_pb from '@hyperledger-labs/weaver-protos-js/common/events_pb'; +import query_pb from '@hyperledger/cacti-weaver-protos-js/common/query_pb'; +import events_pb from '@hyperledger/cacti-weaver-protos-js/common/events_pb'; import { lookupEventSubscriptions, readAllEventMatchers } from './events'; import { invoke, getNetworkGateway, packageFabricView } from './fabric-code'; import { handlePromise, relayCallback, getRelayClientForEventPublish, delay } from './utils'; diff --git a/weaver/core/drivers/fabric-driver/server/server.ts b/weaver/core/drivers/fabric-driver/server/server.ts index 7a6668fad2..c645caece3 100644 --- a/weaver/core/drivers/fabric-driver/server/server.ts +++ b/weaver/core/drivers/fabric-driver/server/server.ts @@ -6,14 +6,14 @@ import fs from 'fs'; import { Server, ServerCredentials, credentials } from '@grpc/grpc-js'; -import ack_pb from '@hyperledger-labs/weaver-protos-js/common/ack_pb'; -import query_pb from '@hyperledger-labs/weaver-protos-js/common/query_pb'; -import fabricViewPb from '@hyperledger-labs/weaver-protos-js/fabric/view_data_pb'; -import eventsPb from '@hyperledger-labs/weaver-protos-js/common/events_pb'; -import driver_pb_grpc from '@hyperledger-labs/weaver-protos-js/driver/driver_grpc_pb'; -import datatransfer_grpc_pb from '@hyperledger-labs/weaver-protos-js/relay/datatransfer_grpc_pb'; -import events_grpc_pb from '@hyperledger-labs/weaver-protos-js/relay/events_grpc_pb'; -import state_pb from '@hyperledger-labs/weaver-protos-js/common/state_pb'; +import ack_pb from '@hyperledger/cacti-weaver-protos-js/common/ack_pb'; +import query_pb from '@hyperledger/cacti-weaver-protos-js/common/query_pb'; +import fabricViewPb from '@hyperledger/cacti-weaver-protos-js/fabric/view_data_pb'; +import eventsPb from '@hyperledger/cacti-weaver-protos-js/common/events_pb'; +import driver_pb_grpc from '@hyperledger/cacti-weaver-protos-js/driver/driver_grpc_pb'; +import datatransfer_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/datatransfer_grpc_pb'; +import events_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/events_grpc_pb'; +import state_pb from '@hyperledger/cacti-weaver-protos-js/common/state_pb'; import { invoke, packageFabricView } from './fabric-code'; import 'dotenv/config'; import { loadEventSubscriptionsFromStorage, monitorBlockForMissedEvents } from './listener' @@ -22,7 +22,7 @@ import { subscribeEventHelper, unsubscribeEventHelper, signEventSubscriptionQuer import * as path from 'path'; import { handlePromise, relayCallback, getRelayClientForQueryResponse, getRelayClientForEventSubscription, delay } from './utils'; import { dbConnectionTest, eventSubscriptionTest } from "./tests" -import driverPb from '@hyperledger-labs/weaver-protos-js/driver/driver_pb'; +import driverPb from '@hyperledger/cacti-weaver-protos-js/driver/driver_pb'; import logger from './logger'; if (process.env.DEBUG === 'true') { diff --git a/weaver/core/drivers/fabric-driver/server/tests.ts b/weaver/core/drivers/fabric-driver/server/tests.ts index ea666b9e39..a73b1fea72 100644 --- a/weaver/core/drivers/fabric-driver/server/tests.ts +++ b/weaver/core/drivers/fabric-driver/server/tests.ts @@ -4,8 +4,8 @@ * SPDX-License-Identifier: Apache-2.0 */ -import eventsPb from "@hyperledger-labs/weaver-protos-js/common/events_pb"; -import queryPb from '@hyperledger-labs/weaver-protos-js/common/query_pb'; +import eventsPb from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; +import queryPb from '@hyperledger/cacti-weaver-protos-js/common/query_pb'; import { addEventSubscription, deleteEventSubscription, lookupEventSubscriptions } from "./events" import { LevelDBConnector, DBConnector, DBNotOpenError, DBKeyNotFoundError, DBLockedError } from "./dbConnector" import logger from './logger'; diff --git a/weaver/core/drivers/fabric-driver/server/utils.ts b/weaver/core/drivers/fabric-driver/server/utils.ts index 5829c92b75..8030bb2b9c 100644 --- a/weaver/core/drivers/fabric-driver/server/utils.ts +++ b/weaver/core/drivers/fabric-driver/server/utils.ts @@ -6,8 +6,8 @@ import fs from 'fs'; import { credentials } from '@grpc/grpc-js'; -import datatransfer_grpc_pb from '@hyperledger-labs/weaver-protos-js/relay/datatransfer_grpc_pb'; -import events_grpc_pb from '@hyperledger-labs/weaver-protos-js/relay/events_grpc_pb'; +import datatransfer_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/datatransfer_grpc_pb'; +import events_grpc_pb from '@hyperledger/cacti-weaver-protos-js/relay/events_grpc_pb'; import logger from './logger'; function checkIfArraysAreEqual(x: Array, y: Array): boolean { diff --git a/weaver/core/drivers/fabric-driver/server/walletSetup.ts b/weaver/core/drivers/fabric-driver/server/walletSetup.ts index af1353a8a9..ead3ba4092 100644 --- a/weaver/core/drivers/fabric-driver/server/walletSetup.ts +++ b/weaver/core/drivers/fabric-driver/server/walletSetup.ts @@ -7,7 +7,7 @@ import { Wallets } from 'fabric-network'; import FabricCAServices from 'fabric-ca-client'; import { handlePromise } from './utils'; -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import * as path from 'path'; import * as fs from 'fs'; import logger from './logger'; diff --git a/weaver/core/drivers/fabric-driver/tsconfig.json b/weaver/core/drivers/fabric-driver/tsconfig.json index 01861158f1..42f73e4640 100644 --- a/weaver/core/drivers/fabric-driver/tsconfig.json +++ b/weaver/core/drivers/fabric-driver/tsconfig.json @@ -25,7 +25,7 @@ // "isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */ /* Strict Type-Checking Options */ - // "strict": true, /* Enable all strict type-checking options. */ + // "strict": true, /* Enable all strict type-checking options. */ // "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */ // "strictNullChecks": true, /* Enable strict null checks. */ // "strictFunctionTypes": true, /* Enable strict checking of function types. */ diff --git a/weaver/core/identity-management/iin-agent/.env.docker.template b/weaver/core/identity-management/iin-agent/.env.docker.template index eca631fb41..a8cae325c1 100644 --- a/weaver/core/identity-management/iin-agent/.env.docker.template +++ b/weaver/core/identity-management/iin-agent/.env.docker.template @@ -12,8 +12,8 @@ WEAVER_CONTRACT_ID= SYNC_PERIOD= AUTO_SYNC= TLS_CREDENTIALS_DIR= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent -DOCKER_TAG=1.5.2 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent +DOCKER_TAG=2.0.0-alpha-prerelease EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/weaver/core/identity-management/iin-agent/.gitignore b/weaver/core/identity-management/iin-agent/.gitignore index 3c72974748..4aeb50e7d1 100644 --- a/weaver/core/identity-management/iin-agent/.gitignore +++ b/weaver/core/identity-management/iin-agent/.gitignore @@ -2,7 +2,7 @@ /out /protos /protos-js -/weaver-fabric-interop-sdk +/cacti-weaver-sdk-fabric .env package-lock.json .npmrc diff --git a/weaver/core/identity-management/iin-agent/.npmrc.template b/weaver/core/identity-management/iin-agent/.npmrc.template index b3197a2f00..14ca0a1e2c 100644 --- a/weaver/core/identity-management/iin-agent/.npmrc.template +++ b/weaver/core/identity-management/iin-agent/.npmrc.template @@ -1,2 +1,2 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs +@hyperledger:registry=https://npm.pkg.github.com/hyperledger //npm.pkg.github.com/:_authToken= diff --git a/weaver/core/identity-management/iin-agent/VERSION b/weaver/core/identity-management/iin-agent/VERSION index 2b26b8d213..eca2b7d195 100644 --- a/weaver/core/identity-management/iin-agent/VERSION +++ b/weaver/core/identity-management/iin-agent/VERSION @@ -1 +1 @@ -1.5.9 +2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1 b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1 index 1247b8214c..29b2e89f2f 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1 +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1 @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1_org1 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls index 75f2ccd0ee..0921da2f17 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org1.tls @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1_org1 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2 b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2 index 191d08808a..cbfecfd9aa 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2 +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2 @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1_org2 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls index 853a5f806d..35d5c540f7 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n1.org2.tls @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network1_net COMPOSE_PROJECT_NAME=network1_org2 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1 b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1 index a8b4986ee6..30384ced50 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1 +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1 @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2_org1 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls index d3892a0f60..e4f190fdf9 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org1.tls @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2_org1 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2 b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2 index 632060593f..0da3f40dae 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2 +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2 @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2_org2 diff --git a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls index 8657abc1cb..596871398e 100644 --- a/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls +++ b/weaver/core/identity-management/iin-agent/docker-testnet/envs/.env.n2.org2.tls @@ -13,7 +13,7 @@ WEAVER_CONTRACT_ID=interop SYNC_PERIOD=300 AUTO_SYNC=true TLS_CREDENTIALS_DIR=../../relay/credentials -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-iin-agent DOCKER_TAG=latest EXTERNAL_NETWORK=network2_net COMPOSE_PROJECT_NAME=network2_org2 diff --git a/weaver/core/identity-management/iin-agent/iinagent.local.Dockerfile b/weaver/core/identity-management/iin-agent/iinagent.local.Dockerfile index b57dde090c..eb506530cc 100644 --- a/weaver/core/identity-management/iin-agent/iinagent.local.Dockerfile +++ b/weaver/core/identity-management/iin-agent/iinagent.local.Dockerfile @@ -6,7 +6,7 @@ FROM node:16 AS builder-local WORKDIR /opt/iinagent ADD protos-js /opt/iinagent/protos-js -ADD weaver-fabric-interop-sdk /opt/iinagent/weaver-fabric-interop-sdk +ADD cacti-weaver-sdk-fabric /opt/iinagent/cacti-weaver-sdk-fabric ADD package.json . RUN npm install --unsafe-perm @@ -31,7 +31,7 @@ WORKDIR /opt/iinagent ADD package.json . ADD protos-js /opt/iinagent/protos-js -ADD weaver-fabric-interop-sdk /opt/iinagent/weaver-fabric-interop-sdk +ADD cacti-weaver-sdk-fabric /opt/iinagent/cacti-weaver-sdk-fabric COPY --from=builder /opt/iinagent/package-lock.json /opt/iinagent/ COPY --from=builder /opt/iinagent/node_modules /opt/iinagent/node_modules diff --git a/weaver/core/identity-management/iin-agent/makefile b/weaver/core/identity-management/iin-agent/makefile index ad2cc62174..30a3d5fd67 100644 --- a/weaver/core/identity-management/iin-agent/makefile +++ b/weaver/core/identity-management/iin-agent/makefile @@ -1,6 +1,6 @@ -DOCKER_IMAGE_NAME ?= weaver-iin-agent +DOCKER_IMAGE_NAME ?= cacti-weaver-iin-agent DOCKER_TAG ?= `cat ./VERSION` -DOCKER_REGISTRY ?= ghcr.io/hyperledger-labs +DOCKER_REGISTRY ?= ghcr.io/hyperledger GIT_URL = https://github.com/hyperledger/cacti/weaver/core/identity-management/iin-agent DLT_SPECIFIC_DIR ?= . COMPOSE_ARG ?= @@ -23,13 +23,13 @@ protos-js: cp -r ../../../common/protos-js/relay ./protos-js/ && \ cp -r ../../../common/protos-js/package.json ./protos-js/ -weaver-fabric-interop-sdk: - mkdir -p weaver-fabric-interop-sdk && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/build ./weaver-fabric-interop-sdk/ && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/index.js ./weaver-fabric-interop-sdk/ && \ - cp -r ../../../sdks/fabric/interoperation-node-sdk/package.json ./weaver-fabric-interop-sdk/package.json +cacti-weaver-sdk-fabric: + mkdir -p cacti-weaver-sdk-fabric && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/build ./cacti-weaver-sdk-fabric/ && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/index.js ./cacti-weaver-sdk-fabric/ && \ + cp -r ../../../sdks/fabric/interoperation-node-sdk/package.json ./cacti-weaver-sdk-fabric/package.json -build-local: protos-js weaver-fabric-interop-sdk +build-local: protos-js cacti-weaver-sdk-fabric (cp package.json package-remote.json && \ cp package-local.json package.json && \ npm install) || \ @@ -37,13 +37,13 @@ build-local: protos-js weaver-fabric-interop-sdk mv package-remote.json package.json # Only if success npm run build -build-image-local: protos-js weaver-fabric-interop-sdk +build-image-local: protos-js cacti-weaver-sdk-fabric cp package.json package-remote.json cp package-local.json package.json (docker build --build-arg BUILD_TAG="local" --build-arg GIT_URL=$(GIT_URL) -t ${DOCKER_IMAGE_NAME}:$(DOCKER_TAG) -f iinagent.local.Dockerfile . ) || \ (mv package-remote.json package.json && exit 1) # Only if fails mv package-remote.json package.json # Only if success - rm -rf protos-js weaver-fabric-interop-sdk + rm -rf protos-js cacti-weaver-sdk-fabric docker tag ${DOCKER_IMAGE_NAME}:$(DOCKER_TAG) $(DOCKER_IMAGE_NAME):latest build-image: .npmrc @@ -77,4 +77,4 @@ clean: rm -rf node_modules package-lock.json out clean-local: - rm -rf node_modules package-lock.json out protos-js weaver-fabric-interop-sdk + rm -rf node_modules package-lock.json out protos-js cacti-weaver-sdk-fabric diff --git a/weaver/core/identity-management/iin-agent/package-local.json b/weaver/core/identity-management/iin-agent/package-local.json index 783cad947b..790b9fb17c 100644 --- a/weaver/core/identity-management/iin-agent/package-local.json +++ b/weaver/core/identity-management/iin-agent/package-local.json @@ -1,6 +1,6 @@ { "name": "iin-agent", - "version": "1.5.9", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "index.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "file:./protos-js", - "@hyperledger-labs/weaver-fabric-interop-sdk": "file:./weaver-fabric-interop-sdk", + "@hyperledger/cacti-weaver-protos-js": "file:./protos-js", + "@hyperledger/cacti-weaver-sdk-fabric": "file:./cacti-weaver-sdk-fabric", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^3.5.0", diff --git a/weaver/core/identity-management/iin-agent/package.json b/weaver/core/identity-management/iin-agent/package.json index 19fcd26812..4ffdf4578f 100644 --- a/weaver/core/identity-management/iin-agent/package.json +++ b/weaver/core/identity-management/iin-agent/package.json @@ -1,6 +1,6 @@ { "name": "iin-agent", - "version": "1.5.9", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "index.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "~1.5.0", - "@hyperledger-labs/weaver-fabric-interop-sdk": "~1.5.0", + "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha-prerelease", + "@hyperledger/cacti-weaver-sdk-fabric": "2.0.0-alpha-prerelease", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^3.5.0", diff --git a/weaver/core/identity-management/iin-agent/src/common/ledgerBase.ts b/weaver/core/identity-management/iin-agent/src/common/ledgerBase.ts index c0b5e3d02e..db216009a6 100644 --- a/weaver/core/identity-management/iin-agent/src/common/ledgerBase.ts +++ b/weaver/core/identity-management/iin-agent/src/common/ledgerBase.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import iin_agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; +import iin_agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; export class LedgerBase { ledgerId: string; // Unique ID of a ledger in which the Weaver interoperation module is installed diff --git a/weaver/core/identity-management/iin-agent/src/common/utils.ts b/weaver/core/identity-management/iin-agent/src/common/utils.ts index 854ae670bd..fd9acdccea 100644 --- a/weaver/core/identity-management/iin-agent/src/common/utils.ts +++ b/weaver/core/identity-management/iin-agent/src/common/utils.ts @@ -12,10 +12,10 @@ import crypto from 'crypto'; const { X509Certificate } = require('crypto'); // Weaver Packages -import agent_grpc_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_grpc_pb'; -import agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; -import membership_pb from '@hyperledger-labs/weaver-protos-js/common/membership_pb'; -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import agent_grpc_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_grpc_pb'; +import agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; +import membership_pb from '@hyperledger/cacti-weaver-protos-js/common/membership_pb'; +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric' // Local modules import { LedgerBase } from './ledgerBase'; diff --git a/weaver/core/identity-management/iin-agent/src/fabric-ledger/connector.ts b/weaver/core/identity-management/iin-agent/src/fabric-ledger/connector.ts index 70e52467ae..f4012ca3b3 100644 --- a/weaver/core/identity-management/iin-agent/src/fabric-ledger/connector.ts +++ b/weaver/core/identity-management/iin-agent/src/fabric-ledger/connector.ts @@ -8,8 +8,8 @@ import { Contract } from 'fabric-network'; import * as path from 'path'; import * as fs from 'fs'; -import iin_agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import iin_agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import { LedgerBase } from '../common/ledgerBase'; import { handlePromise, signMessage } from '../common/utils'; diff --git a/weaver/core/identity-management/iin-agent/src/fabric-ledger/networkUtils.ts b/weaver/core/identity-management/iin-agent/src/fabric-ledger/networkUtils.ts index f7a400f861..2dd8a0c873 100644 --- a/weaver/core/identity-management/iin-agent/src/fabric-ledger/networkUtils.ts +++ b/weaver/core/identity-management/iin-agent/src/fabric-ledger/networkUtils.ts @@ -9,8 +9,8 @@ import { Channel } from 'fabric-common'; import * as path from 'path'; import * as fs from 'fs'; -import membershipPb from '@hyperledger-labs/weaver-protos-js/common/membership_pb'; -import { MembershipManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import membershipPb from '@hyperledger/cacti-weaver-protos-js/common/membership_pb'; +import { MembershipManager } from '@hyperledger/cacti-weaver-sdk-fabric' import { getWallet } from './walletUtils'; import * as utils from "../common/utils"; diff --git a/weaver/core/identity-management/iin-agent/src/protocols/externalOperations.ts b/weaver/core/identity-management/iin-agent/src/protocols/externalOperations.ts index 358977b04b..a7b107b289 100644 --- a/weaver/core/identity-management/iin-agent/src/protocols/externalOperations.ts +++ b/weaver/core/identity-management/iin-agent/src/protocols/externalOperations.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import iin_agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; +import iin_agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; import * as utils from '../common/utils'; import { LedgerBase } from '../common/ledgerBase'; import { v4 as uuidv4 } from "uuid"; diff --git a/weaver/core/identity-management/iin-agent/src/protocols/localOperations.ts b/weaver/core/identity-management/iin-agent/src/protocols/localOperations.ts index 42f58db97a..6413e7e431 100644 --- a/weaver/core/identity-management/iin-agent/src/protocols/localOperations.ts +++ b/weaver/core/identity-management/iin-agent/src/protocols/localOperations.ts @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -import iin_agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; +import iin_agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; import * as utils from '../common/utils'; import { localAgentResponseCount, counterAttestationsMap, getSecurityDomainMapKey, securityDomainMap, foreignAgentResponseCount} from './externalOperations'; // import { handlePromise, getLedgerBase, getIINAgentClient, getSecurityDomainDNS, defaultCallback, delay } from '../common/utils'; diff --git a/weaver/core/identity-management/iin-agent/src/server.ts b/weaver/core/identity-management/iin-agent/src/server.ts index f30adfd888..888ceb43de 100644 --- a/weaver/core/identity-management/iin-agent/src/server.ts +++ b/weaver/core/identity-management/iin-agent/src/server.ts @@ -6,9 +6,9 @@ import fs from 'fs'; import { Server, ServerCredentials, credentials } from '@grpc/grpc-js'; -import ack_pb from '@hyperledger-labs/weaver-protos-js/common/ack_pb'; -import iin_agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; -import iin_agent_pb_grpc from '@hyperledger-labs/weaver-protos-js/identity/agent_grpc_pb'; +import ack_pb from '@hyperledger/cacti-weaver-protos-js/common/ack_pb'; +import iin_agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; +import iin_agent_pb_grpc from '@hyperledger/cacti-weaver-protos-js/identity/agent_grpc_pb'; import 'dotenv/config'; import { Certificate } from '@fidm/x509'; import * as path from 'path'; diff --git a/weaver/core/identity-management/iin-agent/test/membershipTest.js b/weaver/core/identity-management/iin-agent/test/membershipTest.js index 408c37f929..094cb2e398 100644 --- a/weaver/core/identity-management/iin-agent/test/membershipTest.js +++ b/weaver/core/identity-management/iin-agent/test/membershipTest.js @@ -19,7 +19,7 @@ chai.should(); const { Wallets } = require("fabric-network"); const { ContractImpl } = require("fabric-network/lib/contract"); const { NetworkImpl } = require("fabric-network/lib/network"); -const membershipPb = require('@hyperledger-labs/weaver-protos-js/common/membership_pb'); +const membershipPb = require('@hyperledger/cacti-weaver-protos-js/common/membership_pb'); describe("Membership", () => { diff --git a/weaver/core/identity-management/iin-agent/test/utilsTest.js b/weaver/core/identity-management/iin-agent/test/utilsTest.js index 995ee31049..10b0e84086 100644 --- a/weaver/core/identity-management/iin-agent/test/utilsTest.js +++ b/weaver/core/identity-management/iin-agent/test/utilsTest.js @@ -19,8 +19,8 @@ chai.should(); const { Wallets } = require("fabric-network"); const { ContractImpl } = require("fabric-network/lib/contract"); const { NetworkImpl } = require("fabric-network/lib/network"); -const membershipPb = require('@hyperledger-labs/weaver-protos-js/common/membership_pb'); -const agent_pb = require('@hyperledger-labs/weaver-protos-js/identity/agent_pb'); +const membershipPb = require('@hyperledger/cacti-weaver-protos-js/common/membership_pb'); +const agent_pb = require('@hyperledger/cacti-weaver-protos-js/identity/agent_pb'); const utils = require('../out/common/utils.js') diff --git a/weaver/core/network/corda-interop-app/README.md b/weaver/core/network/corda-interop-app/README.md index 1ed87f4300..41645dc72c 100644 --- a/weaver/core/network/corda-interop-app/README.md +++ b/weaver/core/network/corda-interop-app/README.md @@ -74,7 +74,7 @@ after PR approval, publish it to `hyperledger/cacti`. To publish to your fork, replace `` with your github username in `github.properties`: ``` ... -url=https://maven.pkg.github.com//weaver-dlt-interoperability +url=https://maven.pkg.github.com//cacti ``` and then follow above 4 steps. @@ -89,8 +89,8 @@ and then follow above 4 steps. 5) Add this to your build.gradle (change the version accordingly): ``` dependencies { - compile(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.1") - compile(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.1") + compile(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "1.2.1") + compile(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "1.2.1") } ``` diff --git a/weaver/core/network/corda-interop-app/build.gradle b/weaver/core/network/corda-interop-app/build.gradle index 3618cec40b..33b1e0a94f 100644 --- a/weaver/core/network/corda-interop-app/build.gradle +++ b/weaver/core/network/corda-interop-app/build.gradle @@ -14,7 +14,7 @@ buildscript { slf4j_version = constants.getProperty("slf4jVersion") corda_platform_version = constants.getProperty("platformVersion").toInteger() arrow_version = constants.getProperty("arrowVersion") - weaver_version = constants.getProperty("weaverVersion") + cacti_version = constants.getProperty("cactiVersion") github_username = "" github_password = "" github_url = "" diff --git a/weaver/core/network/corda-interop-app/constants.properties b/weaver/core/network/corda-interop-app/constants.properties index 66add9e68b..87250f88af 100644 --- a/weaver/core/network/corda-interop-app/constants.properties +++ b/weaver/core/network/corda-interop-app/constants.properties @@ -10,5 +10,4 @@ platformVersion=10 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final arrowVersion=0.10.4 - -weaverVersion=1.5.7 +cactiVersion=2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/core/network/corda-interop-app/github.properties.template b/weaver/core/network/corda-interop-app/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/core/network/corda-interop-app/gradle.properties b/weaver/core/network/corda-interop-app/gradle.properties index f1dd09eb5a..3b8d2a6718 100644 --- a/weaver/core/network/corda-interop-app/gradle.properties +++ b/weaver/core/network/corda-interop-app/gradle.properties @@ -1,4 +1,4 @@ name=Interoperability CorDapp -group=org.hyperledger.cacti.weaver.corda.app.interop -version=1.2.14 +group=org.hyperledger.cacti.weaver.imodule.corda +version=2.0.0-alpha-prerelease kotlin.incremental=false diff --git a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle index 78c8b3f96f..ab4292da88 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-contracts/build.gradle @@ -45,7 +45,7 @@ dependencies { testCompile "$corda_release_group:corda-node-driver:$corda_release_version" // weaver-protos - implementation "org.hyperledger.cacti.weaver:protos-java-kt:$weaver_version" + implementation "org.hyperledger.cacti.weaver.protos:protos-java-kt:$cacti_version" compile "com.google.protobuf:protobuf-java:$protobuf_version" compile "com.google.protobuf:protobuf-java-util:$protobuf_version" diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AccessControlPolicyStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AccessControlPolicyStateContract.kt index 6270afd8f0..2347c34a49 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AccessControlPolicyStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AccessControlPolicyStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class AccessControlPolicyStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.AccessControlPolicyStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetExchangeHTLCStateContract.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetExchangeHTLCStateContract.kt index fd924b188f..5b5624115f 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetExchangeHTLCStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetExchangeHTLCStateContract.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeTxState -import org.hyperledger.cacti.weaver.corda.app.interop.states.sha512 -import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeTxState +import org.hyperledger.cacti.weaver.imodule.corda.states.sha512 +import org.hyperledger.cacti.weaver.imodule.corda.states.HashMechanism import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -28,7 +28,7 @@ import java.util.* class AssetExchangeHTLCStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeHTLCStateContract" } /** @@ -140,7 +140,7 @@ class AssetExchangeHTLCStateContract : Contract { class AssetExchangeTxStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeTxStateContract" } override fun verify(tx: LedgerTransaction) { val command = tx.commands.requireSingleCommand() diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt index 7cf720e73d..f4683b976e 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/AssetTransferContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/AssetTransferContract.kt @@ -4,11 +4,11 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.states.NetworkIdState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -25,7 +25,7 @@ import java.util.* class AssetTransferContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetTransferContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/ExternalStateContract.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/ExternalStateContract.kt index df18c21e5f..08b8ee3e4d 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ExternalStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/ExternalStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.ExternalState +import org.hyperledger.cacti.weaver.imodule.corda.states.ExternalState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.Requirements.using @@ -25,7 +25,7 @@ import net.corda.core.transactions.LedgerTransaction class ExternalStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.ExternalStateContract" } /** * The verify() function determines a transaction is valid if it does not throw and exception. diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/MembershipStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/MembershipStateContract.kt index c09fd74ba5..c3ee665ba4 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/MembershipStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/MembershipStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class MembershipStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.MembershipStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/NetworkIdStateContract.kt similarity index 89% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/NetworkIdStateContract.kt index f84a19769b..a1b530aed2 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/NetworkIdStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/NetworkIdStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.states.NetworkIdState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.Requirements.using @@ -25,7 +25,7 @@ import net.corda.core.transactions.LedgerTransaction class NetworkIdStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.NetworkIdStateContract" } /** * The verify() function determines a transaction is valid if it does not throw and exception. diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/VerificationPolicyStateContract.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/VerificationPolicyStateContract.kt index 432a384321..4f93022ae4 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/VerificationPolicyStateContract.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/contracts/VerificationPolicyStateContract.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts -import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.VerificationPolicyState import net.corda.core.contracts.CommandData import net.corda.core.contracts.Contract import net.corda.core.contracts.requireSingleCommand @@ -24,7 +24,7 @@ import net.corda.core.transactions.LedgerTransaction class VerificationPolicyStateContract : Contract { companion object { // Used to identify our contract when building a transaction. - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.contracts.VerificationPolicyStateContract" } /** diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AccessControlPolicyState.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AccessControlPolicyState.kt index 194cc09e4a..cbe6d9f190 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AccessControlPolicyState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AccessControlPolicyState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AccessControlPolicyStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetClaimStatusState.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetClaimStatusState.kt index 6dedbfe2e1..83050c2ead 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetClaimStatusState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetClaimStatusState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetTransferContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.ContractState diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetExchangeHTLCState.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetExchangeHTLCState.kt index b488f57b85..70f7b67170 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetExchangeHTLCState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetExchangeHTLCState.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeTxStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.ContractState diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetPledgeState.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetPledgeState.kt index 51f191925e..6890893dce 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/AssetPledgeState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/AssetPledgeState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetTransferContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/ExternalState.kt similarity index 86% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/ExternalState.kt index 7a68d117b8..53423445ad 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/ExternalState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/ExternalState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.ExternalStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/HashExtensions.kt similarity index 82% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/HashExtensions.kt index 0367964917..9463568f3a 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/HashExtensions.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/HashExtensions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states import net.corda.core.utilities.OpaqueBytes import java.security.MessageDigest diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/MembershipState.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/MembershipState.kt index bc3264ace6..f80730f6ac 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/MembershipState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/MembershipState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.MembershipStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/NetworkIdState.kt similarity index 87% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/NetworkIdState.kt index 39980efc57..3d5d89fb3b 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/NetworkIdState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/NetworkIdState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.NetworkIdStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/VerificationPolicyState.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt rename to weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/VerificationPolicyState.kt index 13087fc4d7..5a74681aff 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/states/VerificationPolicyState.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/states/VerificationPolicyState.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.states +package org.hyperledger.cacti.weaver.imodule.corda.states -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract +import org.hyperledger.cacti.weaver.imodule.corda.contracts.VerificationPolicyStateContract import net.corda.core.contracts.BelongsToContract import net.corda.core.contracts.LinearState import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt b/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt index 6ae0ed4355..54fe5424f5 100644 --- a/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt +++ b/weaver/core/network/corda-interop-app/interop-contracts/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/contracts/ContractTests.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.contracts +package org.hyperledger.cacti.weaver.imodule.corda.contracts import net.corda.testing.node.MockServices import org.junit.Test diff --git a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle index a873af54f2..4e219f0925 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/build.gradle +++ b/weaver/core/network/corda-interop-app/interop-workflows/build.gradle @@ -74,7 +74,7 @@ dependencies { compile "io.arrow-kt:arrow-syntax:$arrow_version" // weaver-protos - implementation "org.hyperledger.cacti.weaver:protos-java-kt:$weaver_version" + implementation "org.hyperledger.cacti.weaver.protos:protos-java-kt:$cacti_version" compile "com.google.protobuf:protobuf-java:$protobuf_version" compile "com.google.protobuf:protobuf-java-util:$protobuf_version" diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt index b3362c0753..c76764f62d 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/integrationTest/kotlin/org/hyperledger/cacti/cordaInteropApp/DriverBasedTest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import net.corda.core.identity.CordaX500Name import net.corda.core.utilities.getOrThrow diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt index 330a0b7266..ac27139bf3 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AccessControlFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AccessControlFlows.kt @@ -4,13 +4,13 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AccessControlPolicyStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AccessControlPolicyStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Rule import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.Command diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt index 2281a5e7d4..f6f5526362 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeTxStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeTxState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeTxStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeTxState import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCWrapperFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCWrapperFlows.kt index dbd803b110..ce8051bfb0 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetExchangeHTLCWrapperFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetExchangeHTLCWrapperFlows.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetExchangeHTLCStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetExchangeHTLCStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt similarity index 99% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt index df9115a7d6..dde5b99c53 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferFlows.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.states.NetworkIdState import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass import com.google.protobuf.ByteString diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferWrapperFlows.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferWrapperFlows.kt index 3e4a4a3087..81f8331969 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/AssetTransferWrapperFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/AssetTransferWrapperFlows.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.AssetTransferContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeParameters -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetReclaimParameters -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimParameters +import org.hyperledger.cacti.weaver.imodule.corda.contracts.AssetTransferContract +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeParameters +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetReclaimParameters +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimParameters import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CertUtils.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CertUtils.kt index 6deb3a3257..89863b649d 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CertUtils.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CertUtils.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import arrow.core.flatMap -import org.hyperledger.cacti.weaver.corda.app.interop.states.Member -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.states.Member +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState import java.security.cert.X509Certificate import java.time.LocalDateTime import java.time.ZoneId diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CommonHelperFunctions.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CommonHelperFunctions.kt index 28b7362417..ed0c407c11 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CommonHelperFunctions.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CommonHelperFunctions.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left @@ -16,7 +16,7 @@ import java.security.cert.CertificateFactory import java.security.cert.X509Certificate import java.util.Base64 import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks -import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.imodule.corda.states.HashMechanism /** * The parseAddress function takes the address field of a Query sent from an external network at parses it into its diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CreateExternalRequestFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CreateExternalRequestFlows.kt index 85bebea1b0..2edf9f9a7e 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/CreateExternalRequestFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/CreateExternalRequestFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HandleExternalRequest.kt similarity index 99% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HandleExternalRequest.kt index 86ab76a6d4..b6ea20254b 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HandleExternalRequest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HandleExternalRequest.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import arrow.core.Either diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HelperTypes.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HelperTypes.kt index 966a31acf6..cae47c4767 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/HelperTypes.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/HelperTypes.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import net.corda.core.serialization.CordaSerializable diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt index b57eca7bdf..8eb9423cb5 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/MembershipFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/MembershipFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import arrow.core.flatMap import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.MembershipStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.Member -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.MembershipStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.Member +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState import net.corda.core.contracts.Command import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt index 576670c365..d5437cadc6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NetworkIdFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NetworkIdFlows.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.NetworkIdStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.NetworkIdStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.NetworkIdState import net.corda.core.contracts.ContractState import net.corda.core.contracts.CommandData diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NodeSignatureFlows.kt similarity index 98% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NodeSignatureFlows.kt index cb1fefd5a3..e3005b259e 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/NodeSignatureFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/NodeSignatureFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt index e4ca8ba6a8..2cd60b783c 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/VerificationPolicyFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/VerificationPolicyFlows.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left import arrow.core.Right import co.paralleluniverse.fibers.Suspendable -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.VerificationPolicyStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier -import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy -import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.VerificationPolicyStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.Identifier +import org.hyperledger.cacti.weaver.imodule.corda.states.Policy +import org.hyperledger.cacti.weaver.imodule.corda.states.VerificationPolicyState import net.corda.core.contracts.Command import net.corda.core.contracts.StateAndRef import net.corda.core.contracts.UniqueIdentifier diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt similarity index 99% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt index 18f34094ec..e259166b6d 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/ViewVerification.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/ViewVerification.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.* import arrow.core.extensions.either.applicative.applicative diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt index d148c847a0..db94d1e9e6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/WriteExternalStateFlows.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/WriteExternalStateFlows.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows +package org.hyperledger.cacti.weaver.imodule.corda.flows import arrow.core.Either import arrow.core.Left @@ -27,8 +27,8 @@ import org.hyperledger.cacti.weaver.protos.common.state.State import org.hyperledger.cacti.weaver.protos.fabric.view_data.ViewData import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass -import org.hyperledger.cacti.weaver.corda.app.interop.contracts.ExternalStateContract -import org.hyperledger.cacti.weaver.corda.app.interop.states.ExternalState +import org.hyperledger.cacti.weaver.imodule.corda.contracts.ExternalStateContract +import org.hyperledger.cacti.weaver.imodule.corda.states.ExternalState /** diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimHTLCSerializer.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimHTLCSerializer.kt index 28a1653256..d29b0ec1a7 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimHTLCSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimHTLCSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimSerializer.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimSerializer.kt index 8396b8d152..164a8a0586 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimStatusSerializer.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimStatusSerializer.kt index 7f63516714..2ef1fdea86 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetClaimStatusSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetClaimStatusSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetExchangeAgreementSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetExchangeAgreementSerializer.kt index 98d7e3cfaf..aba70c9282 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetExchangeAgreementSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetExchangeAgreementSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockHTLCSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockHTLCSerializer.kt index 3cc16a467a..4cef41c95d 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockHTLCSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockHTLCSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockSerializer.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockSerializer.kt index 15b0368aa6..3a57de27b2 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetLockSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetLockSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetPledgeSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetPledgeSerializer.kt index 82bb126cb3..fdadaea8dc 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/AssetPledgeSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/AssetPledgeSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/CustomSerializationWhitelist.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/CustomSerializationWhitelist.kt index 8b223881a3..0e556da105 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/CustomSerializationWhitelist.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/CustomSerializationWhitelist.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import arrow.core.Either import net.corda.core.serialization.SerializationWhitelist diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt index 2ae159d3c2..caf9545016 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/FungibleAssetExchangeAgreementSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/HashMechanismSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/HashMechanismSerializer.kt index 380a9453b2..47a2205536 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/HashMechanismSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/HashMechanismSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/LockMechanismSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/LockMechanismSerializer.kt index 60b2edf965..0233dd0f86 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/LockMechanismSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/LockMechanismSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/MetaSerializer.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/MetaSerializer.kt index dd32c1ab15..d73127e5da 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/MetaSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/MetaSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import org.hyperledger.cacti.weaver.protos.common.state.State.Meta import org.hyperledger.cacti.weaver.protos.common.state.State.Meta.Protocol diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ProtocolSerializer.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ProtocolSerializer.kt index 23df088899..dbeccc6359 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ProtocolSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ProtocolSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import org.hyperledger.cacti.weaver.protos.common.state.State.Meta.Protocol import net.corda.core.serialization.CordaSerializable diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/QuerySerializer.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/QuerySerializer.kt index c5bfec1182..25597b9411 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/QuerySerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/QuerySerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass.Query import net.corda.core.serialization.SerializationCustomSerializer diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/TimeSpecSerializer.kt similarity index 95% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/TimeSpecSerializer.kt index 4e04638ed4..cfbf1d6ec7 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/TimeSpecSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/TimeSpecSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ViewSerializer.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ViewSerializer.kt index a2481cf6eb..53ebb568f9 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/flows/customSerializers/ViewSerializer.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/kotlin/org/hyperledger/cacti/weaver/imodule/corda/flows/customSerializers/ViewSerializer.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers +package org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers import com.google.protobuf.ByteString import org.hyperledger.cacti.weaver.protos.common.state.State diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist b/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist index 3c98a2b1f0..d8fea929ca 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/main/resources/META-INF/services/net.corda.core.serialization.SerializationWhitelist @@ -1 +1 @@ -org.hyperledger.cacti.weaver.corda.app.interop.flows.customSerializers.CustomSerializationWhitelist +org.hyperledger.cacti.weaver.imodule.corda.flows.customSerializers.CustomSerializationWhitelist diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AccessControlPolicyTests.kt similarity index 97% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AccessControlPolicyTests.kt index eb2f8ef1c4..ccf122c1c1 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AccessControlPolicyTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AccessControlPolicyTests.kt @@ -4,12 +4,12 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Rule import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy @@ -30,8 +30,8 @@ class AccessControlPolicyTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA256Tests.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA256Tests.kt index b0ed81ad59..a3b856b291 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA256Tests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA256Tests.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.HashMechanism -import org.hyperledger.cacti.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.imodule.corda.test.* import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier @@ -47,9 +47,9 @@ class AssetExchangeHTLCSHA256Tests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -161,7 +161,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -197,7 +197,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, wrongClaimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -208,7 +208,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -219,7 +219,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -232,7 +232,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -311,7 +311,7 @@ class AssetExchangeHTLCSHA256Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA512Tests.kt similarity index 90% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA512Tests.kt index 1e1cca4f3b..c7b1d2accc 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCSHA512Tests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCSHA512Tests.kt @@ -4,16 +4,16 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.HashMechanism +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.HashMechanism -import org.hyperledger.cacti.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.imodule.corda.test.* import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.contracts.UniqueIdentifier @@ -47,9 +47,9 @@ class AssetExchangeHTLCSHA512Tests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -161,7 +161,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -197,7 +197,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -208,7 +208,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -219,7 +219,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -232,7 +232,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -247,7 +247,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo2, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -263,7 +263,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, wrongClaimInfo3, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() @@ -342,7 +342,7 @@ class AssetExchangeHTLCSHA512Tests { lockId, claimInfo, AssetStateContract.Commands.Issue(), - "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow", + "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow", issuer )) network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCWrapperTests.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCWrapperTests.kt index e092189a18..39bfc4dc21 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/AssetExchangeHTLCWrapperTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/AssetExchangeHTLCWrapperTests.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetLockHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetLockHTLCData +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimHTLCData -import org.hyperledger.cacti.weaver.corda.app.interop.test.* +import org.hyperledger.cacti.weaver.imodule.corda.test.* import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks @@ -49,9 +49,9 @@ class AssetExchangeHTLCWrapperTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.test") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.test") ))) partyA = network.createPartyNode() partyB = network.createPartyNode() @@ -114,8 +114,8 @@ class AssetExchangeHTLCWrapperTests { return tmp.getOrThrow() } - val getAssetFlow = "org.hyperledger.cacti.weaver.corda.app.interop.test.GetAssetRef" - val updateOwnerFlow = "org.hyperledger.cacti.weaver.corda.app.interop.test.UpdateOwnerFlow" + val getAssetFlow = "org.hyperledger.cacti.weaver.imodule.corda.test.GetAssetRef" + val updateOwnerFlow = "org.hyperledger.cacti.weaver.imodule.corda.test.UpdateOwnerFlow" @Test diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CertUtilsTests.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CertUtilsTests.kt index 1e45cae46e..40c64c88c6 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CertUtilsTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CertUtilsTests.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.getCertificateFromString -import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyCertificateChain -import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.imodule.corda.flows.getCertificateFromString +import org.hyperledger.cacti.weaver.imodule.corda.flows.verifyCertificateChain +import org.hyperledger.cacti.weaver.imodule.corda.flows.verifyNodeSignature import arrow.core.flatMap import arrow.core.Right -import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyCaCertificate +import org.hyperledger.cacti.weaver.imodule.corda.flows.verifyCaCertificate import org.junit.Test import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CommonHelperFunctionTests.kt similarity index 99% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CommonHelperFunctionTests.kt index 59cda9cf6a..1f723cf188 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CommonHelperFunctionTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CommonHelperFunctionTests.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.flows.* import org.junit.Test import kotlin.test.assertEquals import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CreateExternalRequestTests.kt similarity index 87% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CreateExternalRequestTests.kt index fefc1077da..0b76dcbeb7 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/CreateExternalRequestTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/CreateExternalRequestTests.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateAccessControlPolicy -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateExternalRequest -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateVerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature -import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy -import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateAccessControlPolicy +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateExternalRequest +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateVerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.imodule.corda.states.Policy +import org.hyperledger.cacti.weaver.imodule.corda.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Identifier import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -33,8 +33,8 @@ class CreateExternalRequestTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt similarity index 93% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt index 9740b028ab..ade903f880 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/HandleExternalRequestTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/HandleExternalRequestTests.kt @@ -4,18 +4,18 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Left import arrow.core.identity -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateNodeSignatureFlow -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateAccessControlPolicy -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateMembershipState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.HandleExternalRequest -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Member -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateNodeSignatureFlow +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateAccessControlPolicy +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateMembershipState +import org.hyperledger.cacti.weaver.imodule.corda.flows.HandleExternalRequest +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Member +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.states.Rule import org.hyperledger.cacti.weaver.protos.common.query.QueryOuterClass import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork @@ -37,8 +37,8 @@ class HandleExternalRequestTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows"), TestCordapp.findCordapp("com.weaver.corda.app.interop.flows") ))) partyA = network.createPartyNode() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/MembershipTests.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/MembershipTests.kt index 08764838d6..8676a11112 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/MembershipTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/MembershipTests.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Member -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Member +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.states.Rule import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -34,8 +34,8 @@ class MembershipTests { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeDriver.kt similarity index 94% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeDriver.kt index 74c7954cf4..370c0e235b 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeDriver.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeDriver.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import net.corda.core.identity.CordaX500Name import net.corda.core.utilities.getOrThrow diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeSignatureTests.kt similarity index 92% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeSignatureTests.kt index afcd42733c..7c7f712cec 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/NodeSignatureTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/NodeSignatureTests.kt @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.verifyNodeSignature +import org.hyperledger.cacti.weaver.imodule.corda.flows.verifyNodeSignature import org.junit.Test import kotlin.test.assertTrue diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/VerificationPolicyTests.kt similarity index 91% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/VerificationPolicyTests.kt index 5c8adb4909..72d0c43369 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/VerificationPolicyTests.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/VerificationPolicyTests.kt @@ -4,15 +4,15 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda import arrow.core.Either -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateVerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.DeleteVerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.UpdateVerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy -import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateVerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.flows.DeleteVerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.flows.UpdateVerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Policy +import org.hyperledger.cacti.weaver.imodule.corda.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Identifier import net.corda.core.contracts.UniqueIdentifier import net.corda.core.node.services.queryBy import net.corda.core.utilities.getOrThrow @@ -33,8 +33,8 @@ class VerificationPolicyTests { @BeforeClass @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest.kt index ca7af0b393..0ade66426b 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.* +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.* import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -30,8 +30,8 @@ class WriteExternalStateTest { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest2.kt similarity index 96% rename from weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt rename to weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest2.kt index b92403a31b..0424880006 100644 --- a/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/corda/app/interop/WriteExternalStateTest2.kt +++ b/weaver/core/network/corda-interop-app/interop-workflows/src/test/kotlin/org/hyperledger/cacti/weaver/imodule/corda/WriteExternalStateTest2.kt @@ -4,10 +4,10 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop +package org.hyperledger.cacti.weaver.imodule.corda -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.* +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.* import net.corda.core.utilities.getOrThrow import net.corda.testing.node.MockNetwork import net.corda.testing.node.MockNetworkParameters @@ -30,8 +30,8 @@ class WriteExternalStateTest2 { @JvmStatic fun setup() { network = MockNetwork(MockNetworkParameters(cordappsForAllNodes = listOf( - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.contracts"), - TestCordapp.findCordapp("org.hyperledger.cacti.weaver.corda.app.interop.flows") + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.contracts"), + TestCordapp.findCordapp("org.hyperledger.cacti.weaver.imodule.corda.flows") ))) partyA = network.createPartyNode() network.runNetwork() diff --git a/weaver/core/network/corda-interop-app/makefile b/weaver/core/network/corda-interop-app/makefile index d21bde8e04..ad985c7368 100644 --- a/weaver/core/network/corda-interop-app/makefile +++ b/weaver/core/network/corda-interop-app/makefile @@ -27,13 +27,8 @@ publish-contracts: github.properties test: ./gradlew test -.PHONY: clean-local -clean-local: - ./gradlew clean - rm -rf fabric-protos proto || true - rm -rf .gradle - .PHONY: clean -clean: github.properties +clean: ./gradlew clean rm -rf .gradle + diff --git a/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt index 92bef7c1a5..7f0372bdfa 100644 --- a/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt +++ b/weaver/core/network/corda-interop-app/test-cordapp/src/main/kotlin/TestAssetFlow.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.app.interop.test +package org.hyperledger.cacti.weaver.imodule.corda.test import co.paralleluniverse.fibers.Suspendable import net.corda.core.flows.* @@ -38,7 +38,7 @@ data class AssetState ( class AssetStateContract : Contract { companion object { - const val ID = "org.hyperledger.cacti.weaver.corda.app.interop.test.AssetStateContract" + const val ID = "org.hyperledger.cacti.weaver.imodule.corda.test.AssetStateContract" } override fun verify(tx: LedgerTransaction) { val command = tx.commands.requireSingleCommand() diff --git a/weaver/core/network/fabric-interop-cc/.env.template b/weaver/core/network/fabric-interop-cc/.env.template index 67f81144c8..ddcf31e98d 100644 --- a/weaver/core/network/fabric-interop-cc/.env.template +++ b/weaver/core/network/fabric-interop-cc/.env.template @@ -3,8 +3,8 @@ CHANNEL= PEER= ORG= NETWORK= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-cc -DOCKER_TAG=1.4.0 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-imodule-fabric-cc +DOCKER_TAG=2.0.0-alpha-prerelease EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= \ No newline at end of file diff --git a/weaver/core/network/fabric-interop-cc/libs/utils/LICENSE b/weaver/core/network/fabric-interop-cc/libs/utils/LICENSE new file mode 100644 index 0000000000..261eeb9e9f --- /dev/null +++ b/weaver/core/network/fabric-interop-cc/libs/utils/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/weaver/core/network/fabric-interop-cc/makefile b/weaver/core/network/fabric-interop-cc/makefile index 73b255a422..f9072c22b5 100644 --- a/weaver/core/network/fabric-interop-cc/makefile +++ b/weaver/core/network/fabric-interop-cc/makefile @@ -1,6 +1,6 @@ -DOCKER_IMAGE_NAME ?= weaver-fabric-cc +DOCKER_IMAGE_NAME ?= cacti-weaver-imodule-fabric DOCKER_TAG ?= `cat contracts/interop/VERSION` -DOCKER_REGISTRY ?= ghcr.io/hyperledger-labs +DOCKER_REGISTRY ?= ghcr.io/hyperledger GIT_URL = https://github.com/hyperledger/cacti/weaver/core/network/fabric-interop-cc .PHONY: build protos all clean image push-image check-if-tag-exists diff --git a/weaver/core/relay/.env.template b/weaver/core/relay/.env.template index cb1da1cf99..f6a3324eb5 100644 --- a/weaver/core/relay/.env.template +++ b/weaver/core/relay/.env.template @@ -1,8 +1,8 @@ PATH_TO_CONFIG= RELAY_NAME=<"name" in config toml file> RELAY_PORT= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-relay-server -DOCKER_TAG=1.4.2 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-relay-server +DOCKER_TAG=2.0.0-alpha-prerelease EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= \ No newline at end of file diff --git a/weaver/core/relay/.env.template.2 b/weaver/core/relay/.env.template.2 index b74e7c748a..70aa796857 100644 --- a/weaver/core/relay/.env.template.2 +++ b/weaver/core/relay/.env.template.2 @@ -8,8 +8,8 @@ RELAY_NAME= RELAY_PORT= DB_OPEN_MAX_RETRIES= DB_OPEN_RETRY_BACKOFF_MSEC= -DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-relay-server -DOCKER_TAG=1.4.2 +DOCKER_IMAGE_NAME=ghcr.io/hyperledger/cacti-weaver-relay-server +DOCKER_TAG=2.0.0-alpha-prerelease EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/weaver/core/relay/Cargo.toml b/weaver/core/relay/Cargo.toml index 1b94096cb0..f4aa953f0c 100644 --- a/weaver/core/relay/Cargo.toml +++ b/weaver/core/relay/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "relay" -version = "1.5.4" +version = "2.0.0-alpha-prerelease" authors = ["Antony Targett ", "Nick Waywood ", "Sandeep Nishad diff --git a/weaver/samples/besu/besu-cli/package-local.json b/weaver/samples/besu/besu-cli/package-local.json index f38ad08744..b24ea02bd3 100644 --- a/weaver/samples/besu/besu-cli/package-local.json +++ b/weaver/samples/besu/besu-cli/package-local.json @@ -31,8 +31,8 @@ ], "license": "MIT", "dependencies": { - "@hyperledger-labs/weaver-besu-interop-sdk": "file:../../../sdks/besu/interoperation-node-sdk", - "@hyperledger-labs/weaver-protos-js": "file:../../../common/protos-js", + "@hyperledger/cacti-weaver-sdk-besu": "file:../../../sdks/besu/node", + "@hyperledger/cacti-weaver-protos-js": "file:../../../common/protos-js", "@truffle/contract": "^4.2.14", "gluegun": "latest", "winston": "^3.3.3" diff --git a/weaver/samples/besu/besu-cli/package.json b/weaver/samples/besu/besu-cli/package.json index 1642f19435..02c7a7598a 100644 --- a/weaver/samples/besu/besu-cli/package.json +++ b/weaver/samples/besu/besu-cli/package.json @@ -31,8 +31,8 @@ ], "license": "MIT", "dependencies": { - "@hyperledger-labs/weaver-besu-interop-sdk": "~1.0.0", - "@hyperledger-labs/weaver-protos-js": "~1.5.0", + "@hyperledger/cacti-weaver-sdk-besu": "2.0.0-alpha-prerelease", + "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha-prerelease", "@truffle/contract": "^4.2.14", "gluegun": "latest", "winston": "^3.3.3" diff --git a/weaver/samples/besu/besu-cli/src/commands/asset/claim.ts b/weaver/samples/besu/besu-cli/src/commands/asset/claim.ts index 44a443d1d1..32edabea52 100644 --- a/weaver/samples/besu/besu-cli/src/commands/asset/claim.ts +++ b/weaver/samples/besu/besu-cli/src/commands/asset/claim.ts @@ -1,8 +1,8 @@ import { GluegunCommand } from 'gluegun' import { getNetworkConfig, commandHelp } from '../../helper/helper' import { getContractInstance } from '../../helper/besu-functions' -import { AssetManager } from '@hyperledger-labs/weaver-besu-interop-sdk' -import { HashFunctions } from "@hyperledger-labs/weaver-besu-interop-sdk"; +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-besu' +import { HashFunctions } from "@hyperledger/cacti-weaver-sdk-besu"; const Web3 = require('web3') diff --git a/weaver/samples/besu/besu-cli/src/commands/asset/is-locked.ts b/weaver/samples/besu/besu-cli/src/commands/asset/is-locked.ts index 28ffac3b99..1ae0d9d8a1 100644 --- a/weaver/samples/besu/besu-cli/src/commands/asset/is-locked.ts +++ b/weaver/samples/besu/besu-cli/src/commands/asset/is-locked.ts @@ -1,7 +1,7 @@ import { GluegunCommand } from 'gluegun' import { getNetworkConfig, commandHelp } from '../../helper/helper' import { getContractInstance } from '../../helper/besu-functions' -import { AssetManager } from '@hyperledger-labs/weaver-besu-interop-sdk' +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-besu' const Web3 = require('web3') const command: GluegunCommand = { diff --git a/weaver/samples/besu/besu-cli/src/commands/asset/lock.ts b/weaver/samples/besu/besu-cli/src/commands/asset/lock.ts index 83f431160d..992db102ae 100644 --- a/weaver/samples/besu/besu-cli/src/commands/asset/lock.ts +++ b/weaver/samples/besu/besu-cli/src/commands/asset/lock.ts @@ -1,8 +1,8 @@ import { GluegunCommand } from 'gluegun' import { getNetworkConfig, commandHelp } from '../../helper/helper' import { getContractInstance } from '../../helper/besu-functions' -import { AssetManager } from '@hyperledger-labs/weaver-besu-interop-sdk' -import { HashFunctions } from "@hyperledger-labs/weaver-besu-interop-sdk"; +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-besu' +import { HashFunctions } from "@hyperledger/cacti-weaver-sdk-besu"; const Web3 = require('web3') const crypto = require('crypto') diff --git a/weaver/samples/besu/besu-cli/src/commands/asset/unlock.ts b/weaver/samples/besu/besu-cli/src/commands/asset/unlock.ts index e59cb559e8..48a7766644 100644 --- a/weaver/samples/besu/besu-cli/src/commands/asset/unlock.ts +++ b/weaver/samples/besu/besu-cli/src/commands/asset/unlock.ts @@ -1,7 +1,7 @@ import { GluegunCommand } from 'gluegun' import { getNetworkConfig, commandHelp } from '../../helper/helper' import { getContractInstance } from '../../helper/besu-functions' -import { AssetManager } from '@hyperledger-labs/weaver-besu-interop-sdk' +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-besu' // import { send } from 'process' const Web3 = require('web3') diff --git a/weaver/samples/besu/besu-cli/src/commands/hash-helper.ts b/weaver/samples/besu/besu-cli/src/commands/hash-helper.ts index 80c8cd8b12..9aea31e915 100644 --- a/weaver/samples/besu/besu-cli/src/commands/hash-helper.ts +++ b/weaver/samples/besu/besu-cli/src/commands/hash-helper.ts @@ -7,7 +7,7 @@ import { GluegunCommand } from 'gluegun' import logger from '../helper/logger' import { commandHelp } from '../helper/helper' -import { HashFunctions } from '@hyperledger-labs/weaver-besu-interop-sdk' +import { HashFunctions } from '@hyperledger/cacti-weaver-sdk-besu' const command: GluegunCommand = { name: 'hash', diff --git a/weaver/samples/besu/simpleasset/package.json b/weaver/samples/besu/simpleasset/package.json index 4ca021d823..a75cbb040f 100644 --- a/weaver/samples/besu/simpleasset/package.json +++ b/weaver/samples/besu/simpleasset/package.json @@ -29,8 +29,8 @@ ], "homepage": "https://github.com/hyperledger/cacti/weaver/samples/besu/simpleasset", "dependencies": { - "@hyperledger-labs/weaver-besu-interop-sdk": "file:../../../sdks/besu/interoperation-node-sdk", - "@hyperledger-labs/weaver-protos-js": "file:../../../common/protos-js", + "@hyperledger/cacti-weaver-sdk-besu": "file:../../../sdks/besu/node", + "@hyperledger/cacti-weaver-protos-js": "file:../../../common/protos-js", "@lazyledger/protobuf3-solidity-lib": "^0.6.0", "@openzeppelin/contracts": "^4.3.2", "@truffle/contract": "^4.2.14", diff --git a/weaver/samples/corda/corda-simple-application/build.gradle b/weaver/samples/corda/corda-simple-application/build.gradle index 8ec904fe9a..a42670cc9d 100644 --- a/weaver/samples/corda/corda-simple-application/build.gradle +++ b/weaver/samples/corda/corda-simple-application/build.gradle @@ -13,8 +13,7 @@ buildscript { log4j_version = constants.getProperty("log4jVersion") slf4j_version = constants.getProperty("slf4jVersion") corda_platform_version = constants.getProperty("platformVersion").toInteger() - weaver_protos_version = constants.getProperty("weaverProtosVersion") - weaver_corda_version = constants.getProperty("weaverCordaVersion") + cacti_version = constants.getProperty("cactiVersion") } repositories { diff --git a/weaver/samples/corda/corda-simple-application/clients/build.gradle b/weaver/samples/corda/corda-simple-application/clients/build.gradle index 3564c65e4c..62c001f370 100644 --- a/weaver/samples/corda/corda-simple-application/clients/build.gradle +++ b/weaver/samples/corda/corda-simple-application/clients/build.gradle @@ -83,10 +83,10 @@ dependencies { implementation(group: 'com.fungiblehousetoken', name: 'contracts', version: "1.0") implementation(group: 'com.fungiblehousetoken', name: 'workflows', version: "1.0") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.sdk.corda', name: 'weaver-sdk-corda', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt index 35b37e887b..1deb1f8cb6 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AccessControlPolicyManager.kt @@ -21,7 +21,7 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.sdk.AccessControlPolicyManager +import org.hyperledger.cacti.weaver.sdk.corda.AccessControlPolicyManager import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl /** diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt index da302451a8..f4a291f7ff 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetExchangeManager.kt @@ -26,8 +26,8 @@ import net.corda.core.crypto.sha256 import java.time.Instant import net.corda.core.identity.CordaX500Name -import org.hyperledger.cacti.weaver.corda.sdk.AssetManager -import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.sdk.corda.AssetManager +import org.hyperledger.cacti.weaver.sdk.corda.HashFunctions import com.cordaSimpleApplication.state.AssetState import com.cordaSimpleApplication.contract.AssetContract diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt index 15736f8af3..193cc02e11 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/AssetTransferManager.kt @@ -24,14 +24,14 @@ import kotlin.system.exitProcess import net.corda.core.messaging.startFlow import java.util.Base64 import net.corda.core.identity.CordaX500Name -import org.hyperledger.cacti.weaver.corda.sdk.AssetTransferSDK -import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.sdk.corda.AssetTransferSDK +import org.hyperledger.cacti.weaver.sdk.corda.InteroperableHelper import com.cordaSimpleApplication.contract.AssetContract import com.cordaSimpleApplication.contract.BondAssetContract import java.util.Calendar -import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkId -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.flows.RetrieveNetworkId +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState import com.cordaSimpleApplication.flow.GetAssetClaimStatusByPledgeId import com.cordaSimpleApplication.flow.GetBondAssetPledgeStatusByPledgeId import com.cordaSimpleApplication.flow.GetBondAssetClaimStatusByPledgeId diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt index d9c1c50d6d..be9d542ff6 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/ConfigureNetwork.kt @@ -20,7 +20,7 @@ import java.nio.file.Paths import java.util.stream.Collectors import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.sdk.CredentialsCreator +import org.hyperledger.cacti.weaver.sdk.corda.CredentialsCreator class ConfigureCommand : CliktCommand(help ="Configure Command") { override fun run() { diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt index 123fba30d9..4ddd134edb 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenExchangeManager.kt @@ -25,8 +25,8 @@ import net.corda.core.utilities.OpaqueBytes import net.corda.core.crypto.sha256 import java.time.Instant -import org.hyperledger.cacti.weaver.corda.sdk.AssetManager -import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.sdk.corda.AssetManager +import org.hyperledger.cacti.weaver.sdk.corda.HashFunctions import com.cordaSimpleApplication.state.AssetState import com.cordaSimpleApplication.contract.AssetContract diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt index 577c483517..8fb42e249a 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/HouseTokenTransferManager.kt @@ -24,10 +24,10 @@ import net.corda.core.messaging.startFlow import org.json.JSONObject import java.util.Base64 import java.util.Calendar -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import org.hyperledger.cacti.weaver.corda.sdk.AssetTransferSDK +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.sdk.corda.AssetTransferSDK import com.cordaSimpleApplication.contract.AssetContract import net.corda.samples.tokenizedhouse.flows.GetAssetClaimStatusByPledgeId @@ -41,7 +41,7 @@ import com.google.gson.GsonBuilder import com.r3.corda.lib.tokens.contracts.commands.RedeemTokenCommand import com.r3.corda.lib.tokens.contracts.commands.IssueTokenCommand import com.r3.corda.lib.tokens.contracts.FungibleTokenContract -import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkId +import org.hyperledger.cacti.weaver.imodule.corda.flows.RetrieveNetworkId import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt index 649e554bf7..a52d7a4c47 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/InteropManager.kt @@ -21,7 +21,7 @@ import java.util.* import com.cordaSimpleApplication.flow.CreateState import com.cordaSimpleApplication.state.SimpleState -import org.hyperledger.cacti.weaver.corda.sdk.InteroperableHelper +import org.hyperledger.cacti.weaver.sdk.corda.InteroperableHelper /** * The CLI command used to trigger a request for state from an external network. diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt index 3c1af69ccb..155d42fcd1 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/MembershipManager.kt @@ -21,7 +21,7 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.sdk.MembershipManager +import org.hyperledger.cacti.weaver.sdk.corda.MembershipManager import org.hyperledger.cacti.weaver.protos.common.membership.MembershipOuterClass /** diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt index 57315758a6..f60e696ddf 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/NetworkIdStateManager.kt @@ -6,8 +6,8 @@ package com.cordaSimpleApplication.client -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateNetworkIdState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.RetrieveNetworkIdStateAndRef +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateNetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.flows.RetrieveNetworkIdStateAndRef import com.cordaSimpleApplication.flow.TransferAssetStateInitiator import com.github.ajalt.clikt.core.CliktCommand import com.github.ajalt.clikt.core.requireObject @@ -17,7 +17,7 @@ import com.github.ajalt.clikt.parameters.options.flag import com.github.ajalt.clikt.parameters.options.default import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.app.interop.states.NetworkIdState +import org.hyperledger.cacti.weaver.imodule.corda.states.NetworkIdState import java.lang.Exception import net.corda.core.messaging.startFlow diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt index a5bf684e5f..8c7ceff2a4 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/UtilsManager.kt @@ -22,8 +22,8 @@ import kotlin.system.exitProcess import java.util.Base64 import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.app.interop.flows.x509CertToPem -import org.hyperledger.cacti.weaver.corda.sdk.HashFunctions +import org.hyperledger.cacti.weaver.imodule.corda.flows.x509CertToPem +import org.hyperledger.cacti.weaver.sdk.corda.HashFunctions class UtilsCommand : CliktCommand(name = "utils", help ="Manages utilities") { override fun run() { diff --git a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt index 8c3bb5dd9b..6e3c035bd7 100644 --- a/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt +++ b/weaver/samples/corda/corda-simple-application/clients/src/main/kotlin/com/cordaSimpleApplication/client/VerificationPolicyManager.kt @@ -21,7 +21,7 @@ import com.google.protobuf.util.JsonFormat import net.corda.core.identity.CordaX500Name import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.sdk.VerificationPolicyManager +import org.hyperledger.cacti.weaver.sdk.corda.VerificationPolicyManager import org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass /** diff --git a/weaver/samples/corda/corda-simple-application/constants.properties b/weaver/samples/corda/corda-simple-application/constants.properties index 5b9637fec4..3580bad084 100644 --- a/weaver/samples/corda/corda-simple-application/constants.properties +++ b/weaver/samples/corda/corda-simple-application/constants.properties @@ -9,5 +9,4 @@ log4jVersion =2.16.0 platformVersion=10 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final -weaverProtosVersion=1.5.7 -weaverCordaVersion=1.2.14 +cactiVersion=2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/github.properties.template b/weaver/samples/corda/corda-simple-application/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle index aecbb70ded..d1974c2992 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/build.gradle @@ -41,8 +41,8 @@ configurations { dependencies { compile 'com.google.code.gson:gson:2.8.6' - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt index 1454e24c83..c9f6423c4f 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/AssetFlow.kt @@ -31,10 +31,10 @@ import sun.security.x509.UniqueIdentity import java.util.* import com.google.gson.Gson import com.google.gson.GsonBuilder -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.imodule.corda.flows.AssetPledgeStateToProtoBytes /** diff --git a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt index 655541ee6a..bb31481879 100644 --- a/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt +++ b/weaver/samples/corda/corda-simple-application/workflows-kotlin/src/main/kotlin/com/example/flow/BondAssetFlow.kt @@ -31,10 +31,10 @@ import sun.security.x509.UniqueIdentity import java.util.* import com.google.gson.Gson import com.google.gson.GsonBuilder -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.imodule.corda.flows.AssetPledgeStateToProtoBytes /** diff --git a/weaver/samples/corda/fungible-house-token/build.gradle b/weaver/samples/corda/fungible-house-token/build.gradle index dd57ea050d..af15d8766b 100644 --- a/weaver/samples/corda/fungible-house-token/build.gradle +++ b/weaver/samples/corda/fungible-house-token/build.gradle @@ -18,7 +18,7 @@ buildscript { //TokenSDK tokens_release_group = 'com.r3.corda.lib.tokens' tokens_release_version = '1.2' - weaver_version = constants.getProperty("weaverCordaVersion") + cacti_version = constants.getProperty("cactiVersion") } repositories { @@ -83,8 +83,8 @@ allprojects { dependencies { compile 'com.google.code.gson:gson:2.8.6' - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") } tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile) { diff --git a/weaver/samples/corda/fungible-house-token/constants.properties b/weaver/samples/corda/fungible-house-token/constants.properties index 42499492eb..72cc7b6b31 100644 --- a/weaver/samples/corda/fungible-house-token/constants.properties +++ b/weaver/samples/corda/fungible-house-token/constants.properties @@ -10,4 +10,4 @@ log4jVersion =2.16.0 platformVersion=10 slf4jVersion=1.7.25 nettyVersion=4.1.22.Final -weaverCordaVersion=1.2.14 +cactiVersion=2.0.0-alpha-prerelease diff --git a/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt b/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt index 3d0c956bd5..9cd256c552 100644 --- a/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt +++ b/weaver/samples/corda/fungible-house-token/extension-flows/AssetTransferHelperFlows.kt @@ -1,9 +1,9 @@ package net.corda.samples.tokenizedhouse.flows -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetClaimStatusState -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetAssetPledgeStatus -import org.hyperledger.cacti.weaver.corda.app.interop.flows.AssetPledgeStateToProtoBytes +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetClaimStatusState +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetAssetPledgeStatus +import org.hyperledger.cacti.weaver.imodule.corda.flows.AssetPledgeStateToProtoBytes import net.corda.samples.tokenizedhouse.states.FungibleHouseTokenJson import com.google.gson.Gson import com.google.gson.GsonBuilder diff --git a/weaver/samples/fabric/fabric-cli/.npmrc.template b/weaver/samples/fabric/fabric-cli/.npmrc.template index b3197a2f00..14ca0a1e2c 100644 --- a/weaver/samples/fabric/fabric-cli/.npmrc.template +++ b/weaver/samples/fabric/fabric-cli/.npmrc.template @@ -1,2 +1,2 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs +@hyperledger:registry=https://npm.pkg.github.com/hyperledger //npm.pkg.github.com/:_authToken= diff --git a/weaver/samples/fabric/fabric-cli/package-local.json b/weaver/samples/fabric/fabric-cli/package-local.json index fca9fbf797..780cd9f154 100644 --- a/weaver/samples/fabric/fabric-cli/package-local.json +++ b/weaver/samples/fabric/fabric-cli/package-local.json @@ -32,8 +32,8 @@ ], "license": "MIT", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "file:../../../common/protos-js", - "@hyperledger-labs/weaver-fabric-interop-sdk": "file:../../../sdks/fabric/interoperation-node-sdk", + "@hyperledger/cacti-weaver-protos-js": "file:../../../common/protos-js", + "@hyperledger/cacti-weaver-sdk-fabric": "file:../../../sdks/fabric/interoperation-node-sdk", "@fidm/x509": "^1.2.1", "crypto": "^1.0.1", "dotenv": "^8.2.0", diff --git a/weaver/samples/fabric/fabric-cli/package.json b/weaver/samples/fabric/fabric-cli/package.json index c3ecdafae4..9eef0df080 100644 --- a/weaver/samples/fabric/fabric-cli/package.json +++ b/weaver/samples/fabric/fabric-cli/package.json @@ -33,8 +33,8 @@ "license": "MIT", "dependencies": { "@fidm/x509": "^1.2.1", - "@hyperledger-labs/weaver-fabric-interop-sdk": "latest", - "@hyperledger-labs/weaver-protos-js": "latest", + "@hyperledger/cacti-weaver-sdk-fabric": "latest", + "@hyperledger/cacti-weaver-protos-js": "latest", "body-parser": "^1.20.0", "crypto": "^1.0.1", "dotenv": "^8.2.0", diff --git a/weaver/samples/fabric/fabric-cli/readme.md b/weaver/samples/fabric/fabric-cli/readme.md index 5a3d7340e2..f9fe5b2956 100644 --- a/weaver/samples/fabric/fabric-cli/readme.md +++ b/weaver/samples/fabric/fabric-cli/readme.md @@ -40,7 +40,7 @@ The Fabric CLI can be configured either to depend on the published Weaver SDK or ### Using Published Weaver SDK -The `fabric-cli` depends on the npm package `@hyperledger-labs/weaver-fabric-interop-sdk`. To pull this package from Github, run the following steps: +The `fabric-cli` depends on the npm package `@hyperledger/cacti-weaver-sdk-fabric`. To pull this package from Github, run the following steps: 1) Create a Personal Access Token from Github with read access to packages. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help. \ 2) Create a copy of `.npmrc.template` as `.npmrc`. \ 3) Replace in copied `.npmrc` file with your personal access token. \ diff --git a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange-all.ts b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange-all.ts index 65724109c9..d7e5dcbcbf 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange-all.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange-all.ts @@ -8,7 +8,7 @@ import { GluegunCommand } from 'gluegun' import { fabricHelper, invoke } from '../../helpers/fabric-functions' import logger from '../../helpers/logger' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { AssetManager, HashFunctions } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetManager, HashFunctions } from '@hyperledger/cacti-weaver-sdk-fabric' var crypto = require('crypto'); diff --git a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/claim.ts b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/claim.ts index f3c3bbd9c2..9a8e9fd4d4 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/claim.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/claim.ts @@ -8,7 +8,7 @@ import { GluegunCommand } from 'gluegun' import { fabricHelper } from '../../../helpers/fabric-functions' import logger from '../../../helpers/logger' import { commandHelp, getNetworkConfig, handlePromise } from '../../../helpers/helpers' -import { AssetManager, HashFunctions } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetManager, HashFunctions } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'claim', diff --git a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/is-locked.ts b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/is-locked.ts index 5536060438..50e49b6374 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/is-locked.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/is-locked.ts @@ -8,7 +8,7 @@ import { GluegunCommand } from 'gluegun' import { fabricHelper } from '../../../helpers/fabric-functions' import logger from '../../../helpers/logger' import { commandHelp, getNetworkConfig, handlePromise } from '../../../helpers/helpers' -import { AssetManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'is-locked', diff --git a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/lock.ts b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/lock.ts index 87f84a581b..d851fd99b9 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/lock.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/lock.ts @@ -8,7 +8,7 @@ import { GluegunCommand } from 'gluegun' import { fabricHelper } from '../../../helpers/fabric-functions' import logger from '../../../helpers/logger' import { commandHelp, getNetworkConfig, handlePromise } from '../../../helpers/helpers' -import { AssetManager, HashFunctions } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetManager, HashFunctions } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'lock', diff --git a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/unlock.ts b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/unlock.ts index 964c140d25..a7624ed74b 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/unlock.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/asset/exchange/unlock.ts @@ -8,7 +8,7 @@ import { GluegunCommand } from 'gluegun' import { fabricHelper } from '../../../helpers/fabric-functions' import logger from '../../../helpers/logger' import { commandHelp, getNetworkConfig, handlePromise } from '../../../helpers/helpers' -import { AssetManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetManager } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'unlock', diff --git a/weaver/samples/fabric/fabric-cli/src/commands/configure/membership.ts b/weaver/samples/fabric/fabric-cli/src/commands/configure/membership.ts index d37b9d8d26..6c71896cbd 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/configure/membership.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/configure/membership.ts @@ -10,7 +10,7 @@ import logger from '../../helpers/logger' import * as path from 'path' import * as dotenv from 'dotenv' import * as fs from 'fs' -import { MembershipManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { MembershipManager } from '@hyperledger/cacti-weaver-sdk-fabric' dotenv.config({ path: path.resolve(__dirname, '../../.env') }) const command: GluegunCommand = { diff --git a/weaver/samples/fabric/fabric-cli/src/commands/event/get-all.ts b/weaver/samples/fabric/fabric-cli/src/commands/event/get-all.ts index 7a6fb59249..31db4d7aad 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/event/get-all.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/event/get-all.ts @@ -9,8 +9,8 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../hel import logger from '../../helpers/logger' import { Utils, ICryptoKey } from 'fabric-common' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { EventsManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' -import { EventSubscriptionState, EventType } from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import { EventsManager } from '@hyperledger/cacti-weaver-sdk-fabric' +import { EventSubscriptionState, EventType } from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import * as fs from 'fs' import * as path from 'path' diff --git a/weaver/samples/fabric/fabric-cli/src/commands/event/get-subscription-status.ts b/weaver/samples/fabric/fabric-cli/src/commands/event/get-subscription-status.ts index cebbe91c20..52c65b2ef2 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/event/get-subscription-status.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/event/get-subscription-status.ts @@ -9,8 +9,8 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../hel import logger from '../../helpers/logger' import { Utils, ICryptoKey } from 'fabric-common' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { EventsManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' -import { EventSubscriptionState, EventType } from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import { EventsManager } from '@hyperledger/cacti-weaver-sdk-fabric' +import { EventSubscriptionState, EventType } from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import * as fs from 'fs' import * as path from 'path' diff --git a/weaver/samples/fabric/fabric-cli/src/commands/event/receive.ts b/weaver/samples/fabric/fabric-cli/src/commands/event/receive.ts index cecb65d4b0..791b308603 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/event/receive.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/event/receive.ts @@ -9,8 +9,8 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../hel import logger from '../../helpers/logger' import { Utils, ICryptoKey } from 'fabric-common' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { EventsManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' -import { EventSubscriptionState, EventType } from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import { EventsManager } from '@hyperledger/cacti-weaver-sdk-fabric' +import { EventSubscriptionState, EventType } from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import * as fs from 'fs' import * as path from 'path' import * as express from 'express'; diff --git a/weaver/samples/fabric/fabric-cli/src/commands/event/subscribe.ts b/weaver/samples/fabric/fabric-cli/src/commands/event/subscribe.ts index a219fa3efb..695a5d96cd 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/event/subscribe.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/event/subscribe.ts @@ -9,8 +9,8 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../hel import logger from '../../helpers/logger' import { Utils, ICryptoKey } from 'fabric-common' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { EventsManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' -import { EventSubscriptionState, EventType } from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import { EventsManager } from '@hyperledger/cacti-weaver-sdk-fabric' +import { EventSubscriptionState, EventType } from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import * as fs from 'fs' import * as path from 'path' diff --git a/weaver/samples/fabric/fabric-cli/src/commands/event/unsubscribe.ts b/weaver/samples/fabric/fabric-cli/src/commands/event/unsubscribe.ts index 7707251600..9876b2f57d 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/event/unsubscribe.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/event/unsubscribe.ts @@ -9,8 +9,8 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../hel import logger from '../../helpers/logger' import { Utils, ICryptoKey } from 'fabric-common' import { commandHelp, getNetworkConfig, handlePromise } from '../../helpers/helpers' -import { EventsManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' -import { EventSubscriptionState, EventType } from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import { EventsManager } from '@hyperledger/cacti-weaver-sdk-fabric' +import { EventSubscriptionState, EventType } from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import * as fs from 'fs' import * as path from 'path' diff --git a/weaver/samples/fabric/fabric-cli/src/commands/hash-helper.ts b/weaver/samples/fabric/fabric-cli/src/commands/hash-helper.ts index dc6d5a8d85..ce91eb8962 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/hash-helper.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/hash-helper.ts @@ -7,7 +7,7 @@ import { GluegunCommand } from 'gluegun' import logger from '../helpers/logger' import { commandHelp } from '../helpers/helpers' -import { HashFunctions } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { HashFunctions } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'hash', diff --git a/weaver/samples/fabric/fabric-cli/src/commands/relay/get.ts b/weaver/samples/fabric/fabric-cli/src/commands/relay/get.ts index 8ccd3a6101..37aefa1e36 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/relay/get.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/relay/get.ts @@ -5,7 +5,7 @@ */ import { GluegunCommand } from 'gluegun' -import { RelayHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { RelayHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import { commandHelp, getNetworkConfig } from '../../helpers/helpers' import logger from '../../helpers/logger' diff --git a/weaver/samples/fabric/fabric-cli/src/commands/relay/poll.ts b/weaver/samples/fabric/fabric-cli/src/commands/relay/poll.ts index e6691dc543..49c4aae546 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/relay/poll.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/relay/poll.ts @@ -16,7 +16,7 @@ import { fabricHelper, getKeyAndCertForRemoteRequestbyUserName } from '../../helpers/fabric-functions' -import { RelayHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { RelayHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import * as path from 'path' import * as dotenv from 'dotenv' dotenv.config({ path: path.resolve(__dirname, '../../.env') }) diff --git a/weaver/samples/fabric/fabric-cli/src/commands/relay/send.ts b/weaver/samples/fabric/fabric-cli/src/commands/relay/send.ts index e87d682494..94c20e49b1 100644 --- a/weaver/samples/fabric/fabric-cli/src/commands/relay/send.ts +++ b/weaver/samples/fabric/fabric-cli/src/commands/relay/send.ts @@ -21,7 +21,7 @@ import { } from '../../helpers/fabric-functions' dotenv.config({ path: path.resolve(__dirname, '../../.env') }) -import { RelayHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { RelayHelper } from '@hyperledger/cacti-weaver-sdk-fabric' const command: GluegunCommand = { name: 'send', description: 'Sends a query to the local relay.', diff --git a/weaver/samples/fabric/fabric-cli/src/helpers/fabric-functions.ts b/weaver/samples/fabric/fabric-cli/src/helpers/fabric-functions.ts index c327a5d051..db92df3693 100644 --- a/weaver/samples/fabric/fabric-cli/src/helpers/fabric-functions.ts +++ b/weaver/samples/fabric/fabric-cli/src/helpers/fabric-functions.ts @@ -9,9 +9,9 @@ import { commandHelp, getNetworkConfig, saveUserCertToFile, handlePromise } from import * as FabricCAServices from 'fabric-ca-client' import { Certificate } from '@fidm/x509' import { Utils, ICryptoKey } from 'fabric-common' -import * as membership_pb from "@hyperledger-labs/weaver-protos-js/common/membership_pb" -import * as iin_agent_pb from "@hyperledger-labs/weaver-protos-js/identity/agent_pb" -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import * as membership_pb from "@hyperledger/cacti-weaver-protos-js/common/membership_pb" +import * as iin_agent_pb from "@hyperledger/cacti-weaver-protos-js/identity/agent_pb" +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import * as path from 'path' import * as dotenv from 'dotenv' dotenv.config({ path: path.resolve(__dirname, '../../.env') }) diff --git a/weaver/samples/fabric/fabric-cli/src/helpers/helpers.ts b/weaver/samples/fabric/fabric-cli/src/helpers/helpers.ts index 00c7d9b50c..e914a9aeba 100644 --- a/weaver/samples/fabric/fabric-cli/src/helpers/helpers.ts +++ b/weaver/samples/fabric/fabric-cli/src/helpers/helpers.ts @@ -8,8 +8,8 @@ import { GluegunCommand } from 'gluegun' import { Toolbox } from 'gluegun/build/types/domain/toolbox' import { GluegunPrint } from 'gluegun/build/types/toolbox/print-types' import { getKeyAndCertForRemoteRequestbyUserName, fabricHelper, invoke, query, InvocationSpec } from './fabric-functions' -import { AssetPledge } from "@hyperledger-labs/weaver-protos-js/common/asset_transfer_pb" -import { InteroperableHelper } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { AssetPledge } from "@hyperledger/cacti-weaver-protos-js/common/asset_transfer_pb" +import { InteroperableHelper } from '@hyperledger/cacti-weaver-sdk-fabric' import * as crypto from 'crypto' import { promisify } from 'util' import * as fs from 'fs' diff --git a/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts b/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts index 5aec0928b3..b85bbc1db6 100644 --- a/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts +++ b/weaver/samples/fabric/fabric-cli/src/helpers/interop-setup/configure-network.ts @@ -13,7 +13,7 @@ import { fabricHelper } from '../fabric-functions' import { handlePromise, getNetworkConfig } from '../helpers' -import { MembershipManager } from '@hyperledger-labs/weaver-fabric-interop-sdk' +import { MembershipManager } from '@hyperledger/cacti-weaver-sdk-fabric' const helperInvoke = async (userId, ccFunc, ccArg, ...args) => { const [contractName, channelName, connProfilePath, networkName, logger] = args diff --git a/weaver/sdks/besu/interoperation-node-sdk/.npmrc.template b/weaver/sdks/besu/interoperation-node-sdk/.npmrc.template deleted file mode 100644 index b3197a2f00..0000000000 --- a/weaver/sdks/besu/interoperation-node-sdk/.npmrc.template +++ /dev/null @@ -1,2 +0,0 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs -//npm.pkg.github.com/:_authToken= diff --git a/weaver/sdks/besu/interoperation-node-sdk/.gitignore b/weaver/sdks/besu/node/.gitignore similarity index 100% rename from weaver/sdks/besu/interoperation-node-sdk/.gitignore rename to weaver/sdks/besu/node/.gitignore diff --git a/weaver/sdks/besu/interoperation-node-sdk/.npmignore b/weaver/sdks/besu/node/.npmignore similarity index 100% rename from weaver/sdks/besu/interoperation-node-sdk/.npmignore rename to weaver/sdks/besu/node/.npmignore diff --git a/weaver/sdks/besu/node/.npmrc.template b/weaver/sdks/besu/node/.npmrc.template new file mode 100644 index 0000000000..14ca0a1e2c --- /dev/null +++ b/weaver/sdks/besu/node/.npmrc.template @@ -0,0 +1,2 @@ +@hyperledger:registry=https://npm.pkg.github.com/hyperledger +//npm.pkg.github.com/:_authToken= diff --git a/weaver/sdks/besu/interoperation-node-sdk/README.md b/weaver/sdks/besu/node/README.md similarity index 94% rename from weaver/sdks/besu/interoperation-node-sdk/README.md rename to weaver/sdks/besu/node/README.md index c9777576f4..f95688e142 100644 --- a/weaver/sdks/besu/interoperation-node-sdk/README.md +++ b/weaver/sdks/besu/node/README.md @@ -3,7 +3,7 @@ SPDX-License-Identifier: CC-BY-4.0 --> -# weaver-besu-interop-sdk +# Cacti - Weaver Besu SDK Client library functions for Besu Interoperation. @@ -34,7 +34,7 @@ Run `npm run docs` to generate docs. View docs via the generated html file. 2) Create a copy of `.npmrc.template` as `.npmrc`. 3) Replace in copied `.npmrc` file with your personal access token. 4) Now put this `.npmrc` file in your application in same level as package.json. -5) Now you can run `npm install @hyperledger-labs/weaver-besu-interop-sdk` in your application directory to install the latest version. +5) Now you can run `npm install @hyperledger/cacti-weaver-sdk-besu` in your application directory to install the latest version. # Steps to publish 1) Create a Personal Access Token from Github with write/read/delete access to packages. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help. diff --git a/weaver/sdks/besu/interoperation-node-sdk/index.js b/weaver/sdks/besu/node/index.js similarity index 100% rename from weaver/sdks/besu/interoperation-node-sdk/index.js rename to weaver/sdks/besu/node/index.js diff --git a/weaver/sdks/besu/interoperation-node-sdk/makefile b/weaver/sdks/besu/node/makefile similarity index 100% rename from weaver/sdks/besu/interoperation-node-sdk/makefile rename to weaver/sdks/besu/node/makefile diff --git a/weaver/sdks/besu/interoperation-node-sdk/package-local.json b/weaver/sdks/besu/node/package-local.json similarity index 89% rename from weaver/sdks/besu/interoperation-node-sdk/package-local.json rename to weaver/sdks/besu/node/package-local.json index 2422170399..f4fc141f50 100644 --- a/weaver/sdks/besu/interoperation-node-sdk/package-local.json +++ b/weaver/sdks/besu/node/package-local.json @@ -1,7 +1,7 @@ { - "name": "@hyperledger-labs/weaver-besu-interop-sdk", + "name": "@hyperledger/cacti-weaver-sdk-besu", "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", - "version": "1.0.1", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "build/index.js", "scripts": { @@ -16,7 +16,7 @@ }, "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "file:./protos-js", + "@hyperledger/cacti-weaver-protos-js": "file:./protos-js", "log4js": "^6.7.0", "web3": "^1.8.1" }, diff --git a/weaver/sdks/besu/interoperation-node-sdk/package.json b/weaver/sdks/besu/node/package.json similarity index 84% rename from weaver/sdks/besu/interoperation-node-sdk/package.json rename to weaver/sdks/besu/node/package.json index ca67380967..7f93550e5d 100644 --- a/weaver/sdks/besu/interoperation-node-sdk/package.json +++ b/weaver/sdks/besu/node/package.json @@ -1,7 +1,7 @@ { - "name": "@hyperledger-labs/weaver-besu-interop-sdk", + "name": "@hyperledger/cacti-weaver-sdk-besu", "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", - "version": "1.0.1", + "version": "2.0.0-alpha-prerelease", "description": "", "main": "build/index.js", "scripts": { @@ -16,7 +16,7 @@ }, "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "^1.5.7", + "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha-prerelease", "log4js": "^6.7.0", "web3": "^1.8.1" }, @@ -43,6 +43,6 @@ "typescript": "^4.8.4" }, "publishConfig": { - "registry": "https://npm.pkg.github.com/hyperledger-labs" + "registry": "https://npm.pkg.github.com/hyperledger" } } diff --git a/weaver/sdks/besu/interoperation-node-sdk/src/AssetManager.ts b/weaver/sdks/besu/node/src/AssetManager.ts similarity index 99% rename from weaver/sdks/besu/interoperation-node-sdk/src/AssetManager.ts rename to weaver/sdks/besu/node/src/AssetManager.ts index 2f827fa271..ed54f53d16 100644 --- a/weaver/sdks/besu/interoperation-node-sdk/src/AssetManager.ts +++ b/weaver/sdks/besu/node/src/AssetManager.ts @@ -5,7 +5,7 @@ * This file provides helper functions for interoperability operations. **/ /** End file docs */ -import * as assetLocksPb from "@hyperledger-labs/weaver-protos-js/common/asset_locks_pb"; +import * as assetLocksPb from "@hyperledger/cacti-weaver-protos-js/common/asset_locks_pb"; import * as Web3 from 'web3-utils'; import { Hash, SHA256 } from "./HashFunctions"; diff --git a/weaver/sdks/besu/interoperation-node-sdk/src/HashFunctions.ts b/weaver/sdks/besu/node/src/HashFunctions.ts similarity index 96% rename from weaver/sdks/besu/interoperation-node-sdk/src/HashFunctions.ts rename to weaver/sdks/besu/node/src/HashFunctions.ts index c92e48e212..982afebdac 100644 --- a/weaver/sdks/besu/interoperation-node-sdk/src/HashFunctions.ts +++ b/weaver/sdks/besu/node/src/HashFunctions.ts @@ -5,7 +5,7 @@ */ import * as crypto from 'crypto'; -import { HashMechanism } from "@hyperledger-labs/weaver-protos-js/common/asset_locks_pb"; +import { HashMechanism } from "@hyperledger/cacti-weaver-protos-js/common/asset_locks_pb"; //TODO: move all common node SDK functions to one place, instead of replicating in each SDK diff --git a/weaver/sdks/besu/interoperation-node-sdk/tsconfig.json b/weaver/sdks/besu/node/tsconfig.json similarity index 100% rename from weaver/sdks/besu/interoperation-node-sdk/tsconfig.json rename to weaver/sdks/besu/node/tsconfig.json diff --git a/weaver/sdks/corda/README.md b/weaver/sdks/corda/README.md index 4238b79e66..f4412bbe45 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-labs/weaver-dlt-interoperability + url https://maven.pkg.github.com/hyperledger/cacti credentials { username password @@ -64,9 +64,9 @@ repositories { } } dependencies { - implementation(group: 'org.hyperledger.cacti.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.2.3") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.3") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.sdk.corda', name: 'weaver-sdk-corda', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "1.2.3") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "1.2.3") implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "1.2.3") } ``` diff --git a/weaver/sdks/corda/build.gradle b/weaver/sdks/corda/build.gradle index 9d697a9e44..1949876e9d 100644 --- a/weaver/sdks/corda/build.gradle +++ b/weaver/sdks/corda/build.gradle @@ -13,8 +13,7 @@ buildscript { ext.corda_gradle_plugins_version = "5.0.12" ext.log4j_version = "2.16.0" ext.slf4j_version = "1.7.25" - ext.weaver_protos_version = "1.5.7" - ext.weaver_corda_version = "1.2.14" + ext.cacti_version = "2.0.0-alpha-prerelease" dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -68,9 +67,9 @@ dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_version" - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'org.hyperledger.cacti.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-contracts', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.imodule.corda', name: 'interop-workflows', version: "$cacti_version") + implementation(group: 'org.hyperledger.cacti.weaver.protos', name: 'protos-java-kt', version: "$cacti_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/weaver/sdks/corda/github.properties.template b/weaver/sdks/corda/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/sdks/corda/gradle.properties b/weaver/sdks/corda/gradle.properties index c31b06ea0c..ce835c2c9b 100644 --- a/weaver/sdks/corda/gradle.properties +++ b/weaver/sdks/corda/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official -name=weaver-corda-sdk -group=org.hyperledger.cacti.weaver.corda.sdk -version=1.2.14 +name=weaver-sdk-corda +group=org.hyperledger.cacti.weaver.sdk.corda +version=2.0.0-alpha-prerelease kotlin.incremental=false diff --git a/weaver/sdks/corda/settings.gradle b/weaver/sdks/corda/settings.gradle index 3fa8d52ccb..a0bdd732ed 100644 --- a/weaver/sdks/corda/settings.gradle +++ b/weaver/sdks/corda/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = "weaver-corda-sdk" +rootProject.name = "weaver-sdk-corda" diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AccessControlPolicyManager.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AccessControlPolicyManager.kt index 589120898d..2e6e10a14e 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AccessControlPolicyManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AccessControlPolicyManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -19,9 +19,9 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.app.interop.states.AccessControlPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Rule -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AccessControlPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Rule +import org.hyperledger.cacti.weaver.imodule.corda.flows.* import org.hyperledger.cacti.weaver.protos.common.access_control.AccessControl diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetManager.kt similarity index 98% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetManager.kt index 591aeb49e7..b9bd6a77c9 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -20,8 +20,8 @@ import net.corda.core.identity.Party import java.lang.Exception import java.util.* import com.google.protobuf.ByteString -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetExchangeHTLCState +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetExchangeHTLCState import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetTransferSDK.kt similarity index 97% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetTransferSDK.kt index 4840e870c3..f9f971be46 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/AssetTransferSDK.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/AssetTransferSDK.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -20,11 +20,11 @@ import net.corda.core.identity.Party import java.lang.Exception import java.util.* import com.google.protobuf.ByteString -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeState -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetPledgeParameters -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetClaimParameters -import org.hyperledger.cacti.weaver.corda.app.interop.states.AssetReclaimParameters +import org.hyperledger.cacti.weaver.imodule.corda.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeState +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetPledgeParameters +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetClaimParameters +import org.hyperledger.cacti.weaver.imodule.corda.states.AssetReclaimParameters import org.hyperledger.cacti.weaver.protos.common.asset_transfer.AssetTransfer diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsCreator.kt similarity index 99% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsCreator.kt index 92819d7784..34d29bdadd 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsCreator.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsCreator.kt @@ -7,7 +7,7 @@ * Helper function used by ConfigureCreateAllCommand */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import net.corda.core.contracts.UniqueIdentifier import org.json.JSONObject diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsExtractor.java similarity index 99% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsExtractor.java index da11df388b..8b36177e22 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/CredentialsExtractor.java +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/CredentialsExtractor.java @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import java.io.BufferedReader; import java.io.File; diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/HashFunctions.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/HashFunctions.kt index df303cbb6d..fac95b4436 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/HashFunctions.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/HashFunctions.kt @@ -4,14 +4,14 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import java.util.Base64 import net.corda.core.utilities.OpaqueBytes import net.corda.core.crypto.sha256 import kotlin.random.Random import org.hyperledger.cacti.weaver.protos.common.asset_locks.AssetLocks.HashMechanism -import org.hyperledger.cacti.weaver.corda.app.interop.states.sha512 +import org.hyperledger.cacti.weaver.imodule.corda.states.sha512 class HashFunctions { /* diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/InteroperableHelper.kt similarity index 98% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/InteroperableHelper.kt index 5410c8434c..1148c2e9e7 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/InteroperableHelper.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/InteroperableHelper.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory import net.corda.core.messaging.startFlow import net.corda.core.messaging.CordaRPCOps -import org.hyperledger.cacti.weaver.corda.app.interop.flows.CreateExternalRequest -import org.hyperledger.cacti.weaver.corda.app.interop.flows.WriteExternalStateInitiator -import org.hyperledger.cacti.weaver.corda.app.interop.flows.GetExternalStateByLinearId +import org.hyperledger.cacti.weaver.imodule.corda.flows.CreateExternalRequest +import org.hyperledger.cacti.weaver.imodule.corda.flows.WriteExternalStateInitiator +import org.hyperledger.cacti.weaver.imodule.corda.flows.GetExternalStateByLinearId import org.hyperledger.cacti.weaver.protos.common.interop_payload.InteropPayloadOuterClass import org.hyperledger.cacti.weaver.protos.common.state.State import org.hyperledger.cacti.weaver.protos.corda.ViewDataOuterClass diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/MembershipManager.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/MembershipManager.kt index 3981fbfc52..1aff732727 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/MembershipManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/MembershipManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -19,9 +19,9 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.app.interop.states.MembershipState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Member -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.MembershipState +import org.hyperledger.cacti.weaver.imodule.corda.states.Member +import org.hyperledger.cacti.weaver.imodule.corda.flows.* import org.hyperledger.cacti.weaver.protos.common.membership.MembershipOuterClass diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/RelayClient.kt similarity index 98% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/RelayClient.kt index 7ed45e0642..87a0a23a40 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/RelayClient.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/RelayClient.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import io.grpc.ManagedChannel import io.grpc.Status diff --git a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/VerificationPolicyManager.kt similarity index 96% rename from weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt rename to weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/VerificationPolicyManager.kt index f97a7b3574..e0077e033d 100644 --- a/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/corda/sdk/VerificationPolicyManager.kt +++ b/weaver/sdks/corda/src/main/kotlin/org/hyperledger/cacti/weaver/sdk/corda/VerificationPolicyManager.kt @@ -4,7 +4,7 @@ * SPDX-License-Identifier: Apache-2.0 */ -package org.hyperledger.cacti.weaver.corda.sdk; +package org.hyperledger.cacti.weaver.sdk.corda; import arrow.core.Either import arrow.core.Left @@ -19,10 +19,10 @@ import net.corda.core.messaging.CordaRPCOps import net.corda.core.contracts.UniqueIdentifier import net.corda.core.identity.Party -import org.hyperledger.cacti.weaver.corda.app.interop.states.VerificationPolicyState -import org.hyperledger.cacti.weaver.corda.app.interop.states.Identifier -import org.hyperledger.cacti.weaver.corda.app.interop.states.Policy -import org.hyperledger.cacti.weaver.corda.app.interop.flows.* +import org.hyperledger.cacti.weaver.imodule.corda.states.VerificationPolicyState +import org.hyperledger.cacti.weaver.imodule.corda.states.Identifier +import org.hyperledger.cacti.weaver.imodule.corda.states.Policy +import org.hyperledger.cacti.weaver.imodule.corda.flows.* import org.hyperledger.cacti.weaver.protos.common.verification_policy.VerificationPolicyOuterClass diff --git a/weaver/sdks/fabric/go-sdk/VERSION b/weaver/sdks/fabric/go-sdk/VERSION index c813fe116c..eca2b7d195 100644 --- a/weaver/sdks/fabric/go-sdk/VERSION +++ b/weaver/sdks/fabric/go-sdk/VERSION @@ -1 +1 @@ -1.2.5 +2.0.0-alpha-prerelease \ No newline at end of file diff --git a/weaver/sdks/fabric/interoperation-node-sdk/.npmrc.template b/weaver/sdks/fabric/interoperation-node-sdk/.npmrc.template index b3197a2f00..14ca0a1e2c 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/.npmrc.template +++ b/weaver/sdks/fabric/interoperation-node-sdk/.npmrc.template @@ -1,2 +1,2 @@ -@hyperledger-labs:registry=https://npm.pkg.github.com/hyperledger-labs +@hyperledger:registry=https://npm.pkg.github.com/hyperledger //npm.pkg.github.com/:_authToken= diff --git a/weaver/sdks/fabric/interoperation-node-sdk/README.md b/weaver/sdks/fabric/interoperation-node-sdk/README.md index 6203631b1d..817e50e6a6 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/README.md +++ b/weaver/sdks/fabric/interoperation-node-sdk/README.md @@ -3,7 +3,7 @@ SPDX-License-Identifier: CC-BY-4.0 --> -# weaver-fabric-interop-sdk +# Cacti - Weaver Fabric SDK Client library functions to augment or complement the Fabric-Node-SDK library @@ -34,7 +34,7 @@ Run `npm run docs` to generate docs. View docs via the generated html file. 2) Create a copy of `.npmrc.template` as `.npmrc`. 3) Replace in copied `.npmrc` file with your personal access token. 4) Now put this `.npmrc` file in your application in same level as package.json. -5) Now you can run `npm install @hyperledger-labs/weaver-fabric-interop-sdk` in your application directory to install the latest version. +5) Now you can run `npm install @hyperledger/cacti-weaver-sdk-fabric` in your application directory to install the latest version. # Steps to publish 1) Create a Personal Access Token from Github with write/read/delete access to packages. Refer [Creating a Personal Access Token](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) for help. diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json index 981c87b770..b2d1ac7cfe 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package-local.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package-local.json @@ -1,12 +1,12 @@ { - "name": "@hyperledger-labs/weaver-fabric-interop-sdk", + "name": "@hyperledger/cacti-weaver-sdk-fabric", "description": "Supplemental library to 'fabric-client' with functions for relay-based cross-network interactions", "keywords": [ "hyperledger", "blockchain", "interoperability" ], - "version": "1.5.9", + "version": "2.0.0-alpha-prerelease", "author": "V. Ramakrishna", "tag": "latest", "main": "build/index.js", @@ -27,7 +27,7 @@ "npm": ">=6.0.0 <=8.15.0" }, "dependencies": { - "@hyperledger-labs/weaver-protos-js": "file:./protos-js", + "@hyperledger/cacti-weaver-protos-js": "file:./protos-js", "@grpc/grpc-js": "^1.1.3", "@grpc/proto-loader": "^0.6.13", "elliptic": "^6.2.3", @@ -87,6 +87,6 @@ "all": true }, "publishConfig": { - "registry": "https://npm.pkg.github.com/hyperledger-labs" + "registry": "https://npm.pkg.github.com/hyperledger" } } diff --git a/weaver/sdks/fabric/interoperation-node-sdk/package.json b/weaver/sdks/fabric/interoperation-node-sdk/package.json index 4fa2cbd469..615fdb5ade 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/package.json +++ b/weaver/sdks/fabric/interoperation-node-sdk/package.json @@ -1,12 +1,12 @@ { - "name": "@hyperledger-labs/weaver-fabric-interop-sdk", + "name": "@hyperledger/cacti-weaver-sdk-fabric", "description": "Supplemental library to 'fabric-client' with functions for relay-based cross-network interactions", "keywords": [ "hyperledger", "blockchain", "interoperability" ], - "version": "1.5.9", + "version": "2.0.0-alpha-prerelease", "author": "V. Ramakrishna", "tag": "latest", "main": "build/index.js", @@ -29,7 +29,7 @@ "dependencies": { "@grpc/grpc-js": "^1.1.3", "@grpc/proto-loader": "^0.6.13", - "@hyperledger-labs/weaver-protos-js": "~1.5.7", + "@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha-prerelease", "elliptic": "^6.2.3", "fabric-common": "^2.2.8", "fabric-network": "^2.2.8", @@ -87,6 +87,6 @@ "all": true }, "publishConfig": { - "registry": "https://npm.pkg.github.com/hyperledger-labs" + "registry": "https://npm.pkg.github.com/hyperledger" } } diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/AssetManager.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/AssetManager.ts index b18ef425af..d18813ecb3 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/AssetManager.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/AssetManager.ts @@ -13,7 +13,7 @@ import log4js from "log4js"; import crypto from "crypto"; import fabproto6 from "fabric-protos"; import * as helpers from "./helpers"; -import assetLocksPb from "@hyperledger-labs/weaver-protos-js/common/asset_locks_pb"; +import assetLocksPb from "@hyperledger/cacti-weaver-protos-js/common/asset_locks_pb"; import { Contract, ContractListener } from "fabric-network"; import { Hash, SHA256, SHA512 } from "./HashFunctions" const logger = log4js.getLogger("InteroperableHelper"); diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/EventsManager.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/EventsManager.ts index 211ee23f52..5773a8fd5b 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/EventsManager.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/EventsManager.ts @@ -13,7 +13,7 @@ import log4js from "log4js"; import { v4 as uuidv4 } from "uuid"; import { ICryptoKey } from "fabric-common"; import { Contract } from "fabric-network"; -import eventsPb from "@hyperledger-labs/weaver-protos-js/common/events_pb"; +import eventsPb from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; import { Relay } from "./Relay"; import { InteropJSON } from "./types"; import { getPolicyCriteriaForAddress, createAddress, signMessage } from "./InteroperableHelper"; diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/HashFunctions.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/HashFunctions.ts index 1d0fbeac18..05b8b4bbdd 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/HashFunctions.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/HashFunctions.ts @@ -5,7 +5,7 @@ */ import crypto from "crypto"; -import { HashMechanism } from "@hyperledger-labs/weaver-protos-js/common/asset_locks_pb"; +import { HashMechanism } from "@hyperledger/cacti-weaver-protos-js/common/asset_locks_pb"; /* * Interface for all hash functions to be used for HTLC diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/InteroperableHelper.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/InteroperableHelper.ts index df9afef2f6..a108d71510 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/InteroperableHelper.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/InteroperableHelper.ts @@ -20,13 +20,13 @@ import crypto from "crypto"; import eciesCrypto from "./eciesCrypto.js"; import * as helpers from "./helpers"; import { deserializeRemoteProposalResponseBase64, serializeRemoteProposalResponse } from "./decoders"; -import statePb from "@hyperledger-labs/weaver-protos-js/common/state_pb"; -import fabricViewPb from "@hyperledger-labs/weaver-protos-js/fabric/view_data_pb"; -import cordaViewPb from "@hyperledger-labs/weaver-protos-js/corda/view_data_pb"; -import interopPayloadPb from "@hyperledger-labs/weaver-protos-js/common/interop_payload_pb"; -import proposalPb from "@hyperledger-labs/weaver-protos-js/peer/proposal_pb"; -import proposalResponsePb from "@hyperledger-labs/weaver-protos-js/peer/proposal_response_pb"; -import identitiesPb from "@hyperledger-labs/weaver-protos-js/msp/identities_pb"; +import statePb from "@hyperledger/cacti-weaver-protos-js/common/state_pb"; +import fabricViewPb from "@hyperledger/cacti-weaver-protos-js/fabric/view_data_pb"; +import cordaViewPb from "@hyperledger/cacti-weaver-protos-js/corda/view_data_pb"; +import interopPayloadPb from "@hyperledger/cacti-weaver-protos-js/common/interop_payload_pb"; +import proposalPb from "@hyperledger/cacti-weaver-protos-js/peer/proposal_pb"; +import proposalResponsePb from "@hyperledger/cacti-weaver-protos-js/peer/proposal_response_pb"; +import identitiesPb from "@hyperledger/cacti-weaver-protos-js/msp/identities_pb"; import { Relay } from "./Relay"; import { Gateway, Contract } from "fabric-network"; import { v4 as uuidv4 } from "uuid"; diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts index be6703c960..c58038ad99 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/MembershipManager.ts @@ -11,10 +11,10 @@ import * as fs from 'fs'; import { credentials } from '@grpc/grpc-js'; -import membership_pb from '@hyperledger-labs/weaver-protos-js/common/membership_pb'; -import agent_grpc_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_grpc_pb'; -import agent_pb from '@hyperledger-labs/weaver-protos-js/identity/agent_pb'; -import common_ack_pb from "@hyperledger-labs/weaver-protos-js/common/ack_pb"; +import membership_pb from '@hyperledger/cacti-weaver-protos-js/common/membership_pb'; +import agent_grpc_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_grpc_pb'; +import agent_pb from '@hyperledger/cacti-weaver-protos-js/identity/agent_pb'; +import common_ack_pb from "@hyperledger/cacti-weaver-protos-js/common/ack_pb"; import { handlePromise, promisifyAll } from './helpers' diff --git a/weaver/sdks/fabric/interoperation-node-sdk/src/Relay.ts b/weaver/sdks/fabric/interoperation-node-sdk/src/Relay.ts index b94d2eb3d9..571e085564 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/src/Relay.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/src/Relay.ts @@ -10,11 +10,11 @@ /** End file docs */ import fs from "fs"; import * as grpcJs from "@grpc/grpc-js"; -import networksGrpcPb from "@hyperledger-labs/weaver-protos-js/networks/networks_grpc_pb"; -import networksPb from "@hyperledger-labs/weaver-protos-js/networks/networks_pb"; -import common_ack_pb from "@hyperledger-labs/weaver-protos-js/common/ack_pb"; -import eventsPb from "@hyperledger-labs/weaver-protos-js/common/events_pb"; -import statePb from "@hyperledger-labs/weaver-protos-js/common/state_pb"; +import networksGrpcPb from "@hyperledger/cacti-weaver-protos-js/networks/networks_grpc_pb"; +import networksPb from "@hyperledger/cacti-weaver-protos-js/networks/networks_pb"; +import common_ack_pb from "@hyperledger/cacti-weaver-protos-js/common/ack_pb"; +import eventsPb from "@hyperledger/cacti-weaver-protos-js/common/events_pb"; +import statePb from "@hyperledger/cacti-weaver-protos-js/common/state_pb"; import * as helpers from "./helpers"; /** * The Relay class represents a relay in the target blockchain network. diff --git a/weaver/sdks/fabric/interoperation-node-sdk/test/AssetManager.js b/weaver/sdks/fabric/interoperation-node-sdk/test/AssetManager.js index ece766bace..9674528a55 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/test/AssetManager.js +++ b/weaver/sdks/fabric/interoperation-node-sdk/test/AssetManager.js @@ -22,7 +22,7 @@ const { NetworkImpl } = require("fabric-network/lib/network"); const { Transaction } = require("fabric-network/lib/transaction"); const assetManager = require("../src/AssetManager"); const hashFunctions = require("../src/HashFunctions"); -import assetLocksPb from "@hyperledger-labs/weaver-protos-js/common/asset_locks_pb"; +import assetLocksPb from "@hyperledger/cacti-weaver-protos-js/common/asset_locks_pb"; describe("AssetManager", () => { const mspId = "mspId"; diff --git a/weaver/sdks/fabric/interoperation-node-sdk/test/InteroperableHelper.js b/weaver/sdks/fabric/interoperation-node-sdk/test/InteroperableHelper.js index 4adb9e39bb..8ebc612ca1 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/test/InteroperableHelper.js +++ b/weaver/sdks/fabric/interoperation-node-sdk/test/InteroperableHelper.js @@ -34,7 +34,7 @@ const { } = require("../src/InteroperableHelper"); const { deserializeRemoteProposalResponseBase64, serializeRemoteProposalResponse } = require("../src/decoders"); import { Relay } from "../src/Relay"; -import statePb from "@hyperledger-labs/weaver-protos-js/common/state_pb"; +import statePb from "@hyperledger/cacti-weaver-protos-js/common/state_pb"; describe("InteroperableHelper", () => { const mspId = "mspId"; diff --git a/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js b/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js index 220be3157c..9c38a5c4e7 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js +++ b/weaver/sdks/fabric/interoperation-node-sdk/test/Relay.js @@ -16,10 +16,10 @@ const chai = require("chai"); const sinon = require("sinon"); const sinonChai = require("sinon-chai"); -import statePb from "@hyperledger-labs/weaver-protos-js/common/state_pb"; -import ackPb from "@hyperledger-labs/weaver-protos-js/common/ack_pb"; -import networksGrpcPb from "@hyperledger-labs/weaver-protos-js/networks/networks_grpc_pb"; -import networksPb from "@hyperledger-labs/weaver-protos-js/networks/networks_pb"; +import statePb from "@hyperledger/cacti-weaver-protos-js/common/state_pb"; +import ackPb from "@hyperledger/cacti-weaver-protos-js/common/ack_pb"; +import networksGrpcPb from "@hyperledger/cacti-weaver-protos-js/networks/networks_grpc_pb"; +import networksPb from "@hyperledger/cacti-weaver-protos-js/networks/networks_pb"; const { expect } = chai; chai.use(sinonChai); diff --git a/weaver/sdks/fabric/interoperation-node-sdk/types/index.d.ts b/weaver/sdks/fabric/interoperation-node-sdk/types/index.d.ts index 478b08b6af..4ec78c0f11 100644 --- a/weaver/sdks/fabric/interoperation-node-sdk/types/index.d.ts +++ b/weaver/sdks/fabric/interoperation-node-sdk/types/index.d.ts @@ -4,9 +4,9 @@ * SPDX-License-Identifier: Apache-2.0 */ -export { Ack } from "@hyperledger-labs/weaver-protos-js/common/ack_pb"; -export { VerificationPolicy } from "@hyperledger-labs/weaver-protos-js/common/verification_policy_pb"; -export { FabricView } from "@hyperledger-labs/weaver-protos-js/fabric/view_data_pb"; +export { Ack } from "@hyperledger/cacti-weaver-protos-js/common/ack_pb"; +export { VerificationPolicy } from "@hyperledger/cacti-weaver-protos-js/common/verification_policy_pb"; +export { FabricView } from "@hyperledger/cacti-weaver-protos-js/fabric/view_data_pb"; import * as InteroperableHelper from "../src/InteroperableHelper"; export { InteroperableHelper }; diff --git a/weaver/tests/network-setups/corda/github.properties.template b/weaver/tests/network-setups/corda/github.properties.template index b638d1ff33..c84ce06186 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-labs/weaver-dlt-interoperability \ No newline at end of file +url=https://maven.pkg.github.com/hyperledger/cacti \ No newline at end of file diff --git a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh index ba1810e6a1..adb5b2ef1b 100755 --- a/weaver/tests/network-setups/corda/scripts/get-cordapps.sh +++ b/weaver/tests/network-setups/corda/scripts/get-cordapps.sh @@ -3,8 +3,7 @@ directory=$(dirname $0) app=${1:-simple} local=$2 -weaverCordaVersion="1.2.14" -weaverProtosVersion="1.5.7" +cactiVersion="2.0.0-alpha-prerelease" if [ "simple" = "$app" ]; then cordappPath=$directory/../../../../samples/corda/corda-simple-application @@ -80,19 +79,19 @@ fi ######### Corda Interop App ########### if [[ $local == "local" ]]; then - if [[ ! -f $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverProtosVersion.jar ]]; then - echo "Please Build the weaver-protos-java-kt version $weaverVersion to use local components." + if [[ ! -f $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$cactiVersion.jar ]]; then + echo "Please Build the weaver-protos-java-kt version $cactiVersion to use local components." fi - if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverCordaVersion.jar ]]; then - echo "Please Build the corda-interop-app version $weaverVersion to use local components." + if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$cactiVersion.jar ]]; then + echo "Please Build the corda-interop-app version $cactiVersion to use local components." fi - if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverCordaVersion.jar ]]; then - echo "Please Build the corda-interop-app version $weaverVersion to use local components." + if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$cactiVersion.jar ]]; then + echo "Please Build the corda-interop-app version $cactiVersion to use local components." fi echo "Copying Corda Interop App..." - cp $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverCordaVersion.jar $directory/../shared/artifacts - cp $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverCordaVersion.jar $directory/../shared/artifacts - cp $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverProtosVersion.jar $directory/../shared/artifacts + cp $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$cactiVersion.jar $directory/../shared/artifacts + cp $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$cactiVersion.jar $directory/../shared/artifacts + cp $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$cactiVersion.jar $directory/../shared/artifacts else file="$directory/../github.properties" if [ -f $file ]; then @@ -101,9 +100,9 @@ else pkgurl=`sed '/^\#/d' $file | grep 'url=' | cut -d "=" -f2-` baseUrl="$pkgurl/org/hyperledger/cacti/weaver" echo "Downloading Corda Interop App from $baseUrl ..." - (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-contracts/$weaverCordaVersion/interop-contracts-$weaverCordaVersion.jar) || exit 1 - (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-workflows/$weaverCordaVersion/interop-workflows-$weaverCordaVersion.jar) || exit 1 - (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/protos-java-kt/$weaverProtosVersion/protos-java-kt-$weaverProtosVersion.jar) || exit 1 + (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/imodule/corda/interop-contracts/$cactiVersion/interop-contracts-$cactiVersion.jar) || exit 1 + (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/imodule/corda//interop-workflows/$cactiVersion/interop-workflows-$cactiVersion.jar) || exit 1 + (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/protos/protos-java-kt/$cactiVersion/protos-java-kt-$cactiVersion.jar) || exit 1 else echo Please copy the github.properties.template file as github.properties and replace placeholders with Github credentials. fi diff --git a/weaver/tests/network-setups/corda/scripts/start-nodes.sh b/weaver/tests/network-setups/corda/scripts/start-nodes.sh index 0f0c0028ba..d67d1df6ba 100755 --- a/weaver/tests/network-setups/corda/scripts/start-nodes.sh +++ b/weaver/tests/network-setups/corda/scripts/start-nodes.sh @@ -9,8 +9,7 @@ simpleAppVersion="0.4" houseTokenAppVersion="1.0" tokenVersion="1.2" -weaverCordaVersion="1.2.14" -weaverProtosVersion="1.5.7" +cactiVersion="2.0.0-alpha-prerelease" parties="Notary PartyA PartyB PartyC" @@ -31,10 +30,10 @@ for party in ${parties}; do echo "Cordapp not found" && exit 1 fi - cp $directory/../shared/artifacts/interop-contracts-$weaverCordaVersion.jar dev/${nw}/build/nodes/${party}/cordapps - cp $directory/../shared/artifacts/interop-workflows-$weaverCordaVersion.jar dev/${nw}/build/nodes/${party}/cordapps + cp $directory/../shared/artifacts/interop-contracts-$cactiVersion.jar dev/${nw}/build/nodes/${party}/cordapps + cp $directory/../shared/artifacts/interop-workflows-$cactiVersion.jar dev/${nw}/build/nodes/${party}/cordapps - cp $directory/../shared/artifacts/protos-java-kt-$weaverProtosVersion.jar dev/${nw}/build/nodes/${party}/cordapps + cp $directory/../shared/artifacts/protos-java-kt-$cactiVersion.jar dev/${nw}/build/nodes/${party}/cordapps done; dockerProject="corda"