diff --git a/CHANGELOG.md b/CHANGELOG.md index f2d7bc3a..557ba848 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,15 @@ +## v2.4.2 +Wed 4 May 2022 11:30:35 BST + +* [4467c458](https://github.com/hyperledger/fabric-chaincode-node/commit/4467c458) Allow jsdoc push to fail (#331) +* [3f1dbffd](https://github.com/hyperledger/fabric-chaincode-node/commit/3f1dbffd) Remove fabric-shim-crypto package +* [d9cfc3d0](https://github.com/hyperledger/fabric-chaincode-node/commit/d9cfc3d0) Correct 2.4 to be Node 16 +* [e1ae5b31](https://github.com/hyperledger/fabric-chaincode-node/commit/e1ae5b31) Fixing a command which is giving errors while copying and pasting (#322) +* [671a5442](https://github.com/hyperledger/fabric-chaincode-node/commit/671a5442) Some updates to the latest tool versions +* [2d861535](https://github.com/hyperledger/fabric-chaincode-node/commit/2d861535) Replace RocketChat with Discord +* [f7288eba](https://github.com/hyperledger/fabric-chaincode-node/commit/f7288eba) add missing bracket (#312) +* [a53121f0](https://github.com/hyperledger/fabric-chaincode-node/commit/a53121f0) Fix Doc: Type of args in invokeChaincode() is string[] (#311) + ## v2.4.1 Mon Nov 29 10:39:51 GMT 2021 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 81388fa1..6fd4db14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ The following [Rush categories](https://rushjs.io/pages/maintainer/add_to_repo/) ### Pre-requisites -* node v12.16.1 (npm v6.4.1) => recommend to use [nvm](https://github.com/nvm-sh/nvm) +* node v16.4.0 (npm v8.0.0) => recommend to use [nvm](https://github.com/nvm-sh/nvm) * rush => `npm install -g @microsoft/rush` > Note that npm v6 has some bugs that mean adding new dependencies etc are not properly picked up. Longer term we should consider moving to yarn or pnpm. However in practice this isn't a serious problem and has been possible to be worked around by issuing `rm ./common/config/rush/npm-shrinkwrap.json` and then `rush update` diff --git a/TUTORIAL.md b/TUTORIAL.md index 486f955e..58beaa78 100644 --- a/TUTORIAL.md +++ b/TUTORIAL.md @@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required. "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^2.4.1", - "fabric-shim": "^2.4.1" + "fabric-contract-api": "^2.4.2", + "fabric-shim": "^2.4.2" } } diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index 0bf70e20..ccc6363e 100644 --- a/apis/fabric-contract-api/package.json +++ b/apis/fabric-contract-api/package.json @@ -1,6 +1,6 @@ { "name": "fabric-contract-api", - "version": "2.4.1", + "version": "2.4.2", "tag": "release", "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", @@ -46,7 +46,7 @@ "lines": 100 }, "dependencies": { - "fabric-shim-api": "2.4.1", + "fabric-shim-api": "2.4.2", "class-transformer": "^0.4.0", "fast-safe-stringify": "^2.1.1", "get-params": "^0.1.2", diff --git a/apis/fabric-shim-api/package.json b/apis/fabric-shim-api/package.json index 07ddf24d..b1228f15 100644 --- a/apis/fabric-shim-api/package.json +++ b/apis/fabric-shim-api/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim-api", - "version": "2.4.1", + "version": "2.4.2", "tag": "release", "description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml index 67f50076..4711bdef 100644 --- a/ci/azure-pipelines.yml +++ b/ci/azure-pipelines.yml @@ -52,7 +52,7 @@ pool: # # Publish to NPM on release builds (they are the github tagged releases) # Publish to NPM on nightly builds when there is something to build -# the ids will be of the format 2.4.1.{commitid} +# the ids will be of the format 2.4.2.{commitid} # stages: diff --git a/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json index ec6cb8b7..a41dad0e 100644 --- a/docker/fabric-nodeenv/package.json +++ b/docker/fabric-nodeenv/package.json @@ -1,6 +1,6 @@ { "name": "fabric-nodeenv", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "docker.js", "scripts": { @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "git-rev-sync": "3.0.1", - "toolchain": "2.4.1" + "toolchain": "2.4.2" } } diff --git a/docs/_jsdoc/tutorials/using-chaincodeinterface.md b/docs/_jsdoc/tutorials/using-chaincodeinterface.md index 7dbf0c15..301b163e 100644 --- a/docs/_jsdoc/tutorials/using-chaincodeinterface.md +++ b/docs/_jsdoc/tutorials/using-chaincodeinterface.md @@ -8,7 +8,7 @@ cd mycc // create a new node project npm init // install fabric-shim at main branch -npm install fabric-shim@2.4.1 +npm install fabric-shim@2.4.2 // or using the released version npm install fabric-shim touch mychaincode.js @@ -68,7 +68,7 @@ Finally, update the "start" script in package.json to "node mychaincode.js": "engineStrict": true, "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1" + "fabric-shim": "2.4.2" } } ``` diff --git a/docs/_jsdoc/tutorials/using-contractinterface.md b/docs/_jsdoc/tutorials/using-contractinterface.md index 76a5f4ad..1805ff86 100644 --- a/docs/_jsdoc/tutorials/using-contractinterface.md +++ b/docs/_jsdoc/tutorials/using-contractinterface.md @@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required. "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-contract-api": "^2.4.1", - "fabric-shim": "^2.4.1" + "fabric-contract-api": "^2.4.2", + "fabric-shim": "^2.4.2" } } diff --git a/docs/package.json b/docs/package.json index 9a5998a2..16431e57 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim-docs", - "version": "2.4.1", + "version": "2.4.2", "description": "", "private": true, "scripts": { @@ -8,7 +8,7 @@ "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json" }, "dependencies": { - "fabric-ledger": "2.4.1" + "fabric-ledger": "2.4.2" }, "devDependencies": { "ink-docstrap": "^1.3.2", diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json index 9cad7f04..1b8d6723 100644 --- a/libraries/fabric-ledger/package.json +++ b/libraries/fabric-ledger/package.json @@ -1,6 +1,6 @@ { "name": "fabric-ledger", - "version": "2.4.1", + "version": "2.4.2", "tag": "unstable", "description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts", "main": "lib/index.js", @@ -49,7 +49,7 @@ "lines": 100 }, "dependencies": { - "fabric-contract-api": "2.4.1", + "fabric-contract-api": "2.4.2", "winston": "^3.7.2" }, "devDependencies": { diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json index d241bfe8..b3fe6302 100644 --- a/libraries/fabric-shim/package.json +++ b/libraries/fabric-shim/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim", - "version": "2.4.1", + "version": "2.4.2", "tag": "release", "description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other", "main": "index.js", @@ -59,8 +59,8 @@ "@grpc/proto-loader": "^0.6.6", "@types/node": "^16.11.1", "ajv": "^6.12.2", - "fabric-contract-api": "2.4.1", - "fabric-shim-api": "2.4.1", + "fabric-contract-api": "2.4.2", + "fabric-shim-api": "2.4.2", "fs-extra": "^10.0.1", "reflect-metadata": "^0.1.13", "winston": "^3.7.2", diff --git a/release_notes/v2.4.2.txt b/release_notes/v2.4.2.txt new file mode 100644 index 00000000..a2904293 --- /dev/null +++ b/release_notes/v2.4.2.txt @@ -0,0 +1,15 @@ +v2.4.2 +------ + +Release Notes +------------- + +This release corrects the 2.4 nodeenv docker image to be Node 16, and removes the fabric-shim-crypto package. + +Note that version of Node.js is updated to 16.4.0. See the COMPATIBILITY.md file in the main branch for information. + +See the change log for a full list of updates. + +Change Log +---------- +https://github.com/hyperledger/fabric-chaincode-node/blob/main/CHANGELOG.md#v2.4.2 diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json index 2f5d8a35..fa069ea1 100644 --- a/test/chaincodes/annotations/package.json +++ b/test/chaincodes/annotations/package.json @@ -14,13 +14,13 @@ "typings": "dist/index.d.ts", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "APACHE-2.0", "dependencies": { "@types/node": "^16.11.4", - "fabric-contract-api": "2.4.1", - "fabric-shim": "2.4.1", + "fabric-contract-api": "2.4.2", + "fabric-shim": "2.4.2", "ts-node": "^3.3.0", "tslint": "^5.6.0", "typescript": "^4.0.2" diff --git a/test/chaincodes/annotations/src/test_contract/expected-metadata.json b/test/chaincodes/annotations/src/test_contract/expected-metadata.json index 1ed2551a..4041e7eb 100644 --- a/test/chaincodes/annotations/src/test_contract/expected-metadata.json +++ b/test/chaincodes/annotations/src/test_contract/expected-metadata.json @@ -107,7 +107,7 @@ } }, "info": { - "version": "2.4.1", + "version": "2.4.2", "title": "ts_chaincode" }, "components": { diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json index 0f6e6ef1..7c5dfeec 100644 --- a/test/chaincodes/clientidentity/package.json +++ b/test/chaincodes/clientidentity/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json index 4eaefdda..f4d65c05 100644 --- a/test/chaincodes/crosschaincode/package.json +++ b/test/chaincodes/crosschaincode/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json index 4eaefdda..f4d65c05 100644 --- a/test/chaincodes/crosschaincode2/package.json +++ b/test/chaincodes/crosschaincode2/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json index f469f26b..ac0bb3c0 100644 --- a/test/chaincodes/crud/package.json +++ b/test/chaincodes/crud/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json index 9b0bcd36..a4140d4b 100644 --- a/test/chaincodes/events/package.json +++ b/test/chaincodes/events/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json index 7ad68005..83323138 100644 --- a/test/chaincodes/ledger/package.json +++ b/test/chaincodes/ledger/package.json @@ -11,12 +11,12 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1", - "fabric-ledger": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2", + "fabric-ledger": "2.4.2" } } diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json index 6e697668..fa2b4c4b 100644 --- a/test/chaincodes/privateData/package.json +++ b/test/chaincodes/privateData/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json index b768a63f..cf160a18 100644 --- a/test/chaincodes/query/package.json +++ b/test/chaincodes/query/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json index 587ebacc..a7947cd1 100644 --- a/test/chaincodes/scenario/package.json +++ b/test/chaincodes/scenario/package.json @@ -11,11 +11,11 @@ "main": "index.js", "engine-strict": true, "engineStrict": true, - "version": "2.4.1", + "version": "2.4.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.4.1", - "fabric-contract-api": "2.4.1" + "fabric-shim": "2.4.2", + "fabric-contract-api": "2.4.2" } } diff --git a/test/e2e/package.json b/test/e2e/package.json index b5835bd5..160a522e 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -1,6 +1,6 @@ { "name": "fabric-e2e-tests", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "docker.js", "scripts": { @@ -13,7 +13,7 @@ "devDependencies": { "git-rev-sync": "3.0.1", "gulp": "^4.0.2", - "toolchain": "2.4.1", + "toolchain": "2.4.2", "delay": "5.0.0", "fs-extra": "^10.0.1", "ip": "^1.1.5", diff --git a/test/e2e/scenario.js b/test/e2e/scenario.js index 3aee9651..d2cbf034 100644 --- a/test/e2e/scenario.js +++ b/test/e2e/scenario.js @@ -57,7 +57,7 @@ const queryFunctions = async () => { const metadata = JSON.parse(stdout); - const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.4.1","title":"chaincode"},"components":{"schemas":{}}}'; + const expectedMetadata = '{"$schema":"https://hyperledger.github.io/fabric-chaincode-node/main/api/contract-schema.json","contracts":{"UpdateValues":{"name":"UpdateValues","contractInstance":{"name":"UpdateValues","logBuffer":{"output":[]},"default":true},"transactions":[{"name":"setup","tags":["SUBMIT","submitTx"]},{"name":"setNewAssetValue","tags":["SUBMIT","submitTx"],"parameters":[{"name":"arg0","description":"Argument 0","schema":{"type":"string"}}]},{"name":"doubleAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"RemoveValues":{"name":"RemoveValues","contractInstance":{"name":"RemoveValues"},"transactions":[{"name":"quarterAssetValue","tags":["SUBMIT","submitTx"]},{"name":"getAssetValue","tags":["SUBMIT","submitTx"]}],"info":{"title":"","version":""}},"org.hyperledger.fabric":{"name":"org.hyperledger.fabric","contractInstance":{"name":"org.hyperledger.fabric"},"transactions":[{"name":"GetMetadata"}],"info":{"title":"","version":""}}},"info":{"version":"2.4.2","title":"chaincode"},"components":{"schemas":{}}}'; const schema = fs.readFileSync(path.join(__dirname, '../../apis/fabric-contract-api/schema/contract-schema.json')); diff --git a/test/fv/package.json b/test/fv/package.json index d9b3a190..9032e127 100644 --- a/test/fv/package.json +++ b/test/fv/package.json @@ -1,6 +1,6 @@ { "name": "fvtests", - "version": "2.4.1", + "version": "2.4.2", "description": "fv tests", "testFabricVersion": "main", "testFabricThirdParty": "0.4.15", @@ -26,9 +26,9 @@ "del": "^3.0.0", "delay": "5.0.0", "eslint": "^6.6.0", - "fabric-contract-api": "2.4.1", - "fabric-shim": "2.4.1", - "fabric-shim-api": "2.4.1", + "fabric-contract-api": "2.4.2", + "fabric-shim": "2.4.2", + "fabric-shim-api": "2.4.2", "fs-extra": "^10.0.1", "git-rev-sync": "3.0.1", "gulp": "^4.0.2", diff --git a/tools/toolchain/network/docker-compose/docker-compose-base.yaml b/tools/toolchain/network/docker-compose/docker-compose-base.yaml index 57991670..3868ddd3 100644 --- a/tools/toolchain/network/docker-compose/docker-compose-base.yaml +++ b/tools/toolchain/network/docker-compose/docker-compose-base.yaml @@ -92,7 +92,7 @@ services: # # bridge network as the peers # # https://docs.docker.com/compose/networking/ - CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default - - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.4.1 + - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.4.2 # Allow more time for chaincode container to build on install. - CORE_CHAINCODE_EXECUTETIMEOUT=300s diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json index bc49b937..1425c3a6 100644 --- a/tools/toolchain/package.json +++ b/tools/toolchain/package.json @@ -1,6 +1,6 @@ { "name": "toolchain", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "index.js", "scripts": {