fixup! feat(taker): import seed

Author: holzeis

crates/daemon/src/seed.rs

@@ -42,6 +42,8 @@ pub const APP_SEED_SIZE: usize = 32;
 pub trait Seed {
     fn seed(&self) -> Vec<u8>;
 
+    fn is_managed(&self) -> bool;
+
     fn derive_extended_priv_key(&self, network: Network) -> Result<ExtendedPrivKey> {
         let mut ext_priv_key_seed = [0u8; 64];
 
@@ -97,6 +99,9 @@ impl Seed for RandomSeed {
     fn seed(&self) -> Vec<u8> {
         self.0.to_vec()
     }
+    fn is_managed(&self) -> bool {
+        true
+    }
 }
 
 impl Debug for RandomSeed {
@@ -164,6 +169,9 @@ impl Seed for AppSeed {
     fn seed(&self) -> Vec<u8> {
         self.0.to_vec()
     }
+    fn is_managed(&self) -> bool {
+        false
+    }
 }
 
 impl From<[u8; APP_SEED_SIZE]> for AppSeed {

crates/daemon/src/wallet.rs

@@ -111,13 +111,15 @@ pub struct Actor<B, DB> {
     used_utxos: LockedUtxos,
     sender: watch::Sender<Option<WalletInfo>>,
     db: Option<Db>,
+    managed_wallet: bool,
 }
 
 impl Actor<ElectrumBlockchain, Tree> {
     pub fn spawn(
         electrum_rpc_url: &str,
         ext_priv_key: ExtendedPrivKey,
         db_path: PathBuf,
+        managed_wallet: bool,
     ) -> Result<(xtra::Address<Self>, watch::Receiver<Option<WalletInfo>>)> {
         let client = electrum_client::Client::new(electrum_rpc_url)
             .context("Failed to initialize Electrum RPC client")?;
@@ -147,6 +149,7 @@ impl Actor<ElectrumBlockchain, Tree> {
             used_utxos: LockedUtxos::new(time_to_lock),
             blockchain_client: ElectrumBlockchain::from(client),
             db: Some(db),
+            managed_wallet,
         };
 
         let (addr, fut) = actor.create(None).run();
@@ -267,6 +270,7 @@ where
             address,
             last_updated_at: Timestamp::now(),
             transactions,
+            managed_wallet: self.managed_wallet,
         };
 
         tracing::trace!(target : "wallet", sync_time_sec = %now.elapsed().as_secs(), "Wallet sync done");
@@ -588,6 +592,7 @@ mod tests {
                 },
                 blockchain_client: (),
                 db: None,
+                managed_wallet: true,
             })
         }
     }

crates/maker/src/main.rs

@@ -85,8 +85,12 @@ async fn main() -> Result<()> {
     let mut wallet_dir = data_dir.clone();
 
     wallet_dir.push(MAKER_WALLET_ID);
-    let (wallet, wallet_feed_receiver) =
-        wallet::Actor::spawn(opts.network.electrum(), ext_priv_key, wallet_dir)?;
+    let (wallet, wallet_feed_receiver) = wallet::Actor::spawn(
+        opts.network.electrum(),
+        ext_priv_key,
+        wallet_dir,
+        wallet_seed.is_managed(),
+    )?;
 
     if let Some(Withdraw::Withdraw {
         amount,

crates/model/src/lib.rs

@@ -456,6 +456,7 @@ pub struct WalletInfo {
     pub address: Address,
     pub last_updated_at: Timestamp,
     pub transactions: Vec<TransactionDetails>,
+    pub managed_wallet: bool,
 }
 
 #[derive(Debug, Copy, Clone, Serialize, Deserialize, PartialEq, Eq, PartialOrd, Ord)]

crates/shared-bin/src/to_sse_event.rs

@@ -29,6 +29,7 @@ pub struct WalletInfo {
     address: String,
     last_updated_at: Timestamp,
     transactions: Vec<TransactionDetails>,
+    managed_wallet: bool,
 }
 
 #[derive(Serialize, Debug, Clone, PartialEq, Eq, Default)]
@@ -75,6 +76,7 @@ impl ToSseEvent for Option<model::WalletInfo> {
                 address: wallet_info.address.to_string(),
                 last_updated_at: wallet_info.last_updated_at,
                 transactions: transaction_details,
+                managed_wallet: wallet_info.managed_wallet,
             }
         });
 

crates/taker/src/lib.rs

@@ -385,7 +385,7 @@ pub async fn run(opts: Opts) -> Result<()> {
     let mut wallet_dir = data_dir.clone();
     wallet_dir.push(TAKER_WALLET_ID);
     let (wallet, wallet_feed_receiver) =
-        wallet::Actor::spawn(network.electrum(), ext_priv_key, wallet_dir)?;
+        wallet::Actor::spawn(network.electrum(), ext_priv_key, wallet_dir, wallet_seed.is_managed())?;
 
     if let Some(Withdraw::Withdraw {
         amount,
@@ -497,7 +497,7 @@ pub async fn run(opts: Opts) -> Result<()> {
     let rocket_auth_db_connection = RocketAuthDbConnection::new(db.clone());
     let users = Users::new(Box::new(rocket_auth_db_connection));
 
-    let mission_success = rocket::custom(figment)
+    let mut rocket = rocket::custom(figment)
         .manage(feed_receivers)
         .manage(wallet_feed_receiver)
         .manage(identity_info)
@@ -513,8 +513,6 @@ pub async fn run(opts: Opts) -> Result<()> {
                 routes::post_cfd_action,
                 routes::post_withdraw_request,
                 routes::put_sync_wallet,
-                routes::get_export_seed,
-                routes::put_import_seed,
                 shared_bin::routes::get_health_check,
                 shared_bin::routes::get_metrics,
                 shared_bin::routes::get_version,
@@ -527,16 +525,21 @@ pub async fn run(opts: Opts) -> Result<()> {
         .register("/api", default_catchers())
         .manage(users)
         .manage(data_dir)
-        .manage(environment)
         .manage(network)
         .mount("/", rocket::routes![routes::dist, routes::index])
         .register("/", default_catchers())
         .attach(fairings::log_launch())
         .attach(fairings::log_requests())
-        .attach(fairings::ui_browser_launch(!opts.headless))
-        .launch()
-        .await?;
+        .attach(fairings::ui_browser_launch(!opts.headless));
 
+    if wallet_seed.is_managed() {
+        rocket = rocket.mount(
+            "/api",
+            rocket::routes![routes::get_export_seed, routes::put_import_seed],
+        );
+    }
+
+    let mission_success = rocket.launch().await?;
     tracing::trace!(?mission_success, "Rocket has landed");
 
     db.close().await;

crates/taker/src/routes.rs

@@ -14,7 +14,6 @@ use daemon::projection::FeedReceivers;
 use daemon::seed;
 use daemon::seed::RANDOM_SEED_SIZE;
 use daemon::wallet;
-use daemon::Environment;
 use daemon::TakerActorSystem;
 use http_api_problem::HttpApiProblem;
 use http_api_problem::StatusCode;
@@ -71,7 +70,6 @@ pub async fn feed(
     rx_maker_status: &State<watch::Receiver<ConnectionStatus>>,
     rx_maker_identity: &State<watch::Receiver<Option<identify::PeerInfo>>>,
     identity_info: &State<IdentityInfo>,
-    environment: &State<Environment>,
     _user: User,
 ) -> EventStream![] {
     let rx = rx.inner();
@@ -84,7 +82,6 @@ pub async fn feed(
     let identity = identity_info.inner().clone();
     let mut heartbeat =
         tokio::time::interval(std::time::Duration::from_secs(HEARTBEAT_INTERVAL_SECS));
-    let environment = environment.inner().clone();
 
     EventStream! {
 
@@ -99,8 +96,6 @@ pub async fn feed(
 
         yield Event::json(&identity).event("identity");
 
-        yield Event::json(&environment).event("environment");
-
         let offers = rx_offers.borrow().clone();
         yield Event::json(&offers.btcusd_long).event("btcusd_long_offer");
         yield Event::json(&offers.btcusd_short).event("btcusd_short_offer");
@@ -316,15 +311,8 @@ pub async fn put_sync_wallet(taker: &State<Taker>, _user: User) -> Result<(), Ht
 #[instrument(name = "GET /export", skip_all)]
 pub async fn get_export_seed<'a>(
     data_dir: &'a State<PathBuf>,
-    environment: &'a State<Environment>,
     _user: User,
 ) -> Result<DownloadResponsePro<'a>, HttpApiProblem> {
-    if environment.inner().as_string() == "umbrel" {
-        return Err(HttpApiProblem::new(StatusCode::BAD_REQUEST)
-            .title("Could not export seed file")
-            .detail("Cannot export seed file for umbrel environment"));
-    }
-
     let seed = tokio::fs::read(data_dir.join(seed::TAKER_WALLET_SEED_FILE))
         .await
         .map_err(|e| {
@@ -335,7 +323,7 @@ pub async fn get_export_seed<'a>(
 
     let resp = DownloadResponsePro::from_vec(
         seed,
-        Some("taker_seed"),
+        Some(seed::TAKER_WALLET_SEED_FILE),
         Some(mime::APPLICATION_OCTET_STREAM),
     );
     Ok(resp)
@@ -348,14 +336,7 @@ pub async fn put_import_seed(
     taker: &State<Taker>,
     data_dir: &State<PathBuf>,
     network: &State<Network>,
-    environment: &State<Environment>,
 ) -> Result<(), HttpApiProblem> {
-    if environment.inner().as_string() == "umbrel" {
-        return Err(HttpApiProblem::new(StatusCode::BAD_REQUEST)
-            .title("Could not import seed file")
-            .detail("Cannot import seed file for umbrel environment"));
-    }
-
     // fetch seed from upload stream as bytes. we only support the random seed.
     let seed = seed
         .open(RANDOM_SEED_SIZE.bytes())

taker-frontend/src/App.tsx

@@ -141,8 +141,6 @@ export const App = () => {
 
     const identityOrUndefined = useLatestEvent<IdentityInfo>(source, "identity");
 
-    const environment = useLatestEvent<string>(source, "environment");
-
     const shortOffer = makerOfferToTakerOffer(makerLong);
     const longOffer = makerOfferToTakerOffer(makerShort);
 
@@ -289,7 +287,7 @@ export const App = () => {
             >
                 <Route
                     path="/wallet"
-                    element={<Wallet walletInfo={walletInfo} cfds={cfds.length > 0} environment={environment} />}
+                    element={<Wallet walletInfo={walletInfo} cfds={cfds.length > 0} />}
                 />
                 <Route
                     element={

taker-frontend/src/components/Wallet.tsx

@@ -47,7 +47,6 @@ import Timestamp from "./Timestamp";
 interface WalletProps {
     walletInfo: WalletInfo | null;
     cfds: boolean;
-    environment: string | null;
 }
 
 interface SeedFile {
@@ -59,7 +58,6 @@ export default function Wallet(
     {
         walletInfo,
         cfds,
-        environment,
     }: WalletProps,
 ) {
     const toast = useToast();
@@ -282,7 +280,7 @@ export default function Wallet(
                     </HStack>
                 </VStack>
 
-                {environment !== "umbrel" && (
+                {walletInfo?.managed_wallet && (
                     <Box>
                         <Divider marginTop={3} marginBottom={4} />
                         <Center>

taker-frontend/src/types.ts

@@ -11,6 +11,7 @@ export interface WalletInfo {
     address: string;
     last_updated_at: number;
     transactions: Transaction[];
+    managed_wallet: boolean;
 }
 
 export interface Transaction {