Use block header from IndexedFilter event

After the new kyoto release (v0.6.3) `Indexedfilter` event has a
`header` field which is used directly (previously we fetched header as
an additional action).

Also renamed import of kyoto `Event` into `KyotoEvent` for readability.

Author: randomlogin

Cargo.toml

@@ -105,7 +105,7 @@ bdk_chain = { version = "0.23.3", default-features = false, features = ["std"] }
 bdk_esplora = { version = "0.22.2", default-features = false, features = ["async-https-rustls", "tokio"], optional = true }
 bdk_electrum = { version = "0.24.0", default-features = false, features = ["use-rustls-ring"], optional = true }
 bdk_wallet = { version = "3.1.0", default-features = false, features = ["std", "keys-bip39"]}
-bip157 = { version = "0.6.1", default-features = false, optional = true }
+bip157 = { version = "0.6.3", default-features = false, optional = true }
 
 bitreq = { version = "0.3", default-features = false, features = ["async-https", "json-using-serde"] }
 rustls = { version = "0.23", default-features = false }

src/chain/cbf.rs

@@ -5,8 +5,9 @@ use std::time::{Duration, SystemTime, UNIX_EPOCH};
 
 use bip157::chain::ChainState;
 use bip157::{
-	chain::BlockHeaderChanges, Builder as KyotoBuilder, Client, Event, HashCheckpoint, Header,
-	IndexedBlock, Info, Node as KyotoNode, Package, Requester, TrustedPeer, Warning,
+	chain::BlockHeaderChanges, Builder as KyotoBuilder, Client, Event as KyotoEvent,
+	HashCheckpoint, Header, IndexedBlock, Info, Node as KyotoNode, Package, Requester, TrustedPeer,
+	Warning,
 };
 use bitcoin::{BlockHash, FeeRate, Network, Script, ScriptBuf, Transaction, Txid};
 use electrum_client::{Client as ElectrumClient, ConfigBuilder as ElectrumConfigBuilder};
@@ -576,14 +577,14 @@ impl CbfChainSource {
 	}
 
 	async fn process_kyoto_events(
-		logger: Arc<Logger>, mut event_rx: mpsc::UnboundedReceiver<Event>,
+		logger: Arc<Logger>, mut event_rx: mpsc::UnboundedReceiver<KyotoEvent>,
 		registered_scripts: Arc<Mutex<HashSet<ScriptBuf>>>,
 		cbf_runtime_status: Arc<Mutex<CbfRuntimeStatus>>, ops_tx: mpsc::UnboundedSender<ChainOp>,
 		onchain_wallet: std::sync::Weak<Wallet>, sync_state_tx: watch::Sender<CbfSyncState>,
 	) {
 		while let Some(event) = event_rx.recv().await {
 			match event {
-				Event::IndexedFilter(indexed_filter) => {
+				KyotoEvent::IndexedFilter(indexed_filter) => {
 					let Some(onchain_wallet) = onchain_wallet.upgrade() else {
 						log_debug!(logger, "Onchain wallet dropped; stopping CBF event processing");
 						break;
@@ -671,61 +672,30 @@ impl CbfChainSource {
 						};
 						ChainOp::ConnectFull { block }
 					} else {
-						let height = indexed_filter.height();
-						//TODO we need to recheck that a particular height has not been
-						//reorganized, and we retrieve indeed the same block header that we
-						//received `IndexedFilter` event of.
-						match requester.get_header(height).await {
-							Ok(Some(indexed_header)) => {
-								if indexed_header.block_hash() != block_hash {
-									log_debug!(
-										logger,
-										"Filter for {} reorged; skipping",
-										block_hash
-									);
-									continue;
-								}
-								ChainOp::ConnectFiltered {
-									header: indexed_header.header,
-									height: indexed_header.height,
-								}
-							},
-							Ok(None) => {
-								log_error!(logger, "No header at height {}", height,);
-								let _ = ops_tx.send(ChainOp::Failed { error: Error::TxSyncFailed });
-								break;
-							},
-							Err(e) => {
-								log_error!(
-									logger,
-									"Failed to fetch header at height {}: {:?}",
-									height,
-									e,
-								);
-								let _ = ops_tx.send(ChainOp::Failed { error: Error::TxSyncFailed });
-								break;
-							},
+						ChainOp::ConnectFiltered {
+							header: indexed_filter.header(),
+							height: indexed_filter.height(),
 						}
 					};
 					if let Err(e) = ops_tx.send(chop) {
 						log_debug!(logger, "ops_rx gone: {}", e);
 					}
 				},
-				Event::FiltersSynced(sync_update) => {
+				KyotoEvent::FiltersSynced(sync_update) => {
 					//Because application of blocks is async, the fact that kyoto synced up to the
 					//tip does NOT mean that we caught everything up, that's why we send a ChainOp,
 					//only processing of which means we processed all blocks up to the tip.
 					log_info!(logger, "Kyoto synced up to the tip {}", sync_update.tip().height);
 					let _ = ops_tx.send(ChainOp::Synced { tip_height: sync_update.tip().height });
 				},
-				Event::ChainUpdate(BlockHeaderChanges::Connected(indexed_header)) => {
+				KyotoEvent::ChainUpdate(BlockHeaderChanges::Connected(indexed_header)) => {
 					log_debug!(
 						logger,
 						"Kyoto connected header at height {}",
 						indexed_header.height
 					);
 				},
-				Event::ChainUpdate(BlockHeaderChanges::Reorganized {
+				KyotoEvent::ChainUpdate(BlockHeaderChanges::Reorganized {
 					reorganized,
 					accepted: _,
 				}) => {
@@ -738,7 +708,7 @@ impl CbfChainSource {
 						let _ = ops_tx.send(ChainOp::Disconnect { fork_point });
 					}
 				},
-				Event::ChainUpdate(BlockHeaderChanges::ForkAdded(fork)) => {
+				KyotoEvent::ChainUpdate(BlockHeaderChanges::ForkAdded(fork)) => {
 					log_debug!(logger, "Kyoto added fork header at height {}", fork.height);
 				},
 			}