fix: more errors

Author: rolznz

src/balance.rs

@@ -6,7 +6,7 @@
 // accordance with one or both of these licenses.
 
 use bitcoin::secp256k1::PublicKey;
-use bitcoin::{Amount, BlockHash, Txid};
+use bitcoin::{Amount, BlockHash, OutPoint, Txid};
 use lightning::chain::channelmonitor::{Balance as LdkBalance, BalanceSource};
 use lightning::ln::types::ChannelId;
 use lightning::sign::SpendableOutputDescriptor;
@@ -80,7 +80,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount available to claim, in satoshis, excluding the on-chain fees which will be
 		/// required to do so.
 		amount_satoshis: u64,
@@ -138,7 +138,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount available to claim, in satoshis, possibly excluding the on-chain fees which
 		/// were spent in broadcasting the transaction.
 		amount_satoshis: u64,
@@ -165,7 +165,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount available to claim, in satoshis, excluding the on-chain fees which will be
 		/// required to do so.
 		amount_satoshis: u64,
@@ -188,7 +188,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount potentially available to claim, in satoshis, excluding the on-chain fees
 		/// which will be required to do so.
 		amount_satoshis: u64,
@@ -211,7 +211,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount potentially available to claim, in satoshis, excluding the on-chain fees
 		/// which will be required to do so.
 		amount_satoshis: u64,
@@ -234,7 +234,7 @@ pub enum LightningBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Txid,
 		/// Alby: funding transaction output index.
-		funding_tx_index: u16,
+		funding_tx_index: u32,
 		/// The amount, in satoshis, of the output which we can claim.
 		amount_satoshis: u64,
 	},
@@ -245,7 +245,7 @@ impl LightningBalance {
 		channel_id: ChannelId, counterparty_node_id: PublicKey, funding_txo: OutPoint,
 		balance: LdkBalance,
 	) -> Self {
-		let OutPoint { txid: funding_tx_id, index: funding_tx_index } = funding_txo;
+		let OutPoint { txid: funding_tx_id, vout: funding_tx_index } = funding_txo;
 		match balance {
 			LdkBalance::ClaimableOnChannelClose {
 				balance_candidates,
@@ -355,7 +355,7 @@ pub enum PendingSweepBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Option<Txid>,
 		/// Alby: funding transaction output index.
-		funding_tx_index: Option<u16>,
+		funding_tx_index: Option<u32>,
 	},
 	/// A spending transaction has been generated and broadcast and is awaiting confirmation
 	/// on-chain.
@@ -373,7 +373,7 @@ pub enum PendingSweepBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Option<Txid>,
 		/// Alby: funding transaction output index.
-		funding_tx_index: Option<u16>,
+		funding_tx_index: Option<u32>,
 	},
 	/// A spending transaction has been confirmed on-chain and is awaiting threshold confirmations.
 	///
@@ -396,7 +396,7 @@ pub enum PendingSweepBalance {
 		/// Alby: funding transaction ID.
 		funding_tx_id: Option<Txid>,
 		/// Alby: funding transaction output index.
-		funding_tx_index: Option<u16>,
+		funding_tx_index: Option<u32>,
 	},
 }
 
@@ -414,7 +414,7 @@ impl PendingSweepBalance {
 					amount_satoshis,
 					counterparty_node_id,
 					funding_tx_id: funding_txo.map(|funding_txo| funding_txo.txid),
-					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.index),
+					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.vout),
 				}
 			},
 			OutputSpendStatus::PendingFirstConfirmation {
@@ -432,7 +432,7 @@ impl PendingSweepBalance {
 					amount_satoshis,
 					counterparty_node_id,
 					funding_tx_id: funding_txo.map(|funding_txo| funding_txo.txid),
-					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.index),
+					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.vout),
 				}
 			},
 			OutputSpendStatus::PendingThresholdConfirmations {
@@ -452,7 +452,7 @@ impl PendingSweepBalance {
 					amount_satoshis,
 					counterparty_node_id,
 					funding_tx_id: funding_txo.map(|funding_txo| funding_txo.txid),
-					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.index),
+					funding_tx_index: funding_txo.map(|funding_txo| funding_txo.vout),
 				}
 			},
 		}

src/builder.rs

@@ -8,7 +8,7 @@
 use std::collections::HashMap;
 use std::convert::TryInto;
 use std::default::Default;
-use std::path::PathBuf;
+use std::path::{Path, PathBuf};
 use std::sync::{Arc, Mutex, Once, RwLock};
 use std::time::SystemTime;
 use std::{fmt, fs};
@@ -34,8 +34,13 @@ use lightning::routing::scoring::{
 use lightning::sign::{EntropySource, NodeSigner};
 use lightning::util::persist::{
 	KVStoreSync, CHANNEL_MANAGER_PERSISTENCE_KEY, CHANNEL_MANAGER_PERSISTENCE_PRIMARY_NAMESPACE,
-	CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE,
+	CHANNEL_MANAGER_PERSISTENCE_SECONDARY_NAMESPACE, CHANNEL_MONITOR_PERSISTENCE_PRIMARY_NAMESPACE,
+	CHANNEL_MONITOR_PERSISTENCE_SECONDARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_KEY,
+	NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
+	SCORER_PERSISTENCE_KEY, SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
+	SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 };
+
 use lightning::util::ser::ReadableArgs;
 use lightning::util::sweep::OutputSweeper;
 use lightning_persister::fs_store::FilesystemStore;
@@ -65,19 +70,21 @@ use crate::io::{
 use crate::liquidity::{
 	LSPS1ClientConfig, LSPS2ClientConfig, LSPS2ServiceConfig, LiquiditySourceBuilder,
 };
-use crate::logger::{log_error, LdkLogger, LogLevel, LogWriter, Logger};
+use crate::logger::{log_error, log_info, LdkLogger, LogLevel, LogWriter, Logger};
 use crate::message_handler::NodeCustomMessageHandler;
 use crate::payment::asynchronous::om_mailbox::OnionMessageMailbox;
 use crate::peer_store::PeerStore;
 use crate::runtime::Runtime;
 use crate::tx_broadcaster::TransactionBroadcaster;
 use crate::types::{
-	ChainMonitor, ChannelManager, DynStore, GossipSync, Graph, KeysManager, MessageRouter,
-	OnionMessenger, PaymentStore, PeerManager, Persister,
+	ChainMonitor, ChannelManager, DynStore, GossipSync, Graph, KeyValue, KeysManager,
+	MessageRouter, MigrateStorage, OnionMessenger, PaymentStore, PeerManager, Persister,
+	ResetState,
 };
 use crate::wallet::persist::KVStoreWalletPersister;
 use crate::wallet::Wallet;
 use crate::{Node, NodeMetrics};
+use chrono::Local;
 
 const VSS_HARDENED_CHILD_INDEX: u32 = 877;
 const VSS_LNURL_AUTH_HARDENED_CHILD_INDEX: u32 = 138;
@@ -252,7 +259,7 @@ pub struct NodeBuilder {
 	chain_data_source_config: Option<ChainDataSourceConfig>,
 	gossip_source_config: Option<GossipSourceConfig>,
 	liquidity_source_config: Option<LiquiditySourceConfig>,
-	monitors_to_restore: Option<Vec<KeyValue>>,
+	monitors_to_restore: Option<Vec<KeyValue>>, // Alby: for hub recovery with SCB backup file
 	reset_state: Option<ResetState>,
 	migrate_storage: Option<MigrateStorage>,
 	log_writer_config: Option<LogWriterConfig>,
@@ -618,8 +625,9 @@ impl NodeBuilder {
 		let storage_dir_path = self.config.storage_dir_path.clone();
 		fs::create_dir_all(storage_dir_path.clone())
 			.map_err(|_| BuildError::StoragePathAccessFailed)?;
-		let sql_store_config =
-			SqliteStoreConfig { transient_graph: self.config.transient_network_graph };
+		let sql_store_config = io::sqlite_store::SqliteStoreConfig {
+			transient_graph: self.config.transient_network_graph,
+		};
 		let kv_store = Arc::new(
 			SqliteStore::with_config(
 				storage_dir_path.into(),
@@ -805,13 +813,14 @@ impl NodeBuilder {
 					Some(io::sqlite_store::KV_TABLE_NAME.to_string()),
 				)
 				.map_err(|_| BuildError::KVStoreSetupFailed)?,
-			) as Arc<DynStore>);
+			) as Arc<SqliteStore>);
 		}
 
 		// Alby: use a secondary KV store for non-essential data (not needed by VSS)
 		let storage_dir_path = config.storage_dir_path.clone();
-		let sql_store_config =
-			SqliteStoreConfig { transient_graph: self.config.transient_network_graph };
+		let sql_store_config = io::sqlite_store::SqliteStoreConfig {
+			transient_graph: self.config.transient_network_graph,
+		};
 		let secondary_kv_store = Arc::new(
 			SqliteStore::with_config(
 				storage_dir_path.into(),
@@ -851,7 +860,7 @@ impl NodeBuilder {
 						BuildError::KVStoreSetupFailed
 					})?;
 				// write value to new store
-				vss_store.write(primary_namespace, secondary_namespace, key, &value).map_err(
+				vss_store.write(primary_namespace, secondary_namespace, key, value).map_err(
 					|e| {
 						log_error!(logger, "Failed to migrate value: {}", e);
 						BuildError::KVStoreSetupFailed
@@ -934,7 +943,7 @@ impl NodeBuilder {
 		if self.monitors_to_restore.is_some() {
 			let monitors = self.monitors_to_restore.clone().unwrap();
 			for monitor in monitors {
-				let result = kv_store.write("monitors", "", &monitor.key, &monitor.value);
+				let result = &*kv_store.write("monitors", "", &monitor.key, &monitor.value);
 				if result.is_err() {
 					log_error!(logger, "Failed to restore monitor: {}", result.unwrap_err());
 				}

src/event.rs

@@ -81,7 +81,9 @@ use crate::payment::store::{
 	PaymentDetails, PaymentDetailsUpdate, PaymentDirection, PaymentKind, PaymentStatus,
 };
 use crate::runtime::Runtime;
-use crate::types::{CustomTlvRecord, DynStore, OnionMessenger, PaymentStore, Sweeper, Wallet};
+use crate::types::{
+	CustomTlvRecord, DynStore, OnionMessenger, PaymentStore, Sweeper, TlvEntry, Wallet,
+};
 use crate::{
 	hex_utils, BumpTransactionEventHandler, ChannelManager, Error, Graph, PeerInfo, PeerStore,
 	UserChannelId,

src/io/sqlite_store/mod.rs

@@ -16,13 +16,11 @@ use std::sync::atomic::{AtomicU64, Ordering};
 use std::sync::{Arc, Mutex};
 
 use lightning::io;
-/*use lightning::util::persist::{
-	KVStore, NETWORK_GRAPH_PERSISTENCE_KEY, NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
-	NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
-};
-use lightning::util::string::PrintableString;*/
 
-use lightning::util::persist::{KVStore, KVStoreSync};
+use lightning::util::persist::{
+	KVStore, KVStoreSync, NETWORK_GRAPH_PERSISTENCE_KEY,
+	NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE, NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
+};
 use lightning_types::string::PrintableString;
 use rusqlite::{named_params, Connection};
 
@@ -60,8 +58,6 @@ impl Default for SqliteStoreConfig {
 ///
 /// [SQLite]: https://sqlite.org
 pub struct SqliteStore {
-	config: SqliteStoreConfig,
-
 	inner: Arc<SqliteStoreInner>,
 
 	// Version counter to ensure that writes are applied in the correct order. It is assumed that read and list
@@ -117,15 +113,15 @@ impl SqliteStore {
 
 		if config.transient_graph {
 			// Drop existing network graph if it has been persisted before.
-			ret.remove(
+			ret.inner.remove_internal(
 				NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
 				NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
 				NETWORK_GRAPH_PERSISTENCE_KEY,
 				false,
 			)?;
 		}
 
-		ret.config = config;
+		ret.inner.config = config;
 		Ok(ret)
 	}
 }
@@ -270,6 +266,7 @@ struct SqliteStoreInner {
 	data_dir: PathBuf,
 	kv_table_name: String,
 	write_version_locks: Mutex<HashMap<String, Arc<Mutex<u64>>>>,
+	config: SqliteStoreConfig,
 }
 
 impl SqliteStoreInner {
@@ -344,7 +341,13 @@ impl SqliteStoreInner {
 
 		let connection = Arc::new(Mutex::new(connection));
 		let write_version_locks = Mutex::new(HashMap::new());
-		Ok(Self { connection, data_dir, kv_table_name, write_version_locks })
+		Ok(Self {
+			connection,
+			data_dir,
+			kv_table_name,
+			write_version_locks,
+			config: SqliteStoreConfig::default(),
+		})
 	}
 
 	fn get_inner_lock_ref(&self, locking_key: String) -> Arc<Mutex<u64>> {