Skip to content
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

Bump version to 2.1.5 #175

Merged
merged 1 commit into from
Jun 23, 2020
Merged

Bump version to 2.1.5 #175

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
4 changes: 2 additions & 2 deletions TUTORIAL.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required.
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "^2.1.4",
"fabric-shim": "^2.1.4"
"fabric-contract-api": "^2.1.5-unstable",
"fabric-shim": "^2.1.5-unstable"
}
}

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.1.4",
"tag": "latest",
"version": "2.1.5-unstable",
"tag": "unstable",
"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 @@ -46,7 +46,7 @@
"lines": 100
},
"dependencies": {
"fabric-shim-api": "2.1.4",
"fabric-shim-api": "2.1.5-unstable",
"class-transformer": "^0.2.2",
"fast-safe-stringify": "~2.0.7",
"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.1.4",
"tag": "latest",
"version": "2.1.5-unstable",
"tag": "unstable",
"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 docs/_jsdoc/tutorials/using-chaincodeinterface.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd mycc
// create a new node project
npm init
// install fabric-shim at master branch
npm install [email protected].4
npm install [email protected].5-unstable
// or using the released version
npm install fabric-shim
touch mychaincode.js
Expand Down Expand Up @@ -68,7 +68,7 @@ Finally, update the "start" script in package.json to "node mychaincode.js":
"engineStrict": true,
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4"
"fabric-shim": "2.1.5-unstable"
}
}
```
Expand Down
4 changes: 2 additions & 2 deletions docs/_jsdoc/tutorials/using-contractinterface.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ The dependencies of `fabric-contract-api` and `fabric-shim` will be required.
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-contract-api": "^2.1.4",
"fabric-shim": "^2.1.4"
"fabric-contract-api": "^2.1.5-unstable",
"fabric-shim": "^2.1.5-unstable"
}
}

Expand Down
4 changes: 2 additions & 2 deletions libraries/fabric-shim-crypto/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-shim-crypto",
"version": "2.1.4",
"tag": "latest",
"version": "2.1.5-unstable",
"tag": "unstable",
"description": "A node.js implementation of encryption library for Hyperledger Fabric chaincode shim",
"main": "index.js",
"repository": {
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.1.4",
"tag": "latest",
"version": "2.1.5-unstable",
"tag": "unstable",
"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 @@
"@grpc/proto-loader": "^0.5.4",
"@types/node": "^8.9.4",
"ajv": "^6.5.5",
"fabric-contract-api": "2.1.4",
"fabric-shim-api": "2.1.4",
"fabric-contract-api": "2.1.5-unstable",
"fabric-shim-api": "2.1.5-unstable",
"fs-extra": "8.1.0",
"reflect-metadata": "^0.1.12",
"winston": "3.2.1",
Expand Down
4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "fabric-chaincode-node",
"version": "2.1.4",
"tag": "latest",
"version": "2.1.5-unstable",
"tag": "unstable",
"description": "fabric-chaincode-node monorepo, built with rush",
"testFabricVersion": "master",
"testFabricCAVersion": "1.4.4",
Expand Down
4 changes: 2 additions & 2 deletions test/chaincodes/annotations/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@
"author": "",
"license": "APACHE-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4",
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable",
"@types/node": "^10.3.6",
"ts-node": "^3.3.0",
"tslint": "^5.6.0",
Expand Down
4 changes: 2 additions & 2 deletions test/chaincodes/clientidentity/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/crosschaincode/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/crosschaincode2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/crud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/encryption/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4",
"fabric-shim-crypto": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable",
"fabric-shim-crypto": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/scenario/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
4 changes: 2 additions & 2 deletions test/chaincodes/server/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.1.4",
"fabric-contract-api": "2.1.4"
"fabric-shim": "2.1.5-unstable",
"fabric-contract-api": "2.1.5-unstable"
}
}
10 changes: 5 additions & 5 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.1.4",
"version": "2.1.5-unstable",
"description": "fv tests",
"testFabricVersion": "master",
"testFabricThirdParty": "0.4.15",
Expand All @@ -26,10 +26,10 @@
"del": "^3.0.0",
"delay": "4.3.0",
"eslint": "6.6.0",
"fabric-contract-api": "2.1.4",
"fabric-shim": "2.1.4",
"fabric-shim-api": "2.1.4",
"fabric-shim-crypto": "2.1.4",
"fabric-contract-api": "2.1.5-unstable",
"fabric-shim": "2.1.5-unstable",
"fabric-shim-api": "2.1.5-unstable",
"fabric-shim-crypto": "2.1.5-unstable",
"fs-extra": "8.1.0",
"git-rev-sync": "1.12.0",
"gulp": "^4.0.0",
Expand Down
2 changes: 1 addition & 1 deletion tools/toolchain/network/docker-compose/docker-compose-base.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ services:
# # bridge network as the peers
# # https://docs.docker.com/compose/networking/
- CORE_VM_DOCKER_HOSTCONFIG_NETWORKMODE=node_default
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.4
- CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.1.5-unstable
# Allow more time for chaincode container to build on install.
- CORE_CHAINCODE_EXECUTETIMEOUT=300s
working_dir: /opt/gopath/src/github.com/hyperledger/fabric
Expand Down