fixup! feat(taker): import seed

Author: holzeis

crates/daemon-tests/tests/main/import_seed.rs

@@ -1,4 +1,5 @@
 use daemon::bdk::bitcoin;
+use daemon::seed;
 use daemon::seed::RandomSeed;
 use daemon::seed::Seed;
 use daemon_tests::open_cfd;
@@ -34,6 +35,7 @@ async fn fail_to_import_seed_with_open_cfds() {
             RandomSeed::default().seed(),
             data_dir,
             bitcoin::Network::Testnet,
+            seed::TAKER_WALLET_SEED_FILE,
         )
         .await
         .expect_err("import seed should be rejected as open CFDs exist");

crates/daemon/src/lib.rs

@@ -459,6 +459,7 @@ where
         seed: Vec<u8>,
         data_dir: PathBuf,
         network: Network,
+        name: &str,
     ) -> Result<()> {
         let open_cfd_ids = self.db.load_open_cfd_ids().await?;
 
@@ -471,8 +472,9 @@ where
         self.wallet_actor
             .send(wallet::ImportSeed {
                 seed,
-                seed_path: data_dir.join(seed::TAKER_WALLET_SEED_FILE),
+                path: data_dir,
                 network,
+                name: name.to_string(),
             })
             .await??;
 

crates/daemon/src/wallet.rs

@@ -1,6 +1,7 @@
 use crate::bitcoin::secp256k1::Secp256k1;
 use crate::seed::RandomSeed;
 use crate::seed::Seed;
+use crate::seed::RANDOM_SEED_SIZE;
 use crate::wallet::sled::Db;
 use anyhow::anyhow;
 use anyhow::bail;
@@ -183,10 +184,10 @@ where
 {
     pub fn import_seed(&mut self, msg: ImportSeed) -> Result<AddressInfo> {
         let seed = msg.seed;
-        let import_seed: [u8; 256] = seed
+        let import_seed: [u8; RANDOM_SEED_SIZE] = seed
             .clone()
             .try_into()
-            .map_err(|_| anyhow!("seed must be 256 bytes long"))?;
+            .map_err(|_| anyhow!("seed must be {RANDOM_SEED_SIZE} bytes long"))?;
 
         let import_seed = RandomSeed::from(import_seed);
         let ext_priv_key = import_seed.derive_extended_priv_key(msg.network)?;
@@ -197,8 +198,17 @@ where
         // recreate and update wallet
         self.wallet = Actor::build_wallet(ext_priv_key, db)?;
 
+        let name = msg.name;
+        let wallet_seed = msg.path.join(&name);
+
+        let now = Timestamp::now();
+        let backup_seed = msg.path.join(format!("{name}.{now}.back"));
+
+        // copying old seed file to safety.
+        tokio::fs::copy(&wallet_seed, &backup_seed).await?;
+
         // write imported seed file to disk.
-        tokio::fs::write(msg.seed_path.as_path(), seed).await?;
+        tokio::fs::write(wallet_seed.as_path(), seed).await?;
 
         self.wallet
             .get_address(AddressIndex::LastUnused)
@@ -410,7 +420,8 @@ pub struct Sign {
 
 pub struct ImportSeed {
     pub seed: Vec<u8>,
-    pub seed_path: PathBuf,
+    pub path: PathBuf,
+    pub name: String,
     pub network: Network,
 }
 
@@ -540,7 +551,6 @@ fn seed_and_rpc_on_same_network(rpc: &electrum_client::Client, network: Network)
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::seed;
     use bdk::database::MemoryDatabase;
     use bdk_ext::keypair;
     use bdk_ext::new_test_wallet;
@@ -630,13 +640,13 @@ mod tests {
         let mut import_seed = [0u8; 32];
         thread_rng().fill(&mut import_seed);
 
-        let seed_path = data_dir.join(seed::TAKER_WALLET_SEED_FILE);
         // import seed
         actor
             .send(ImportSeed {
                 seed: import_seed.to_vec(),
                 network: Network::Testnet,
-                seed_path,
+                path: data_dir,
+                name: crate::seed::TAKER_WALLET_SEED_FILE.to_string(),
             })
             .await
             .unwrap()
@@ -670,8 +680,6 @@ mod tests {
 
         let wallet = actor.create(None).spawn(&mut tasks);
 
-        let seed_path = data_dir.join(seed::TAKER_WALLET_SEED_FILE);
-
         const IMPORT_SEED: [u8; 256] = [
             137, 78, 181, 39, 89, 143, 9, 224, 92, 125, 51, 183, 87, 95, 206, 236, 135, 33, 54, 10,
             237, 169, 132, 74, 230, 66, 244, 244, 89, 224, 23, 62, 163, 60, 39, 66, 19, 213, 68,
@@ -693,7 +701,8 @@ mod tests {
             .send(ImportSeed {
                 seed: IMPORT_SEED.to_vec(),
                 network: Network::Testnet,
-                seed_path,
+                path: data_dir,
+                name: crate::seed::TAKER_WALLET_SEED_FILE.to_string(),
             })
             .await
             .unwrap()

crates/model/src/lib.rs

@@ -487,6 +487,12 @@ impl Timestamp {
     }
 }
 
+impl fmt::Display for Timestamp {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        self.0.fmt(f)
+    }
+}
+
 /// Funding rate per SETTLEMENT_INTERVAL
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize, Deserialize)]
 pub struct FundingRate(Decimal);

crates/taker/src/routes.rs

@@ -12,6 +12,7 @@ use daemon::projection;
 use daemon::projection::CfdAction;
 use daemon::projection::FeedReceivers;
 use daemon::seed;
+use daemon::seed::RANDOM_SEED_SIZE;
 use daemon::wallet;
 use daemon::Environment;
 use daemon::TakerActorSystem;
@@ -46,7 +47,6 @@ use std::path::PathBuf;
 use tokio::select;
 use tokio::sync::watch;
 use tracing::instrument;
-use daemon::seed::RANDOM_SEED_SIZE;
 
 type Taker = TakerActorSystem<
     oracle::Actor,
@@ -357,11 +357,15 @@ pub async fn put_import_seed(
     }
 
     // fetch seed from upload stream as bytes. we only support the random seed.
-    let seed = seed.open(RANDOM_SEED_SIZE.bytes()).into_bytes().await.map_err(|e| {
-        HttpApiProblem::new(StatusCode::INTERNAL_SERVER_ERROR)
-            .title("Could not import seed file")
-            .detail(format!("{e:#}"))
-    })?;
+    let seed = seed
+        .open(RANDOM_SEED_SIZE.bytes())
+        .into_bytes()
+        .await
+        .map_err(|e| {
+            HttpApiProblem::new(StatusCode::INTERNAL_SERVER_ERROR)
+                .title("Could not import seed file")
+                .detail(format!("{e:#}"))
+        })?;
 
     if !seed.is_complete() {
         return Err(HttpApiProblem::new(StatusCode::BAD_REQUEST).title("Exceeded max file size."));
@@ -372,6 +376,7 @@ pub async fn put_import_seed(
             seed.into_inner(),
             data_dir.inner().clone(),
             *network.inner(),
+            seed::TAKER_WALLET_SEED_FILE,
         )
         .await
         .map_err(|e| {

taker-frontend/src/components/Wallet.tsx

@@ -338,7 +338,7 @@ export default function Wallet(
                                             children={<Icon as={FaSeedling} />}
                                         />
                                         <Input
-                                            placeholder="Your seed ..."
+                                            placeholder="Click here to import your seed ..."
                                             onClick={() => {
                                                 const element = document.getElementById("importSeed");
                                                 if (element) {