diff --git a/Cargo.lock b/Cargo.lock index 72daf46..fdd9e3a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -98,9 +98,24 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "artimonist" -version = "1.8.1" +version = "1.8.4" +dependencies = [ + "anyhow", + "artimonist 1.9.0", + "assert_cmd", + "clap", + "comfy-table", + "inquire", + "predicates", + "thiserror", + "unicode-normalization", +] + +[[package]] +name = "artimonist" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c4ccfe5965f5cc9df4df8df95fa9b877b0451857926bdf2c7a5cddc852ca9f2" +checksum = "0cf30bf6016bf556215cd2cb0f3c4a17241424b92525d164a08992fd2eca096c" dependencies = [ "aes", "argon2", @@ -114,21 +129,6 @@ dependencies = [ "xbits", ] -[[package]] -name = "artimonist" -version = "1.8.3" -dependencies = [ - "anyhow", - "artimonist 1.8.1", - "assert_cmd", - "clap", - "comfy-table", - "inquire", - "predicates", - "thiserror", - "unicode-normalization", -] - [[package]] name = "assert_cmd" version = "2.0.17" diff --git a/Cargo.toml b/Cargo.toml index 13685e9..5b8445a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "artimonist" -version = "1.8.3" +version = "1.8.4" edition = "2024" description = "A tool for generating mnemonics and wallets." @@ -21,7 +21,7 @@ testnet = ["artimonist/testnet"] [dependencies] -artimonist = { version = "1.8" } +artimonist = { version = "1.9" } clap = { version = "^4.5", features = ["derive"] } inquire = { version = "^0.7", default-features = false, features = ["crossterm"] } comfy-table = { version = "^7.1", default-features = false} diff --git a/src/diagram/execute.rs b/src/diagram/execute.rs index ddc62b1..7525388 100644 --- a/src/diagram/execute.rs +++ b/src/diagram/execute.rs @@ -187,7 +187,7 @@ impl DisplayTargets for DiagramCommand { let password = self.password.as_ref().ok_or(anyhow!("empty password"))?; writeln!(f, "Wifs: ")?; for index in self.index..self.index + self.amount { - let artimonist::Wif { addr, pk } = master.bip85_wif(index)?; + let artimonist::Wif { addr, pk } = master.bip85_wallet(index)?; writeln!(f, "({index}): {addr}, {}", pk.bip38_encrypt(password)?)?; } Ok(()) @@ -197,7 +197,7 @@ impl DisplayTargets for DiagramCommand { fn xpriv(&self, master: &Xpriv, f: &mut impl Write) -> anyhow::Result<()> { writeln!(f, "Xprvs: ")?; for index in self.index..self.index + self.amount { - let xpriv = master.bip85_xpriv(index)?; + let xpriv = master.bip85_master(index)?; writeln!(f, "({index}): {xpriv}")?; } Ok(()) @@ -207,7 +207,7 @@ impl DisplayTargets for DiagramCommand { fn pwd(&self, master: &Xpriv, f: &mut impl Write) -> anyhow::Result<()> { writeln!(f, "Passwords: ")?; for index in self.index..self.index + self.amount { - let pwd = master.bip85_pwd(index, 20, Default::default())?; + let pwd = master.bip85_password(index, 20, Default::default())?; writeln!(f, "({index}): {pwd}")?; } Ok(()) diff --git a/src/main.rs b/src/main.rs index 9d637ad..33fd33e 100644 --- a/src/main.rs +++ b/src/main.rs @@ -104,13 +104,15 @@ mod diagram_test { let mnemonic = master.bip85_mnemonic(0, 24, Default::default()).unwrap(); assert_eq!(mnemonic, MNEMONIC); WIFS.into_iter().enumerate().for_each(|(i, s)| { - let Wif { addr, pk } = master.bip85_wif(i as u32).unwrap(); + let Wif { addr, pk } = master.bip85_wallet(i as u32).unwrap(); assert_eq!(format!("{addr}, {pk}"), s); }); let salt_master = diagram.bip32_master("artimonist".as_bytes()).unwrap(); - assert_eq!(salt_master.bip85_xpriv(0).unwrap(), XPRIV); + assert_eq!(salt_master.bip85_master(0).unwrap(), XPRIV); PWDS.into_iter().enumerate().for_each(|(i, s)| { - let pwd = master.bip85_pwd(i as u32, 20, Default::default()).unwrap(); + let pwd = master + .bip85_password(i as u32, 20, Default::default()) + .unwrap(); assert_eq!(pwd, s); }); }