Merge branch 'dev' into breaking

.github/workflows/deploy.chat.yml

@@ -3,21 +3,21 @@ on:
   deployment:
 
 # Disable simultaneous deployments into a single environment
-concurrency: deploy-chat-${{ github.event.inputs.environment }}
+concurrency: deploy-chat-${{ github.event.deployment.environment }}
 
 jobs:
   setup:
     name: Setup
-    uses: matter-labs/zksync-dev/.github/workflows/setup.runtime.yml@dev
+    uses: ./.github/workflows/setup.runtime.yml
     with:
       find-latest-config: true
-      environment: ${{ github.event.inputs.environment }}
+      environment: ${{ github.event.deployment.environment }}
     secrets:
       github-token: ${{ secrets.GH_TOKEN }}
 
   update:
     name: Update
-    uses: matter-labs/zksync-dev/.github/workflows/server.update-config.yml@dev
+    uses: ./.github/workflows/server.update-config.yml
     needs: [setup]
     with:
       ref: ${{ needs.setup.outputs.config-tag }}
@@ -29,7 +29,7 @@ jobs:
 
   deploy:
     name: Deploy
-    uses: matter-labs/zksync-dev/.github/workflows/deploy.yml@dev
+    uses: ./.github/workflows/deploy.yml
     needs: [setup, update]
     with:
       cluster: ${{ needs.setup.outputs.cluster }}

.github/workflows/loadtest.yml

@@ -77,7 +77,7 @@ jobs:
         run: |
           mkdir -p etc/env/
           kubectl get cm -n ${ZKSYNC_ENV} server-env-custom -o json | jq -j '.data | to_entries | .[] | "\(.key)=\(.value)\n"' > etc/env/${ZKSYNC_ENV}.env
-          kubectl get secret -n ${ZKSYNC_ENV} secretenv-zksync -o go-template='{{range $k, $v := .data}}{{ printf "%s=%s\n" $k ($v | base64decode) }}{{end}}' \
+          kubectl get secret -n ${ZKSYNC_ENV} secretenv-zksync -o go-template='{{range $k, $v := .data}}{{ printf "%s=\"%s\"\n" $k ($v | base64decode) }}{{end}}' \
             >> etc/env/${ZKSYNC_ENV}.env
       -
         uses: actions/upload-artifact@v2
@@ -142,7 +142,7 @@ jobs:
   configmap:
     name: Update configMap
     runs-on: [self-hosted, deployer, "${{ needs.setup.outputs.cluster}}"]
-    needs: [setup-db]
+    needs: [setup, setup-db]
     container:
       image: dysnix/kubectl:v1.20-gcloud
       volumes:
@@ -196,6 +196,7 @@ jobs:
       MAIN_TOKEN: "BAT"
       ZKSYNC_RPC_ADDR: "https://loadtest-api.zksync.dev/jsrpc"
       ETH_NETWORK: "rinkeby"
+      ALLOWED_PERCENT: 10
       RUST_LOG: info
     steps:
       - uses: actions/checkout@v2

Cargo.toml

@@ -18,7 +18,9 @@ members = [
     "core/bin/zksync_forced_exit_requests",
 
     # Libraries
+    "core/lib/token_db_cache",
     "core/lib/circuit",
+    "core/lib/mempool",
     "core/lib/eth_client",
     "core/lib/eth_signer",
     "core/lib/gateway_watcher",

core/bin/block_revert/src/main.rs

@@ -25,6 +25,12 @@ async fn revert_blocks_in_storage(
         .return_executed_txs_to_mempool(last_block)
         .await?;
     println!("`mempool_txs`, `executed_transactions` tables are updated");
+    transaction
+        .chain()
+        .state_schema()
+        .clear_current_nonce_table(last_block)
+        .await?;
+    println!("`committed_nonce` table is updated");
     transaction
         .chain()
         .block_schema()

core/bin/server/Cargo.toml

@@ -20,6 +20,8 @@ zksync_forced_exit_requests = { path = "../zksync_forced_exit_requests", version
 
 zksync_prometheus_exporter = { path = "../../lib/prometheus_exporter", version = "1.0" }
 zksync_config = { path = "../../lib/config", version = "1.0" }
+
+zksync_mempool = { path = "../../lib/mempool", version = "1.0" }
 zksync_storage = { path = "../../lib/storage", version = "1.0" }
 zksync_gateway_watcher = { path = "../../lib/gateway_watcher", version = "1.0" }
 zksync_utils = { path = "../../lib/utils", version = "1.0" }