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

Jump to bottom

fix(besu): testnet web3 version fixed to 1.10.0 #2451

Merged
merged 1 commit into from
Jun 14, 2023
Merged

fix(besu): testnet web3 version fixed to 1.10.0 #2451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion weaver/sdks/besu/node/package-local.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@hyperledger/cacti-weaver-protos-js": "file:./protos-js",
"log4js": "^6.7.0",
"web3": "^1.8.1"
"web3": "^1.10.0"
},
"devDependencies": {
"@types/node": "^14.0.14",
Expand Down
2 changes: 1 addition & 1 deletion weaver/sdks/besu/node/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@hyperledger/cacti-weaver-protos-js": "2.0.0-alpha.1",
"log4js": "^6.7.0",
"web3": "1.5.2"
"web3": "1.10.0"
},
"devDependencies": {
"@types/node": "^14.0.14",
Expand Down
2 changes: 2 additions & 0 deletions weaver/tests/network-setups/besu/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,4 @@
SampleBesuNetwork1
SampleBesuNetwork2
package-lock.json
node_modules
9 changes: 7 additions & 2 deletions weaver/tests/network-setups/besu/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
start: start-network1 start-network2

start-network1:
npm-install:
npm install

start-network1: npm-install
bash scripts/setupNetwork.sh 1

start-network2:
start-network2: npm-install
bash scripts/setupNetwork.sh 2

test: test-network1 test-network2
Expand All @@ -23,6 +26,7 @@ clean-network1:
tmux kill-session -t Network1_Node3_session || true
tmux kill-session -t Network1_Node4_session || true
rm -rf SampleBesuNetwork1/
rm -rf node_modules

clean-network2:
tmux kill-session -t Network2_EthSigner_session || true
Expand All @@ -31,3 +35,4 @@ clean-network2:
tmux kill-session -t Network2_Node3_session || true
tmux kill-session -t Network2_Node4_session || true
rm -rf SampleBesuNetwork2/
rm -rf node_modules
22 changes: 22 additions & 0 deletions weaver/tests/network-setups/besu/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
{
"name": "besu-testnet",
"version": "1.0.0",
"main": "index.js",
"private": true,
"scripts": {
"test": "echo \"Error: no test specified\" && exit 1"
},
"repository": {
"type": "git",
"url": "git+https://github.com/hyperledger/cacti.git"
},
"author": "",
"license": "Apache-2.0",
"bugs": {
"url": "https://github.com/hyperledger/cacti/issues"
},
"homepage": "https://github.com/hyperledger/cacti#readme",
"dependencies": {
"web3": "^1.10.0"
}
}
2 changes: 1 addition & 1 deletion weaver/tests/network-setups/besu/scripts/setupEthSigner.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ touch keys/keyFile_${Node}
# Without this, the npm install will fail because of conflicting dependency versions
# that cannot be resolved properly unless "forced" (tested on Ubuntu 22.04)
# FIXME: Eliminate the need to do an npm install out-of-bounds like this entirely.
npm install --force web3
# npm install --force web3
node createKeyFile.js > keys/keyFile_${Node}
rm createKeyFile.js
cp ../artifacts/account.toml keys/
Expand Down