Skip to content

Commit 9bcd0b3

Browse files
jt-ntimbwhite
authored andcommitted
[FABCN-377] Prepare for v2.1 unstable builds (WIP)
Signed-off-by: James Taylor <jamest@uk.ibm.com>
1 parent 869f107 commit 9bcd0b3

24 files changed

Lines changed: 142 additions & 152 deletions

File tree

CHANGELOG.md

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
## v2.0.0
2+
Wed 22 Jan 2020 16:03:50 GMT
3+
4+
* [869f107](https://github.com/hyperledger/fabric-chaincode-node/commit/869f107) [FABCI-482](https://jira.hyperledger.org/browse/FABCI-482) Update Nexus URL's to Artifactory
5+
* [b296d0a](https://github.com/hyperledger/fabric-chaincode-node/commit/b296d0a) [FABCN-241](https://jira.hyperledger.org/browse/FABCN-241) - Remove to.be.ok (#55)
6+
* [b345925](https://github.com/hyperledger/fabric-chaincode-node/commit/b345925) Update maintainers list
7+
* [81eb5a9](https://github.com/hyperledger/fabric-chaincode-node/commit/81eb5a9) Update rush node.js version (#54)
8+
* [084c595](https://github.com/hyperledger/fabric-chaincode-node/commit/084c595) [FABCN-355](https://jira.hyperledger.org/browse/FABCN-355) Added READMEs
9+
* [6b60a98](https://github.com/hyperledger/fabric-chaincode-node/commit/6b60a98) [FABCN-353](https://jira.hyperledger.org/browse/FABCN-353) License updates (#50)
10+
111
## v2.0.0-beta
212
Thu 12 Dec 11:46:40 GMT 2019
313

apis/fabric-contract-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-contract-api",
3-
"version": "2.0.0-beta.1",
4-
"tag": "beta",
3+
"version": "2.1.0-unstable",
4+
"tag": "unstable",
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.0.0-beta.1",
49+
"fabric-shim-api": "2.1.0-unstable",
5050
"class-transformer": "^0.2.2",
5151
"fast-safe-stringify": "~2.0.7",
5252
"get-params": "^0.1.2",

apis/fabric-shim-api/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fabric-shim-api",
3-
"version": "2.0.0-beta.1",
4-
"tag": "beta",
3+
"version": "2.1.0-unstable",
4+
"tag": "unstable",
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": {

ci/azure-pipelines.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,7 @@ stages:
226226
workingFile: '$(Agent.TempDirectory)/.npmrc'
227227
customEndpoint: 'fabric-chainode-node-npm'
228228
- script: |
229-
find $(Pipeline.Workspace)/node-tgz/ -maxdepth 1 -type f -name 'fabric-*.tgz' -exec npm publish {} --tag beta \;
229+
find $(Pipeline.Workspace)/node-tgz/ -maxdepth 1 -type f -name 'fabric-*.tgz' -exec npm publish {} --tag unstable \;
230230
displayName: 'npm publish'
231231
- job: jsdoc_publish
232232
steps:
@@ -251,11 +251,11 @@ stages:
251251
docker login ${DOCKER_REGISTRY_URL} --username=${DOCKER_REGISTRY_USERNAME} --password=${DOCKER_REGISTRY_PASSWORD}
252252
echo "Logged in to docker registry"
253253
# tag nodeenv image to PACKAGE_VERSION
254-
docker tag hyperledger/fabric-nodeenv fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-beta
254+
docker tag hyperledger/fabric-nodeenv fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-unstable
255255
# push nodeenv to repository
256-
docker push hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-beta
257-
./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-beta" --target "hyperledger/fabric-nodeenv:$(BuildData.PACKAGE_VERSION)-beta"
258-
./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-beta" --target "hyperledger/fabric-nodeenv:2.0"
256+
docker push hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-unstable
257+
./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-unstable" --target "hyperledger/fabric-nodeenv:$(BuildData.PACKAGE_VERSION)-unstable"
258+
./manifest-tool push from-args --platforms linux/amd64 --template "hyperledger/fabric-nodeenv:amd64-$(BuildData.PACKAGE_VERSION)-unstable" --target "hyperledger/fabric-nodeenv:2.0-unstable"
259259
env:
260260
DOCKER_REGISTRY_USERNAME: $(DockerHub-Username)
261261
DOCKER_REGISTRY_PASSWORD: $(DockerHub-Password)

docs/apidocs/tutorials/using-chaincodeinterface.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ cd mycc
88
// create a new node project
99
npm init
1010
// install fabric-shim at master branch
11-
npm install 2.0.0-beta.1
11+
npm install 2.1.0-unstable
1212
// or using the released version
1313
npm install fabric-shim
1414
touch mychaincode.js
@@ -68,7 +68,7 @@ Finally, update the "start" script in package.json to "node mychaincode.js":
6868
"engineStrict": true,
6969
"license": "Apache-2.0",
7070
"dependencies": {
71-
"fabric-shim": "2.0.0-beta.1"
71+
"fabric-shim": "2.1.0-unstable"
7272
}
7373
}
7474
```

libraries/fabric-shim-crypto/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "fabric-shim-crypto",
3-
"version": "2.0.0-beta.1",
4-
"tag": "beta",
3+
"version": "2.1.0-unstable",
4+
"tag": "unstable",
55
"description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
66
"main": "index.js",
77
"repository": {

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.0.0-beta.1",
4-
"tag": "beta",
3+
"version": "2.1.0-unstable",
4+
"tag": "unstable",
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": {
@@ -61,8 +61,8 @@
6161
"@grpc/proto-loader": "^0.5.1",
6262
"@types/node": "^8.9.4",
6363
"ajv": "^6.5.5",
64-
"fabric-contract-api": "2.0.0-beta.1",
65-
"fabric-shim-api": "2.0.0-beta.1",
64+
"fabric-contract-api": "2.1.0-unstable",
65+
"fabric-shim-api": "2.1.0-unstable",
6666
"fs-extra": "8.1.0",
6767
"grpc": "^1.23.3",
6868
"reflect-metadata": "^0.1.12",

package.json

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
11
{
22
"name": "fabric-shim-test",
3-
"version": "2.0.0-beta.1",
4-
"tag": "beta",
3+
"version": "2.1.0-unstable",
4+
"tag": "unstable",
55
"description": "fabric-shim, fabric-shim-crypto",
66
"testFabricVersion": "master",
7+
"testFabricCAVersion": "1.4.4",
78
"testFabricThirdParty": "0.4.15",
89
"docsLatestVersion": "release-1.4",
910
"engines": {

release_notes/v2.0.0.txt

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
v2.0.0, 22 January 2020
2+
-----------------------
3+
4+
Release Notes
5+
-------------
6+
The main change in the v2.0.0 is the level of NodeJS runtime has moved up to the latest LTS version of v12.13.0
7+
v2.0.0 has the fixes from v1.4.4 level.
8+
9+
Migration Notes
10+
---------------
11+
Note that a change needed to be made to the metadata schema as it was in error; it had diverged from the JSONSchema standard
12+
so that it was not possible to validate complex objects.
13+
14+
If you have custom metadata defined in the contract, then for the complex objects defined in the 'components' section
15+
the properties of this object where previously held as array; they now need to be held as a map with the key as the name
16+
of the property
17+
18+
Return types on functions where returned as an array of schema objects. this has been modified to be a single object. i.e.
19+
the single value array is now just a single value.
20+
21+
There is also a new nodeenv docker image that is used for hosting the chaincode rather than use the baseos image as in V1.4
22+
23+
In v1.4, the fabric-contract-api had a dependency on the fabric-shim. This has changed in this version to have a dependency
24+
on the new fabric-shim-api module. This allows the fabric-contract-api to be used client side for annotations.
25+
26+
For contributors, the v2.0.0 repo is built using rush and is organized as a full mono-repo.
27+
28+
The @Object annotation has been deprecated in favour of the @DataType annotation
29+
30+
The x509 library used for parsing has changed; this should be parse the X509 certificates exactly the same way; this is a note that
31+
differences are observed in the parsed certificates please raise an issue.
32+
33+
Summary of the programming model
34+
-------------------------------
35+
36+
This is designed to improve developer productivity and ease of use.
37+
For more information see https://hyperledger-fabric.readthedocs.io/en/developapps/developing_applications.html
38+
39+
Known Vulnerabilities
40+
---------------------
41+
none
42+
43+
Resolved Vulnerabilities
44+
------------------------
45+
none
46+
47+
Known Issues & Workarounds
48+
--------------------------
49+
none
50+
51+
Change Log
52+
----------
53+
https://github.com/hyperledger/fabric-chaincode-node/blob/release-2.0/CHANGELOG.md#v2.0.0

test/chaincodes/annotations/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
"author": "",
1919
"license": "APACHE-2.0",
2020
"dependencies": {
21-
"fabric-shim": "2.0.0-beta.1",
22-
"fabric-contract-api": "2.0.0-beta.1",
21+
"fabric-shim": "2.1.0-unstable",
22+
"fabric-contract-api": "2.1.0-unstable",
2323
"@types/node": "^10.3.6",
2424
"ts-node": "^3.3.0",
2525
"tslint": "^5.6.0",

0 commit comments

Comments
 (0)