Merge branch 'dev' into killmeplz-patch-1

Nusy · Jan 31, 2022 · 5949ff6 · 5949ff6
2 parents 69d7496 + 30c73b3
commit 5949ff6
Show file tree

Hide file tree

Showing 33 changed files with 2,682 additions and 2,358 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -194,12 +194,13 @@ jobs:
         run: ci_run zk test integration testkit --offline
 
   notify:
-    if: failure()
+    if: always()
     name: Notify on failures
     runs-on: ubuntu-latest
     needs: [lint, unit-tests, integration, circuit-tests, testkit]
     steps:
       -
+        if: failure()
         name: Notify to Mattermost (on incidents)
         uses: tferreira/matterfy@releases/v1
         with:

diff --git a/.github/workflows/npm.publish-packages.yml b/.github/workflows/npm.publish-packages.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   publish-zksync:
     name: Publish zksync.js
-    uses: matter-labs/zksync-dev/.github/workflows/npm.publish.yml@devops/publish-npm-zksync
+    uses: matter-labs/zksync-dev/.github/workflows/npm.publish.yml@dev
     with:
       working-directory: sdk/zksync.js
       build-command: |
@@ -19,3 +19,4 @@ jobs:
       ref: ${{ github.event.inputs.ref }}
     secrets:
       notify-webhook: ${{ secrets.MATTERMOST_WEBHOOK }}
+      token: ${{ secrets.NPM_TOKEN }}
diff --git a/.github/workflows/npm.publish.yml b/.github/workflows/npm.publish.yml
@@ -20,7 +20,9 @@ on:
       notify-webhook:
         description: Chat notification webhook
         required: true
-
+      token:
+        description: NPM token
+        required: true
 jobs:
   local-call-publish:
     name: Build NPM package
@@ -53,7 +55,7 @@ jobs:
         run: |
           npm publish
         env:
-          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
+          NODE_AUTH_TOKEN: ${{ secrets.token }}
       -
         if: failure()
         name: Notify to Mattermost (on incidents)

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -8,9 +8,7 @@ members = [
     "core/bin/parse_pub_data",
     "core/bin/block_revert",
     "core/bin/remove_proofs",
-    "core/bin/update_sequnce_number",
 
-    "core/bin/remove_outstanding_tx_filters",
     # Server micro-services
     "core/bin/zksync_api",
     "core/bin/zksync_core",

diff --git a/core/bin/remove_outstanding_tx_filters/Cargo.toml b/core/bin/remove_outstanding_tx_filters/Cargo.toml
diff --git a/core/bin/remove_outstanding_tx_filters/src/main.rs b/core/bin/remove_outstanding_tx_filters/src/main.rs
diff --git a/core/bin/update_sequnce_number/Cargo.toml b/core/bin/update_sequnce_number/Cargo.toml
diff --git a/core/bin/update_sequnce_number/src/main.rs b/core/bin/update_sequnce_number/src/main.rs