Introduce rest zk improvements from 2.0

contracts/scripts/deploy.ts

@@ -30,9 +30,9 @@ async function main() {
     const wallet = args.deployerPrivateKey
         ? new Wallet(args.deployerPrivateKey, provider)
         : Wallet.fromMnemonic(
-            process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
-            "m/44'/60'/0'/0/1"
-        ).connect(provider);
+              process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
+              "m/44'/60'/0'/0/1"
+          ).connect(provider);
 
     const gasPrice = args.gasPrice ? parseUnits(args.gasPrice, 'gwei') : await provider.getGasPrice();
     console.log(`Using gas price: ${formatUnits(gasPrice, 'gwei')} gwei`);

contracts/scripts/upgrade-testnet.ts

@@ -41,9 +41,9 @@ async function main() {
     const wallet = args.deployerPrivateKey
         ? new Wallet(args.deployerPrivateKey, provider)
         : Wallet.fromMnemonic(
-            process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
-            "m/44'/60'/0'/0/1"
-        ).connect(provider);
+              process.env.MNEMONIC ? process.env.MNEMONIC : ethTestConfig.mnemonic,
+              "m/44'/60'/0'/0/1"
+          ).connect(provider);
 
     const gasPrice = args.gasPrice ? parseUnits(args.gasPrice, 'gwei') : await provider.getGasPrice();
     console.info(`Using gas price: ${formatUnits(gasPrice, 'gwei')} gwei`);

contracts/scripts/utils.ts

@@ -1,12 +1,30 @@
 import { ethers } from 'ethers';
 import { ParamType } from '@ethersproject/abi';
+import * as chalk from 'chalk';
+
+const warning = chalk.bold.yellow;
 
 export function web3Url() {
     return process.env.ETH_CLIENT_WEB3_URL.split(',')[0] as string;
 }
 
 export function web3Provider() {
-    return new ethers.providers.JsonRpcProvider(web3Url());
+    const provider = new ethers.providers.JsonRpcProvider(web3Url());
+
+    // Check that `CHAIN_ETH_NETWORK` variable is set. If not, it's most likely because
+    // the variable was renamed. As this affects the time to deploy contracts in localhost
+    // scenario, it surely deserves a warning.
+    const network = process.env.CHAIN_ETH_NETWORK;
+    if (!network) {
+        console.log(warning('Network variable is not set. Check if contracts/scripts/utils.ts is correct'));
+    }
+
+    // Short polling interval for local network
+    if (network === 'localhost') {
+        provider.pollingInterval = 100;
+    }
+
+    return provider;
 }
 
 export function storedBlockInfoParam(): ParamType {

contracts/src.ts/deploy.ts

@@ -2,11 +2,7 @@ import { deployContract } from 'ethereum-waffle';
 import { ethers, Signer, providers } from 'ethers';
 import { formatEther, Interface } from 'ethers/lib/utils';
 import * as fs from 'fs';
-import {
-    encodeConstructorArgs,
-    encodeProxyContstuctorArgs,
-    publishSourceCodeToEtherscan
-} from './publish-utils';
+import { encodeConstructorArgs, encodeProxyContstuctorArgs, publishSourceCodeToEtherscan } from './publish-utils';
 import {
     Governance,
     GovernanceFactory,
@@ -219,7 +215,7 @@ export class Deployer {
                     this.addresses.Verifier = parsedLog.args.verifier;
                     this.addresses.UpgradeGatekeeper = parsedLog.args.gatekeeper;
                 }
-            } catch (_) { }
+            } catch (_) {}
         }
         const txHash = deployFactoryTx.transactionHash;
         const gasUsed = deployFactoryTx.gasUsed;

docs/architecture.md

@@ -87,7 +87,6 @@ This section provides an overview on folders / sub-projects that exist in this r
 - `/etc`: Configration files.
   - `/env`: `.env` files that contain environment variables for different configuration of zkSync Server / Prover.
   - `/js`: Configuration files for JavaScript applications (such as Explorer).
-  - `/tesseracts`: Configuration for `tesseracts` minimalistic blockchain explorer (used for development).
   - `/tokens`: Configuration of supported Ethereum ERC-20 tokens.
 - `/infrastructure`: Application that aren't naturally a part of zkSync core, but are related to it.
   - `/explorer`: A blockchain explorer for zkSync network.

infrastructure/zk/src/contract.ts

@@ -27,6 +27,12 @@ export async function build() {
 }
 
 export async function publish() {
+    // Spawning a new script is expensive, so if we know that publishing is disabled, it's better to not launch
+    // it at all (even though `publish-sources` checks the network as well).
+    if (process.env.CHAIN_ETH_NETWORK == 'localhost') {
+        console.log('Skip contract publish on localhost');
+        return;
+    }
     await utils.spawn('yarn contracts publish-sources');
 }
 

infrastructure/zk/src/env.ts

@@ -99,6 +99,11 @@ export async function load() {
     process.env.ENV_DIR = envDir;
     dotenv.config({ path: envFile });
     load_docker();
+
+    // This suppresses the warning that looks like: "Warning: Accessing non-existent property 'INVALID_ALT_NUMBER'...".
+    // This warning is spawned from the `antlr4`, which is a dep of old `solidity-parser` library.
+    // Old version of `solidity-parser` is still videly used, and currently we can't get rid of it fully.
+    process.env.NODE_OPTIONS = '--no-warnings';
 }
 
 // replaces an env variable in current .env file

infrastructure/zk/src/fmt.ts

@@ -38,10 +38,10 @@ export const command = new Command('fmt')
                 await prettier(extension, cmd.check);
             }
         } else {
-            for (const ext of EXTENSIONS) {
-                await prettier(ext, cmd.check);
-            }
-            await rustfmt(cmd.check);
+            // Run all the checks in parallel.
+            const promises = EXTENSIONS.map((ext) => prettier(ext, cmd.check));
+            promises.push(rustfmt(cmd.check));
+            await Promise.all(promises);
         }
     });
 

infrastructure/zk/src/run/run.ts

@@ -52,9 +52,7 @@ export async function tokenInfo(address: string) {
 // installs all dependencies and builds our js packages
 export async function yarn() {
     await utils.spawn('yarn');
-    await utils.spawn('yarn crypto build');
-    await utils.spawn('yarn reading-tool build');
-    await utils.spawn('yarn zksync prepublish');
+    await utils.spawn('yarn init-build');
 }
 
 export async function deployTestkit(genesisRoot: string, prodContracts: boolean = false) {

package.json

@@ -26,6 +26,9 @@
     ]
   },
   "scripts": {
+    "build:zksync-sdk": "yarn zksync prepublish",
+    "build:crypto": "yarn crypto build",
+    "build:reading-tool": "yarn reading-tool build",
     "zksync": "yarn workspace zksync",
     "crypto": "yarn workspace zksync-crypto",
     "contracts": "yarn workspace franklin-contracts",
@@ -34,7 +37,8 @@
     "explorer": "yarn workspace sync-explorer",
     "zk": "yarn workspace zk",
     "reading-tool": "yarn workspace reading-tool",
-    "api-docs": "yarn workspace api-docs"
+    "api-docs": "yarn workspace api-docs",
+    "init-build": "yarn npm-run-all --parallel build:*"
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^4.10.0",
@@ -46,6 +50,7 @@
     "markdownlint-cli": "^0.24.0",
     "prettier": "^2.2.1",
     "prettier-plugin-solidity": "^1.0.0-alpha.60",
-    "solhint": "^3.3.2"
+    "solhint": "^3.3.2",
+    "npm-run-all": "^4.1.5"
   }
-}
+}