diff --git a/Cargo.toml b/Cargo.toml index 1e8d7f07c..910ae4d11 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,6 +47,7 @@ axum = "0.7.5" bitflags = "2.5.0" bitvec = "1.0.1" bytes = "1.6.0" +cargo_metadata = "0.18.1" ciborium = "0.2.2" ciborium-io = "0.2.2" clap = { version = "4.5.7", features = ["derive", "env"] } @@ -104,6 +105,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] } u4 = "0.1.0" uint = "0.9.5" url = "2.5.2" +vergen = { version = "9.0.0", features = ["build", "rustc"] } winnow = "0.6.13" # local dependencies @@ -131,6 +133,3 @@ proc-macro2 = "1.0" quote = "1.0" syn = "2.0" trybuild = "1.0" - -vergen = { version = "9.0.0", features = ["build", "rustc"] } -cargo_metadata = "0.18.1" diff --git a/zero_bin/common/Cargo.toml b/zero_bin/common/Cargo.toml index 7d63afb9d..0d0e35191 100644 --- a/zero_bin/common/Cargo.toml +++ b/zero_bin/common/Cargo.toml @@ -28,3 +28,4 @@ vergen = { workspace = true } [build-dependencies] cargo_metadata = { workspace = true } vergen = { workspace = true } +anyhow = { workspace = true } diff --git a/zero_bin/common/src/build_version.rs b/zero_bin/common/build.rs similarity index 74% rename from zero_bin/common/src/build_version.rs rename to zero_bin/common/build.rs index c556fd775..c3e7b006d 100644 --- a/zero_bin/common/src/build_version.rs +++ b/zero_bin/common/build.rs @@ -28,14 +28,3 @@ fn main() -> anyhow::Result<()> { Ok(()) } - -pub fn print_version( - evm_arithmetization_package_version: &str, - rustc_commit_hash: &str, - rustc_timestamp: &str, -) { - println!( - "evm_arithmetization Package Version: {}\nBuild Commit Hash: {}\nBuild Timestamp: {}", - evm_arithmetization_package_version, rustc_commit_hash, rustc_timestamp - ) -} diff --git a/zero_bin/common/src/lib.rs b/zero_bin/common/src/lib.rs index 9a612c5b1..5570a5d5f 100644 --- a/zero_bin/common/src/lib.rs +++ b/zero_bin/common/src/lib.rs @@ -1,6 +1,6 @@ pub mod block_interval; -pub mod build_version; pub mod debug_utils; pub mod fs; pub mod parsing; pub mod prover_state; +pub mod version; diff --git a/zero_bin/common/src/version.rs b/zero_bin/common/src/version.rs new file mode 100644 index 000000000..5dbbf7f9b --- /dev/null +++ b/zero_bin/common/src/version.rs @@ -0,0 +1,10 @@ +pub fn print_version( + evm_arithmetization_package_version: &str, + rustc_commit_hash: &str, + rustc_timestamp: &str, +) { + println!( + "evm_arithmetization Package Version: {}\nBuild Commit Hash: {}\nBuild Timestamp: {}", + evm_arithmetization_package_version, rustc_commit_hash, rustc_timestamp + ) +} diff --git a/zero_bin/leader/Cargo.toml b/zero_bin/leader/Cargo.toml index b12d90249..5d0881da1 100644 --- a/zero_bin/leader/Cargo.toml +++ b/zero_bin/leader/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true -build = "../common/src/build_version.rs" +build = "../common/build.rs" [dependencies] paladin-core = { workspace = true } diff --git a/zero_bin/leader/src/main.rs b/zero_bin/leader/src/main.rs index 08c39d687..9aafcd5fd 100644 --- a/zero_bin/leader/src/main.rs +++ b/zero_bin/leader/src/main.rs @@ -11,7 +11,7 @@ use paladin::runtime::Runtime; use proof_gen::proof_types::GeneratedBlockProof; use tracing::{info, warn}; use zero_bin_common::block_interval::BlockInterval; -use zero_bin_common::build_version; +use zero_bin_common::version; use crate::client::{client_main, ProofParams}; @@ -46,7 +46,6 @@ async fn main() -> Result<()> { unsafe { env::set_var( EVM_ARITHMETIZATION_PKG_VER, - // see version.rs env!("EVM_ARITHMETIZATION_PKG_VER"), ); } @@ -55,7 +54,7 @@ async fn main() -> Result<()> { let args: Vec = env::args().collect(); if args.contains(&"--version".to_string()) { - build_version::print_version( + version::print_version( env!("EVM_ARITHMETIZATION_PKG_VER"), env!("VERGEN_RUSTC_COMMIT_HASH"), env!("VERGEN_BUILD_TIMESTAMP"), diff --git a/zero_bin/rpc/Cargo.toml b/zero_bin/rpc/Cargo.toml index 441fe7533..14f447cef 100644 --- a/zero_bin/rpc/Cargo.toml +++ b/zero_bin/rpc/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true -build = "../common/src/build_version.rs" +build = "../common/build.rs" [dependencies] __compat_primitive_types = { workspace = true } diff --git a/zero_bin/rpc/src/main.rs b/zero_bin/rpc/src/main.rs index 695375df8..ee1ed08e0 100644 --- a/zero_bin/rpc/src/main.rs +++ b/zero_bin/rpc/src/main.rs @@ -7,7 +7,7 @@ use rpc::{retry::build_http_retry_provider, RpcType}; use tracing_subscriber::{prelude::*, EnvFilter}; use url::Url; use zero_bin_common::block_interval::BlockInterval; -use zero_bin_common::build_version; +use zero_bin_common::version; #[derive(Parser)] pub enum Cli { @@ -81,7 +81,7 @@ impl Cli { async fn main() -> anyhow::Result<()> { let args: Vec = env::args().collect(); if args.contains(&"--version".to_string()) { - build_version::print_version( + version::print_version( env!("EVM_ARITHMETIZATION_PKG_VER"), env!("VERGEN_RUSTC_COMMIT_HASH"), env!("VERGEN_BUILD_TIMESTAMP"), diff --git a/zero_bin/verifier/Cargo.toml b/zero_bin/verifier/Cargo.toml index a8e0abe25..ab9e5068f 100644 --- a/zero_bin/verifier/Cargo.toml +++ b/zero_bin/verifier/Cargo.toml @@ -3,7 +3,7 @@ name = "verifier" authors = ["Polygon Zero "] version = "0.1.0" edition = "2021" -build = "../common/src/build_version.rs" +build = "../common/build.rs" [dependencies] clap = { workspace = true } diff --git a/zero_bin/verifier/src/main.rs b/zero_bin/verifier/src/main.rs index 72d7f643c..e14ad7827 100644 --- a/zero_bin/verifier/src/main.rs +++ b/zero_bin/verifier/src/main.rs @@ -7,7 +7,7 @@ use dotenvy::dotenv; use proof_gen::proof_types::GeneratedBlockProof; use serde_json::Deserializer; use tracing::info; -use zero_bin_common::build_version; +use zero_bin_common::version; mod cli; mod init; @@ -18,7 +18,7 @@ fn main() -> Result<()> { let args: Vec = env::args().collect(); if args.contains(&"--version".to_string()) { - build_version::print_version( + version::print_version( env!("EVM_ARITHMETIZATION_PKG_VER"), env!("VERGEN_RUSTC_COMMIT_HASH"), env!("VERGEN_BUILD_TIMESTAMP"), diff --git a/zero_bin/worker/Cargo.toml b/zero_bin/worker/Cargo.toml index 2b0f72564..3a146c90e 100644 --- a/zero_bin/worker/Cargo.toml +++ b/zero_bin/worker/Cargo.toml @@ -7,7 +7,7 @@ license.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true -build = "../common/src/build_version.rs" +build = "../common/build.rs" [dependencies] paladin-core = { workspace = true } diff --git a/zero_bin/worker/src/main.rs b/zero_bin/worker/src/main.rs index 000e67a3a..2358401f4 100644 --- a/zero_bin/worker/src/main.rs +++ b/zero_bin/worker/src/main.rs @@ -5,8 +5,8 @@ use clap::Parser; use dotenvy::dotenv; use ops::register; use paladin::runtime::WorkerRuntime; -use zero_bin_common::build_version; use zero_bin_common::prover_state::cli::CliProverStateConfig; +use zero_bin_common::version; mod init; @@ -28,7 +28,7 @@ struct Cli { async fn main() -> Result<()> { let args: Vec = env::args().collect(); if args.contains(&"--version".to_string()) { - build_version::print_version( + version::print_version( env!("EVM_ARITHMETIZATION_PKG_VER"), env!("VERGEN_RUSTC_COMMIT_HASH"), env!("VERGEN_BUILD_TIMESTAMP"),