[chain_redesign] Remove old structures

Other changes:

* The `async-https` feature of `bdk_esplora` is no longer default.
* Rename `ObservedAs` to `ChainPosition`.
* Set temporary MSRV to 1.60.0 to compile all workspace members will all
  features.

Author: evanlinjin

Cargo.toml

@@ -4,11 +4,9 @@ members = [
     "crates/chain",
     "crates/file_store",
     "crates/electrum",
+    "crates/esplora",
     "example-crates/example_cli",
     "example-crates/example_electrum",
-    "example-crates/keychain_tracker_electrum",
-    "example-crates/keychain_tracker_esplora",
-    "example-crates/keychain_tracker_example_cli",
     "example-crates/wallet_electrum",
     "example-crates/wallet_esplora",
     "example-crates/wallet_esplora_async",

crates/bdk/src/wallet/export.rs

@@ -130,8 +130,8 @@ impl FullyNodedExport {
                 .transactions()
                 .next()
                 .map_or(0, |canonical_tx| match canonical_tx.observed_as {
-                    bdk_chain::ObservedAs::Confirmed(a) => a.confirmation_height,
-                    bdk_chain::ObservedAs::Unconfirmed(_) => 0,
+                    bdk_chain::ChainPosition::Confirmed(a) => a.confirmation_height,
+                    bdk_chain::ChainPosition::Unconfirmed(_) => 0,
                 })
         } else {
             0

crates/bdk/src/wallet/mod.rs

@@ -25,7 +25,7 @@ use bdk_chain::{
     keychain::{KeychainTxOutIndex, LocalChangeSet, LocalUpdate},
     local_chain::{self, LocalChain, UpdateNotConnectedError},
     tx_graph::{CanonicalTx, TxGraph},
-    Append, BlockId, ConfirmationTime, ConfirmationTimeAnchor, FullTxOut, ObservedAs, Persist,
+    Append, BlockId, ChainPosition, ConfirmationTime, ConfirmationTimeAnchor, FullTxOut, Persist,
     PersistBackend,
 };
 use bitcoin::consensus::encode::serialize;
@@ -1015,7 +1015,7 @@ impl<D> Wallet<D> {
         let pos = graph
             .get_chain_position(&self.chain, chain_tip, txid)
             .ok_or(Error::TransactionNotFound)?;
-        if let ObservedAs::Confirmed(_) = pos {
+        if let ChainPosition::Confirmed(_) = pos {
             return Err(Error::TransactionConfirmed);
         }
 
@@ -1258,8 +1258,8 @@ impl<D> Wallet<D> {
                 .graph()
                 .get_chain_position(&self.chain, chain_tip, input.previous_output.txid)
                 .map(|observed_as| match observed_as {
-                    ObservedAs::Confirmed(a) => a.confirmation_height,
-                    ObservedAs::Unconfirmed(_) => u32::MAX,
+                    ChainPosition::Confirmed(a) => a.confirmation_height,
+                    ChainPosition::Unconfirmed(_) => u32::MAX,
                 });
             let current_height = sign_options
                 .assume_height
@@ -1775,7 +1775,7 @@ where
 fn new_local_utxo(
     keychain: KeychainKind,
     derivation_index: u32,
-    full_txo: FullTxOut<ObservedAs<ConfirmationTimeAnchor>>,
+    full_txo: FullTxOut<ConfirmationTimeAnchor>,
 ) -> LocalUtxo {
     LocalUtxo {
         outpoint: full_txo.outpoint,

crates/bdk/tests/wallet.rs

@@ -8,8 +8,8 @@ use bdk::Error;
 use bdk::FeeRate;
 use bdk::KeychainKind;
 use bdk_chain::BlockId;
+use bdk_chain::ConfirmationTime;
 use bdk_chain::COINBASE_MATURITY;
-use bdk_chain::{ConfirmationTime, TxHeight};
 use bitcoin::hashes::Hash;
 use bitcoin::BlockHash;
 use bitcoin::Script;
@@ -23,7 +23,7 @@ use core::str::FromStr;
 mod common;
 use common::*;
 
-fn receive_output(wallet: &mut Wallet, value: u64, height: TxHeight) -> OutPoint {
+fn receive_output(wallet: &mut Wallet, value: u64, height: ConfirmationTime) -> OutPoint {
     let tx = Transaction {
         version: 1,
         lock_time: PackedLockTime(0),
@@ -34,18 +34,7 @@ fn receive_output(wallet: &mut Wallet, value: u64, height: TxHeight) -> OutPoint
         }],
     };
 
-    wallet
-        .insert_tx(
-            tx.clone(),
-            match height {
-                TxHeight::Confirmed(height) => ConfirmationTime::Confirmed {
-                    height,
-                    time: 42_000,
-                },
-                TxHeight::Unconfirmed => ConfirmationTime::Unconfirmed { last_seen: 0 },
-            },
-        )
-        .unwrap();
+    wallet.insert_tx(tx.clone(), height).unwrap();
 
     OutPoint {
         txid: tx.txid(),
@@ -54,7 +43,10 @@ fn receive_output(wallet: &mut Wallet, value: u64, height: TxHeight) -> OutPoint
 }
 
 fn receive_output_in_latest_block(wallet: &mut Wallet, value: u64) -> OutPoint {
-    let height = wallet.latest_checkpoint().map(|id| id.height).into();
+    let height = match wallet.latest_checkpoint() {
+        Some(BlockId { height, .. }) => ConfirmationTime::Confirmed { height, time: 0 },
+        None => ConfirmationTime::Unconfirmed { last_seen: 0 },
+    };
     receive_output(wallet, value, height)
 }
 
@@ -1941,7 +1933,11 @@ fn test_bump_fee_unconfirmed_inputs_only() {
     let (psbt, __details) = builder.finish().unwrap();
     // Now we receive one transaction with 0 confirmations. We won't be able to use that for
     // fee bumping, as it's still unconfirmed!
-    receive_output(&mut wallet, 25_000, TxHeight::Unconfirmed);
+    receive_output(
+        &mut wallet,
+        25_000,
+        ConfirmationTime::Unconfirmed { last_seen: 0 },
+    );
     let mut tx = psbt.extract_tx();
     let txid = tx.txid();
     for txin in &mut tx.input {
@@ -1966,7 +1962,7 @@ fn test_bump_fee_unconfirmed_input() {
     let addr = Address::from_str("2N1Ffz3WaNzbeLFBb51xyFMHYSEUXcbiSoX").unwrap();
     // We receive a tx with 0 confirmations, which will be used as an input
     // in the drain tx.
-    receive_output(&mut wallet, 25_000, TxHeight::Unconfirmed);
+    receive_output(&mut wallet, 25_000, ConfirmationTime::unconfirmed(0));
     let mut builder = wallet.build_tx();
     builder
         .drain_wallet()