Decomposed schema crate.

.github/workflows/protobuf.yaml

@@ -23,12 +23,12 @@ env:
 
 jobs:
   compatibility:
-    runs-on: ubuntu-latest
+    runs-on: [ubuntu-22.04-github-hosted-16core]
     steps:
       # github.base_ref -> github.head_ref for pull_request
       # github.event.before -> github.event.after for push
       - uses: mozilla-actions/[email protected]
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.base_ref || github.event.before }}
           path: before
@@ -40,7 +40,7 @@ jobs:
           perl -ne 'print "$1\n" if /PROTOBUF_DESCRIPTOR="(.*)"/'
           `find ./before/node/target/debug/build/*/output`
           | xargs cat > ./before.binpb
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.head_ref || github.event.after }}
           path: after

node/Cargo.toml

@@ -9,7 +9,6 @@ members = [
     "actors/network",
     "actors/sync_blocks",
     "libs/roles",
-    "libs/schema",
     "libs/storage",
     "tools",
     "libs/utils",
@@ -32,7 +31,6 @@ zksync_consensus_executor = { path = "actors/executor" }
 zksync_consensus_network = { path = "actors/network" }
 zksync_consensus_sync_blocks = { path = "actors/sync_blocks" }
 zksync_consensus_roles = { path = "libs/roles" }
-zksync_consensus_schema = { path = "libs/schema" }
 zksync_consensus_storage = { path = "libs/storage" }
 zksync_consensus_tools = { path = "tools" }
 zksync_consensus_utils = { path = "libs/utils" }

node/actors/bft/Cargo.toml

@@ -11,7 +11,6 @@ zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true
 zksync_consensus_network.workspace = true
 zksync_consensus_roles.workspace = true
-zksync_consensus_schema.workspace = true
 zksync_consensus_storage.workspace = true
 zksync_consensus_utils.workspace = true
 zksync_protobuf.workspace = true

node/actors/executor/Cargo.toml

@@ -12,16 +12,19 @@ zksync_consensus_bft.workspace = true
 zksync_consensus_crypto.workspace = true
 zksync_consensus_network.workspace = true
 zksync_consensus_roles.workspace = true
-zksync_consensus_schema.workspace = true
 zksync_consensus_storage.workspace = true
 zksync_consensus_sync_blocks.workspace = true
 zksync_consensus_utils.workspace = true
 zksync_protobuf.workspace = true
 
 anyhow.workspace = true
+prost.workspace = true
 rand.workspace = true
 tracing.workspace = true
 vise.workspace = true
 
 [dev-dependencies]
 tokio.workspace = true
+
+[build-dependencies]
+zksync_protobuf.workspace = true

node/actors/executor/build.rs

@@ -0,0 +1,11 @@
+//! Generates rust code from protobufs.
+fn main() {
+    zksync_protobuf::build::Config {
+        input_root: "src/config/proto".into(),
+        proto_root: "zksync/executor/config".into(),
+        dependencies: vec![],
+        protobuf_crate: "::zksync_protobuf".parse().unwrap(),
+    }
+    .generate()
+    .expect("generate(config)");
+}

node/actors/executor/src/config/mod.rs

@@ -7,9 +7,9 @@ use std::{
 use zksync_consensus_crypto::{read_required_text, Text, TextFmt};
 use zksync_consensus_network::{consensus, gossip};
 use zksync_consensus_roles::{node, validator};
-use zksync_consensus_schema::proto::executor::config as proto;
 use zksync_protobuf::{read_required, required, ProtoFmt};
 
+pub mod proto;
 #[cfg(test)]
 mod tests;
 

node/libs/schema/proto/executor/config.proto → node/actors/executor/src/config/proto/mod.proto

@@ -36,7 +36,7 @@
 //     the validator set) or move it to a separate config file.
 syntax = "proto3";
 
-package zksync.schema.executor.config;
+package zksync.executor.config;
 
 // (public key, ip address) of a gossip network node. 
 message NodeAddr {

node/actors/executor/src/config/proto/mod.rs

@@ -0,0 +1,2 @@
+#![allow(warnings)]
+include!(concat!(env!("OUT_DIR"), "/src/config/proto/gen.rs"));

node/actors/executor/src/lib.rs

@@ -18,7 +18,7 @@ pub mod testonly;
 #[cfg(test)]
 mod tests;
 
-pub use self::config::{ConsensusConfig, ExecutorConfig, GossipConfig};
+pub use self::config::{proto, ConsensusConfig, ExecutorConfig, GossipConfig};
 
 /// Validator-related part of [`Executor`].
 #[derive(Debug)]

node/actors/network/Cargo.toml

@@ -10,7 +10,6 @@ license.workspace = true
 zksync_concurrency.workspace = true
 zksync_consensus_crypto.workspace = true
 zksync_consensus_roles.workspace = true
-zksync_consensus_schema.workspace = true
 zksync_consensus_utils.workspace = true
 zksync_protobuf.workspace = true
 
@@ -19,6 +18,7 @@ async-trait.workspace = true
 im.workspace = true
 once_cell.workspace = true
 pin-project.workspace = true
+prost.workspace = true
 rand.workspace = true
 snow.workspace = true
 thiserror.workspace = true
@@ -29,3 +29,7 @@ vise.workspace = true
 pretty_assertions.workspace = true
 test-casing.workspace = true
 tokio.workspace = true
+
+[build-dependencies]
+zksync_consensus_roles.workspace = true
+zksync_protobuf.workspace = true

node/actors/network/build.rs

@@ -0,0 +1,29 @@
+//! Generates rust code from protobufs.
+fn main() {
+    zksync_protobuf::build::Config {
+        input_root: "src/proto".into(),
+        proto_root: "zksync/network".into(),
+        dependencies: vec![
+            (
+                "::zksync_protobuf::proto".parse().unwrap(),
+                &zksync_protobuf::proto::DESCRIPTOR,
+            ),
+            (
+                "::zksync_consensus_roles::proto".parse().unwrap(),
+                &zksync_consensus_roles::proto::DESCRIPTOR,
+            ),
+        ],
+        protobuf_crate: "::zksync_protobuf".parse().unwrap(),
+    }
+    .generate()
+    .expect("generate()");
+
+    zksync_protobuf::build::Config {
+        input_root: "src/mux/tests/proto".into(),
+        proto_root: "zksync/network/mux/tests".into(),
+        dependencies: vec![],
+        protobuf_crate: "::zksync_protobuf".parse().unwrap(),
+    }
+    .generate()
+    .expect("generate()");
+}

node/actors/network/src/consensus/handshake/mod.rs

@@ -1,9 +1,8 @@
-use crate::{frame, noise};
+use crate::{frame, noise, proto::consensus as proto};
 use anyhow::Context as _;
 use zksync_concurrency::{ctx, time};
 use zksync_consensus_crypto::ByteFmt;
 use zksync_consensus_roles::{node, validator};
-use zksync_consensus_schema::proto::network::consensus as proto;
 use zksync_protobuf::{read_required, ProtoFmt};
 
 #[cfg(test)]

node/actors/network/src/gossip/handshake/mod.rs

@@ -1,10 +1,9 @@
 use super::Config;
-use crate::{frame, noise};
+use crate::{frame, noise, proto::gossip as proto};
 use anyhow::Context as _;
 use zksync_concurrency::{ctx, time};
 use zksync_consensus_crypto::ByteFmt;
 use zksync_consensus_roles::node;
-use zksync_consensus_schema::proto::network::gossip as proto;
 use zksync_protobuf::{read_required, required, ProtoFmt};
 
 #[cfg(test)]

node/actors/network/src/lib.rs

@@ -14,6 +14,7 @@ mod mux;
 mod noise;
 mod pool;
 mod preface;
+pub mod proto;
 mod rpc;
 mod state;
 pub mod testonly;

node/actors/network/src/mux/handshake.rs

@@ -1,7 +1,7 @@
 use super::CapabilityId;
+use crate::proto::mux as proto;
 use anyhow::Context as _;
 use std::collections::HashMap;
-use zksync_consensus_schema::proto::network::mux as proto;
 use zksync_protobuf::required;
 
 pub(super) struct Handshake {

node/actors/network/src/mux/tests.rs → node/actors/network/src/mux/tests/mod.rs

@@ -9,8 +9,8 @@ use std::{
     },
 };
 use zksync_concurrency::{ctx, scope, testonly::abort_on_panic};
-use zksync_consensus_schema::proto::network::mux_test as proto;
 use zksync_consensus_utils::no_copy::NoCopy;
+mod proto;
 
 fn assert_partition(sets: &[u16]) {
     let mut sum = 0;

node/libs/schema/proto/network/mux_test.proto → node/actors/network/src/mux/tests/proto/mod.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package zksync.schema.network.mux_test;
+package zksync.network.mux.tests;
 
 message Req {
   optional bytes input = 1;

node/actors/network/src/mux/tests/proto/mod.rs

@@ -0,0 +1,2 @@
+#![allow(warnings)]
+include!(concat!(env!("OUT_DIR"), "/src/mux/tests/proto/gen.rs"));

node/actors/network/src/preface.rs

@@ -7,9 +7,8 @@
 //!
 //! Hence, the preface protocol is used to enable encryption
 //! and multiplex between mutliple endpoints available on the same TCP port.
-use crate::{frame, metrics, noise};
+use crate::{frame, metrics, noise, proto::preface as proto};
 use zksync_concurrency::{ctx, time};
-use zksync_consensus_schema::proto::network::preface as proto;
 use zksync_protobuf::{required, ProtoFmt};
 
 /// Timeout on executing the preface protocol.

node/libs/schema/proto/network/consensus.proto → node/actors/network/src/proto/consensus.proto

@@ -1,8 +1,8 @@
 syntax = "proto3";
 
-package zksync.schema.network.consensus;
+package zksync.network.consensus;
 
-import "zksync/schema/roles/validator.proto";
+import "zksync/roles/validator.proto";
 import "zksync/std.proto";
 
 // First message exchanged in the encrypted session.

node/libs/schema/proto/network/gossip.proto → node/actors/network/src/proto/gossip.proto

@@ -1,9 +1,9 @@
 syntax = "proto3";
 
-package zksync.schema.network.gossip;
+package zksync.network.gossip;
 
-import "zksync/schema/roles/node.proto";
-import "zksync/schema/roles/validator.proto";
+import "zksync/roles/node.proto";
+import "zksync/roles/validator.proto";
 
 // First message exchanged in the encrypted session.
 message Handshake {

node/actors/network/src/proto/mod.rs

@@ -0,0 +1,2 @@
+#![allow(warnings)]
+include!(concat!(env!("OUT_DIR"), "/src/proto/gen.rs"));

node/libs/schema/proto/network/mux.proto → node/actors/network/src/proto/mux.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package zksync.schema.network.mux;
+package zksync.network.mux;
 
 import "zksync/std.proto";
 

node/libs/schema/proto/network/ping.proto → node/actors/network/src/proto/ping.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package zksync.schema.network.ping;
+package zksync.network.ping;
 
 message PingReq {
   optional bytes data = 1;

node/libs/schema/proto/network/preface.proto → node/actors/network/src/proto/preface.proto

@@ -1,6 +1,6 @@
 syntax = "proto3";
 
-package zksync.schema.network.preface;
+package zksync.network.preface;
 
 // Every connection starts with the following preface:
 // 1. client sends Encryption msg to server.

node/actors/network/src/rpc/consensus.rs

@@ -1,8 +1,7 @@
 //! Defines RPC for passing consensus messages.
-use crate::mux;
+use crate::{mux, proto::consensus as proto};
 use zksync_concurrency::{limiter, time};
 use zksync_consensus_roles::validator;
-use zksync_consensus_schema::proto::network::consensus as proto;
 use zksync_protobuf::{read_required, ProtoFmt};
 
 /// Consensus RPC.