From 2d4a3c000a64d7be8618b60d3d3190a75cb4bc85 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Fri, 5 Nov 2021 16:48:01 +0100
Subject: [PATCH 01/28] Add semicolon (just so the branches will be different
 for PR)

---
 lukso-win.ps1 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index 730da05..3b6469e 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -898,7 +898,7 @@ switch ($command)
 
 if ($KeepShell)
 {
-    Write-Output "LUKSO clients are working do not close this shell"
+    Write-Output "LUKSO clients are working, do not close this shell"
 }
 
 while ($KeepShell)

From 1c606ae4a4b5e64c5c322a794cf81e4798ed69df Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 8 Nov 2021 15:22:56 +0100
Subject: [PATCH 02/28] Add lukso version to windows

---
 lukso-win.ps1 | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index 3b6469e..79379ff 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -53,7 +53,8 @@ param (
 
 $platform = "Windows"
 $architecture = "x86_64"
-$InstallDir = $Env:APPDATA + "\LUKSO";
+$InstallDir = $Env:APPDATA + "\LUKSO"
+$LuksoScriptVersion = "v1.7"
 $RunDate = Get-Date -Format "yyyy-m-dd__HH-mm-ss"
 
 # Parsing config File and setting defaults
@@ -882,6 +883,10 @@ switch ($command)
 #        logs $argument
     }
 
+    "version" {
+        Write-Output $LuksoScriptVersion
+    }
+
     "attach" {
         pandora attach ipc:\\.\pipe\geth.ipc
     }

From a6243119e030642471308e9956a8b8bb9ca9320d Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 8 Nov 2021 17:54:04 +0100
Subject: [PATCH 03/28] Add eth2stats to windows

---
 lukso-win.ps1 | 38 +++++++++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index 79379ff..d70317f 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -189,7 +189,7 @@ Function download_binary($client, $tag)
             $repo = "network-deposit-cli"
         }
 
-        eth2stats {
+        eth2stats-client {
             $repo = "network-vanguard-stats-client"
         }
     }
@@ -275,6 +275,10 @@ Function import_accounts() {
     powershell.exe -command $("$InstallDir\binaries\lukso-validator\$validator\lukso-validator-Windows-x86_64.exe $Arguments")
 }
 
+Function setup_config()
+{
+    ConvertTo-Yaml
+}
 
 Function check_validator_requirements()
 {
@@ -532,7 +536,31 @@ function start_validator() {
 
 }
 
-function start_eth2stats() {
+function start_eth2stats_client() {
+    if (!(Test-Path $logsdir\eth2stats))
+    {
+        New-Item -ItemType Directory -Force -Path $logsdir\eth2stats
+    }
+
+    Write-Output $runDate | Out-File -FilePath "$logsdir\eth2stats\current.tmp"
+
+    $Arguments = New-Object System.Collections.Generic.List[System.Object]
+
+    $Arguments.Add("--beacon.type=`"prysm`"")
+    $Arguments.Add("--beacon.addr=`"$ETH2STATS_BEACON_ADDR`"")
+    $Arguments.Add("--beacon.metrics-addr=`"$VAN_ETHSTATS_METRICS`"")
+    $Arguments.Add("--data.folder=$DATADIR\eth2stats-client")
+    $Arguments.Add("--eth2stats.node-name=`"$NODE_NAME`"")
+    $Arguments.Add("--eth2stats.addr=`"$VAN_ETHSTATS`"")
+    $Arguments.Add("--eth2stats.tls=`"false`"")
+
+
+
+    Start-Process -FilePath "eth2stats-client" `
+    -ArgumentList $Arguments `
+    -NoNewWindow `
+    -RedirectStandardOutput "$logsdir\eth2stats\eth2stats_$runDate.out" `
+    -RedirectStandardError "$logsdir\eth2stats\eth2stats_$runDate.err"
 
 }
 
@@ -693,6 +721,10 @@ function _reset($client) {
     }
 }
 
+Function _logs() {
+
+}
+
 function _help() {
     Write-Output "USAGE:"
     Write-Output "lukso <command> [argument] [--flags]"
@@ -836,7 +868,7 @@ if ($validator)
 
 if ($eth2stats)
 {
-    bind_binary eth2stats $eth2stats
+    bind_binary eth2stats-client $eth2stats
 }
 
 if ($deposit)

From c9c179dccf6abff172cf8ffb8718467f12d48c03 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 9 Nov 2021 09:39:39 +0100
Subject: [PATCH 04/28] Add pan-ethstats

---
 lukso-win.ps1 | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index d70317f..14fd40d 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -35,6 +35,7 @@ param (
     [Switch]${pandora-universal-profile-expose},
     [Switch]${pandora-unsafe-expose},
     [String]${pandora-verbosity},
+    [String]${pan-ethstats},
     [String]$vanguard,
     [String]${vanguard-bootnodes},
     [String]${vanguard-p2p-priv-key},
@@ -135,6 +136,7 @@ ${pandora-external-ip} = If (${pandora-external-ip}) {${pandora-external-ip}} El
 ${pandora-universal-profile-expose} = If (${pandora-universal-profile-expose}) {${pandora-universal-profile-expose}} ElseIf ($ConfigFile.PANDORA_UNIVERSAL_PROFILE_EXPOSE) {$ConfigFile.PANDORA_UNIVERSAL_PROFILE_EXPOSE} Else {$false}
 ${pandora-unsafe-expose} = If (${pandora-unsafe-expose}) {${pandora-unsafe-expose}} ElseIf ($ConfigFile.PANDORA_UNSAFE_EXPOSE) {$ConfigFile.PANDORA_UNSAFE_EXPOSE} Else {$false}
 ${pandora-verbosity} = If (${pandora-verbosity}) {${pandora-verbosity}} ElseIf ($ConfigFile.PANDORA_VERBOSITY) {$ConfigFile.PANDORA_VERBOSITY} Else {"info"}
+${pan-ethstats} = If (${pan-ethstats}) {${pan-ethstats}} ElseIf ($ConfigFile.PANDORA_ETHSTATS) {$ConfigFile.PANDORA_ETHSTATS} Else {"6Tcpc53R5V763Aur9LgD@stats.pandora.l15.lukso.network"}
 $vanguard = If ($vanguard) {$vanguard} ElseIf ($ConfigFile.VANGUARD) {$ConfigFile.VANGUARD} Else {""}
 ${vanguard-bootnodes} = If (${vanguard-bootnodes}) {${vanguard-bootnodes}} ElseIf ($ConfigFile.VANGUARD_BOOTNODES) {$ConfigFile.VANGUARD_BOOTNODES} Else {$NetworkConfig.VANGUARD_BOOTNODES}
 ${vanguard-p2p-priv-key} = If (${vanguard-p2p-priv-key}) {${vanguard-p2p-priv-key}} ElseIf ($ConfigFile.VANGUARD_P2P_PRIV_KEY) {$ConfigFile.VANGUARD_P2P_PRIV_KEY} Else {""}
@@ -549,8 +551,8 @@ function start_eth2stats_client() {
     $Arguments.Add("--beacon.type=`"prysm`"")
     $Arguments.Add("--beacon.addr=`"$ETH2STATS_BEACON_ADDR`"")
     $Arguments.Add("--beacon.metrics-addr=`"$VAN_ETHSTATS_METRICS`"")
-    $Arguments.Add("--data.folder=$DATADIR\eth2stats-client")
-    $Arguments.Add("--eth2stats.node-name=`"$NODE_NAME`"")
+    $Arguments.Add("--data.folder=$datadir\eth2stats-client")
+    $Arguments.Add("--eth2stats.node-name=`"$(${node-name})`"")
     $Arguments.Add("--eth2stats.addr=`"$VAN_ETHSTATS`"")
     $Arguments.Add("--eth2stats.tls=`"false`"")
 

From d7a4c0ba508916bf461c1178972ebbb5f5105099 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 9 Nov 2021 09:45:25 +0100
Subject: [PATCH 05/28] Add van-ethstats-metrics

---
 lukso-win.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index 14fd40d..e00a73e 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -44,6 +44,7 @@ param (
     [String]${vanguard-rpc-host},
     [String]${vanguard-monitoring-host},
     [String]${vanguard-verbosity},
+    [String]${van-ethstats-metrics},
     [String]$validator,
     [String]${validator-verbosity},
     [String]${cors-domain},
@@ -145,6 +146,7 @@ ${vanguard-p2p-host-dns} = If (${vanguard-p2p-host-dns}) {${vanguard-p2p-host-dn
 ${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf ($ConfigFile.VANGUARD_RPC_HOST) {$ConfigFile.VANGUARD_RPC_HOST} Else {""}
 ${vanguard-monitoring-host} = If (${vanguard-monitoring-host}) {${vanguard-monitoring-host}} ElseIf ($ConfigFile.VANGUARD_MONITORING_HOST) {$ConfigFile.VANGUARD_MONITORING_HOST} Else {""}
 ${vanguard-verbosity} = If (${vanguard-verbosity}) {${vanguard-verbosity}} ElseIf ($ConfigFile.VANGUARD_VERBOSITY) {$ConfigFile.VANGUARD_VERBOSITY} Else {"info"}
+${van-ethstats-metrics} = If (${van-ethstats-metrics}) {${van-ethstats-metrics}} ElseIf ($ConfigFile.VANGUARD_ETHSTATS_METRICS) {$ConfigFile.VANGUARD_ETHSTATS_METRICS} Else {"http://127.0.0.1:8080/metrics"}
 $validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
 ${cors-domain} = If (${cors-domain}) {${cors-domain}} ElseIf ($ConfigFile.CORS_DOMAIN) {$ConfigFile.CORS_DOMAIN} Else {""}
@@ -550,7 +552,7 @@ function start_eth2stats_client() {
 
     $Arguments.Add("--beacon.type=`"prysm`"")
     $Arguments.Add("--beacon.addr=`"$ETH2STATS_BEACON_ADDR`"")
-    $Arguments.Add("--beacon.metrics-addr=`"$VAN_ETHSTATS_METRICS`"")
+    $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})"")
     $Arguments.Add("--data.folder=$datadir\eth2stats-client")
     $Arguments.Add("--eth2stats.node-name=`"$(${node-name})`"")
     $Arguments.Add("--eth2stats.addr=`"$VAN_ETHSTATS`"")

From 6801ea6f6c8ed900c251ae37a0946c7513540e09 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 9 Nov 2021 10:54:26 +0100
Subject: [PATCH 06/28] Added) van-rpc-port van-udp-port van-tcp-port
 van-grpc-gateway-port

---
 lukso-win.ps1 | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/lukso-win.ps1 b/lukso-win.ps1
index e00a73e..b7bc1b7 100755
--- a/lukso-win.ps1
+++ b/lukso-win.ps1
@@ -45,6 +45,10 @@ param (
     [String]${vanguard-monitoring-host},
     [String]${vanguard-verbosity},
     [String]${van-ethstats-metrics},
+    [String]${van-rpc-port},
+    [String]${van-udp-port},
+    [String]${van-tcp-port},
+    [String]${van-grpc-gateway-port},
     [String]$validator,
     [String]${validator-verbosity},
     [String]${cors-domain},
@@ -147,6 +151,10 @@ ${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf (
 ${vanguard-monitoring-host} = If (${vanguard-monitoring-host}) {${vanguard-monitoring-host}} ElseIf ($ConfigFile.VANGUARD_MONITORING_HOST) {$ConfigFile.VANGUARD_MONITORING_HOST} Else {""}
 ${vanguard-verbosity} = If (${vanguard-verbosity}) {${vanguard-verbosity}} ElseIf ($ConfigFile.VANGUARD_VERBOSITY) {$ConfigFile.VANGUARD_VERBOSITY} Else {"info"}
 ${van-ethstats-metrics} = If (${van-ethstats-metrics}) {${van-ethstats-metrics}} ElseIf ($ConfigFile.VANGUARD_ETHSTATS_METRICS) {$ConfigFile.VANGUARD_ETHSTATS_METRICS} Else {"http://127.0.0.1:8080/metrics"}
+${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VANGUARD_RPC_PORT) {$ConfigFile.VANGUARD_RPC_PORT} Else {"4000"}
+${van-udp-port} = If (${van-udp-port}) {${van-udp-port}} ElseIf ($ConfigFile.VANGUARD_UDP_PORT) {$ConfigFile.VANGUARD_UDP_PORT} Else {"12000"}
+${van-tcp-port} = If (${van-tcp-port}) {${van-tcp-port}} ElseIf ($ConfigFile.VANGUARD_TCP_PORT) {$ConfigFile.VANGUARD_TCP_PORT} Else {"13000"}
+${van-grpc-gateway-port} = If (${van-grpc-gateway-port}) {${van-grpc-gateway-port}} ElseIf ($ConfigFile.VANGUARD_GRPC_GATEWAY_PORT) {$ConfigFile.VANGUARD_GRPC_GATEWAY_PORT} Else {"3500"}
 $validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
 ${cors-domain} = If (${cors-domain}) {${cors-domain}} ElseIf ($ConfigFile.CORS_DOMAIN) {$ConfigFile.CORS_DOMAIN} Else {""}
@@ -474,10 +482,10 @@ function start_vanguard() {
     $Arguments.Add("--min-sync-peers=2")
     $Arguments.Add("--p2p-max-peers=50")
     $Arguments.Add("--orc-http-provider=http://127.0.0.1:7877")
-    $Arguments.Add("--rpc-port=4000")
-    $Arguments.Add("--p2p-udp-port=12000")
-    $Arguments.Add("--p2p-tcp-port=13000")
-    $Arguments.Add("--grpc-gateway-port=3500")
+    $Arguments.Add("--rpc-port=$(${van-rpc-port})")
+    $Arguments.Add("--p2p-udp-port=$(${van-udp-port})")
+    $Arguments.Add("--p2p-tcp-port=$(${van-tcp-port})")
+    $Arguments.Add("--grpc-gateway-port=$(${van-grpc-gateway-port})")
     $Arguments.Add("--update-head-timely")
     $Arguments.Add("--lukso-network")
 
@@ -552,7 +560,7 @@ function start_eth2stats_client() {
 
     $Arguments.Add("--beacon.type=`"prysm`"")
     $Arguments.Add("--beacon.addr=`"$ETH2STATS_BEACON_ADDR`"")
-    $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})"")
+    $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})`"")
     $Arguments.Add("--data.folder=$datadir\eth2stats-client")
     $Arguments.Add("--eth2stats.node-name=`"$(${node-name})`"")
     $Arguments.Add("--eth2stats.addr=`"$VAN_ETHSTATS`"")

From 4bc74563c63c3a29e62da287a715d8781e3c19a1 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 11:16:26 +0100
Subject: [PATCH 07/28] Move files to different directory

---
 install-unix.sh => shell_scripts/install-unix.sh | 0
 install-win.ps1 => shell_scripts/install-win.ps1 | 0
 lukso => shell_scripts/lukso                     | 0
 lukso-win.ps1 => shell_scripts/lukso-win.ps1     | 0
 4 files changed, 0 insertions(+), 0 deletions(-)
 rename install-unix.sh => shell_scripts/install-unix.sh (100%)
 rename install-win.ps1 => shell_scripts/install-win.ps1 (100%)
 rename lukso => shell_scripts/lukso (100%)
 rename lukso-win.ps1 => shell_scripts/lukso-win.ps1 (100%)

diff --git a/install-unix.sh b/shell_scripts/install-unix.sh
similarity index 100%
rename from install-unix.sh
rename to shell_scripts/install-unix.sh
diff --git a/install-win.ps1 b/shell_scripts/install-win.ps1
similarity index 100%
rename from install-win.ps1
rename to shell_scripts/install-win.ps1
diff --git a/lukso b/shell_scripts/lukso
similarity index 100%
rename from lukso
rename to shell_scripts/lukso
diff --git a/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
similarity index 100%
rename from lukso-win.ps1
rename to shell_scripts/lukso-win.ps1

From 872c21890e8d65ff4dcda85a0bbb7890514fb731 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 13:30:18 +0100
Subject: [PATCH 08/28] Added flags: van-ethstats pan-http-addr pan-http-port
 pan-http-miner-addr pan-ws-addr pan-ws-port pan-ws-miner-addr

---
 shell_scripts/lukso-win.ps1 | 38 +++++++++++++++++++++++++++----------
 1 file changed, 28 insertions(+), 10 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index b7bc1b7..1982e1c 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -27,7 +27,7 @@ param (
     [String]${orchestrator-verbosity},
     [String]$pandora,
     [String]${pandora-bootnodes},
-    [String]${pandora-http-port},
+#    [String]${pandora-http-port},
     [Switch]${pandora-metrics},
     [String]${pandora-nodekey},
     [String]${pandora-rpcvhosts},
@@ -35,6 +35,11 @@ param (
     [Switch]${pandora-universal-profile-expose},
     [Switch]${pandora-unsafe-expose},
     [String]${pandora-verbosity},
+    [String]${pan-http-addr},
+    [String]${pan-http-port},
+    [String]${pan-http-miner-addr},
+    [String]${pan-ws-addr},
+    [String]${pan-ws-miner-addr},
     [String]${pan-ethstats},
     [String]$vanguard,
     [String]${vanguard-bootnodes},
@@ -49,6 +54,7 @@ param (
     [String]${van-udp-port},
     [String]${van-tcp-port},
     [String]${van-grpc-gateway-port},
+    [String]${van-ethstats},
     [String]$validator,
     [String]${validator-verbosity},
     [String]${cors-domain},
@@ -133,7 +139,6 @@ $orchestrator = If ($orchestrator) {$orchestrator} ElseIf ($ConfigFile.ORCHESTRA
 ${orchestrator-verbosity} = If (${orchestrator-verbosity}) {${orchestrator-verbosity}} ElseIf ($ConfigFile.ORCHESTRATOR_VERBOSITY) {$ConfigFile.ORCHESTRATOR_VERBOSITY} Else {"info"}
 $pandora = If ($pandora) {$pandora} ElseIf ($ConfigFile.PANDORA) {$ConfigFile.PANDORA} Else {""}
 ${pandora-bootnodes} = If (${pandora-bootnodes}) {${pandora-bootnodes}} ElseIf ($ConfigFile.PANDORA_BOOTNODES) {$ConfigFile.PANDORA_BOOTNODES} Else {$NetworkConfig.PANDORA_BOOTNODES}
-${pandora-http-port} = If (${pandora-http-port}) {${pandora-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
 ${pandora-metrics} = If (${pandora-metrics}) {${pandora-metrics}} ElseIf ($ConfigFile.PANDORA_METRICS) {$ConfigFile.PANDORA_METRICS} Else {$false}
 ${pandora-nodekey} = If (${pandora-nodekey}) {${pandora-nodekey}} ElseIf ($ConfigFile.PANDORA_NODEKEY) {$ConfigFile.PANDORA_NODEKEY} Else {""}
 ${pandora-rpcvhosts} = If (${pandora-rpcvhosts}) {${pandora-rpcvhosts}} ElseIf ($ConfigFile.PANDORA_RPCVHOSTS) {$ConfigFile.PANDORA_RPCVHOSTS} Else {""}
@@ -141,6 +146,13 @@ ${pandora-external-ip} = If (${pandora-external-ip}) {${pandora-external-ip}} El
 ${pandora-universal-profile-expose} = If (${pandora-universal-profile-expose}) {${pandora-universal-profile-expose}} ElseIf ($ConfigFile.PANDORA_UNIVERSAL_PROFILE_EXPOSE) {$ConfigFile.PANDORA_UNIVERSAL_PROFILE_EXPOSE} Else {$false}
 ${pandora-unsafe-expose} = If (${pandora-unsafe-expose}) {${pandora-unsafe-expose}} ElseIf ($ConfigFile.PANDORA_UNSAFE_EXPOSE) {$ConfigFile.PANDORA_UNSAFE_EXPOSE} Else {$false}
 ${pandora-verbosity} = If (${pandora-verbosity}) {${pandora-verbosity}} ElseIf ($ConfigFile.PANDORA_VERBOSITY) {$ConfigFile.PANDORA_VERBOSITY} Else {"info"}
+#${pandora-http-port} = If (${pandora-http-port}) {${pandora-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
+${pan-http-addr} = If (${pan-http-addr}) {${pan-http-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_ADDR) {$ConfigFile.PANDORA_HTTP_ADDR} Else {"127.0.0.1"}
+${pan-http-port} = If (${pan-http-port}) {${pan-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
+${pan-http-miner-addr} = If (${pan-http-miner-addr}) {${pan-http-miner-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_MINER_ADDR) {$ConfigFile.PANDORA_HTTP_MINER_ADDR} Else {"ws://127.0.0.1:7877"}
+${pan-ws-addr} = If (${pan-ws-addr}) {${pan-ws-addr}} ElseIf ($ConfigFile.PANDORA_WS_ADDR) {$ConfigFile.PANDORA_WS_ADDR} Else {"127.0.0.1"}
+${pan-ws-port} = If (${pan-ws-port}) {${pan-ws-port}} ElseIf ($ConfigFile.PANDORA_WS_PORT) {$ConfigFile.PANDORA_WS_PORT} Else {"8546"}
+${pan-ws-miner-addr} = If (${pan-ws-miner-addr}) {${pan-ws-miner-addr}} ElseIf ($ConfigFile.PANDORA_WS_MINER_ADDR) {$ConfigFile.PANDORA_WS_MINER_ADDR} Else {"ws://127.0.0.1:7878"}
 ${pan-ethstats} = If (${pan-ethstats}) {${pan-ethstats}} ElseIf ($ConfigFile.PANDORA_ETHSTATS) {$ConfigFile.PANDORA_ETHSTATS} Else {"6Tcpc53R5V763Aur9LgD@stats.pandora.l15.lukso.network"}
 $vanguard = If ($vanguard) {$vanguard} ElseIf ($ConfigFile.VANGUARD) {$ConfigFile.VANGUARD} Else {""}
 ${vanguard-bootnodes} = If (${vanguard-bootnodes}) {${vanguard-bootnodes}} ElseIf ($ConfigFile.VANGUARD_BOOTNODES) {$ConfigFile.VANGUARD_BOOTNODES} Else {$NetworkConfig.VANGUARD_BOOTNODES}
@@ -155,6 +167,7 @@ ${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VAN
 ${van-udp-port} = If (${van-udp-port}) {${van-udp-port}} ElseIf ($ConfigFile.VANGUARD_UDP_PORT) {$ConfigFile.VANGUARD_UDP_PORT} Else {"12000"}
 ${van-tcp-port} = If (${van-tcp-port}) {${van-tcp-port}} ElseIf ($ConfigFile.VANGUARD_TCP_PORT) {$ConfigFile.VANGUARD_TCP_PORT} Else {"13000"}
 ${van-grpc-gateway-port} = If (${van-grpc-gateway-port}) {${van-grpc-gateway-port}} ElseIf ($ConfigFile.VANGUARD_GRPC_GATEWAY_PORT) {$ConfigFile.VANGUARD_GRPC_GATEWAY_PORT} Else {"3500"}
+${van-ethstats} = If (${van-ethstats}) {${van-ethstats}} ElseIf ($ConfigFile.VAN_ETHSTATS) {$ConfigFile.VAN_ETHSTATS} Else {"34.141.156.125:9090"}
 $validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
 ${cors-domain} = If (${cors-domain}) {${cors-domain}} ElseIf ($ConfigFile.CORS_DOMAIN) {$ConfigFile.CORS_DOMAIN} Else {""}
@@ -415,21 +428,26 @@ function start_pandora()
     }
     $Arguments.Add("--port=30405")
     $Arguments.Add("--http")
-    $Arguments.Add("--http.addr=0.0.0.0")
-    $Arguments.Add("--http.port=${pandora-http-port}")
+    $Arguments.Add("--http.addr=$(${pan-http-addr})")
+    $Arguments.Add("--http.port=$(${pan-http-port})")
     $Arguments.Add("--http.api=admin,net,eth,debug,miner,personal,txpool,web3")
     $Arguments.Add("--http.corsdomain=*")
-    $Arguments.Add("--bootnodes=${pandora-bootnodes}")
+    $Arguments.Add("--bootnodes=$(${pandora-bootnodes})")
     $Arguments.Add("--ws")
-    $Arguments.Add("--ws.port=8546")
+    $Arguments.Add("--ws.addr=$(${pan-ws-addr})")
+    $Arguments.Add("--ws.port=$(${pan-ws-port})")
     $Arguments.Add("--ws.api=admin,net,eth,debug,miner,personal,txpool,web3")
     $Arguments.Add("--ws.origins=*")
-    $Arguments.Add("--mine")
-    $Arguments.Add("--miner.notify=ws://127.0.0.1:7878,http://127.0.0.1:7877")
-    $Arguments.Add("--miner.etherbase=$coinbase")
+    $Arguments.Add("--miner.notify=$(${pan-ws-miner-addr}),$(${pan-http-miner-addr})")
     $Arguments.Add("--syncmode=full")
     $Arguments.Add("--allow-insecure-unlock")
     $Arguments.Add("--verbosity=${pandora-verbosity}")
+
+    if ($coinbase) {
+        $Arguments.Add("--mine")
+        $Arguments.Add("--miner.etherbase=$coinbase")
+    }
+
     if (${pandora-external-ip}) {
         $Arguments.Add("--nat=extip:${pandora-external-ip}")
     }
@@ -563,7 +581,7 @@ function start_eth2stats_client() {
     $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})`"")
     $Arguments.Add("--data.folder=$datadir\eth2stats-client")
     $Arguments.Add("--eth2stats.node-name=`"$(${node-name})`"")
-    $Arguments.Add("--eth2stats.addr=`"$VAN_ETHSTATS`"")
+    $Arguments.Add("--eth2stats.addr=`"$(${van-ethstats})`"")
     $Arguments.Add("--eth2stats.tls=`"false`"")
 
 

From 372740e12409b430ffc2b287d04e71ae2b4ef05a Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 14:07:05 +0100
Subject: [PATCH 09/28] Added: --pan-port --orc-http-address --orc-http-port
 --orc-ws-address --orc-ws-port --van-min-sync-peers --van-max-p2p-peers

---
 shell_scripts/lukso-win.ps1 | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 1982e1c..9733bee 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -24,6 +24,10 @@ param (
     [String]${node-name},
     [Switch]$validate,
     [String]$orchestrator,
+    [String]${orc-http-address},
+    [String]${orc-http-port},
+    [String]${orc-ws-address},
+    [String]${orc-ws-port},
     [String]${orchestrator-verbosity},
     [String]$pandora,
     [String]${pandora-bootnodes},
@@ -35,6 +39,7 @@ param (
     [Switch]${pandora-universal-profile-expose},
     [Switch]${pandora-unsafe-expose},
     [String]${pandora-verbosity},
+    [String]${pan-port},
     [String]${pan-http-addr},
     [String]${pan-http-port},
     [String]${pan-http-miner-addr},
@@ -54,6 +59,8 @@ param (
     [String]${van-udp-port},
     [String]${van-tcp-port},
     [String]${van-grpc-gateway-port},
+    [String]${van-min-sync-peers},
+    [String]${van-max-p2p-peers},
     [String]${van-ethstats},
     [String]$validator,
     [String]${validator-verbosity},
@@ -136,6 +143,10 @@ $coinbase = If ($coinbase) {$coinbase} ElseIf ($ConfigFile.COINBASE) {$ConfigFil
 ${node-name} = If (${node-name}) {${node-name}} ElseIf ($ConfigFile.NODE_NAME) {$ConfigFile.NODE_NAME} Else {""}
 $validate = If ($validate) {$validate} ElseIf ($ConfigFile.VALIDATE) {$ConfigFile.VALIDATE} Else {$false}
 $orchestrator = If ($orchestrator) {$orchestrator} ElseIf ($ConfigFile.ORCHESTRATOR) {$ConfigFile.ORCHESTRATOR} Else {""}
+${orc-http-address} = If (${orc-http-address}) {${orc-http-address}} ElseIf ($ConfigFile.ORC_HTTP_ADDR) {$ConfigFile.ORC_HTTP_ADDR} Else {"127.0.0.1"}
+${orc-http-port} = If (${orc-http-port}) {${orc-http-port}} ElseIf ($ConfigFile.ORC_HTTP_PORT) {$ConfigFile.ORC_HTTP_PORT} Else {"7877"}
+${orc-ws-address} = If (${orc-ws-address}) {${orc-ws-address}} ElseIf ($ConfigFile.ORC_WS_ADDR) {$ConfigFile.ORC_WS_ADDR} Else {"127.0.0.1"}
+${orc-ws-port} = If (${orc-ws-port}) {${orc-ws-port}} ElseIf ($ConfigFile.ORC_WS_PORT) {$ConfigFile.ORC_WS_PORT} Else {"7878"}
 ${orchestrator-verbosity} = If (${orchestrator-verbosity}) {${orchestrator-verbosity}} ElseIf ($ConfigFile.ORCHESTRATOR_VERBOSITY) {$ConfigFile.ORCHESTRATOR_VERBOSITY} Else {"info"}
 $pandora = If ($pandora) {$pandora} ElseIf ($ConfigFile.PANDORA) {$ConfigFile.PANDORA} Else {""}
 ${pandora-bootnodes} = If (${pandora-bootnodes}) {${pandora-bootnodes}} ElseIf ($ConfigFile.PANDORA_BOOTNODES) {$ConfigFile.PANDORA_BOOTNODES} Else {$NetworkConfig.PANDORA_BOOTNODES}
@@ -147,6 +158,7 @@ ${pandora-universal-profile-expose} = If (${pandora-universal-profile-expose}) {
 ${pandora-unsafe-expose} = If (${pandora-unsafe-expose}) {${pandora-unsafe-expose}} ElseIf ($ConfigFile.PANDORA_UNSAFE_EXPOSE) {$ConfigFile.PANDORA_UNSAFE_EXPOSE} Else {$false}
 ${pandora-verbosity} = If (${pandora-verbosity}) {${pandora-verbosity}} ElseIf ($ConfigFile.PANDORA_VERBOSITY) {$ConfigFile.PANDORA_VERBOSITY} Else {"info"}
 #${pandora-http-port} = If (${pandora-http-port}) {${pandora-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
+${pan-port} = If (${pan-port}) {${pan-port}} ElseIf ($ConfigFile.PANDORA_PORT) {$ConfigFile.PANDORA_PORT} Else {"30405"}
 ${pan-http-addr} = If (${pan-http-addr}) {${pan-http-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_ADDR) {$ConfigFile.PANDORA_HTTP_ADDR} Else {"127.0.0.1"}
 ${pan-http-port} = If (${pan-http-port}) {${pan-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
 ${pan-http-miner-addr} = If (${pan-http-miner-addr}) {${pan-http-miner-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_MINER_ADDR) {$ConfigFile.PANDORA_HTTP_MINER_ADDR} Else {"ws://127.0.0.1:7877"}
@@ -167,6 +179,8 @@ ${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VAN
 ${van-udp-port} = If (${van-udp-port}) {${van-udp-port}} ElseIf ($ConfigFile.VANGUARD_UDP_PORT) {$ConfigFile.VANGUARD_UDP_PORT} Else {"12000"}
 ${van-tcp-port} = If (${van-tcp-port}) {${van-tcp-port}} ElseIf ($ConfigFile.VANGUARD_TCP_PORT) {$ConfigFile.VANGUARD_TCP_PORT} Else {"13000"}
 ${van-grpc-gateway-port} = If (${van-grpc-gateway-port}) {${van-grpc-gateway-port}} ElseIf ($ConfigFile.VANGUARD_GRPC_GATEWAY_PORT) {$ConfigFile.VANGUARD_GRPC_GATEWAY_PORT} Else {"3500"}
+${van-min-sync-peers} = If (${van-min-sync-peers}) {${van-min-sync-peers}} ElseIf ($ConfigFile.VANGUARD_MIN_SYNC_PEERS) {$ConfigFile.VANGUARD_MIN_SYNC_PEERS} Else {"2"}
+${van-max-p2p-peers} = If (${van-max-p2p-peers}) {${van-max-p2p-peers}} ElseIf ($ConfigFile.VANGUARD_MAX_P2P_PEERS) {$ConfigFile.VANGUARD_MAX_P2P_PEERS} Else {"50"}
 ${van-ethstats} = If (${van-ethstats}) {${van-ethstats}} ElseIf ($ConfigFile.VAN_ETHSTATS) {$ConfigFile.VAN_ETHSTATS} Else {"34.141.156.125:9090"}
 $validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
@@ -352,11 +366,11 @@ Function start_orchestrator()
     "--datadir=$datadir\orchestrator"
     "--vanguard-grpc-endpoint=127.0.0.1:4000"
     "--http"
-    "--http.addr=0.0.0.0"
-    "--http.port=7877"
+    "--http.addr=$(${orc-http-address})"
+    "--http.port=$(${orc-http-port})"
     "--ws"
-    "--ws.addr=0.0.0.0"
-    "--ws.port=7878"
+    "--ws.addr=$(${orc-ws-address})"
+    "--ws.port=$(${orc-ws-port})"
     "--pandora-rpc-endpoint=ws://127.0.0.1:8546"
     "--verbosity=trace"
     )
@@ -426,7 +440,7 @@ function start_pandora()
     if (${pan-ethstats}) {
         $Arguments.Add("--ethstats=$(${node-name}):@$(${pan-ethstats})")
     }
-    $Arguments.Add("--port=30405")
+    $Arguments.Add("--port=$(${pan-port})")
     $Arguments.Add("--http")
     $Arguments.Add("--http.addr=$(${pan-http-addr})")
     $Arguments.Add("--http.port=$(${pan-http-port})")
@@ -497,8 +511,8 @@ function start_vanguard() {
     $Arguments.Add("--rpc-host=0.0.0.0")
     $Arguments.Add("--monitoring-host=0.0.0.0")
     $Arguments.Add("--verbosity=${vanguard-verbosity}")
-    $Arguments.Add("--min-sync-peers=2")
-    $Arguments.Add("--p2p-max-peers=50")
+    $Arguments.Add("--min-sync-peers=$(${van-min-sync-peers})")
+    $Arguments.Add("--p2p-max-peers=$(${van-max-p2p-peers})")
     $Arguments.Add("--orc-http-provider=http://127.0.0.1:7877")
     $Arguments.Add("--rpc-port=$(${van-rpc-port})")
     $Arguments.Add("--p2p-udp-port=$(${van-udp-port})")

From 6554b34fb1d5442da52c0783d5cdf0c82c1e75d1 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 14:16:38 +0100
Subject: [PATCH 10/28] Add --orchestrator-pandora-rpc-endpoint
 --orchestrator-vanguard-rpc-endpoint

---
 shell_scripts/lukso-win.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 9733bee..45ec57b 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -28,6 +28,8 @@ param (
     [String]${orc-http-port},
     [String]${orc-ws-address},
     [String]${orc-ws-port},
+    [String]${orchestrator-pandora-rpc-endpoint},
+    [String]${orchestrator-vanguard-rpc-endpoint},
     [String]${orchestrator-verbosity},
     [String]$pandora,
     [String]${pandora-bootnodes},
@@ -147,6 +149,8 @@ ${orc-http-address} = If (${orc-http-address}) {${orc-http-address}} ElseIf ($Co
 ${orc-http-port} = If (${orc-http-port}) {${orc-http-port}} ElseIf ($ConfigFile.ORC_HTTP_PORT) {$ConfigFile.ORC_HTTP_PORT} Else {"7877"}
 ${orc-ws-address} = If (${orc-ws-address}) {${orc-ws-address}} ElseIf ($ConfigFile.ORC_WS_ADDR) {$ConfigFile.ORC_WS_ADDR} Else {"127.0.0.1"}
 ${orc-ws-port} = If (${orc-ws-port}) {${orc-ws-port}} ElseIf ($ConfigFile.ORC_WS_PORT) {$ConfigFile.ORC_WS_PORT} Else {"7878"}
+${orchestrator-pandora-rpc-endpoint} = If (${orchestrator-pandora-rpc-endpoint}) {${orchestrator-pandora-rpc-endpoint}} ElseIf ($ConfigFile.ORCHESTRATOR_PANDORA_RPC_ENDPOINT) {$ConfigFile.ORCHESTRATOR_PANDORA_RPC_ENDPOINT} Else {"ws://127.0.0.1:8546"}
+${orchestrator-vanguard-rpc-endpoint} = If (${orchestrator-vanguard-rpc-endpoint}) {${orchestrator-vanguard-rpc-endpoint}} ElseIf ($ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT) {$ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT} Else {"127.0.0.1:4000"}
 ${orchestrator-verbosity} = If (${orchestrator-verbosity}) {${orchestrator-verbosity}} ElseIf ($ConfigFile.ORCHESTRATOR_VERBOSITY) {$ConfigFile.ORCHESTRATOR_VERBOSITY} Else {"info"}
 $pandora = If ($pandora) {$pandora} ElseIf ($ConfigFile.PANDORA) {$ConfigFile.PANDORA} Else {""}
 ${pandora-bootnodes} = If (${pandora-bootnodes}) {${pandora-bootnodes}} ElseIf ($ConfigFile.PANDORA_BOOTNODES) {$ConfigFile.PANDORA_BOOTNODES} Else {$NetworkConfig.PANDORA_BOOTNODES}
@@ -364,14 +368,14 @@ Function start_orchestrator()
 
     $arguments = @(
     "--datadir=$datadir\orchestrator"
-    "--vanguard-grpc-endpoint=127.0.0.1:4000"
+    "--vanguard-grpc-endpoint=$(${orchestrator-vanguard-rpc-endpoint})"
     "--http"
     "--http.addr=$(${orc-http-address})"
     "--http.port=$(${orc-http-port})"
     "--ws"
     "--ws.addr=$(${orc-ws-address})"
     "--ws.port=$(${orc-ws-port})"
-    "--pandora-rpc-endpoint=ws://127.0.0.1:8546"
+    "--pandora-rpc-endpoint=$(${orchestrator-pandora-rpc-endpoint})"
     "--verbosity=trace"
     )
 

From c05f87548989edd6cdedb59c5cfa824ff9396de3 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 14:23:01 +0100
Subject: [PATCH 11/28] Add --vanguard-http-web3-provider
 --vanguard-orc-rpc-provider

---
 shell_scripts/lukso-win.ps1 | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 45ec57b..406bfcf 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -54,6 +54,8 @@ param (
     [String]${vanguard-external-ip},
     [String]${vanguard-p2p-host-dns},
     [String]${vanguard-rpc-host},
+    [String]${vanguard-http-web3provider},
+    [String]${vanguard-orc-rpc-provider},
     [String]${vanguard-monitoring-host},
     [String]${vanguard-verbosity},
     [String]${van-ethstats-metrics},
@@ -177,6 +179,8 @@ ${vanguard-external-ip} = If (${vanguard-external-ip}) {${vanguard-external-ip}}
 ${vanguard-p2p-host-dns} = If (${vanguard-p2p-host-dns}) {${vanguard-p2p-host-dns}} ElseIf ($ConfigFile.VANGUARD_P2P_HOST_DNS) {$ConfigFile.VANGUARD_P2P_HOST_DNS} Else {""}
 ${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf ($ConfigFile.VANGUARD_RPC_HOST) {$ConfigFile.VANGUARD_RPC_HOST} Else {""}
 ${vanguard-monitoring-host} = If (${vanguard-monitoring-host}) {${vanguard-monitoring-host}} ElseIf ($ConfigFile.VANGUARD_MONITORING_HOST) {$ConfigFile.VANGUARD_MONITORING_HOST} Else {""}
+${vanguard-http-web3provider} = If (${vanguard-http-web3provider}) {${vanguard-http-web3provider}} ElseIf ($ConfigFile.VANGUARD_HTTP_WEB3PROVIDER) {$ConfigFile.VANGUARD_HTTP_WEB3PROVIDER} Else {"http://127.0.0.1:8545"}
+${vanguard-orc-rpc-provider} = If (${vanguard-orc-rpc-provider}) {${vanguard-orc-rpc-provider}} ElseIf ($ConfigFile.VANGUARD_ORC_RPC_PROVIDER) {$ConfigFile.VANGUARD_ORC_RPC_PROVIDER} Else {"http://127.0.0.1:7877"}
 ${vanguard-verbosity} = If (${vanguard-verbosity}) {${vanguard-verbosity}} ElseIf ($ConfigFile.VANGUARD_VERBOSITY) {$ConfigFile.VANGUARD_VERBOSITY} Else {"info"}
 ${van-ethstats-metrics} = If (${van-ethstats-metrics}) {${van-ethstats-metrics}} ElseIf ($ConfigFile.VANGUARD_ETHSTATS_METRICS) {$ConfigFile.VANGUARD_ETHSTATS_METRICS} Else {"http://127.0.0.1:8080/metrics"}
 ${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VANGUARD_RPC_PORT) {$ConfigFile.VANGUARD_RPC_PORT} Else {"4000"}
@@ -509,7 +513,7 @@ function start_vanguard() {
     foreach ($Bootnode in $BootnodesArray) {
         $Arguments.Add("--bootstrap-node=$Bootnode")
     }
-    $Arguments.Add("--http-web3provider=http://127.0.0.1:${pandora-http-port}")
+    $Arguments.Add("--http-web3provider=$(${vanguard-http-web3provider})")
     $Arguments.Add("--deposit-contract=0x000000000000000000000000000000000000cafe")
     $Arguments.Add("--contract-deployment-block=0")
     $Arguments.Add("--rpc-host=0.0.0.0")
@@ -517,7 +521,7 @@ function start_vanguard() {
     $Arguments.Add("--verbosity=${vanguard-verbosity}")
     $Arguments.Add("--min-sync-peers=$(${van-min-sync-peers})")
     $Arguments.Add("--p2p-max-peers=$(${van-max-p2p-peers})")
-    $Arguments.Add("--orc-http-provider=http://127.0.0.1:7877")
+    $Arguments.Add("--orc-http-provider=$(${vanguard-orc-rpc-provider})")
     $Arguments.Add("--rpc-port=$(${van-rpc-port})")
     $Arguments.Add("--p2p-udp-port=$(${van-udp-port})")
     $Arguments.Add("--p2p-tcp-port=$(${van-tcp-port})")

From 4e8893fa1f3f2b9197a1ca631b39b593c906e409 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 14:36:13 +0100
Subject: [PATCH 12/28] Add eth2stats-beacon-addr

---
 shell_scripts/lukso-win.ps1 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 406bfcf..4bbf63c 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -8,6 +8,7 @@ param (
     [Parameter(Position = 1)][String]$argument,
     [String]$deposit,
     [String]$eth2stats,
+    [String]${eth2stats-beacon-addr},
     [String]$network,
     [String]${lukso-home},
     [String]$datadir,
@@ -135,6 +136,7 @@ If ($network) {
 
 $deposit = If ($deposit) {$deposit} ElseIf ($ConfigFile.DEPOSIT) {$ConfigFile.DEPOSIT} Else {"v1.2.6-LUKSO"}
 $eth2stats = If ($eth2stats) {$eth2stats} ElseIf ($ConfigFile.ETH2STATS) {$ConfigFile.ETH2STATS} Else {""}
+${eth2stats-beacon-addr} = If (${eth2stats-beacon-addr}) {${eth2stats-beacon-addr}} ElseIf ($ConfigFile.ETH2STATS_BEACON_ADDR) {$ConfigFile.ETH2STATS_BEACON_ADDR} Else {"127.0.0.1:4000"}
 ${lukso-home} = If (${lukso-home}) {${lukso-home}} ElseIf ($ConfigFile.LUKSO_HOME) {$ConfigFile.LUKSO_HOME} Else {"$HOME\.lukso"}
 $datadir = If ($datadir) {$datadir} ElseIf ($ConfigFile.DATADIR) {$ConfigFile.DATADIR} Else {"${lukso-home}\$network\datadir"}
 $logsdir = If ($logsdir) {$logsdir} ElseIf ($ConfigFile.LOGSDIR) {$ConfigFile.LOGSDIR} Else {"${lukso-home}\$network\logs"}
@@ -599,7 +601,7 @@ function start_eth2stats_client() {
     $Arguments = New-Object System.Collections.Generic.List[System.Object]
 
     $Arguments.Add("--beacon.type=`"prysm`"")
-    $Arguments.Add("--beacon.addr=`"$ETH2STATS_BEACON_ADDR`"")
+    $Arguments.Add("--beacon.addr=`"$(${eth2stats-beacon-addr})`"")
     $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})`"")
     $Arguments.Add("--data.folder=$datadir\eth2stats-client")
     $Arguments.Add("--eth2stats.node-name=`"$(${node-name})`"")

From 59ec3c653d66c10bf1baec0ae09a91da37d3418c Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 10 Nov 2021 16:13:14 +0100
Subject: [PATCH 13/28] Add --validator-pandora-http-provider
 --validator-beacon-rpc-provider

---
 shell_scripts/lukso-win.ps1 | 24 +++++++++++++++++-------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 4bbf63c..44591f4 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -68,6 +68,8 @@ param (
     [String]${van-max-p2p-peers},
     [String]${van-ethstats},
     [String]$validator,
+    [String]${validator-beacon-rpc-provider},
+    [String]${validator-pandora-http-provider},
     [String]${validator-verbosity},
     [String]${cors-domain},
     [String]${external-ip},
@@ -134,9 +136,18 @@ If ($network) {
     $NetworkConfig = ConvertFrom-Yaml $(Get-Content -Raw $NetworkConfigFile)
 }
 
+${pan-http-addr} = If (${pan-http-addr}) {${pan-http-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_ADDR) {$ConfigFile.PANDORA_HTTP_ADDR} Else {"127.0.0.1"}
+${pan-http-port} = If (${pan-http-port}) {${pan-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
+
+${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf ($ConfigFile.VANGUARD_RPC_HOST) {$ConfigFile.VANGUARD_RPC_HOST} Else {"127.0.0.1"}
+${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VANGUARD_RPC_PORT) {$ConfigFile.VANGUARD_RPC_PORT} Else {"4000"}
+
+${vanguard-rpc} = "${vanguard-rpc-host}:${van-rpc-port}"
+${pandora-rpc} = "${pan-http-addr}:${pan-http-port}"
+
 $deposit = If ($deposit) {$deposit} ElseIf ($ConfigFile.DEPOSIT) {$ConfigFile.DEPOSIT} Else {"v1.2.6-LUKSO"}
 $eth2stats = If ($eth2stats) {$eth2stats} ElseIf ($ConfigFile.ETH2STATS) {$ConfigFile.ETH2STATS} Else {""}
-${eth2stats-beacon-addr} = If (${eth2stats-beacon-addr}) {${eth2stats-beacon-addr}} ElseIf ($ConfigFile.ETH2STATS_BEACON_ADDR) {$ConfigFile.ETH2STATS_BEACON_ADDR} Else {"127.0.0.1:4000"}
+${eth2stats-beacon-addr} = If (${eth2stats-beacon-addr}) {${eth2stats-beacon-addr}} ElseIf ($ConfigFile.ETH2STATS_BEACON_ADDR) {$ConfigFile.ETH2STATS_BEACON_ADDR} Else {${vanguard-rpc}}
 ${lukso-home} = If (${lukso-home}) {${lukso-home}} ElseIf ($ConfigFile.LUKSO_HOME) {$ConfigFile.LUKSO_HOME} Else {"$HOME\.lukso"}
 $datadir = If ($datadir) {$datadir} ElseIf ($ConfigFile.DATADIR) {$ConfigFile.DATADIR} Else {"${lukso-home}\$network\datadir"}
 $logsdir = If ($logsdir) {$logsdir} ElseIf ($ConfigFile.LOGSDIR) {$ConfigFile.LOGSDIR} Else {"${lukso-home}\$network\logs"}
@@ -154,7 +165,7 @@ ${orc-http-port} = If (${orc-http-port}) {${orc-http-port}} ElseIf ($ConfigFile.
 ${orc-ws-address} = If (${orc-ws-address}) {${orc-ws-address}} ElseIf ($ConfigFile.ORC_WS_ADDR) {$ConfigFile.ORC_WS_ADDR} Else {"127.0.0.1"}
 ${orc-ws-port} = If (${orc-ws-port}) {${orc-ws-port}} ElseIf ($ConfigFile.ORC_WS_PORT) {$ConfigFile.ORC_WS_PORT} Else {"7878"}
 ${orchestrator-pandora-rpc-endpoint} = If (${orchestrator-pandora-rpc-endpoint}) {${orchestrator-pandora-rpc-endpoint}} ElseIf ($ConfigFile.ORCHESTRATOR_PANDORA_RPC_ENDPOINT) {$ConfigFile.ORCHESTRATOR_PANDORA_RPC_ENDPOINT} Else {"ws://127.0.0.1:8546"}
-${orchestrator-vanguard-rpc-endpoint} = If (${orchestrator-vanguard-rpc-endpoint}) {${orchestrator-vanguard-rpc-endpoint}} ElseIf ($ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT) {$ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT} Else {"127.0.0.1:4000"}
+${orchestrator-vanguard-rpc-endpoint} = If (${orchestrator-vanguard-rpc-endpoint}) {${orchestrator-vanguard-rpc-endpoint}} ElseIf ($ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT) {$ConfigFile.ORCHESTRATOR_VANGUARD_RPC_ENDPOINT} Else {${vanguard-rpc}}
 ${orchestrator-verbosity} = If (${orchestrator-verbosity}) {${orchestrator-verbosity}} ElseIf ($ConfigFile.ORCHESTRATOR_VERBOSITY) {$ConfigFile.ORCHESTRATOR_VERBOSITY} Else {"info"}
 $pandora = If ($pandora) {$pandora} ElseIf ($ConfigFile.PANDORA) {$ConfigFile.PANDORA} Else {""}
 ${pandora-bootnodes} = If (${pandora-bootnodes}) {${pandora-bootnodes}} ElseIf ($ConfigFile.PANDORA_BOOTNODES) {$ConfigFile.PANDORA_BOOTNODES} Else {$NetworkConfig.PANDORA_BOOTNODES}
@@ -167,8 +178,6 @@ ${pandora-unsafe-expose} = If (${pandora-unsafe-expose}) {${pandora-unsafe-expos
 ${pandora-verbosity} = If (${pandora-verbosity}) {${pandora-verbosity}} ElseIf ($ConfigFile.PANDORA_VERBOSITY) {$ConfigFile.PANDORA_VERBOSITY} Else {"info"}
 #${pandora-http-port} = If (${pandora-http-port}) {${pandora-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
 ${pan-port} = If (${pan-port}) {${pan-port}} ElseIf ($ConfigFile.PANDORA_PORT) {$ConfigFile.PANDORA_PORT} Else {"30405"}
-${pan-http-addr} = If (${pan-http-addr}) {${pan-http-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_ADDR) {$ConfigFile.PANDORA_HTTP_ADDR} Else {"127.0.0.1"}
-${pan-http-port} = If (${pan-http-port}) {${pan-http-port}} ElseIf ($ConfigFile.PANDORA_HTTP_PORT) {$ConfigFile.PANDORA_HTTP_PORT} Else {"8545"}
 ${pan-http-miner-addr} = If (${pan-http-miner-addr}) {${pan-http-miner-addr}} ElseIf ($ConfigFile.PANDORA_HTTP_MINER_ADDR) {$ConfigFile.PANDORA_HTTP_MINER_ADDR} Else {"ws://127.0.0.1:7877"}
 ${pan-ws-addr} = If (${pan-ws-addr}) {${pan-ws-addr}} ElseIf ($ConfigFile.PANDORA_WS_ADDR) {$ConfigFile.PANDORA_WS_ADDR} Else {"127.0.0.1"}
 ${pan-ws-port} = If (${pan-ws-port}) {${pan-ws-port}} ElseIf ($ConfigFile.PANDORA_WS_PORT) {$ConfigFile.PANDORA_WS_PORT} Else {"8546"}
@@ -179,13 +188,11 @@ ${vanguard-bootnodes} = If (${vanguard-bootnodes}) {${vanguard-bootnodes}} ElseI
 ${vanguard-p2p-priv-key} = If (${vanguard-p2p-priv-key}) {${vanguard-p2p-priv-key}} ElseIf ($ConfigFile.VANGUARD_P2P_PRIV_KEY) {$ConfigFile.VANGUARD_P2P_PRIV_KEY} Else {""}
 ${vanguard-external-ip} = If (${vanguard-external-ip}) {${vanguard-external-ip}} ElseIf ($ConfigFile.VANGUARD_EXTERNAL_IP) {$ConfigFile.VANGUARD_EXTERNAL_IP} Else {""}
 ${vanguard-p2p-host-dns} = If (${vanguard-p2p-host-dns}) {${vanguard-p2p-host-dns}} ElseIf ($ConfigFile.VANGUARD_P2P_HOST_DNS) {$ConfigFile.VANGUARD_P2P_HOST_DNS} Else {""}
-${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf ($ConfigFile.VANGUARD_RPC_HOST) {$ConfigFile.VANGUARD_RPC_HOST} Else {""}
 ${vanguard-monitoring-host} = If (${vanguard-monitoring-host}) {${vanguard-monitoring-host}} ElseIf ($ConfigFile.VANGUARD_MONITORING_HOST) {$ConfigFile.VANGUARD_MONITORING_HOST} Else {""}
 ${vanguard-http-web3provider} = If (${vanguard-http-web3provider}) {${vanguard-http-web3provider}} ElseIf ($ConfigFile.VANGUARD_HTTP_WEB3PROVIDER) {$ConfigFile.VANGUARD_HTTP_WEB3PROVIDER} Else {"http://127.0.0.1:8545"}
 ${vanguard-orc-rpc-provider} = If (${vanguard-orc-rpc-provider}) {${vanguard-orc-rpc-provider}} ElseIf ($ConfigFile.VANGUARD_ORC_RPC_PROVIDER) {$ConfigFile.VANGUARD_ORC_RPC_PROVIDER} Else {"http://127.0.0.1:7877"}
 ${vanguard-verbosity} = If (${vanguard-verbosity}) {${vanguard-verbosity}} ElseIf ($ConfigFile.VANGUARD_VERBOSITY) {$ConfigFile.VANGUARD_VERBOSITY} Else {"info"}
 ${van-ethstats-metrics} = If (${van-ethstats-metrics}) {${van-ethstats-metrics}} ElseIf ($ConfigFile.VANGUARD_ETHSTATS_METRICS) {$ConfigFile.VANGUARD_ETHSTATS_METRICS} Else {"http://127.0.0.1:8080/metrics"}
-${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VANGUARD_RPC_PORT) {$ConfigFile.VANGUARD_RPC_PORT} Else {"4000"}
 ${van-udp-port} = If (${van-udp-port}) {${van-udp-port}} ElseIf ($ConfigFile.VANGUARD_UDP_PORT) {$ConfigFile.VANGUARD_UDP_PORT} Else {"12000"}
 ${van-tcp-port} = If (${van-tcp-port}) {${van-tcp-port}} ElseIf ($ConfigFile.VANGUARD_TCP_PORT) {$ConfigFile.VANGUARD_TCP_PORT} Else {"13000"}
 ${van-grpc-gateway-port} = If (${van-grpc-gateway-port}) {${van-grpc-gateway-port}} ElseIf ($ConfigFile.VANGUARD_GRPC_GATEWAY_PORT) {$ConfigFile.VANGUARD_GRPC_GATEWAY_PORT} Else {"3500"}
@@ -193,6 +200,8 @@ ${van-min-sync-peers} = If (${van-min-sync-peers}) {${van-min-sync-peers}} ElseI
 ${van-max-p2p-peers} = If (${van-max-p2p-peers}) {${van-max-p2p-peers}} ElseIf ($ConfigFile.VANGUARD_MAX_P2P_PEERS) {$ConfigFile.VANGUARD_MAX_P2P_PEERS} Else {"50"}
 ${van-ethstats} = If (${van-ethstats}) {${van-ethstats}} ElseIf ($ConfigFile.VAN_ETHSTATS) {$ConfigFile.VAN_ETHSTATS} Else {"34.141.156.125:9090"}
 $validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
+${validator-beacon-rpc-provider} = If (${validator-beacon-rpc-provider}) {${validator-beacon-rpc-provider}} ElseIf ($ConfigFile.VALIDATOR_BEACON_RPC_PROVIDER) {$ConfigFile.VALIDATOR_BEACON_RPC_PROVIDER} Else {${vanguard-rpc}}
+${validator-pandora-http-provider} = If (${validator-pandora-http-provider}) {${validator-pandora-http-provider}} ElseIf ($ConfigFile.VALIDATOR_PANDORA_HTTP_PROVIDER) {$ConfigFile.VALIDATOR_PANDORA_HTTP_PROVIDER} Else {${pandora-rpc}}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
 ${cors-domain} = If (${cors-domain}) {${cors-domain}} ElseIf ($ConfigFile.CORS_DOMAIN) {$ConfigFile.CORS_DOMAIN} Else {""}
 ${external-ip} = If (${external-ip}) {${external-ip}} ElseIf ($ConfigFile.EXTERNAL_IP) {$ConfigFile.EXTERNAL_IP} Else {""}
@@ -566,9 +575,10 @@ function start_validator() {
     $Arguments = New-Object System.Collections.Generic.List[System.Object]
     $Arguments.Add("--datadir=$datadir\validator")
     $Arguments.Add("--accept-terms-of-use")
-    $Arguments.Add("--beacon-rpc-provider=localhost:4000")
+    $Arguments.Add("--beacon-rpc-provider=$(${validator-beacon-rpc-provider})")
     $Arguments.Add("--chain-config-file=$InstallDir\networks\$network\config\vanguard-config.yaml")
     $Arguments.Add("--verbosity=$(${validator-verbosity})")
+    $Arguments.Add("--pandora-http-provider=$(${validator-pandora-http-provider})")
     $Arguments.Add("--wallet-dir=$(${wallet-dir})")
     $Arguments.Add("--rpc")
     $Arguments.Add("--log-file=$logsdir\validator\validator_$runDate.log")

From ebdb9a2fd780990030db132b8bcdefd0187290c6 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Fri, 12 Nov 2021 12:19:35 +0100
Subject: [PATCH 14/28] Fix starting eth2stats

---
 shell_scripts/install-win.ps1 | 4 ++--
 shell_scripts/lukso-win.ps1   | 9 +++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index 0cc4875..33fc249 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -27,7 +27,7 @@ download_network_config("l15-prod")
 download_network_config("l15-staging")
 download_network_config("l15-dev")
 
-Invoke-WebRequest -Uri https://raw.githubusercontent.com/lukso-network/lukso-orchestrator/feature/l15-setup/scripts/lukso-win.ps1 -OutFile $InstallDir\lukso.ps1
+Invoke-WebRequest -Uri https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/lukso-win.ps1 -OutFile $InstallDir\lukso.ps1
 if (Test-Path "$InstallDir\globalPath\lukso") {
     rm "$InstallDir\globalPath\lukso"
 }
@@ -39,5 +39,5 @@ lukso bind-binaries `
 -pandora v0.2.0-rc.1 `
 -vanguard v0.2.0-rc.1 `
 -validator v0.2.0-rc.1 `
--eth2stats v0.1.0-rc.1 `
+-eth2stats v0.1.0-develop `
 -deposit v1.2.6-LUKSO
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 44591f4..e8bef46 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -398,8 +398,8 @@ Function start_orchestrator()
     Start-Process -FilePath lukso-orchestrator `
     -ArgumentList $arguments `
     -NoNewWindow `
-    -RedirectStandardOutput "orchestrator_$runDate.out" `
-    -RedirectStandardError "orchestrator_$runDate.err" `
+    -RedirectStandardOutput "$logsdir\orchestrator\orchestrator_$runDate.out" `
+    -RedirectStandardError "$logsdir\orchestrator\orchestrator_$runDate.err" `
 }
 
 function start_pandora()
@@ -610,6 +610,7 @@ function start_eth2stats_client() {
 
     $Arguments = New-Object System.Collections.Generic.List[System.Object]
 
+    $Arguments.Add("run")
     $Arguments.Add("--beacon.type=`"prysm`"")
     $Arguments.Add("--beacon.addr=`"$(${eth2stats-beacon-addr})`"")
     $Arguments.Add("--beacon.metrics-addr=`"$(${van-ethstats-metrics})`"")
@@ -618,7 +619,7 @@ function start_eth2stats_client() {
     $Arguments.Add("--eth2stats.addr=`"$(${van-ethstats})`"")
     $Arguments.Add("--eth2stats.tls=`"false`"")
 
-
+    echo $Arguments
 
     Start-Process -FilePath "eth2stats-client" `
     -ArgumentList $Arguments `
@@ -636,7 +637,7 @@ function start_all() {
     start_orchestrator
     start_pandora
     start_vanguard
-    start_eth2stats
+    start_eth2stats_client
 }
 
 # "start" is a reserved keyword in PowerShell

From c2fcbb76df54549fcd71d0f0544020f525722fb6 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Fri, 12 Nov 2021 14:48:31 +0100
Subject: [PATCH 15/28] Change prompt for validator password

---
 shell_scripts/lukso-win.ps1 | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index e8bef46..c684a3a 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -340,29 +340,44 @@ Function setup_config()
 
 Function check_validator_requirements()
 {
+    $CanValidate = $true
 
-  if (${wallet-dir}) {
-      if (!(Test-Path ${wallet-dir})) {
-          Write-Output "ERROR! Cannot Validate, wallet not found"
-          exit
-      }
+  if ( ($argument -ne "validator") -and (!($coinbase)) ) {
+       Write-Output "Please provide coinbase: -coinbase 0x<ETH1_ADDRESS>"
   }
 
-   if (${wallet-password-file}) {
-      if (!(Test-Path ${wallet-password-file})) {
+  if ( ($argument -eq "validator") -and (!($coinbase)) ) {
+
+
+    if (!($(powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec 'eth.coinbase'")) -match '^\"0x[a-fA-F0-9]{40}\"$')) {
+        Write-Output "ERROR: Coinbase is not set on already running pandora. Please provide it using:"
+        Write-Output "--coinbase 0x<ETH1_ADDRESS>"
+        $CanValidate = $false
+    }
+  }
+
+  if ( (${wallet-dir}) -and (!(Test-Path ${wallet-dir})) ) {
+          Write-Output "Cannot validate, wallet not found. Your wallet directory is: ${wallet-dir}"
+          Write-Output "Create new wallet using: `"lukso wallet`" "
+          $CanValidate = $false
+  }
+
+   if ( (${wallet-password-file}) -and (!(Test-Path ${wallet-password-file})) ) {
           Write-Output "ERROR! Cannot Validate, password file not found"
-          exit
-      }
+          $CanValidate = $false
    }
 
+   if (!($CanValidate)) {
+       exit 1
+   }
 
 
   if (!${wallet-password-file}) {
       $securedValue = Read-Host -AsSecureString -Prompt "Enter validator password"
       $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($securedValue)
       $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
-      $filename = "$Env:APPDATA\LUKSO\temp_pass.txt"
-      [IO.File]::WriteAllLines($filename, $value)
+      $TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
+      [IO.File]::WriteAllLines($TempPassFile, $value)
   }
 }
 

From 55db0489a0d148a74adfade47d6ba674d371fa2d Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Fri, 12 Nov 2021 17:13:15 +0100
Subject: [PATCH 16/28] Add loop for wrong password

---
 shell_scripts/lukso-win.ps1 | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index c684a3a..f7248e0 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -373,11 +373,19 @@ Function check_validator_requirements()
 
 
   if (!${wallet-password-file}) {
-      $securedValue = Read-Host -AsSecureString -Prompt "Enter validator password"
-      $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($securedValue)
-      $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
-      $TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
-      [IO.File]::WriteAllLines($TempPassFile, $value)
+      $PasswordCheck = $false
+      while (!($PasswordCheck)) {
+        $securedValue = Read-Host -AsSecureString -Prompt "Enter validator password"
+        $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($securedValue)
+        $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
+        $TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
+        [IO.File]::WriteAllLines($TempPassFile, $value)
+        powershell.exe -command $("$InstallDir\binaries\lukso-validator\v0.2.0-rc.1\lukso-validator-Windows-x86_64.exe accounts list --wallet-dir ${wallet-dir} --wallet-password-file $TempPassFile")
+        $PasswordCheck = $?
+        if (!($PasswordCheck)) {
+            Write-Output "Wrong password for wallet in ${wallet-dir}"
+        }
+      }
   }
 }
 
@@ -580,6 +588,12 @@ function start_vanguard() {
 }
 
 function start_validator() {
+
+    if (($argument -eq "validator") -and ($coinbase)) {
+        powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec miner.setEtherbase(`"$COINBASE`")")
+        powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec miner.start()")
+    }
+
     if (!(Test-Path $logsdir\validator))
     {
         New-Item -ItemType Directory -Force -Path $logsdir\validator
@@ -603,7 +617,7 @@ function start_validator() {
       $Arguments.Add("--wallet-password-file=${wallet-password-file}")
     }
 
-    if (!${wallet-password-file}) {
+    if ($TempPassFile) {
       $Arguments.Add("--wallet-password-file=$Env:APPDATA\LUKSO\temp_pass.txt")
     }
 

From 95feb47897586d118eab4d37b3d77e6e3293ec56 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 15 Nov 2021 22:16:43 +0100
Subject: [PATCH 17/28] Add logs

---
 shell_scripts/lukso-win.ps1 | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index f7248e0..435aeb8 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -815,7 +815,24 @@ function _reset($client) {
     }
 }
 
-Function _logs() {
+Function _logs($client) {
+    
+    Workflow MultipleTail
+    {
+        Param([string[]] $Path)
+        $ProgressPreference='SilentlyContinue'
+        foreach -parallel ($file in $path)
+        {
+            Get-Content -Path $file -Tail 1 -Wait
+        }
+    }
+
+    $CurrentLogs = (Get-Content $logsdir\$client\current.tmp -Raw).Trim()
+    $logfiles = @(
+        "$logsdir\$client\$client"+"_$CurrentLogs.out"
+        "$logsdir\$client\$client"+"_$CurrentLogs.err"
+    )
+    MultipleTail($logfiles)
 
 }
 
@@ -1005,8 +1022,8 @@ switch ($command)
     }
 
     "logs" {
-        Write-Output "Work in progress. To get the logs go to $USER\.lukso\$network\logs\<client>"
-#        logs $argument
+        # Write-Output "Work in progress. To get the logs go to $USER\.lukso\$network\logs\<client>"
+        _logs $argument
     }
 
     "version" {
@@ -1014,7 +1031,7 @@ switch ($command)
     }
 
     "attach" {
-        pandora attach ipc:\\.\pipe\geth.ipc
+        powershell.exe -command $((Get-Item "$InstallDir\globalPath\pandora").Target) "attach ipc:\\.\pipe\geth.ipc"
     }
 
     "bind-binaries" {

From 1ecc6e45b6bce1446261431d84b494cf109cedbc Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 16 Nov 2021 14:18:42 +0100
Subject: [PATCH 18/28] Add logs command

---
 shell_scripts/install-win.ps1 |  2 ++
 shell_scripts/lukso-win.ps1   | 25 ++++++++++++-------------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index 33fc249..6573db3 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -34,6 +34,8 @@ if (Test-Path "$InstallDir\globalPath\lukso") {
 
 Write-Output "powershell.exe -File $InstallDir\lukso.ps1 %*" | Out-File -Encoding ASCII -FilePath "$InstallDir\globalPath\lukso.bat"
 
+$Env:Path += ";$InstallDir\globalPath"
+
 lukso bind-binaries `
 -orchestrator v0.2.0-rc.1 `
 -pandora v0.2.0-rc.1 `
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 435aeb8..dc1ae0e 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -143,9 +143,9 @@ ${vanguard-rpc-host} = If (${vanguard-rpc-host}) {${vanguard-rpc-host}} ElseIf (
 ${van-rpc-port} = If (${van-rpc-port}) {${van-rpc-port}} ElseIf ($ConfigFile.VANGUARD_RPC_PORT) {$ConfigFile.VANGUARD_RPC_PORT} Else {"4000"}
 
 ${vanguard-rpc} = "${vanguard-rpc-host}:${van-rpc-port}"
-${pandora-rpc} = "${pan-http-addr}:${pan-http-port}"
+${pandora-rpc} = "http://${pan-http-addr}:${pan-http-port}"
 
-$deposit = If ($deposit) {$deposit} ElseIf ($ConfigFile.DEPOSIT) {$ConfigFile.DEPOSIT} Else {"v1.2.6-LUKSO"}
+$deposit = If ($deposit) {$deposit} ElseIf ($ConfigFile.DEPOSIT) {$ConfigFile.DEPOSIT} Else {""}
 $eth2stats = If ($eth2stats) {$eth2stats} ElseIf ($ConfigFile.ETH2STATS) {$ConfigFile.ETH2STATS} Else {""}
 ${eth2stats-beacon-addr} = If (${eth2stats-beacon-addr}) {${eth2stats-beacon-addr}} ElseIf ($ConfigFile.ETH2STATS_BEACON_ADDR) {$ConfigFile.ETH2STATS_BEACON_ADDR} Else {${vanguard-rpc}}
 ${lukso-home} = If (${lukso-home}) {${lukso-home}} ElseIf ($ConfigFile.LUKSO_HOME) {$ConfigFile.LUKSO_HOME} Else {"$HOME\.lukso"}
@@ -199,7 +199,7 @@ ${van-grpc-gateway-port} = If (${van-grpc-gateway-port}) {${van-grpc-gateway-por
 ${van-min-sync-peers} = If (${van-min-sync-peers}) {${van-min-sync-peers}} ElseIf ($ConfigFile.VANGUARD_MIN_SYNC_PEERS) {$ConfigFile.VANGUARD_MIN_SYNC_PEERS} Else {"2"}
 ${van-max-p2p-peers} = If (${van-max-p2p-peers}) {${van-max-p2p-peers}} ElseIf ($ConfigFile.VANGUARD_MAX_P2P_PEERS) {$ConfigFile.VANGUARD_MAX_P2P_PEERS} Else {"50"}
 ${van-ethstats} = If (${van-ethstats}) {${van-ethstats}} ElseIf ($ConfigFile.VAN_ETHSTATS) {$ConfigFile.VAN_ETHSTATS} Else {"34.141.156.125:9090"}
-$validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {"v0.2.0-rc.1"}
+$validator = If ($validator) {$validator} ElseIf ($ConfigFile.VALIDATOR) {$ConfigFile.VALIDATOR} Else {""}
 ${validator-beacon-rpc-provider} = If (${validator-beacon-rpc-provider}) {${validator-beacon-rpc-provider}} ElseIf ($ConfigFile.VALIDATOR_BEACON_RPC_PROVIDER) {$ConfigFile.VALIDATOR_BEACON_RPC_PROVIDER} Else {${vanguard-rpc}}
 ${validator-pandora-http-provider} = If (${validator-pandora-http-provider}) {${validator-pandora-http-provider}} ElseIf ($ConfigFile.VALIDATOR_PANDORA_HTTP_PROVIDER) {$ConfigFile.VALIDATOR_PANDORA_HTTP_PROVIDER} Else {${pandora-rpc}}
 ${validator-verbosity} = If (${validator-verbosity}) {${validator-verbosity}} ElseIf ($ConfigFile.VALIDATOR_VERBOSITY) {$ConfigFile.VALIDATOR_VERBOSITY} Else {"info"}
@@ -208,7 +208,7 @@ ${external-ip} = If (${external-ip}) {${external-ip}} ElseIf ($ConfigFile.EXTERN
 ${allow-respin} = If (${allow-respin}) {${allow-respin}} ElseIf ($ConfigFile.ALLOW_RESPIN) {$ConfigFile.ALLOW_RESPIN} Else {$false}
 $force = If ($force) {$force} ElseIf ($ConfigFile.FORCE) {$ConfigFile.FORCE} Else {$false}
 
-
+$TempPassFile = ""
 
 
 
@@ -311,7 +311,8 @@ Function generate_keys()
   $Arguments.Add("--folder $(${keys-dir})")
   $Arguments.Add("--num_validators $ValidatorsNumber")
 
-  powershell.exe -command $("$InstallDir\binaries\lukso-deposit-cli\$deposit\lukso-deposit-cli-Windows-x86_64.exe $Arguments")
+  $depositPath = $(Get-Item "$InstallDir\globalPath\lukso-deposit-cli").Target
+  powershell.exe -command "$depositPath $Arguments"
 }
 
 Function import_accounts() {
@@ -378,9 +379,9 @@ Function check_validator_requirements()
         $securedValue = Read-Host -AsSecureString -Prompt "Enter validator password"
         $bstr = [System.Runtime.InteropServices.Marshal]::SecureStringToBSTR($securedValue)
         $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
-        $TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
-        [IO.File]::WriteAllLines($TempPassFile, $value)
-        powershell.exe -command $("$InstallDir\binaries\lukso-validator\v0.2.0-rc.1\lukso-validator-Windows-x86_64.exe accounts list --wallet-dir ${wallet-dir} --wallet-password-file $TempPassFile")
+        $global:TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
+        [IO.File]::WriteAllLines($global:TempPassFile, $value)
+        powershell.exe -command $("$InstallDir\binaries\lukso-validator\v0.2.0-rc.1\lukso-validator-Windows-x86_64.exe accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile")
         $PasswordCheck = $?
         if (!($PasswordCheck)) {
             Write-Output "Wrong password for wallet in ${wallet-dir}"
@@ -617,7 +618,7 @@ function start_validator() {
       $Arguments.Add("--wallet-password-file=${wallet-password-file}")
     }
 
-    if ($TempPassFile) {
+    if ($global:TempPassFile) {
       $Arguments.Add("--wallet-password-file=$Env:APPDATA\LUKSO\temp_pass.txt")
     }
 
@@ -648,8 +649,6 @@ function start_eth2stats_client() {
     $Arguments.Add("--eth2stats.addr=`"$(${van-ethstats})`"")
     $Arguments.Add("--eth2stats.tls=`"false`"")
 
-    echo $Arguments
-
     Start-Process -FilePath "eth2stats-client" `
     -ArgumentList $Arguments `
     -NoNewWindow `
@@ -816,14 +815,14 @@ function _reset($client) {
 }
 
 Function _logs($client) {
-    
+
     Workflow MultipleTail
     {
         Param([string[]] $Path)
         $ProgressPreference='SilentlyContinue'
         foreach -parallel ($file in $path)
         {
-            Get-Content -Path $file -Tail 1 -Wait
+            Get-Content -Path $file -Tail 10 -Wait
         }
     }
 

From f1480ddbf383cf8888ee046c6abb9b3655a73c1c Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 16 Nov 2021 15:22:22 +0100
Subject: [PATCH 19/28] Change tool execution

---
 shell_scripts/lukso-win.ps1 | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index dc1ae0e..fba40f6 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -331,7 +331,8 @@ Function import_accounts() {
     $Arguments.Add("--keys-dir=$(${keys-dir})")
     $Arguments.Add("--wallet-dir=$(${wallet-dir})")
 
-    powershell.exe -command $("$InstallDir\binaries\lukso-validator\$validator\lukso-validator-Windows-x86_64.exe $Arguments")
+    $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target
+    powershell.exe -command "$validatorPath $Arguments"
 }
 
 Function setup_config()
@@ -349,8 +350,8 @@ Function check_validator_requirements()
 
   if ( ($argument -eq "validator") -and (!($coinbase)) ) {
 
-
-    if (!($(powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec 'eth.coinbase'")) -match '^\"0x[a-fA-F0-9]{40}\"$')) {
+    $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+    if (!($(powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec 'eth.coinbase'") -match '^\"0x[a-fA-F0-9]{40}\"$')) {
         Write-Output "ERROR: Coinbase is not set on already running pandora. Please provide it using:"
         Write-Output "--coinbase 0x<ETH1_ADDRESS>"
         $CanValidate = $false
@@ -381,7 +382,8 @@ Function check_validator_requirements()
         $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
         $global:TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
         [IO.File]::WriteAllLines($global:TempPassFile, $value)
-        powershell.exe -command $("$InstallDir\binaries\lukso-validator\v0.2.0-rc.1\lukso-validator-Windows-x86_64.exe accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile")
+        $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target
+        powershell.exe -command "$validatorPath accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile"
         $PasswordCheck = $?
         if (!($PasswordCheck)) {
             Write-Output "Wrong password for wallet in ${wallet-dir}"
@@ -591,8 +593,9 @@ function start_vanguard() {
 function start_validator() {
 
     if (($argument -eq "validator") -and ($coinbase)) {
-        powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec miner.setEtherbase(`"$COINBASE`")")
-        powershell.exe -command $("$InstallDir\binaries\pandora\v0.2.0-rc.1\pandora-Windows-x86_64.exe attach ipc:\\.\pipe\geth.ipc --exec miner.start()")
+        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec miner.setEtherbase(`"$COINBASE`")"
+        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec miner.start()"
     }
 
     if (!(Test-Path $logsdir\validator))
@@ -1030,7 +1033,8 @@ switch ($command)
     }
 
     "attach" {
-        powershell.exe -command $((Get-Item "$InstallDir\globalPath\pandora").Target) "attach ipc:\\.\pipe\geth.ipc"
+        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc"
     }
 
     "bind-binaries" {

From 87d2d6e117aabbac643dda91c3a691d2dfe8b5e3 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Tue, 16 Nov 2021 16:54:05 +0100
Subject: [PATCH 20/28] Add lukso-status

---
 shell_scripts/install-win.ps1 |  3 ++-
 shell_scripts/lukso-win.ps1   | 49 ++++++++++++++++++++++++++++++++++-
 2 files changed, 50 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index 6573db3..959c49c 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -42,4 +42,5 @@ lukso bind-binaries `
 -vanguard v0.2.0-rc.1 `
 -validator v0.2.0-rc.1 `
 -eth2stats v0.1.0-develop `
--deposit v1.2.6-LUKSO
+-deposit v1.2.6-LUKSO `
+-lukso-status v0.0.1-alpha.9
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index fba40f6..aa277dc 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -8,6 +8,8 @@ param (
     [Parameter(Position = 1)][String]$argument,
     [String]$deposit,
     [String]$eth2stats,
+    [String]${lukso-status},
+    [Switch]${status-page},
     [String]${eth2stats-beacon-addr},
     [String]$network,
     [String]${lukso-home},
@@ -147,6 +149,8 @@ ${pandora-rpc} = "http://${pan-http-addr}:${pan-http-port}"
 
 $deposit = If ($deposit) {$deposit} ElseIf ($ConfigFile.DEPOSIT) {$ConfigFile.DEPOSIT} Else {""}
 $eth2stats = If ($eth2stats) {$eth2stats} ElseIf ($ConfigFile.ETH2STATS) {$ConfigFile.ETH2STATS} Else {""}
+${lukso-status} = If (${lukso-status}) {${lukso-status}} ElseIf ($ConfigFile.LUKSO_STATUS) {$ConfigFile.LUKSO_STATUS} Else {""}
+${status-page} = If (${status-page}) {${status-page}} ElseIf ($ConfigFile.STATUS_PAGE) {$ConfigFile.STATUS_PAGE} Else {$false}
 ${eth2stats-beacon-addr} = If (${eth2stats-beacon-addr}) {${eth2stats-beacon-addr}} ElseIf ($ConfigFile.ETH2STATS_BEACON_ADDR) {$ConfigFile.ETH2STATS_BEACON_ADDR} Else {${vanguard-rpc}}
 ${lukso-home} = If (${lukso-home}) {${lukso-home}} ElseIf ($ConfigFile.LUKSO_HOME) {$ConfigFile.LUKSO_HOME} Else {"$HOME\.lukso"}
 $datadir = If ($datadir) {$datadir} ElseIf ($ConfigFile.DATADIR) {$ConfigFile.DATADIR} Else {"${lukso-home}\$network\datadir"}
@@ -511,7 +515,7 @@ function start_pandora()
         $Arguments.Add("--nat=extip:${pandora-external-ip}")
     }
 
-    if (${pandora-metrics}) {
+    if (${pandora-metrics} -or ${status-page}) {
         $Arguments.Add("--metrics")
         $Arguments.Add("--metrics.expensive")
         $Arguments.Add("--pprof")
@@ -660,6 +664,22 @@ function start_eth2stats_client() {
 
 }
 
+function start_lukso_status() {
+    if (!(Test-Path $logsdir\lukso-status))
+    {
+        New-Item -ItemType Directory -Force -Path $logsdir\lukso-status
+    }
+
+    Write-Output $runDate | Out-File -FilePath "$logsdir\lukso-status\current.tmp"
+
+    $Arguments = New-Object System.Collections.Generic.List[System.Object]
+
+    Start-Process -FilePath "lukso-status" `
+    -NoNewWindow `
+    -RedirectStandardOutput "$logsdir\lukso-status\lukso-status_$runDate.out" `
+    -RedirectStandardError "$logsdir\lukso-status\lukso-status_$runDate.err"
+}
+
 function start_all() {
     if ($validate) {
         check_validator_requirements
@@ -669,6 +689,9 @@ function start_all() {
     start_pandora
     start_vanguard
     start_eth2stats_client
+    if (${status-page}) {
+        start_lukso_status
+    }
 }
 
 # "start" is a reserved keyword in PowerShell
@@ -693,6 +716,14 @@ function _start($client)
             start_validator
         }
 
+        eth2stats {
+            start_eth2stats_client
+        }
+
+        lukso-status {
+            start_lukso_status
+        }
+
         all {
             start_all
         }
@@ -723,6 +754,10 @@ function stop_eth2stats() {
     Stop-Process -ProcessName "eth2stats-Windows-x86_64"
 }
 
+function stop_lukso_status() {
+    Stop-Process -ProcessName "lukso-status"
+}
+
 function stop_all() {
     stop_orchestrator
     stop_pandora
@@ -989,6 +1024,18 @@ if ($deposit)
     bind_binary lukso-deposit-cli $deposit
 }
 
+if (${lukso-status})
+{
+    download "https://github.com/rryter/node-status/releases/download/${lukso-status}/lukso-status-${lukso-status}-windows-amd64.zip" $InstallDir\lukso-status-${lukso-status}-windows-amd64.zip
+    New-Item -ItemType Directory -Force -Path $InstallDir\binaries\lukso-status\${lukso-status}
+    Expand-Archive -Path "$InstallDir\lukso-status-${lukso-status}-windows-amd64.zip" -DestinationPath "$InstallDir\binaries\lukso-status\${lukso-status}" -Force
+    if (Test-Path "$InstallDir\globalPath\lukso-status") {
+        rm "$InstallDir\globalPath\lukso-status"
+    }
+    echo "$InstallDir\binaries\lukso-status\${lukso-status}\lukso-status.exe"
+    cmd /c mklink "$InstallDir\globalPath\lukso-status" "$InstallDir\binaries\lukso-status\${lukso-status}\lukso-status.exe"
+}
+
 
 
 switch ($command)

From 8c5acbe2d34d881c699e68bb0850425cd7d0c045 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 17 Nov 2021 11:41:31 +0100
Subject: [PATCH 21/28] Add config tool

---
 shell_scripts/lukso-win.ps1 | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index aa277dc..f01a23f 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -341,7 +341,22 @@ Function import_accounts() {
 
 Function setup_config()
 {
-    ConvertTo-Yaml
+    $input_coinbase = Read-Host -Prompt "Enter your coinbase (0x<ETH1_ADDRESS>)"
+    $input_walletDir = Read-Host -Prompt "Enter wallet directory location"
+    $input_dataDir = Read-Host -Prompt "Enter data directory (chain will be stored there) location"
+    $input_logsDir = Read-Host -Prompt "Enter logs directory location"
+    $input_nodeName = Read-Host -Prompt "Enter node name"
+
+    $configData = @{
+        "COINBASE"=$input_coinbase
+        "WALLET_DIR"=$input_walletDir
+        "DATADIR"=$input_dataDir
+        "LOGSDIR"=$input_logsDir
+        "NODE_NAME"=$input_nodeName
+    }
+
+    $yaml = ConvertTo-Yaml $configData
+    Write-Output $yaml >
 }
 
 Function check_validator_requirements()
@@ -1054,7 +1069,7 @@ switch ($command)
     }
 
     "config" {
-        Write-Output "Not available yet"
+         setup_config
     }
 
     "help" {

From 5024fb5cd1dd12e560f7f68702e8371c82caf65e Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 17 Nov 2021 17:23:45 +0100
Subject: [PATCH 22/28] Add config file fields

---
 shell_scripts/lukso-win.ps1 | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index f01a23f..f971e9c 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -341,11 +341,33 @@ Function import_accounts() {
 
 Function setup_config()
 {
-    $input_coinbase = Read-Host -Prompt "Enter your coinbase (0x<ETH1_ADDRESS>)"
-    $input_walletDir = Read-Host -Prompt "Enter wallet directory location"
-    $input_dataDir = Read-Host -Prompt "Enter data directory (chain will be stored there) location"
-    $input_logsDir = Read-Host -Prompt "Enter logs directory location"
-    $input_nodeName = Read-Host -Prompt "Enter node name"
+    $input_configLocation = Read-Host -Prompt "Where to store config file? "
+    while (!($input_coinbase -match '^0x[a-fA-F0-9]{40}$'))
+    {
+        $input_coinbase = Read-Host -Prompt "Enter your coinbase (0x<ETH1_ADDRESS>)"
+        if (!($input_coinbase -match '^0x[a-fA-F0-9]{40}$')) {
+            Write-Host "Enter proper coinbase ex. 0x74cbB1D4F9F79Eabd601405Db6A5950E608F5885"
+        }
+    }
+
+    while (!($input_walletDir)) {
+        $input_walletDir = Read-Host -Prompt "Enter wallet directory location"
+    }
+    $input_walletDir = $(Resolve-Path $input_walletDir).Path
+
+    while (!($input_dataDir)) {
+        $input_dataDir = Read-Host -Prompt "Enter data directory (chain will be stored there) location"
+    }
+    $input_dataDir = $(Resolve-Path $input_dataDir).Path
+
+    while (!($input_logsDir)) {
+        $input_logsDir = Read-Host -Prompt "Enter logs directory location"
+    }
+    $input_logsDir = $(Resolve-Path $input_logsDir).Path
+
+    while (!($input_nodeName)) {
+        $input_nodeName = Read-Host -Prompt "Enter node name"
+    }
 
     $configData = @{
         "COINBASE"=$input_coinbase
@@ -356,7 +378,7 @@ Function setup_config()
     }
 
     $yaml = ConvertTo-Yaml $configData
-    Write-Output $yaml >
+    Write-Output $yaml > config.yaml
 }
 
 Function check_validator_requirements()

From 5d457d960b5926d78dbe0404e5cc832a43a64822 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 22 Nov 2021 16:08:04 +0100
Subject: [PATCH 23/28] Fix pandora attach setEtherbase

---
 shell_scripts/lukso-win.ps1 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index f971e9c..9073fad 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -635,8 +635,8 @@ function start_validator() {
 
     if (($argument -eq "validator") -and ($coinbase)) {
         $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
-        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec miner.setEtherbase(`"$COINBASE`")"
-        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec miner.start()"
+        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec `"miner.setEtherbase(`'$coinbase`')`""
+        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec 'miner.start()'"
     }
 
     if (!(Test-Path $logsdir\validator))

From f7ee45de8fccc11930bbb736a5fa737aba17682d Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 29 Nov 2021 10:37:07 +0100
Subject: [PATCH 24/28] Add flag bypasser

---
 shell_scripts/flag_bypasser.ps1 | 11 +++++++
 shell_scripts/install-win.ps1   | 11 ++++---
 shell_scripts/lukso-win.ps1     | 55 +++++++++++++++++++--------------
 3 files changed, 48 insertions(+), 29 deletions(-)
 create mode 100644 shell_scripts/flag_bypasser.ps1

diff --git a/shell_scripts/flag_bypasser.ps1 b/shell_scripts/flag_bypasser.ps1
new file mode 100644
index 0000000..7060e2f
--- /dev/null
+++ b/shell_scripts/flag_bypasser.ps1
@@ -0,0 +1,11 @@
+# This file is used for converting "--" flag prefix to "-"
+# before being processed by the main script
+# since "--" cannot be used for flags in Powershell
+
+$InstallDir = $Env:APPDATA + "\LUKSO"
+
+$cmd = "$args"
+$cmd = $cmd.Replace(" --", " -")
+
+Write-Output $cmd
+powershell -command "$InstallDir\lukso.ps1 $cmd"
\ No newline at end of file
diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index 959c49c..e0abd36 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -32,15 +32,16 @@ if (Test-Path "$InstallDir\globalPath\lukso") {
     rm "$InstallDir\globalPath\lukso"
 }
 
-Write-Output "powershell.exe -File $InstallDir\lukso.ps1 %*" | Out-File -Encoding ASCII -FilePath "$InstallDir\globalPath\lukso.bat"
+# Write-Output "powershell.exe -File $InstallDir\lukso.ps1 %*" | Out-File -Encoding ASCII -FilePath "$InstallDir\globalPath\lukso.bat"
+download https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/flag_bypasser.ps1 $InstallDir\globalPath\lukso.ps1
 
 $Env:Path += ";$InstallDir\globalPath"
 
 lukso bind-binaries `
--orchestrator v0.2.0-rc.1 `
--pandora v0.2.0-rc.1 `
--vanguard v0.2.0-rc.1 `
--validator v0.2.0-rc.1 `
+-orchestrator v0.2.0-rc.2 `
+-pandora v0.2.0-rc.2 `
+-vanguard v0.2.0-rc.2 `
+-validator v0.2.0-rc.2 `
 -eth2stats v0.1.0-develop `
 -deposit v1.2.6-LUKSO `
 -lukso-status v0.0.1-alpha.9
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 9073fad..989ed2d 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -315,7 +315,7 @@ Function generate_keys()
   $Arguments.Add("--folder $(${keys-dir})")
   $Arguments.Add("--num_validators $ValidatorsNumber")
 
-  $depositPath = $(Get-Item "$InstallDir\globalPath\lukso-deposit-cli").Target
+  $depositPath = $(Get-Item "$InstallDir\globalPath\lukso-deposit-cli").Target[0]
   powershell.exe -command "$depositPath $Arguments"
 }
 
@@ -335,7 +335,7 @@ Function import_accounts() {
     $Arguments.Add("--keys-dir=$(${keys-dir})")
     $Arguments.Add("--wallet-dir=$(${wallet-dir})")
 
-    $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target
+    $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target[0]
     powershell.exe -command "$validatorPath $Arguments"
 }
 
@@ -391,7 +391,7 @@ Function check_validator_requirements()
 
   if ( ($argument -eq "validator") -and (!($coinbase)) ) {
 
-    $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+    $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
     if (!($(powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec 'eth.coinbase'") -match '^\"0x[a-fA-F0-9]{40}\"$')) {
         Write-Output "ERROR: Coinbase is not set on already running pandora. Please provide it using:"
         Write-Output "--coinbase 0x<ETH1_ADDRESS>"
@@ -423,7 +423,7 @@ Function check_validator_requirements()
         $value = [System.Runtime.InteropServices.Marshal]::PtrToStringAuto($bstr)
         $global:TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
         [IO.File]::WriteAllLines($global:TempPassFile, $value)
-        $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target
+        $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target[0]
         powershell.exe -command "$validatorPath accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile"
         $PasswordCheck = $?
         if (!($PasswordCheck)) {
@@ -461,10 +461,11 @@ Function start_orchestrator()
     "--verbosity=trace"
     )
 
-
-    Start-Process -FilePath lukso-orchestrator `
+    $OrchestratorPath = $(Get-Item "$InstallDir\globalPath\lukso-orchestrator").Target[0]
+    echo $OrchestratorPath
+    Start-Process {"$OrchestratorPath $keys"} `
     -ArgumentList $arguments `
-    -NoNewWindow `
+    -WindowStyle hidden `
     -RedirectStandardOutput "$logsdir\orchestrator\orchestrator_$runDate.out" `
     -RedirectStandardError "$logsdir\orchestrator\orchestrator_$runDate.err" `
 }
@@ -511,7 +512,9 @@ function start_pandora()
     $Arguments.Add("init")
     $Arguments.Add("$InstallDir\networks\$NETWORK\config\pandora-genesis.json")
     $Arguments.Add("--datadir=$datadir\pandora")
-    Start-Process -Wait -FilePath "pandora" `
+
+    $PandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
+    Start-Process -Wait -FilePath $PandoraPath `
     -ArgumentList $Arguments `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\pandora\init_pandora_$runDate.out" `
@@ -563,8 +566,8 @@ function start_pandora()
         $Arguments.Add("--nodekey=${pandora-nodekey}")
     }
 
-
-    Start-Process -FilePath "pandora" `
+    $PandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
+    Start-Process -FilePath $PandoraPath `
     -ArgumentList $Arguments `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\pandora\pandora_$runDate.out" `
@@ -623,7 +626,8 @@ function start_vanguard() {
         $Arguments.Add("--p2p-host-ip=$vanguard_external_ip")
     }
 
-    Start-Process -FilePath "vanguard" `
+    $VanguardPath = $(Get-Item "$InstallDir\globalPath\vanguard").Target[0]
+    Start-Process -FilePath $VanguardPath `
     -ArgumentList $Arguments `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\vanguard\vanguard_$runDate.out" `
@@ -634,7 +638,7 @@ function start_vanguard() {
 function start_validator() {
 
     if (($argument -eq "validator") -and ($coinbase)) {
-        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
         powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec `"miner.setEtherbase(`'$coinbase`')`""
         powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec 'miner.start()'"
     }
@@ -666,7 +670,8 @@ function start_validator() {
       $Arguments.Add("--wallet-password-file=$Env:APPDATA\LUKSO\temp_pass.txt")
     }
 
-    Start-Process -FilePath "lukso-validator" `
+    $ValidatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target[0]
+    Start-Process -FilePath $ValidatorPath `
     -ArgumentList $arguments `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\validator\validator_$runDate.out" `
@@ -693,7 +698,8 @@ function start_eth2stats_client() {
     $Arguments.Add("--eth2stats.addr=`"$(${van-ethstats})`"")
     $Arguments.Add("--eth2stats.tls=`"false`"")
 
-    Start-Process -FilePath "eth2stats-client" `
+    $Eth2StatsPath = $(Get-Item "$InstallDir\globalPath\eth2stats-client").Target[0]
+    Start-Process -FilePath $Eth2StatsPath `
     -ArgumentList $Arguments `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\eth2stats\eth2stats_$runDate.out" `
@@ -711,7 +717,8 @@ function start_lukso_status() {
 
     $Arguments = New-Object System.Collections.Generic.List[System.Object]
 
-    Start-Process -FilePath "lukso-status" `
+    $LuksoStatusPath = $(Get-Item "$InstallDir\globalPath\lukso-status").Target[0]
+    Start-Process -FilePath $LuksoStatusPath `
     -NoNewWindow `
     -RedirectStandardOutput "$logsdir\lukso-status\lukso-status_$runDate.out" `
     -RedirectStandardError "$logsdir\lukso-status\lukso-status_$runDate.err"
@@ -1117,7 +1124,7 @@ switch ($command)
     }
 
     "attach" {
-        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target
+        $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
         powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc"
     }
 
@@ -1131,13 +1138,13 @@ switch ($command)
     }
 }
 
-if ($KeepShell)
-{
-    Write-Output "LUKSO clients are working, do not close this shell"
-}
+# if ($KeepShell)
+# {
+#     Write-Output "LUKSO clients are working, do not close this shell"
+# }
 
-while ($KeepShell)
-{
-    Read-Host
-}
+# while ($KeepShell)
+# {
+#     Read-Host
+# }
 

From 682a8ed7dfe5eb8ef190aa8551e7157e40d13950 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Mon, 29 Nov 2021 15:54:19 +0100
Subject: [PATCH 25/28] Check running in background

---
 shell_scripts/flag_bypasser.ps1 |  1 -
 shell_scripts/install-win.ps1   |  4 ++--
 shell_scripts/lukso-win.ps1     | 16 ++++++++--------
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/shell_scripts/flag_bypasser.ps1 b/shell_scripts/flag_bypasser.ps1
index 7060e2f..46b7cd6 100644
--- a/shell_scripts/flag_bypasser.ps1
+++ b/shell_scripts/flag_bypasser.ps1
@@ -7,5 +7,4 @@ $InstallDir = $Env:APPDATA + "\LUKSO"
 $cmd = "$args"
 $cmd = $cmd.Replace(" --", " -")
 
-Write-Output $cmd
 powershell -command "$InstallDir\lukso.ps1 $cmd"
\ No newline at end of file
diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index e0abd36..3e2f796 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -27,13 +27,13 @@ download_network_config("l15-prod")
 download_network_config("l15-staging")
 download_network_config("l15-dev")
 
-Invoke-WebRequest -Uri https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/lukso-win.ps1 -OutFile $InstallDir\lukso.ps1
+download "https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/lukso-win.ps1" $InstallDir\lukso.ps1
 if (Test-Path "$InstallDir\globalPath\lukso") {
     rm "$InstallDir\globalPath\lukso"
 }
 
 # Write-Output "powershell.exe -File $InstallDir\lukso.ps1 %*" | Out-File -Encoding ASCII -FilePath "$InstallDir\globalPath\lukso.bat"
-download https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/flag_bypasser.ps1 $InstallDir\globalPath\lukso.ps1
+download "https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/flag_bypasser.ps1" $InstallDir\globalPath\lukso.ps1
 
 $Env:Path += ";$InstallDir\globalPath"
 
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 989ed2d..6754bdc 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -463,7 +463,7 @@ Function start_orchestrator()
 
     $OrchestratorPath = $(Get-Item "$InstallDir\globalPath\lukso-orchestrator").Target[0]
     echo $OrchestratorPath
-    Start-Process {"$OrchestratorPath $keys"} `
+    Start-Process -FilePath "$OrchestratorPath" `
     -ArgumentList $arguments `
     -WindowStyle hidden `
     -RedirectStandardOutput "$logsdir\orchestrator\orchestrator_$runDate.out" `
@@ -516,7 +516,7 @@ function start_pandora()
     $PandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
     Start-Process -Wait -FilePath $PandoraPath `
     -ArgumentList $Arguments `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\pandora\init_pandora_$runDate.out" `
     -RedirectStandardError "$logsdir\pandora\init_pandora_$runDate.err"
 
@@ -569,7 +569,7 @@ function start_pandora()
     $PandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
     Start-Process -FilePath $PandoraPath `
     -ArgumentList $Arguments `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\pandora\pandora_$runDate.out" `
     -RedirectStandardError "$logsdir\pandora\pandora_$runDate.err"
 }
@@ -629,7 +629,7 @@ function start_vanguard() {
     $VanguardPath = $(Get-Item "$InstallDir\globalPath\vanguard").Target[0]
     Start-Process -FilePath $VanguardPath `
     -ArgumentList $Arguments `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\vanguard\vanguard_$runDate.out" `
     -RedirectStandardError "$logsdir\vanguard\vanguard_$runDate.err"
 
@@ -673,7 +673,7 @@ function start_validator() {
     $ValidatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target[0]
     Start-Process -FilePath $ValidatorPath `
     -ArgumentList $arguments `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\validator\validator_$runDate.out" `
     -RedirectStandardError "$logsdir\validator\validator_$runDate.err"
 
@@ -701,7 +701,7 @@ function start_eth2stats_client() {
     $Eth2StatsPath = $(Get-Item "$InstallDir\globalPath\eth2stats-client").Target[0]
     Start-Process -FilePath $Eth2StatsPath `
     -ArgumentList $Arguments `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\eth2stats\eth2stats_$runDate.out" `
     -RedirectStandardError "$logsdir\eth2stats\eth2stats_$runDate.err"
 
@@ -719,7 +719,7 @@ function start_lukso_status() {
 
     $LuksoStatusPath = $(Get-Item "$InstallDir\globalPath\lukso-status").Target[0]
     Start-Process -FilePath $LuksoStatusPath `
-    -NoNewWindow `
+    -WindowStyle Hidden `
     -RedirectStandardOutput "$logsdir\lukso-status\lukso-status_$runDate.out" `
     -RedirectStandardError "$logsdir\lukso-status\lukso-status_$runDate.err"
 }
@@ -795,7 +795,7 @@ function stop_validator() {
 }
 
 function stop_eth2stats() {
-    Stop-Process -ProcessName "eth2stats-Windows-x86_64"
+    Stop-Process -ProcessName "eth2stats-client-Windows-x86_64"
 }
 
 function stop_lukso_status() {

From 2d69d301fa67e449ab538389ac6fcc8727d3908d Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Wed, 1 Dec 2021 15:37:07 +0100
Subject: [PATCH 26/28] Fix separate starting of validator

---
 shell_scripts/lukso-win.ps1 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 6754bdc..0396eec 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -424,7 +424,7 @@ Function check_validator_requirements()
         $global:TempPassFile = "$Env:APPDATA\LUKSO\temp_pass.txt"
         [IO.File]::WriteAllLines($global:TempPassFile, $value)
         $validatorPath = $(Get-Item "$InstallDir\globalPath\lukso-validator").Target[0]
-        powershell.exe -command "$validatorPath accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile"
+        powershell.exe -command "$validatorPath accounts list --wallet-dir ${wallet-dir} --wallet-password-file $global:TempPassFile" | Out-Null
         $PasswordCheck = $?
         if (!($PasswordCheck)) {
             Write-Output "Wrong password for wallet in ${wallet-dir}"
@@ -639,7 +639,8 @@ function start_validator() {
 
     if (($argument -eq "validator") -and ($coinbase)) {
         $pandoraPath = $(Get-Item "$InstallDir\globalPath\pandora").Target[0]
-        powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec `"miner.setEtherbase(`'$coinbase`')`""
+        $pandoraCommand = "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec `"miner.setEtherbase(`'"+$coinbase+"`')`""
+        "$pandoraPath $pandoraCommand" | Out-Null
         powershell.exe -command "$pandoraPath attach ipc:\\.\pipe\geth.ipc --exec 'miner.start()'"
     }
 

From c8411fd30e6c77219f1579bfb8c05c892262f657 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Thu, 2 Dec 2021 16:17:19 +0100
Subject: [PATCH 27/28] Set default command for CLI

---
 shell_scripts/install-win.ps1 |  2 +-
 shell_scripts/lukso-win.ps1   | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/shell_scripts/install-win.ps1 b/shell_scripts/install-win.ps1
index 3e2f796..d03fe65 100644
--- a/shell_scripts/install-win.ps1
+++ b/shell_scripts/install-win.ps1
@@ -29,7 +29,7 @@ download_network_config("l15-dev")
 
 download "https://raw.githubusercontent.com/lukso-network/network-lukso-cli/feature/windows-script/shell_scripts/lukso-win.ps1" $InstallDir\lukso.ps1
 if (Test-Path "$InstallDir\globalPath\lukso") {
-    rm "$InstallDir\globalPath\lukso"
+    Remove-Item "$InstallDir\globalPath\lukso"
 }
 
 # Write-Output "powershell.exe -File $InstallDir\lukso.ps1 %*" | Out-File -Encoding ASCII -FilePath "$InstallDir\globalPath\lukso.bat"
diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index 0396eec..f4d3313 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -4,7 +4,7 @@
 
 # Flags declaration
 param (
-    [Parameter(Position = 0, Mandatory)][String]$command,
+    [Parameter(Position = 0)][String]$command,
     [Parameter(Position = 1)][String]$argument,
     [String]$deposit,
     [String]$eth2stats,
@@ -102,6 +102,8 @@ Function pick_network($picked_network)
     $NetworkConfig = ConvertFrom-Yaml $(Get-Content -Raw $NetworkConfigFile)
 }
 
+$command = If ($command) {$command} Else {"help"}
+
 $network = If ($network) {$network} ElseIf ($ConfigFile.NETWORK) {$ConfigFile.NETWORK} Else {""}
 
 ${l15-prod} = If (${l15-prod}) {${l15-prod}} ElseIf ($ConfigFile.L15_PROD) {$ConfigFile.L15_PROD} Else {$false}
@@ -280,7 +282,7 @@ Function bind_binary($client, $tag)
         download_binary $client $tag
     }
     if (Test-Path "$InstallDir\globalPath\$client") {
-        rm "$InstallDir\globalPath\$client"
+        Remove-Item "$InstallDir\globalPath\$client"
     }
 
     cmd /c mklink "$InstallDir\globalPath\$client" "$InstallDir\binaries\$client\$tag\$client-$platform-$architecture.exe" | Out-Null
@@ -341,7 +343,9 @@ Function import_accounts() {
 
 Function setup_config()
 {
-    $input_configLocation = Read-Host -Prompt "Where to store config file? "
+    $input_configLocation = Read-Host -Prompt "Where to store config file? (Default: config.yaml) "
+    if ($input_configLocation) {$input_configLocation} Else {"config.yaml"}
+
     while (!($input_coinbase -match '^0x[a-fA-F0-9]{40}$'))
     {
         $input_coinbase = Read-Host -Prompt "Enter your coinbase (0x<ETH1_ADDRESS>)"
@@ -350,17 +354,17 @@ Function setup_config()
         }
     }
 
-    while (!($input_walletDir)) {
+    while (!($input_walletDir) -or !($(Resolve-Path -ErrorAction 'silentlycontinue' $input_walletDir))) {
         $input_walletDir = Read-Host -Prompt "Enter wallet directory location"
     }
     $input_walletDir = $(Resolve-Path $input_walletDir).Path
 
-    while (!($input_dataDir)) {
+    while (!($input_dataDir) -or !($(Resolve-Path -ErrorAction 'silentlycontinue' $input_dataDir))) {
         $input_dataDir = Read-Host -Prompt "Enter data directory (chain will be stored there) location"
     }
     $input_dataDir = $(Resolve-Path $input_dataDir).Path
 
-    while (!($input_logsDir)) {
+    while (!($input_logsDir) -or !($(Resolve-Path -ErrorAction 'silentlycontinue' $input_logsDir))) {
         $input_logsDir = Read-Host -Prompt "Enter logs directory location"
     }
     $input_logsDir = $(Resolve-Path $input_logsDir).Path
@@ -378,7 +382,8 @@ Function setup_config()
     }
 
     $yaml = ConvertTo-Yaml $configData
-    Write-Output $yaml > config.yaml
+    Write-Output $yaml > $input_configLocation
+    Write-Output "Saved to $($(Resolve-Path $input_configLocation).Path)"
 }
 
 Function check_validator_requirements()
@@ -462,7 +467,7 @@ Function start_orchestrator()
     )
 
     $OrchestratorPath = $(Get-Item "$InstallDir\globalPath\lukso-orchestrator").Target[0]
-    echo $OrchestratorPath
+
     Start-Process -FilePath "$OrchestratorPath" `
     -ArgumentList $arguments `
     -WindowStyle hidden `
@@ -716,7 +721,6 @@ function start_lukso_status() {
 
     Write-Output $runDate | Out-File -FilePath "$logsdir\lukso-status\current.tmp"
 
-    $Arguments = New-Object System.Collections.Generic.List[System.Object]
 
     $LuksoStatusPath = $(Get-Item "$InstallDir\globalPath\lukso-status").Target[0]
     Start-Process -FilePath $LuksoStatusPath `
@@ -1075,9 +1079,9 @@ if (${lukso-status})
     New-Item -ItemType Directory -Force -Path $InstallDir\binaries\lukso-status\${lukso-status}
     Expand-Archive -Path "$InstallDir\lukso-status-${lukso-status}-windows-amd64.zip" -DestinationPath "$InstallDir\binaries\lukso-status\${lukso-status}" -Force
     if (Test-Path "$InstallDir\globalPath\lukso-status") {
-        rm "$InstallDir\globalPath\lukso-status"
+        Remove-Item "$InstallDir\globalPath\lukso-status"
     }
-    echo "$InstallDir\binaries\lukso-status\${lukso-status}\lukso-status.exe"
+
     cmd /c mklink "$InstallDir\globalPath\lukso-status" "$InstallDir\binaries\lukso-status\${lukso-status}\lukso-status.exe"
 }
 
@@ -1087,7 +1091,7 @@ switch ($command)
 {
     "start" {
         _start $argument
-        $KeepShell = $true
+        # $KeepShell = $true
     }
 
     "stop" {

From 60c7f233869611ff11acca35ff482a4ea4d50ee8 Mon Sep 17 00:00:00 2001
From: Patryk Krakos <patryk.krakos@m8b.pl>
Date: Thu, 9 Dec 2021 12:49:58 +0100
Subject: [PATCH 28/28] Correct output on stop command

---
 shell_scripts/lukso-win.ps1 | 54 ++++++++++++++++++++++++++++++++-----
 1 file changed, 48 insertions(+), 6 deletions(-)

diff --git a/shell_scripts/lukso-win.ps1 b/shell_scripts/lukso-win.ps1
index f4d3313..8da9433 100755
--- a/shell_scripts/lukso-win.ps1
+++ b/shell_scripts/lukso-win.ps1
@@ -784,27 +784,69 @@ function _start($client)
 }
 
 function stop_orchestrator() {
-    Stop-Process -ProcessName "lukso-orchestrator-Windows-x86_64"
+    $orchestratorProcess = Get-Process -Name "lukso-orchestrator-Windows-x86_64" -ErrorAction SilentlyContinue
+    if ($orchestratorProcess) {
+        Write-Output "Stopping orchestrator"
+        Stop-Process -ProcessName "lukso-orchestrator-Windows-x86_64"
+      } else {
+          Write-Host "Orchestrator not running"
+      }
+      Remove-Variable orchestratorProcess
 }
 
 function stop_pandora() {
-    Stop-Process -ProcessName "pandora-Windows-x86_64"
+    $pandoraProcess = Get-Process -Name "pandora-Windows-x86_64" -ErrorAction SilentlyContinue
+    if ($pandoraProcess) {
+        Write-Output "Stopping pandora"
+        Stop-Process -ProcessName "pandora-Windows-x86_64"
+      } else {
+          Write-Host "Pandora not running"
+      }
+      Remove-Variable pandoraProcess
 }
 
 function stop_vanguard() {
-    Stop-Process -ProcessName "vanguard-Windows-x86_64"
+    $vanguardProcess = Get-Process -Name "vanguard-Windows-x86_64" -ErrorAction SilentlyContinue
+    if ($vanguardProcess) {
+        Write-Output "Stopping vanguard"
+        Stop-Process -ProcessName "vanguard-Windows-x86_64"
+      } else {
+          Write-Host "Vanguard not running"
+      }
+      Remove-Variable vanguardProcess
 }
 
 function stop_validator() {
-    Stop-Process -ProcessName "lukso-validator-Windows-x86_64"
+    $validatorProcess = Get-Process -Name "lukso-validator-Windows-x86_64" -ErrorAction SilentlyContinue
+    if ($validatorProcess) {
+        Write-Output "Stopping validator"
+        Stop-Process -ProcessName "lukso-validator-Windows-x86_64"
+      } else {
+          Write-Host "Validator not running"
+      }
+      Remove-Variable validatorProcess
 }
 
 function stop_eth2stats() {
-    Stop-Process -ProcessName "eth2stats-client-Windows-x86_64"
+    $eth2statsProcess = Get-Process -Name "eth2stats-client-Windows-x86_64" -ErrorAction SilentlyContinue
+    if ($eth2statsProcess) {
+        Write-Output "Stopping eth2stats"
+        Stop-Process -ProcessName "eth2stats-client-Windows-x86_64"
+      } else {
+          Write-Host "eth2stats not running"
+      }
+      Remove-Variable eth2statsProcess
 }
 
 function stop_lukso_status() {
-    Stop-Process -ProcessName "lukso-status"
+    $luksoStatusProcess = Get-Process -Name "lukso-status" -ErrorAction SilentlyContinue
+    if ($luksoStatusProcess) {
+        Write-Output "Stopping lukso-status"
+        Stop-Process -ProcessName "lukso-status"
+      } else {
+          Write-Host "lukso-status not running"
+      }
+      Remove-Variable luksoStatusProcess
 }
 
 function stop_all() {