From 3dd1dd8578f76ed9faf3aefc4445bb5e054efd25 Mon Sep 17 00:00:00 2001
From: DadeKuma <mattafix68@gmail.com>
Date: Mon, 12 Feb 2024 21:45:41 +0100
Subject: [PATCH] added judge validation

---
 .github/workflows/bot_name_check.yml |  4 +-
 .github/workflows/json_check.yml     |  2 +-
 public/data/judges.json              | 37 +++++++-----------
 scripts/check_bot_names.sh           | 30 ---------------
 scripts/validate_race_names.sh       | 56 ++++++++++++++++++++++++++++
 5 files changed, 72 insertions(+), 57 deletions(-)
 delete mode 100644 scripts/check_bot_names.sh
 create mode 100644 scripts/validate_race_names.sh

diff --git a/.github/workflows/bot_name_check.yml b/.github/workflows/bot_name_check.yml
index 14c0ab7..f39f59d 100644
--- a/.github/workflows/bot_name_check.yml
+++ b/.github/workflows/bot_name_check.yml
@@ -7,7 +7,7 @@ on:
 
 jobs:
   file-check:
-    name: Check Files
+    name: Validate Bot Names
     runs-on: ubuntu-latest
 
     steps:
@@ -15,4 +15,4 @@ jobs:
         uses: actions/checkout@v2
 
       - name: Check Names
-        run: bash scripts/check_bot_names.sh
+        run: bash scripts/validate_race_names.sh
diff --git a/.github/workflows/json_check.yml b/.github/workflows/json_check.yml
index 057c1a1..90876bc 100644
--- a/.github/workflows/json_check.yml
+++ b/.github/workflows/json_check.yml
@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v1
-      - name: Validate JSON
+      - name: Validate Race Schema
         uses: docker://orrosenblatt/validate-json-action:latest
         env:
           INPUT_SCHEMA: /public/schema/races.schema.json
diff --git a/public/data/judges.json b/public/data/judges.json
index 7d6b6d8..62b574f 100644
--- a/public/data/judges.json
+++ b/public/data/judges.json
@@ -1,26 +1,15 @@
 [
-    "0x6980-bot",
-    "auditbase",
-    "baudit",
-    "Cygnet",
-    "Dragonfly",
-    "Gas-Optimzeer",
-    "GasAxy",
-    "graphium-bot",
-    "henry",
-    "Hound",
-    "IllIllI-bot",
-    "LightChaser",
-    "MrsHudson",
-    "Outis",
-    "Pechenkata",
-    "Selucruh",
-    "sol2vuln",
-    "SolidInspect",
-    "Tera",
-    "The_Madaladinator",
-    "TragedyOTCommons",
-    "ubl4nk_bot",
-    "vuln-detector",
-    "znBotty"
+    "0xA5DF",
+    "0xRobocop",
+    "__141345__",
+    "Alex The Entreprenerd",
+    "bytes032",
+    "hansfriese",
+    "KingNFT",
+    "ladboy233",
+    "minhquanym",
+    "Picodes",
+    "RaymondFam",
+    "sorryNotsorry",
+    "Trust"
 ]
\ No newline at end of file
diff --git a/scripts/check_bot_names.sh b/scripts/check_bot_names.sh
deleted file mode 100644
index 4bc6f45..0000000
--- a/scripts/check_bot_names.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-for file in public/data/races/*.json; do
-    # Read JSON file
-    data=$(<"$file")
-
-    # Read valid_names.json
-    valid_bot_names=$(<public/data/bots.json)
-
-    # Extract bot_names from data.json
-    bot_names=$(echo "$data" | jq -r '.[].data | .winner[], .A[], .B[], .C[]')
-
-    # Check if all bot_names are valid
-    invalid_names=""
-    for name in $bot_names; do
-        if ! echo "$valid_bot_names" | grep -q "$name"; then
-            invalid_names+=" $name"
-        fi
-    done
-
-    # Remove duplicate names
-    unique_invalid_names=$(echo "$invalid_names" | tr ' ' '\n' | awk '!seen[$0]++' | tr '\n' ' ')
-
-    if [ -n "$unique_invalid_names" ]; then
-        echo "Invalid bot_names found in $file: $unique_invalid_names"
-        exit 1
-    else
-        echo "All bot_names in $file are valid"
-    fi
-done
diff --git a/scripts/validate_race_names.sh b/scripts/validate_race_names.sh
new file mode 100644
index 0000000..6f33d42
--- /dev/null
+++ b/scripts/validate_race_names.sh
@@ -0,0 +1,56 @@
+#!/bin/bash
+
+# Flag to track success or failure
+successful=true
+
+for file in public/data/races/*.json; do
+    # Read JSON file
+    data=$(<"$file")
+
+    # Read valid_names.json
+    valid_bot_names=$(<public/data/bots.json)
+    valid_judge_names=$(<public/data/judges.json)
+
+    # Extract bot_names from data.json
+    bot_names=$(echo "$data" | jq -r '.[].data | .winner[], .A[], .B[], .C[]')
+    judge_names=$(echo "$data" | jq -r '.[].data | .judge[]')
+
+    # Check if all bot_names are valid
+    invalid_bot_names=""
+    for name in $bot_names; do
+        if ! echo "$valid_bot_names" | grep -q "$name"; then
+            invalid_bot_names+=" $name"
+            successful=false
+        fi
+    done
+
+    # Check if all judge_names are valid
+    invalid_judge_names=""
+    for name in $judge_names; do
+        if ! echo "$valid_judge_names" | grep -q "$name"; then
+            invalid_judge_names+=" $name"
+            successful=false
+        fi
+    done
+
+    # Remove duplicate names
+    unique_invalid_bot_names=$(echo "$invalid_bot_names" | tr ' ' '\n' | awk '!seen[$0]++' | tr '\n' ' ')
+    unique_invalid_judge_names=$(echo "$invalid_judge_names" | tr ' ' '\n' | awk '!seen[$0]++' | tr '\n' ' ')
+    
+    if [ -n "$unique_invalid_bot_names" ]; then
+        echo "Invalid bot_names found in $file: $unique_invalid_bot_names"
+    else
+        echo "All bot_names in $file are valid"
+    fi
+
+    if [ -n "$unique_invalid_judge_names" ]; then
+        echo "Invalid judge_names found in $file: $unique_invalid_judge_names"
+    else
+        echo "All judge_names in $file are valid"
+    fi
+done
+
+# Output overall success or failure
+if [ "$successful" = false ]; then
+    exit 1
+fi
\ No newline at end of file