Skip to content

Commit 67eec36

Browse files
committed
Merge #1152: fix(wallet_esplora): missing_heights uses the graph update
b1461f0 fix(wallet_esplora): missing_heights uses the... ...graph update (Daniela Brozzoni) Pull request description: Fixes #1151. When wallet_esplora_* was used to sync a wallet containing a transaction confirmed some time ago (more than 10-15 blocks ago), the transaction would be stuck in an "unconfirmed" state forever. At the first scan time, `update_local_chain` would just fetch the last 10 to 15 blocks (depending on the server used), and `tx_graph.missing_heights` wouldn't return the tx's confirmation block as it was called on the original, non-updated tx_graph. So, after the first scan, we would have a transaction in memory with an anchor that doesn't exist in our local_chain, and try_get_chain_position would return unconfirmed. When scanning again, missing_heights would find the missing anchor, but `update_local_chain` wouldn't include it as it's older than ASSUME_FINAL_DEPTH. The missing block would be downloaded every time, but never included in the local_chain, and the transaction would remain unconfirmed forever. Here we call missing_heights on the updated graph, so that it can correctly return the anchor height, and `update_local_chain` can fetch it and include it in the chain. ### Notes to the reviewers I'm not sure if this is the right approach, so I'm opening this PR to gather feedback. I still need to add tests, I'll do so once we decide if this is the right way to go or not. ### Checklists #### All Submissions: * [x] I've signed all my commits * [x] I followed the [contribution guidelines](https://github.com/bitcoindevkit/bdk/blob/master/CONTRIBUTING.md) * [x] I ran `cargo fmt` and `cargo clippy` before committing #### Bugfixes: * [x] This pull request breaks the existing API * [ ] I've added tests to reproduce the issue which are now passing * [x] I'm linking the issue being fixed by this PR ACKs for top commit: evanlinjin: ACK b1461f0 Tree-SHA512: ba0cf85929644ee737dbc77e6afec662845532de0f120917aa6000ca8f5db79d0cb3971bd92285b5c5b5d26042b60b6c8536f50c9bd49615e31f5da28e80a509
2 parents 77cde96 + b1461f0 commit 67eec36

File tree

2 files changed

+2
-2
lines changed
  • example-crates

2 files changed

+2
-2
lines changed

example-crates/wallet_esplora_async/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
5656
let (update_graph, last_active_indices) = client
5757
.scan_txs_with_keychains(keychain_spks, None, None, STOP_GAP, PARALLEL_REQUESTS)
5858
.await?;
59-
let missing_heights = wallet.tx_graph().missing_heights(wallet.local_chain());
59+
let missing_heights = update_graph.missing_heights(wallet.local_chain());
6060
let chain_update = client.update_local_chain(prev_tip, missing_heights).await?;
6161
let update = Update {
6262
last_active_indices,

example-crates/wallet_esplora_blocking/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
5555

5656
let (update_graph, last_active_indices) =
5757
client.scan_txs_with_keychains(keychain_spks, None, None, STOP_GAP, PARALLEL_REQUESTS)?;
58-
let missing_heights = wallet.tx_graph().missing_heights(wallet.local_chain());
58+
let missing_heights = update_graph.missing_heights(wallet.local_chain());
5959
let chain_update = client.update_local_chain(prev_tip, missing_heights)?;
6060
let update = Update {
6161
last_active_indices,

0 commit comments

Comments
 (0)