Start fixing issues after merge

contracts/contract-templates/TokenInitTemplate.template

@@ -1,4 +1,4 @@
-pragma solidity ^0.5.0;
+pragma solidity ^0.7.0;
 
 contract TokenDeployInit {
     function getTokens() internal pure returns (address[] memory) {

contracts/contracts/TokenInit.sol

@@ -1,10 +1,12 @@
-// SPDX-License-Identifier: MIT OR Apache-2.0
-
 pragma solidity ^0.7.0;
 
 contract TokenDeployInit {
     function getTokens() internal pure returns (address[] memory) {
-        address[] memory tokens = new address[](0);
+        address[] memory tokens = new address[](4);
+        tokens[0] = 0x472d533243475f40221F3fD22C5bA5F98c71D10B;
+        tokens[1] = 0x1412295a435aB93CC9082FeaB48532170189E0D2;
+        tokens[2] = 0x623CFDc6F8D2011A2607254D2Fa4582691b66A45;
+        tokens[3] = 0xAd4E5DE9646A905a57e26ba99d58538BcA48bf28;
         return tokens;
     }
 }

contracts/hardhat.config.ts

@@ -9,20 +9,20 @@ const prodConfig = {
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 127,
     // PRIORITY_EXPIRATION: 101,
     DUMMY_VERIFIER: false,
-    UPGRADE_FROM_V3: true
+    UPGRADE_FROM_V3: true,
 };
 const testnetConfig = {
     UPGRADE_NOTICE_PERIOD: 0,
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 127,
     // PRIORITY_EXPIRATION: 101,
     DUMMY_VERIFIER: false,
-    UPGRADE_FROM_V3: true
+    UPGRADE_FROM_V3: true,
 };
 const testConfig = {
     UPGRADE_NOTICE_PERIOD: 0,
     MAX_AMOUNT_OF_REGISTERED_TOKENS: 5,
     PRIORITY_EXPIRATION: 101,
-    DUMMY_VERIFIER: true
+    DUMMY_VERIFIER: true,
 };
 
 const localConfig = Object.assign({}, prodConfig);
@@ -33,7 +33,7 @@ const contractDefs = {
     ropsten: testnetConfig,
     mainnet: prodConfig,
     test: testConfig,
-    localhost: localConfig
+    localhost: localConfig,
 };
 
 export default {
@@ -42,33 +42,33 @@ export default {
         settings: {
             optimizer: {
                 enabled: true,
-                runs: 200
-            }
-        }
+                runs: 200,
+            },
+        },
     },
     contractSizer: {
-        runOnCompile: false
+        runOnCompile: false,
     },
     paths: {
-        sources: './contracts'
+        sources: './contracts',
     },
     solpp: {
         defs: (() => {
             if (process.env.CONTRACT_TESTS) {
                 return contractDefs.test;
             }
-            return contractDefs[process.env.ETH_NETWORK];
-        })()
+            return contractDefs[process.env.CHAIN_ETH_NETWORK];
+        })(),
     },
     networks: {
         env: {
-            url: process.env.WEB3_URL
+            url: process.env.ETH_CLIENT_WEB3_URL,
         },
         hardhat: {
-            allowUnlimitedContractSize: true
-        }
+            allowUnlimitedContractSize: true,
+        },
     },
     etherscan: {
-        apiKey: process.env.ETHERSCAN_API_KEY
-    }
+        apiKey: process.env.MISC_ETHERSCAN_API_KEY,
+    },
 };

contracts/scripts/publish.ts

@@ -4,7 +4,7 @@ import { ethers } from 'ethers';
 const hre = require('hardhat');
 
 async function main() {
-    if (process.env.ETH_NETWORK == 'localhost') {
+    if (process.env.CHAIN_ETH_NETWORK == 'localhost') {
         console.log('Skip contract publish on localhost');
         return;
     }
@@ -13,7 +13,7 @@ async function main() {
         addresses.ZkSyncTarget,
         addresses.VerifierTarget,
         addresses.GovernanceTarget,
-        addresses.UpgradeGatekeeper
+        addresses.UpgradeGatekeeper,
     ]) {
         try {
             await hre.run('verify', { address });
@@ -26,7 +26,7 @@ async function main() {
         const address = addresses.ZkSync;
         const zkSyncEncodedArguments = ethers.utils.defaultAbiCoder.encode(
             ['address', 'address', 'bytes32'],
-            [addresses.Governance, addresses.Verifier, process.env.GENESIS_ROOT]
+            [addresses.Governance, addresses.Verifier, process.env.CONTRACTS_GENESIS_ROOT]
         );
 
         const constructorArguments = [addresses.ZkSyncTarget, zkSyncEncodedArguments];

core/lib/storage/sqlx-data.json

@@ -1044,27 +1044,6 @@
       "nullable": []
     }
   },
-  "4534e42575c3d9d93740398a6247ee09048d4abf5426389c0d07f7b6f609c372": {
-    "query": "\n                WITH unsized_blocks AS (\n                    SELECT * FROM operations o\n                    WHERE action_type = 'COMMIT'\n                        AND block_number >\n                            (SELECT COALESCE(max(block_number),0) FROM operations WHERE action_type = 'VERIFY')\n                        AND NOT EXISTS\n                            (SELECT * FROM proofs WHERE block_number = o.block_number)\n                        AND NOT EXISTS\n                            (SELECT * FROM prover_runs\n                                WHERE block_number = o.block_number AND (now() - updated_at) < $1::interval)\n                )\n                SELECT min(block_number) FROM unsized_blocks\n                INNER JOIN blocks\n                    ON unsized_blocks.block_number = blocks.number AND blocks.block_size = $2\n            ",
-    "describe": {
-      "columns": [
-        {
-          "ordinal": 0,
-          "name": "min",
-          "type_info": "Int8"
-        }
-      ],
-      "parameters": {
-        "Left": [
-          "Interval",
-          "Int8"
-        ]
-      },
-      "nullable": [
-        null
-      ]
-    }
-  },
   "457b4a87812ac9dcad6fbfc356952f05481a5729074ce305c3dedb33f99672f6": {
     "query": "\n            DELETE FROM pending_block WHERE number = $1\n            ",
     "describe": {
@@ -2781,6 +2760,54 @@
       "nullable": []
     }
   },
+  "ab8774812664b1c1d4207e7fcd5e04a078293d295c469f043e5bc4933c0c2944": {
+    "query": "SELECT * FROM aggregate_operations\n            WHERE NOT EXISTS (SELECT * FROM eth_aggregated_ops_binding WHERE op_id = aggregate_operations.id)\n            ORDER BY id ASC",
+    "describe": {
+      "columns": [
+        {
+          "ordinal": 0,
+          "name": "id",
+          "type_info": "Int8"
+        },
+        {
+          "ordinal": 1,
+          "name": "action_type",
+          "type_info": "Text"
+        },
+        {
+          "ordinal": 2,
+          "name": "arguments",
+          "type_info": "Jsonb"
+        },
+        {
+          "ordinal": 3,
+          "name": "from_block",
+          "type_info": "Int8"
+        },
+        {
+          "ordinal": 4,
+          "name": "to_block",
+          "type_info": "Int8"
+        },
+        {
+          "ordinal": 5,
+          "name": "created_at",
+          "type_info": "Timestamptz"
+        }
+      ],
+      "parameters": {
+        "Left": []
+      },
+      "nullable": [
+        false,
+        false,
+        false,
+        false,
+        false,
+        false
+      ]
+    }
+  },
   "b1c528c67d3c2ecea86e3ba1b2407cb4ee72149d66be0498be1c1162917c065d": {
     "query": "INSERT INTO block_witness (block, witness)\n            VALUES ($1, $2)\n            ON CONFLICT (block)\n            DO NOTHING",
     "describe": {

infrastructure/zk/src/test/integration.ts

@@ -234,4 +234,6 @@ command
         }
         mode = mode || 'fast';
         if (offline) {
+            delete process.env.SQLX_OFFLINE;
+        }
     });

sdk/zksync.js/src/transport.ts

@@ -9,15 +9,15 @@ import { Signer } from './signer';
 const W3CWebSocket = websocket.w3cwebsocket;
 
 export abstract class AbstractJSONRPCTransport {
-    abstract async request(method: string, params): Promise<any>;
+    abstract request(method: string, params): Promise<any>;
     subscriptionsSupported(): boolean {
         return false;
     }
     // eslint-disable-next-line @typescript-eslint/no-unused-vars
     async subscribe(subMethod: string, subParams, unsubMethod: string, cb: (data: any) => void): Promise<Subscription> {
         throw new Error('subscription are not supported for this transport');
     }
-    abstract async disconnect();
+    abstract disconnect();
 }
 
 // Has jrpcError field which is JRPC error object.
@@ -48,7 +48,7 @@ export class HTTPTransport extends AbstractJSONRPCTransport {
             id: 1,
             jsonrpc: '2.0',
             method,
-            params
+            params,
         };
 
         const response = await Axios.post(this.address, request).then((resp) => {
@@ -81,7 +81,7 @@ export class WSTransport extends AbstractJSONRPCTransport {
             packMessage: (data) => JSON.stringify(data),
             unpackMessage: (data) => JSON.parse(data as string),
             attachRequestId: (data, requestId) => Object.assign({ id: requestId }, data), // attach requestId to message as `id` field
-            extractRequestId: (data) => data && data.id
+            extractRequestId: (data) => data && data.id,
         });
 
         this.subscriptionCallback = new Map();
@@ -122,7 +122,7 @@ export class WSTransport extends AbstractJSONRPCTransport {
             const unsubRep = await this.ws.sendRequest({
                 jsonrpc: '2.0',
                 method: unsubMethod,
-                params: [subId]
+                params: [subId],
             });
             if (unsubRep.error) {
                 throw new JRPCError(`Unsubscribe failed: ${subId}, ${JSON.stringify(unsubRep.error)}`, unsubRep.error);
@@ -141,7 +141,7 @@ export class WSTransport extends AbstractJSONRPCTransport {
         const request = {
             jsonrpc: '2.0',
             method,
-            params
+            params,
         };
 
         const response = await this.ws.sendRequest(request, { requestId: 1 });
@@ -180,7 +180,7 @@ export class DummyTransport extends AbstractJSONRPCTransport {
                 // The HEX-encoded sequence of bytes [0..20) provided as the `mainContract`.
                 mainContract: '0x000102030405060708090a0b0c0d0e0f10111213',
                 //  The `govContract` is not used in tests and it is simply an empty string.
-                govContract: ''
+                govContract: '',
             };
         }
 
@@ -194,7 +194,7 @@ export class DummyTransport extends AbstractJSONRPCTransport {
                     address: tokenItem.address,
                     id: id,
                     symbol: tokenItem.symbol,
-                    decimals: tokenItem.decimals
+                    decimals: tokenItem.decimals,
                 };
 
                 tokens[tokenItem.symbol] = token;
@@ -216,18 +216,18 @@ export class DummyTransport extends AbstractJSONRPCTransport {
                 depositing: {},
                 committed: {
                     balances: {
-                        DAI: BigNumber.from(12345)
+                        DAI: BigNumber.from(12345),
                     },
                     nonce: 0,
-                    pubKeyHash: await this.getPubKeyHash()
+                    pubKeyHash: await this.getPubKeyHash(),
                 },
                 verified: {
                     balances: {
-                        USDC: BigNumber.from(98765)
+                        USDC: BigNumber.from(98765),
                     },
                     nonce: 0,
-                    pubKeyHash: ''
-                }
+                    pubKeyHash: '',
+                },
             };
         }
 
@@ -237,7 +237,7 @@ export class DummyTransport extends AbstractJSONRPCTransport {
 
         return {
             method,
-            params
+            params,
         };
     }