Merge branch 'bft-477-save-batch-qc' into bft-474-batch-vote-publish-…

…loop
matter-labs · Jul 8, 2024 · bbb9394 · bbb9394
2 parents 45ad649 + 825f10d
commit bbb9394
Show file tree

Hide file tree

Showing 14 changed files with 26 additions and 21 deletions.
diff --git a/node/Cargo.lock b/node/Cargo.lock
diff --git a/node/Cargo.toml b/node/Cargo.toml
@@ -20,6 +20,7 @@ edition = "2021"
 authors = ["The Matter Labs Team <[email protected]>"]
 homepage = "https://matter-labs.io/"
 license = "MIT"
+version = "0.1.0"
 
 [workspace.dependencies]
 # Crates from this repo.
@@ -38,9 +39,9 @@ zksync_protobuf = { path = "libs/protobuf" }
 zksync_protobuf_build = { 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,6 +1,6 @@
 [package]
 name = "zksync_consensus_bft"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/actors/executor/Cargo.toml b/node/actors/executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_executor"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/actors/network/Cargo.toml b/node/actors/network/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_network"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/concurrency/Cargo.toml b/node/libs/concurrency/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_concurrency"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/crypto/Cargo.toml b/node/libs/crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_crypto"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/protobuf/Cargo.toml b/node/libs/protobuf/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_protobuf"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/protobuf_build/Cargo.toml b/node/libs/protobuf_build/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_protobuf_build"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true
@@ -18,4 +18,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,6 +1,6 @@
 [package]
 name = "zksync_consensus_roles"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/storage/Cargo.toml b/node/libs/storage/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_storage"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/libs/utils/Cargo.toml b/node/libs/utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_utils"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/tests/Cargo.toml b/node/tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "tester"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true

diff --git a/node/tools/Cargo.toml b/node/tools/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "zksync_consensus_tools"
-version = "0.1.0"
+version.workspace = true
 edition.workspace = true
 authors.workspace = true
 homepage.workspace = true