Merge branch 'dev' into deniallugo-update-web3

.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

@@ -65,8 +65,8 @@ jobs:
           ci_run zk db basic-setup
           ci_run zk run yarn
 
-      - name: liquidity-token
-        run: docker-compose -f docker-compose-runner.yml restart dev-liquidity-token-watcher
+      - name: restart dev-liquidity-token-watcher and dev-ticker
+        run: docker-compose -f docker-compose-runner.yml restart dev-liquidity-token-watcher dev-ticker
 
       - name: contracts-unit-tests
         run: ci_run zk test contracts
@@ -102,8 +102,8 @@ jobs:
           ci_run zk dummy-prover enable --no-redeploy
           ci_run zk init
 
-      - name: liquidity-token
-        run: docker-compose -f docker-compose-runner.yml restart dev-liquidity-token-watcher
+      - name: restart dev-liquidity-token-watcher and dev-ticker
+        run: docker-compose -f docker-compose-runner.yml restart dev-liquidity-token-watcher dev-ticker
 
       - name: run-services
         run: |
@@ -116,7 +116,9 @@ jobs:
         run: ci_run zk test i server
 
       - name: integration-api
-        run: ci_run zk test i api
+        run: |
+          ci_run zk test i api
+          ci_run zk test i api-docs
 
       - name: integration-zcli
         run: ci_run zk test i zcli

.github/workflows/deploy-apps.yml

@@ -4,7 +4,7 @@ on:
   deployment:
 
 env:
-  DEPLOY_APPS: -l name=server -l name=prover -l name=explorer
+  DEPLOY_APPS: -l name=server -l name=prover
 
 jobs:
   pre:
@@ -89,7 +89,7 @@ jobs:
         with:
           repository: matter-labs/helm-infra
           path: helm-infra
-          ref: breaking-secrets
+          ref: new-health-and-conf
           token: ${{ secrets.GH_TOKEN }}
       -
         if: ${{ needs.pre.outputs.isTag == 'true' }}

.github/workflows/deploy-stage.yml

@@ -42,7 +42,7 @@ jobs:
         echo $(pwd)/bin >> $GITHUB_PATH
     - name: init
       run: |
-        cargo sqlx --version || cargo install --version=0.2.0 sqlx-cli
+        cargo sqlx --version || cargo install sqlx-cli
         zk
         zk run yarn
         cp etc/tokens/{test,localhost}.json
@@ -53,11 +53,9 @@ jobs:
         docker login -u ${{ secrets.DOCKER_USER }} -p ${{ secrets.DOCKER_PASSWORD }}
         zk docker push rust
 
-
+  ##  !!! TODO: fix stage and enable deployments back.
+  ##  !!! TODO: breaking deployment is not supported.
   # deploy:
-  #   ## TODO: fix stage and enable deployments back.
-  #   ## NOTE: breaking deployment is not supported.
-
   #   name: Deploy to the Stage enviroment
   #   runs-on: [k8s, deployer, stage]
   #   needs: [pre, build-images]

Cargo.toml

@@ -6,7 +6,6 @@ members = [
     "core/bin/server",
     "core/bin/prover",
     "core/bin/parse_pub_data",
-    "core/bin/regen-root-hash",
     "core/bin/block_revert",
 
     # Server micro-services
@@ -35,6 +34,7 @@ members = [
     "core/lib/contracts",
     "core/lib/api_client",
     "core/lib/notifier",
+    "core/lib/api_types",
     "core/lib/balancer",
 
     # Test infrastructure

bin/api_docs

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+if [ -z "$1" ]; then
+    cd $ZKSYNC_HOME
+    yarn && yarn api-docs build
+else
+    # can't start this with yarn since it has quirks with `--` as an argument
+    node -- $ZKSYNC_HOME/infrastructure/api-docs/build/index.js "$@"
+fi

changelog/core.md

@@ -6,6 +6,8 @@ All notable changes to the core components will be documented in this file.
 
 ### Removed
 
+- (`api_server`): REST API v1.0.
+
 ### Changed
 
 - (`loadtest`): `zksync_fee` has been moved to `[main_wallet]` section from the `[network]` section.
@@ -16,6 +18,7 @@ All notable changes to the core components will be documented in this file.
 - (`api_server`): Make `submit_txs_batch` send only one signature request.
 - Fast withdrawals now can trigger aggregated block execution.
 - Replaced `anyhow` errors with typed errors in `lib/state`, `lib/crypto` and `lib/types`.
+- (`fee-ticker`): Batch fee now includes `zkp_fee` and `gas_fee`.
 
 ### Added
 
@@ -30,6 +33,11 @@ All notable changes to the core components will be documented in this file.
 - (`api_server`): Support for accounts that don't have to pay fees (e.g. network service accounts) was added.
 - Added `BlockMetadata` structure and corresponding table to track block data that is not related to protocol.
 - (`block_revert`): CLI that calls `revertBlocks` smart contract function and updates the database respectively.
+- (`api_server`): Added REST API v0.2.
+- (`api_client`): Client for REST API v0.2.
+- (`api_types`): Crate for storing types that are used in API.
+- Added hashes for batches and additional hashes for priority operations.
+- Added `ForcedExit` fee type to REST API v0.2 and JSON RPC API.
 
 ### Fixed
 

changelog/infrastructure.md

@@ -15,9 +15,12 @@ components, the logs will have the following format:
 
 ### Added
 
+- (`api-docs`): tool for generating and testing API documentation. Docs are generated from a bunch of .apib files where
+  API endpoints and their inputs/outputs are defined.
 - (`token_list_manager`): CLI for updating to new version of a previously saved list of trusted tokens.
-
 - (`loadnext`): Crate, a new implementation of the loadtest for zkSync.
+- (`api-docs`): tool for generating and testing API documentation. Docs are generated from a bunch of .apib files where
+  API endpoints and their inputs/outputs are defined.
 
 ### Fixed
 

changelog/js-sdk.md

@@ -8,10 +8,25 @@ All notable changes to `zksync.js` will be documented in this file.
 
 - Methods for working with NFTs. You can read more [here](https://zksync.io/dev/nfts.html).
 - Methods for working with atomic swaps/limit orders. You can read more [here](https://zksync.io/dev/swaps.html).
+- `RestProvider` class, that is used for querying REST API v0.2.
+- `SyncProvider` interface: common interface for API v0.2 `RestProvider` and JSON RPC `Provider`.
+- Types for REST API v0.2.
+
+- `RestProvider` class, that is used for queriing REST API v0.2.
+- `SyncProvider` interface: common interface for API v0.2 `RestProvider` and JSON RPC `Provider`.
+- Types for REST API v0.2.
 
 ### Changed
 
+- Changed type of `provider` field in `Wallet` class from `Provider` to `SyncProvider`.
+- `ForcedExit` fee type is used for `ForcedExit` transactions instead of `Withdraw` fee type.
 - `zksync-crypto` to support atomic swaps/limit orders functionality.
+- Changed type of `provider` field in `Wallet` class from `Provider` to `SyncProvider`.
+- `ForcedExit` fee type is used for `ForcedExit` transactions instead of `Withdraw` fee type.
+
+### Deprecated
+
+### Fixed
 
 ## Version 0.10.9 (13.04.2021)