From fc495a9c6ca111b31d0d870d6a6c9565e1634888 Mon Sep 17 00:00:00 2001
From: Volker Mische <volker.mische@gmail.com>
Date: Thu, 6 Aug 2020 15:29:33 +0200
Subject: [PATCH 1/2] feat: add script to verify parameter checksums in
 parameters.json

This commit adds a script to verify that a `.params` file (and the corresponding
`.vk file`) is part of the `parameters.json` and has the correct checksums.
---
 scripts/verify-parameters-json.sh | 58 +++++++++++++++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100755 scripts/verify-parameters-json.sh

diff --git a/scripts/verify-parameters-json.sh b/scripts/verify-parameters-json.sh
new file mode 100755
index 000000000..474c53522
--- /dev/null
+++ b/scripts/verify-parameters-json.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# This script verifies that a given `.params` file (and the corresponding
+# `.vk` file) is part of `parameters.json` as has the correct digest.
+#
+# This script runs on POSIX compatible shells. You need to have standard
+# utilities (`basename`, `head`, `grep`) as well as have `jq` and `b2sum`
+# installed.
+#
+# The input a `parameter.json` file and a `.params' file.
+
+if [ "${#}" -ne 1 ]; then
+    echo "Verify that a given .params file (and the corresponding .vk file)"
+    echo "is part of parameters.json as has the correct digest."
+    echo ""
+    echo "Usage: $(basename "${0}") parameters.json parameter-file.params"
+    exit 1
+fi
+
+if ! command -v b2sum >/dev/null 2>&1
+then
+    echo "ERROR: 'b2sum' needs to be installed."
+    exit 1
+fi
+
+if ! command -v jq >/dev/null 2>&1
+then
+    echo "ERROR: 'jq' needs to be installed."
+    exit 1
+fi
+
+PARAMS_JSON=${1}
+PARAMS_ID="${2%.*}"
+
+PARAMS_FILE="${PARAMS_ID}.params"
+VK_FILE="${PARAMS_ID}.vk"
+
+# Transforms the `parameters.json` into a string that consists of digest and
+# filename pairs.
+PARAMS_JSON_DATA=$(jq -r 'to_entries[] | "\(.value.digest) \(.key)"' "${PARAMS_JSON}")
+
+VK_HASH_SHORT=$(b2sum "${VK_FILE}"|head --bytes 32)
+if echo "${PARAMS_JSON_DATA}"|grep --silent "${VK_HASH_SHORT} ${VK_FILE}"; then
+    echo "ok Correct digest of VK file was found in ${PARAMS_JSON}."
+else
+    echo "not ok ERROR: Digest of VK file was *not* found/correct in ${PARAMS_JSON}."
+    exit 1
+fi
+
+PARAMS_HASH_SHORT=$(b2sum "${PARAMS_FILE}"|head --bytes 32)
+if echo "${PARAMS_JSON_DATA}"|grep --silent "${PARAMS_HASH_SHORT} ${PARAMS_FILE}"; then
+    echo "ok Correct digest of params file was found in ${PARAMS_JSON}."
+else
+    echo "not ok ERROR: Digest of params file was *not* found/correct in ${PARAMS_JSON}."
+    exit 1
+fi
+
+echo "# Verification successfully completed."

From 5d8cca2b34634cba22d3b3c25bd22af30e844d86 Mon Sep 17 00:00:00 2001
From: nemo <nemo@protocol.ai>
Date: Fri, 7 Aug 2020 13:48:30 -0400
Subject: [PATCH 2/2] fix: update typos and parameter count checking

---
 scripts/verify-parameters-json.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/verify-parameters-json.sh b/scripts/verify-parameters-json.sh
index 474c53522..0e5e09256 100755
--- a/scripts/verify-parameters-json.sh
+++ b/scripts/verify-parameters-json.sh
@@ -1,17 +1,17 @@
 #!/bin/sh
 
 # This script verifies that a given `.params` file (and the corresponding
-# `.vk` file) is part of `parameters.json` as has the correct digest.
+# `.vk` file) is part of `parameters.json` and has the correct digest.
 #
 # This script runs on POSIX compatible shells. You need to have standard
 # utilities (`basename`, `head`, `grep`) as well as have `jq` and `b2sum`
 # installed.
 #
-# The input a `parameter.json` file and a `.params' file.
+# The inputs are a `parameter.json` file and a `.params' file.
 
-if [ "${#}" -ne 1 ]; then
+if [ "${#}" -ne 2 ]; then
     echo "Verify that a given .params file (and the corresponding .vk file)"
-    echo "is part of parameters.json as has the correct digest."
+    echo "is part of parameters.json and has the correct digest."
     echo ""
     echo "Usage: $(basename "${0}") parameters.json parameter-file.params"
     exit 1