Backport: fix/datatool-hardened-derivation to 0.2.0 (#951)

* Backport: fix/datatool-hardened-derivation to 0.2.0

* fix: cargo.lock

Author: Zk2u

Cargo.lock

@@ -25,6 +25,7 @@ rand_core.workspace = true
 reth-chainspec.workspace = true
 secp256k1 = { workspace = true, features = ["global-context", "std"] }
 serde_json.workspace = true
+shrex.workspace = true
 terrors = "0.3.0"
 zeroize.workspace = true
 

bin/datatool/Cargo.toml

@@ -103,6 +103,12 @@ pub(crate) struct SubcOpXpub {
         short = 'E'
     )]
     pub(crate) key_from_env: bool,
+
+    #[argh(switch, description = "print the p2p key", short = 'p')]
+    pub(crate) p2p: bool,
+
+    #[argh(switch, description = "print the wallet key", short = 'w')]
+    pub(crate) wallet: bool,
 }
 
 /// Generate a network's param file from inputs.
@@ -148,14 +154,14 @@ pub(crate) struct SubcParams {
 
     #[argh(
         option,
-        description = "add a bridge operator key (must be at least one, appended after file keys)",
+        description = "add a bridge operator key (master xpriv, must be at least one, appended after file keys)",
         short = 'b'
     )]
     pub(crate) opkey: Vec<String>,
 
     #[argh(
         option,
-        description = "read bridge operator keys by line from file",
+        description = "read bridge operator keys (master xpriv) by line from file",
         short = 'B'
     )]
     pub(crate) opkeys: Option<PathBuf>,

bin/datatool/src/args.rs

@@ -15,20 +15,19 @@ use util::{exec_subc, resolve_network};
 
 fn main() {
     let args: args::Args = argh::from_env();
-    if let Err(e) = main_inner(args) {
-        eprintln!("ERROR\n{e:?}");
-    }
-}
+    let inner = || -> anyhow::Result<()> {
+        let network = resolve_network(args.bitcoin_network.as_deref())?;
 
-fn main_inner(args: args::Args) -> anyhow::Result<()> {
-    let network = resolve_network(args.bitcoin_network.as_deref())?;
+        let mut ctx = CmdContext {
+            datadir: args.datadir.unwrap_or_else(|| PathBuf::from(".")),
+            bitcoin_network: network,
+            rng: OsRng,
+        };
 
-    let mut ctx = CmdContext {
-        datadir: args.datadir.unwrap_or_else(|| PathBuf::from(".")),
-        bitcoin_network: network,
-        rng: OsRng,
+        exec_subc(args.subc, &mut ctx)?;
+        Ok(())
     };
-
-    exec_subc(args.subc, &mut ctx)?;
-    Ok(())
+    if let Err(e) = inner() {
+        eprintln!("ERROR\n{e:?}");
+    }
 }