Merge branch 'dev' into dvush-new-sc

.github/workflows/ci.yml

@@ -32,14 +32,27 @@ jobs:
 
     - name: lints
       run: |
-        zk db setup # So database will be created for compilation.
+        # lint non-rust code
+        zk fmt --check
+        yarn lint:md
+        yarn lint:sol
+        # So database will be created for compilation.
+        zk db setup
         zk dummy-prover ensure-disabled
         cargo fmt --all -- --check
         # For some reason, `cargo clippy` currently doesn't work in sqlx offline mod. So, we're checking it in online mode.
         zk f cargo clippy --tests --benches -- -D warnings
         pushd sdk/zksync-crypto
         cargo fmt -- --check
         cargo clippy --all --tests --benches -- -D warnings
+    
+    - name: generic-init
+      run: |
+        # Unpack keys to build dev contracts
+        zk run verify-keys unpack
+        # EIP1271 contract is used in Rust & JS unit tests.
+        zk contract build-dev
+        zk run deploy-eip1271
 
     - name: integration-tests
       run: zk test integration all --in-docker

.gitignore

@@ -8,7 +8,6 @@
 .DS_Store
 *.bak
 node_modules
-yarn-error.log
 *.log
 target
 a.out 
@@ -18,7 +17,7 @@ tags
 
 zksync_pk.key
 dist
-npm-debug.log
+todo
 
 Cargo.lock
 !/Cargo.lock
@@ -28,10 +27,6 @@ Cargo.lock
 !/etc/env/dev.env.example
 !/etc/env/ci.env
 /etc/tokens/localhost.json
-/contracts/yarn-error.log
-/deploy.log
-/test.log
-/genesis.log
 !/keys
 /keys/*
 !/keys/packed

.markdownlintrc

@@ -0,0 +1,8 @@
+{
+    "default": true,
+    "header-increment": false,
+    "no-duplicate-header": false,
+    "no-inline-html": false,
+    "line-length": false,
+    "fenced-code-language": false
+}

.prettier-md.json

@@ -0,0 +1,9 @@
+{
+  "tabWidth": 2,
+  "printWidth": 120,
+  "parser": "markdown",
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": true,
+  "proseWrap": "always"
+}

.prettier-sol.json

@@ -0,0 +1,8 @@
+{
+  "printWidth": 120,
+  "tabWidth": 4,
+  "useTabs": false,
+  "singleQuote": false,
+  "bracketSpacing": false,
+  "explicitTypes": "always"
+}

.prettier-ts.json

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

.solhint.json

@@ -0,0 +1,3 @@
+{
+  "extends": "solhint:recommended"
+}

CHANGELOG.md

@@ -3,20 +3,20 @@
 ### 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.
+- 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.
+- 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`.
+- 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
 
@@ -26,12 +26,17 @@
 
 - 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)
+- 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)
+- 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
 
@@ -40,18 +45,21 @@
 ### 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)
+- 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)
+- 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)
+- 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.