f Switch BDK to Sqlite

Author: tnull

Cargo.toml

@@ -41,8 +41,9 @@ lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning",
 #lightning-rapid-gossip-sync = { path = "../rust-lightning/lightning-rapid-gossip-sync" }
 #lightning-transaction-sync = { path = "../rust-lightning/lightning-transaction-sync", features = ["esplora-async"] }
 
-bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "key-value-db"]}
+bdk = { version = "0.27.1", default-features = false, features = ["async-interface", "use-esplora-async", "sqlite-bundled"]}
 reqwest = { version = "0.11", default-features = false, features = ["json", "rustls-tls"] }
+rusqlite = { version = "0.28.0", features = ["bundled"] }
 bitcoin = "0.29.2"
 
 rand = "0.8.5"

src/event.rs

@@ -186,7 +186,7 @@ where
 	K::Target: KVStorePersister,
 	L::Target: Logger,
 {
-	wallet: Arc<Wallet<bdk::sled::Tree>>,
+	wallet: Arc<Wallet<bdk::database::SqliteDatabase>>,
 	event_queue: Arc<EventQueue<K>>,
 	channel_manager: Arc<ChannelManager>,
 	network_graph: Arc<NetworkGraph>,
@@ -204,7 +204,7 @@ where
 	L::Target: Logger,
 {
 	pub fn new(
-		wallet: Arc<Wallet<bdk::sled::Tree>>, event_queue: Arc<EventQueue<K>>,
+		wallet: Arc<Wallet<bdk::database::SqliteDatabase>>, event_queue: Arc<EventQueue<K>>,
 		channel_manager: Arc<ChannelManager>, network_graph: Arc<NetworkGraph>,
 		keys_manager: Arc<KeysManager>, inbound_payments: Arc<PaymentInfoStorage>,
 		outbound_payments: Arc<PaymentInfoStorage>, tokio_runtime: Arc<tokio::runtime::Runtime>,

src/lib.rs

@@ -77,7 +77,7 @@ use lightning_invoice::{payment, Currency, Invoice};
 
 use bdk::bitcoin::secp256k1::Secp256k1;
 use bdk::blockchain::esplora::EsploraBlockchain;
-use bdk::sled;
+use bdk::database::SqliteDatabase;
 use bdk::template::Bip84;
 
 use bitcoin::hashes::sha256::Hash as Sha256;
@@ -221,8 +221,9 @@ impl Builder {
 			&Secp256k1::new(),
 		)
 		.expect("Failed to derive on-chain wallet name");
-		let database = sled::open(bdk_data_dir).expect("Failed to open BDK database");
-		let database = database.open_tree(wallet_name).expect("Failed to open BDK database");
+
+		let database_path = format!("{}/{}.sqlite", bdk_data_dir, wallet_name);
+		let database = SqliteDatabase::new(database_path);
 
 		let bdk_wallet = bdk::Wallet::new(
 			Bip84(xprv, bdk::KeychainKind::External),
@@ -445,7 +446,7 @@ struct Runtime {
 pub struct Node {
 	running: RwLock<Option<Runtime>>,
 	config: Arc<Config>,
-	wallet: Arc<Wallet<bdk::sled::Tree>>,
+	wallet: Arc<Wallet<bdk::database::SqliteDatabase>>,
 	tx_sync: Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
 	event_queue: Arc<EventQueue<Arc<FilesystemPersister>>>,
 	channel_manager: Arc<ChannelManager>,
@@ -682,8 +683,8 @@ impl Node {
 	}
 
 	/// Returns our own node id
-	pub fn node_id(&self) -> Result<PublicKey, Error> {
-		Ok(self.channel_manager.get_our_node_id())
+	pub fn node_id(&self) -> PublicKey {
+		self.channel_manager.get_our_node_id()
 	}
 
 	/// Returns our own listening address and port.

src/tests/functional_tests.rs

@@ -158,8 +158,7 @@ fn channel_full_cycle() {
 	assert_eq!(node_b.on_chain_balance().unwrap().get_spendable(), 100000);
 
 	println!("\nA -- connect_open_channel -> B");
-	let node_b_addr =
-		format!("{}@{}", node_b.node_id().unwrap(), node_b.listening_address().unwrap());
+	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
 	node_a.connect_open_channel(&node_b_addr, 50000, true).unwrap();
 
 	let funding_txo = loop {
@@ -206,7 +205,7 @@ fn channel_full_cycle() {
 	expect_event!(node_a, PaymentSuccessful);
 	expect_event!(node_b, PaymentReceived);
 
-	node_b.close_channel(&channel_id, &node_a.node_id().unwrap()).unwrap();
+	node_b.close_channel(&channel_id, &node_a.node_id()).unwrap();
 	expect_event!(node_a, ChannelClosed);
 	expect_event!(node_b, ChannelClosed);
 
@@ -247,8 +246,7 @@ fn channel_open_fails_when_funds_insufficient() {
 	assert_eq!(node_b.on_chain_balance().unwrap().get_spendable(), 100000);
 
 	println!("\nA -- connect_open_channel -> B");
-	let node_b_addr =
-		format!("{}@{}", node_b.node_id().unwrap(), node_b.listening_address().unwrap());
+	let node_b_addr = format!("{}@{}", node_b.node_id(), node_b.listening_address().unwrap());
 	assert_eq!(
 		Err(Error::InsufficientFunds),
 		node_a.connect_open_channel(&node_b_addr, 120000, true)

src/types.rs

@@ -47,8 +47,8 @@ pub enum PaymentStatus {
 pub(crate) type ChainMonitor = chainmonitor::ChainMonitor<
 	InMemorySigner,
 	Arc<EsploraSyncClient<Arc<FilesystemLogger>>>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<Wallet<bdk::database::SqliteDatabase>>,
+	Arc<Wallet<bdk::database::SqliteDatabase>>,
 	Arc<FilesystemLogger>,
 	Arc<FilesystemPersister>,
 >;
@@ -60,21 +60,21 @@ pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
 	Arc<OnionMessenger>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
 >;
 
 pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
 	Arc<ChainMonitor>,
-	Arc<Wallet<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<Wallet<bdk::sled::Tree>>,
+	Arc<Wallet<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<Wallet<bdk::database::SqliteDatabase>>,
 	Arc<Router>,
 	Arc<FilesystemLogger>,
 >;
 
-pub(crate) type KeysManager = WalletKeysManager<bdk::sled::Tree>;
+pub(crate) type KeysManager = WalletKeysManager<bdk::database::SqliteDatabase>;
 
 pub(crate) type Router =
 	DefaultRouter<Arc<NetworkGraph>, Arc<FilesystemLogger>, Arc<Mutex<Scorer>>>;
@@ -88,8 +88,8 @@ pub(crate) type NetworkGraph = gossip::NetworkGraph<Arc<FilesystemLogger>>;
 pub(crate) type PaymentInfoStorage = Mutex<HashMap<PaymentHash, PaymentInfo>>;
 
 pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
-	Arc<WalletKeysManager<bdk::sled::Tree>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
+	Arc<WalletKeysManager<bdk::database::SqliteDatabase>>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
 >;