Merge branch 'main' into igor/quint-timeout-qc-refactor

matter-labs · Jul 8, 2024 · b128bea · b128bea
2 parents 864bdff + 92fe49c
commit b128bea
Show file tree

Hide file tree

Showing 16 changed files with 109 additions and 80 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -19,28 +19,31 @@ resolver = "2"
 edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://matter-labs.io/"
-license = "MIT"
+repository = "https://github.com/matter-labs/era-consensus"
+license = "MIT OR Apache-2.0"
+keywords = ["blockchain", "zksync"]
+version = "0.1.0-rc.1"
 
 [workspace.dependencies]
 # Crates from this repo.
-zksync_consensus_bft = { path = "actors/bft" }
-zksync_consensus_crypto = { path = "libs/crypto" }
-zksync_consensus_executor = { path = "actors/executor" }
-zksync_consensus_network = { path = "actors/network" }
-zksync_consensus_roles = { path = "libs/roles" }
-zksync_consensus_storage = { path = "libs/storage" }
-zksync_consensus_tools = { path = "tools" }
-zksync_consensus_utils = { path = "libs/utils" }
+zksync_consensus_bft = { version = "=0.1.0-rc.1", path = "actors/bft" }
+zksync_consensus_crypto = { version = "=0.1.0-rc.1", path = "libs/crypto" }
+zksync_consensus_executor = { version = "=0.1.0-rc.1", path = "actors/executor" }
+zksync_consensus_network = { version = "=0.1.0-rc.1", path = "actors/network" }
+zksync_consensus_roles = { version = "=0.1.0-rc.1", path = "libs/roles" }
+zksync_consensus_storage = { version = "=0.1.0-rc.1", path = "libs/storage" }
+zksync_consensus_tools = { version = "=0.1.0-rc.1", path = "tools" }
+zksync_consensus_utils = { version = "=0.1.0-rc.1", path = "libs/utils" }
 
 # Crates from this repo that might become independent in the future.
-zksync_concurrency = { path = "libs/concurrency" }
-zksync_protobuf = { path = "libs/protobuf" }
-zksync_protobuf_build = { path = "libs/protobuf_build" }
+zksync_concurrency = { version = "=0.1.0-rc.1", path = "libs/concurrency" }
+zksync_protobuf = { version = "=0.1.0-rc.1", path = "libs/protobuf" }
+zksync_protobuf_build = { version = "=0.1.0-rc.1", path = "libs/protobuf_build" }
 
 # Crates from Matter Labs.
-pairing = { package = "pairing_ce", git = "https://github.com/matter-labs/pairing.git", rev = "d24f2c5871089c4cd4f54c0ca266bb9fef6115eb" }
-vise = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "a5bb80c9ce7168663114ee30e794d6dc32159ee4" }
-vise-exporter = { version = "0.1.0", git = "https://github.com/matter-labs/vise.git", rev = "a5bb80c9ce7168663114ee30e794d6dc32159ee4" }
+pairing = { package = "pairing_ce", version = "=0.28.6" }
+vise = "0.1.0"
+vise-exporter = "0.1.0"
 
 # Crates from third-parties.
 anyhow = "1"

diff --git a/node/actors/bft/Cargo.toml b/node/actors/bft/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_bft"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 zksync_concurrency.workspace = true

diff --git a/node/actors/executor/Cargo.toml b/node/actors/executor/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_executor"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 zksync_concurrency.workspace = true

diff --git a/node/actors/network/Cargo.toml b/node/actors/network/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_network"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 zksync_concurrency.workspace = true

diff --git a/node/libs/concurrency/Cargo.toml b/node/libs/concurrency/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_concurrency"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 anyhow.workspace = true

diff --git a/node/libs/crypto/Cargo.toml b/node/libs/crypto/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_crypto"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 anyhow.workspace = true

diff --git a/node/libs/protobuf/Cargo.toml b/node/libs/protobuf/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_protobuf"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 links = "zksync_protobuf_proto"
 
 [dependencies]

diff --git a/node/libs/protobuf_build/Cargo.toml b/node/libs/protobuf_build/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_protobuf_build"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 anyhow.workspace = true
@@ -18,4 +20,4 @@ quote.workspace = true
 syn.workspace = true
 
 [lints]
-workspace = true
+workspace = true
diff --git a/node/libs/roles/Cargo.toml b/node/libs/roles/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_roles"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 links = "zksync_consensus_roles_proto"
 
 [dependencies]

diff --git a/node/libs/storage/Cargo.toml b/node/libs/storage/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_storage"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 zksync_concurrency.workspace = true

diff --git a/node/libs/utils/Cargo.toml b/node/libs/utils/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_utils"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 
 [dependencies]
 zksync_concurrency.workspace = true

diff --git a/node/tests/Cargo.toml b/node/tests/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "tester"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
+publish = false
 
 [dependencies]
 zksync_consensus_tools.workspace = true

diff --git a/node/tools/Cargo.toml b/node/tools/Cargo.toml
@@ -1,10 +1,12 @@
 [package]
 name = "zksync_consensus_tools"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
 license.workspace = true
+repository.workspace = true
+keywords.workspace = true
 default-run = "executor"
 
 [dependencies]