Merge remote-tracking branch 'origin/sb-prepare-upgrade' into sb-prep…

…are-upgrade

README.md

@@ -31,7 +31,7 @@ used on msg.sender, when it calls other contracts.
 
 ## Building
 
-This repository is used as a submodule of the [zksync-2-dev](https://github.com/matter-labs/zksync-2-dev).
+This repository is used as a submodule of the [zksync-era](https://github.com/matter-labs/zksync-era).
 
 Compile the solidity and yul contracts: `yarn build`
 
@@ -84,9 +84,11 @@ See [LICENSE-MIT](LICENSE-MIT) for details.
 
 - [Website](https://zksync.io/)
 - [GitHub](https://github.com/matter-labs)
+- [ZK Credo](https://github.com/zksync/credo)
 - [Twitter](https://twitter.com/zksync)
 - [Twitter for Devs](https://twitter.com/zkSyncDevs)
-- [Discord](https://discord.gg/nMaPGrDDwk)
+- [Discord](https://join.zksync.dev/)
+- [Mirror](https://zksync.mirror.xyz/)
 
 ## Disclaimer
 

scripts/process.ts

@@ -2,6 +2,7 @@ import * as hre from "hardhat";
 
 import { ethers } from "ethers";
 import { existsSync, mkdirSync, writeFileSync } from "fs";
+import { join } from "path";
 import { renderFile } from "template-file";
 import { utils } from "zksync-web3";
 import { SYSTEM_CONTRACTS, getRevertSelector, getTransactionUtils } from "./constants";
@@ -14,6 +15,10 @@ const SYSTEM_PARAMS = require("../SystemConfig.json");
 
 const OUTPUT_DIR = "bootloader/build";
 
+function path(...args: string[]): string {
+  return join(__dirname, ...args);
+}
+
 function getSelector(contractName: string, method: string): string {
   const artifact = hre.artifacts.readArtifactSync(contractName);
   const contractInterface = new ethers.utils.Interface(artifact.abi);
@@ -239,11 +244,11 @@ async function main() {
     mkdirSync(OUTPUT_DIR);
   }
 
-  writeFileSync(`${OUTPUT_DIR}/bootloader_test.yul`, provedBootloaderWithTests);
-  writeFileSync(`${OUTPUT_DIR}/proved_batch.yul`, provedBatchBootloader);
-  writeFileSync(`${OUTPUT_DIR}/playground_batch.yul`, playgroundBatchBootloader);
-  writeFileSync(`${OUTPUT_DIR}/gas_test.yul`, gasTestBootloader);
-  writeFileSync(`${OUTPUT_DIR}/fee_estimate.yul`, feeEstimationBootloader);
+  writeFileSync(path(`../${OUTPUT_DIR}/bootloader_test.yul`), provedBootloaderWithTests);
+  writeFileSync(path(`../${OUTPUT_DIR}/proved_batch.yul`), provedBatchBootloader);
+  writeFileSync(path(`../${OUTPUT_DIR}/playground_batch.yul`), playgroundBatchBootloader);
+  writeFileSync(path(`../${OUTPUT_DIR}/gas_test.yul`), gasTestBootloader);
+  writeFileSync(path(`../${OUTPUT_DIR}/fee_estimate.yul`), feeEstimationBootloader);
 
   console.log("Preprocessing done!");
 }