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

Update to new version #395

Merged
merged 1 commit into from
Mar 17, 2023
+65 −63
Merged

Update to new version #395

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
1 change: 0 additions & 1 deletion .github/workflows/pull_request.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
pull_request:
branches:
- main
- release-2.5
workflow_dispatch:

concurrency:
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/push.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ on:
push:
branches:
- main
- release-2.5
workflow_dispatch:

jobs:
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2.5.3
Tue Mar 7 09:36:52 GMT 2023


## 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,6 +1,6 @@
{
"name": "fabric-contract-api",
"version": "2.5.3-unstable",
"version": "2.5.3",
"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",
Expand All @@ -22,7 +22,7 @@
"Fabric Shim"
],
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"license": "Apache-2.0",
"types": "./types/index.d.ts",
Expand All @@ -45,7 +45,7 @@
"lines": 100
},
"dependencies": {
"fabric-shim-api": "2.5.3-unstable",
"fabric-shim-api": "2.5.3",
"class-transformer": "^0.4.0",
"fast-safe-stringify": "^2.1.1",
"get-params": "^0.1.2",
Expand Down
2 changes: 1 addition & 1 deletion apis/fabric-shim-api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-shim-api",
"version": "2.5.3-unstable",
"version": "2.5.3",
"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",
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-unstable",
"version": "2.5.3",
"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-unstable"
"toolchain": "2.5.3"
}
}
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-unstable",
"version": "2.5.3",
"description": "",
"private": true,
"scripts": {
"build": "npm run docs",
"docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
},
"dependencies": {
"fabric-ledger": "2.5.3-unstable"
"fabric-ledger": "2.5.3"
},
"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,6 +1,6 @@
{
"name": "fabric-ledger",
"version": "2.5.3-unstable",
"version": "2.5.3",
"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",
Expand All @@ -23,7 +23,7 @@
"Fabric Ledger"
],
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"license": "Apache-2.0",
"nyc": {
Expand All @@ -48,7 +48,7 @@
"lines": 100
},
"dependencies": {
"fabric-contract-api": "2.5.3-unstable",
"fabric-contract-api": "2.5.3",
"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,6 +1,6 @@
{
"name": "fabric-shim",
"version": "2.5.3-unstable",
"version": "2.5.3",
"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",
Expand Down Expand Up @@ -29,7 +29,7 @@
"Fabric Shim"
],
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"types": "./types/index.d.ts",
"license": "Apache-2.0",
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-unstable",
"fabric-shim-api": "2.5.3-unstable",
"fabric-contract-api": "2.5.3",
"fabric-shim-api": "2.5.3",
"fast-safe-stringify": "^2.1.1",
"fs-extra": "^10.0.1",
"reflect-metadata": "^0.1.13",
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-unstable",
"version": "2.5.3",
"author": "",
"license": "APACHE-2.0",
"dependencies": {
"@types/node": "^16.11.4",
"fabric-contract-api": "2.5.3-unstable",
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3",
"fabric-shim": "2.5.3",
"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-unstable",
"version": "2.5.3",
"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-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
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-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/crosschaincode2/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "chaincode",
"description": "Chaincode testing cross chaincode functionality",
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"scripts": {
"start": "fabric-chaincode-node start"
},
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/crud/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "chaincode",
"description": "Chaincode testing crud functionality",
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"scripts": {
"start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start"
},
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/events/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "chaincode",
"description": "Chaincode testing events functionality",
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"scripts": {
"start": "set -x && CORE_CHAINCODE_LOGGING_LEVEL=debug fabric-chaincode-node start"
},
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
10 changes: 5 additions & 5 deletions test/chaincodes/ledger/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,20 @@
"name": "chaincode",
"description": "Chaincode testing ledger functionality",
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"scripts": {
"start": "fabric-chaincode-node start"
},
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable",
"fabric-ledger": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3",
"fabric-ledger": "2.5.3"
}
}
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-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/query/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,19 @@
"name": "chaincode",
"description": "Chaincode testing query functionality",
"engines": {
"node": "^18.0.0"
"node": "^18.0.0"
},
"scripts": {
"start": "fabric-chaincode-node start"
},
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.3-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
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-unstable",
"version": "2.5.3",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.3-unstable",
"fabric-contract-api": "2.5.3-unstable"
"fabric-shim": "2.5.3",
"fabric-contract-api": "2.5.3"
}
}
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-unstable",
"version": "2.5.3",
"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-unstable",
"toolchain": "2.5.3",
"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-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.3","title":"chaincode"},"components":{"schemas":{}}}';

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

Expand Down
Loading