Merge branch 'main' into yuji/upstream-hermes

Author: yito88

.changelog/libs-v0.47.2/improvements/4347-tx-result-events.md

@@ -0,0 +1,2 @@
+- Print tx's events in output of `namadac tx-result`.
+  ([\#4347](https://github.com/anoma/namada/pull/4347))

.changelog/libs-v0.47.2/summary.md

@@ -0,0 +1 @@
+Namada libs v0.47.2 patch release.

.changelog/v1.1.2/miscellaneous/4363-minor-release.md

@@ -0,0 +1,2 @@
+- Updated Namada libraries to lib-v0.47.2
+  ([\#4363](https://github.com/anoma/namada/pull/4363))

.changelog/v1.1.2/summary.md

@@ -0,0 +1 @@
+Namada apps v1.1.2 patch release.

CHANGELOG.md

@@ -1,5 +1,14 @@
 # CHANGELOG
 
+## v1.1.2
+
+Namada apps v1.1.2 patch release.
+
+### MISCELLANEOUS
+
+- Updated Namada libraries to lib-v0.47.2
+  ([\#4363](https://github.com/anoma/namada/pull/4363))
+
 ## v1.1.1
 
 Namada apps v1.1.1 patch release.
@@ -27,6 +36,15 @@ Namada v1.0.0 is the first stable release of the Namada apps.
 - updated namada libraries to libs-v0.46.1
   ([\#4123](https://github.com/anoma/namada/pull/4123))
 
+## libs-v0.47.2
+
+Namada libs v0.47.2 patch release.
+
+### IMPROVEMENTS
+
+- Print tx's events in output of `namadac tx-result`.
+  ([\#4347](https://github.com/anoma/namada/pull/4347))
+
 ## libs-v0.47.1
 
 Namada libs v0.47.1 patch release.

Cargo.lock

@@ -31,6 +31,6 @@ proptest = { workspace = true, optional = true }
 serde.workspace = true
 
 [dev-dependencies]
-namada_core = { workspace = true, features = ["testing"] }
+namada_core = { path = "../core", features = ["testing"] }
 
 proptest.workspace = true

crates/account/Cargo.toml

@@ -79,4 +79,5 @@ winapi.workspace = true
 [dev-dependencies]
 
 [build-dependencies]
+cargo_metadata.workspace = true
 git2.workspace = true

crates/apps/Cargo.toml

@@ -1,13 +1,11 @@
+use std::env;
 use std::fs::File;
 use std::io::Write;
-use std::str;
+use std::path::PathBuf;
 
 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");
@@ -23,8 +21,10 @@ fn main() {
         Some(describe) => describe.format(Some(&describe_format)).ok(),
         None => None,
     };
+    let out_dir = env::var("OUT_DIR").unwrap();
     let mut version_rs =
-        File::create("./version.rs").expect("cannot write version");
+        File::create(PathBuf::from_iter([&out_dir, "version.rs"]))
+            .expect("cannot write version");
     let pre = "pub fn namada_version() -> &'static str { \"";
     let post = "\" }";
     match version_string {
@@ -47,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| {
@@ -69,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);
 }

crates/apps_lib/build.rs crates/apps/build.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

crates/apps/src/bin/namada-client/main.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();

crates/apps/src/bin/namada-node/cli.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
 }

crates/apps/src/bin/namada-relayer/_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
 }

crates/apps/src/bin/namada-wallet/main.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 => {

crates/apps/src/bin/namada/cli.rs

@@ -0,0 +1,2 @@
+// Imports `pub fn namada_version() -> &'static str` made by build script
+include!(concat!(env!("OUT_DIR"), "/version.rs"));

crates/apps/src/lib.rs

@@ -84,15 +84,11 @@ tracing.workspace = true
 zeroize.workspace = true
 
 [dev-dependencies]
-namada_sdk = { workspace = true, default-features = true, features = [
+namada_sdk = { path = "../sdk", default-features = true, features = [
   "testing",
 ] }
 
 bit-set.workspace = true
 proptest.workspace = true
 lazy_static.workspace = true
 pretty_assertions.workspace = true
-
-[build-dependencies]
-cargo_metadata.workspace = true
-git2.workspace = true

crates/apps_lib/Cargo.toml

@@ -22,8 +22,6 @@ pub use utils::{safe_exit, Cmd};
 pub use self::context::Context;
 use crate::cli::api::CliIo;
 
-include!("../version.rs");
-
 const APP_NAME: &str = "Namada";
 
 // Main Namada sub-commands
@@ -9045,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);
@@ -9067,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) => {
@@ -9101,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) => {
@@ -9128,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)
 }
 
@@ -9139,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 {
@@ -9168,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))

crates/apps_lib/src/cli.rs

@@ -52,17 +52,15 @@ thiserror.workspace = true
 tracing = "0.1.30"
 
 [dev-dependencies]
-namada_account.workspace = true
-namada_core = { workspace = true, features = ["ethers-derive", "testing"] }
-namada_gas.workspace = true
-namada_governance.workspace = true
-namada_proof_of_stake = { workspace = true, features = ["testing"] }
-namada_state = { workspace = true, features = ["testing"] }
-namada_token = { workspace = true, features = ["testing"] }
-namada_tx = { workspace = true, features = ["testing"] }
-namada_vm = { workspace = true, default-features = true, features = [
-    "testing",
-] }
+namada_account.path = "../account"
+namada_core = { path = "../core", features = ["ethers-derive", "testing"] }
+namada_gas.path = "../gas"
+namada_governance.path = "../governance"
+namada_proof_of_stake = { path = "../proof_of_stake", features = ["testing"] }
+namada_state = { path = "../state", features = ["testing"] }
+namada_token = { path = "../token", features = ["testing"] }
+namada_tx = { path = "../tx", features = ["testing"] }
+namada_vm = { path = "../vm", default-features = true, features = ["testing"] }
 namada_vp.workspace = true
 
 assert_matches.workspace = true