Cumulative PR for Wallet & Metrics Refactoring

Cargo.toml

@@ -4,6 +4,7 @@ members = [
     "daemon",
     "cli",
     "core",
+    "wallet/macros",
     "wallet/core",
     "wallet/native",
     "wallet/wasm",
@@ -32,7 +33,6 @@ members = [
     "rpc/grpc/core",
     "rpc/grpc/client",
     "rpc/grpc/server",
-    "rpc/wrpc/core",
     "rpc/wrpc/server",
     "rpc/wrpc/client",
     "rpc/wrpc/proxy",
@@ -52,6 +52,7 @@ members = [
     "utils/tower",
     "rothschild",
     "metrics/perf_monitor",
+    "metrics/core",
 ]
 
 [workspace.package]
@@ -73,18 +74,18 @@ include = [
 
 [workspace.dependencies]
 # kaspa-testing-integration = { version = "0.13.1", path = "testing/integration" }
-kaspa-os = { version = "0.13.1", path = "kaspa-os" }
-kaspa-daemon = { version = "0.13.1", path = "daemon" }
 kaspa-addresses = { version = "0.13.1", path = "crypto/addresses" }
 kaspa-addressmanager = { version = "0.13.1", path = "components/addressmanager" }
 kaspa-bip32 = { version = "0.13.1", path = "wallet/bip32" }
+kaspa-cli = { version = "0.13.1", path = "cli" }
 kaspa-connectionmanager = { version = "0.13.1", path = "components/connectionmanager" }
 kaspa-consensus = { version = "0.13.1", path = "consensus" }
 kaspa-consensus-core = { version = "0.13.1", path = "consensus/core" }
 kaspa-consensus-notify = { version = "0.13.1", path = "consensus/notify" }
 kaspa-consensus-wasm = { version = "0.13.1", path = "consensus/wasm" }
 kaspa-consensusmanager = { version = "0.13.1", path = "components/consensusmanager" }
 kaspa-core = { version = "0.13.1", path = "core" }
+kaspa-daemon = { version = "0.13.1", path = "daemon" }
 kaspa-database = { version = "0.13.1", path = "database" }
 kaspa-grpc-client = { version = "0.13.1", path = "rpc/grpc/client" }
 kaspa-grpc-core = { version = "0.13.1", path = "rpc/grpc/core" }
@@ -94,12 +95,15 @@ kaspa-index-core = { version = "0.13.1", path = "indexes/core" }
 kaspa-index-processor = { version = "0.13.1", path = "indexes/processor" }
 kaspa-math = { version = "0.13.1", path = "math" }
 kaspa-merkle = { version = "0.13.1", path = "crypto/merkle" }
+kaspa-metrics-core = { version = "0.13.0", path = "metrics/core" }
 kaspa-mining = { version = "0.13.1", path = "mining" }
 kaspa-mining-errors = { version = "0.13.1", path = "mining/errors" }
 kaspa-muhash = { version = "0.13.1", path = "crypto/muhash" }
 kaspa-notify = { version = "0.13.1", path = "notify" }
+kaspa-os = { version = "0.13.1", path = "kaspa-os" }
 kaspa-p2p-flows = { version = "0.13.1", path = "protocol/flows" }
 kaspa-p2p-lib = { version = "0.13.1", path = "protocol/p2p" }
+kaspa-perf-monitor = { version = "0.13.1", path = "metrics/perf_monitor" }
 kaspa-pow = { version = "0.13.1", path = "consensus/pow" }
 kaspa-rpc-core = { version = "0.13.1", path = "rpc/core" }
 kaspa-rpc-macros = { version = "0.13.1", path = "rpc/macros" }
@@ -110,20 +114,20 @@ kaspa-utils = { version = "0.13.1", path = "utils" }
 kaspa-utils-tower = { version = "0.13.1", path = "utils/tower" }
 kaspa-utxoindex = { version = "0.13.1", path = "indexes/utxoindex" }
 kaspa-wallet = { version = "0.13.1", path = "wallet/native" }
-kaspa-cli = { version = "0.13.1", path = "cli" }
 kaspa-wallet-cli-wasm = { version = "0.13.1", path = "wallet/wasm" }
 kaspa-wallet-core = { version = "0.13.1", path = "wallet/core" }
+kaspa-wallet-macros = { version = "0.13.0", path = "wallet/macros" }
 kaspa-wasm = { version = "0.13.1", path = "wasm" }
-kaspa-wrpc-core = { version = "0.13.1", path = "rpc/wrpc/core" }
 kaspa-wrpc-client = { version = "0.13.1", path = "rpc/wrpc/client" }
+kaspa-wrpc-core = { version = "0.13.1", path = "rpc/wrpc/core" }
 kaspa-wrpc-proxy = { version = "0.13.1", path = "rpc/wrpc/proxy" }
 kaspa-wrpc-server = { version = "0.13.1", path = "rpc/wrpc/server" }
 kaspa-wrpc-wasm = { version = "0.13.1", path = "rpc/wrpc/wasm" }
 kaspad = { version = "0.13.1", path = "kaspad" }
-kaspa-perf-monitor = { version = "0.13.1", path = "metrics/perf_monitor" }
 
 # external
 aes = "0.8.3"
+ahash = "0.8.6"
 argon2 = "0.5.2"
 async-channel = "2.0.0"
 async-std = { version = "1.12.0", features = ['attributes'] }
@@ -155,11 +159,10 @@ enum-primitive-derive = "0.2.2"
 event-listener = "2.5.3" # TODO "3.0.1"
 evpkdf = "0.2.0"
 faster-hex = "0.6.1" # TODO "0.8.1" - fails unit tests
+fixedstr = { version = "0.5.4", features = ["serde"] }
 flate2 = "1.0.28"
 futures = { version = "0.3.29" }
-futures-util = { version = "0.3.29", default-features = false, features = [
-    "alloc",
-] }
+futures-util = { version = "0.3.29", default-features = false, features = [ "alloc", ] }
 getrandom = { version = "0.2.10", features = ["js"] }
 h2 = "0.3.21"
 heapless = "0.7.16"
@@ -243,16 +246,16 @@ hyper = "0.14.27"
 workflow-perf-monitor = { version = "0.0.2" }
 
 # workflow dependencies
-workflow-d3 = { version = "0.8.1" }
-workflow-nw = { version = "0.8.1" }
-workflow-log = { version = "0.8.1" }
-workflow-core = { version = "0.8.1" }
-workflow-wasm = { version = "0.8.1" }
-workflow-dom = { version = "0.8.1" }
-workflow-rpc = { version = "0.8.1" }
-workflow-node = { version = "0.8.1" }
-workflow-store = { version = "0.8.1" }
-workflow-terminal = { version = "0.8.1" }
+workflow-d3 = { version = "0.10.1" }
+workflow-nw = { version = "0.10.1" }
+workflow-log = { version = "0.10.1" }
+workflow-core = { version = "0.10.1" }
+workflow-wasm = { version = "0.10.1" }
+workflow-dom = { version = "0.10.1" }
+workflow-rpc = { version = "0.10.1" }
+workflow-node = { version = "0.10.1" }
+workflow-store = { version = "0.10.1" }
+workflow-terminal = { version = "0.10.1" }
 nw-sys = "0.1.6"
 
 # if below is enabled, this means that there is an ongoing work
@@ -268,6 +271,17 @@ nw-sys = "0.1.6"
 # workflow-node = { path = "../workflow-rs/node" }
 # workflow-store = { path = "../workflow-rs/store" }
 # workflow-terminal = { path = "../workflow-rs/terminal" }
+# ---
+# workflow-d3 = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-nw = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-log = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-core = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-wasm = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-dom = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-rpc = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-node = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-store = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
+# workflow-terminal = { git = "https://github.com/workflow-rs/workflow-rs.git", branch = "master" }
 # https://github.com/aspectron/nw-sys
 # nw-sys = { path = "../nw-sys" }
 

cli/Cargo.toml

@@ -36,6 +36,7 @@ kaspa-bip32.workspace = true
 kaspa-consensus-core.workspace = true
 kaspa-core.workspace = true
 kaspa-daemon.workspace = true
+kaspa-metrics-core.workspace = true
 kaspa-rpc-core.workspace = true
 kaspa-utils.workspace = true
 kaspa-wallet-core.workspace = true

cli/src/cli.rs

@@ -1,16 +1,13 @@
 use crate::error::Error;
 use crate::helpers::*;
 use crate::imports::*;
-pub use crate::metrics;
 use crate::modules::miner::Miner;
 use crate::modules::node::Node;
 use crate::notifier::{Notification, Notifier};
 use crate::result::Result;
 use kaspa_daemon::{DaemonEvent, DaemonKind, Daemons};
 use kaspa_wallet_core::rpc::DynRpcApi;
-use kaspa_wallet_core::runtime::{Account, BalanceStrings};
 use kaspa_wallet_core::storage::{IdT, PrvKeyDataInfo};
-use kaspa_wallet_core::{runtime::Wallet, Events};
 use kaspa_wrpc_client::KaspaRpcClient;
 use workflow_core::channel::*;
 use workflow_core::time::Instant;
@@ -192,6 +189,7 @@ impl KaspaCli {
     }
 
     pub fn register_metrics(self: &Arc<Self>) -> Result<()> {
+        use crate::modules::metrics;
         register_handlers!(self, self.handlers(), [metrics]);
         Ok(())
     }
@@ -282,6 +280,7 @@ impl KaspaCli {
 
                         if let Ok(msg) = msg {
                             match *msg {
+                                Events::Error { message } => { terrorln!(this,"{message}"); },
                                 Events::UtxoProcStart => {},
                                 Events::UtxoProcStop => {},
                                 Events::UtxoProcError { message } => {
@@ -336,95 +335,117 @@ impl KaspaCli {
 
                                 },
                                 Events::AccountSelection { .. } => { },
+                                Events::WalletCreate { .. } => { },
                                 Events::WalletError { .. } => { },
-                                Events::WalletOpen |
-                                Events::WalletReload => {
-
-                                    // load all accounts
-                                    if let Err(err) = this.wallet().activate_all_stored_accounts().await {
-                                        terrorln!(this, "{err}");
-                                    }
+                                // Events::WalletReady { .. } => { },
 
+                                Events::WalletOpen { .. } |
+                                Events::WalletReload { .. } => { },
+                                Events::WalletClose => {
+                                    this.term().refresh_prompt();
+                                },
+                                Events::PrvKeyDataCreate { .. } => { },
+                                Events::AccountDeactivation { .. } => { },
+                                Events::AccountActivation { .. } => {
                                     // list all accounts
                                     this.list().await.unwrap_or_else(|err|terrorln!(this, "{err}"));
 
                                     // load default account if only one account exists
                                     this.wallet().autoselect_default_account_if_single().await.ok();
                                     this.term().refresh_prompt();
-
-                                },
-                                Events::WalletClose => {
-                                    this.term().refresh_prompt();
                                 },
+                                Events::AccountCreate { .. } => { },
+                                Events::AccountUpdate { .. } => { },
                                 Events::DAAScoreChange { current_daa_score } => {
                                     if this.is_mutted() && this.flags.get(Track::Daa) {
                                         tprintln!(this, "{NOTIFY} DAA: {current_daa_score}");
                                     }
                                 },
+                                Events::Discovery { .. } => { }
                                 Events::Reorg {
                                     record
                                 } => {
                                     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Pending)) {
                                         let include_utxos = this.flags.get(Track::Utxo);
-                                        let tx = record.format_with_state(&this.wallet,Some("reorg"),include_utxos).await;
+                                        let tx = record.format_transaction_with_state(&this.wallet,Some("reorg"),include_utxos).await;
                                         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
                                     }
                                 },
-                                Events::External {
+                                Events::Stasis {
                                     record
                                 } => {
-                                    if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
+                                    // Pending and coinbase stasis fall under the same `Track` category
+                                    if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Pending)) {
                                         let include_utxos = this.flags.get(Track::Utxo);
-                                        let tx = record.format_with_state(&this.wallet,Some("external"),include_utxos).await;
+                                        let tx = record.format_transaction_with_state(&this.wallet,Some("stasis"),include_utxos).await;
                                         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
                                     }
                                 },
+                                // Events::External {
+                                //     record
+                                // } => {
+                                //     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
+                                //         let include_utxos = this.flags.get(Track::Utxo);
+                                //         let tx = record.format_with_state(&this.wallet,Some("external"),include_utxos).await;
+                                //         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
+                                //     }
+                                // },
                                 Events::Pending {
-                                    record, is_outgoing : _
+                                    record
                                 } => {
                                     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Pending)) {
                                         let include_utxos = this.flags.get(Track::Utxo);
-                                        let tx = record.format_with_state(&this.wallet,Some("pending"),include_utxos).await;
+                                        let tx = record.format_transaction_with_state(&this.wallet,Some("pending"),include_utxos).await;
                                         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
                                     }
                                 },
                                 Events::Maturity {
-                                    record, is_outgoing : _
-                                } => {
-                                    if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
-                                        let include_utxos = this.flags.get(Track::Utxo);
-                                        let tx = record.format_with_state(&this.wallet,Some("confirmed"),include_utxos).await;
-                                        tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
-                                    }
-                                },
-                                Events::Outgoing {
                                     record
                                 } => {
                                     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
                                         let include_utxos = this.flags.get(Track::Utxo);
-                                        let tx = record.format_with_state(&this.wallet,Some("confirmed"),include_utxos).await;
+                                        let tx = record.format_transaction_with_state(&this.wallet,Some("confirmed"),include_utxos).await;
                                         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
                                     }
                                 },
+                                // Events::Outgoing {
+                                //     record
+                                // } => {
+                                //     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
+                                //         let include_utxos = this.flags.get(Track::Utxo);
+                                //         let tx = record.format_with_state(&this.wallet,Some("confirmed"),include_utxos).await;
+                                //         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
+                                //     }
+                                // },
+                                // Events::Change {
+                                //     record
+                                // } => {
+                                //     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Tx)) {
+                                //         let include_utxos = this.flags.get(Track::Utxo);
+                                //         let tx = record.format_with_state(&this.wallet,Some("change"),include_utxos).await;
+                                //         tx.iter().for_each(|line|tprintln!(this,"{NOTIFY} {line}"));
+                                //     }
+                                // },
                                 Events::Balance {
                                     balance,
                                     id,
-                                    mature_utxo_size,
-                                    pending_utxo_size,
                                 } => {
 
                                     if !this.is_mutted() || (this.is_mutted() && this.flags.get(Track::Balance)) {
                                         let network_id = this.wallet.network_id().expect("missing network type");
                                         let network_type = NetworkType::from(network_id);
-                                        let balance = BalanceStrings::from((&balance,&network_type, None));
+                                        let balance_strings = BalanceStrings::from((&balance,&network_type, None));
                                         let id = id.short();
 
-                                        let pending_utxo_info = if pending_utxo_size > 0 {
-                                            format!("({pending_utxo_size} pending)")
+                                        let mature_utxo_count = balance.as_ref().map(|balance|balance.mature_utxo_count.separated_string()).unwrap_or("N/A".to_string());
+                                        let pending_utxo_count = balance.as_ref().map(|balance|balance.pending_utxo_count).unwrap_or(0);
+
+                                        let pending_utxo_info = if pending_utxo_count > 0 {
+                                            format!("({} pending)", pending_utxo_count)
                                         } else { "".to_string() };
-                                        let utxo_info = style(format!("{} UTXOs {pending_utxo_info}", mature_utxo_size.separated_string())).dim();
+                                        let utxo_info = style(format!("{mature_utxo_count} UTXOs {pending_utxo_info}")).dim();
 
-                                        tprintln!(this, "{NOTIFY} {} {id}: {balance}   {utxo_info}",style("balance".pad_to_width(8)).blue());
+                                        tprintln!(this, "{NOTIFY} {} {id}: {balance_strings}   {utxo_info}",style("balance".pad_to_width(8)).blue());
                                     }
 
                                     this.term().refresh_prompt();
@@ -757,9 +778,10 @@ impl Cli for KaspaCli {
             }
         }
 
-        if let Some(name) = self.wallet.name() {
-            if name != "kaspa" {
-                prompt.push(name);
+        if let Some(descriptor) = self.wallet.descriptor() {
+            let title = descriptor.title.unwrap_or(descriptor.filename);
+            if title.to_lowercase().as_str() != "kaspa" {
+                prompt.push(title);
             }
 
             if let Ok(account) = self.wallet.account() {

cli/src/error.rs

@@ -116,6 +116,9 @@ pub enum Error {
 
     #[error("private key {0} already exists")]
     PrivateKeyAlreadyExists(String),
+
+    #[error(transparent)]
+    MetricsError(kaspa_metrics_core::error::Error),
 }
 
 impl Error {

cli/src/extensions/mod.rs

@@ -0,0 +1,2 @@
+pub mod transaction;
+pub use transaction::*;