update still not working

Author: matthiasdebernardini

Cargo.toml

@@ -4,22 +4,28 @@ version = "0.0.1"
 edition = "2021"
 
 [dependencies]
-bdk_wallet = { version = "1.2.0", features = ["test-utils"] }
 serde = { version = "1.0.208", features = ["derive"] }
 serde_json = "1.0.125"
 sqlx = { version = "0.8.1", default-features = false, features = ["runtime-tokio", "tls-rustls-ring","derive", "postgres", "sqlite", "json", "chrono", "uuid", "sqlx-macros", "migrate"] }
 thiserror = "1"
 tokio = { version = "1.40.0", features = ["macros", "rt-multi-thread"] }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter", "serde_json", "json"] }
-sqlx-postgres-tester = "0.1.1"
+
+[dependencies.bdk_wallet]
+git = "https://github.com/bitcoindevkit/bdk_wallet.git"
+tag = "wallet-2.0.0"
+features = ["test-utils"]
 
 [dev-dependencies]
 assert_matches = "1.5.0"
 anyhow = "1.0.89"
-bdk_electrum = { version = "0.20.1"}
 rustls = "0.23.14"
 
+[dev-dependencies.bdk_electrum]
+git = "https://github.com/bitcoindevkit/bdk.git"
+tag = "chain-0.23.0"
+
 [[example]]
 name = "bdk_sqlx_postgres"
 path = "examples/bdk_sqlx_postgres.rs"

examples/bdk_sqlx_postgres.rs

@@ -1,14 +1,15 @@
 #![allow(unused)]
-use std::collections::HashSet;
-use std::io::Write;
-
+use anyhow::Context;
 use bdk_electrum::{electrum_client, BdkElectrumClient};
 use bdk_sqlx::sqlx::Postgres;
 use bdk_sqlx::{PgStoreBuilder, Store};
 use bdk_wallet::bitcoin::secp256k1::Secp256k1;
 use bdk_wallet::bitcoin::Network;
-use bdk_wallet::{KeychainKind, PersistedWallet, Wallet};
+use bdk_wallet::chain::spk_client::{FullScanRequest, SyncRequest};
+use bdk_wallet::{KeychainKind, PersistedWallet, Update, Wallet};
 use rustls::crypto::ring::default_provider;
+use std::collections::HashSet;
+use std::io::Write;
 use tracing_subscriber::layer::SubscriberExt;
 use tracing_subscriber::util::SubscriberInitExt;
 use tracing_subscriber::EnvFilter;
@@ -119,31 +120,45 @@ async fn main() -> anyhow::Result<()> {
 
     Ok(())
 }
-
 fn electrum(wallet: &mut PersistedWallet<Store<Postgres>>) -> anyhow::Result<()> {
     let client = BdkElectrumClient::new(electrum_client::Client::new(ELECTRUM_URL)?);
 
     // Populate the electrum client's transaction cache so it doesn't re-download transaction we
     // already have.
     client.populate_tx_cache(wallet.tx_graph().full_txs().map(|tx_node| tx_node.tx));
 
-    let request = wallet.start_full_scan().inspect({
-        let mut stdout = std::io::stdout();
-        let mut once = HashSet::<KeychainKind>::new();
-        move |k, spk_i, _| {
-            if once.insert(k) {
-                print!("\nScanning keychain [{:?}]", k);
-            }
-            print!(" {:<3}", spk_i);
-            stdout.flush().expect("must flush");
-        }
-    });
-
-    let update = client.full_scan(request, STOP_GAP, BATCH_SIZE, true)?;
-
-    println!();
+    
+    let graph = wallet.tx_graph();
+    let chain = wallet.local_chain();
+    let request = {
+        FullScanRequest::builder()
+            .chain_tip(chain.tip())
+            .spks_for_keychain(
+                KeychainKind::External,
+                graph
+                    .index
+                    .unbounded_spk_iter(KeychainKind::External)
+                    .into_iter()
+                    .flatten(),
+            )
+            .spks_for_keychain(
+                KeychainKind::Internal,
+                graph
+                    .index
+                    .unbounded_spk_iter(KeychainKind::Internal)
+                    .into_iter()
+                    .flatten(),
+            )
+    };
 
-    wallet.apply_update(update)?;
+    let res = client
+        .full_scan::<_>(request, STOP_GAP, BATCH_SIZE, false)
+        .context("scanning the blockchain")?;
+    (
+        res.chain_update,
+        res.tx_update,
+        Some(res.last_active_indices),
+    );
 
     Ok(())
 }

migrations/postgres/01_bdk_wallet.sql

@@ -43,6 +43,8 @@ CREATE TABLE IF NOT EXISTS bdk_wallet.tx (
     txid TEXT NOT NULL,
     whole_tx BYTEA,
     last_seen BIGINT,
+    last_evicted BIGINT,
+    first_seen BIGINT,
     PRIMARY KEY (wallet_name, txid)
 );
 

src/postgres.rs

@@ -250,6 +250,8 @@ impl Store<Postgres> {
             txid TEXT NOT NULL,
             whole_tx BYTEA,
             last_seen BIGINT,
+            last_evicted BIGINT,
+            first_seen BIGINT,
             PRIMARY KEY (wallet_name, txid)
         )"#,
             r#"CREATE TABLE IF NOT EXISTS "bdk_wallet"."txout" (
@@ -283,14 +285,42 @@ impl Store<Postgres> {
                 })?;
         }
 
-        // At the end of migration, insert the current version
-        // After all tables are created but before tx.commit()
+        // Check current schema version and apply migrations if needed
+        let current_version: Option<i32> = sqlx::query_scalar(
+            r#"SELECT version FROM "bdk_wallet"."version" ORDER BY version DESC LIMIT 1"#,
+        )
+        .fetch_optional(&mut *tx)
+        .await
+        .map_err(|e| BdkSqlxError::QueryError {
+            table: "select version".to_string(),
+            source: e,
+        })?;
+
+        match current_version {
+            Some(1) => {
+                // Migrate from v1 to v2: Add last_evicted and first_seen columns
+                sqlx::query(
+                    r#"ALTER TABLE "bdk_wallet"."tx" 
+                       ADD COLUMN IF NOT EXISTS last_evicted BIGINT,
+                       ADD COLUMN IF NOT EXISTS first_seen BIGINT"#,
+                )
+                .execute(&mut *tx)
+                .await
+                .map_err(|e| BdkSqlxError::QueryError {
+                    table: "alter tx table".to_string(),
+                    source: e,
+                })?;
+            }
+            _ => {} // Fresh install or already at v2
+        }
+
+        // Insert or update to current version
         sqlx::query(
             r#"INSERT INTO "bdk_wallet"."version" (version) 
                VALUES ($1) 
                ON CONFLICT (version) DO NOTHING"#,
         )
-        .bind(1) // Current schema version
+        .bind(2) // Current schema version is now 2
         .execute(&mut *tx)
         .await
         .map_err(|e| BdkSqlxError::QueryError {
@@ -512,7 +542,7 @@ pub async fn tx_graph_changeset_from_postgres(
 
     // Fetch transactions
     let rows = sqlx::query(
-        r#"SELECT txid, whole_tx, last_seen FROM "bdk_wallet"."tx" WHERE wallet_name = $1"#,
+        r#"SELECT txid, whole_tx, last_seen, last_evicted, first_seen FROM "bdk_wallet"."tx" WHERE wallet_name = $1"#,
     )
     .bind(wallet_name)
     .fetch_all(&mut **db_tx)
@@ -527,6 +557,8 @@ pub async fn tx_graph_changeset_from_postgres(
         let txid = Txid::from_str(&txid)?;
         let whole_tx: Option<Vec<u8>> = row.get("whole_tx");
         let last_seen: Option<i64> = row.get("last_seen");
+        let _last_evicted: Option<i64> = row.get("last_evicted");
+        let _first_seen: Option<i64> = row.get("first_seen");
 
         if let Some(tx_bytes) = whole_tx {
             if let Ok(tx) = bitcoin::Transaction::consensus_decode(&mut tx_bytes.as_slice()) {
@@ -536,6 +568,8 @@ pub async fn tx_graph_changeset_from_postgres(
         if let Some(last_seen) = last_seen {
             changeset.last_seen.insert(txid, last_seen as u64);
         }
+        // Note: last_evicted and first_seen are fetched but not yet used in ChangeSet
+        // These fields are stored for future use when bdk_chain supports them
     }
 
     // Fetch txouts
@@ -602,6 +636,8 @@ pub async fn tx_graph_changeset_persist_to_postgres(
 ) -> Result<()> {
     trace!("tx graph changeset from postgres");
     for tx in &changeset.txs {
+        // Note: last_evicted and first_seen columns are reserved for future use
+        // when bdk_chain adds support for these fields in ChangeSet
         sqlx::query(
             r#"INSERT INTO "bdk_wallet"."tx" (wallet_name, txid, whole_tx) VALUES ($1, $2, $3)
              ON CONFLICT (wallet_name, txid) DO UPDATE SET whole_tx = $3"#,