Merge pull request #4361 from anoma/mergify/bp/maint-libs-0.47/pr-4355

mergify[bot] · web-flow · commit df7bee9e8d70 · 2025-02-10T15:20:49.000Z
move version detection build script from apps_lib into apps (backport #4355)
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/apps/Cargo.toml b/crates/apps/Cargo.toml
@@ -79,4 +79,5 @@ winapi.workspace = true
 [dev-dependencies]
 
 [build-dependencies]
+cargo_metadata.workspace = true
 git2.workspace = true
diff --git a/crates/apps/build.rs b/crates/apps/build.rs
@@ -1,14 +1,11 @@
+use std::env;
 use std::fs::File;
 use std::io::Write;
 use std::path::PathBuf;
-use std::{env, str};
 
 use cargo_metadata::MetadataCommand;
 use git2::{DescribeFormatOptions, DescribeOptions, Repository};
 
-/// Path to the .proto source files, relative to `apps_lib` directory
-const PROTO_SRC: &str = "./proto";
-
 fn main() {
     // Discover the repository version, if it exists
     println!("cargo:rerun-if-changed=../../.git");
@@ -50,7 +47,7 @@ fn main() {
                     "--locked".to_string(),
                     "--offline".to_string(),
                 ])
-                .manifest_path("../apps/Cargo.toml")
+                .manifest_path("./Cargo.toml")
                 .exec()
                 .ok()
                 .and_then(|metadata| {
@@ -72,7 +69,4 @@ fn main() {
                 .expect("cannot write version");
         }
     };
-
-    // Tell Cargo that if the given file changes, to rerun this build script.
-    println!("cargo:rerun-if-changed={}", PROTO_SRC);
 }
diff --git a/crates/apps/src/bin/namada-client/main.rs b/crates/apps/src/bin/namada-client/main.rs
@@ -15,7 +15,7 @@ async fn main() -> Result<()> {
     // run the CLI
     CliApi::handle_client_command::<HttpClient, _>(
         None,
-        cli::namada_client_cli()?,
+        cli::namada_client_cli(namada_apps::namada_version())?,
         CliIo,
     )
     .await
diff --git a/crates/apps/src/bin/namada-node/cli.rs b/crates/apps/src/bin/namada-node/cli.rs
@@ -11,7 +11,7 @@ use namada_apps_lib::time::{DateTimeUtc, Utc};
 use namada_node as node;
 
 pub fn main() -> Result<()> {
-    let cmd = cli::namada_node_cli()?;
+    let cmd = cli::namada_node_cli(namada_apps::namada_version())?;
     match cmd {
         cli::NamadaNode::Ledger(cmd, ctx) => match cmd {
             cmds::Ledger::Run(cmds::LedgerRun(args)) => {
@@ -28,15 +28,25 @@ pub fn main() -> Result<()> {
                     );
                     ScheduledMigration::from_path(p, hash, height).unwrap()
                 });
-                node::run(chain_ctx.config, wasm_dir, scheduled_migration);
+                node::run(
+                    chain_ctx.config,
+                    wasm_dir,
+                    scheduled_migration,
+                    namada_apps::namada_version(),
+                );
             }
             cmds::Ledger::RunUntil(cmds::LedgerRunUntil(args)) => {
                 let mut chain_ctx = ctx.take_chain_or_exit();
                 let wasm_dir = chain_ctx.wasm_dir();
                 sleep_until(args.time);
                 chain_ctx.config.ledger.shell.action_at_height =
                     Some(args.action_at_height);
-                node::run(chain_ctx.config, wasm_dir, None);
+                node::run(
+                    chain_ctx.config,
+                    wasm_dir,
+                    None,
+                    namada_apps::namada_version(),
+                );
             }
             cmds::Ledger::Reset(_) => {
                 let chain_ctx = ctx.take_chain_or_exit();
diff --git a/crates/apps/src/bin/namada-relayer/_main.rs b/crates/apps/src/bin/namada-relayer/_main.rs
@@ -12,7 +12,7 @@ async fn main() -> Result<()> {
     // init logging
     logging::init_from_env_or(LevelFilter::INFO)?;
 
-    let cmd = cli::namada_relayer_cli()?;
+    let cmd = cli::namada_relayer_cli(namada_apps::namada_version())?;
     // run the CLI
     CliApi::handle_relayer_command::<HttpClient>(None, cmd, CliIo).await
 }
diff --git a/crates/apps/src/bin/namada-wallet/main.rs b/crates/apps/src/bin/namada-wallet/main.rs
@@ -5,7 +5,7 @@ use namada_apps_lib::cli::api::{CliApi, CliIo};
 #[tokio::main]
 pub async fn main() -> Result<()> {
     color_eyre::install()?;
-    let (cmd, ctx) = cli::namada_wallet_cli()?;
+    let (cmd, ctx) = cli::namada_wallet_cli(namada_apps::namada_version())?;
     // run the CLI
     CliApi::handle_wallet_command(cmd, ctx, &CliIo).await
 }
diff --git a/crates/apps/src/bin/namada/cli.rs b/crates/apps/src/bin/namada/cli.rs
@@ -12,7 +12,7 @@ use eyre::Result;
 use namada_apps_lib::cli;
 
 pub fn main() -> Result<()> {
-    let (cmd, raw_sub_cmd) = cli::namada_cli();
+    let (cmd, raw_sub_cmd) = cli::namada_cli(namada_apps::namada_version());
     handle_command(cmd, raw_sub_cmd)
 }
 
@@ -69,12 +69,13 @@ fn handle_command(cmd: cli::cmds::Namada, raw_sub_cmd: String) -> Result<()> {
             use clap_complete::{generate, shells};
             use clap_complete_nushell::Nushell;
 
+            let version = namada_apps::namada_version();
             for (mut app, name) in [
-                (cli::namada_app(), "namada"),
-                (cli::namada_node_app(), "namadan"),
-                (cli::namada_client_app(), "namadac"),
-                (cli::namada_wallet_app(), "namadaw"),
-                (cli::namada_relayer_app(), "namadar"),
+                (cli::namada_app(version), "namada"),
+                (cli::namada_node_app(version), "namadan"),
+                (cli::namada_client_app(version), "namadac"),
+                (cli::namada_wallet_app(version), "namadaw"),
+                (cli::namada_relayer_app(version), "namadar"),
             ] {
                 match shell {
                     cli::args::Shell::Bash => {
diff --git a/crates/apps/src/lib.rs b/crates/apps/src/lib.rs
@@ -0,0 +1,2 @@
+// Imports `pub fn namada_version() -> &'static str` made by build script
+include!(concat!(env!("OUT_DIR"), "/version.rs"));
diff --git a/crates/apps_lib/Cargo.toml b/crates/apps_lib/Cargo.toml
@@ -92,7 +92,3 @@ bit-set.workspace = true
 proptest.workspace = true
 lazy_static.workspace = true
 pretty_assertions.workspace = true
-
-[build-dependencies]
-cargo_metadata.workspace = true
-git2.workspace = true
diff --git a/crates/apps_lib/src/cli.rs b/crates/apps_lib/src/cli.rs
@@ -22,9 +22,6 @@ pub use utils::{safe_exit, Cmd};
 pub use self::context::Context;
 use crate::cli::api::CliIo;
 
-// Imports `pub fn namada_version() -> &'static str` made by build script
-include!(concat!(env!("OUT_DIR"), "/version.rs"));
-
 const APP_NAME: &str = "Namada";
 
 // Main Namada sub-commands
@@ -9046,16 +9043,16 @@ pub mod args {
     }
 }
 
-pub fn namada_cli() -> (cmds::Namada, String) {
-    let app = namada_app();
+pub fn namada_cli(version: &'static str) -> (cmds::Namada, String) {
+    let app = namada_app(version);
     let matches = app.get_matches();
     let raw_sub_cmd =
         matches.subcommand().map(|(raw, _matches)| raw.to_string());
     let result = cmds::Namada::parse(&matches);
     match (result, raw_sub_cmd) {
         (Some(cmd), Some(raw_sub)) => return (cmd, raw_sub),
         _ => {
-            namada_app().print_help().unwrap();
+            namada_app(version).print_help().unwrap();
         }
     }
     safe_exit(2);
@@ -9068,8 +9065,8 @@ pub enum NamadaNode {
     Utils(cmds::NodeUtils, args::Global),
 }
 
-pub fn namada_node_cli() -> Result<NamadaNode> {
-    let app = namada_node_app();
+pub fn namada_node_cli(version: &'static str) -> Result<NamadaNode> {
+    let app = namada_node_app(version);
     let matches = app.clone().get_matches();
     match Cmd::parse(&matches) {
         Some(cmd) => {
@@ -9102,8 +9099,8 @@ pub enum NamadaClient {
     WithContext(Box<(cmds::NamadaClientWithContext, Context)>),
 }
 
-pub fn namada_client_cli() -> Result<NamadaClient> {
-    let app = namada_client_app();
+pub fn namada_client_cli(version: &'static str) -> Result<NamadaClient> {
+    let app = namada_client_app(version);
     let matches = app.clone().get_matches();
     match Cmd::parse(&matches) {
         Some(cmd) => {
@@ -9129,8 +9126,10 @@ pub fn namada_client_cli() -> Result<NamadaClient> {
     }
 }
 
-pub fn namada_wallet_cli() -> Result<(cmds::NamadaWallet, Context)> {
-    let app = namada_wallet_app();
+pub fn namada_wallet_cli(
+    version: &'static str,
+) -> Result<(cmds::NamadaWallet, Context)> {
+    let app = namada_wallet_app(version);
     cmds::NamadaWallet::parse_or_print_help(app)
 }
 
@@ -9140,8 +9139,8 @@ pub enum NamadaRelayer {
     ValidatorSet(cmds::ValidatorSet),
 }
 
-pub fn namada_relayer_cli() -> Result<NamadaRelayer> {
-    let app = namada_relayer_app();
+pub fn namada_relayer_cli(version: &'static str) -> Result<NamadaRelayer> {
+    let app = namada_relayer_app(version);
     let matches = app.clone().get_matches();
     match Cmd::parse(&matches) {
         Some(cmd) => match cmd {
@@ -9169,49 +9168,49 @@ pub fn namada_relayer_cli() -> Result<NamadaRelayer> {
     }
 }
 
-pub fn namada_app() -> App {
+pub fn namada_app(version: &'static str) -> App {
     let app = App::new(APP_NAME)
-        .version(namada_version())
+        .version(version)
         .about("Namada command line interface.")
         .color(ColorChoice::Auto)
         .subcommand_required(true)
         .arg_required_else_help(true);
     cmds::Namada::add_sub(args::Global::def(app))
 }
 
-pub fn namada_node_app() -> App {
+pub fn namada_node_app(version: &'static str) -> App {
     let app = App::new(APP_NAME)
-        .version(namada_version())
+        .version(version)
         .about("Namada node command line interface.")
         .color(ColorChoice::Auto)
         .subcommand_required(true)
         .arg_required_else_help(true);
     cmds::NamadaNode::add_sub(args::Global::def(app))
 }
 
-pub fn namada_client_app() -> App {
+pub fn namada_client_app(version: &'static str) -> App {
     let app = App::new(APP_NAME)
-        .version(namada_version())
+        .version(version)
         .about("Namada client command line interface.")
         .color(ColorChoice::Auto)
         .subcommand_required(true)
         .arg_required_else_help(true);
     cmds::NamadaClient::add_sub(args::Global::def(app))
 }
 
-pub fn namada_wallet_app() -> App {
+pub fn namada_wallet_app(version: &'static str) -> App {
     let app = App::new(APP_NAME)
-        .version(namada_version())
+        .version(version)
         .about("Namada wallet command line interface.")
         .color(ColorChoice::Auto)
         .subcommand_required(true)
         .arg_required_else_help(true);
     cmds::NamadaWallet::add_sub(args::Global::def(app))
 }
 
-pub fn namada_relayer_app() -> App {
+pub fn namada_relayer_app(version: &'static str) -> App {
     let app = App::new(APP_NAME)
-        .version(namada_version())
+        .version(version)
         .about("Namada relayer command line interface.")
         .subcommand_required(true);
     cmds::NamadaRelayer::add_sub(args::Global::def(app))
diff --git a/crates/node/src/lib.rs b/crates/node/src/lib.rs
@@ -287,6 +287,7 @@ pub fn run(
     config: config::Config,
     wasm_dir: PathBuf,
     scheduled_migration: Option<ScheduledMigration>,
+    namada_version: &'static str,
 ) {
     handle_tendermint_mode_change(&config);
 
@@ -325,7 +326,12 @@ pub fn run(
         .enable_all()
         .build()
         .unwrap()
-        .block_on(run_aux(config.ledger, wasm_dir, scheduled_migration));
+        .block_on(run_aux(
+            config.ledger,
+            wasm_dir,
+            scheduled_migration,
+            namada_version,
+        ));
 }
 
 /// Check the `tendermint_mode` has changed from validator to non-validator
@@ -453,6 +459,7 @@ async fn run_aux(
     config: config::Ledger,
     wasm_dir: PathBuf,
     scheduled_migration: Option<ScheduledMigration>,
+    namada_version: &'static str,
 ) {
     let setup_data =
         run_aux_setup(&config, &wasm_dir, scheduled_migration).await;
@@ -462,7 +469,7 @@ async fn run_aux(
     let mut spawner = AbortableSpawner::new();
 
     // Start Tendermint node
-    start_tendermint(&mut spawner, &config);
+    start_tendermint(&mut spawner, &config, namada_version);
 
     // Start oracle if necessary
     let eth_oracle_channels =
@@ -753,7 +760,11 @@ async fn run_abci(
 
 /// Launches a new task managing a Tendermint process into the asynchronous
 /// runtime, and returns its [`task::JoinHandle`].
-fn start_tendermint(spawner: &mut AbortableSpawner, config: &config::Ledger) {
+fn start_tendermint(
+    spawner: &mut AbortableSpawner,
+    config: &config::Ledger,
+    namada_version: &'static str,
+) {
     let tendermint_dir = config.cometbft_dir();
     let chain_id = config.chain_id.clone();
     let proxy_app_address = config.cometbft.proxy_app.to_string();
@@ -777,6 +788,7 @@ fn start_tendermint(spawner: &mut AbortableSpawner, config: &config::Ledger) {
                 proxy_app_address,
                 config,
                 tm_abort_recv,
+                namada_version,
             )
             .map_err(Error::Tendermint)
             .await;
diff --git a/crates/node/src/tendermint_node.rs b/crates/node/src/tendermint_node.rs

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ async fn main() -> Result<()> {`
`15`	`15`	`// run the CLI`
`16`	`16`	`CliApi::handle_client_command::<HttpClient, _>(`
`17`	`17`	`None,`
`18`		`- cli::namada_client_cli()?,`
	`18`	`+ cli::namada_client_cli(namada_apps::namada_version())?,`
`19`	`19`	`CliIo,`
`20`	`20`	`)`
`21`	`21`	`.await`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ async fn main() -> Result<()> {`
`12`	`12`	`// init logging`
`13`	`13`	`logging::init_from_env_or(LevelFilter::INFO)?;`
`14`	`14`
`15`		`- let cmd = cli::namada_relayer_cli()?;`
	`15`	`+ let cmd = cli::namada_relayer_cli(namada_apps::namada_version())?;`
`16`	`16`	`// run the CLI`
`17`	`17`	`CliApi::handle_relayer_command::<HttpClient>(None, cmd, CliIo).await`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ use namada_apps_lib::cli::api::{CliApi, CliIo};`
`5`	`5`	`#[tokio::main]`
`6`	`6`	`pub async fn main() -> Result<()> {`
`7`	`7`	`color_eyre::install()?;`
`8`		`- let (cmd, ctx) = cli::namada_wallet_cli()?;`
	`8`	`+ let (cmd, ctx) = cli::namada_wallet_cli(namada_apps::namada_version())?;`
`9`	`9`	`// run the CLI`
`10`	`10`	`CliApi::handle_wallet_command(cmd, ctx, &CliIo).await`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	+// Imports `pub fn namada_version() -> &'static str` made by build script
	`2`	`+include!(concat!(env!("OUT_DIR"), "/version.rs"));`