From a604944ab812fb2ca7f000553c86beac8447240e Mon Sep 17 00:00:00 2001 From: Jack <87960263+ylmin@users.noreply.github.com> Date: Tue, 7 Nov 2023 20:43:05 +0800 Subject: [PATCH 1/5] chore: normalise file path (#18) refactor: normalize file path Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com> --- scripts/process.ts | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/process.ts b/scripts/process.ts index 261b3005..f7339f99 100644 --- a/scripts/process.ts +++ b/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!"); } From 96d10b2a5b4b35e1d5f6dcfb43ddb218ce727ddf Mon Sep 17 00:00:00 2001 From: DKlupov <148810781+DKlupov@users.noreply.github.com> Date: Thu, 9 Nov 2023 03:54:43 +0800 Subject: [PATCH 2/5] docs(readme): update zksync-era link (#48) docs: update docs --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a795a2f..15ab855b 100644 --- a/README.md +++ b/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` From ef9f57800039eb583e0c673ccd60a631650815ea Mon Sep 17 00:00:00 2001 From: Salad <148864073+Saladerl@users.noreply.github.com> Date: Thu, 9 Nov 2023 03:57:18 +0800 Subject: [PATCH 3/5] docs: add Mirror link (#51) feat(docs): Add Mirror hyperlink --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 15ab855b..26ce9154 100644 --- a/README.md +++ b/README.md @@ -87,6 +87,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. - [Twitter](https://twitter.com/zksync) - [Twitter for Devs](https://twitter.com/zkSyncDevs) - [Discord](https://discord.gg/nMaPGrDDwk) +- [Mirror](https://zksync.mirror.xyz/) ## Disclaimer From 0e5b7899871981ec46bcaacb78bd9e1af224684a Mon Sep 17 00:00:00 2001 From: MartinKong1990 <104483650+MartinKong1990@users.noreply.github.com> Date: Thu, 9 Nov 2023 04:00:01 +0800 Subject: [PATCH 4/5] docs: fix Discord link (#55) Update README.md - Fix Discord Link Co-authored-by: Bence Haromi <56651250+benceharomi@users.noreply.github.com> --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 26ce9154..2e504c22 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ See [LICENSE-MIT](LICENSE-MIT) for details. - [GitHub](https://github.com/matter-labs) - [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 From 920e2e56469a088abe9a79ac21e390f3c0cf2fed Mon Sep 17 00:00:00 2001 From: Bence Haromi Date: Thu, 9 Nov 2023 11:37:21 +0000 Subject: [PATCH 5/5] docs: zk credo added --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 2e504c22..5f74ec61 100644 --- a/README.md +++ b/README.md @@ -84,6 +84,7 @@ 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://join.zksync.dev/)