Skip to content

Commit c75ecf4

Browse files
committed
build(deps): bulk fix CVEs via dependency resolution overrides 2023-10-23
1. Couldn't get rid of vulnerable versions in a couple of dependencies because the underlying dependencies have gone ESM only which is a blocker for us at the moment unfortunately. 2. Swapped out the ubiquity TS client to a version of it that I self published onto npm after a full renovation of all of its dependencies. Depends on hyperledger-cacti#2807 (because that one also has a couple of dependency bumps that are needed to eliminate the vulnerabilities) Fixes hyperledger-cacti#2828 Signed-off-by: Peter Somogyvari <peter.somogyvari@accenture.com>
1 parent 539dfe5 commit c75ecf4

File tree

4 files changed

+533
-846
lines changed

4 files changed

+533
-846
lines changed

package.json

+14-3
Original file line numberDiff line numberDiff line change
@@ -77,16 +77,27 @@
7777
"init-registries": "npm config set @iroha2:registry=https://nexus.iroha.tech/repository/npm-group/"
7878
},
7979
"resolutions": {
80-
"ansi-html": ">0.0.8",
80+
"@babel/traverse": ">=7.23.2",
81+
"ansi-html": ">=0.0.8",
8182
"axios": ">=0.27.2",
82-
"glob-parent": "5.1.2",
83+
"engine.io": ">=6.4.2",
84+
"get-func-name": ">=2.0.1",
85+
"glob-parent": ">=5.1.2",
8386
"http-cache-semantics": ">=4.1.1",
87+
"jsonwebtoken": ">=9.0.0",
8488
"lodash": ">=4.17.21",
8589
"minimist": ">=1.2.6",
8690
"nano": ">=10.0.0",
8791
"node-forge": ">=1.3.0",
92+
"postcss": ">=8.4.31",
8893
"protobufjs": ">=7.2.5",
89-
"underscore": "1.13.2"
94+
"semver": ">=7.5.2",
95+
"socket.io-parser": ">=4.2.3",
96+
"tough-cookie": ">=4.1.3",
97+
"xml2js": ">=0.5.0",
98+
"yargs-parser": ">=18.1.1",
99+
"underscore": ">=1.13.2",
100+
"zod": ">=3.22.3"
90101
},
91102
"devDependencies": {
92103
"@commitlint/cli": "17.7.1",

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@
5757
"dependencies": {
5858
"@hyperledger/cactus-core": "2.0.0-alpha.2",
5959
"@hyperledger/cactus-core-api": "2.0.0-alpha.2",
60-
"@ubiquity/ubiquity-ts-client-modified": "https://github.com/RafaelAPB/ubiquity-ts-client-mirror.git",
6160
"dotenv": "16.0.1",
6261
"prom-client": "13.2.0",
63-
"typescript-optional": "2.0.1"
62+
"typescript-optional": "2.0.1",
63+
"ubiquity-ts-client-renovated": "1.0.0"
6464
},
6565
"devDependencies": {
6666
"@hyperledger/cactus-common": "2.0.0-alpha.2",

packages/cactus-plugin-ledger-connector-ubiquity/src/main/typescript/plugin-ledger-connector-ubiquity.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import { GetTransactionsByAddressEndpoint } from "./endpoints/transaction/get-tr
2727
import {
2828
UbiquityClient,
2929
TxPage,
30-
Balance,
30+
BalanceV1,
3131
Tx,
32-
} from "@ubiquity/ubiquity-ts-client-modified";
32+
} from "ubiquity-ts-client-renovated";
3333

3434
export interface IPluginLedgerConnectorUbiquity {
3535
logLevel?: LogLevelDesc;
@@ -135,7 +135,7 @@ export class PluginLedgerConnectorUbiquity
135135
protocol: PROTOCOL_TYPE,
136136
network: NETWORK_TYPE,
137137
address: string,
138-
): Promise<AxiosResponse<Balance[]>> {
138+
): Promise<AxiosResponse<BalanceV1[]>> {
139139
const fnTag = `${this.className}:GetBalancesByAddresses`;
140140
this.log.debug("enter ", fnTag);
141141
const accounts = this.client.accountsApi.getListOfBalancesByAddress(

0 commit comments

Comments
 (0)