Merge remote-tracking branch 'origin/snapshot/livetest' into snapshot-gnosis-merge

Author: jannikluhn

.circleci/basis.yml

@@ -1,6 +1,12 @@
 version: 2.1
 
 commands:
+  install-rsync:
+    steps:
+      - run:
+          name: Install rsync
+          command: |
+            sudo apt update && sudo apt install rsync
   install-asdf:
     steps:
       - run:

.circleci/rolling-shutter.yml

@@ -60,18 +60,29 @@ jobs:
       - restore_cache:
           keys:
             - rs-build-<< parameters.go-version >>-v4-{{ checksum "go.sum" }}-{{ checksum "go.mod" }}
+      - install-rsync
       - install-asdf
       - run:
           name: "Install asdf plugins"
           command: |
             asdf plugin add tinygo https://github.com/schmir/asdf-tinygo.git || true
             asdf plugin add binaryen https://github.com/birros/asdf-binaryen.git || true
+            asdf plugin add nodejs || true
       - run:
           name: "Install asdf managed executables"
           command: |
             asdf install tinygo
             asdf install binaryen
+            asdf install nodejs
       - run: make build wasm
+      - node/install-packages:
+          app-dir: ../js/shutter-crypto
+          override-ci-command: npm install
+      - run: make wasm-js
+      - run:
+          name: "Run WASM tests"
+          command: |
+            make wasm-js-test
       - run:
           name: "Run unit tests with gotestsum"
           command: |

.dockerignore

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

.gitignore

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

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"]