[wallet_redesign] Update Wallet with redesigned structures

bitcoindevkit · May 11, 2023 · e5de79f · e5de79f
1 parent ed89de7
commit e5de79f
Show file tree

Hide file tree

Showing 9 changed files with 756 additions and 527 deletions.
diff --git a/crates/bdk/src/wallet/export.rs b/crates/bdk/src/wallet/export.rs
@@ -56,7 +56,6 @@
 use core::str::FromStr;
 
 use alloc::string::{String, ToString};
-use bdk_chain::sparse_chain::ChainPosition;
 use serde::{Deserialize, Serialize};
 
 use miniscript::descriptor::{ShInner, WshInner};
@@ -130,8 +129,10 @@ impl FullyNodedExport {
             wallet
                 .transactions()
                 .next()
-                .and_then(|(pos, _)| pos.height().into())
-                .unwrap_or(0)
+                .map_or(0, |canonical_tx| match canonical_tx.observed_as {
+                    bdk_chain::ObservedAs::Confirmed(a) => a.confirmation_height,
+                    bdk_chain::ObservedAs::Unconfirmed(_) => 0,
+                })
         } else {
             0
         };
@@ -246,6 +247,7 @@ mod test {
                     height: 5000,
                     time: 0,
                 },
+                None,
             )
             .unwrap();
         wallet