From 0920eb29409ba3aa5a218fad3d8b57e73cb7f4e5 Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Sat, 12 Dec 2020 07:38:59 -0800
Subject: [PATCH 1/2] up-verifier: more flexible

---
 up-verifier.sh | 40 ++++++++++++++++++++++++++++------------
 1 file changed, 28 insertions(+), 12 deletions(-)

diff --git a/up-verifier.sh b/up-verifier.sh
index e5edb72..30b46c3 100755
--- a/up-verifier.sh
+++ b/up-verifier.sh
@@ -1,12 +1,22 @@
 #!/bin/bash
 
-DOCKERFILE='docker-compose.local.yml'
-SERVICES="deployer verifier l1_chain batch_submitter geth_l2"
+DOCKERFILE='docker-compose.yml'
+SERVICES='deployer verifier l1_chain batch_submitter geth_l2'
+LOCAL_VERIFIER=
 
 while (( "$#" )); do
   case "$1" in
     -l|--local)
       DOCKERFILE="docker-compose.local.yml"
+      LOCAL_VERIFIER=true
+      shift 1
+      ;;
+    --local-sequencer)
+      DOCKERFILE="docker-compose.local.yml"
+      shift 1
+      ;;
+    --local-verifier)
+      LOCAL_VERIFIER=true
       shift 1
       ;;
     -s|--services)
@@ -20,14 +30,20 @@ while (( "$#" )); do
   esac
 done
 
-docker-compose \
-    -f $DOCKERFILE \
-    -f optional/verifier-service.yml \
-    -f optional/verifier-service.local.yml \
-    down -v --remove-orphans
+dcmd="docker-compose"
+dcmd="$dcmd -f $DOCKERFILE"
+dcmd="$dcmd -f optional/verifier-service.yml"
+if [ ! -z $LOCAL_VERIFIER ]; then
+    dcmd="$dcmd -f optional/verifier-service.local.yml"
+fi
+dcmd="$dcmd down -v --remove-orphans"
+$dcmd
 
-docker-compose \
-    -f $DOCKERFILE \
-    -f optional/verifier-service.yml \
-    -f optional/verifier-service.local.yml \
-    up $SERVICES
+cmd="docker-compose"
+cmd="$cmd -f $DOCKERFILE"
+cmd="$cmd -f optional/verifier-service.yml"
+if [ ! -z $LOCAL_VERIFIER ]; then
+    cmd="$cmd -f optional/verifier-service.local.yml"
+fi
+cmd="$cmd up $SERVICES"
+exec $cmd

From c0257d9b1b9f6f7a493cff562b02a988f01874fc Mon Sep 17 00:00:00 2001
From: Mark Tyneway <mark.tyneway@gmail.com>
Date: Sat, 12 Dec 2020 07:40:08 -0800
Subject: [PATCH 2/2] up-verifier: docstring

---
 up-verifier.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/up-verifier.sh b/up-verifier.sh
index 30b46c3..0b65026 100755
--- a/up-verifier.sh
+++ b/up-verifier.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Run the verifier along with the sequencer using
+# docker-compose
+
 DOCKERFILE='docker-compose.yml'
 SERVICES='deployer verifier l1_chain batch_submitter geth_l2'
 LOCAL_VERIFIER=