Reorganize/refactor 7nodes example and update for latest Vagrant

Author: patrickmn

README.md

@@ -10,7 +10,7 @@ The easiest way to get started with running the examples is to use the vagrant e
 
 **Important note**: Any account/encryption keys contained in this repository are for
 demonstration and testing purposes only. Before running a real environment, you should
-generate new ones using Geth's `account` tool and `constellation-enclave-keygen`.
+generate new ones using Geth's `account` tool and `constellation-node --generate-keys`.
 
 ## Vagrant Usage
 
@@ -20,7 +20,7 @@ Quorum examples.
 ### Requirements
 
   1. Install [VirtualBox](https://www.virtualbox.org/wiki/Downloads)
-  1. Install [Vagrant](https://www.vagrantup.com/downloads.html)
+  2. Install [Vagrant](https://www.vagrantup.com/downloads.html)
 
 (If you are behind a proxy server, please see https://github.com/jpmorganchase/quorum/issues/23)
 
@@ -41,8 +41,6 @@ cd quorum-examples
 exist, please run `sudo rm -r /opt/vagrant/embedded/bin/curl`. This is usually due to
 issues with the version of curl bundled with Vagrant.)
 
-
-
 To shut down the Vagrant instance, run `vagrant suspend`. To delete it, run
 `vagrant destroy`. To start from scratch, run `vagrant up` after destroying the
 instance.

examples/7nodes/bench-private-async.sh renamed to examples/7nodes/bench/private-async.sh

@@ -0,0 +1,28 @@
+#!/bin/bash
+set -u
+set -e
+
+for i in {1..7}
+do
+    DDIR="qdata/c$i"
+    mkdir -p $DDIR
+    mkdir -p qdata/logs
+    cp "keys/tm$i.pub" "$DDIR/tm.pub"
+    cp "keys/tm$i.key" "$DDIR/tm.key"
+    rm -f "$DDIR/tm.ipc"
+    CMD="constellation-node --url=https://127.0.0.$i:900$i/ --port=900$i --workdir=$DDIR --socket=tm.ipc --publickeys=tm.pub --privatekeys=tm.key --othernodes=https://127.0.0.1:9001/"
+    echo "$CMD >> qdata/logs/constellation$i.log 2>&1 &"
+    $CMD >> "qdata/logs/constellation$i.log" 2>&1 &
+done
+
+DOWN=true
+while $DOWN; do
+    sleep 0.1
+    DOWN=false
+    for i in {1..7}
+    do
+	if [ ! -S "qdata/c$i/tm.ipc" ]; then
+            DOWN=true
+	fi
+    done
+done

examples/7nodes/bench-private-sync.sh renamed to examples/7nodes/bench/private-sync.sh

@@ -8,47 +8,54 @@ mkdir -p qdata/logs
 
 echo "[*] Configuring node 1"
 mkdir -p qdata/dd1/{keystore,geth}
-cp raft/static-nodes.json qdata/dd1
+cp permissioned-nodes.json qdata/dd1/static-nodes.json
+cp permissioned-nodes.json qdata/dd1/
 cp keys/key1 qdata/dd1/keystore
 cp raft/nodekey1 qdata/dd1/geth/nodekey
 geth --datadir qdata/dd1 init istanbul-genesis.json
 
 echo "[*] Configuring node 2"
 mkdir -p qdata/dd2/{keystore,geth}
-cp raft/static-nodes.json qdata/dd2
+cp permissioned-nodes.json qdata/dd2/static-nodes.json
+cp permissioned-nodes.json qdata/dd2/
 cp keys/key2 qdata/dd2/keystore
 cp keys/key3 qdata/dd2/keystore
 cp raft/nodekey2 qdata/dd2/geth/nodekey
 geth --datadir qdata/dd2 init istanbul-genesis.json
 
 echo "[*] Configuring node 3"
 mkdir -p qdata/dd3/{keystore,geth}
-cp raft/static-nodes.json qdata/dd3
+cp permissioned-nodes.json qdata/dd3/static-nodes.json
+cp permissioned-nodes.json qdata/dd3/
 cp raft/nodekey3 qdata/dd3/geth/nodekey
 geth --datadir qdata/dd3 init istanbul-genesis.json
 
 echo "[*] Configuring node 4 as voter"
 mkdir -p qdata/dd4/{keystore,geth}
-cp raft/static-nodes.json qdata/dd4
+cp permissioned-nodes.json qdata/dd4/static-nodes.json
+cp permissioned-nodes.json qdata/dd4/
 cp keys/key4 qdata/dd4/keystore
 cp raft/nodekey4 qdata/dd4/geth/nodekey
 geth --datadir qdata/dd4 init istanbul-genesis.json
 
 echo "[*] Configuring node 5 as voter"
 mkdir -p qdata/dd5/{keystore,geth}
-cp raft/static-nodes.json qdata/dd5
+cp permissioned-nodes.json qdata/dd5/static-nodes.json
+cp permissioned-nodes.json qdata/dd5/
 cp keys/key5 qdata/dd5/keystore
 cp raft/nodekey5 qdata/dd5/geth/nodekey
 geth --datadir qdata/dd5 init istanbul-genesis.json
 
 echo "[*] Configuring node 6"
 mkdir -p qdata/dd6/{keystore,geth}
-cp raft/static-nodes.json qdata/dd6
+cp permissioned-nodes.json qdata/dd6/static-nodes.json
+cp permissioned-nodes.json qdata/dd6/
 cp raft/nodekey6 qdata/dd6/geth/nodekey
 geth --datadir qdata/dd6 init istanbul-genesis.json
 
 echo "[*] Configuring node 7"
 mkdir -p qdata/dd7/{keystore,geth}
-cp raft/static-nodes.json qdata/dd7
+cp permissioned-nodes.json qdata/dd7/static-nodes.json
+cp permissioned-nodes.json qdata/dd7/
 cp raft/nodekey7 qdata/dd7/geth/nodekey
-geth --datadir qdata/dd7 init istanbul-genesis.json
+geth --datadir qdata/dd7 init istanbul-genesis.json

examples/7nodes/bench-public-sync.sh renamed to examples/7nodes/bench/public-sync.sh

@@ -2,44 +2,22 @@
 set -u
 set -e
 
-GLOBAL_ARGS="--syncmode full --mine --rpc --rpcaddr 0.0.0.0 --rpcapi admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"
-
+mkdir -p qdata/logs
 echo "[*] Starting Constellation nodes"
-nohup constellation-node tm1.conf 2>> qdata/logs/constellation1.log &
-sleep 1
-nohup constellation-node tm2.conf 2>> qdata/logs/constellation2.log &
-nohup constellation-node tm3.conf 2>> qdata/logs/constellation3.log &
-nohup constellation-node tm4.conf 2>> qdata/logs/constellation4.log &
-nohup constellation-node tm5.conf 2>> qdata/logs/constellation5.log &
-nohup constellation-node tm6.conf 2>> qdata/logs/constellation6.log &
-nohup constellation-node tm7.conf 2>> qdata/logs/constellation7.log &
-
-sleep 1
-
-echo "[*] Starting node 1"
-PRIVATE_CONFIG=tm1.conf nohup geth --datadir qdata/dd1 $GLOBAL_ARGS --rpcport 22000 --port 21000 --unlock 0 --password passwords.txt 2>>qdata/logs/1.log &
-
-echo "[*] Starting node 2"
-PRIVATE_CONFIG=tm2.conf nohup geth --datadir qdata/dd2 $GLOBAL_ARGS --rpcport 22001 --port 21001 2>>qdata/logs/2.log &
-
-echo "[*] Starting node 3"
-PRIVATE_CONFIG=tm3.conf nohup geth --datadir qdata/dd3 $GLOBAL_ARGS --rpcport 22002 --port 21002 2>>qdata/logs/3.log &
-
-echo "[*] Starting node 4"
-PRIVATE_CONFIG=tm4.conf nohup geth --datadir qdata/dd4 $GLOBAL_ARGS --rpcport 22003 --port 21003 2>>qdata/logs/4.log &
-
-echo "[*] Starting node 5"
-PRIVATE_CONFIG=tm5.conf nohup geth --datadir qdata/dd5 $GLOBAL_ARGS --rpcport 22004 --port 21004 2>>qdata/logs/5.log &
-
-echo "[*] Starting node 6"
-PRIVATE_CONFIG=tm6.conf nohup geth --datadir qdata/dd6 $GLOBAL_ARGS --rpcport 22005 --port 21005 2>>qdata/logs/6.log &
-
-echo "[*] Starting node 7"
-PRIVATE_CONFIG=tm7.conf nohup geth --datadir qdata/dd7 $GLOBAL_ARGS --rpcport 22006 --port 21006 2>>qdata/logs/7.log &
-
-echo "[*] Waiting for nodes to start"
-sleep 10
-echo "[*] Sending first transaction"
-PRIVATE_CONFIG=tm1.conf geth --exec 'loadScript("script1.js")' attach ipc:qdata/dd1/geth.ipc
-
-echo "All nodes configured. See 'qdata/logs' for logs, and run e.g. 'geth attach qdata/dd1/geth.ipc' to attach to the first Geth node"
+./constellation-start.sh
+
+echo "[*] Starting Ethereum nodes"
+set -v
+ARGS="--syncmode full --mine --rpc --rpcaddr 0.0.0.0 --rpcapi admin,db,eth,debug,miner,net,shh,txpool,personal,web3,quorum,istanbul"
+PRIVATE_CONFIG=qdata/c1/tm.ipc nohup geth --datadir qdata/dd1 $ARGS --rpcport 22000 --port 21000 --unlock 0 --password passwords.txt 2>>qdata/logs/1.log &
+PRIVATE_CONFIG=qdata/c2/tm.ipc nohup geth --datadir qdata/dd2 $ARGS --rpcport 22001 --port 21001 2>>qdata/logs/2.log &
+PRIVATE_CONFIG=qdata/c3/tm.ipc nohup geth --datadir qdata/dd3 $ARGS --rpcport 22002 --port 21002 2>>qdata/logs/3.log &
+PRIVATE_CONFIG=qdata/c4/tm.ipc nohup geth --datadir qdata/dd4 $ARGS --rpcport 22003 --port 21003 2>>qdata/logs/4.log &
+PRIVATE_CONFIG=qdata/c5/tm.ipc nohup geth --datadir qdata/dd5 $ARGS --rpcport 22004 --port 21004 2>>qdata/logs/5.log &
+PRIVATE_CONFIG=qdata/c6/tm.ipc nohup geth --datadir qdata/dd6 $ARGS --rpcport 22005 --port 21005 2>>qdata/logs/6.log &
+PRIVATE_CONFIG=qdata/c7/tm.ipc nohup geth --datadir qdata/dd7 $ARGS --rpcport 22006 --port 21006 2>>qdata/logs/7.log &
+set +v
+
+echo
+echo "All nodes configured. See 'qdata/logs' for logs, and run e.g. 'geth attach qdata/dd1/geth.ipc' to attach to the first Geth node."
+echo "To test sending a private transaction from Node 1 to Node 7, run './runscript script1.js'"