Merge pull request #168 from dedis/minor-doc-update

Adds minor doc and script updates

Author: nkcr

README.md

@@ -360,9 +360,9 @@ results.
 
 # ⚙️ Setup
 
-First be sure to have Go installed (at least 1.19).
+1: Install [Go](https://go.dev/dl/) (at least 1.19).
 
-Be sure to have the `crypto` utility from Dela:
+2: Install the `crypto` utility from Dela:
 
 ```sh
 git clone https://github.com/dedis/dela.git
@@ -373,29 +373,53 @@ go install
 Go will install the binaries in `$GOPATH/bin`, so be sure this it is correctly
 added to you path (like with `export PATH=$PATH:/Users/david/go/bin`).
 
-Create a private key (in the d-voting root folder):
+3: [Install tmux](https://github.com/tmux/tmux/wiki/Installing)
+
+# Setup a simple system with 3 nodes
+
+1: Run 3 nodes:
 
 ```sh
-crypto bls signer new --save private.key
+./runNode.sh -n 3
 ```
 
-Copy the private key from the d-voting root folder to the `cli/memcoin` folder:
+This will run 4 terminal sessions. You can navigate by hitting
+<kbd>CTRL</kbd>+<kbd>B</kbd> and then <kbd>S</kbd>. Use the arrows to select a
+window.
+
+2: Launch the setup
+
+From the first terminal sessions, run:
 
 ```sh
-cp private.key cli/memcoin/
+./setupnNode.sh -n 3
 ```
 
-Install memcoin (this requires the private key in `cli/memcoin`):
+3: Launch the web backend
 
 ```sh
-cd cli/memcoin
-go install
+cd web/backend
+# if this is the first time, run `npm install` first
+npm start
 ```
 
-Additionally, you can build the memcoin binary with:
+4: Launch the web frontend
+
+```sh
+cd web/frontend
+# if this is the first time, run `npm install` first
+REACT_APP_PROXY=http://localhost:9081 REACT_APP_NOMOCK=on npm start
+```
+
+Note that you need to be on EPFL's network to login with Tequila. Additionally,
+once logged with Tequila, update the redirect URL and replace
+`dvoting-dev.dedis.ch` with `localhost`. Once logged, you can create an
+election.
+
+5: Stop nodes
 
 ```sh
-go build ./cli/memcoin
+./kill_test.sh
 ```
 
 # Run the nodes

runNode.sh

@@ -4,6 +4,8 @@
 # an evoting system. User can pass number of nodes, window attach mode useful for autotest,
 # and docker usage.
 
+set -e
+
 # by default run on local
 DOCKER=false
 ATTACH=true
@@ -68,11 +70,10 @@ tmux new-session -d -s $s
 rm -rf ./log/log
 mkdir -p ./log/log
 
-
-
+crypto bls signer new --save private.key --force
 
 if [ "$DOCKER" == false ]; then
-    make build
+    go build -o memcoin ./cli/memcoin
 else
     # Clean created containers and tmp dir
     if [[ $(docker ps -a -q --filter ancestor=node) ]]; then
@@ -97,7 +98,16 @@ tmux new-window -t $s
 window=$from
 
 if [ "$DOCKER" == false ]; then
-    tmux send-keys -t $s:$window "PROXY_LOG=info LLVL=info ./memcoin --config /tmp/node$from start --postinstall --promaddr :$((9099 + $from)) --proxyaddr :$((9079 + $from)) --proxykey $pk --listen tcp://0.0.0.0:$((2000 + $from)) --public //localhost:$((2000 + $from))| tee ./log/log/node$from.log" C-m
+    tmux send-keys -t $s:$window "PROXY_LOG=info LLVL=info ./memcoin \
+      --config /tmp/node$from \
+      start \
+      --postinstall \
+      --promaddr :$((9099 + $from)) \
+      --proxyaddr :$((9079 + $from)) \
+      --proxykey $pk \
+      --listen tcp://0.0.0.0:$((2000 + $from)) \
+      --routing tree \
+      --public //localhost:$((2000 + $from))| tee ./log/log/node$from.log" C-m
 else
     docker run -d -it --env LLVL=info --name node$from --network evoting-net -v "$(pwd)"/nodedata:/tmp  --publish $(( 9079+$from )):9080 node
     tmux send-keys -t $s:$window "docker exec node$from memcoin --config /tmp/node$from start --postinstall \