Several improvements for the local-setup

local-setup/README.md

@@ -8,15 +8,15 @@ In case you have
 - a sgx hardware and compile the worker with `SGX_MODE=HW` (default mode)
 - a valid intel IAS key (development key is fine)
 
-you can omit the `--features skip-ias-check` when building the node, but you must not use the subcommand flag `--skip-ra` in the json file (see [`simple-config.json`](simple-config.json)) you're using to start the worker.
+you can omit the `--features skip-ias-check` when building the node, but you must not use the subcommand flag `--skip-ra` in the json file (see [`two-workers.json`](./config/two-workers.json)) you're using to start the worker.
 
 ## Steps
-Adapt or create your own config file, as in the example of [`simple-config.json`](simple-config.json). Be mindful of the ports in case you're running the script on a server multiple people are working on.
+Adapt or create your own config file, as in the example of [`two-workers.json`](./config/two-workers.json). Be mindful of the ports in case you're running the script on a server multiple people are working on.
 
 ### Launch worker and node in terminal one
 You can launch the workers and the node with:
 ```bash
-./local-setup/launch.py ./local-setup/simple-config.json
+./local-setup/launch.py ./local-setup/config/two-workers.json
 ```
 wait a little until all workers have been launched. You can stop the worker and node simply by pressing `Ctrl + c`.
 

local-setup/benchmark-config.json → local-setup/config/benchmark.json

@@ -10,7 +10,9 @@
       "--port",
       "30330",
       "--rpc-port",
-      "8930"
+      "8930",
+      "--ws-external",
+      "--rpc-external"
     ]
   },
   "workers": [
@@ -27,7 +29,8 @@
         "-w",
         "2031",
         "-h",
-        "4530"
+        "4530",
+        "--ws-external"
       ],
       "subcommand_flags": [
         "--skip-ra",

local-setup/simple-config.json → local-setup/config/one-worker.json

@@ -6,11 +6,13 @@
       "--dev",
       "-lruntime=info",
       "--ws-port",
-      "9990",
+      "9944",
       "--port",
       "30390",
       "--rpc-port",
-      "8990"
+      "9933",
+      "--ws-external",
+      "--rpc-external"
     ]
   },
   "workers": [
@@ -19,41 +21,21 @@
       "flags": [
         "--clean-reset",
         "-P",
-        "2090",
+        "2000",
         "-p",
-        "9990",
+        "9944",
         "-r",
         "3490",
         "-w",
-        "2091",
+        "2001",
         "-h",
-        "4545"
+        "4545",
+        "--ws-external"
       ],
       "subcommand_flags": [
         "--skip-ra",
         "--dev"
       ]
-    },
-    {
-      "source": "bin",
-      "flags": [
-        "--clean-reset",
-        "-P",
-        "3090",
-        "-p",
-        "9990",
-        "-r",
-        "3590",
-        "-w",
-        "3091",
-        "-h",
-        "4546"
-      ],
-      "subcommand_flags": [
-        "--skip-ra",
-        "--dev",
-        "--request-state"
-      ]
     }
   ]
 }

local-setup/tutorial-config.json → local-setup/config/two-workers.json

@@ -10,7 +10,9 @@
       "--port",
       "30390",
       "--rpc-port",
-      "8990"
+      "9933",
+      "--ws-external",
+      "--rpc-external"
     ]
   },
   "workers": [
@@ -22,10 +24,13 @@
         "2000",
         "-p",
         "9944",
+        "-r",
+        "3490",
         "-w",
         "2001",
-        "-r",
-        "3443"
+        "-h",
+        "4545",
+        "--ws-external"
       ],
       "subcommand_flags": [
         "--skip-ra",
@@ -40,10 +45,13 @@
         "3000",
         "-p",
         "9944",
+        "-r",
+        "4490",
         "-w",
         "3001",
-        "-r",
-        "3444"
+        "-h",
+        "4546",
+        "--ws-external"
       ],
       "subcommand_flags": [
         "--skip-ra",

scripts/benchmark_local-setup.sh

@@ -9,7 +9,7 @@ popd
 
 ulimit -S -n 4096
 
-python3 local-setup/launch.py local-setup/benchmark-config.json &
+python3 local-setup/launch.py local-setup/config/benchmark.json &
 PID=$!
 echo $PID > ./benchmark.pid
 echo "Benchmark PID: $PID"