From 1e30a5d341e5435a1025ee28bdffc8aee0b94d5d Mon Sep 17 00:00:00 2001 From: Sandeep Nishad Date: Tue, 21 May 2024 21:16:38 +0530 Subject: [PATCH] chore(release): release v1.6.0 (last release) Signed-off-by: Sandeep Nishad --- common/protos-go/VERSION | 2 +- common/protos-java-kt/gradle.properties | 2 +- common/protos-js/package.json | 2 +- common/protos-rs/pkg/Cargo.toml | 2 +- core/drivers/corda-driver/VERSION | 2 +- core/drivers/corda-driver/build.gradle | 11 +++++----- core/drivers/corda-driver/gradle.properties | 2 +- .../fabric-driver/.env.docker.template | 2 +- core/drivers/fabric-driver/VERSION | 2 +- core/drivers/fabric-driver/package-local.json | 2 +- core/drivers/fabric-driver/package.json | 6 +++--- .../iin-agent/.env.docker.template | 2 +- core/identity-management/iin-agent/VERSION | 2 +- .../iin-agent/package-local.json | 2 +- .../iin-agent/package.json | 6 +++--- core/network/corda-interop-app/README.md | 4 ++-- .../corda-interop-app/constants.properties | 2 +- .../corda-interop-app/gradle.properties | 2 +- .../contracts/interop/go.mod | 6 +++--- .../contracts/interop/go.sum | 6 ++++++ .../interfaces/asset-mgmt/VERSION | 2 +- .../interfaces/asset-mgmt/go.mod | 2 +- .../interfaces/asset-mgmt/go.sum | 2 ++ .../libs/assetexchange/VERSION | 2 +- .../libs/assetexchange/go.mod | 2 +- .../libs/assetexchange/go.sum | 2 ++ .../fabric-interop-cc/libs/utils/VERSION | 2 +- .../fabric-interop-cc/libs/utils/go.mod | 2 +- .../fabric-interop-cc/libs/utils/go.sum | 2 ++ core/relay/.env.template | 2 +- core/relay/.env.template.2 | 2 +- core/relay/VERSION | 2 +- .../enabling-weaver-network/corda.md | 12 +++++------ .../enabling-weaver-network/fabric.md | 14 ++++++------- go-gen-checksum.sh | 14 +++++++++++-- samples/besu/besu-cli/package.json | 4 ++-- .../corda-simple-application/build.gradle | 3 +-- .../clients/build.gradle | 8 +++---- .../constants.properties | 3 +-- .../workflows-kotlin/build.gradle | 4 ++-- .../corda/fungible-house-token/build.gradle | 2 +- .../fungible-house-token/constants.properties | 2 +- samples/fabric/go-cli/go.mod | 4 ++-- samples/fabric/go-cli/go.sum | 4 ++++ samples/fabric/simpleasset/go.mod | 4 ++-- samples/fabric/simpleasset/go.sum | 4 ++++ samples/fabric/simpleassetandinterop/go.mod | 4 ++-- samples/fabric/simpleassetandinterop/go.sum | 4 ++++ samples/fabric/simpleassettransfer/go.mod | 6 +++--- samples/fabric/simpleassettransfer/go.sum | 6 ++++++ samples/fabric/simplestatewithacl/go.mod | 4 ++-- samples/fabric/simplestatewithacl/go.sum | 4 ++++ .../package-local.json | 2 +- .../besu/interoperation-node-sdk/package.json | 4 ++-- sdks/corda/README.md | 8 +++---- sdks/corda/build.gradle | 9 ++++---- sdks/corda/gradle.properties | 2 +- sdks/fabric/go-sdk/VERSION | 2 +- sdks/fabric/go-sdk/go.mod | 2 +- sdks/fabric/go-sdk/go.sum | 2 ++ .../package-local.json | 2 +- .../interoperation-node-sdk/package.json | 4 ++-- .../corda/scripts/get-cordapps.sh | 21 +++++++++---------- .../corda/scripts/start-nodes.sh | 9 ++++---- 64 files changed, 154 insertions(+), 114 deletions(-) diff --git a/common/protos-go/VERSION b/common/protos-go/VERSION index df808199c..dc1e644a1 100644 --- a/common/protos-go/VERSION +++ b/common/protos-go/VERSION @@ -1 +1 @@ -1.5.11 +1.6.0 diff --git a/common/protos-java-kt/gradle.properties b/common/protos-java-kt/gradle.properties index 45c725e51..2bd067070 100644 --- a/common/protos-java-kt/gradle.properties +++ b/common/protos-java-kt/gradle.properties @@ -1,4 +1,4 @@ name=Interop Protos group=com.weaver -version=1.5.7 +version=1.6.0 kotlin.incremental=false diff --git a/common/protos-js/package.json b/common/protos-js/package.json index 5564f82a8..401402630 100644 --- a/common/protos-js/package.json +++ b/common/protos-js/package.json @@ -1,6 +1,6 @@ { "name": "@hyperledger-labs/weaver-protos-js", - "version": "1.5.7", + "version": "1.6.0", "description": "Interop protos for Node JS (Weaver)", "main": "index.js", "exports": { diff --git a/common/protos-rs/pkg/Cargo.toml b/common/protos-rs/pkg/Cargo.toml index 1ce350549..432dc1596 100644 --- a/common/protos-rs/pkg/Cargo.toml +++ b/common/protos-rs/pkg/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "weaver_protos_rs" -version = "1.5.7" +version = "1.6.0" authors = ["Peter Somogyvari ", "Sandeep Nishad ENABLE_MONITOR= MONITOR_SYNC_PERIOD= DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver -DOCKER_TAG=1.4.0 +DOCKER_TAG=1.6.0 EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/core/drivers/fabric-driver/VERSION b/core/drivers/fabric-driver/VERSION index f8dd9d99a..ce6a70b9d 100644 --- a/core/drivers/fabric-driver/VERSION +++ b/core/drivers/fabric-driver/VERSION @@ -1 +1 @@ -1.5.14 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/core/drivers/fabric-driver/package-local.json b/core/drivers/fabric-driver/package-local.json index 0ca07dca2..23e0cb61a 100644 --- a/core/drivers/fabric-driver/package-local.json +++ b/core/drivers/fabric-driver/package-local.json @@ -1,6 +1,6 @@ { "name": "fabric-driver", - "version": "1.5.13", + "version": "1.6.0", "description": "", "main": "out/server.js", "scripts": { diff --git a/core/drivers/fabric-driver/package.json b/core/drivers/fabric-driver/package.json index aa01dee60..e545f3475 100644 --- a/core/drivers/fabric-driver/package.json +++ b/core/drivers/fabric-driver/package.json @@ -1,6 +1,6 @@ { "name": "fabric-driver", - "version": "1.5.13", + "version": "1.6.0", "description": "", "main": "out/server.js", "scripts": { @@ -19,8 +19,8 @@ "author": "", "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "~1.5.7", - "@hyperledger-labs/weaver-fabric-interop-sdk": "~1.5.14", + "@hyperledger-labs/weaver-protos-js": "1.6.0", + "@hyperledger-labs/weaver-fabric-interop-sdk": "1.6.0", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^3.5.0", diff --git a/core/identity-management/iin-agent/.env.docker.template b/core/identity-management/iin-agent/.env.docker.template index eca631fb4..47fbe55f0 100644 --- a/core/identity-management/iin-agent/.env.docker.template +++ b/core/identity-management/iin-agent/.env.docker.template @@ -13,7 +13,7 @@ SYNC_PERIOD= AUTO_SYNC= TLS_CREDENTIALS_DIR= DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-iin-agent -DOCKER_TAG=1.5.2 +DOCKER_TAG=1.6.0 EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/core/identity-management/iin-agent/VERSION b/core/identity-management/iin-agent/VERSION index 2b26b8d21..dc1e644a1 100644 --- a/core/identity-management/iin-agent/VERSION +++ b/core/identity-management/iin-agent/VERSION @@ -1 +1 @@ -1.5.9 +1.6.0 diff --git a/core/identity-management/iin-agent/package-local.json b/core/identity-management/iin-agent/package-local.json index 921096ddf..cd05407dc 100644 --- a/core/identity-management/iin-agent/package-local.json +++ b/core/identity-management/iin-agent/package-local.json @@ -1,6 +1,6 @@ { "name": "iin-agent", - "version": "1.5.9", + "version": "1.6.0", "description": "", "main": "index.js", "scripts": { diff --git a/core/identity-management/iin-agent/package.json b/core/identity-management/iin-agent/package.json index a438007b9..f1264fda4 100644 --- a/core/identity-management/iin-agent/package.json +++ b/core/identity-management/iin-agent/package.json @@ -1,6 +1,6 @@ { "name": "iin-agent", - "version": "1.5.9", + "version": "1.6.0", "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-labs/weaver-protos-js": "1.6.0", + "@hyperledger-labs/weaver-fabric-interop-sdk": "1.6.0", "@fidm/x509": "^1.2.1", "@grpc/grpc-js": "^1.1.1", "@typescript-eslint/eslint-plugin": "^3.5.0", diff --git a/core/network/corda-interop-app/README.md b/core/network/corda-interop-app/README.md index f531d48bb..1ca709bba 100644 --- a/core/network/corda-interop-app/README.md +++ b/core/network/corda-interop-app/README.md @@ -89,8 +89,8 @@ and then follow above 4 steps. 5) Add this to your build.gradle (change the version accordingly): ``` dependencies { - compile(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.1") - compile(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.1") + compile(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.6.0") + compile(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.6.0") } ``` diff --git a/core/network/corda-interop-app/constants.properties b/core/network/corda-interop-app/constants.properties index 66add9e68..64456f96d 100644 --- a/core/network/corda-interop-app/constants.properties +++ b/core/network/corda-interop-app/constants.properties @@ -11,4 +11,4 @@ slf4jVersion=1.7.25 nettyVersion=4.1.22.Final arrowVersion=0.10.4 -weaverVersion=1.5.7 +weaverVersion=1.6.0 diff --git a/core/network/corda-interop-app/gradle.properties b/core/network/corda-interop-app/gradle.properties index d6f337d7d..d074de975 100644 --- a/core/network/corda-interop-app/gradle.properties +++ b/core/network/corda-interop-app/gradle.properties @@ -1,4 +1,4 @@ name=Interoperability CorDapp group=com.weaver.corda.app.interop -version=1.2.14 +version=1.6.0 kotlin.incremental=false diff --git a/core/network/fabric-interop-cc/contracts/interop/go.mod b/core/network/fabric-interop-cc/contracts/interop/go.mod index 81f8b8afb..ec4372210 100644 --- a/core/network/fabric-interop-cc/contracts/interop/go.mod +++ b/core/network/fabric-interop-cc/contracts/interop/go.mod @@ -5,10 +5,10 @@ go 1.20 require ( github.com/ethereum/go-ethereum v1.13.15 github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/core/network/fabric-interop-cc/contracts/interop/go.sum b/core/network/fabric-interop-cc/contracts/interop/go.sum index a52e35a70..e211fe8aa 100644 --- a/core/network/fabric-interop-cc/contracts/interop/go.sum +++ b/core/network/fabric-interop-cc/contracts/interop/go.sum @@ -173,3 +173,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0 h1:CRA16ciSV2dqogcxavqfl47OGggrzzcfgnM7I98cTuU= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0/go.mod h1:Y02vQN1363iz6j1NXrT26+uMo4mM5Q0GTY7/YXQoslY= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 h1:Fd2IhI/8pVnhdE6cEJVataCPoCnv8PSHvJN+iIdhYt0= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0/go.mod h1:vhscTYgVbY6vCRDxHymxcawyZFZhTo0QRvl5L8tgF8I= diff --git a/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION b/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION index 757d1b6b5..dc1e644a1 100644 --- a/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION +++ b/core/network/fabric-interop-cc/interfaces/asset-mgmt/VERSION @@ -1 +1 @@ -1.5.11 \ No newline at end of file +1.6.0 diff --git a/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod b/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod index 5df2638d1..eff44e0c9 100644 --- a/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod +++ b/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 diff --git a/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum b/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum index 090c30170..4112ab27d 100644 --- a/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum +++ b/core/network/fabric-interop-cc/interfaces/asset-mgmt/go.sum @@ -156,3 +156,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= diff --git a/core/network/fabric-interop-cc/libs/assetexchange/VERSION b/core/network/fabric-interop-cc/libs/assetexchange/VERSION index 757d1b6b5..dc1e644a1 100644 --- a/core/network/fabric-interop-cc/libs/assetexchange/VERSION +++ b/core/network/fabric-interop-cc/libs/assetexchange/VERSION @@ -1 +1 @@ -1.5.11 \ No newline at end of file +1.6.0 diff --git a/core/network/fabric-interop-cc/libs/assetexchange/go.mod b/core/network/fabric-interop-cc/libs/assetexchange/go.mod index 527f9e6e0..1a0ea498f 100644 --- a/core/network/fabric-interop-cc/libs/assetexchange/go.mod +++ b/core/network/fabric-interop-cc/libs/assetexchange/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 github.com/hyperledger/fabric-contract-api-go v1.2.2 github.com/hyperledger/fabric-protos-go v0.3.3 github.com/sirupsen/logrus v1.9.3 diff --git a/core/network/fabric-interop-cc/libs/assetexchange/go.sum b/core/network/fabric-interop-cc/libs/assetexchange/go.sum index 4a7318d7e..f5de639d3 100644 --- a/core/network/fabric-interop-cc/libs/assetexchange/go.sum +++ b/core/network/fabric-interop-cc/libs/assetexchange/go.sum @@ -153,3 +153,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= diff --git a/core/network/fabric-interop-cc/libs/utils/VERSION b/core/network/fabric-interop-cc/libs/utils/VERSION index 757d1b6b5..dc1e644a1 100644 --- a/core/network/fabric-interop-cc/libs/utils/VERSION +++ b/core/network/fabric-interop-cc/libs/utils/VERSION @@ -1 +1 @@ -1.5.11 \ No newline at end of file +1.6.0 diff --git a/core/network/fabric-interop-cc/libs/utils/go.mod b/core/network/fabric-interop-cc/libs/utils/go.mod index 78f76d62d..6b9fc0908 100644 --- a/core/network/fabric-interop-cc/libs/utils/go.mod +++ b/core/network/fabric-interop-cc/libs/utils/go.mod @@ -4,7 +4,7 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/core/network/fabric-interop-cc/libs/utils/go.sum b/core/network/fabric-interop-cc/libs/utils/go.sum index b9ba14edd..9176c15df 100644 --- a/core/network/fabric-interop-cc/libs/utils/go.sum +++ b/core/network/fabric-interop-cc/libs/utils/go.sum @@ -149,3 +149,5 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= diff --git a/core/relay/.env.template b/core/relay/.env.template index cb1da1cf9..9acbb4839 100644 --- a/core/relay/.env.template +++ b/core/relay/.env.template @@ -2,7 +2,7 @@ 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_TAG=1.6.0 EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= \ No newline at end of file diff --git a/core/relay/.env.template.2 b/core/relay/.env.template.2 index b74e7c748..5031be151 100644 --- a/core/relay/.env.template.2 +++ b/core/relay/.env.template.2 @@ -9,7 +9,7 @@ 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_TAG=1.6.0 EXTERNAL_NETWORK= COMPOSE_PROJECT_NAME= COMPOSE_PROJECT_NETWORK= diff --git a/core/relay/VERSION b/core/relay/VERSION index b7fd43df7..ce6a70b9d 100644 --- a/core/relay/VERSION +++ b/core/relay/VERSION @@ -1 +1 @@ -1.5.12 \ No newline at end of file +1.6.0 \ No newline at end of file diff --git a/docs/docs/external/getting-started/enabling-weaver-network/corda.md b/docs/docs/external/getting-started/enabling-weaver-network/corda.md index e37263a07..13f75c9ec 100644 --- a/docs/docs/external/getting-started/enabling-weaver-network/corda.md +++ b/docs/docs/external/getting-started/enabling-weaver-network/corda.md @@ -116,10 +116,10 @@ repositories { } } dependencies { - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.2.13") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.13") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.13") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "1.5.7") + implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.6.0") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.6.0") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.6.0") + implementation(group: 'com.weaver', name: 'protos-java-kt', version: "1.6.0") } ``` (Or check out the [package website](https://github.com/hyperledger-labs/weaver-dlt-interoperability/packages/952245) and select a different version.) @@ -438,7 +438,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger-labs/weaver-d EXTERNAL_NETWORK= DOCKER_REGISTRY=ghcr.io/hyperledger-labs DOCKER_IMAGE_NAME=weaver-relay - DOCKER_TAG=1.5.4 + DOCKER_TAG=1.6.0 ``` - The `PATH_TO_CONFIG` variable should point to the properties file typically named `config.toml` (you can name this whatever you wish). See further below for instructions to write this file. - The `RELAY_NAME` variable specifies a unique name for this relay. It should match what's specified in the `config.toml` (more on that below). @@ -528,7 +528,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger-labs/weaver-d DRIVER_RPC_PASSWORD= EXTERNAL_NETWORK= DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-corda-driver - DOCKER_TAG=1.2.13 + DOCKER_TAG=1.6.0 RELAY_TLS= RELAY_TLSCA_TRUST_STORE= RELAY_TLSCA_TRUST_STORE_PASSWORD= diff --git a/docs/docs/external/getting-started/enabling-weaver-network/fabric.md b/docs/docs/external/getting-started/enabling-weaver-network/fabric.md index cc0da0fce..e6de1b953 100644 --- a/docs/docs/external/getting-started/enabling-weaver-network/fabric.md +++ b/docs/docs/external/getting-started/enabling-weaver-network/fabric.md @@ -79,8 +79,8 @@ Below, we list the template functions with sample code that you, as a developer, ```go require( ... - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.6 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.5.3 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0 ... ) ``` @@ -172,8 +172,8 @@ Below, we list the template functions with sample code that you, as a developer, ```go require( ... - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.6 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.5.3 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0 ... ) ``` @@ -322,7 +322,7 @@ Consider a scenario inspired by the [global trade use case](../../user-stories/g (In preparation, a suitable access control policy must be recorded on `tradelogisticschannel` in `trade-logistics-network`, and a suitable verification policy must be recorded on `tradefinancechannel` in `trade-finance-network`. We will see how to do this in the "Startup and Boostrap" section later.) -You will need to insert some code in the Layer-2 application that accepts a B/L and submits a `RecordBillOfLading` transaction in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `interopFlow` function offered by the [weaver-fabric-interop-sdk](https://github.com/hyperledger-labs/weaver-dlt-interoperability/packages/888424) library (there's an [equivalent library in Golang](https://github.com/hyperledger-labs/weaver-dlt-interoperability/releases/tag/sdks%2Ffabric%2Fgo-sdk%2Fv1.2.3-alpha.1) too). The following code sample illustrates this (the Golang equivalent is left to the reader): +You will need to insert some code in the Layer-2 application that accepts a B/L and submits a `RecordBillOfLading` transaction in `trade-finance-network`. (No code changes need to be made in any application in the other network.) The logic to accept a B/L should be replaced (or you can simply add an alternative) by a call to the `interopFlow` function offered by the [weaver-fabric-interop-sdk](https://github.com/hyperledger-labs/weaver-dlt-interoperability/packages/888424) library (there's an [equivalent library in Golang](https://github.com/hyperledger-labs/weaver-dlt-interoperability/releases/tag/sdks%2Ffabric%2Fgo-sdk%2Fv1.6.0) too). The following code sample illustrates this (the Golang equivalent is left to the reader): ```js showLineNumbers const ihelper = require('@hyperledger-labs/weaver-fabric-interop-sdk').InteroperableHelper; const interopcc = ; // Use Fabric SDK functions: (new Gateway()).getNetwork(...).getContract() @@ -529,7 +529,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger-labs/weaver-d EXTERNAL_NETWORK= DOCKER_REGISTRY=ghcr.io/hyperledger-labs DOCKER_IMAGE_NAME=weaver-relay - DOCKER_TAG=1.5.4 + DOCKER_TAG=1.6.0 ``` - The `PATH_TO_CONFIG` variable should point to the properties file typically named `config.toml` (you can name this whatever you wish). See further below for instructions to write this file. - The `RELAY_NAME` variable specifies a unique name for this relay. It should match what's specified in the `config.toml` (more on that below). @@ -622,7 +622,7 @@ Weaver provides a [pre-built image](https://github.com/hyperledger-labs/weaver-d EXTERNAL_NETWORK= TLS_CREDENTIALS_DIR= DOCKER_IMAGE_NAME=ghcr.io/hyperledger-labs/weaver-fabric-driver - DOCKER_TAG=1.5.6 + DOCKER_TAG=1.6.0 DRIVER_TLS= DRIVER_TLS_CERT_PATH=path_to_tls_cert_pem_for_driver DRIVER_TLS_KEY_PATH=path_to_tls_key_pem_for_driver diff --git a/go-gen-checksum.sh b/go-gen-checksum.sh index 08e5c7895..a1c1b0710 100644 --- a/go-gen-checksum.sh +++ b/go-gen-checksum.sh @@ -4,14 +4,21 @@ ROOT_DIR='.' # Repo full go path -# REPO='github.com/hyperledger/cacti' REPO='github.com/hyperledger-labs/weaver-dlt-interoperability' +VERSION=$1 GOMODULE_PATHS=("core/network/fabric-interop-cc/libs/utils" "core/network/fabric-interop-cc/libs/assetexchange" "core/network/fabric-interop-cc/interfaces/asset-mgmt" -"core/network/fabric-interop-cc/contracts/interop") +"core/network/fabric-interop-cc/contracts/interop" +"sdks/fabric/go-sdk" +"samples/fabric/go-cli" +"samples/fabric/simpleasset" +"samples/fabric/simpleassetandinterop" +"samples/fabric/simpleassettransfer" +"samples/fabric/simplestatewithacl" +"samples/fabric/simplestate") for GOMODULE in ${GOMODULE_PATHS[@]}; do echo "############# START $GOMODULE ################" @@ -34,6 +41,9 @@ for GOMODULE in ${GOMODULE_PATHS[@]}; do echo "------------ END --------------" continue fi + + (cat VERSION | grep "$VERSION") || echo $VERSION > VERSION + GOMOD_VERSION=v$(cat VERSION) GOMOD_SUM=$(go-checksum . $GOMOD_NAME@$GOMOD_VERSION | grep "GoCheckSum" | cut -d ' ' -f 2 | cut -d '"' -f 2) GOMOD_DOTMOD_SUM=$(go-checksum go.mod | grep "GoCheckSum" | cut -d ' ' -f 2 | cut -d '"' -f 2) diff --git a/samples/besu/besu-cli/package.json b/samples/besu/besu-cli/package.json index 1642f1943..db349aedf 100644 --- a/samples/besu/besu-cli/package.json +++ b/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-labs/weaver-besu-interop-sdk": "1.6.0", + "@hyperledger-labs/weaver-protos-js": "1.6.0", "@truffle/contract": "^4.2.14", "gluegun": "latest", "winston": "^3.3.3" diff --git a/samples/corda/corda-simple-application/build.gradle b/samples/corda/corda-simple-application/build.gradle index 250c6db22..ea6255f84 100644 --- a/samples/corda/corda-simple-application/build.gradle +++ b/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") + weaver_version = constants.getProperty("weaverVersion") } repositories { diff --git a/samples/corda/corda-simple-application/clients/build.gradle b/samples/corda/corda-simple-application/clients/build.gradle index e8008815f..a589124de 100644 --- a/samples/corda/corda-simple-application/clients/build.gradle +++ b/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: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_corda_version") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") + implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "$weaver_version") + implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/samples/corda/corda-simple-application/constants.properties b/samples/corda/corda-simple-application/constants.properties index 5b9637fec..bdfe026ef 100644 --- a/samples/corda/corda-simple-application/constants.properties +++ b/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 +weaverVersion=1.6.0 diff --git a/samples/corda/corda-simple-application/workflows-kotlin/build.gradle b/samples/corda/corda-simple-application/workflows-kotlin/build.gradle index 9cb65d50e..21a010461 100644 --- a/samples/corda/corda-simple-application/workflows-kotlin/build.gradle +++ b/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: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version" compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version" diff --git a/samples/corda/fungible-house-token/build.gradle b/samples/corda/fungible-house-token/build.gradle index 479aef423..ad6e3bae1 100644 --- a/samples/corda/fungible-house-token/build.gradle +++ b/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") + weaver_version = constants.getProperty("weaverVersion") } repositories { diff --git a/samples/corda/fungible-house-token/constants.properties b/samples/corda/fungible-house-token/constants.properties index 42499492e..0fb5db66a 100644 --- a/samples/corda/fungible-house-token/constants.properties +++ b/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 +weaverVersion=1.6.0 diff --git a/samples/fabric/go-cli/go.mod b/samples/fabric/go-cli/go.mod index 10bd811c5..c41300a61 100644 --- a/samples/fabric/go-cli/go.mod +++ b/samples/fabric/go-cli/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/cloudflare/cfssl v1.4.1 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 - github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.2.5 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.6.0 github.com/hyperledger/fabric-sdk-go v1.0.1-0.20221020141211-7af45cede6af github.com/sirupsen/logrus v1.9.3 github.com/spf13/cobra v1.2.1 diff --git a/samples/fabric/go-cli/go.sum b/samples/fabric/go-cli/go.sum index 2dd942ee3..3fafe70bb 100644 --- a/samples/fabric/go-cli/go.sum +++ b/samples/fabric/go-cli/go.sum @@ -921,3 +921,7 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0= rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA= sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o= sourcegraph.com/sourcegraph/appdash v0.0.0-20190731080439-ebfcffb1b5c0/go.mod h1:hI742Nqp5OhwiqlzhgfbWU4mW4yO10fP+LoT9WOswdU= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.6.0 h1:gJB2kIQ1JXmVNO2FQyOL+3qdQD3cjMuenG5/gs6sH5I= +github.com/hyperledger-labs/weaver-dlt-interoperability/sdks/fabric/go-sdk v1.6.0/go.mod h1:8TraX5tcDzW/aCFMwdX8PQl4nQTydtB5ycqGszvkdEo= diff --git a/samples/fabric/simpleasset/go.mod b/samples/fabric/simpleasset/go.mod index 24714e31b..7e27e1c1b 100644 --- a/samples/fabric/simpleasset/go.mod +++ b/samples/fabric/simpleasset/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 diff --git a/samples/fabric/simpleasset/go.sum b/samples/fabric/simpleasset/go.sum index a918f7aa3..16e4c71d6 100644 --- a/samples/fabric/simpleasset/go.sum +++ b/samples/fabric/simpleasset/go.sum @@ -158,3 +158,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0 h1:FMJf69Bk3+rXldtAMtgvl/lmwe3ho1gDcqhlEEcfyxs= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0/go.mod h1:pK+vGW86BaTmn82kLlLBfwVND9cN33iuppVyUwk4ySQ= diff --git a/samples/fabric/simpleassetandinterop/go.mod b/samples/fabric/simpleassetandinterop/go.mod index 7ac6b152a..c228333d1 100644 --- a/samples/fabric/simpleassetandinterop/go.mod +++ b/samples/fabric/simpleassetandinterop/go.mod @@ -4,8 +4,8 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 diff --git a/samples/fabric/simpleassetandinterop/go.sum b/samples/fabric/simpleassetandinterop/go.sum index d475f50f3..a617dc983 100644 --- a/samples/fabric/simpleassetandinterop/go.sum +++ b/samples/fabric/simpleassetandinterop/go.sum @@ -158,3 +158,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0 h1:CRA16ciSV2dqogcxavqfl47OGggrzzcfgnM7I98cTuU= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/assetexchange v1.6.0/go.mod h1:Y02vQN1363iz6j1NXrT26+uMo4mM5Q0GTY7/YXQoslY= diff --git a/samples/fabric/simpleassettransfer/go.mod b/samples/fabric/simpleassettransfer/go.mod index 7de665aae..bb5d00ad2 100644 --- a/samples/fabric/simpleassettransfer/go.mod +++ b/samples/fabric/simpleassettransfer/go.mod @@ -4,10 +4,10 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 github.com/hyperledger/fabric-protos-go v0.3.3 diff --git a/samples/fabric/simpleassettransfer/go.sum b/samples/fabric/simpleassettransfer/go.sum index 8f046d361..59772ddd6 100644 --- a/samples/fabric/simpleassettransfer/go.sum +++ b/samples/fabric/simpleassettransfer/go.sum @@ -160,3 +160,9 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0 h1:FMJf69Bk3+rXldtAMtgvl/lmwe3ho1gDcqhlEEcfyxs= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/interfaces/asset-mgmt v1.6.0/go.mod h1:pK+vGW86BaTmn82kLlLBfwVND9cN33iuppVyUwk4ySQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 h1:Fd2IhI/8pVnhdE6cEJVataCPoCnv8PSHvJN+iIdhYt0= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0/go.mod h1:vhscTYgVbY6vCRDxHymxcawyZFZhTo0QRvl5L8tgF8I= diff --git a/samples/fabric/simplestatewithacl/go.mod b/samples/fabric/simplestatewithacl/go.mod index 99689a534..eca33304b 100644 --- a/samples/fabric/simplestatewithacl/go.mod +++ b/samples/fabric/simplestatewithacl/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/testutils v0.0.0-20240521164517-4cb6d4e59bfa - github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 github.com/hyperledger/fabric-chaincode-go v0.0.0-20240425200701-0431f709af2c github.com/hyperledger/fabric-contract-api-go v1.2.2 github.com/hyperledger/fabric-protos-go v0.3.3 @@ -21,7 +21,7 @@ require ( github.com/gobuffalo/envy v1.10.2 // indirect github.com/gobuffalo/packd v1.0.2 // indirect github.com/gobuffalo/packr v1.30.1 // indirect - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 // indirect + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 // indirect github.com/joho/godotenv v1.5.1 // indirect github.com/josharian/intern v1.0.0 // indirect github.com/mailru/easyjson v0.7.7 // indirect diff --git a/samples/fabric/simplestatewithacl/go.sum b/samples/fabric/simplestatewithacl/go.sum index 8959087e2..4669b6e36 100644 --- a/samples/fabric/simplestatewithacl/go.sum +++ b/samples/fabric/simplestatewithacl/go.sum @@ -155,3 +155,7 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C gopkg.in/yaml.v3 v3.0.0-20200615113413-eeeca48fe776/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0 h1:Fd2IhI/8pVnhdE6cEJVataCPoCnv8PSHvJN+iIdhYt0= +github.com/hyperledger-labs/weaver-dlt-interoperability/core/network/fabric-interop-cc/libs/utils v1.6.0/go.mod h1:vhscTYgVbY6vCRDxHymxcawyZFZhTo0QRvl5L8tgF8I= diff --git a/sdks/besu/interoperation-node-sdk/package-local.json b/sdks/besu/interoperation-node-sdk/package-local.json index b8d581a6f..8368d9a33 100644 --- a/sdks/besu/interoperation-node-sdk/package-local.json +++ b/sdks/besu/interoperation-node-sdk/package-local.json @@ -1,7 +1,7 @@ { "name": "@hyperledger-labs/weaver-besu-interop-sdk", "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", - "version": "1.0.1", + "version": "1.6.0", "description": "", "main": "build/index.js", "scripts": { diff --git a/sdks/besu/interoperation-node-sdk/package.json b/sdks/besu/interoperation-node-sdk/package.json index 8c6ef4c80..eb8d7b55e 100644 --- a/sdks/besu/interoperation-node-sdk/package.json +++ b/sdks/besu/interoperation-node-sdk/package.json @@ -1,7 +1,7 @@ { "name": "@hyperledger-labs/weaver-besu-interop-sdk", "description": "Supplemental library for Web3JS based Besu client applications to enable interoperability using Weaver", - "version": "1.0.1", + "version": "1.6.0", "description": "", "main": "build/index.js", "scripts": { @@ -16,7 +16,7 @@ }, "license": "ISC", "dependencies": { - "@hyperledger-labs/weaver-protos-js": "^1.5.7", + "@hyperledger-labs/weaver-protos-js": "1.6.0", "log4js": "^6.7.0", "web3": "^1.8.1" }, diff --git a/sdks/corda/README.md b/sdks/corda/README.md index 06449fbe0..5756c83c1 100644 --- a/sdks/corda/README.md +++ b/sdks/corda/README.md @@ -64,10 +64,10 @@ repositories { } } dependencies { - implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.2.3") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.2.3") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.2.3") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "1.2.3") + implementation(group: 'com.weaver.corda.sdk', name: 'weaver-corda-sdk', version: "1.6.0") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "1.6.0") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "1.6.0") + implementation(group: 'com.weaver', name: 'protos-java-kt', version: "1.6.0") } ``` diff --git a/sdks/corda/build.gradle b/sdks/corda/build.gradle index 4c4a6f13b..e00a17682 100644 --- a/sdks/corda/build.gradle +++ b/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.weaver_version = "1.6.0" dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" @@ -70,9 +69,9 @@ dependencies { // Corda dependencies. compile "$corda_release_group:corda-rpc:$corda_version" - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_corda_version") - implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_corda_version") - implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_protos_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-contracts', version: "$weaver_version") + implementation(group: 'com.weaver.corda.app.interop', name: 'interop-workflows', version: "$weaver_version") + implementation(group: 'com.weaver', name: 'protos-java-kt', version: "$weaver_version") // gRPC and protobuf dependencies implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$coroutines_version" diff --git a/sdks/corda/gradle.properties b/sdks/corda/gradle.properties index d1c64e427..485f23663 100644 --- a/sdks/corda/gradle.properties +++ b/sdks/corda/gradle.properties @@ -1,5 +1,5 @@ kotlin.code.style=official name=weaver-corda-sdk group=com.weaver.corda.sdk -version=1.2.14 +version=1.6.0 kotlin.incremental=false diff --git a/sdks/fabric/go-sdk/VERSION b/sdks/fabric/go-sdk/VERSION index 3c43790f5..dc1e644a1 100644 --- a/sdks/fabric/go-sdk/VERSION +++ b/sdks/fabric/go-sdk/VERSION @@ -1 +1 @@ -1.2.6 +1.6.0 diff --git a/sdks/fabric/go-sdk/go.mod b/sdks/fabric/go-sdk/go.mod index f4b7c9e22..580d326e5 100644 --- a/sdks/fabric/go-sdk/go.mod +++ b/sdks/fabric/go-sdk/go.mod @@ -5,7 +5,7 @@ go 1.20 require ( github.com/golang/protobuf v1.5.4 github.com/google/uuid v1.6.0 - github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.5.11 + github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 github.com/hyperledger/fabric-protos-go v0.3.3 github.com/sirupsen/logrus v1.9.3 github.com/stretchr/testify v1.9.0 diff --git a/sdks/fabric/go-sdk/go.sum b/sdks/fabric/go-sdk/go.sum index fe5b6bfc6..1b17a9718 100644 --- a/sdks/fabric/go-sdk/go.sum +++ b/sdks/fabric/go-sdk/go.sum @@ -36,3 +36,5 @@ gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0 h1:6k9njgcIcWkNmrSeaN9SU1f7jzYu0+CMIMzHUHNWZow= +github.com/hyperledger-labs/weaver-dlt-interoperability/common/protos-go v1.6.0/go.mod h1:HjNaNm5F7UDoLY4qsIwoAJ1tWEsmLK8yNcCjEQWyzXQ= diff --git a/sdks/fabric/interoperation-node-sdk/package-local.json b/sdks/fabric/interoperation-node-sdk/package-local.json index e30c05ad9..dfd26d30b 100644 --- a/sdks/fabric/interoperation-node-sdk/package-local.json +++ b/sdks/fabric/interoperation-node-sdk/package-local.json @@ -6,7 +6,7 @@ "blockchain", "interoperability" ], - "version": "1.5.14", + "version": "1.6.0", "author": "V. Ramakrishna", "tag": "latest", "main": "build/index.js", diff --git a/sdks/fabric/interoperation-node-sdk/package.json b/sdks/fabric/interoperation-node-sdk/package.json index 027ac0df3..6d79db00a 100644 --- a/sdks/fabric/interoperation-node-sdk/package.json +++ b/sdks/fabric/interoperation-node-sdk/package.json @@ -6,7 +6,7 @@ "blockchain", "interoperability" ], - "version": "1.5.14", + "version": "1.6.0", "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-labs/weaver-protos-js": "1.6.0", "elliptic": "^6.2.3", "fabric-common": "^2.2.8", "fabric-network": "^2.2.8", diff --git a/tests/network-setups/corda/scripts/get-cordapps.sh b/tests/network-setups/corda/scripts/get-cordapps.sh index 6af8f8673..975cd6ae2 100755 --- a/tests/network-setups/corda/scripts/get-cordapps.sh +++ b/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" +weaverVersion="1.6.0" 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 + if [[ ! -f $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverVersion.jar ]]; then echo "Please Build the weaver-protos-java-kt version $weaverVersion to use local components." fi - if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverCordaVersion.jar ]]; then + if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-contracts/build/libs/interop-contracts-$weaverVersion.jar ]]; then echo "Please Build the corda-interop-app version $weaverVersion to use local components." fi - if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverCordaVersion.jar ]]; then + if [[ ! -f $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverVersion.jar ]]; then echo "Please Build the corda-interop-app version $weaverVersion 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-$weaverVersion.jar $directory/../shared/artifacts + cp $directory/../../../../core/network/corda-interop-app/interop-workflows/build/libs/interop-workflows-$weaverVersion.jar $directory/../shared/artifacts + cp $directory/../../../../common/protos-java-kt/build/libs/protos-java-kt-$weaverVersion.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/com/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/corda/app/interop/interop-contracts/$weaverVersion/interop-contracts-$weaverVersion.jar) || exit 1 + (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/corda/app/interop/interop-workflows/$weaverVersion/interop-workflows-$weaverVersion.jar) || exit 1 + (cd $directory/../shared/artifacts && curl --location -u $username:$password -O $baseUrl/protos-java-kt/$weaverVersion/protos-java-kt-$weaverVersion.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/tests/network-setups/corda/scripts/start-nodes.sh b/tests/network-setups/corda/scripts/start-nodes.sh index 0f0c0028b..b001877e9 100755 --- a/tests/network-setups/corda/scripts/start-nodes.sh +++ b/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" +weaverVersion="1.6.0" 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-$weaverVersion.jar dev/${nw}/build/nodes/${party}/cordapps + cp $directory/../shared/artifacts/interop-workflows-$weaverVersion.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-$weaverVersion.jar dev/${nw}/build/nodes/${party}/cordapps done; dockerProject="corda"