From 11bc1d2d09402b6ce15322249313f868d8eb6c4f Mon Sep 17 00:00:00 2001 From: Igor Aleksanov Date: Sat, 6 Jul 2024 13:30:02 +0400 Subject: [PATCH] chore: Prepare crates for publishing (#147) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ - Changes git dependency on `pairing` to the published one. - Same for `vise` and `vise-exporter` - Uses `workspace.version` for all the crates. ## Why ❔ --- node/Cargo.lock | 14 +++++++++----- node/Cargo.toml | 7 ++++--- node/actors/bft/Cargo.toml | 2 +- node/actors/executor/Cargo.toml | 2 +- node/actors/network/Cargo.toml | 2 +- node/libs/concurrency/Cargo.toml | 2 +- node/libs/crypto/Cargo.toml | 2 +- node/libs/protobuf/Cargo.toml | 2 +- node/libs/protobuf_build/Cargo.toml | 4 ++-- node/libs/roles/Cargo.toml | 2 +- node/libs/storage/Cargo.toml | 2 +- node/libs/utils/Cargo.toml | 2 +- node/tests/Cargo.toml | 2 +- node/tools/Cargo.toml | 2 +- 14 files changed, 26 insertions(+), 21 deletions(-) diff --git a/node/Cargo.lock b/node/Cargo.lock index f85572f2..3a6cfade 100644 --- a/node/Cargo.lock +++ b/node/Cargo.lock @@ -2124,8 +2124,9 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" [[package]] name = "pairing_ce" -version = "0.28.5" -source = "git+https://github.com/matter-labs/pairing.git?rev=d24f2c5871089c4cd4f54c0ca266bb9fef6115eb#d24f2c5871089c4cd4f54c0ca266bb9fef6115eb" +version = "0.28.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843b5b6fb63f00460f611dbc87a50bbbb745f0dfe5cbf67ca89299c79098640e" dependencies = [ "byteorder", "cfg-if", @@ -3635,7 +3636,8 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vise" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "229baafe01d5177b63c6ee1def80d8e39a2365e64caf69ddb05a57594b15647c" dependencies = [ "compile-fmt", "elsa", @@ -3648,7 +3650,8 @@ dependencies = [ [[package]] name = "vise-exporter" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23981b18d697026f5430249ab01ba739ef2edc463e400042394331cb2bb63494" dependencies = [ "hyper 0.14.29", "once_cell", @@ -3660,7 +3663,8 @@ dependencies = [ [[package]] name = "vise-macros" version = "0.1.0" -source = "git+https://github.com/matter-labs/vise.git?rev=a5bb80c9ce7168663114ee30e794d6dc32159ee4#a5bb80c9ce7168663114ee30e794d6dc32159ee4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8bb19c33cd5f04dcf4e767635e058a998edbc2b7fca32ade0a4a1cea0f8e9b34" dependencies = [ "proc-macro2", "quote", diff --git a/node/Cargo.toml b/node/Cargo.toml index ccfaf133..85e26017 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -20,6 +20,7 @@ edition = "2021" authors = ["The Matter Labs Team "] 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 index 99932bfa..8cbe0a65 100644 --- 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 index be95dcb3..03e0c9f2 100644 --- 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 index 56657a68..ab7f7dbb 100644 --- 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 index e305f684..96a72f3d 100644 --- 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 index 72fb18ed..44f7fd83 100644 --- 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 index 889b531c..1be22904 100644 --- 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 index 93e4b831..58055e7a 100644 --- 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 \ No newline at end of file +workspace = true diff --git a/node/libs/roles/Cargo.toml b/node/libs/roles/Cargo.toml index c3e2426b..d4666689 100644 --- 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 index e1cca9e2..e44a5cd4 100644 --- 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 index 9dedc6b8..ffb3f5b1 100644 --- 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 index acf9ac25..d46a0925 100644 --- 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 index b6df9de7..70ba698f 100644 --- 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