Bump version to 2.5.0 (#340)

Updating main to the 2.5.x release stream. Future 2.4.x releases will be from the new release-2.4 branch. Signed-off-by: James Taylor <jamest@uk.ibm.com>
hyperledger · Jul 14, 2022 · 501af57 · 501af57
1 parent eee5833
commit 501af57
Show file tree

Hide file tree

Showing 26 changed files with 60 additions and 60 deletions.
diff --git a/TUTORIAL.md b/TUTORIAL.md
@@ -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.4.3-unstable",
- "fabric-shim": "^2.4.3-unstable"
+ "fabric-contract-api": "^2.5.0-unstable",
+ "fabric-shim": "^2.5.0-unstable"
  }
 }
 

diff --git a/apis/fabric-contract-api/package.json b/apis/fabric-contract-api/package.json
@@ -1,6 +1,6 @@
 {
  "name": "fabric-contract-api",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-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",
@@ -46,7 +46,7 @@
  "lines": 100
  },
  "dependencies": {
- "fabric-shim-api": "2.4.3-unstable",
+ "fabric-shim-api": "2.5.0-unstable",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "fabric-shim-api",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-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",

diff --git a/ci/azure-pipelines.yml b/ci/azure-pipelines.yml
@@ -52,7 +52,7 @@ pool:
 #
 # Publish to NPM on release builds (they are the github tagged releases)
 # Publish to NPM on nightly builds when there is something to build
-# the ids will be of the format 2.4.3-unstable.{commitid}
+# the ids will be of the format 2.5.0-unstable.{commitid}
 #
 stages:
 

diff --git a/docker/fabric-nodeenv/package.json b/docker/fabric-nodeenv/package.json
@@ -1,6 +1,6 @@
 {
  "name": "fabric-nodeenv",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "description": "",
  "main": "docker.js",
  "scripts": {
@@ -11,6 +11,6 @@
  "license": "Apache-2.0",
  "dependencies": {
  "git-rev-sync": "3.0.1",
- "toolchain": "2.4.3-unstable"
+ "toolchain": "2.5.0-unstable"
  }
 }
diff --git a/docs/_jsdoc/tutorials/using-chaincodeinterface.md b/docs/_jsdoc/tutorials/using-chaincodeinterface.md
@@ -8,7 +8,7 @@ cd mycc
 // create a new node project
 npm init
 // install fabric-shim at main branch
-npm install fabric-shim@2.4.3-unstable
+npm install fabric-shim@2.5.0-unstable
 // or using the released version
 npm install fabric-shim
 touch mychaincode.js
@@ -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.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable"
  }
 }
 ```

diff --git a/docs/_jsdoc/tutorials/using-contractinterface.md b/docs/_jsdoc/tutorials/using-contractinterface.md
@@ -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.4.3-unstable",
- "fabric-shim": "^2.4.3-unstable"
+ "fabric-contract-api": "^2.5.0-unstable",
+ "fabric-shim": "^2.5.0-unstable"
  }
 }
 

diff --git a/docs/package.json b/docs/package.json
@@ -1,14 +1,14 @@
 {
  "name": "fabric-shim-docs",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "description": "",
  "private": true,
  "scripts": {
  "build": "npm run docs",
  "docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
  },
  "dependencies": {
- "fabric-ledger": "2.4.3-unstable"
+ "fabric-ledger": "2.5.0-unstable"
  },
  "devDependencies": {
  "ink-docstrap": "^1.3.2",

diff --git a/libraries/fabric-ledger/package.json b/libraries/fabric-ledger/package.json
@@ -1,6 +1,6 @@
 {
  "name": "fabric-ledger",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "tag": "unstable",
  "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.4.3-unstable",
+ "fabric-contract-api": "2.5.0-unstable",
  "winston": "^3.7.2"
  },
  "devDependencies": {

diff --git a/libraries/fabric-shim/package.json b/libraries/fabric-shim/package.json
@@ -1,6 +1,6 @@
 {
  "name": "fabric-shim",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-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",
@@ -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.4.3-unstable",
- "fabric-shim-api": "2.4.3-unstable",
+ "fabric-contract-api": "2.5.0-unstable",
+ "fabric-shim-api": "2.5.0-unstable",
  "fs-extra": "^10.0.1",
  "reflect-metadata": "^0.1.13",
  "winston": "^3.7.2",

diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "APACHE-2.0",
  "dependencies": {
  "@types/node": "^16.11.4",
- "fabric-contract-api": "2.4.3-unstable",
- "fabric-shim": "2.4.3-unstable",
+ "fabric-contract-api": "2.5.0-unstable",
+ "fabric-shim": "2.5.0-unstable",
  "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
@@ -107,7 +107,7 @@
  }
  },
  "info": {
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "title": "ts_chaincode"
  },
  "components": {

diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable",
- "fabric-ledger": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable",
+ "fabric-ledger": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git 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.4.3-unstable",
+ "version": "2.5.0-unstable",
  "author": "",
  "license": "Apache-2.0",
  "dependencies": {
- "fabric-shim": "2.4.3-unstable",
- "fabric-contract-api": "2.4.3-unstable"
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-contract-api": "2.5.0-unstable"
  }
 }
diff --git a/test/e2e/package.json b/test/e2e/package.json
@@ -1,6 +1,6 @@
 {
  "name": "fabric-e2e-tests",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "description": "",
  "main": "docker.js",
  "scripts": {
@@ -13,7 +13,7 @@
  "devDependencies": {
  "git-rev-sync": "3.0.1",
  "gulp": "^4.0.2",
- "toolchain": "2.4.3-unstable",
+ "toolchain": "2.5.0-unstable",
  "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
@@ -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.4.3-unstable","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.0-unstable","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
@@ -1,6 +1,6 @@
 {
  "name": "fvtests",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "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.4.3-unstable",
- "fabric-shim": "2.4.3-unstable",
- "fabric-shim-api": "2.4.3-unstable",
+ "fabric-contract-api": "2.5.0-unstable",
+ "fabric-shim": "2.5.0-unstable",
+ "fabric-shim-api": "2.5.0-unstable",
  "fs-extra": "^10.0.1",
  "git-rev-sync": "3.0.1",
  "gulp": "^4.0.2",

diff --git a/tools/toolchain/network/docker-compose/docker-compose-base.yaml b/tools/toolchain/network/docker-compose/docker-compose-base.yaml
@@ -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.4.3-unstable
+ - CORE_CHAINCODE_NODE_RUNTIME=hyperledger/fabric-nodeenv:2.5.0-unstable
  # Allow more time for chaincode container to build on install.
  - CORE_CHAINCODE_EXECUTETIMEOUT=300s
 

diff --git a/tools/toolchain/package.json b/tools/toolchain/package.json
@@ -1,6 +1,6 @@
 {
  "name": "toolchain",
- "version": "2.4.3-unstable",
+ "version": "2.5.0-unstable",
  "description": "",
  "main": "index.js",
  "scripts": {