Skip to content

Commit

Permalink
Update versions following v2.5.8 release (#444)
Browse files Browse the repository at this point in the history
Signed-off-by: Mark S. Lewis <[email protected]>
  • Loading branch information
bestbeforetoday authored Dec 4, 2024
1 parent b3720d0 commit 67cda6c
Show file tree
Hide file tree
Showing 20 changed files with 58 additions and 59 deletions.
4 changes: 2 additions & 2 deletions apis/fabric-contract-api/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-contract-api",
"version": "2.5.8",
"version": "2.5.9",
"tag": "latest",
"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 @@ -45,7 +45,7 @@
"lines": 100
},
"dependencies": {
"fabric-shim-api": "2.5.8",
"fabric-shim-api": "2.5.9",
"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
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-shim-api",
"version": "2.5.8",
"version": "2.5.9",
"tag": "latest",
"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
2 changes: 1 addition & 1 deletion docker/fabric-nodeenv/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-nodeenv",
"version": "2.5.8",
"version": "2.5.9",
"description": "",
"main": "docker.js",
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions docs/package.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"name": "fabric-shim-docs",
"version": "2.5.8",
"version": "2.5.9",
"description": "",
"private": true,
"scripts": {
"build": "npm run docs",
"docs": "rimraf ./gen && jsdoc -c ./_jsdoc.json"
},
"dependencies": {
"fabric-ledger": "2.5.8"
"fabric-ledger": "2.5.9"
},
"devDependencies": {
"ink-docstrap": "^1.3.2",
Expand Down
4 changes: 2 additions & 2 deletions libraries/fabric-ledger/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-ledger",
"version": "2.5.8",
"version": "2.5.9",
"tag": "latest",
"description": "A node.js implementation of Hyperledger Fabric ledger api, to allow access to ledger data from smart contracts",
"main": "lib/index.js",
Expand Down Expand Up @@ -48,7 +48,7 @@
"lines": 100
},
"dependencies": {
"fabric-contract-api": "2.5.8",
"fabric-contract-api": "2.5.9",
"winston": "^3.7.2"
},
"devDependencies": {
Expand Down
6 changes: 3 additions & 3 deletions libraries/fabric-shim/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-shim",
"version": "2.5.8",
"version": "2.5.9",
"tag": "latest",
"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 @@ -58,8 +58,8 @@
"@hyperledger/fabric-protos": "^0.2.2",
"@types/node": "^16.11.1",
"ajv": "^6.12.2",
"fabric-contract-api": "2.5.8",
"fabric-shim-api": "2.5.8",
"fabric-contract-api": "2.5.9",
"fabric-shim-api": "2.5.9",
"fast-safe-stringify": "^2.1.1",
"long": "^5.2.3",
"reflect-metadata": "^0.1.13",
Expand Down
6 changes: 3 additions & 3 deletions test/chaincodes/annotations/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "APACHE-2.0",
"dependencies": {
"@types/node": "^16.11.4",
"fabric-contract-api": "2.5.8",
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.9",
"fabric-shim": "2.5.9",
"ts-node": "^3.3.0",
"tslint": "^5.6.0",
"typescript": "^4.0.2"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@
}
},
"info": {
"version": "2.5.8",
"version": "2.5.9",
"title": "ts_chaincode"
},
"components": {
Expand Down
6 changes: 3 additions & 3 deletions test/chaincodes/clientidentity/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crosschaincode/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crosschaincode2/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/crud/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/events/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
8 changes: 4 additions & 4 deletions test/chaincodes/ledger/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,12 @@
"main": "index.js",
"engine-strict": true,
"engineStrict": true,
"version": "2.5.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8",
"fabric-ledger": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9",
"fabric-ledger": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/privateData/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/query/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
6 changes: 3 additions & 3 deletions test/chaincodes/scenario/package.json
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.8",
"version": "2.5.9",
"author": "",
"license": "Apache-2.0",
"dependencies": {
"fabric-shim": "2.5.8",
"fabric-contract-api": "2.5.8"
"fabric-shim": "2.5.9",
"fabric-contract-api": "2.5.9"
}
}
2 changes: 1 addition & 1 deletion test/e2e/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fabric-e2e-tests",
"version": "2.5.8",
"version": "2.5.9",
"description": "",
"main": "docker.js",
"scripts": {
Expand Down
21 changes: 10 additions & 11 deletions test/e2e/scenario.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ const exportPeerCommand = async (org) => {
const role = 'Admin';
const args =
`export PATH=${dir}/bin:$PATH && export FABRIC_CFG_PATH=${dir}/config/ && ` +
`export CORE_PEER_TLS_ENABLED=true && export CORE_PEER_LOCALMSPID="${
org[0].toUpperCase() + org.slice(1)
`export CORE_PEER_TLS_ENABLED=true && export CORE_PEER_LOCALMSPID="${org[0].toUpperCase() + org.slice(1)
}MSP" && ` +
`export CORE_PEER_TLS_ROOTCERT_FILE=${dir}/test-network/organizations/peerOrganizations/${org}.example.com/peers/peer0.${org}.example.com/tls/ca.crt && ` +
`export CORE_PEER_MSPCONFIGPATH=${dir}/test-network/organizations/peerOrganizations/${org}.example.com/users/${role}@${org}.example.com/msp && ` +
Expand Down Expand Up @@ -69,7 +68,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.8","title":"chaincode"},"components":{"schemas":{}}}';
'{"$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.9","title":"chaincode"},"components":{"schemas":{}}}';

const schema = fs.readFileSync(
path.join(
Expand Down Expand Up @@ -98,14 +97,14 @@ const instantiateChaincode = async () => {
// Invoke init function
await runcmds([
(await exportPeerCommand('org1')) +
' && ' +
util.format(
'peer chaincode invoke -o localhost:7050 %s -C %s -n %s -c %s --waitForEvent',
getTLSArgs(),
CHANNEL_NAME,
'mysmartcontract',
'\'{"Args":["UpdateValues:setup"]}\''
),
' && ' +
util.format(
'peer chaincode invoke -o localhost:7050 %s -C %s -n %s -c %s --waitForEvent',
getTLSArgs(),
CHANNEL_NAME,
'mysmartcontract',
'\'{"Args":["UpdateValues:setup"]}\''
),
]);
};

Expand Down
8 changes: 4 additions & 4 deletions test/fv/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "fvtests",
"version": "2.5.8",
"version": "2.5.9",
"description": "fv tests",
"testFabricVersion": "main",
"testFabricThirdParty": "0.4.15",
Expand All @@ -25,9 +25,9 @@
"del": "^3.0.0",
"delay": "5.0.0",
"eslint": "^6.6.0",
"fabric-contract-api": "2.5.8",
"fabric-shim": "2.5.8",
"fabric-shim-api": "2.5.8",
"fabric-contract-api": "2.5.9",
"fabric-shim": "2.5.9",
"fabric-shim-api": "2.5.9",
"git-rev-sync": "3.0.1",
"gulp": "^4.0.2",
"ip": "^1.1.5",
Expand Down

0 comments on commit 67cda6c

Please sign in to comment.