Merge branch 'main' into benjamin

Cardinal-Cryptography · Oct 20, 2022 · ebf4f64 · ebf4f64
2 parents da68f36 + d23bfbf
commit ebf4f64
Show file tree

Hide file tree

Showing 54 changed files with 5,497 additions and 1,330 deletions.
diff --git a/.github/scripts/run_consensus.sh b/.github/scripts/run_consensus.sh
@@ -7,6 +7,9 @@ set -euo pipefail
 NODE_COUNT=5
 MIN_VALIDATOR_COUNT=4
 
+# default minimum validator count
+MIN_VALIDATOR_COUNT=4
+
 export NODE_IMAGE=aleph-node:latest
 
 mkdir -p docker/data/

diff --git a/Cargo.lock b/Cargo.lock