Skip to content

Release v2.5.4 #402

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2023
Merged

Release v2.5.4 #402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
## 2.5.3
Tue Mar 7 09:36:52 GMT 2023
## v2.5.4
Wed 14 Jun 2023 12:29:35 BST

* [690c91a9](https://github.com/hyperledger/fabric-chaincode-node/commit/690c91a9) Using the CLI provided gRPC configurations when starting the chaincode (#401)
* [cf179e7b](https://github.com/hyperledger/fabric-chaincode-node/commit/cf179e7b) Update SetEvent documentation (#399)
* [6f66124b](https://github.com/hyperledger/fabric-chaincode-node/commit/6f66124b) Update COMPATIBILITY.md for Node 18. (#396)

## v2.5.3
Tue Mar 7 09:36:52 GMT 2023
* [7d865afd](https://github.com/hyperledger/fabric-chaincode-node/commit/7d865afd) Update to new version Update to the .github workflows to handle the branch rename.
* [220ac53b](https://github.com/hyperledger/fabric-chaincode-node/commit/220ac53b) Clean-up npm engine specs (#394)
* [5d72d902](https://github.com/hyperledger/fabric-chaincode-node/commit/5d72d902) Nominate Mark Lewis as maintainer, Remove James Taylor (#391)
* [385efa8b](https://github.com/hyperledger/fabric-chaincode-node/commit/385efa8b) Add scheduled builds (#392)
* [e9c9eb79](https://github.com/hyperledger/fabric-chaincode-node/commit/e9c9eb79) Update to Node18

## v2.5.2
Wed Jan 25 14:21:32 GMT 2023
Expand Down
6 changes: 3 additions & 3 deletions apis/fabric-contract-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-contract-api",
"version": "2.5.3",
"tag": "unstable",
"version": "2.5.4",
"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",
"repository": {
Expand Down Expand Up @@ -45,7 +45,7 @@
"lines": 100
},
"dependencies": {
"fabric-shim-api": "2.5.3",
"fabric-shim-api": "2.5.4",
"class-transformer": "^0.4.0",
"fast-safe-stringify": "^2.1.1",
"get-params": "^0.1.2",
Expand Down
4 changes: 2 additions & 2 deletions apis/fabric-shim-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-shim-api",
"version": "2.5.3",
"tag": "unstable",
"version": "2.5.4",
"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",
"repository": {
Expand Down
4 changes: 2 additions & 2 deletions docker/fabric-nodeenv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-nodeenv",
"version": "2.5.3",
"version": "2.5.4",
"description": "",
"main": "docker.js",
"scripts": {
Expand All @@ -11,6 +11,6 @@
"license": "Apache-2.0",
"dependencies": {
"git-rev-sync": "3.0.1",
"toolchain": "2.5.3"
"toolchain": "2.5.4"
}
}
4 changes: 2 additions & 2 deletions docs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "fabric-shim-docs",
"version": "2.5.3",
"version": "2.5.4",
"description": "",
"private": true,
"scripts": {
"build": "npm run docs",
"docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
},
"dependencies": {
"fabric-ledger": "2.5.3"
"fabric-ledger": "2.5.4"
},
"devDependencies": {
"ink-docstrap": "^1.3.2",
Expand Down
6 changes: 3 additions & 3 deletions libraries/fabric-ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-ledger",
"version": "2.5.3",
"tag": "unstable",
"version": "2.5.4",
"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",
"types": "lib/index.d.ts",
Expand Down Expand Up @@ -48,7 +48,7 @@
"lines": 100
},
"dependencies": {
"fabric-contract-api": "2.5.3",
"fabric-contract-api": "2.5.4",
"winston": "^3.7.2"
},
"devDependencies": {
Expand Down
8 changes: 4 additions & 4 deletions libraries/fabric-shim/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-shim",
"version": "2.5.3",
"tag": "unstable",
"version": "2.5.4",
"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",
"bin": {
Expand Down Expand Up @@ -59,8 +59,8 @@
"@hyperledger/fabric-protos": "0.1.0-dev.2300102001.1",
"@types/node": "^16.11.1",
"ajv": "^6.12.2",
"fabric-contract-api": "2.5.3",
"fabric-shim-api": "2.5.3",
"fabric-contract-api": "2.5.4",
"fabric-shim-api": "2.5.4",
"fast-safe-stringify": "^2.1.1",
"fs-extra": "^10.0.1",
"long": "^5.2.3",
Expand Down
6 changes: 3 additions & 3 deletions test/chaincodes/annotations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
"typings": "dist/index.d.ts",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "APACHE-2.0",
"dependencies": {
"@types/node": "^16.11.4",
"fabric-contract-api": "2.5.3",
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.4",
"fabric-shim": "2.5.4",
"ts-node": "^3.3.0",
"tslint": "^5.6.0",
"typescript": "^4.0.2"
Expand Down
2 changes: 1 addition & 1 deletion test/chaincodes/annotations/src/test_contract/expected-metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
}
},
"info": {
"version": "2.5.3",
"version": "2.5.4",
"title": "ts_chaincode"
},
"components": {
Expand Down
6 changes: 3 additions & 3 deletions test/chaincodes/clientidentity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crosschaincode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crosschaincode2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3",
"fabric-ledger": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4",
"fabric-ledger": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/privateData/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/scenario/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3",
"version": "2.5.4",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
"fabric-shim": "2.5.4",
"fabric-contract-api": "2.5.4"
}
}
4 changes: 2 additions & 2 deletions test/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-e2e-tests",
"version": "2.5.3",
"version": "2.5.4",
"description": "",
"main": "docker.js",
"scripts": {
Expand All @@ -13,7 +13,7 @@
"devDependencies": {
"git-rev-sync": "3.0.1",
"gulp": "^4.0.2",
"toolchain": "2.5.3",
"toolchain": "2.5.4",
"delay": "5.0.0",
"fs-extra": "^10.0.1",
"ip": "^1.1.5",
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/scenario.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.3","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.4","title":"chaincode"},"components":{"schemas":{}}}';

const schema = fs.readFileSync(path.join(__dirname, '../../apis/fabric-contract-api/schema/contract-schema.json'));

Expand Down
8 changes: 4 additions & 4 deletions test/fv/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fvtests",
"version": "2.5.3",
"version": "2.5.4",
"description": "fv tests",
"testFabricVersion": "main",
"testFabricThirdParty": "0.4.15",
Expand All @@ -25,9 +25,9 @@
"del": "^3.0.0",
"delay": "5.0.0",
"eslint": "^6.6.0",
"fabric-contract-api": "2.5.3",
"fabric-shim": "2.5.3",
"fabric-shim-api": "2.5.3",
"fabric-contract-api": "2.5.4",
"fabric-shim": "2.5.4",
"fabric-shim-api": "2.5.4",
"fs-extra": "^10.0.1",
"git-rev-sync": "3.0.1",
"gulp": "^4.0.2",
Expand Down
27 changes: 13 additions & 14 deletions tools/scripts/updateversions.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,23 @@
#!/bin/bash
# Note uses bash4.4 or later features, and sponge from GNU moreutils
#!/usr/bin/env bash

set -eo pipefail

if [ -z $1 ]; then
echo "Need to have the first arg set to the new package.json version "
if [ -z "$1" ]; then
echo "Need to have the first arg set to the new package.json version"
exit 1
fi

NEW_VERSION=$1
NEW_VERSION="$1"
echo "Setting new version to '${NEW_VERSION}'"

readarray -d '' PACKAGES < <(find . -name package.json -not -path '*/node_modules/*' -not -path '*/common/*')

for PACKAGE in ${PACKAGES}
do
echo "Updating '${PACKAGE}'"
jq --arg VER "${NEW_VERSION}" '.version=$VER' "${PACKAGE}" | sponge "${PACKAGE}"
done
while read -r PACKAGE; do
echo "Updating '${PACKAGE}'"
( cd "$(dirname "${PACKAGE}")" && npm --allow-same-version --no-git-tag-version version "${NEW_VERSION}" )
done <<< "$(find . -type d \( -name node_modules -o -name common \) -prune -o -type f -name package.json -print)"

MAJOR_MINOR=$(cut -d. -f-2 <<< "${NEW_VERSION}")

echo "Please also check these files"
echo "Please also check these files containing ${MAJOR_MINOR}.n"
# NB - the grep regexp syntax is a little different
find . -name "*.js" -not -path '*/node_modules/*' -not -path '*/common/*' | xargs grep "2\.4\.\?[0-9]"
MAJOR_MINOR_REGEX="${MAJOR_MINOR/./\.}\.\?[0-9]"
find . -type d \( -name node_modules -o -name common \) -prune -o -type f -name '*.js' -exec grep "${MAJOR_MINOR_REGEX}" {} +
2 changes: 1 addition & 1 deletion tools/toolchain/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "toolchain",
"version": "2.5.3",
"version": "2.5.4",
"description": "",
"main": "index.js",
"scripts": {
Expand Down