Skip to content

Commit

Permalink
feat(wip): more fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
outSH committed Nov 17, 2023
1 parent 5bb2c07 commit 7ed54df
Show file tree
Hide file tree
Showing 7 changed files with 27 additions and 39 deletions.
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
.openapi-generator-ignore
README.md
models/health_check_response_pb.proto
models/memory_usage_pb.proto
Expand Down
1 change: 1 addition & 0 deletions packages/cactus-cmd-api-server/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"declarationDir": "dist/lib",
"rootDir": "./src",
"skipLibCheck": true,
"resolveJsonModule": true,
"tsBuildInfoFile": "../../.build-cache/cactus-cmd-api-server.tsbuildinfo"
},
"include": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"axios": "1.5.1",
"cbor": "9.0.1",
"rxjs": "7.8.1",
"socket.io-client": "4.5.4"
"socket.io-client-fixed-types": "4.5.4"
},
"devDependencies": {
"@hyperledger/cactus-test-tooling": "2.0.0-alpha.2",
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Observable, ReplaySubject } from "rxjs";
import { finalize } from "rxjs/operators";
import { io } from "socket.io-client";
const { io } = require("socket.io-client-fixed-types");
import {
Logger,
Checks,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@hyperledger/cactus-core-api": "2.0.0-alpha.2",
"axios": "1.6.0",
"dotenv": "16.0.1",
"node-fetch": "3.3.2",
"node-fetch": "2.7.0",
"prom-client": "13.2.0",
"typescript-optional": "2.0.1",
"ubiquity-ts-client-renovated": "1.0.0",
Expand Down
4 changes: 2 additions & 2 deletions weaver/samples/besu/simpleasset/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ deploy-contracts: deploy-contract-network1 deploy-contract-network2

.PHONY: deploy-contract-network1
deploy-contract-network1:
BESU_NETWORK_HOST=localhost BESU_NETWORK_PORT=8545 npm run deploy-contract
BESU_NETWORK_HOST=127.0.0.1 BESU_NETWORK_PORT=8545 npm run deploy-contract

.PHONY: deploy-contract-network2
deploy-contract-network2:
BESU_NETWORK_HOST=localhost BESU_NETWORK_PORT=9544 npm run deploy-contract
BESU_NETWORK_HOST=127.0.0.1 BESU_NETWORK_PORT=9544 npm run deploy-contract

.PHONY: clean-run
clean-run:
Expand Down
54 changes: 21 additions & 33 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7818,7 +7818,7 @@ __metadata:
express: 4.18.2
rxjs: 7.8.1
socket.io: 4.5.4
socket.io-client: 4.5.4
socket.io-client-fixed-types: 4.5.4
uuid: 9.0.1
languageName: unknown
linkType: soft
Expand Down Expand Up @@ -7862,7 +7862,7 @@ __metadata:
"@types/uuid": 9.0.6
axios: 1.6.0
dotenv: 16.0.1
node-fetch: 3.3.2
node-fetch: 2.7.0
prom-client: 13.2.0
typescript-optional: 2.0.1
ubiquity-ts-client-renovated: 1.0.0
Expand Down Expand Up @@ -35660,42 +35660,31 @@ __metadata:
languageName: node
linkType: hard

"node-fetch@npm:3.3.2, node-fetch@npm:^3.3.2":
version: 3.3.2
resolution: "node-fetch@npm:3.3.2"
dependencies:
data-uri-to-buffer: ^4.0.0
fetch-blob: ^3.1.4
formdata-polyfill: ^4.0.10
checksum: 06a04095a2ddf05b0830a0d5302699704d59bda3102894ea64c7b9d4c865ecdff2d90fd042df7f5bc40337266961cb6183dcc808ea4f3000d024f422b462da92
languageName: node
linkType: hard

"node-fetch@npm:^2.6.12":
version: 2.6.12
resolution: "node-fetch@npm:2.6.12"
"node-fetch@npm:2.7.0, node-fetch@npm:^2.6.8, node-fetch@npm:^2.6.9":
version: 2.7.0
resolution: "node-fetch@npm:2.7.0"
dependencies:
whatwg-url: ^5.0.0
peerDependencies:
encoding: ^0.1.0
peerDependenciesMeta:
encoding:
optional: true
checksum: 3bc1655203d47ee8e313c0d96664b9673a3d4dd8002740318e9d27d14ef306693a4b2ef8d6525775056fd912a19e23f3ac0d7111ad8925877b7567b29a625592
checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
languageName: node
linkType: hard

"node-fetch@npm:^2.6.8, node-fetch@npm:^2.6.9":
version: 2.7.0
resolution: "node-fetch@npm:2.7.0"
"node-fetch@npm:^2.6.12":
version: 2.6.12
resolution: "node-fetch@npm:2.6.12"
dependencies:
whatwg-url: ^5.0.0
peerDependencies:
encoding: ^0.1.0
peerDependenciesMeta:
encoding:
optional: true
checksum: d76d2f5edb451a3f05b15115ec89fc6be39de37c6089f1b6368df03b91e1633fd379a7e01b7ab05089a25034b2023d959b47e59759cb38d88341b2459e89d6e5
checksum: 3bc1655203d47ee8e313c0d96664b9673a3d4dd8002740318e9d27d14ef306693a4b2ef8d6525775056fd912a19e23f3ac0d7111ad8925877b7567b29a625592
languageName: node
linkType: hard

Expand All @@ -35710,6 +35699,17 @@ __metadata:
languageName: node
linkType: hard

"node-fetch@npm:^3.3.2":
version: 3.3.2
resolution: "node-fetch@npm:3.3.2"
dependencies:
data-uri-to-buffer: ^4.0.0
fetch-blob: ^3.1.4
formdata-polyfill: ^4.0.10
checksum: 06a04095a2ddf05b0830a0d5302699704d59bda3102894ea64c7b9d4c865ecdff2d90fd042df7f5bc40337266961cb6183dcc808ea4f3000d024f422b462da92
languageName: node
linkType: hard

"node-forge@npm:>=1.3.0":
version: 1.3.1
resolution: "node-forge@npm:1.3.1"
Expand Down Expand Up @@ -43222,18 +43222,6 @@ __metadata:
languageName: node
linkType: hard

"socket.io-client@npm:4.5.4":
version: 4.5.4
resolution: "socket.io-client@npm:4.5.4"
dependencies:
"@socket.io/component-emitter": ~3.1.0
debug: ~4.3.2
engine.io-client: ~6.2.3
socket.io-parser: ~4.2.1
checksum: 8320ce4a96e9c28318b17037e412746b1d612cfba653c3c321c0e49042f0be9aeb8de67d5861e45e9aad32407bb4dd204bfe199565d78d5320aaf65253371b7f
languageName: node
linkType: hard

"socket.io-parser@npm:>=4.2.3":
version: 4.2.4
resolution: "socket.io-parser@npm:4.2.4"
Expand Down

0 comments on commit 7ed54df

Please sign in to comment.