Update readme

README.md

@@ -1,125 +1,85 @@
-# Artimonist
-A tool for generating mnemonics and wallets.  
-Web version: **<https://www.artimonist.org>**
-
-### Help infomation
-**`> artimonist --help`**
-``` blank
-Usage: artimonist <COMMAND>
-
-Commands:
-  simple   Use simple diagram of 7 * 7 unicode chars
-  complex  Use complex diagram of 7 * 7 unicode strings
-  encrypt  Encrypt private key by bip38
-  decrypt  Decrypt private key by bip38
-  derive   Derive from master key or mnemonic
-  bip32    Derive by custom bip32 path
-  help     Print this message or the help of the given subcommand(s)
-```
-**`> artimonist simple --help`**
-``` blank
-Usage: artimonist simple [OPTIONS]
-
-Options:
-  -i, --index <INDEX>      Start index [default: 0]
-  -m, --amount <AMOUNT>    Amount to generate [default: 1]
-  -f, --file <FILE>        Input diagram from text file
-      --unicode            Export unicode view for non-displayable character
-      --mnemonic <LENGTH>  Generate bip39 mnemonic [default] [possible values: 12, 15, 18, 21, 24]
-      --wif                Generate wallet address and private key [aliases: --wallet]
-      --xprv               Generate master key for HD-Wallet [aliases: --master]
-      --pwd                Generate password
-  -h, --help               Print help
-```
-**`> artimonist derive --help`**
-``` blank
-Usage: artimonist derive [OPTIONS] <MNEMONIC|MASTER_KEY>
-
-Arguments:
-  <MNEMONIC|MASTER_KEY>  Mnemonic phrase or Master key
-
-Options:
-  -a, --account <ACCOUNT>  Account start index [default: 0]
-  -i, --index <INDEX>      Address start index [default: 0]
-  -m, --amount <AMOUNT>    Amount of address [default: 5]
-      --bip44              Use derive path: m/44'/0'/account'/0/index [p2pkh]
-      --bip49              Use derive path: m/49'/0'/account'/0/index [p2shwpkh, default]
-      --bip84              Use derive path: m/84'/0'/account'/0/index [p2wpkh]
-      --m23                Multiple signatures address of 2-3 [derive path: account'/0/index]
-      --m35                Multiple signatures address of 3-5 [derive path: account'/0/index]
-      --detail             Export account xprv, xpub and redeem scripts of multisig
-  -h, --help               Print help
-```
+# [Artimonist](https://www.artimonist.org)  
+### A tool for generating mnemonics and wallets.
 
-Let's draw a diagram like the one below, and generate multi target by it.
-```
-+----+---+---+---+---+---+----+
-| 【 |   |   |   |   |   |    |
-|----+---+---+---+---+---+----|
-|    | 1 |   |   |   |   |    |
-|----+---+---+---+---+---+----|
-|    |   | $ |   |   |   |    |
-|----+---+---+---+---+---+----|
-|    |   |   | ≈ |   |   |    |
-|----+---+---+---+---+---+----|
-|    |   |   |   | ⅞ |   |    |
-|----+---+---+---+---+---+----|
-|    |   |   |   |   | £ |    |
-|----+---+---+---+---+---+----|
-|    |   |   |   |   |   | 】 |
-+----+---+---+---+---+---+----+
-```
-_(Some terminal fonts display different characters width, using monospaced font maybe display correctly.)_
-
-### mnemonic
-**`> artimonist simple`**  
-`> row (1) "【"  ""  ""  ""  ""  ""  ""`  
-`> row (2) ""  "1"  ""  ""  ""  ""  ""`  
-`> row (3) ""  ""  "$"  ""  ""  ""  ""`  
-`> row (4) ""  ""  ""  "≈"  ""  ""  ""`  
-`> row (5) ""  ""  ""  ""  "⅞"  ""  ""`  
-`> row (6) ""  ""  ""  ""  ""  "£"  ""`  
-`> row (7) ""  ""  ""  ""  ""  ""  "】"`  
-_(Accepts any Unicode character written as "\u{1234}")_  
-_(With salt of '123456')_  
-``` blank
+### Simple diagram
+|【 | | | | | | |
+|-|-|-|-|-|-|-|
+| |1| | | | | |
+| | |$| | | | |
+| | | |≈| | | |
+| | | | |⅞| | |
+| | | | | |£| |
+| | | | | | |】|
+
+
+#### Generate mnemonics
+```blank
+> artimonist simple  
+> row (1) "【"  ""  ""  ""  ""  ""  ""  
+> row (2) ""  "1"  ""  ""  ""  ""  ""  
+> row (3) ""  ""  "$"  ""  ""  ""  ""  
+> row (4) ""  ""  ""  "≈"  ""  ""  ""  
+> row (5) ""  ""  ""  ""  "⅞"  ""  ""  
+> row (6) ""  ""  ""  ""  ""  "£"  ""  
+> row (7) ""  ""  ""  ""  ""  ""  "】"  
+
+Mnemonics: 
 (0): tattoo slide more city sample ask tell unfold category spoil mother bottom assume session rib humble school usage ensure game bottom able mind exile
 ```
+> Accepts any Unicode character written as "\u{1234}"  
+> With Encryption Key of "123456"  
 
-### wallet
-**`> artimonist simple --wallet --amount 5`**  
-``` blank
+
+#### Generate wallets
+```blank
+> artimonist simple --wallet --amount 5
+
+Wifs:
 (0): 3QUo3a7XB8u9hQK8qjNpjbjy13NfNyFvBa, 6PYTgnyGxwze4uCPu159m6wDxcmng7P4zpJZXQCUT1c4ULf44U8YyDkGMn
 (1): 35doRbCyWPShWdmteEJ22WF5erBuodf36B, 6PYWhNEcMShynPayAaZzVgkQ1PdHtjoqgvpUP73NSJFKnvEuAmFdrUQ1ad
 (2): 39fwZPrpp7wrq5dBrXFYs8HnbnS5V8sgJL, 6PYQHCK2RJBYwTxGoth59ejdpMQpa71zjiU3A76EZdVJCo8ytDHZRyBtDf
 (3): 3DpJtFBEyXknqme54LpM3WrMncKDiZzRQx, 6PYXMCM7edE4yriik3PfSgRyV2wJVWF19SdPcNs9PReJCBP6Ljsr3yFrdy
 (4): 3AQU4ZCDBHK6QFBa9A47MpaCesiRSVvB5a, 6PYPZmdi6rG6dBrR5tyV2EPdDEQqd1WW7qLyVWtD66BQALA2tVnqrezUMc
-``` 
+```
+> address and encrypted private key
 
-### xprv
-**`> artimonist simple --xprv`**  
-``` blank
+
+#### Generate master key
+```blank
+> artimonist simple --xprv
+
+Xprvs:  
 (0): xprv9s21ZrQH143K4NhZJaqTRwAaQztwHG3fUbLur3MBRiVJhEg1ZVQPGzStfYaBJnVtrdsJUGhPCEdYnh9e4K8XLuDP3XhPtMFypV3ujRtgRY4
 ```
-### derive
-**`> artimonist derive "tattoo slide more city sample ask tell unfold category spoil mother bottom assume session rib humble school usage ensure game bottom able mind exile"`**  
-``` blank
+
+
+#### Derive wallets
+```blank
+> artimonist derive "tattoo slide more city sample ask tell unfold category spoil mother bottom assume session rib humble school usage ensure game bottom able mind exile"
+
 [m/49'/0'/0'/0/0]: 3HpzFSi3vDpP4LEMphC1rpiArzAQARuhCz, 6PYS49dBhWXYUGYoJRs1BjiwWP9xFtMvTSUrz3LH25pgkx7vHLRjWhPh77
 [m/49'/0'/0'/0/1]: 3LNibRvHXCAfFNtAxsGTdgc4QK6zfux1Xh, 6PYWdYWUHEUWbrpZfsqyqDqLEdKciPU4z2CUP5dTAZUgAA5P3kRpdJfssd
 [m/49'/0'/0'/0/2]: 38CJzvL1JTEP4hsotKSeXwWycGSzaadMY4, 6PYQsKHKd5t98dejwB4mPtztciPbdBpMvEYEW7RfgdbkirU9dQgD9R4fzR
 [m/49'/0'/0'/0/3]: 35EMZ6LJ7FSqDkUUbrHBzoWrbxvCuAC5iW, 6PYS77m41stXJrnUSjkQDjTKofNxseKw7nisnrwJFb5qiZv45ZfrMXJNAD
 [m/49'/0'/0'/0/4]: 36wWQaePbom8zvRFeNcjpr2Jwq99RY88os, 6PYT6LyxaPpmN3CY3DhgdSN1YTFBySN5tYomMuj5AS9i4bD8hGNSGvEhiC
 ```
 
-### multisig
-**`> artimonist derive --m23 xprv9s21ZrQH143K4NhZJaqTRwAaQztwHG3fUbLur3MBRiVJhEg1ZVQPGzStfYaBJnVtrdsJUGhPCEdYnh9e4K8XLuDP3XhPtMFypV3ujRtgRY4`**  
-``` blank
+
+#### Derive multisig wallets
+```blank
+> artimonist derive --m23 --detail xprv9s21ZrQH143K4NhZJaqTRwAaQztwHG3fUbLur3MBRiVJhEg1ZVQPGzStfYaBJnVtrdsJUGhPCEdYnh9e4K8XLuDP3XhPtMFypV3ujRtgRY4
+
 Account xpubs: [m/49'/0'/0'] ~ [m/49'/0'/2']
-  xpub6BjjJvci8YJwRTSJaWkPezV4qKoTVWtm77jgFG6k6rT137tMht1929iVCZHGKfgQXo865wuswijs7vMqzV9s4hGPK6u8pj8ckeipS9ULPxm
-  xpub6BjjJvci8YJwUHa9yfYaF3NWg55RsTTkVNywZibPUPn6wiyZ57f5By7RqBhzCY8uL5GQfYatikaVLqyK8DUgi5ZrcGfLJaKraG8uXme82uq
-  xpub6BjjJvci8YJwUYMbGZG7QkpMVnyMhz9wvmEeXZQ2MzML9WHYyiyDUQFsTXT1DzFdXroLXYfhtSJy9m6n9J5Ye66GyTPgcLgnJU1i54He8f9
+[m/49'/0'/0']: xpub6BjjJvci8YJwRTSJaWkPezV4qKoTVWtm77jgFG6k6rT137tMht1929iVCZHGKfgQXo865wuswijs7vMqzV9s4hGPK6u8pj8ckeipS9ULPxm
+[m/49'/0'/1']: xpub6BjjJvci8YJwUHa9yfYaF3NWg55RsTTkVNywZibPUPn6wiyZ57f5By7RqBhzCY8uL5GQfYatikaVLqyK8DUgi5ZrcGfLJaKraG8uXme82uq
+[m/49'/0'/2']: xpub6BjjJvci8YJwUYMbGZG7QkpMVnyMhz9wvmEeXZQ2MzML9WHYyiyDUQFsTXT1DzFdXroLXYfhtSJy9m6n9J5Ye66GyTPgcLgnJU1i54He8f9
+
+Account xprvs: [m/49'/0'/0'] ~ [m/49'/0'/2']
+[m/49'/0'/0']: xprv9xkNuR5pJAkeCyMqUVDPHrYLHHxy64Aujtp5Ssh8YWv2AKZDALgtUMQ1MFShNCSLS4v1F1L9XqxFE56aer9watYobVb52UXAhpC7BrEbA8X
+[m/49'/0'/1']: xprv9xkNuR5pJAkeFoVgse1ZsuRn83EwTzju8A4LmLBmv4F84veQXaLpeAnwyvgD1ZvuYeYMJDViQGKFUz4EG4xsjoQDq8bE8aJSKso1FMoezta
+[m/49'/0'/2']: xprv9xkNuR5pJAkeG4H8AXj73cscwm8sJXS6ZYK3jAzQoepMGhxQSBexvbwPcF4AHWQtbKJd8HdhrC6WznjxdM8CtZYxHzPZQbEThFKKLT29eY8
 
-Addresses:
+Addresses: 
 ┌───────┬────────────────────────────────────┐
 │ Path  │ Address                            │
 ╞═══════╪════════════════════════════════════╡
@@ -133,4 +93,11 @@ Addresses:
 ├───────┼────────────────────────────────────┤
 │ m/0/4 │ 37fb8tLHQzCKPo3thPzapm44bsT7xAdsAB │
 └───────┴────────────────────────────────────┘
-```
+
+Redeem scripts:
+[m/0/0]: 522102150d3144895fe0af428448876dcb9748e893a572ee7f469c865ab140fd65f5ec2102ce54fa0619c5ba7f036faaf432a1d8ec39dd4cae0eed650b787b819bad53822a21038b45906d143409dc98c2373abb8d7a249b1ccdb6aa72445ea163ce8d6b2db4cb53ae
+[m/0/1]: 5221039c3bd88f187ed1f9ff6ad7f3624f43d73ba999b907576dd90e70954c77c6c50a2103acaa3cf1dace72e66169c7e23573bbee58ac45ce27eb9ae7843a4aad6e027a532103ff9c3147481a07f87cccdd7b12b419f84e2c1d59041afa0aa727001e16d029cb53ae
+[m/0/2]: 52210288377dc2426cccd0a08b1787ac621ae0dedd4399794b66cdd2a3926680f6d1d621030b1f38d1ecbd61584567a66a127498a7966eef31356016a68ee6f338e88b9214210364f16403c8bb1b52621c66bd104800ef109871167ffc12e992342624ee7523ce53ae
+[m/0/3]: 52210217dc857c33cc40807584a36ffab5a108cf8c873b80335f992a1629568f4a5cd5210229462108ad8adc198dc2a73d1d28120c82d4442a2fd512f5c166219a0cbb3c672103e5d720a3d40081266f32feaa15e3b7bcf0c2426a587510df97ab6dc13abb782a53ae
+[m/0/4]: 522102a6beb4cba2135a80180d1a20d772bdb0ee7667cce0ab81e41f74ba3c4278119b2102de7f0c00ea61ccffd8d9654a4426eeee2571baa5ab2672770c4421f2874d316c21037258d0cf8463e5d8c2215a865c15bff270eb6f31829d4138af1fd21f0bec9a6253ae
+```

src/derive/multisig.rs

@@ -57,7 +57,7 @@ impl MultiSig for DeriveCommand {
         }
         if self.detail {
             writeln!(f)?;
-            writeln!(f, "Account xprivs: [{path_first}] ~ [{path_last}]")?;
+            writeln!(f, "Account xprvs: [{path_first}] ~ [{path_last}]")?;
             for (i, (_, xpriv)) in accounts.iter().enumerate() {
                 let path = self.derive.path(self.account + i as u32);
                 writeln!(f, "[{path}]: {xpriv}")?;

src/diagram/output.rs

@@ -100,7 +100,7 @@ impl<D: GenericDiagram> DeriveTargets for DiagramCommand<D> {
 
     #[inline]
     fn xpriv(&self, master: &Xpriv, f: &mut impl Write) -> anyhow::Result<()> {
-        writeln!(f, "Xprivs: ")?;
+        writeln!(f, "Xprvs: ")?;
         for index in self.index..self.index + self.amount {
             let xpriv = master.bip85_xpriv(index)?;
             writeln!(f, "({index}): {xpriv}")?;
@@ -137,8 +137,17 @@ where
                 None => "".to_owned(),
             })
         });
+
+        use comfy_table::modifiers::UTF8_ROUND_CORNERS;
+        use comfy_table::modifiers::UTF8_SOLID_INNER_BORDERS;
+        use comfy_table::presets::UTF8_FULL;
+
         let mut table = comfy_table::Table::new();
-        table.add_rows(mx);
+        table
+            .load_preset(UTF8_FULL)
+            .apply_modifier(UTF8_ROUND_CORNERS)
+            .apply_modifier(UTF8_SOLID_INNER_BORDERS)
+            .add_rows(mx);
         table
     }
 }

src/main.rs

@@ -32,6 +32,7 @@ pub enum Commands {
     /// Derive from master key or mnemonic
     Derive(DeriveCommand),
     /// Derive by custom bip32 path
+    #[clap(hide = true)]
     Bip32(Bip32Command),
 }
 

tests/derive/bip44_m23

@@ -4,7 +4,7 @@ Account xpubs: [m/44'/0'/0'] ~ [m/44'/0'/2']
 [m/44'/0'/1']: xpub6DR5Z1g6cZ8qPb7ES7QQkUWTGNwRnvtUTMccNXMQCEvNCxYhCmkv6b7jzKBgYnRYRkAqkCK8KPB8eEPKtxkqcwX6DZipntyigyGEpFM5Ukd
 [m/44'/0'/2']: xpub6DR5Z1g6cZ8qSEZ9nsmkYKsjVQZSqAAwAUnnD3YFnwS5Bm1MaticJY4VPJapQ8vNtgV62R6L2SbULUfPihDtczTdwZqtyFGv16SRWDfN3Gg
 
-Account xprivs: [m/44'/0'/0'] ~ [m/44'/0'/2']
+Account xprvs: [m/44'/0'/0'] ~ [m/44'/0'/2']
 [m/44'/0'/0']: xprv9zRj9W9CnBaYALsQyZuKMMk2aEskuQkb5rq7iF7cYFi5TxJNBSYzmpxxzrhYbU7cUHJhzEN7sZS2dK1UD3BNB5Yv4bsgLWAdAvvykwBRKUy
 [m/44'/0'/1']: xprv9zRj9W9CnBaYB72mL5sQPLZiiM6wPUAd68h1a8wnduPPLADYfESfYnoG93X9rqyVWTpm76y6Ty72bvVCbeAr5cFKfuz59heF2N3Btui4isj
 [m/44'/0'/2']: xprv9zRj9W9CnBaYDkUggrEkBBvzwNixRhT5oFsBQf8eEbu6JxgD3MQMkjk1Y1EKrkEusqymx73KFN3C6sg8nnJqAcBHDo8N7C1Gv9qWWeyyeEP

tests/derive/bip44_m35

@@ -6,7 +6,7 @@ Account xpubs: [m/44'/0'/0'] ~ [m/44'/0'/4']
 [m/44'/0'/3']: xpub6DR5Z1g6cZ8qUDoUQNTbHMu6jS2M2oD3wqHJQzC9VGJ9niUWe2LLZgTvx82cjqytP41DzVzvgMaVzKohA8WHuyBuEjjLVmoHtU5MQ93Tmvk
 [m/44'/0'/4']: xpub6DR5Z1g6cZ8qX5vzPTmpDi61Fzn4NErZTCUJQUhQFs3LcfqwWtuASCr1wcw6A9feRuzPkDzZpHCCYTCXWXNX28rDGsykD3CnkAy26RMzWew
 
-Account xprivs: [m/44'/0'/0'] ~ [m/44'/0'/4']
+Account xprvs: [m/44'/0'/0'] ~ [m/44'/0'/4']
 [m/44'/0'/0']: xprv9zRj9W9CnBaYALsQyZuKMMk2aEskuQkb5rq7iF7cYFi5TxJNBSYzmpxxzrhYbU7cUHJhzEN7sZS2dK1UD3BNB5Yv4bsgLWAdAvvykwBRKUy
 [m/44'/0'/1']: xprv9zRj9W9CnBaYB72mL5sQPLZiiM6wPUAd68h1a8wnduPPLADYfESfYnoG93X9rqyVWTpm76y6Ty72bvVCbeAr5cFKfuz59heF2N3Btui4isj
 [m/44'/0'/2']: xprv9zRj9W9CnBaYDkUggrEkBBvzwNixRhT5oFsBQf8eEbu6JxgD3MQMkjk1Y1EKrkEusqymx73KFN3C6sg8nnJqAcBHDo8N7C1Gv9qWWeyyeEP

tests/derive/bip49_m23

@@ -4,7 +4,7 @@ Account xpubs: [m/49'/0'/0'] ~ [m/49'/0'/2']
 [m/49'/0'/1']: xpub6C64R6ykTRzrdYGCy2kSW1FnJS4NdfzeXDkCzFTaTmRfHfaBWGryAbp45EiNRoq39tWRkxJh7xa6fjNoDmrPFCMiHpYR9BrbVWEHs8WLcur
 [m/49'/0'/2']: xpub6C64R6ykTRzreYVyfrf4LmpwQhrVcDi92HBvCKaB5LjorHMaXogimCe76jjFKLXd6kMJZKXaTrWuuKUMB9ks3ZzNLsY6xzmJNjvaTZYkHaA
 
-Account xprivs: [m/49'/0'/0'] ~ [m/49'/0'/2']
+Account xprvs: [m/49'/0'/0'] ~ [m/49'/0'/2']
 [m/49'/0'/0']: xprv9y6i1bSrd4SZMKKAAPkQggLjTWLs4Vzmtco51mfozx3dDkbLJi9XdNTcix2CVDWmQoymbjEtih7vHjcUtoEKwoPvnWNvp3988VwV8g3BCq5
 [m/49'/0'/1']: xprv9y6i1bSrd4SZR4Bjs1DS8sK3kQDtEDGo9zpcBs3xuRtgQsF2xjYicoVaDzMBb7urN19SCXFxxEfASsN3Zj23iUdrVxUBrSTG4mBPkwrBGTZ
 [m/49'/0'/2']: xprv9y6i1bSrd4SZS4RWZq83ydtCrg21CkzHf4GKPwAZX1CpyV2RzGNUDQKdFVD943Mt9fQVCtEBqTSMq3Dk6Q6qknTbACxukVq42pAXrL8AnnH

tests/derive/bip49_m35

@@ -6,7 +6,7 @@ Account xpubs: [m/49'/0'/0'] ~ [m/49'/0'/4']
 [m/49'/0'/3']: xpub6C64R6ykTRzriG9XWbRApi5dzdU5CyJgyHqsEjXRbhz13MftYU9nrM9DvJwJmVg7KpiqBavQZ6PxjA44XrdZuEPhdJWft6zu1vFgwKxMERd
 [m/49'/0'/4']: xpub6C64R6ykTRzrkGfwz41w9zYXJHGSAvsCA6aV9XtyojVBiQ2TdbAjukykJbxD54EZKasZpr89WmSF4hPQ39w7ziqXM5LsPJVXWkkSNsDEb4R
 
-Account xprivs: [m/49'/0'/0'] ~ [m/49'/0'/4']
+Account xprvs: [m/49'/0'/0'] ~ [m/49'/0'/4']
 [m/49'/0'/0']: xprv9y6i1bSrd4SZMKKAAPkQggLjTWLs4Vzmtco51mfozx3dDkbLJi9XdNTcix2CVDWmQoymbjEtih7vHjcUtoEKwoPvnWNvp3988VwV8g3BCq5
 [m/49'/0'/1']: xprv9y6i1bSrd4SZR4Bjs1DS8sK3kQDtEDGo9zpcBs3xuRtgQsF2xjYicoVaDzMBb7urN19SCXFxxEfASsN3Zj23iUdrVxUBrSTG4mBPkwrBGTZ
 [m/49'/0'/2']: xprv9y6i1bSrd4SZS4RWZq83ydtCrg21CkzHf4GKPwAZX1CpyV2RzGNUDQKdFVD943Mt9fQVCtEBqTSMq3Dk6Q6qknTbACxukVq42pAXrL8AnnH

tests/derive/bip84_m23

@@ -4,7 +4,7 @@ Account xpubs: [m/84'/0'/0'] ~ [m/84'/0'/2']
 [m/84'/0'/1']: xpub6CyGs9D3fAppmNAaN2rMNQAmNz2WyNiKmx1QBZHajhvdLzBEkT2ofHhmSYp9mhkmWXtLuFd7LvjbyfQuehzN9CibdGeHPUcEz2eBJ4WeEY2
 [m/84'/0'/2']: xpub6CyGs9D3fAppnar8KNBCQxZD7iL7JgpGSPSnAByM9Q6ZphTucrb422fhP6kp6wbYCb8qQp4iByEzx5efAMQ1yXh56Mk8tDS7kpu8cdrJYYU
 
-Account xprivs: [m/84'/0'/0'] ~ [m/84'/0'/2']
+Account xprvs: [m/84'/0'/0'] ~ [m/84'/0'/2']
 [m/84'/0'/0']: xprv9yyvTdg9poGXVi6X737f5mbWotQg2YGGkXQvGtJbmA6U8SzuGpWAgD8dEbuDLUBvBmSZZpR9xg62htV5SRRkqFJ7cRZMrHaPtJ7aEv1nxQs
 [m/84'/0'/1']: xprv9yyvTdg9poGXYt67G1KM1GE2pxC2ZuzUQj5oPAsyBNPeUBr6CuiZ7VPHbFuuvJtqBQaYL1i5kgcshcaBuqLMTJqTD2SVYGqbBuf7dD6iwMz
 [m/84'/0'/2']: xprv9yyvTdg9poGXa6mfDLeC3pcUZgVcuE6R5AXBMoZjb4Zawu8m5KGoUEMDXohCQWYi4LfuSC2Gg9nLUDdDTo9sLU2juxpimfxVmzaeNzYQfhp

tests/derive/bip84_m35

@@ -6,7 +6,7 @@ Account xpubs: [m/84'/0'/0'] ~ [m/84'/0'/4']
 [m/84'/0'/3']: xpub6CyGs9D3fAppr8DVGqCYDzS4gwufocXgVC3sxQm37qYVxn25adj21Z6TVfvjxYQ2qPadNPsBW5mY3QKwjP2jq7UpJKeJdrnEUQJrguQHjVH
 [m/84'/0'/4']: xpub6CyGs9D3fApptrWzs6MxwQctw8aHJyFN5benf5mv3zTHir2Gyqu7o2f2G21BDzMJHwDzjZbkXtKn9JaEQrt6EW2sAoi8HPfxMMn5M6MCBDP
 
-Account xprivs: [m/84'/0'/0'] ~ [m/84'/0'/4']
+Account xprvs: [m/84'/0'/0'] ~ [m/84'/0'/4']
 [m/84'/0'/0']: xprv9yyvTdg9poGXVi6X737f5mbWotQg2YGGkXQvGtJbmA6U8SzuGpWAgD8dEbuDLUBvBmSZZpR9xg62htV5SRRkqFJ7cRZMrHaPtJ7aEv1nxQs
 [m/84'/0'/1']: xprv9yyvTdg9poGXYt67G1KM1GE2pxC2ZuzUQj5oPAsyBNPeUBr6CuiZ7VPHbFuuvJtqBQaYL1i5kgcshcaBuqLMTJqTD2SVYGqbBuf7dD6iwMz
 [m/84'/0'/2']: xprv9yyvTdg9poGXa6mfDLeC3pcUZgVcuE6R5AXBMoZjb4Zawu8m5KGoUEMDXohCQWYi4LfuSC2Gg9nLUDdDTo9sLU2juxpimfxVmzaeNzYQfhp

tests/derive/master_m23

@@ -4,7 +4,7 @@ Account xpubs: [m/49'/0'/1111'] ~ [m/49'/0'/1113']
 [m/49'/0'/1112']: xpub6CnPrHKUx6riFVtrvf1b1SPXCH4zw1w8Eje6ymsYPNyvjNT2dPRd4TCyW7qiWBMGFQzsTsyjx5a2s5K23ztTMqaLQPoMnXwSpgRFDjjpJTd
 [m/49'/0'/1113']: xpub6CnPrHKUx6riKBgspoMJjRvXDoK3zeEfBwnb82W4aRiw74aSyigSirntBPr9JZ6UwXhY9eg23rojKRtw7mXcHnWJR88TGVxAB7BUWDg4jJQ
 
-Account xprivs: [m/49'/0'/1111'] ~ [m/49'/0'/1113']
+Account xprvs: [m/49'/0'/1111'] ~ [m/49'/0'/1113']
 [m/49'/0'/1111']: xprv9yo3Smnb7jJQyYFzeL6g3AHst7tKRMCtY3PKry4vQ1itvm7FdiUtsuUCVR4rLqQViRvcSD1462v6sQcJvtRmTs81sLncYQ2tPnSe8LfgG2S
 [m/49'/0'/1112']: xprv9yo3Smnb7jJR31pPpdUaeJSneFEWXZDGsWiWBPTvq3Swra7t5r7NWetVerGr9Cn92DfsvV6TF6Lf6AKRz5FT9z2qBPRor3cD2Nxw6Hfdgx1
 [m/49'/0'/1113']: xprv9yo3Smnb7jJR6hcQimpJNHynfmUZbBWopirzKe6T26BxEGFJSBNCB4UQL8qVfXzCuGqkApLSpZmn7m8FVEM5eQD2vBNqS3x5TyXaBRpXgwt

tests/derive/master_m35

@@ -6,7 +6,7 @@ Account xpubs: [m/49'/0'/1111'] ~ [m/49'/0'/1115']
 [m/49'/0'/1114']: xpub6CnPrHKUx6riMw17VoC695brmuJvxUt8afDPZ285v4DkKYKh3NdugK8cPgqKBt31VndhLLzyn4wTCt1FsuPFZSfNtMPuzWRG26Wzi5X7D59
 [m/49'/0'/1115']: xpub6CnPrHKUx6riNoPjUZFoJXapzsytubSGenBnqpoRjdK9nSe1DWQCJ5EUvjdHBhKJfpUGNkepEraWeZoc2GiNgiTVyChJYZtP5Qgmydnp35k
 
-Account xprivs: [m/49'/0'/1111'] ~ [m/49'/0'/1115']
+Account xprvs: [m/49'/0'/1111'] ~ [m/49'/0'/1115']
 [m/49'/0'/1111']: xprv9yo3Smnb7jJQyYFzeL6g3AHst7tKRMCtY3PKry4vQ1itvm7FdiUtsuUCVR4rLqQViRvcSD1462v6sQcJvtRmTs81sLncYQ2tPnSe8LfgG2S
 [m/49'/0'/1112']: xprv9yo3Smnb7jJR31pPpdUaeJSneFEWXZDGsWiWBPTvq3Swra7t5r7NWetVerGr9Cn92DfsvV6TF6Lf6AKRz5FT9z2qBPRor3cD2Nxw6Hfdgx1
 [m/49'/0'/1113']: xprv9yo3Smnb7jJR6hcQimpJNHynfmUZbBWopirzKe6T26BxEGFJSBNCB4UQL8qVfXzCuGqkApLSpZmn7m8FVEM5eQD2vBNqS3x5TyXaBRpXgwt