fix(besu): testnet web3 version fixed to 1.10.0

Signed-off-by: Sandeep Nishad <sandeep.nishad1@ibm.com>
hyperledger · Jun 14, 2023 · 334612d · 334612d
1 parent 665129c
commit 334612d
Show file tree

Hide file tree

Showing 6 changed files with 34 additions and 5 deletions.
diff --git a/weaver/sdks/besu/node/package-local.json b/weaver/sdks/besu/node/package-local.json
@@ -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",

diff --git a/weaver/sdks/besu/node/package.json b/weaver/sdks/besu/node/package.json
@@ -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",

diff --git a/weaver/tests/network-setups/besu/.gitignore b/weaver/tests/network-setups/besu/.gitignore
@@ -1,2 +1,4 @@
 SampleBesuNetwork1
 SampleBesuNetwork2
+package-lock.json
+node_modules
diff --git a/weaver/tests/network-setups/besu/Makefile b/weaver/tests/network-setups/besu/Makefile
@@ -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
@@ -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
@@ -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
diff --git a/weaver/tests/network-setups/besu/package.json b/weaver/tests/network-setups/besu/package.json
@@ -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"
+  }
+}
diff --git a/weaver/tests/network-setups/besu/scripts/setupEthSigner.sh b/weaver/tests/network-setups/besu/scripts/setupEthSigner.sh
@@ -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/