Merge pull request #412 from sandeepnRES/main

fix(besu): fix web3 verison to 1.10

tests/network-setups/besu/.gitignore

@@ -1,2 +1,4 @@
 SampleBesuNetwork1
 SampleBesuNetwork2
+package-lock.json
+node_modules

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

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"
+  }
+}

tests/network-setups/besu/scripts/setupEthSigner.sh

@@ -16,7 +16,6 @@ cp ../artifacts/network$1/createKeyFile.js .
 key=`cat $Node/data/key`
 sed -i "s/<AccountPrivateKey>/$key/g" createKeyFile.js
 touch keys/keyFile_${Node}
-npm install web3
 node createKeyFile.js > keys/keyFile_${Node}
 rm createKeyFile.js
 cp ../artifacts/account.toml keys/