From e9e308b89189416a32bb5151d9b52eb814cd114c Mon Sep 17 00:00:00 2001
From: segfaultdoctor <17258903+segfaultdoc@users.noreply.github.com>
Date: Mon, 25 Sep 2023 16:18:26 -0400
Subject: [PATCH] Updates scripts for easy local setup. (#383)

---
 multinode-demo/bootstrap-validator.sh | 30 +++++++++++----------------
 multinode-demo/validator.sh           | 30 ++++++++++++++++-----------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/multinode-demo/bootstrap-validator.sh b/multinode-demo/bootstrap-validator.sh
index 7a7709a270..983b5eb6be 100755
--- a/multinode-demo/bootstrap-validator.sh
+++ b/multinode-demo/bootstrap-validator.sh
@@ -103,30 +103,12 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --skip-require-tower ]]; then
       maybeRequireTower=false
       shift
-    elif [[ $1 == --trust-relayer-packets ]]; then
-      args+=("$1")
-      shift
-    elif [[ $1 == --trust-block-engine-packets ]]; then
-      args+=("$1")
-      shift
     elif [[ $1 == --relayer-url ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 == --relayer-address ]]; then
-      args+=("$1" "$2")
-      shift 2
     elif [[ $1 == --block-engine-url ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 == --block-engine-address ]]; then
-      args+=("$1" "$2")
-      shift 2
-    elif [[ $1 == --block-engine-auth-service-address ]]; then
-      args+=("$1" "$2")
-      shift 2
-    elif [[ $1 == --relayer-auth-service-address ]]; then
-      args+=("$1" "$2")
-      shift 2
     elif [[ $1 == --tip-payment-program-pubkey ]]; then
       args+=("$1" "$2")
       shift 2
@@ -142,6 +124,18 @@ while [[ -n $1 ]]; do
     elif [[ $1 = --log-messages-bytes-limit ]]; then
       args+=("$1" "$2")
       shift 2
+    elif [[ $1 == --geyser-plugin-config ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 == --trust-relayer-packets ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --rpc-threads ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 == --trust-block-engine-packets ]]; then
+      args+=("$1")
+      shift
     else
       echo "Unknown argument: $1"
       $program --help
diff --git a/multinode-demo/validator.sh b/multinode-demo/validator.sh
index 439ca7d864..721008a661 100755
--- a/multinode-demo/validator.sh
+++ b/multinode-demo/validator.sh
@@ -85,24 +85,12 @@ while [[ -n $1 ]]; do
       vote_account=$2
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 == --relayer-address ]]; then
-      args+=("$1" "$2")
-      shift 2
     elif [[ $1 == --block-engine-url ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 == --block-engine-address ]]; then
-      args+=("$1" "$2")
-      shift 2
-    elif [[ $1 == --block-engine-auth-service-address ]]; then
-      args+=("$1" "$2")
-      shift 2
     elif [[ $1 == --relayer-url ]]; then
       args+=("$1" "$2")
       shift 2
-    elif [[ $1 == --relayer-auth-service-address ]]; then
-      args+=("$1" "$2")
-      shift 2
     elif [[ $1 = --merkle-root-upload-authority ]]; then
       args+=("$1" "$2")
       shift 2
@@ -212,6 +200,24 @@ while [[ -n $1 ]]; do
     elif [[ $1 == --skip-require-tower ]]; then
       maybeRequireTower=false
       shift
+    elif [[ $1 == --rpc-pubsub-enable-block-subscription ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --geyser-plugin-config ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 == --trust-relayer-packets ]]; then
+      args+=("$1")
+      shift
+    elif [[ $1 == --rpc-threads ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 == --shred-receiver-address ]]; then
+      args+=("$1" "$2")
+      shift 2
+    elif [[ $1 == --trust-block-engine-packets ]]; then
+      args+=("$1")
+      shift
     elif [[ $1 = -h ]]; then
       usage "$@"
     else