Merge branch 'dev' into dvush-new-sc

Author: dvush

.dockerignore

@@ -3,6 +3,7 @@
 !docker/exit-tool/exit-tool-entry.sh
 !docker/exit-tool/configs
 !docker/keybase-secrets/entrypoint.sh
+!docker/ci-integration-test/entrypoint.sh
 !etc/env/dev.env.example
 !etc/tokens
 !keys/packed

.github/bors.toml

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

.github/workflows/ci.yml

@@ -2,14 +2,16 @@ name: CI
 
 on:
   pull_request:
+  push:
     branches:
-     - '*'
+    - staging
+    - trying
 
 jobs:
   ci-all:
     # We currently have two self-hosted runners, one of which is marked "DEV-CI" and other one is marder "MAIN".
     # "MAIN" is the current CI runner, "DEV-CI" is currently used to experiment with CI optimizing.
-    runs-on: self-hosted
+    runs-on: [self-hosted, MAIN]
 
     steps:
     - uses: actions/checkout@v2
@@ -42,12 +44,11 @@ jobs:
         key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
     - name: update-deps
-      # Upstream version of sqlx-cli has some incompatibilities with the sqlx version used zksync_storage.
       run: |
         rustup update stable
-        cargo install sqlx-cli --git https://github.com/alekseysidorov/sqlx.git
+        cargo install --version=0.2.0 sqlx-cli
         cargo install diesel_cli --no-default-features --features postgres
-        docker pull matterlabs/ci-integration-test:zk-latest
+        docker pull matterlabs/ci-integration-test:latest
 
     - name: zk
       run: zk

.github/workflows/promote-stage.yml

@@ -21,7 +21,7 @@ jobs:
 
     - name: init
       run: |
-        cargo sqlx --version || cargo install --version=0.1.0-beta.1 sqlx-cli
+        cargo sqlx --version || cargo install --version=0.2.0 sqlx-cli
         zk
         zk run yarn
         cp etc/tokens/{test,localhost}.json

.prettier-js.json

@@ -0,0 +1,7 @@
+{
+    "tabWidth": 4,
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": true
+}

.prettier-vue.json

@@ -0,0 +1,7 @@
+{
+    "tabWidth": 4,
+    "printWidth": 120,
+    "singleQuote": true,
+    "trailingComma": "none",
+    "bracketSpacing": true
+}

CHANGELOG.md

@@ -1,77 +0,0 @@
-# zkSync changelog
-
-### Contracts v4 and protocol (24.11.2020)
-
-- Timestamp is added to the block commitment. Rollup block timestamp validity is checked when block is committed
-  onchain.
-- Offchain ChangePubKey can be performed for smart contract wallets that can be deployed with CREATE2 when pubkey hash
-  is encoded in the CREATE2 salt parameter.
-- Governance contract can pause token deposits.
-- ChangePubKey message signature is changed.
-- Onchain operation processing changed on the contract.
-- Recursive block verifier added.
-- Onchain rollup block commitment changed, multiple blocks can be committed, verified at once.
-
-### Contracts v3 and protocol (4.09.2020)
-
-- Change pubkey operation requires fee for processing.
-- Added support for the forced exit operation which allows user to force a withdrawal from another account that does not
-  have signing key set and is older than 24h.
-
-### zksync.js 0.6.5
-
-- Support of fast withdrawals was added. Corresponding optional field was added to the object passed to the
-  `withdrawFromSyncToEthereum` method and `getTransactionFee` now accepts `FastWithdraw` fee type.
-
-### zksync.js 0.6.3
-
-- Bundled version for browsers added. File `dist/main.js` can be used in `<script>` html tag. It requires global
-  `ethers` object from [ethers-io/ethers.js](https://github.com/ethers-io/ethers.js/)
-- `zksync.crypto.loadZkSyncCrypto()` method is added for browser builds that loads and compiles
-  `zksync-crypto-web_bg.wasm` file. Should be called before any calls that use `zksync-crypto`.
-
-### zksync.js 0.6.0
-
-- Upgrade ethers to ^5.0.0
-
-### zkSync
-
-- Server: Robustness of the fee ticker's API interacting module was increased. [#786]
-- Server: A possibility to get an Ethereum tx hash for withdrawal operation was added. [#751]
-- Prover: Bug with delay between receiving a job and starting sending heartbeats was fixed.
-  [7a82dba](https://github.com/matter-labs/zksync/commit/7a82dba)
-- Server: Blocks that contain withdraw operations are sealed faster.
-  [bab346b](https://github.com/matter-labs/zksync/commit/bab346b)
-- Server: Added support for non-standard Ethereum signatures.
-  [da0670e](https://github.com/matter-labs/zksync/commit/da0670e)
-- Server: `eth_sender` module now can be disabled. [f9642e9](https://github.com/matter-labs/zksync/commit/f9642e9)
-- Server: Transfer to zero address (0x00..00) is now forbidden in zkSync.
-  [b3c72cd](https://github.com/matter-labs/zksync/commit/b3c72cd)
-- Server: WebSocket server now uses more threads for handling incoming requests.
-  [3a77363](https://github.com/matter-labs/zksync/commit/3a77363)
-
-### zksync.js
-
-- Support of WalletConnect was added. [16dd987](https://github.com/matter-labs/zksync/commit/16dd987)
-
-### Explorer
-
-- A link to the wallet was added to the explorer. [14424a6](https://github.com/matter-labs/zksync/commit/14424a6)
-- Fixed bug with accessing non-existent blocks in explorer.
-  [e8ca026](https://github.com/matter-labs/zksync/commit/e8ca026)
-
-### Contracts v2 (20.07.2020)
-
-- Added event denoting information about pending and completed withdrawals.
-  [bb0d1bd](https://github.com/matter-labs/zksync/commit/bb0d1bd)
-- Added support for tokens that aren't fully compatible with ERC20.
-  [c088328](https://github.com/matter-labs/zksync/commit/c088328)
-- Block revert interval is changed to 0 hours. [c088328](https://github.com/matter-labs/zksync/commit/c088328)
-- Redundant priority request check is removed from contract upgrade logic.
-  [c088328](https://github.com/matter-labs/zksync/commit/c088328)
-- `PRIORITY_EXPRIRATION_PERIOD` is reduced to 3 days. [c12ab40](https://github.com/matter-labs/zksync/commit/c12ab40)
-- `UPGRADE_NOTICE_PERIOD` is increased to 8 days. [c12ab40](https://github.com/matter-labs/zksync/commit/c12ab40)
-
-## zkSync 1.0 (18.06.2020)
-
-Changes prior to the 1.0 release are not presented in this changelog.