Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

TESTING #29

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

TESTING #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c6f3522
TESTING
Jan 15, 2025
f434340
TESTING
Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cactus-core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,13 @@
"http-errors": "2.0.0",
"http-errors-enhanced-cjs": "2.0.1",
"run-time-error-cjs": "1.4.0",
"safe-stable-stringify": "2.4.3",
"safe-stable-stringify": "2.5.0",
"typescript-optional": "2.0.1"
},
"devDependencies": {
"@types/body-parser": "1.19.4",
"@types/express": "5.0.0",
"@types/http-errors": "2.0.2",
"@types/http-errors": "2.0.4",
"node-mocks-http": "1.14.0",
"uuid": "10.0.0"
},
Expand Down
10 changes: 5 additions & 5 deletions packages/cactus-plugin-bungee-hermes/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,24 +71,24 @@
"fs-extra": "11.2.0",
"http-errors-enhanced-cjs": "2.0.1",
"key-encoder": "2.0.3",
"merkletreejs": "0.3.11",
"merkletreejs": "0.4.0",
"safe-stable-stringify": "2.5.0",
"typescript-optional": "2.0.1",
"uuid": "10.0.0",
"web3": "1.6.1",
"web3-core": "1.6.1"
"web3": "4.4.0",
"web3-core": "4.1.1"
},
"devDependencies": {
"@hyperledger/cactus-test-geth-ledger": "2.1.0",
"@hyperledger/cactus-test-tooling": "2.1.0",
"@types/body-parser": "1.19.4",
"@types/crypto-js": "4.0.1",
"@types/crypto-js": "4.1.1",
"@types/express": "5.0.0",
"@types/fs-extra": "11.0.4",
"@types/tape": "4.13.4",
"@types/uuid": "10.0.0",
"express": "4.21.2",
"fabric-network": "2.2.20",
"fabric-network": "2.5.0-snapshot.23",
"socket.io": "4.6.2"
},
"engines": {
Expand Down
7 changes: 4 additions & 3 deletions packages/cactus-test-tooling/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,10 @@
"temp": "0.9.4",
"typescript-optional": "2.0.1",
"uuid": "10.0.0",
"web3": "1.6.1",
"web3-core": "1.6.1",
"web3-utils": "1.6.1"
"web3": "4.4.0",
"web3-core": "4.1.1",
"web3-eth-accounts": "4.1.1",
"web3-utils": "4.1.1"
},
"devDependencies": {
"@aries-framework/askar": "0.5.0-alpha.58",
Expand Down
8 changes: 4 additions & 4 deletions packages/cactus-test-tooling/src/main/typescript/besu/besu-test-ledger.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,7 @@ import Docker, { Container, ContainerInfo } from "dockerode";
import Joi from "joi";
import tar from "tar-stream";
import { EventEmitter } from "events";
import Web3 from "web3";
import { Account, TransactionReceipt } from "web3-core";
import Web3, { TransactionReceipt } from "web3";
import {
LogLevelDesc,
Logger,
Expand All @@ -15,6 +14,7 @@ import { ITestLedger } from "../i-test-ledger";
import { Streams } from "../common/streams";
import { IKeyPair } from "../i-key-pair";
import { Containers } from "../common/containers";
import { Web3Account } from "web3-eth-accounts";

export interface IBesuTestLedgerConstructorOptions {
containerImageVersion?: string;
Expand Down Expand Up @@ -162,10 +162,10 @@ export class BesuTestLedger implements ITestLedger {
*
* @param [seedMoney=10e8] The amount of money to seed the new test account with.
*/
public async createEthTestAccount(seedMoney = 10e8): Promise<Account> {
public async createEthTestAccount(seedMoney = 10e8): Promise<Web3Account> {
const rpcApiHttpHost = await this.getRpcApiHttpHost();
const web3 = new Web3(rpcApiHttpHost);
const ethTestAccount = web3.eth.accounts.create(uuidv4());
const ethTestAccount = web3.eth.accounts.create();

await this.sendEthToAccount(ethTestAccount.address, seedMoney);

Expand Down
59 changes: 30 additions & 29 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9700,7 +9700,7 @@ __metadata:
"@hyperledger/cactus-core-api": "npm:2.1.0"
"@types/body-parser": "npm:1.19.4"
"@types/express": "npm:5.0.0"
"@types/http-errors": "npm:2.0.2"
"@types/http-errors": "npm:2.0.4"
body-parser: "npm:1.20.3"
express: "npm:4.21.2"
express-jwt-authz: "npm:2.4.1"
Expand All @@ -9709,7 +9709,7 @@ __metadata:
http-errors-enhanced-cjs: "npm:2.0.1"
node-mocks-http: "npm:1.14.0"
run-time-error-cjs: "npm:1.4.0"
safe-stable-stringify: "npm:2.4.3"
safe-stable-stringify: "npm:2.5.0"
typescript-optional: "npm:2.0.1"
uuid: "npm:10.0.0"
languageName: unknown
Expand Down Expand Up @@ -10093,19 +10093,19 @@ __metadata:
"@hyperledger/cactus-test-geth-ledger": "npm:2.1.0"
"@hyperledger/cactus-test-tooling": "npm:2.1.0"
"@types/body-parser": "npm:1.19.4"
"@types/crypto-js": "npm:4.0.1"
"@types/crypto-js": "npm:4.1.1"
"@types/express": "npm:5.0.0"
"@types/fs-extra": "npm:11.0.4"
"@types/tape": "npm:4.13.4"
"@types/uuid": "npm:10.0.0"
axios: "npm:1.7.9"
axios: "npm:>=1.7.9"
body-parser: "npm:1.20.3"
express: "npm:4.21.2"
fabric-network: "npm:2.2.20"
fabric-network: "npm:2.5.0-snapshot.23"
fs-extra: "npm:11.2.0"
http-errors-enhanced-cjs: "npm:2.0.1"
key-encoder: "npm:2.0.3"
merkletreejs: "npm:0.3.11"
merkletreejs: "npm:0.4.0"
safe-stable-stringify: "npm:2.5.0"
socket.io: "npm:4.6.2"
typescript-optional: "npm:2.0.1"
Expand Down Expand Up @@ -11096,9 +11096,11 @@ __metadata:
temp: "npm:0.9.4"
typescript-optional: "npm:2.0.1"
uuid: "npm:10.0.0"
web3: "npm:1.6.1"
web3-core: "npm:1.6.1"
web3-utils: "npm:1.6.1"
web3: "npm:4.4.0"
web3-core: "npm:4.1.1"
web3-eth-accounts: "npm:4.1.1"
web3-types: "npm:1.10.0"
web3-utils: "npm:4.1.1"
languageName: unknown
linkType: soft

Expand Down Expand Up @@ -17188,13 +17190,6 @@ __metadata:
languageName: node
linkType: hard

"@types/http-errors@npm:2.0.2":
version: 2.0.2
resolution: "@types/http-errors@npm:2.0.2"
checksum: 10/d7f14045240ac4b563725130942b8e5c8080bfabc724c8ff3f166ea928ff7ae02c5194763bc8f6aaf21897e8a44049b0492493b9de3e058247e58fdfe0f86692
languageName: node
linkType: hard

"@types/http-errors@npm:2.0.4":
version: 2.0.4
resolution: "@types/http-errors@npm:2.0.4"
Expand Down Expand Up @@ -39334,19 +39329,6 @@ __metadata:
languageName: node
linkType: hard

"merkletreejs@npm:0.3.11":
version: 0.3.11
resolution: "merkletreejs@npm:0.3.11"
dependencies:
bignumber.js: "npm:^9.0.1"
buffer-reverse: "npm:^1.0.1"
crypto-js: "npm:^4.2.0"
treeify: "npm:^1.1.0"
web3-utils: "npm:^1.3.4"
checksum: 10/a93520ef768648d1e4ebd175182bd3d304270b8eb0700df5be99395fb3ad8805407bdaf3231d13b1649e87de799aa06d71c616db047ad039025764eb23b02244
languageName: node
linkType: hard

"merkletreejs@npm:0.4.0":
version: 0.4.0
resolution: "merkletreejs@npm:0.4.0"
Expand Down Expand Up @@ -55302,6 +55284,13 @@ __metadata:
languageName: node
linkType: hard

"web3-types@npm:1.10.0":
version: 1.10.0
resolution: "web3-types@npm:1.10.0"
checksum: 10/849f05a001896b27082c5b5c46c62b65a28f463366eeec7223802418a61db6d3487ebfb73d1fe6dcad3f0849a76e20706098819cb4e266df4f75ca24617e62a1
languageName: node
linkType: hard

"web3-types@npm:^1.0.2":
version: 1.0.2
resolution: "web3-types@npm:1.0.2"
Expand Down Expand Up @@ -55434,6 +55423,18 @@ __metadata:
languageName: node
linkType: hard

"web3-utils@npm:4.1.1":
version: 4.1.1
resolution: "web3-utils@npm:4.1.1"
dependencies:
ethereum-cryptography: "npm:^2.0.0"
web3-errors: "npm:^1.1.4"
web3-types: "npm:^1.3.1"
web3-validator: "npm:^2.0.4"
checksum: 10/c4bdc9e98a87f5eb4a6b4a5f29f1ea340935f4295fc3ad7fff69a9d8944e455657d02bb6ef401a5819dd70e07e621b6f65dc769ea64cb7eddb8ac1c0797000e4
languageName: node
linkType: hard

"web3-utils@npm:4.2.1":
version: 4.2.1
resolution: "web3-utils@npm:4.2.1"
Expand Down
Loading