Merge pull request #1421 from matter-labs/breaking

Breaking change - contract update V5,V6

.dockerignore

@@ -2,6 +2,7 @@
 !docker/prover/prover-entry.sh
 !docker/exit-tool/exit-tool-entry.sh
 !docker/exit-tool/configs
+!docker/data-restore/data-restore-entry.sh
 !docker/keybase-secrets/entrypoint.sh
 !docker/ci-integration-test/entrypoint.sh
 !docker/zk/entrypoint.sh

.github/bors.toml

@@ -1,4 +1,4 @@
-status = ["lint", "unit-tests", "integration", "testkit"]
+status = ["lint", "unit-tests", "integration", "testkit", "circuit-tests"]
 delete_merged_branches = true
 update_base_for_deletes = true
 timeout_sec = 7200

.github/workflows/ci.yml

@@ -34,10 +34,7 @@ jobs:
         run: |
           ci_run zk
           ci_run zk fmt --check
-          ci_run zk lint rust --check
-          ci_run zk lint js --check
-          ci_run zk lint ts --check
-          ci_run zk lint md --check
+          ci_run zk lint --check
 
   unit-tests:
     runs-on: [self-hosted, CI-worker]
@@ -78,7 +75,7 @@ jobs:
         run: ci_run zk test js
 
       - name: rust-unit-tests
-        run: ci_run zk test rust
+        run: ci_run zk test server-rust
 
   integration:
     runs-on: [self-hosted, FAST]
@@ -138,6 +135,25 @@ jobs:
           ci_run cat server.log
           ci_run cat dummy_prover.log
 
+  circuit-tests:
+    runs-on: [self-hosted, CI-worker]
+
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: prepare
+        run: |
+          echo ZKSYNC_HOME=$(pwd) >> $GITHUB_ENV
+          echo $(pwd)/bin >> $GITHUB_PATH
+
+      - name: init
+        run: |
+          ci_run ln -s /usr/src/keys/setup keys/setup
+          ci_run zk
+          ci_run zk run verify-keys unpack
+
+      - name: circuit-tests
+        run: ci_run zk test crypto-rust
 
   testkit:
     runs-on: [self-hosted, CI-worker]

.github/workflows/deploy-apps.yml

@@ -27,17 +27,17 @@ jobs:
           key: "${{ github.event.deployment.environment }}"
           map: |
             {
-              "mainnet": {
+              "^mainnet$": {
                 "KUBECONF": "KUBECONF_MAINNET",
                 "HFENV": "prod",
                 "RUNNER": "mainnet"
               },
-              "rinkeby": {
+              "^rinkeby$": {
                 "KUBECONF": "KUBECONF_TESTNET",
                 "HFENV": "${{ github.event.deployment.environment }}",
                 "RUNNER": "testnet"
               },
-              "ropsten": {
+              "^ropsten$": {
                 "KUBECONF": "KUBECONF_TESTNET",
                 "HFENV": "${{ github.event.deployment.environment }}",
                 "RUNNER": "testnet"
@@ -68,7 +68,6 @@ jobs:
     name: Deploy Apps
     runs-on: [k8s, deployer, "${{ needs.pre.outputs.runner }}"]
     needs: pre
-    if: ${{ needs.pre.outputs.isTag == 'true' }}
 
     container:
       image: dysnix/kubectl:v1.19-gcloud
@@ -80,17 +79,20 @@ jobs:
 
     steps:
       -
+        if: ${{ needs.pre.outputs.isTag == 'true' }}
         name: Create ~/.kube/config
         run: mkdir -p ~/.kube && echo "$KUBECONF" | base64 -d > ~/.kube/config
       -
+        if: ${{ needs.pre.outputs.isTag == 'true' }}
         name: Clone helm-infra
         uses: actions/checkout@v2
         with:
           repository: matter-labs/helm-infra
           path: helm-infra
-          ref: master
+          ref: new-health-and-conf
           token: ${{ secrets.GH_TOKEN }}
       -
+        if: ${{ needs.pre.outputs.isTag == 'true' }}
         name: Deploy apps
         working-directory: helm-infra
         run: |
@@ -100,25 +102,25 @@ jobs:
           UPDATE_REPOS=y helmfile -e $HFENV repos
           helmfile -e $HFENV $DEPLOY_APPS apply --args "timeout 180s"
       -
+        if: success() && needs.pre.outputs.isTag == 'true'
         name: Update deployment status (success)
-        if: success()
         uses: chrnorm/deployment-status@releases/v1
         with:
           token: ${{ github.token }}
           state: success
           deployment_id: ${{ github.event.deployment.id }}
       -
+        if: failure() && needs.pre.outputs.isTag == 'true'
         name: Update deployment status (failure)
-        if: failure()
         uses: chrnorm/deployment-status@releases/v1
         with:
           token: ${{ github.token }}
           state: failure
           deployment_id: ${{ github.event.deployment.id }}
       -
+        if: failure() && needs.pre.outputs.isTag == 'true'
         name: Notify to Mattermost (on failure)
         uses: tferreira/matterfy@releases/v1
-        if: failure()
         with:
           type: ${{ job.status }}
           job_name: '*Deployment to "${{ github.event.deployment.environment }}" failed*'