draft

.changelog/unreleased/bug-fixes/1504-wallet-address-add-fix.md

@@ -0,0 +1,2 @@
+- Do not add address if it already exists in the wallet.
+  ([\#1504](https://github.com/anoma/namada/issues/1504))

.changelog/unreleased/bug-fixes/1520-fix-sum-post-bonds-slashing.md

@@ -0,0 +1,5 @@
+- When processing slashes, bonds and unbonds that became active after
+  the infraction epoch must be properly accounted in order to properly
+  deduct stake that accounts for the precise slash amount. A bug
+  is fixed in the procedure that properly performs this accounting.
+  ([#1520](https://github.com/anoma/namada/pull/1520))

.changelog/unreleased/bug-fixes/1522-client-fix-wait-msg.md

@@ -0,0 +1,2 @@
+- Fix the message when a client is waiting for a node to sync on queries or
+  transactions. ([\#1522](https://github.com/anoma/namada/pull/1522))

.changelog/unreleased/bug-fixes/1524-fix-dry-run-header-and-prover.md

@@ -0,0 +1,2 @@
+- This change will enable usage of the Namada SDK to create MASP transactions
+  from non-CLI clients. ([\#1524](https://github.com/anoma/namada/pull/1524))

.changelog/unreleased/bug-fixes/1528-balances-fix-issue-758.md

@@ -0,0 +1,2 @@
+- Fixing how token balances are displayed in case of missing --token option.
+  ([#1528](https://github.com/anoma/namada/pull/1528))

.changelog/unreleased/bug-fixes/1533-fix-slashing-client-query.md

@@ -0,0 +1,3 @@
+- The slashed token amounts contained inside the bond and unbond information
+  returned by the PoS library fn bonds_and_unbonds are fixed and properly
+  computed. ([#1533](https://github.com/anoma/namada/pull/1533))

.changelog/unreleased/bug-fixes/1549-fix-init-validator-tm-mode.md

@@ -0,0 +1,3 @@
+- PoS: Fixed the client to change configuration to validator
+  mode after a successful `init-validator` transaction.
+  ([\#1549](https://github.com/anoma/namada/pull/1549))

.changelog/unreleased/bug-fixes/1553-fix-is-validator-fn.md

@@ -0,0 +1,3 @@
+- PoS: fixed a check for whether a given address belongs to a
+  validator account to work properly with newly created accounts.
+  ([\#1553](https://github.com/anoma/namada/pull/1553))

.changelog/unreleased/improvements/1491-utils-base-dir.md

@@ -0,0 +1,4 @@
+- Add a command, `namadac utils default-base-dir`, to
+  print the default base directory the command
+  line would use were one not provided by the user.
+  ([#1491](https://github.com/anoma/namada/pull/1491))

.changelog/unreleased/improvements/1510-established-addr-bytes.md

@@ -0,0 +1,3 @@
+- Improve the established address in-memory representation
+  and use a full SHA-256 digest for their generation.
+  ([\#1510](https://github.com/anoma/namada/pull/1510))

.changelog/unreleased/improvements/1512-implicit-addr-bytes.md

@@ -0,0 +1,2 @@
+- Improve the implicit address and PKH in-memory representation.
+  ([\#1512](https://github.com/anoma/namada/pull/1512))

.changelog/unreleased/improvements/1514-wallet-message-fix.md

@@ -0,0 +1,2 @@
+- Improve help message for address add command
+  ([\#1514](https://github.com/anoma/namada/issues/1514))

.changelog/unreleased/improvements/1518-pos-bonds-query-reuse.md

@@ -0,0 +1,2 @@
+- PoS: make a re-usable bonds and unbonds details query.
+  ([\#1518](https://github.com/anoma/namada/pull/1518))

apps/src/bin/namada-client/cli.rs

@@ -326,6 +326,9 @@ pub async fn main() -> Result<()> {
             Utils::PkToTmAddress(PkToTmAddress(args)) => {
                 utils::pk_to_tm_address(global_args, args)
             }
+            Utils::DefaultBaseDir(DefaultBaseDir(args)) => {
+                utils::default_base_dir(global_args, args)
+            }
         },
     }
     Ok(())
@@ -358,9 +361,9 @@ async fn wait_until_node_is_synched(ledger_address: &TendermintAddress) {
                         println!(
                             " Waiting for {} ({}/{} tries)...",
                             if is_at_least_height_one {
-                                "a first block"
-                            } else {
                                 "node to sync"
+                            } else {
+                                "a first block"
                             },
                             try_count + 1,
                             MAX_TRIES

apps/src/bin/namada-wallet/cli.rs

@@ -340,6 +340,10 @@ fn key_and_address_restore(
         .unwrap_or_else(|err| {
             eprintln!("{}", err);
             cli::safe_exit(1)
+        })
+        .unwrap_or_else(|| {
+            println!("No changes are persisted. Exiting.");
+            cli::safe_exit(0);
         });
     namada_apps::wallet::save(&wallet)
         .unwrap_or_else(|err| eprintln!("{}", err));
@@ -378,6 +382,10 @@ fn key_and_address_gen(
         .unwrap_or_else(|err| {
             eprintln!("{}", err);
             cli::safe_exit(1);
+        })
+        .unwrap_or_else(|| {
+            println!("No changes are persisted. Exiting.");
+            cli::safe_exit(0);
         });
     namada_apps::wallet::save(&wallet)
         .unwrap_or_else(|err| eprintln!("{}", err));

apps/src/lib/cli.rs

@@ -748,9 +748,10 @@ pub mod cmds {
         fn def() -> App {
             App::new(Self::CMD)
                 .about(
-                    "Restores a keypair from the given mnemonic code and \
-                     derives the implicit address from its public key. Stores \
-                     the keypair and the address with the given alias.",
+                    "Restores a keypair from the given mnemonic code and HD \
+                     derivation path and derives the implicit address from \
+                     its public key. Stores the keypair and the address with \
+                     the given alias.",
                 )
                 .add_args::<args::KeyAndAddressRestore>()
         }
@@ -1588,6 +1589,7 @@ pub mod cmds {
         InitNetwork(InitNetwork),
         InitGenesisValidator(InitGenesisValidator),
         PkToTmAddress(PkToTmAddress),
+        DefaultBaseDir(DefaultBaseDir),
     }
 
     impl SubCmd for Utils {
@@ -1604,11 +1606,14 @@ pub mod cmds {
                     SubCmd::parse(matches).map(Self::InitGenesisValidator);
                 let pk_to_tm_address =
                     SubCmd::parse(matches).map(Self::PkToTmAddress);
+                let default_base_dir =
+                    SubCmd::parse(matches).map(Self::DefaultBaseDir);
                 join_network
                     .or(fetch_wasms)
                     .or(init_network)
                     .or(init_genesis)
                     .or(pk_to_tm_address)
+                    .or(default_base_dir)
             })
         }
 
@@ -1620,6 +1625,7 @@ pub mod cmds {
                 .subcommand(InitNetwork::def())
                 .subcommand(InitGenesisValidator::def())
                 .subcommand(PkToTmAddress::def())
+                .subcommand(DefaultBaseDir::def())
                 .setting(AppSettings::SubcommandRequiredElseHelp)
         }
     }
@@ -1725,6 +1731,29 @@ pub mod cmds {
                 .add_args::<args::PkToTmAddress>()
         }
     }
+
+    #[derive(Clone, Debug)]
+    pub struct DefaultBaseDir(pub args::DefaultBaseDir);
+
+    impl SubCmd for DefaultBaseDir {
+        const CMD: &'static str = "default-base-dir";
+
+        fn parse(matches: &ArgMatches) -> Option<Self> {
+            matches
+                .subcommand_matches(Self::CMD)
+                .map(|matches| Self(args::DefaultBaseDir::parse(matches)))
+        }
+
+        fn def() -> App {
+            App::new(Self::CMD)
+                .about(
+                    "Print the default base directory that would be used if \
+                     --base-dir or NAMADA_BASE_DIR were not used to set the \
+                     base directory.",
+                )
+                .add_args::<args::DefaultBaseDir>()
+        }
+    }
 }
 
 pub mod args {
@@ -3842,6 +3871,19 @@ pub mod args {
         }
     }
 
+    #[derive(Clone, Debug)]
+    pub struct DefaultBaseDir {}
+
+    impl Args for DefaultBaseDir {
+        fn parse(_matches: &ArgMatches) -> Self {
+            Self {}
+        }
+
+        fn def(app: App) -> App {
+            app
+        }
+    }
+
     #[derive(Clone, Debug)]
     pub struct FetchWasms {
         pub chain_id: ChainId,

apps/src/lib/client/rpc.rs

@@ -32,7 +32,9 @@ use namada::ledger::pos::{
     self, BondId, BondsAndUnbondsDetail, CommissionPair, PosParams, Slash,
 };
 use namada::ledger::queries::RPC;
-use namada::ledger::rpc::{query_epoch, TxResponse};
+use namada::ledger::rpc::{
+    enriched_bonds_and_unbonds, query_epoch, TxResponse,
+};
 use namada::ledger::storage::ConversionState;
 use namada::ledger::wallet::{AddressVpType, Wallet};
 use namada::proof_of_stake::types::WeightedValidator;
@@ -314,7 +316,8 @@ pub async fn query_transparent_balance<
         }
         (None, Some(owner)) => {
             for token in tokens {
-                let prefix = token.to_db_key().into();
+                let prefix =
+                    token::balance_key(&token, &owner.address().unwrap());
                 let balances =
                     query_storage_prefix::<C, token::Amount>(client, &prefix)
                         .await;
@@ -329,7 +332,7 @@ pub async fn query_transparent_balance<
             }
         }
         (Some(token), None) => {
-            let prefix = token.to_db_key().into();
+            let prefix = token::balance_prefix(&token);
             let balances =
                 query_storage_prefix::<C, token::Amount>(client, &prefix).await;
             if let Some(balances) = balances {
@@ -1263,29 +1266,18 @@ pub async fn query_bonds<C: namada::ledger::queries::Client + Sync>(
     _wallet: &mut Wallet<CliWalletUtils>,
     args: args::QueryBonds,
 ) -> std::io::Result<()> {
-    let _epoch = query_and_print_epoch(client).await;
+    let epoch = query_and_print_epoch(client).await;
 
     let source = args.owner;
     let validator = args.validator;
 
     let stdout = io::stdout();
     let mut w = stdout.lock();
 
-    let bonds_and_unbonds: pos::types::BondsAndUnbondsDetails =
-        unwrap_client_response::<C, pos::types::BondsAndUnbondsDetails>(
-            RPC.vp()
-                .pos()
-                .bonds_and_unbonds(client, &source, &validator)
-                .await,
-        );
-    let mut bonds_total: token::Amount = 0.into();
-    let mut bonds_total_slashed: token::Amount = 0.into();
-    let mut unbonds_total: token::Amount = 0.into();
-    let mut unbonds_total_slashed: token::Amount = 0.into();
-    let mut total_withdrawable: token::Amount = 0.into();
-    for (bond_id, details) in bonds_and_unbonds {
-        let mut total: token::Amount = 0.into();
-        let mut total_slashed: token::Amount = 0.into();
+    let bonds_and_unbonds =
+        enriched_bonds_and_unbonds(client, epoch, &source, &validator).await;
+
+    for (bond_id, details) in &bonds_and_unbonds.data {
         let bond_type = if bond_id.source == bond_id.validator {
             format!("Self-bonds from {}", bond_id.validator)
         } else {
@@ -1295,74 +1287,66 @@ pub async fn query_bonds<C: namada::ledger::queries::Client + Sync>(
             )
         };
         writeln!(w, "{}:", bond_type)?;
-        for bond in details.bonds {
+        for bond in &details.data.bonds {
             writeln!(
                 w,
                 "  Remaining active bond from epoch {}: Δ {}",
                 bond.start, bond.amount
             )?;
-            total += bond.amount;
-            total_slashed += bond.slashed_amount.unwrap_or_default();
         }
-        if total_slashed != token::Amount::default() {
+        if details.bonds_total_slashed != token::Amount::default() {
             writeln!(
                 w,
                 "Active (slashed) bonds total: {}",
-                total - total_slashed
+                details.bonds_total_active()
             )?;
         }
-        writeln!(w, "Bonds total: {}", total)?;
+        writeln!(w, "Bonds total: {}", details.bonds_total)?;
         writeln!(w)?;
-        bonds_total += total;
-        bonds_total_slashed += total_slashed;
 
-        let mut withdrawable = token::Amount::default();
-        if !details.unbonds.is_empty() {
-            let mut total: token::Amount = 0.into();
-            let mut total_slashed: token::Amount = 0.into();
+        if !details.data.unbonds.is_empty() {
             let bond_type = if bond_id.source == bond_id.validator {
                 format!("Unbonded self-bonds from {}", bond_id.validator)
             } else {
                 format!("Unbonded delegations from {}", bond_id.source)
             };
             writeln!(w, "{}:", bond_type)?;
-            for unbond in details.unbonds {
-                total += unbond.amount;
-                total_slashed += unbond.slashed_amount.unwrap_or_default();
+            for unbond in &details.data.unbonds {
                 writeln!(
                     w,
                     "  Withdrawable from epoch {} (active from {}): Δ {}",
                     unbond.withdraw, unbond.start, unbond.amount
                 )?;
             }
-            withdrawable = total - total_slashed;
-            writeln!(w, "Unbonded total: {}", total)?;
-
-            unbonds_total += total;
-            unbonds_total_slashed += total_slashed;
-            total_withdrawable += withdrawable;
+            writeln!(w, "Unbonded total: {}", details.unbonds_total)?;
         }
-        writeln!(w, "Withdrawable total: {}", withdrawable)?;
+        writeln!(w, "Withdrawable total: {}", details.total_withdrawable)?;
         writeln!(w)?;
     }
-    if bonds_total != bonds_total_slashed {
+    if bonds_and_unbonds.bonds_total != bonds_and_unbonds.bonds_total_slashed {
         writeln!(
             w,
             "All bonds total active: {}",
-            bonds_total - bonds_total_slashed
+            bonds_and_unbonds.bonds_total_active()
         )?;
     }
-    writeln!(w, "All bonds total: {}", bonds_total)?;
+    writeln!(w, "All bonds total: {}", bonds_and_unbonds.bonds_total)?;
 
-    if unbonds_total != unbonds_total_slashed {
+    if bonds_and_unbonds.unbonds_total
+        != bonds_and_unbonds.unbonds_total_slashed
+    {
         writeln!(
             w,
             "All unbonds total active: {}",
-            unbonds_total - unbonds_total_slashed
+            bonds_and_unbonds.unbonds_total_active()
         )?;
     }
-    writeln!(w, "All unbonds total: {}", unbonds_total)?;
-    writeln!(w, "All unbonds total withdrawable: {}", total_withdrawable)?;
+    writeln!(w, "All unbonds total: {}", bonds_and_unbonds.unbonds_total)?;
+    writeln!(
+        w,
+        "All unbonds total withdrawable: {}",
+        bonds_and_unbonds.total_withdrawable
+    )?;
     Ok(())
 }