Print wallet descriptor to env file

Author: da-kami

scripts/src/docker/bitcoin.rs

@@ -147,25 +147,14 @@ pub async fn mine_a_block(endpoint: BitcoindHttpEndpoint) -> anyhow::Result<()>
     Ok(())
 }
 
-pub struct DerivationPath {
-    path: Vec<ChildNumber>,
-}
+#[derive(Debug, Clone)]
+pub struct DerivationPath(Vec<ChildNumber>);
 
 impl Display for DerivationPath {
     fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        for i in 0..self.path.len() {
-            let elem = self.path.get(i).unwrap();
-
-            let separator = if i == self.path.len() - 1 { "" } else { "/" };
-
-            match elem {
-                ChildNumber::Normal { index } => {
-                    write!(f, "{:?}{:0}", index, separator)?;
-                }
-                ChildNumber::Hardened { index } => {
-                    write!(f, "{:?}h{:0}", index, separator)?;
-                }
-            }
+        for i in &self.0 {
+            write!(f, "/")?;
+            fmt::Display::fmt(i, f)?;
         }
 
         Ok(())
@@ -174,22 +163,21 @@ impl Display for DerivationPath {
 
 impl DerivationPath {
     pub fn bip44_bitcoin_testnet() -> anyhow::Result<Self> {
-        Ok(Self {
-            path: vec![
-                ChildNumber::from_hardened_idx(44)?,
-                ChildNumber::from_hardened_idx(1)?,
-                ChildNumber::from_hardened_idx(0)?,
-                ChildNumber::from_normal_idx(0)?,
-                ChildNumber::from_normal_idx(0)?,
-            ],
-        })
+        Ok(Self(vec![
+            ChildNumber::from_hardened_idx(44)?,
+            ChildNumber::from_hardened_idx(1)?,
+            ChildNumber::from_hardened_idx(0)?,
+            ChildNumber::from_normal_idx(0)?,
+            ChildNumber::from_normal_idx(0)?,
+        ]))
     }
 }
 
-#[derive(Clone)]
+#[derive(Debug, Clone)]
 pub struct Account {
     pub master: ExtendedPrivKey,
     first_account: rust_bitcoin::util::key::PrivateKey,
+    derivation_path: DerivationPath,
 }
 
 impl Account {
@@ -206,13 +194,14 @@ impl Account {
 
         // derive a private key from the master key
         let priv_key = master
-            .derive_priv(&Secp256k1::new(), &derivation_path.path)
+            .derive_priv(&Secp256k1::new(), &derivation_path.0)
             .map(|secret_key| secret_key.private_key)?;
 
         // it is not great to store derived data in here but since the derivation can fail, it is better to fail early instead of later
         Ok(Self {
             master,
             first_account: priv_key,
+            derivation_path,
         })
     }
 
@@ -224,6 +213,17 @@ impl Account {
     }
 }
 
+impl Display for Account {
+    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
+        write!(f, "wpkh(")?;
+        fmt::Display::fmt(&self.master, f)?;
+        fmt::Display::fmt(&self.derivation_path, f)?;
+        write!(f, ")")?;
+
+        Ok(())
+    }
+}
+
 #[derive(Debug, serde::Serialize)]
 pub struct NewAddressRequest {
     jsonrpc: String,
@@ -386,7 +386,23 @@ mod tests {
         let derivation_path = DerivationPath::bip44_bitcoin_testnet().unwrap();
 
         let to_string = derivation_path.to_string();
-        assert_eq!(to_string, "44h/1h/0h/0/0")
+        assert_eq!(to_string, "/44'/1'/0'/0/0")
+    }
+
+    #[test]
+    fn format_account() {
+        let account = Account::new_random().unwrap();
+        let master = account.master;
+
+        let to_string = account.to_string();
+        assert_eq!(
+            to_string,
+            format!(
+                "wpkh({}{})",
+                master,
+                DerivationPath::bip44_bitcoin_testnet().unwrap()
+            )
+        )
     }
 
     #[test]

scripts/src/env/start.rs

@@ -1,7 +1,7 @@
 use anyhow::Context;
 use envfile::EnvFile;
 
-use crate::docker::bitcoin::{DerivationPath, PASSWORD, USERNAME};
+use crate::docker::bitcoin::{PASSWORD, USERNAME};
 use crate::{
     docker::{
         self,
@@ -68,24 +68,12 @@ pub async fn execute() -> anyhow::Result<Environment> {
     );
     envfile.update("ETHEREUM_NODE_HTTP_URL", &parity.http_endpoint.to_string());
 
-    envfile.update(
-        "BITCOIN_HD_KEY_0",
-        &format!("{}", bitcoind.account_0.master),
-    );
-    envfile.update(
-        "BITCOIN_HD_KEY_1",
-        &format!("{}", bitcoind.account_1.master),
-    );
+    envfile.update("BITCOIN_WALLET_0", &bitcoind.account_0.to_string());
+    envfile.update("BITCOIN_WALLET_1", &bitcoind.account_1.to_string());
     envfile.update("BITCOIN_P2P_URI", &bitcoind.p2p_uri.to_string());
     envfile.update("BITCOIN_HTTP_URI", &bitcoind.http_endpoint.to_string());
     envfile.update("BITCOIN_USERNAME", USERNAME);
     envfile.update("BITCOIN_PASSWORD", PASSWORD);
-    envfile.update(
-        "BITCOIN_DERIVATION_PATH",
-        &*DerivationPath::bip44_bitcoin_testnet()
-            .expect("can create derivation path")
-            .to_string(),
-    );
 
     envfile.update("HTTP_URL_CND_0", &cnd_0.http_endpoint.to_string());
     envfile.update("HTTP_URL_CND_1", &cnd_1.http_endpoint.to_string());