From 2100f1112e64ec9091f370af6171185bca38c941 Mon Sep 17 00:00:00 2001 From: Matthew B White Date: Wed, 25 Jan 2023 14:18:54 +0000 Subject: [PATCH] Prepare release 2.5.2 Signed-off-by: Matthew B White --- CHANGELOG.md | 9 ++++++-- 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.2.txt | 21 +++++++++++++++++++ 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, 80 insertions(+), 54 deletions(-) create mode 100644 release_notes/v2.5.2.txt diff --git a/CHANGELOG.md b/CHANGELOG.md index 706d5bc5..1e7e834e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,9 +1,14 @@ +## v2.5.2 +Wed Jan 25 14:21:32 GMT 2023 + +* [fe2946d3](https://github.com/hyperledger/fabric-chaincode-node/commit/fe2946d3) Prepare release 2.5.2 +* [653b7245](https://github.com/hyperledger/fabric-chaincode-node/commit/653b7245) Fix the handling of the key endorsement policy (#377) +* [982eddab](https://github.com/hyperledger/fabric-chaincode-node/commit/982eddab) GetHistoryForKey to return correct data (#375) + ## 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 diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json index 1f0b5ff1..3959525c 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.1", + "version": "2.5.2", "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.1", + "fabric-shim-api": "2.5.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 fd747e3c..e4f16fb9 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.1", + "version": "2.5.2", "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 91d131d8..a9f99ca7 100644 --- a/docker/fabric-nodeenv/package.json +++ b/docker/fabric-nodeenv/package.json @@ -1,6 +1,6 @@ { "name": "fabric-nodeenv", - "version": "2.5.1", + "version": "2.5.2", "description": "", "main": "docker.js", "scripts": { @@ -11,6 +11,6 @@ "license": "Apache-2.0", "dependencies": { "git-rev-sync": "3.0.1", - "toolchain": "2.5.1" + "toolchain": "2.5.2" } } diff --git a/docs/package.json b/docs/package.json index 990f733a..38484008 100644 --- a/docs/package.json +++ b/docs/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim-docs", - "version": "2.5.1", + "version": "2.5.2", "description": "", "private": true, "scripts": { @@ -8,7 +8,7 @@ "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json" }, "dependencies": { - "fabric-ledger": "2.5.1" + "fabric-ledger": "2.5.2" }, "devDependencies": { "ink-docstrap": "^1.3.2", diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json index 5ddfd32d..76e14f09 100644 --- a/libraries/fabric-ledger/package.json +++ b/libraries/fabric-ledger/package.json @@ -1,6 +1,6 @@ { "name": "fabric-ledger", - "version": "2.5.1", + "version": "2.5.2", "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.1", + "fabric-contract-api": "2.5.2", "winston": "^3.7.2" }, "devDependencies": { diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json index 037f8cc9..ec7366af 100644 --- a/libraries/fabric-shim/package.json +++ b/libraries/fabric-shim/package.json @@ -1,6 +1,6 @@ { "name": "fabric-shim", - "version": "2.5.1", + "version": "2.5.2", "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.1", - "fabric-shim-api": "2.5.1", + "fabric-contract-api": "2.5.2", + "fabric-shim-api": "2.5.2", "fs-extra": "^10.0.1", "reflect-metadata": "^0.1.13", "winston": "^3.7.2", diff --git a/release_notes/v2.5.2.txt b/release_notes/v2.5.2.txt new file mode 100644 index 00000000..a212a42c --- /dev/null +++ b/release_notes/v2.5.2.txt @@ -0,0 +1,21 @@ +v2.5.2 +------ + +Release Notes +------------- +This is the LTS Release of of the v2.5 Fabric Chaincode Node. It replaces the previous v2.2 LTS. + +New in the version 2.5.2 + +- Fixed the getHistory API returning a byte buffer rather than an JSON object +- Setting a state endorsement policy functions correctly + +Other noteable 2.5 updates are + +- 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.2 diff --git a/test/chaincodes/annotations/package.json b/test/chaincodes/annotations/package.json index 5551385c..f7c04ed4 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.1", + "version": "2.5.2", "author": "", "license": "APACHE-2.0", "dependencies": { "@types/node": "^16.11.4", - "fabric-contract-api": "2.5.1", - "fabric-shim": "2.5.1", + "fabric-contract-api": "2.5.2", + "fabric-shim": "2.5.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 4243062b..4b2bb9b1 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.1", + "version": "2.5.2", "title": "ts_chaincode" }, "components": { diff --git a/test/chaincodes/clientidentity/package.json b/test/chaincodes/clientidentity/package.json index d9cf30b7..769949ad 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/crosschaincode/package.json b/test/chaincodes/crosschaincode/package.json index 3eb7500e..a7b61c14 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/crosschaincode2/package.json b/test/chaincodes/crosschaincode2/package.json index 069a81d7..50feb33a 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/crud/package.json b/test/chaincodes/crud/package.json index bc2c1853..003a6816 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/events/package.json b/test/chaincodes/events/package.json index f9cc11cb..1ef5dcb5 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/ledger/package.json b/test/chaincodes/ledger/package.json index 74ae6a52..d97091d8 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1", - "fabric-ledger": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2", + "fabric-ledger": "2.5.2" } } diff --git a/test/chaincodes/privateData/package.json b/test/chaincodes/privateData/package.json index feaaa74b..cc74fce1 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/query/package.json b/test/chaincodes/query/package.json index 6f2411ce..541be7a5 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.1-latest", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/chaincodes/scenario/package.json b/test/chaincodes/scenario/package.json index 60c3d720..a8173a09 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.1", + "version": "2.5.2", "author": "", "license": "Apache-2.0", "dependencies": { - "fabric-shim": "2.5.1", - "fabric-contract-api": "2.5.1" + "fabric-shim": "2.5.2", + "fabric-contract-api": "2.5.2" } } diff --git a/test/e2e/package.json b/test/e2e/package.json index a67479ff..b2011d96 100644 --- a/test/e2e/package.json +++ b/test/e2e/package.json @@ -1,6 +1,6 @@ { "name": "fabric-e2e-tests", - "version": "2.5.1", + "version": "2.5.2", "description": "", "main": "docker.js", "scripts": { @@ -13,7 +13,7 @@ "devDependencies": { "git-rev-sync": "3.0.1", "gulp": "^4.0.2", - "toolchain": "2.5.1", + "toolchain": "2.5.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 56bc3966..98688162 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.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.5.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 094ddec0..6a753a9d 100644 --- a/test/fv/package.json +++ b/test/fv/package.json @@ -1,6 +1,6 @@ { "name": "fvtests", - "version": "2.5.1", + "version": "2.5.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.5.1", - "fabric-shim": "2.5.1", - "fabric-shim-api": "2.5.1", + "fabric-contract-api": "2.5.2", + "fabric-shim": "2.5.2", + "fabric-shim-api": "2.5.2", "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 154c98ae..544aca23 100644 --- a/tools/toolchain/package.json +++ b/tools/toolchain/package.json @@ -1,6 +1,6 @@ { "name": "toolchain", - "version": "2.5.1", + "version": "2.5.2", "description": "", "main": "index.js", "scripts": {