Mirror to 7da9e94 (matter-labs#97)

Fresh mirror: Includes large amount of changes to zksync
Academydaoo · Sep 21, 2023 · a43bc40 · a43bc40
1 parent 43abaa9
commit a43bc40
Show file tree

Hide file tree

Showing 788 changed files with 33,058 additions and 26,737 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -2,6 +2,7 @@
 !docker/prover/prover-entry.sh
 !docker/zk/entrypoint.sh
 !docker/local-node/entrypoint.sh
+!docker/external-node/entrypoint.sh
 !docker/contract-verifier/install-all-solc.sh
 !etc/test_config
 !etc/env/dev.env.example
@@ -16,11 +17,13 @@ keys/setup
 !db/
 !backups/
 !core/
+!prover/
 !yarn.lock
 !package.json
 !Cargo.lock
 !Cargo.toml
 !contracts/
+!setup_2\^26.key
 # It's required to remove .git from contracts,
 # otherwise yarn tries to use .git parent directory that
 # doesn't exist.
@@ -30,7 +33,11 @@ contracts/.git
 !sdk/zksync-rs
 !sdk/zksync-web3.js
 !etc/system-contracts/bootloader/build/artifacts
+!etc/system-contracts/contracts/artifacts
+!etc/system-contracts/contracts/precompiles/artifacts
 !etc/system-contracts/artifacts-zk
+!etc/multivm_bootloaders
 !cargo
 !bellman-cuda
 !core/bin/verification_key_generator_and_server/data/
+!prover/vk_setup_data_generator_server_fri/data/
diff --git a/...up_key_generator_and_server/data/.gitkeep → .env b/...up_key_generator_and_server/data/.gitkeep → .env
diff --git a/.gitignore b/.gitignore
@@ -15,6 +15,7 @@ a.out
 cobertura.xml
 tags
 *.orig
+.direnv
 
 # Yarn files
 .yarn/
@@ -26,11 +27,9 @@ todo
 
 Cargo.lock
 !/Cargo.lock
-!/core/bin/prover/Cargo.lock
-!/core/bin/circuit_synthesizer/Cargo.lock
-!/core/bin/setup_key_generator_and_server/Cargo.lock
 !/core/bin/verification_key_generator_and_server/Cargo.lock
 !/infrastructure/zksync-crypto/Cargo.lock
+!/prover/Cargo.lock
 
 /etc/env/*
 !/etc/env/base
@@ -39,7 +38,9 @@ Cargo.lock
 !/etc/env/ext-node-docker.toml
 /etc/tokens/localhost.json
 /etc/zksolc-bin/*
+/etc/zkvyper-bin/*
 /etc/solc-bin/*
+/etc/vyper-bin/*
 !/keys
 /keys/*
 !/keys/packed
@@ -69,5 +70,3 @@ artifacts-zk/
 cache-zk/
 zksolc
 verified_sources
-
-.github
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "etc/system-contracts"]
-	path = etc/system-contracts
-	url = https://github.com/matter-labs/era-system-contracts.git
+path = etc/system-contracts
+url = https://github.com/matter-labs/era-system-contracts.git
 [submodule "contracts"]
-	path = contracts
-	url = https://github.com/matter-labs/era-contracts.git
+path = contracts
+url = https://github.com/matter-labs/era-contracts.git
diff --git a/.nvmrc b/.nvmrc
@@ -0,0 +1 @@
+v18.18.0
diff --git a/.prettierignore b/.prettierignore
@@ -1,2 +1,5 @@
 # Ignore submodule
 bellman-cuda
+sdk/zksync-web3.js/CHANGELOG.md
+sdk/zksync-rs/CHANGELOG.md
+CHANGELOG.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -1,9 +1,44 @@
 # Contribution Guidelines
 
-Thank you for considering helping out with the source code! We are extremely grateful for any consideration of
-contributions to this repository. However, at this time, we generally do not accept external contributions. This policy
-will change in the future, so please check back regularly for updates.
+Hello! Thanks for your interest in joining the mission to accelerate the mass adoption of crypto for personal
+sovereignty! We welcome contributions from anyone on the internet, and are grateful for even the smallest of fixes!
 
-For security issues, please contact us at [security@matterlabs.dev](mailto:security@matterlabs.dev).
+## Ways to contribute
 
-Thank you for your support in accelerating the mass adoption of crypto for personal sovereignty!
+There are many ways to contribute to the ZK Stack:
+
+1. Open issues: if you find a bug, have something you believe needs to be fixed, or have an idea for a feature, please
+   open an issue.
+2. Add color to existing issues: provide screenshots, code snippets, and whatever you think would be helpful to resolve
+   issues.
+3. Resolve issues: either by showing an issue isn't a problem and the current state is ok as is or by fixing the problem
+   and opening a PR.
+4. Report security issues, see [our security policy](./github/SECURITY.md).
+5. [Join the team!](https://matterlabs.notion.site/Shape-the-future-of-Ethereum-at-Matter-Labs-dfb3b5a037044bb3a8006af2eb0575e0)
+
+## Fixing issues
+
+To contribute code fixing issues, please fork the repo, fix an issue, commit, add documentation as per the PR template,
+and the repo's maintainers will review the PR.
+[here](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request-from-a-fork)
+for guidance how to work with PRs created from a fork.
+
+## Licenses
+
+If you contribute to this project, your contributions will be made to the project under both Apache 2.0 and the MIT
+license.
+
+## Resources
+
+We aim to make it as easy as possible to contribute to the mission. This is still WIP, and we're happy for contributions
+and suggestions here too. Some resources to help:
+
+1. [In-repo docs aimed at developers](docs)
+2. [zkSync Era docs!](https://era.zksync.io/docs/)
+3. Company links can be found in the [repo's readme](README.md)
+
+## Code of Conduct
+
+Be polite and respectful.
+
+### Thank you