Skip to content

Commit 5a4d075

Browse files
mbwhitejt-nti
authored andcommitted
Release 2.4.0
Updated version numbers & the compatibility.md table Signed-off-by: Matthew B White <[email protected]>
1 parent c4fe3c1 commit 5a4d075

File tree

26 files changed

+215
-199
lines changed

26 files changed

+215
-199
lines changed

CHANGELOG.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,12 @@
1+
## 2.4.0
2+
Fri Nov 26 08:07:34 GMT 2021
3+
4+
Release 2.4.0
5+
16
## v2.4.0-beta
27
Wed 18 Aug 2021 12:11:16 BST
38

49
* [d98e77b](https://github.com/hyperledger/fabric-chaincode-node/commit/d98e77b) updated documentation for getStateByPartialCompositeKey, getStateByPartialCompositeKeyWithPagination and getPrivateDataByPartialCompositeKey
5-
* [c982390](https://github.com/hyperledger/fabric-chaincode-node/commit/c982390) Disable server tests
610
* [556f32a](https://github.com/hyperledger/fabric-chaincode-node/commit/556f32a) Metadata generate updated [FABCN-447](https://jira.hyperledger.org/browse/FABCN-447) (#276)
711
* [2bd68fd](https://github.com/hyperledger/fabric-chaincode-node/commit/2bd68fd) Shebang issue fixed [FABCN-438](https://jira.hyperledger.org/browse/FABCN-438) (#271)
812
* [1d43015](https://github.com/hyperledger/fabric-chaincode-node/commit/1d43015) Pipeline publishing fixed (#273)
@@ -19,9 +23,6 @@ Wed 18 Aug 2021 12:11:16 BST
1923
* [52d8638](https://github.com/hyperledger/fabric-chaincode-node/commit/52d8638) Move azure variable to env variable
2024
* [b1991a6](https://github.com/hyperledger/fabric-chaincode-node/commit/b1991a6) Add in the missing dependency, adjust find command" (#256)
2125
* [b1bb93c](https://github.com/hyperledger/fabric-chaincode-node/commit/b1bb93c) Remove incorrect condition placement
22-
* [7565306](https://github.com/hyperledger/fabric-chaincode-node/commit/7565306) replicate template
23-
* [3ed241d](https://github.com/hyperledger/fabric-chaincode-node/commit/3ed241d) Use templates
24-
* [5e0c543](https://github.com/hyperledger/fabric-chaincode-node/commit/5e0c543) Simplify Naming
2526
* [54c27e7](https://github.com/hyperledger/fabric-chaincode-node/commit/54c27e7) Move to use NPM directly
2627
* [4510e67](https://github.com/hyperledger/fabric-chaincode-node/commit/4510e67) Adjust NPM repo URL
2728
* [2017002](https://github.com/hyperledger/fabric-chaincode-node/commit/2017002) Provide Nightly publishing of drivers

COMPATIBILITY.md

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,13 @@ Github is used for code base management, issues should reported in the [FABCN](h
77

88
This table shows the summary of the compatibility of the Node modules at versions 1.4 and 2.x, together with the Nodejs runtime they require and the Fabric Peer versions they can communicate with.
99

10-
| | Peer Connectivity v1.4 | NodeJS | Peer Connectivity v2.x |
11-
| ----------------------- | ---------------------- | ------ | ---------------------- |
12-
| Node modules **v1.4.5** | Yes | 8 | Yes |
13-
| Node modules **v2.x.x** | Yes | 12 | Yes |
10+
| | Peer Connectivity v1.4 | NodeJS | Peer Connectivity v2.x |
11+
| ------------------------------ | ---------------------- | ------ | ---------------------- |
12+
| Node modules **v1.4.5** | Yes | 8 | Yes |
13+
| Node modules **v2.2.x/v2.3.x** | Yes | 12 | Yes |
14+
| Node modules **v2.4.x** | Yes | 16 | Yes |
1415

15-
By default a Fabric Peer v1.4 will create a Nodejs v8 runtime, and a Fabric Peer v2.x will create a Nodejs 12 runtime. Whilst this is the default, the docker image used to host the chaincode and contracts can be altered. Set the environment variable `CORE_CHAINCODE_NODE_RUNTIME` on the peer to the name of the docker image.
16+
By default a Fabric Peer v1.4 will create a Nodejs v8 runtime, and a Fabric Peer v2.2/2.3 will create a Nodejs 12 runtime. The Fabric v2.4 will create a Nodejs 16 runtime. Whilst these are defaults, the docker image used to host the chaincode and contracts can be altered. Set the environment variable `CORE_CHAINCODE_NODE_RUNTIME` on the peer to the name of the docker image.
1617

1718
For example `CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1` will allow the use of the latest Node 12 runtime to be used within a Peer v1.4.
1819

@@ -22,7 +23,7 @@ Note that the `fabric-contract-api` & `fabric-shim` node modules must be at v1.4
2223

2324
## Compatibility
2425

25-
The key elements are : 
26+
The key elements are :
2627

2728
- the version of the Fabric Contract Node modules used
2829
- the version of the Nodejs runtime used to run the code
@@ -36,15 +37,17 @@ Node modules that are produced are `fabric-contract-api`, `fabric-shim`, `fabric
3637

3738
### Supported Runtimes
3839

39-
v2.x Node modules are supported running in Nodejs 12.16.1, with the x86_64 architecture.
40+
v2.4 Node modules are supported running in Nodejs 16.4.0, with the x86_64 architecture.
41+
42+
v2.2/2.3 Node modules are supported running in Nodejs 12.16.1, with the x86_64 architecture.
4043

4144
v1.4.x Node modules are supported running Nodejs 8.16.1 with the x86_64 architecture.
4245

4346
Architecture Support: all docker images, runtimes, tools are tested under x86_64 ONLY
4447

4548
### Default Peer Runtime selection
4649

47-
When using Fabric 2.x, the default docker image that is used to run the Node chaincode is node:12.16.1-alpine 
50+
When using Fabric 2.2/2.3x the default docker image that is used to run the Node chaincode is node:12.16.1-alpine. With Fabric 2.4 the default docker image is node:16.4.0-alpine
4851

4952
*Note:* With the default docker image used by Fabric 2.x, the packaged code will be installed with npm. If a `package-lock.json` or a `npm-shrinkwrap.json` file is present, `npm ci --only=production` will be used. Otherwise `npm install --production` will be used. 
5053

apis/fabric-contract-api/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fabric-contract-api",
3-
"version": "2.4.0-beta",
4-
"tag": "beta",
3+
"version": "2.4.0",
4+
"tag": "release",
55
"description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
66
"main": "index.js",
77
"repository": {
@@ -46,7 +46,7 @@
4646
"lines": 100
4747
},
4848
"dependencies": {
49-
"fabric-shim-api": "2.4.0-beta",
49+
"fabric-shim-api": "2.4.0",
5050
"class-transformer": "^0.4.0",
5151
"fast-safe-stringify": "^2.1.1",
5252
"get-params": "^0.1.2",
@@ -56,7 +56,7 @@
5656
"devDependencies": {
5757
"ajv": "^6.12.2",
5858
"ajv-cli": "^3.2.1",
59-
"ajv-formats":"2.1.1",
59+
"ajv-formats": "2.1.1",
6060
"chai": "^4.3.4",
6161
"chai-as-promised": "^7.1.1",
6262
"chai-things": "^0.2.0",

apis/fabric-shim-api/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fabric-shim-api",
3-
"version": "2.4.0-beta",
4-
"tag": "beta",
3+
"version": "2.4.0",
4+
"tag": "release",
55
"description": "A node.js API of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
66
"main": "index.js",
77
"repository": {
@@ -26,4 +26,4 @@
2626
"devDependencies": {
2727
"@types/long": "^4.0.1"
2828
}
29-
}
29+
}

docker/fabric-nodeenv/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fabric-nodeenv",
3-
"version": "2.4.0-beta",
3+
"version": "2.4.0",
44
"description": "",
55
"main": "docker.js",
66
"scripts": {
@@ -11,6 +11,6 @@
1111
"license": "Apache-2.0",
1212
"dependencies": {
1313
"git-rev-sync": "3.0.1",
14-
"toolchain": "1.0.0"
14+
"toolchain": "2.4.0"
1515
}
1616
}

docs/package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "fabric-shim-docs",
3-
"version": "2.4.0-beta",
3+
"version": "2.4.0",
44
"description": "",
55
"private": true,
66
"scripts": {
77
"build": "npm run docs",
88
"docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
99
},
1010
"dependencies": {
11-
"fabric-ledger": "2.4.0-beta"
11+
"fabric-ledger": "2.4.0"
1212
},
1313
"devDependencies": {
1414
"ink-docstrap": "^1.3.2",
@@ -18,4 +18,4 @@
1818
"keywords": [],
1919
"author": "",
2020
"license": "Apache-2.0"
21-
}
21+
}

libraries/fabric-ledger/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "fabric-ledger",
3-
"version": "2.4.0-beta",
3+
"version": "2.4.0",
44
"tag": "unstable",
55
"description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts",
66
"main": "lib/index.js",
@@ -49,7 +49,7 @@
4949
"lines": 100
5050
},
5151
"dependencies": {
52-
"fabric-contract-api": "2.4.0-beta",
52+
"fabric-contract-api": "2.4.0",
5353
"winston": "^3.3.3"
5454
},
5555
"devDependencies": {
Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,60 +1,60 @@
11
{
2-
"name": "fabric-shim-crypto",
3-
"version": "2.4.0-beta",
4-
"tag": "beta",
5-
"description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
6-
"main": "index.js",
7-
"repository": {
8-
"type": "git",
9-
"url": "https://github.com/hyperledger/fabric-chaincode-node"
10-
},
11-
"scripts": {
12-
"test": "nyc mocha --recursive 'test/**/*.js' --reporter spec-junit-splitter-mocha-reporter",
13-
"lint":"eslint ./lib/",
14-
"build": "npm run lint && npm test"
15-
},
16-
"keywords": [
17-
"fabric-shim",
18-
"fabric-shim-crypto",
19-
"Hyperledger Fabric",
20-
"Fabric Shim"
2+
"name": "fabric-shim-crypto",
3+
"version": "2.4.0",
4+
"tag": "release",
5+
"description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
6+
"main": "index.js",
7+
"repository": {
8+
"type": "git",
9+
"url": "https://github.com/hyperledger/fabric-chaincode-node"
10+
},
11+
"scripts": {
12+
"test": "nyc mocha --recursive 'test/**/*.js' --reporter spec-junit-splitter-mocha-reporter",
13+
"lint": "eslint ./lib/",
14+
"build": "npm run lint && npm test"
15+
},
16+
"keywords": [
17+
"fabric-shim",
18+
"fabric-shim-crypto",
19+
"Hyperledger Fabric",
20+
"Fabric Shim"
21+
],
22+
"engines": {
23+
"node": "^16.4.0",
24+
"npm": "^8.0.0"
25+
},
26+
"license": "Apache-2.0",
27+
"dependencies": {
28+
"elliptic": "^6.5.4",
29+
"jsrsasign": "^10.4.1"
30+
},
31+
"devDependencies": {
32+
"mocha": "9.1.3",
33+
"eslint": "^6.6.0",
34+
"nyc": "15.1.0",
35+
"typescript": "4.4.4",
36+
"chai": "^4.3.4",
37+
"chai-as-promised": "^7.1.1",
38+
"rewire": "5.0.0",
39+
"sinon": "11.1.2",
40+
"chai-things": "^0.2.0",
41+
"spec-junit-splitter-mocha-reporter": "1.0.1"
42+
},
43+
"nyc": {
44+
"exclude": [
45+
"coverage/**",
46+
"test/**"
2147
],
22-
"engines": {
23-
"node": "^16.4.0",
24-
"npm": "^8.0.0"
25-
},
26-
"license": "Apache-2.0",
27-
"dependencies": {
28-
"elliptic": "^6.5.4",
29-
"jsrsasign": "^10.4.1"
30-
},
31-
"devDependencies": {
32-
"mocha": "9.1.3",
33-
"eslint": "^6.6.0",
34-
"nyc": "15.1.0",
35-
"typescript": "4.4.4",
36-
"chai": "^4.3.4",
37-
"chai-as-promised": "^7.1.1",
38-
"rewire": "5.0.0",
39-
"sinon": "11.1.2",
40-
"chai-things": "^0.2.0",
41-
"spec-junit-splitter-mocha-reporter": "1.0.1"
42-
},
43-
"nyc": {
44-
"exclude": [
45-
"coverage/**",
46-
"test/**"
47-
],
48-
"reporter": [
49-
"text-summary",
50-
"cobertura",
51-
"html"
52-
],
53-
"all": true,
54-
"check-coverage": true,
55-
"statements": 100,
56-
"branches": 100,
57-
"functions": 100,
58-
"lines": 100
59-
}
48+
"reporter": [
49+
"text-summary",
50+
"cobertura",
51+
"html"
52+
],
53+
"all": true,
54+
"check-coverage": true,
55+
"statements": 100,
56+
"branches": 100,
57+
"functions": 100,
58+
"lines": 100
59+
}
6060
}

libraries/fabric-shim/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fabric-shim",
3-
"version": "2.4.0-beta",
4-
"tag": "beta",
3+
"version": "2.4.0",
4+
"tag": "release",
55
"description": "A node.js implementation of Hyperledger Fabric chaincode shim, to allow endorsing peers and user-provided chaincodes to communicate with each other",
66
"main": "index.js",
77
"bin": {
@@ -59,8 +59,8 @@
5959
"@grpc/proto-loader": "^0.6.6",
6060
"@types/node": "^16.11.1",
6161
"ajv": "^6.12.2",
62-
"fabric-contract-api": "2.4.0-beta",
63-
"fabric-shim-api": "2.4.0-beta",
62+
"fabric-contract-api": "2.4.0",
63+
"fabric-shim-api": "2.4.0",
6464
"fs-extra": "^10.0.0",
6565
"reflect-metadata": "^0.1.13",
6666
"winston": "^3.3.3",

release_notes/v2.4.0.txt

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
v2.4.0
2+
------
3+
4+
Release Notes
5+
-------------
6+
This v2.4.0 Release is a bug fix release of the main branch.
7+
8+
Note that version of Node.js is updated to 16.4.0. See the COMPATIBILITY.md file in the main branch for information.
9+
10+
Change Log
11+
----------
12+
https://github.com/hyperledger/fabric-chaincode-node/blob/release-2.x/CHANGELOG.md#v2.4.0-beta

0 commit comments

Comments
 (0)