From 8820d2ff3af1f9cb1f34c0b9ad8b3b09f3e1c55a Mon Sep 17 00:00:00 2001 From: Arnaud J Le Hors Date: Tue, 14 Apr 2020 17:27:26 +0200 Subject: [PATCH 1/3] Fix commercial-paper README Fixes several errors, typos, and clarifies some of the instructions. Signed-off-by: Arnaud J Le Hors --- commercial-paper/README.md | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/commercial-paper/README.md b/commercial-paper/README.md index 1d31c6fd..4aa6056c 100644 --- a/commercial-paper/README.md +++ b/commercial-paper/README.md @@ -61,7 +61,7 @@ You can re-use this console window if you wish, but it is recommended to run a d ### Setup the Organizations' environments -The contract code is available as either JavaScript, Java or Go. You can use either one, and the choice of contract language does not affect the choice of client language. With the v2.0 Fabric chaincode lifecycle, this requires operations for both MagentoCorp and Digibank admin. Open two windows in the fabric-samples/commercial paper directory, one for each organization. +The contract code is available as either JavaScript, Java or Go. You can use either one, and the choice of contract language does not affect the choice of client language. With the v2.0 Fabric chaincode lifecycle, this requires operations for both MagnetoCorp and Digibank admin. Open two windows in the fabric-samples/commercial paper directory, one for each organization. In your 'MagnetoCorp' window run the following commands, to show the shell environment variables needed to act as that organization. @@ -70,7 +70,7 @@ cd fabric-samples/commercial-paper/organization/magnetocorp ./magnetocorp.sh ``` -You can either copy and paste thee directly into the terminal, or invoke directly in you own command shell. For example if you are using bash or zsh on Linux you can use this command. +You can either copy and paste them directly into the terminal, or invoke directly in your own command shell. For example if you are using bash or zsh on Linux you can use this command. ``` source <(./magnetocorp.sh) @@ -79,13 +79,13 @@ source <(./magnetocorp.sh) Similarly in your 'DigiBank' window run the following command ``` -cd fabric-samples/commercial-paper/digibank +cd fabric-samples/commercial-paper/organization/digibank ./digibank.sh ``` ### Deploy the smart contract to the channel -You need to perform similar operations for both organizations. For different contract langauges the steps are very similar. The steps for JavaScript are shown first, with the details of different languages afterwards. +You need to perform similar operations for both organizations. For different contract languages the steps are very similar. The steps for JavaScript are shown first, with the details of different languages afterwards. **For a JavaScript Contract** @@ -93,7 +93,7 @@ You need to perform similar operations for both organizations. For different con Running in MagnetoCorp: ``` -# MAGENTOCORP +# MAGNETOCORP peer lifecycle chaincode package cp.tar.gz --lang node --path ./contract --label cp_0 peer lifecycle chaincode install cp.tar.gz @@ -174,15 +174,15 @@ peer chaincode query -o localhost:7050 --ordererTLSHostnameOverride orderer.exa **For a Java Contract:** -Before the `peer lifecycle chaincode package` command, you will need to change into each organization's `contract-java` directory and issues +Before the `peer lifecycle chaincode package` command, you will need to change into each organization's `contract-java` directory and issue ``` ./gradlew build ``` -Then when you package the contract, use this variation of the command to specify language +Then from the parent directory when you package the contract, use this variation of the command to specify the java specific contract ``` -peer lifecycle chaincode package cp.tar.gz --lang java --path /opt/gopath/src/github.com/contract-java --label cp_0 +peer lifecycle chaincode package cp.tar.gz --lang java --path ./contract-java --label cp_0 ``` After this point the steps are exactly the same as for JavaScript @@ -190,13 +190,13 @@ After this point the steps are exactly the same as for JavaScript **For a Go Contract:** -Before the `peer lifecycle chaincode package` command, you will need to change into each organization's `contract-go` directory and issues +Before the `peer lifecycle chaincode package` command, you will need to change into each organization's `contract-go` directory and issue ``` go mod vendor ``` -Then when you package the contract, use this variation of the command to specify language +Then from the parent directory when you package the contract, use this variation of the command to specify the go specific contract ``` peer lifecycle chaincode package cp.tar.gz --lang golang --path ./contract-go --label cp_0 ``` From 94beab76482c9b22ceeafc58d698635a89ef111f Mon Sep 17 00:00:00 2001 From: heatherlp Date: Thu, 16 Apr 2020 17:52:47 +0100 Subject: [PATCH 2/3] FABN-1531 Use v2.1.0 sdk-node modules Signed-off-by: heatherlp --- fabcar/javascript/package-lock.json | 62 +++++++++++++++++------------ fabcar/javascript/package.json | 4 +- 2 files changed, 39 insertions(+), 27 deletions(-) diff --git a/fabcar/javascript/package-lock.json b/fabcar/javascript/package-lock.json index 17fbc520..2446ee3e 100644 --- a/fabcar/javascript/package-lock.json +++ b/fabcar/javascript/package-lock.json @@ -177,9 +177,9 @@ "integrity": "sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" }, "@types/node": { - "version": "13.9.5", - "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.5.tgz", - "integrity": "sha512-hkzMMD3xu6BrJpGVLeQ3htQQNAcOrJjX7WFmtK8zWQpz2UJf13LCFF2ALA7c9OVdvc2vQJeDdjfR35M0sBCxvw==" + "version": "13.11.1", + "resolved": "https://registry.npmjs.org/@types/node/-/node-13.11.1.tgz", + "integrity": "sha512-eWQGP3qtxwL8FGneRrC5DwrJLGN4/dH1clNTuLfN81HCrxVtxRjygDTUoZJ5ASlDEeo0ppYFQjQIlXhtXpOn6g==" }, "@types/request": { "version": "2.48.4", @@ -205,9 +205,9 @@ } }, "@types/tough-cookie": { - "version": "2.3.6", - "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-2.3.6.tgz", - "integrity": "sha512-wHNBMnkoEBiRAd3s8KTKwIuO9biFtTf0LehITzBhSco+HQI0xkXZbLOD55SW3Aqw3oUkHstkm5SPv58yaAdFPQ==" + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A==" }, "acorn": { "version": "6.4.1", @@ -901,11 +901,11 @@ "integrity": "sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A=" }, "fabric-ca-client": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-2.0.0-beta.4.tgz", - "integrity": "sha512-pEaMjd/iFhvwrs7gdbbBrfRIOogfGSCad0p2YYYqclwQmugqOti/6HuIOipHlgdWnTBHcVPE71DlZKjpHVNFeg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-2.1.0.tgz", + "integrity": "sha512-f8s8e/tOwsWDHwMhvnPPdnL4bgwkpG8LED5frEaP+rWHUoqUNAUOpvs/kLdnBcezix84UNA3f+UbccF9KL6dAA==", "requires": { - "fabric-common": "^2.0.0-beta.4", + "fabric-common": "^2.1.0", "jsrsasign": "^7.2.2", "url": "^0.11.0", "util": "^0.10.3", @@ -913,12 +913,12 @@ } }, "fabric-common": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/fabric-common/-/fabric-common-2.0.0-beta.4.tgz", - "integrity": "sha512-o0NcUjkGt1Y5P1j5AOQIMPPCQIFrOnxRWNlT86elzE3AaJYdRVe4ZdIB+Oevndm2L8WdGDqrsF1L+MvnCTAHQg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fabric-common/-/fabric-common-2.1.0.tgz", + "integrity": "sha512-t980mEGBlbVTq2y6Zi3ZtVN5RnUy5xNoRWhPTpifAsI1m0KYBSh8jPcxtybMrLds12J/PAE7qI4TrgbZMqapKg==", "requires": { "elliptic": "^6.2.3", - "fabric-protos": "^2.0.0-beta.4", + "fabric-protos": "^2.1.0", "js-sha3": "^0.7.0", "nano": "^6.4.4", "nconf": "^0.10.0", @@ -930,12 +930,12 @@ } }, "fabric-network": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/fabric-network/-/fabric-network-2.0.0-beta.4.tgz", - "integrity": "sha512-BGfk/mgFNxeTv4vibdvqFD46qMLLQKC5jzeNDWJ5BQkSYz8HJfp5Oo230DSfz0avSDQTC9CR2xF5ARELah0TfQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fabric-network/-/fabric-network-2.1.0.tgz", + "integrity": "sha512-9VqUvYX2fROleTl1sKIx51EhLDfhDxDMHIgafRvicBFJKYAeQ6nyKWmk3gZIlGxmB2LjpIV+WzwR5Z2PiNI03w==", "requires": { - "fabric-ca-client": "^2.0.0-beta.4", - "fabric-common": "^2.0.0-beta.4", + "fabric-ca-client": "^2.1.0", + "fabric-common": "^2.1.0", "fs-extra": "^8.1.0", "long": "^4.0.0", "nano": "^8.1.0", @@ -960,6 +960,18 @@ "ms": "^2.1.1" } }, + "fabric-ca-client": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fabric-ca-client/-/fabric-ca-client-2.1.0.tgz", + "integrity": "sha512-f8s8e/tOwsWDHwMhvnPPdnL4bgwkpG8LED5frEaP+rWHUoqUNAUOpvs/kLdnBcezix84UNA3f+UbccF9KL6dAA==", + "requires": { + "fabric-common": "^2.1.0", + "jsrsasign": "^7.2.2", + "url": "^0.11.0", + "util": "^0.10.3", + "winston": "^2.4.0" + } + }, "long": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz", @@ -980,9 +992,9 @@ } }, "fabric-protos": { - "version": "2.0.0-beta.4", - "resolved": "https://registry.npmjs.org/fabric-protos/-/fabric-protos-2.0.0-beta.4.tgz", - "integrity": "sha512-CIRB0lxQl38v3E3JcJUFKv4LggOp0We/uVIVLIaDDOxGNEve0Qog1DgAAKCI8VzrjqFn227p1rqTf+Xyoky0hg==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fabric-protos/-/fabric-protos-2.1.0.tgz", + "integrity": "sha512-99+5ouNLUGz6sA5wQJyhpCYUGlfk8JHWSPUtjutnTRyb40TnbfebmG6k7lBCI6Kjyd7l9AHlD5yZuF7oCqAgkA==", "requires": { "grpc": "1.24.2", "lodash.clone": "4.5.0", @@ -2660,9 +2672,9 @@ "dev": true }, "pkcs11js": { - "version": "1.0.20", - "resolved": "https://registry.npmjs.org/pkcs11js/-/pkcs11js-1.0.20.tgz", - "integrity": "sha512-Nzyl8R0w8FtTOyv5T0Pmmv2dzFt8mtPlEH0DNG7hdmX7VE1wKYMbrvMoQ1D32VnfJd5vs4efbeQ9K0wPg817IQ==", + "version": "1.0.21", + "resolved": "https://registry.npmjs.org/pkcs11js/-/pkcs11js-1.0.21.tgz", + "integrity": "sha512-U+UUXbVqdL3q95zNqi8aGbAg6KcyVkKocKR4QicvoEEO9NVW2podLkaq5hhxLGUi+OOJSL5VBNbUE2EatbeITw==", "optional": true, "requires": { "nan": "^2.14.0" diff --git a/fabcar/javascript/package.json b/fabcar/javascript/package.json index 2d608eb1..38de6ae5 100644 --- a/fabcar/javascript/package.json +++ b/fabcar/javascript/package.json @@ -15,8 +15,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "beta", - "fabric-network": "beta" + "fabric-ca-client": "^2.1.0", + "fabric-network": "^2.1.0" }, "devDependencies": { "chai": "^4.2.0", From 11e4c23a353de0fdbf92c8fcf16bfb2ba2315d15 Mon Sep 17 00:00:00 2001 From: denyeart Date: Fri, 17 Apr 2020 08:29:37 -0400 Subject: [PATCH 3/3] Update samples to use v2.0 or later dependencies (#161) Update application and chaincode dependendencies to use v2.0 or later versions in package.json, build.gradle, pom.xml files. Signed-off-by: David Enyeart --- chaincode/abstore/java/build.gradle | 2 +- chaincode/fabcar/java/build.gradle | 4 ++-- .../organization/digibank/application-java/pom.xml | 2 +- .../organization/digibank/application/package.json | 4 ++-- .../organization/digibank/contract-java/build.gradle | 4 ++-- .../organization/digibank/contract-java/shadow-build.gradle | 2 +- .../organization/magnetocorp/application-java/pom.xml | 2 +- .../organization/magnetocorp/application/package.json | 4 ++-- .../organization/magnetocorp/contract-java/build.gradle | 2 +- fabcar/typescript/package.json | 4 ++-- off_chain_data/package.json | 4 ++-- 11 files changed, 17 insertions(+), 17 deletions(-) diff --git a/chaincode/abstore/java/build.gradle b/chaincode/abstore/java/build.gradle index 02483c75..aec70afe 100644 --- a/chaincode/abstore/java/build.gradle +++ b/chaincode/abstore/java/build.gradle @@ -25,7 +25,7 @@ repositories { } dependencies { - implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.0.+' + implementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' } shadowJar { diff --git a/chaincode/fabcar/java/build.gradle b/chaincode/fabcar/java/build.gradle index 8ef8f8c7..d2c257cc 100644 --- a/chaincode/fabcar/java/build.gradle +++ b/chaincode/fabcar/java/build.gradle @@ -12,9 +12,9 @@ group 'org.hyperledger.fabric.samples' version '1.0-SNAPSHOT' dependencies { - compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.0.+' + compileOnly 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' implementation 'com.owlike:genson:1.5' - testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.0.+' + testImplementation 'org.hyperledger.fabric-chaincode-java:fabric-chaincode-shim:2.+' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' testImplementation 'org.mockito:mockito-core:2.+' diff --git a/commercial-paper/organization/digibank/application-java/pom.xml b/commercial-paper/organization/digibank/application-java/pom.xml index f3963d3f..dbdffae1 100644 --- a/commercial-paper/organization/digibank/application-java/pom.xml +++ b/commercial-paper/organization/digibank/application-java/pom.xml @@ -14,7 +14,7 @@ UTF-8 - [2.0.0,2.1) + [2.0,3.0) diff --git a/commercial-paper/organization/digibank/application/package.json b/commercial-paper/organization/digibank/application/package.json index 2bc80f12..afff844f 100644 --- a/commercial-paper/organization/digibank/application/package.json +++ b/commercial-paper/organization/digibank/application/package.json @@ -10,8 +10,8 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-network": "beta", - "fabric-ca-client": "beta", + "fabric-network": "^2.1.0", + "fabric-ca-client": "^2.1.0", "js-yaml": "^3.12.0" }, "devDependencies": { diff --git a/commercial-paper/organization/digibank/contract-java/build.gradle b/commercial-paper/organization/digibank/contract-java/build.gradle index 2f04c43e..c0a2b439 100644 --- a/commercial-paper/organization/digibank/contract-java/build.gradle +++ b/commercial-paper/organization/digibank/contract-java/build.gradle @@ -19,7 +19,7 @@ repositories { } dependencies { - compileOnly group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '1.4.2' + compileOnly group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+' compile group: 'org.json', name: 'json', version: '20180813' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' @@ -35,4 +35,4 @@ test { tasks.withType(JavaCompile) { options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation" << "-parameters" -} \ No newline at end of file +} diff --git a/commercial-paper/organization/digibank/contract-java/shadow-build.gradle b/commercial-paper/organization/digibank/contract-java/shadow-build.gradle index f683babb..0a298872 100644 --- a/commercial-paper/organization/digibank/contract-java/shadow-build.gradle +++ b/commercial-paper/organization/digibank/contract-java/shadow-build.gradle @@ -20,7 +20,7 @@ repositories { } dependencies { - implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.0.+' + implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+' implementation group: 'org.json', name: 'json', version: '20180813' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' diff --git a/commercial-paper/organization/magnetocorp/application-java/pom.xml b/commercial-paper/organization/magnetocorp/application-java/pom.xml index b405e993..194967c6 100644 --- a/commercial-paper/organization/magnetocorp/application-java/pom.xml +++ b/commercial-paper/organization/magnetocorp/application-java/pom.xml @@ -14,7 +14,7 @@ UTF-8 - 1.4.2 + [2.0,3.0) diff --git a/commercial-paper/organization/magnetocorp/application/package.json b/commercial-paper/organization/magnetocorp/application/package.json index 0b29a9c1..59efa9c0 100644 --- a/commercial-paper/organization/magnetocorp/application/package.json +++ b/commercial-paper/organization/magnetocorp/application/package.json @@ -10,8 +10,8 @@ "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-network": "beta", - "fabric-ca-client": "beta", + "fabric-network": "^2.1.0", + "fabric-ca-client": "^2.1.0", "js-yaml": "^3.12.0" }, "devDependencies": { diff --git a/commercial-paper/organization/magnetocorp/contract-java/build.gradle b/commercial-paper/organization/magnetocorp/contract-java/build.gradle index f683babb..0a298872 100644 --- a/commercial-paper/organization/magnetocorp/contract-java/build.gradle +++ b/commercial-paper/organization/magnetocorp/contract-java/build.gradle @@ -20,7 +20,7 @@ repositories { } dependencies { - implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.0.+' + implementation group: 'org.hyperledger.fabric-chaincode-java', name: 'fabric-chaincode-shim', version: '2.+' implementation group: 'org.json', name: 'json', version: '20180813' testImplementation 'org.junit.jupiter:junit-jupiter:5.4.2' testImplementation 'org.assertj:assertj-core:3.11.1' diff --git a/fabcar/typescript/package.json b/fabcar/typescript/package.json index 57863da9..6cb67aa1 100644 --- a/fabcar/typescript/package.json +++ b/fabcar/typescript/package.json @@ -18,8 +18,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "beta", - "fabric-network": "beta" + "fabric-ca-client": "^2.1.0", + "fabric-network": "^2.1.0" }, "devDependencies": { "@types/chai": "^4.1.7", diff --git a/off_chain_data/package.json b/off_chain_data/package.json index 9490cda3..9bb41be9 100644 --- a/off_chain_data/package.json +++ b/off_chain_data/package.json @@ -15,8 +15,8 @@ "author": "Hyperledger", "license": "Apache-2.0", "dependencies": { - "fabric-ca-client": "beta", - "fabric-network": "beta" + "fabric-ca-client": "^2.1.0", + "fabric-network": "^2.1.0" }, "devDependencies": { "chai": "^4.2.0",