Skip to content

Commit 45c4a69

Browse files
committed
fix(security): upgrade fabric-common to 2.2.10 or later
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 <[email protected]>
1 parent fd41cfb commit 45c4a69

File tree

17 files changed

+107
-345
lines changed

17 files changed

+107
-345
lines changed

contribs/Fujitsu-ConnectionChain/connection-chain/environment/base/cc_env/servers/restserver/coreapi/lib/common/fabric_v1.0/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"dependencies": {
88
"fabric-client": "1.0.2",
9-
"fabric-ca-client": "1.0.2",
9+
"fabric-ca-client": "2.2.10",
1010
"grpc": "1.4.1"
1111
}
12-
}
12+
}

examples/cactus-example-carbon-accounting-backend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@
8282
"@openzeppelin/contracts": "4.3.3",
8383
"@openzeppelin/contracts-upgradeable": "4.3.3",
8484
"async-exit-hook": "2.0.1",
85-
"fabric-network": "2.2.8",
85+
"fabric-network": "2.2.10",
8686
"fs-extra": "10.0.0",
8787
"openapi-types": "9.1.0",
8888
"typescript-optional": "2.0.1",
@@ -99,4 +99,4 @@
9999
"http-status-codes": "2.1.4",
100100
"jose": "1.28.1"
101101
}
102-
}
102+
}

examples/cactus-example-supply-chain-backend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@
7676
"async-exit-hook": "2.0.1",
7777
"axios": "0.21.4",
7878
"express": "4.17.1",
79-
"fabric-network": "2.2.8",
79+
"fabric-network": "2.2.10",
8080
"jose": "1.28.1",
8181
"openapi-types": "9.1.0",
8282
"solc": "0.8.6",
@@ -88,4 +88,4 @@
8888
"@types/express": "4.17.13",
8989
"@types/uuid": "8.3.1"
9090
}
91-
}
91+
}

examples/cartrade/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"ethereumjs-common": "^1.5.1",
2121
"ethereumjs-tx": "^2.1.2",
2222
"express": "~4.16.1",
23-
"fabric-ca-client": "~1.4.0",
24-
"fabric-network": "~1.4.0",
23+
"fabric-ca-client": "2.2.10",
24+
"fabric-network": "2.2.10",
2525
"http-errors": "~1.6.3",
2626
"jade": "~1.11.0",
2727
"jsonwebtoken": "^8.5.1",
@@ -43,4 +43,4 @@
4343
"tslint": "6.0.0",
4444
"typescript": "^3.9.3"
4545
}
46-
}
46+
}

examples/cartrade/script-test-getFunctions/fabric/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"config": "^1.26.1",
7-
"socket.io": "^2.0.4",
8-
"fabric-ca-client": "~1.4.0",
9-
"fabric-network": "~1.4.0"
6+
"config": "^1.26.1",
7+
"socket.io": "^2.0.4",
8+
"fabric-ca-client": "2.2.10",
9+
"fabric-network": "2.2.10"
1010
}
11-
}
11+
}

examples/cartrade/validatorDriver/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ethereumjs-common": "^1.5.1",
2424
"ethereumjs-tx": "^2.1.2",
2525
"web3": "^1.2.9",
26-
"fabric-ca-client": "~1.4.0",
27-
"fabric-network": "~1.4.0"
26+
"fabric-ca-client": "2.2.10",
27+
"fabric-network": "2.2.10"
2828
}
29-
}
29+
}

examples/discounted-cartrade/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"ethereumjs-common": "^1.5.1",
2121
"ethereumjs-tx": "^2.1.2",
2222
"express": "~4.16.1",
23-
"fabric-ca-client": "~1.4.0",
24-
"fabric-network": "~1.4.0",
23+
"fabric-ca-client": "2.2.10",
24+
"fabric-network": "2.2.10",
2525
"http-errors": "~1.6.3",
2626
"indy-sdk": "^1.16.0-dev-1636",
2727
"jade": "~1.11.0",
@@ -44,4 +44,4 @@
4444
"tslint": "6.0.0",
4545
"typescript": "^3.9.3"
4646
}
47-
}
47+
}

examples/discounted-cartrade/script-test-getFunctions/fabric/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
"version": "0.0.0",
44
"private": true,
55
"dependencies": {
6-
"config": "^1.26.1",
7-
"socket.io": "^2.0.4",
8-
"fabric-ca-client": "~1.4.0",
9-
"fabric-network": "~1.4.0"
6+
"config": "^1.26.1",
7+
"socket.io": "^2.0.4",
8+
"fabric-ca-client": "2.2.10",
9+
"fabric-network": "2.2.10"
1010
}
11-
}
11+
}

examples/discounted-cartrade/validatorDriver/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"ethereumjs-common": "^1.5.1",
2424
"ethereumjs-tx": "^2.1.2",
2525
"web3": "^1.2.9",
26-
"fabric-ca-client": "~1.4.0",
27-
"fabric-network": "~1.4.0"
26+
"fabric-ca-client": "2.2.10",
27+
"fabric-network": "2.2.10"
2828
}
29-
}
29+
}

examples/electricity-trade/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"ethereumjs-common": "^1.5.1",
2121
"ethereumjs-tx": "^2.1.2",
2222
"express": "~4.16.1",
23-
"fabric-ca-client": "~1.4.0",
24-
"fabric-network": "~1.4.0",
23+
"fabric-ca-client": "2.2.10",
24+
"fabric-network": "2.2.10",
2525
"http-errors": "~1.6.3",
2626
"jade": "~1.11.0",
2727
"jsonwebtoken": "^8.5.1",
@@ -43,4 +43,4 @@
4343
"tslint": "6.0.0",
4444
"typescript": "^3.9.3"
4545
}
46-
}
46+
}

examples/test-run-transaction/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020
"ethereumjs-common": "^1.5.1",
2121
"ethereumjs-tx": "^2.1.2",
2222
"express": "~4.16.1",
23-
"fabric-ca-client": "~1.4.0",
24-
"fabric-network": "~1.4.0",
23+
"fabric-ca-client": "2.2.10",
24+
"fabric-network": "2.2.10",
2525
"http-errors": "~1.6.3",
2626
"jade": "~1.11.0",
2727
"jsonwebtoken": "^8.5.1",
@@ -43,4 +43,4 @@
4343
"tslint": "6.0.0",
4444
"typescript": "^3.9.3"
4545
}
46-
}
46+
}

packages/cactus-cmd-socketio-server/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
"ethereumjs-common": "^1.5.1",
2323
"ethereumjs-tx": "^2.1.2",
2424
"express": "~4.16.1",
25-
"fabric-ca-client": "~1.4.0",
26-
"fabric-network": "~1.4.0",
25+
"fabric-ca-client": "2.2.10",
26+
"fabric-network": "2.2.10",
2727
"http-errors": "~1.6.3",
2828
"jade": "~1.11.0",
2929
"jsonwebtoken": "^8.5.1",
@@ -50,4 +50,4 @@
5050
"tslint": "6.0.0",
5151
"typescript": "^3.9.10"
5252
}
53-
}
53+
}

packages/cactus-plugin-ledger-connector-fabric-socketio/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
"cookie-parser": "~1.4.3",
2020
"debug": "~4.1.1",
2121
"express": "~4.15.2",
22-
"fabric-ca-client": "~1.4.0",
23-
"fabric-network": "~1.4.0",
22+
"fabric-ca-client": "2.2.10",
23+
"fabric-network": "2.2.10",
2424
"jsonwebtoken": "^8.5.1",
2525
"log4js": "^3.0.6",
2626
"morgan": "~1.8.1",
@@ -38,4 +38,4 @@
3838
"prettier": "^2.4.0",
3939
"typescript": "^3.9.10"
4040
}
41-
}
41+
}

packages/cactus-plugin-ledger-connector-fabric-socketio/src/test/typescript/unit-test/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
"config": "^1.26.1",
1414
"socket.io": "^2.0.4",
1515
"ts-node": "^9.0.0",
16-
"fabric-ca-client": "~1.4.0",
17-
"fabric-network": "~1.4.0",
16+
"fabric-ca-client": "2.2.10",
17+
"fabric-network": "2.2.10",
1818
"shelljs": "^0.8.4"
1919
},
2020
"devDependencies": {
2121
"typescript": "^3.9.3"
2222
}
23-
}
23+
}

packages/cactus-plugin-ledger-connector-fabric/package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@
7777
"bl": "5.0.0",
7878
"bn.js": "4.12.0",
7979
"express": "4.17.1",
80-
"fabric-ca-client": "2.3.0-snapshot.49",
81-
"fabric-common": "2.3.0-snapshot.49",
82-
"fabric-network": "2.3.0-snapshot.49",
83-
"fabric-protos": "2.2.8",
80+
"fabric-ca-client": "2.3.0-snapshot.62",
81+
"fabric-common": "2.3.0-snapshot.63",
82+
"fabric-network": "2.3.0-snapshot.62",
83+
"fabric-protos": "2.3.0-snapshot.63",
8484
"form-data": "4.0.0",
8585
"http-status-codes": "2.1.4",
8686
"jsrsasign": "10.4.0",
@@ -109,4 +109,4 @@
109109
"fs-extra": "10.0.0",
110110
"ws-wallet": "1.1.5"
111111
}
112-
}
112+
}

packages/cactus-test-tooling/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@
7676
"dockerode": "3.3.0",
7777
"elliptic": "6.5.4",
7878
"execa": "5.1.1",
79-
"fabric-ca-client": "2.2.8",
80-
"fabric-network": "2.2.8",
79+
"fabric-ca-client": "2.2.10",
80+
"fabric-network": "2.2.10",
8181
"fs-extra": "10.0.0",
8282
"internal-ip": "6.2.0",
8383
"is-port-reachable": "3.0.0",
@@ -108,4 +108,4 @@
108108
"esm": "3.2.25",
109109
"temp": "0.9.4"
110110
}
111-
}
111+
}

0 commit comments

Comments
 (0)