Merge pull request #3999 from OffchainLabs/split-val-entry-3_9

Port - Add back split-val-entry (#3998)

Author: joshuacolvin0

Dockerfile

@@ -355,16 +355,14 @@ USER user
 # We no longer support pre-arbos-30 wasmmoduleroots (newer wasmmoduleroots can execute old blocks)
 # We keep the code (commented out), and the docker-target, for use in case such an update is needed again.
 FROM nitro-node AS nitro-node-validator
-# USER root
-# COPY --from=nitro-legacy /usr/local/bin/nitro-val /home/user/nitro-legacy/bin/nitro-val
-# COPY --from=nitro-legacy /usr/local/bin/jit /home/user/nitro-legacy/bin/jit
-# RUN export DEBIAN_FRONTEND=noninteractive && \
-#     apt-get update && \
-#     apt-get install -y xxd netcat-traditional && \
-#     rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/ldconfig/aux-cache /usr/lib/python3.9/__pycache__/ /usr/lib/python3.9/*/__pycache__/ /var/log/*
-# COPY scripts/split-val-entry.sh /usr/local/bin
-# ENTRYPOINT [ "/usr/local/bin/split-val-entry.sh" ]
-# USER user
+USER root
+RUN export DEBIAN_FRONTEND=noninteractive && \
+     apt-get update && \
+     apt-get install -y xxd netcat-traditional && \
+     rm -rf /var/lib/apt/lists/* /usr/share/doc/* /var/cache/ldconfig/aux-cache /usr/lib/python3.9/__pycache__/ /usr/lib/python3.9/*/__pycache__/ /var/log/*
+COPY scripts/split-val-entry.sh /usr/local/bin
+ENTRYPOINT [ "/usr/local/bin/split-val-entry.sh" ]
+USER user
 
 FROM nitro-node-validator AS nitro-node-dev
 USER root

scripts/split-val-entry.sh

@@ -2,22 +2,15 @@
 
 xxd -l 32 -ps -c 40 /dev/urandom > /tmp/nitro-val.jwt
 
-legacyvalopts=()
 latestvalopts=()
 while [[ $1 == "--val-options"* ]]; do
-    setlegacy=true
     setlatest=true
     if [[ $1 == "--val-options-legacy" ]]; then
         setlatest=false
-    fi
-    if [[ $1 == "--val-options-latest" ]]; then
-        setlegacy=false
+        echo "warning! legacy validator options set and will have no effect"
     fi
     shift
     while [[ "$1" != "--" ]] && [[ $# -gt 0 ]]; do
-        if $setlegacy; then
-            legacyvalopts=( "${legacyvalopts[@]}" "$1" )
-        fi
         if $setlatest; then
             latestvalopts=( "${latestvalopts[@]}" "$1" )
         fi
@@ -31,12 +24,12 @@ echo launching validation servers
 # add their port to wait loop
 # edit validation-server-configs-list to include the other nodes
 /usr/local/bin/nitro-val --file-logging.enable=false --auth.addr 127.0.0.10 --auth.origins 127.0.0.1 --auth.jwtsecret /tmp/nitro-val.jwt --auth.port 52000 "${latestvalopts[@]}" &
-/home/user/nitro-legacy/bin/nitro-val --file-logging.enable=false --auth.addr 127.0.0.10 --auth.origins 127.0.0.1 --auth.jwtsecret /tmp/nitro-val.jwt --auth.port 52001 --validation.wasm.root-path /home/user/nitro-legacy/machines "${legacyvalopts[@]}" &
-for port in 52000 52001; do
+# shellcheck disable=SC2043
+for port in 52000; do
     while ! nc -w1 -z 127.0.0.10 $port; do
         echo waiting for validation port $port
         sleep 1
     done
 done
 echo launching nitro-node
-exec /usr/local/bin/nitro --validation.wasm.allowed-wasm-module-roots /home/user/nitro-legacy/machines,/home/user/target/machines --node.block-validator.validation-server-configs-list='[{"jwtsecret":"/tmp/nitro-val.jwt","url":"ws://127.0.0.10:52000"}, {"jwtsecret":"/tmp/nitro-val.jwt","url":"ws://127.0.0.10:52001"}]' "$@"
+exec /usr/local/bin/nitro --validation.wasm.allowed-wasm-module-roots /home/user/target/machines --node.block-validator.validation-server-configs-list='[{"jwtsecret":"/tmp/nitro-val.jwt","url":"ws://127.0.0.10:52000"}]' "$@"