Merge branch 'dev' into dvush-new-sc

.githooks/pre-commit

@@ -6,7 +6,7 @@
 RED='\033[0;31m'
 NC='\033[0m' # No Color
 
-# Check that `rustfmt` rules are not violated.
+# Check that Rust formatting rules are not violated.
 if ! cargo fmt -- --check; then
     echo -e "${RED}Commit error!${NC}"
     echo "Please format the code via 'cargo fmt', cannot commit unformatted code"

.githooks/pre-push

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# Pre-push hook verifying that inappropriate code will not be pushed.
+
+# Colors for the terminal output
+RED='\033[0;31m'
+NC='\033[0m' # No Color
+
+# Check that prettier formatting rules are not violated.
+if ! zk fmt --check; then
+    echo -e "${RED}Commit error!${NC}"
+    echo "Please format the code via 'zk fmt', cannot push unformatted code"
+    exit 1
+fi

.github/workflows/ci.yml

@@ -7,7 +7,9 @@ on:
 
 jobs:
   ci-all:
-    runs-on: self-hosted
+    # 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, MAIN]
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/promote-stage.yml

@@ -6,7 +6,9 @@ on:
 
 jobs:
   build-images:
-    runs-on: self-hosted
+    # 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, MAIN]
 
     steps:
     - uses: actions/checkout@v2

CHANGELOG.md

@@ -2,15 +2,16 @@
 
 ### 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.
+- 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.

contracts/contracts/ZkSync.sol

@@ -444,7 +444,10 @@ contract ZkSync is UpgradeableMaster, Storage, Config, Events, ReentrancyGuard {
             ++currentTotalBlocksProofed;
 
             uint256 mask = (~uint256(0)) >> 3;
-            require(_proof.commitments[_commitmentIdxs[i]] & mask == uint256(_committedBlocks[i].commitment) & mask, "pbl3"); // incorrect block commitment in proof
+            require(
+                _proof.commitments[_commitmentIdxs[i]] & mask == uint256(_committedBlocks[i].commitment) & mask,
+                "pbl3"
+            ); // incorrect block commitment in proof
         }
 
         bool success =

contracts/hardhat.config.ts

@@ -2,26 +2,26 @@ import '@nomiclabs/hardhat-waffle';
 import '@nomiclabs/hardhat-solpp';
 import 'hardhat-typechain';
 import 'hardhat-contract-sizer';
-import "@nomiclabs/hardhat-etherscan";
+import '@nomiclabs/hardhat-etherscan';
 
 const prodConfig = {
     // UPGRADE_NOTICE_PERIOD: 0,
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 127,
     // PRIORITY_EXPIRATION: 101,
     DUMMY_VERIFIER: false
-}
+};
 const testnetConfig = {
     UPGRADE_NOTICE_PERIOD: 0,
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 127,
     // PRIORITY_EXPIRATION: 101,
     DUMMY_VERIFIER: false
-}
+};
 const testConfig = {
     UPGRADE_NOTICE_PERIOD: 0,
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 5,
     PRIORITY_EXPIRATION: 101,
     DUMMY_VERIFIER: true
-}
+};
 
 const localConfig = Object.assign({}, prodConfig);
 localConfig.DUMMY_VERIFIER = process.env.DUMMY_VERIFIER ? true : localConfig.DUMMY_VERIFIER;
@@ -30,8 +30,8 @@ const contractDefs = {
     rinkeby: testnetConfig,
     ropsten: testnetConfig,
     mainnet: prodConfig,
-    test:  testConfig,
-    localhost: localConfig,
+    test: testConfig,
+    localhost: localConfig
 };
 
 export default {
@@ -51,10 +51,10 @@ export default {
         sources: './contracts'
     },
     solpp: {
-        defs: process.env.ETH_NETWORK ? contractDefs[process.env.ETH_NETWORK] : contractDefs["test"],
+        defs: process.env.ETH_NETWORK ? contractDefs[process.env.ETH_NETWORK] : contractDefs['test']
     },
     networks: {
-        env : {
+        env: {
             url: process.env.WEB3_URL
         }
     },

contracts/scripts/add-erc20-token.ts

@@ -1,8 +1,12 @@
 import { ArgumentParser } from 'argparse';
 import { BigNumber, Wallet, ethers } from 'ethers';
 import { Deployer } from '../src.ts/deploy';
+import * as fs from 'fs';
+import * as path from 'path';
 
 const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
 async function main() {
     const parser = new ArgumentParser({
@@ -17,9 +21,10 @@ async function main() {
     const args = parser.parseArgs(process.argv.slice(2));
 
     const deployer = new Deployer({ deployWallet: ethers.Wallet.createRandom() });
+
     const governorWallet = args.deployerPrivateKey
         ? new Wallet(args.deployerPrivateKey, provider)
-        : Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
+        : Wallet.fromMnemonic(ethTestConfig.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
 
     console.log('Adding new ERC20 token to network: ', args.tokenAddress);
 

contracts/scripts/deploy-eip1271.ts

@@ -8,26 +8,27 @@ import { deployContract } from 'ethereum-waffle';
 import * as fs from 'fs';
 import * as path from 'path';
 
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const EIP1271TestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eip1271.json`, { encoding: 'utf-8' }));
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
+
 (async () => {
     try {
         if (!['test', 'localhost'].includes(process.env.ETH_NETWORK)) {
             console.error('This deploy script is only for localhost-test network');
             process.exit(1);
         }
 
-        const testConfigPath = path.join(process.env.ZKSYNC_HOME, `etc/test_config/constant/eip1271.json`);
-        const testConfig = JSON.parse(fs.readFileSync(testConfigPath, { encoding: 'utf-8' }));
-
         const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
         provider.pollingInterval = 10;
 
-        const deployWallet = ethers.Wallet.fromMnemonic(process.env.TEST_MNEMONIC, "m/44'/60'/0'/0/0").connect(
+        const deployWallet = ethers.Wallet.fromMnemonic(ethTestConfig.test_mnemonic, "m/44'/60'/0'/0/0").connect(
             provider
         );
         const smartWallet = await deployContract(
             deployWallet,
-            readContractCode('AccountMock'),
-            [testConfig.owner_address],
+            readContractCode('dev-contracts/AccountMock'),
+            [EIP1271TestConfig.owner_address],
             {
                 gasLimit: 5000000
             }

contracts/scripts/deploy-erc20.ts

@@ -3,9 +3,14 @@ import { deployContract } from 'ethereum-waffle';
 import { ethers, Wallet } from 'ethers';
 import { readContractCode } from '../src.ts/deploy';
 import { parseEther } from 'ethers/lib/utils';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
 const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
-const wallet = Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
+const wallet = Wallet.fromMnemonic(ethTestConfig.mnemonic, "m/44'/60'/0'/0/1").connect(provider);
 
 type Token = {
     address: string | null;
@@ -24,7 +29,9 @@ async function deployToken(token: Token): Promise<Token> {
 
     await erc20.mint(wallet.address, parseEther('3000000000'));
     for (let i = 0; i < 10; ++i) {
-        const testWallet = Wallet.fromMnemonic(process.env.TEST_MNEMONIC, "m/44'/60'/0'/0/" + i).connect(provider);
+        const testWallet = Wallet.fromMnemonic(ethTestConfig.test_mnemonic as string, "m/44'/60'/0'/0/" + i).connect(
+            provider
+        );
         await erc20.mint(testWallet.address, parseEther('3000000000'));
     }
     token.address = erc20.address;

contracts/scripts/deploy-testkit.ts

@@ -2,6 +2,11 @@ import { ethers, Wallet } from 'ethers';
 import { Deployer, readContractCode, readTestContracts, readProductionContracts } from '../src.ts/deploy';
 import { deployContract } from 'ethereum-waffle';
 import { ArgumentParser } from 'argparse';
+import * as fs from 'fs';
+import * as path from 'path';
+
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
 (async () => {
     const parser = new ArgumentParser({
@@ -26,7 +31,7 @@ import { ArgumentParser } from 'argparse';
     const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
     provider.pollingInterval = 10;
 
-    const deployWallet = ethers.Wallet.fromMnemonic(process.env.TEST_MNEMONIC, "m/44'/60'/0'/0/0").connect(provider);
+    const deployWallet = ethers.Wallet.fromMnemonic(ethTestConfig.test_mnemonic, "m/44'/60'/0'/0/0").connect(provider);
     // todo: should be decided when building
     const contracts = readProductionContracts();
     const deployer = new Deployer({ deployWallet, contracts, verbose: true });
@@ -48,7 +53,7 @@ import { ArgumentParser } from 'argparse';
     }
 
     for (let i = 0; i < 10; ++i) {
-        const testWallet = Wallet.fromMnemonic(process.env.TEST_MNEMONIC, "m/44'/60'/0'/0/" + i).connect(provider);
+        const testWallet = Wallet.fromMnemonic(ethTestConfig.test_mnemonic, "m/44'/60'/0'/0/" + i).connect(provider);
         await (await erc20.mint(testWallet.address, '0x4B3B4CA85A86C47A098A224000000000')).wait();
     }
 })();

contracts/scripts/deploy-testnet-token.ts

@@ -3,10 +3,14 @@ import { ethers, Wallet } from 'ethers';
 import { readContractCode } from '../src.ts/deploy';
 import { encodeConstructorArgs, publishSourceCodeToEtherscan } from '../src.ts/publish-utils';
 import * as fs from 'fs';
+import * as path from 'path';
 import { ArgumentParser } from 'argparse';
 
 const mainnetTokens = require(`${process.env.ZKSYNC_HOME}/etc/tokens/mainnet`);
 
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
+
 (async () => {
     const parser = new ArgumentParser({
         version: '0.1.0',
@@ -18,10 +22,14 @@ const mainnetTokens = require(`${process.env.ZKSYNC_HOME}/etc/tokens/mainnet`);
         action: 'storeTrue',
         help: 'Only publish code for deployed tokens'
     });
+    parser.addArgument('--deployerPrivateKey', { required: false, help: 'Wallet used to deploy contracts' });
     const args = parser.parseArgs(process.argv.slice(2));
 
     const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
-    const wallet = Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
+    const wallet = args.deployerPrivateKey
+        ? new Wallet(args.deployerPrivateKey, provider)
+        : Wallet.fromMnemonic(ethTestConfig.mnemonic, "m/44'/60'/0'/0/1").connect(provider);
+
     const contractCode = readContractCode('TestnetERC20Token');
 
     if (process.env.ETH_NETWORK === 'mainnet') {

contracts/scripts/deploy.ts

@@ -2,8 +2,12 @@ import { ArgumentParser } from 'argparse';
 import { ethers, Wallet } from 'ethers';
 import { Deployer } from '../src.ts/deploy';
 import { formatUnits, parseUnits } from 'ethers/lib/utils';
+import * as fs from 'fs';
+import * as path from 'path';
 
 const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
+const testConfigPath = path.join(process.env.ZKSYNC_HOME as string, `etc/test_config/constant`);
+const ethTestConfig = JSON.parse(fs.readFileSync(`${testConfigPath}/eth.json`, { encoding: 'utf-8' }));
 
 (async () => {
     const parser = new ArgumentParser({
@@ -25,7 +29,7 @@ const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
 
     const wallet = args.deployerPrivateKey
         ? new Wallet(args.deployerPrivateKey, provider)
-        : Wallet.fromMnemonic(process.env.MNEMONIC, "m/44'/60'/0'/0/1").connect(provider);
+        : Wallet.fromMnemonic(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`);
@@ -55,8 +59,8 @@ const provider = new ethers.providers.JsonRpcProvider(process.env.WEB3_URL);
     if (args.contract === 'Governance' || args.contract == null) {
         await deployer.deployGovernanceTarget({ gasPrice, nonce: args.nonce });
     }
-    //
-    // if (args.contract === 'Proxies' || args.contract == null) {
-    //     await deployer.deployProxiesAndGatekeeper({ gasPrice, nonce: args.nonce });
-    // }
+
+    if (args.contract === 'Proxies' || args.contract == null) {
+        await deployer.deployProxiesAndGatekeeper({ gasPrice, nonce: args.nonce });
+    }
 })();