Merge branch 'main' into bruno-lints

matter-labs · Nov 20, 2023 · 6eab54b · 6eab54b
2 parents a02eb3a + 9f58e68
commit 6eab54b
Show file tree

Hide file tree

Showing 31 changed files with 184 additions and 620 deletions.
diff --git a/.dockerignore b/.dockerignore
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -1,9 +1,12 @@
 CODEOWNERS @brunoffranca
 
-/node/actors/consensus/ @brunoffranca
-/node/actors/executor/ @brunoffranca @pompon0
+/node/actors/consensus/ @brunoffranca @moshababo
+/node/actors/executor/ @brunoffranca @pompon0 @slowli
 /node/actors/network/ @pompon0
 /node/actors/sync_blocks/ @slowli
 
 /node/libs/concurrency/ @pompon0
-/node/libs/crypto/ @brunoffranca
+/node/libs/crypto/ @brunoffranca
+/node/libs/protobuf/ @pompon0
+/node/libs/protobuf_build/ @pompon0
+/node/libs/storage/ @slowli
diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md
@@ -1,4 +1,4 @@
-# What ❔
+## What ❔
 
 <!-- What are the changes this PR brings about? -->
 <!-- Example: This PR adds a PR template to the repo. -->

diff --git a/.github/workflows/docker_build.yaml b/.github/workflows/docker_build.yaml
diff --git a/composes/generate/Cargo.lock b/composes/generate/Cargo.lock
diff --git a/composes/generate/Cargo.toml b/composes/generate/Cargo.toml
diff --git a/composes/generate/src/main.rs b/composes/generate/src/main.rs
diff --git a/docker/Dockerfile b/docker/Dockerfile
diff --git a/docker/compose.Dockerfile b/docker/compose.Dockerfile
diff --git a/docker/localenv.Dockerfile b/docker/localenv.Dockerfile
diff --git a/docs/architecture.md b/docs/architecture.md
@@ -24,9 +24,9 @@ The library crates are just crates that have some basic functionality that can b
 
 - the `crypto` crate, which provides several cryptographic primitives.
 
-- the `roles` crate, which implements the types necessary for each role in the network. We have just two roles: `Node` and `Validator`.
+- the `protobuf` and `protbuf_build` crates, which contains all the code to create the protobuf schemas used by the other crates.
 
-- the `schema` crate, which contains all the protobuf schemas used by the other crates.
+- the `roles` crate, which implements the types necessary for each role in the network. We have just two roles: `Node` and `Validator`.
 
 - the `storage` crate is responsible for storing the current state of the system and providing an interface to access the stored data. It is a key component of the system that ensures the persistence of data and the ability to retrieve it when needed.
 
@@ -36,8 +36,6 @@ The library crates are just crates that have some basic functionality that can b
 
 This section provides a physical map of folders & files in this repository.
 
-- `/composes` & `/docker`: Project docker files.
-
 - `/infrastructure`: Infrastructure scripts that are needed to test the zkSync Era Consensus Layer.
 
 - `/node`
@@ -53,8 +51,9 @@ This section provides a physical map of folders & files in this repository.
 
     - `/concurrency`: Crate with essential primitives for structured concurrency.
     - `/crypto`: Cryptographic primitives used by the other crates.
+    - `/protobuf`: Code generated from protobuf schema files and utilities for serialization.
+    - `/protobuf_build`: Generates rust code from the proto files.
     - `/roles`: Essential types for the different node roles.
-    - `/schema`: Protobuf schemas used by the other crates.
     - `/storage`: Storage layer for the node.
     - `/utils`: Collection of small utilities.