Merge remote-tracking branch 'origin/dev' into popzxc-zks-187-compile…

…-env

# Conflicts:
#	Cargo.lock
#	contracts/scripts/add-erc20-token.ts
#	core/bin/gen_token_add_contract/src/main.rs
#	etc/env/dev.env.example
#	infrastructure/fee-seller/index.ts
#	infrastructure/tok_cli/src/main.rs

.dockerignore

@@ -18,6 +18,5 @@
 !infrastructure/explorer/index.html
 !infrastructure/explorer/dist
 !infrastructure/fee-seller
-!infrastructure/tok_cli
 !infrastructure/zk
 !sdk/zksync-rs

.eslintignore

@@ -0,0 +1,7 @@
+./volumes/**/*
+node_modules
+**/node_modules/** 
+build/
+dist/
+volumes/
+.tslintrc.js

.github/bors.toml

@@ -1,3 +1,4 @@
 status = ["ci-all"]
 delete_merged_branches = true
 update_base_for_deletes = true
+timeout_sec = 7200

.github/workflows/ci.yml

@@ -34,18 +34,10 @@ jobs:
           contracts/dev-contracts/generated
         key: ${{ runner.os }}-contracts-${{ hashFiles('contracts/contracts/*.sol') }}
 
-    - name: cache-rust
-      uses: actions/cache@v2
-      with:
-        path: |
-          ~/.cargo/registry
-          ~/.cargo/git
-          target
-        key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
     - name: update-deps
       run: |
-        rustup update stable
+        rustup update 1.48.0
+        rustup default 1.48.0
         cargo install --version=0.2.0 sqlx-cli
         cargo install diesel_cli --no-default-features --features postgres
         docker pull matterlabs/ci-integration-test:latest
@@ -57,8 +49,7 @@ jobs:
       run: |
         # lint non-rust code
         zk fmt --check
-        yarn lint:md
-        yarn lint:sol
+        zk lint --check
         zk dummy-prover ensure-disabled
         cargo fmt --all -- --check
         zk f cargo clippy --tests --benches -- -D warnings