Merge pull request #514 from shutter-network/gnosis

Merge gnosis into main

Author: jannikluhn

.dockerignore

@@ -1,8 +1,8 @@
 contracts/combined.json
 contracts/node_modules
 contracts/deployments
-docker/data
+docker/data*
 play/work
-play/Dockerfile
-rolling-shutter/bin
+rolling-shutter/bin/rolling-shutter
+rolling-shutter/bin/shutter-crypto.wasm
 tools/snapshot/dummyserver/dist

.gitignore

@@ -3,7 +3,7 @@
 .direnv
 .lsp
 .vscode
-docker/data
+docker/data*
 log
 node_modules
 result

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         require_serial: true
 
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v4.5.0
     hooks:
       - id: check-added-large-files
         args: ["--maxkb=1000"]
@@ -33,7 +33,7 @@ repos:
       - id: trailing-whitespace
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.1
+    rev: v3.1.0
     hooks:
       - id: prettier
         additional_dependencies:
@@ -59,12 +59,12 @@ repos:
           ]
 
   - repo: https://github.com/pre-commit/mirrors-eslint
-    rev: "v8.4.1"
+    rev: "v8.56.0"
     hooks:
       - id: eslint
 
   - repo: https://github.com/shutter-network/pre-commit-go-hooks
-    rev: "7a66f5523b34139615a0c95f2b8a441dbc1778dc"
+    rev: "53239641ec106cda9a7acf9150c98be8d5ffa1ec"
     hooks:
       - id: shfmt
         args: ["-i", "4"]

.tool-versions

@@ -2,12 +2,12 @@ babashka 1.3.182
 binaryen 114
 circleci 0.1.28811
 clojure 1.11.1.1386
-golang 1.21.3
+golang 1.21.4
 golangci-lint 1.55.2
 java temurin-17.0.5+8
 nodejs 18.17.0
 postgres 14.2
-pre-commit 3.3.3
+pre-commit 3.6.0
 protoc 22.3
 shfmt 3.7.0
 solidity 0.8.9

docker/00-build.sh

@@ -2,5 +2,4 @@
 
 source ./common.sh
 
-$DC --profile dev down
 $DC --profile dev build

docker/01-init-db.sh

@@ -2,6 +2,11 @@
 
 source ./common.sh
 
+mkdb() {
+    $DC exec -T db createdb -U postgres $1
+    $DC run -T --rm --no-deps $1 initdb --config /config/${1}.toml
+}
+
 $DC stop db
 $DC rm -f db
 
@@ -11,8 +16,9 @@ $DC up -d db
 $DC run --rm --no-deps dockerize -wait tcp://db:5432 -timeout 40s
 
 for cmd in snapshot keyper-0 keyper-1 keyper-2 keyper-3; do
-    $DC exec db createdb -U postgres $cmd
-    $DC run --rm --no-deps $cmd initdb --config /config/${cmd}.toml
+    mkdb $cmd &
 done
 
+wait
+
 $DC stop db

docker/03-run.sh

@@ -4,5 +4,3 @@ source ./common.sh
 
 echo "Starting entire system"
 $DC --profile dev up -d
-sleep 5
-$DC ps

docker/05-test.sh

@@ -7,7 +7,7 @@ echo "Testing decryption key generation"
 EPOCH_ID=$(LC_ALL=C tr -dc 'a-f0-9' </dev/urandom | head -c64)
 json_body="{\"jsonrpc\": \"2.0\", \"method\": \"get_decryption_key\", \"id\": 1, \"params\": [\"1\", \"${EPOCH_ID}\"]}"
 curl -XGET http://localhost:8754/api/v1/rpc -d "${json_body}"
-sleep 3
+sleep 5
 DECRYPTION_KEY_MSGS=$(${DC} logs snapshot | grep ${EPOCH_ID} | grep -c decryptionKey)
 if [[ $DECRYPTION_KEY_MSGS -gt 0 ]]; then
     echo "Decryption successful with $DECRYPTION_KEY_MSGS / 3 nodes"

docker/10-change-keyperset.sh

@@ -2,4 +2,6 @@
 
 source ./common.sh
 
-$DC run --rm --no-deps deploy-contracts run scripts/change-keypers.js
+TARGET_INDEX=${1:-1}
+
+$DC run --rm --no-deps -e KEYPER_SET_INDEX=${TARGET_INDEX} deploy-contracts run scripts/change-keypers.js

docker/build-src/metrics/Dockerfile

@@ -2,4 +2,4 @@ FROM victoriametrics/victoria-metrics
 
 COPY targets.yaml /targets.yaml
 
-CMD ["-promscrape.config=/targets.yaml"]
+CMD ["-promscrape.config=/targets.yaml", "-search.latencyOffset=0s"]