Skip to content

Commit

Permalink
fix(security): upgrade fabric-common to 2.2.10 or later
Browse files Browse the repository at this point in the history 
In the fabric connector I had to upgrade to a newer snapshot
version because we need the fresh typings from there.

Fixes #1600

Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
  • Loading branch information
@petermetz
petermetz committed Dec 3, 2021
1 parent fd41cfb commit 45c4a69
Show file tree
Hide file tree
Showing 17 changed files with 107 additions and 345 deletions.
4 changes: 2 additions & 2 deletions ...in/environment/base/cc_env/servers/restserver/coreapi/lib/common/fabric_v1.0/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"dependencies": {
"fabric-client": "1.0.2",
"fabric-ca-client": "1.0.2",
"fabric-ca-client": "2.2.10",
"grpc": "1.4.1"
}
}
}
4 changes: 2 additions & 2 deletions examples/cactus-example-carbon-accounting-backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
"@openzeppelin/contracts": "4.3.3",
"@openzeppelin/contracts-upgradeable": "4.3.3",
"async-exit-hook": "2.0.1",
"fabric-network": "2.2.8",
"fabric-network": "2.2.10",
"fs-extra": "10.0.0",
"openapi-types": "9.1.0",
"typescript-optional": "2.0.1",
Expand All @@ -99,4 +99,4 @@
"http-status-codes": "2.1.4",
"jose": "1.28.1"
}
}
}
4 changes: 2 additions & 2 deletions examples/cactus-example-supply-chain-backend/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"async-exit-hook": "2.0.1",
"axios": "0.21.4",
"express": "4.17.1",
"fabric-network": "2.2.8",
"fabric-network": "2.2.10",
"jose": "1.28.1",
"openapi-types": "9.1.0",
"solc": "0.8.6",
Expand All @@ -88,4 +88,4 @@
"@types/express": "4.17.13",
"@types/uuid": "8.3.1"
}
}
}
6 changes: 3 additions & 3 deletions examples/cartrade/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
"jsonwebtoken": "^8.5.1",
Expand All @@ -43,4 +43,4 @@
"tslint": "6.0.0",
"typescript": "^3.9.3"
}
}
}
10 changes: 5 additions & 5 deletions examples/cartrade/script-test-getFunctions/fabric/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"config": "^1.26.1",
"socket.io": "^2.0.4",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0"
"config": "^1.26.1",
"socket.io": "^2.0.4",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10"
}
}
}
6 changes: 3 additions & 3 deletions examples/cartrade/validatorDriver/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"web3": "^1.2.9",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0"
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10"
}
}
}
6 changes: 3 additions & 3 deletions examples/discounted-cartrade/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"http-errors": "~1.6.3",
"indy-sdk": "^1.16.0-dev-1636",
"jade": "~1.11.0",
Expand All @@ -44,4 +44,4 @@
"tslint": "6.0.0",
"typescript": "^3.9.3"
}
}
}
10 changes: 5 additions & 5 deletions examples/discounted-cartrade/script-test-getFunctions/fabric/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
"version": "0.0.0",
"private": true,
"dependencies": {
"config": "^1.26.1",
"socket.io": "^2.0.4",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0"
"config": "^1.26.1",
"socket.io": "^2.0.4",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10"
}
}
}
6 changes: 3 additions & 3 deletions examples/discounted-cartrade/validatorDriver/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"web3": "^1.2.9",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0"
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10"
}
}
}
6 changes: 3 additions & 3 deletions examples/electricity-trade/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
"jsonwebtoken": "^8.5.1",
Expand All @@ -43,4 +43,4 @@
"tslint": "6.0.0",
"typescript": "^3.9.3"
}
}
}
6 changes: 3 additions & 3 deletions examples/test-run-transaction/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
"jsonwebtoken": "^8.5.1",
Expand All @@ -43,4 +43,4 @@
"tslint": "6.0.0",
"typescript": "^3.9.3"
}
}
}
6 changes: 3 additions & 3 deletions packages/cactus-cmd-socketio-server/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@
"ethereumjs-common": "^1.5.1",
"ethereumjs-tx": "^2.1.2",
"express": "~4.16.1",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"http-errors": "~1.6.3",
"jade": "~1.11.0",
"jsonwebtoken": "^8.5.1",
Expand All @@ -50,4 +50,4 @@
"tslint": "6.0.0",
"typescript": "^3.9.10"
}
}
}
6 changes: 3 additions & 3 deletions packages/cactus-plugin-ledger-connector-fabric-socketio/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
"cookie-parser": "~1.4.3",
"debug": "~4.1.1",
"express": "~4.15.2",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"jsonwebtoken": "^8.5.1",
"log4js": "^3.0.6",
"morgan": "~1.8.1",
Expand All @@ -38,4 +38,4 @@
"prettier": "^2.4.0",
"typescript": "^3.9.10"
}
}
}
6 changes: 3 additions & 3 deletions ...cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
"config": "^1.26.1",
"socket.io": "^2.0.4",
"ts-node": "^9.0.0",
"fabric-ca-client": "~1.4.0",
"fabric-network": "~1.4.0",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"shelljs": "^0.8.4"
},
"devDependencies": {
"typescript": "^3.9.3"
}
}
}
10 changes: 5 additions & 5 deletions packages/cactus-plugin-ledger-connector-fabric/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,10 +77,10 @@
"bl": "5.0.0",
"bn.js": "4.12.0",
"express": "4.17.1",
"fabric-ca-client": "2.3.0-snapshot.49",
"fabric-common": "2.3.0-snapshot.49",
"fabric-network": "2.3.0-snapshot.49",
"fabric-protos": "2.2.8",
"fabric-ca-client": "2.3.0-snapshot.62",
"fabric-common": "2.3.0-snapshot.63",
"fabric-network": "2.3.0-snapshot.62",
"fabric-protos": "2.3.0-snapshot.63",
"form-data": "4.0.0",
"http-status-codes": "2.1.4",
"jsrsasign": "10.4.0",
Expand Down Expand Up @@ -109,4 +109,4 @@
"fs-extra": "10.0.0",
"ws-wallet": "1.1.5"
}
}
}
6 changes: 3 additions & 3 deletions packages/cactus-test-tooling/package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@
"dockerode": "3.3.0",
"elliptic": "6.5.4",
"execa": "5.1.1",
"fabric-ca-client": "2.2.8",
"fabric-network": "2.2.8",
"fabric-ca-client": "2.2.10",
"fabric-network": "2.2.10",
"fs-extra": "10.0.0",
"internal-ip": "6.2.0",
"is-port-reachable": "3.0.0",
Expand Down Expand Up @@ -108,4 +108,4 @@
"esm": "3.2.25",
"temp": "0.9.4"
}
}
}
Loading

0 comments on commit 45c4a69

Please sign in to comment.