Add easy_exodus to config

diviser · Feb 5, 2021 · 4bb5cfc · 4bb5cfc
1 parent 07e7a90
commit 4bb5cfc
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/contracts/hardhat.config.ts b/contracts/hardhat.config.ts
@@ -28,7 +28,7 @@ const testConfig = {
 const localConfig = Object.assign({}, prodConfig);
 localConfig.DUMMY_VERIFIER = process.env.CONTRACTS_TEST_DUMMY_VERIFIER === 'true';
 // @ts-ignore
-localConfig.EASY_EXODUS = process.env.EASY_EXODUS === 'true';
+localConfig.EASY_EXODUS = process.env.CONTRACTS_TEST_EASY_EXODUS === 'true';
 
 const contractDefs = {
     rinkeby: testnetConfig,

diff --git a/etc/env/base/contracts.toml b/etc/env/base/contracts.toml
@@ -15,4 +15,5 @@ GENESIS_ROOT="0x2d5ab622df708ab44944bb02377be85b6f27812e9ae520734873b7a193898ba4
 
 [contracts.test]
 dummy_verifier=false
+easy_exodus=false
 
diff --git a/infrastructure/zk/src/init.ts b/infrastructure/zk/src/init.ts
@@ -39,13 +39,13 @@ async function createVolumes() {
 }
 
 async function checkEnv() {
-    const tools = ['node', 'yarn', 'docker', 'docker-compose', 'cargo', 'psql', 'pg_isready', 'diesel', 'solc'];
+    const tools = ['node', 'yarn', 'docker', 'docker-compose', 'cargo', 'psql', 'pg_isready', 'diesel'];
     for (const tool of tools) {
         await utils.exec(`which ${tool}`);
     }
     await utils.exec('cargo sqlx --version');
     const { stdout: version } = await utils.exec('node --version');
-    // Node v.14.14 is required because
+    // Node v14.14 is required because
     // the `fs.rmSync` function was added in v14.14.0
     if ('v14.14' >= version) {
         throw new Error('Error, node.js version 14.14.0 or higher is required');

diff --git a/infrastructure/zk/src/server.ts b/infrastructure/zk/src/server.ts
@@ -17,7 +17,7 @@ export async function genesis() {
     await db.reset();
     await utils.confirmAction();
     await utils.spawn('cargo run --bin zksync_server --release -- --genesis | tee genesis.log');
-    const genesisRoot = fs.readFileSync('genesis.log').toString();
+    const genesisRoot = fs.readFileSync('genesis.log').toString().trim();
     const date = new Date();
     const [year, month, day, hour, minute, second] = [
         date.getFullYear(),
Original file line number	Diff line number	Diff line change
Expand Up		@@ -15,4 +15,5 @@ GENESIS_ROOT="0x2d5ab622df708ab44944bb02377be85b6f27812e9ae520734873b7a193898ba4

		[contracts.test]
		dummy_verifier=false
		easy_exodus=false