Implement chain::Access trait

Author: tnull

src/lib.rs

@@ -29,6 +29,7 @@ mod error;
 pub mod event;
 mod hex_utils;
 mod io_utils;
+mod scid_utils;
 mod logger;
 mod peer_store;
 
@@ -45,7 +46,7 @@ use logger::{
 };
 
 use lightning::chain::keysinterface::{InMemorySigner, KeysInterface, KeysManager, Recipient};
-use lightning::chain::{chainmonitor, Access, BestBlock, Confirm, Filter, Watch};
+use lightning::chain::{chainmonitor, BestBlock, Confirm, Filter, Watch};
 use lightning::ln::channelmanager;
 use lightning::ln::channelmanager::{
 	ChainParameters, ChannelManagerReadArgs, SimpleArcChannelManager,
@@ -227,8 +228,12 @@ impl LdkLiteBuilder {
 		let blockchain = EsploraBlockchain::new(&config.esplora_server_url, BDK_CLIENT_STOP_GAP)
 			.with_concurrency(BDK_CLIENT_CONCURRENCY);
 
-		let chain_access =
-			Arc::new(LdkLiteChainAccess::new(blockchain, bdk_wallet, Arc::clone(&logger)));
+		let chain_access = Arc::new(LdkLiteChainAccess::new(
+			blockchain,
+			bdk_wallet,
+			Arc::clone(&config),
+			Arc::clone(&logger),
+		));
 
 		// Step 3: Initialize Persist
 		let persister = Arc::new(FilesystemPersister::new(ldk_data_dir.clone()));
@@ -303,7 +308,7 @@ impl LdkLiteBuilder {
 			Arc::new(io_utils::read_network_graph(Arc::clone(&config), Arc::clone(&logger))?);
 		let gossip_sync = Arc::new(P2PGossipSync::new(
 			Arc::clone(&network_graph),
-			None::<Arc<dyn Access + Send + Sync>>,
+			Some(Arc::clone(&chain_access)),
 			Arc::clone(&logger),
 		));
 
@@ -963,7 +968,7 @@ type PeerManager = SimpleArcPeerManager<
 	ChainMonitor,
 	LdkLiteChainAccess<bdk::sled::Tree>,
 	LdkLiteChainAccess<bdk::sled::Tree>,
-	dyn Access + Send + Sync,
+	LdkLiteChainAccess<bdk::sled::Tree>,
 	FilesystemLogger,
 >;
 
@@ -985,8 +990,11 @@ type InvoicePayer<F> = payment::InvoicePayer<
 type Router = DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
 type Scorer = ProbabilisticScorer<Arc<NetworkGraph>, Arc<FilesystemLogger>>;
 
-type GossipSync =
-	P2PGossipSync<Arc<NetworkGraph>, Arc<dyn Access + Send + Sync>, Arc<FilesystemLogger>>;
+type GossipSync = P2PGossipSync<
+	Arc<NetworkGraph>,
+	Arc<LdkLiteChainAccess<bdk::sled::Tree>>,
+	Arc<FilesystemLogger>,
+>;
 
 pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
 

src/scid_utils.rs

@@ -0,0 +1,33 @@
+// Copied from `rust-lightning`
+//
+// This file is Copyright its original authors, visible in version control
+// history.
+//
+// This file is licensed under the Apache License, Version 2.0 <LICENSE-APACHE
+// or http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your option.
+// You may not use this file except in accordance with one or both of these
+// licenses.
+
+/// Maximum transaction index that can be used in a `short_channel_id`.
+/// This value is based on the 3-bytes available for tx index.
+pub const MAX_SCID_TX_INDEX: u64 = 0x00ffffff;
+
+/// Maximum vout index that can be used in a `short_channel_id`. This
+/// value is based on the 2-bytes available for the vout index.
+pub const MAX_SCID_VOUT_INDEX: u64 = 0xffff;
+
+/// Extracts the block height (most significant 3-bytes) from the `short_channel_id`
+pub fn block_from_scid(short_channel_id: &u64) -> u32 {
+	return (short_channel_id >> 40) as u32;
+}
+
+/// Extracts the tx index (bytes [2..4]) from the `short_channel_id`
+pub fn tx_index_from_scid(short_channel_id: &u64) -> u32 {
+	return ((short_channel_id >> 16) & MAX_SCID_TX_INDEX) as u32;
+}
+
+/// Extracts the vout (bytes [0..2]) from the `short_channel_id`
+pub fn vout_from_scid(short_channel_id: &u64) -> u16 {
+	return ((short_channel_id) & MAX_SCID_VOUT_INDEX) as u16;
+}