From 21c43778db13ff6a2da850e4f29e9c33cfba3e44 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Wed, 11 Jan 2023 11:33:21 +0000 Subject: [PATCH] Prepare the 2.5.1 release Signed-off-by: Matthew B White --- CHANGELOG.md | 8 ++++++++ apis/fabric-contract-api/package.json | 4 ++-- apis/fabric-shim-api/package.json | 2 +- docker/fabric-nodeenv/package.json | 4 ++-- docs/package.json | 4 ++-- libraries/fabric-ledger/package.json | 4 ++-- libraries/fabric-shim/package.json | 6 +++--- release_notes/v2.5.1.txt | 14 ++++++++++++++ test/chaincodes/annotations/package.json | 6 +++--- .../src/test_contract/expected-metadata.json | 2 +- test/chaincodes/clientidentity/package.json | 6 +++--- test/chaincodes/crosschaincode/package.json | 6 +++--- test/chaincodes/crosschaincode2/package.json | 6 +++--- test/chaincodes/crud/package.json | 6 +++--- test/chaincodes/events/package.json | 6 +++--- test/chaincodes/ledger/package.json | 8 ++++---- test/chaincodes/privateData/package.json | 6 +++--- test/chaincodes/query/package.json | 6 +++--- test/chaincodes/scenario/package.json | 6 +++--- test/e2e/package.json | 4 ++-- test/e2e/scenario.js | 2 +- test/fv/package.json | 8 ++++---- tools/toolchain/package.json | 2 +- 23 files changed, 74 insertions(+), 52 deletions(-) create mode 100644 release_notes/v2.5.1.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 32bfebf6b..706d5bc5a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,11 @@ +## v2.5.1 +Wed Jan 11 11:31:22 GMT 2023 + +* [30125f68](https://github.com/hyperledger/fabric-chaincode-node/commit/30125f68) Pin fabric-shim's dependency on grpc-js to 1.8.1 (#369) +* [4a0fc571](https://github.com/hyperledger/fabric-chaincode-node/commit/4a0fc571) GHA workflow +* [102473e7](https://github.com/hyperledger/fabric-chaincode-node/commit/102473e7) GHA Workflow +* [c6ff468b](https://github.com/hyperledger/fabric-chaincode-node/commit/c6ff468b) Get builds on release-2.5 branch (#360) + ## v2.5.0 Thu Dec 8 09:19:10 GMT 2022 diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index aa2ab94c5..1f0b5ff1e 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.5.0", + "version": "2.5.1", "tag": "latest", "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.5.0", + "fabric-shim-api": "2.5.1", "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 d71a2be27..fd747e3c6 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.5.0", + "version": "2.5.1", "tag": "latest", "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/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json index a24d243f5..91d131d85 100644 --- a/docker/fabric-nodeenv/package.json +++ b/docker/fabric-nodeenv/package.json @@ -1,6 +1,6 @@ { "name": "fabric-nodeenv", - "version": "2.5.0", + "version": "2.5.1", "description": "", "main": "docker.js", "scripts": { @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "git-rev-sync": "3.0.1", - "toolchain": "2.5.0" + "toolchain": "2.5.1" } } diff --git a/docs/package.json b/docs/package.json index f4f9683bc..990f733a8 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim-docs", - "version": "2.5.0", + "version": "2.5.1", "description": "", "private": true, "scripts": { @@ -8,7 +8,7 @@ "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json" }, "dependencies": { - "fabric-ledger": "2.5.0" + "fabric-ledger": "2.5.1" }, "devDependencies": { "ink-docstrap": "^1.3.2", diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json index 0ba737826..5ddfd32d9 100644 --- a/libraries/fabric-ledger/package.json +++ b/libraries/fabric-ledger/package.json @@ -1,6 +1,6 @@ { "name": "fabric-ledger", - "version": "2.5.0", + "version": "2.5.1", "tag": "latest", "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.5.0", + "fabric-contract-api": "2.5.1", "winston": "^3.7.2" }, "devDependencies": { diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json index 13a4b8c6c..037f8cc93 100644 --- a/libraries/fabric-shim/package.json +++ b/libraries/fabric-shim/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim", - "version": "2.5.0", + "version": "2.5.1", "tag": "latest", "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", @@ -60,8 +60,8 @@ "@hyperledger/fabric-protos": "0.1.0-dev.2300102001.1", "@types/node": "^16.11.1", "ajv": "^6.12.2", - "fabric-contract-api": "2.5.0", - "fabric-shim-api": "2.5.0", + "fabric-contract-api": "2.5.1", + "fabric-shim-api": "2.5.1", "fs-extra": "^10.0.1", "reflect-metadata": "^0.1.13", "winston": "^3.7.2", diff --git a/release_notes/v2.5.1.txt b/release_notes/v2.5.1.txt new file mode 100644 index 000000000..ae03c12a5 --- /dev/null +++ b/release_notes/v2.5.1.txt @@ -0,0 +1,14 @@ +v2.5.1 +------ + +Release Notes +------------- +This is the LTS Release of of the v2.5 Fabric Chaincode Node. It replaces the previous v2.2 LTS. + +- the PurgePrivateData feature is exposed via a new `PurgePrivateData` API +- the grpc-js dependency has been locked to 1.8.1 +- arm docker builds + +Change Log +---------- +https://github.com/hyperledger/fabric-chaincode-node/blob/main/CHANGELOG.md#v2.5.0 diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json index 49475b873..5551385c3 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.5.0", + "version": "2.5.1", "author": "", "license": "APACHE-2.0", "dependencies": { "@types/node": "^16.11.4", - "fabric-contract-api": "2.5.0", - "fabric-shim": "2.5.0", + "fabric-contract-api": "2.5.1", + "fabric-shim": "2.5.1", "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 bf046258f..4243062bd 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.5.0", + "version": "2.5.1", "title": "ts_chaincode" }, "components": { diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json index e0ad3d0a4..d9cf30b79 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json index 832a46388..3eb7500e6 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json index c0743d135..069a81d77 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json index e1c0a9064..bc2c1853d 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json index a229b56c8..f9cc11cb1 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json index eaa4dc74d..74ae6a528 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0", - "fabric-ledger": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1", + "fabric-ledger": "2.5.1" } } diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json index 6434bc38a..feaaa74bf 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json index e812b71ca..6f2411ce2 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.5.0-latest", + "version": "2.5.1-latest", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json index 2ad608c10..60c3d7201 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.5.0", + "version": "2.5.1", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.0", - "fabric-contract-api": "2.5.0" + "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.1" } } diff --git a/test/e2e/package.json b/test/e2e/package.json index 774d7ebf5..a67479ff4 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -1,6 +1,6 @@ { "name": "fabric-e2e-tests", - "version": "2.5.0", + "version": "2.5.1", "description": "", "main": "docker.js", "scripts": { @@ -13,7 +13,7 @@ "devDependencies": { "git-rev-sync": "3.0.1", "gulp": "^4.0.2", - "toolchain": "2.5.0", + "toolchain": "2.5.1", "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 4c196b1b9..56bc3966c 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.5.0","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.5.1","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 2da398152..094ddec03 100644 --- a/test/fv/package.json +++ b/test/fv/package.json @@ -1,6 +1,6 @@ { "name": "fvtests", - "version": "2.5.0", + "version": "2.5.1", "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.5.0", - "fabric-shim": "2.5.0", - "fabric-shim-api": "2.5.0", + "fabric-contract-api": "2.5.1", + "fabric-shim": "2.5.1", + "fabric-shim-api": "2.5.1", "fs-extra": "^10.0.1", "git-rev-sync": "3.0.1", "gulp": "^4.0.2", diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json index d9974f504..154c98ae7 100644 --- a/tools/toolchain/package.json +++ b/tools/toolchain/package.json @@ -1,6 +1,6 @@ { "name": "toolchain", - "version": "2.5.0", + "version": "2.5.1", "description": "", "main": "index.js", "scripts": {