fix: more compile errors

Author: rolznz

bindings/ldk_node.udl

@@ -243,16 +243,13 @@ interface Bolt12Payment {
 };
 
 interface SpontaneousPayment {
-	// Alby: custom TLV & preimage (TODO: update to use send_with_preimage_and_custom_tlvs)
+	PaymentId send(u64 amount_msat, PublicKey node_id, RouteParametersConfig? route_parameters);
 	[Throws=NodeError]
-	PaymentId send_with_tlvs_and_preimage(u64 amount_msat, PublicKey node_id, RouteParametersConfig? route_parameters, sequence<TlvEntry> custom_tlvs, PaymentPreimage? preimage);
-	//PaymentId send(u64 amount_msat, PublicKey node_id, RouteParametersConfig? route_parameters);
-	//[Throws=NodeError]
-	//PaymentId send_with_custom_tlvs(u64 amount_msat, PublicKey node_id, RouteParametersConfig? route_parameters, sequence<CustomTlvRecord> custom_tlvs);
-	//[Throws=NodeError]
-	//PaymentId send_with_preimage(u64 amount_msat, PublicKey node_id, PaymentPreimage preimage, RouteParametersConfig? route_parameters);
-	//[Throws=NodeError]
-	//PaymentId send_with_preimage_and_custom_tlvs(u64 amount_msat, PublicKey node_id, sequence<CustomTlvRecord> custom_tlvs, PaymentPreimage preimage, RouteParametersConfig? route_parameters);
+	PaymentId send_with_custom_tlvs(u64 amount_msat, PublicKey node_id, RouteParametersConfig? route_parameters, sequence<CustomTlvRecord> custom_tlvs);
+	[Throws=NodeError]
+	PaymentId send_with_preimage(u64 amount_msat, PublicKey node_id, PaymentPreimage preimage, RouteParametersConfig? route_parameters);
+	[Throws=NodeError]
+	PaymentId send_with_preimage_and_custom_tlvs(u64 amount_msat, PublicKey node_id, sequence<CustomTlvRecord> custom_tlvs, PaymentPreimage preimage, RouteParametersConfig? route_parameters);
 	[Throws=NodeError]
 	void send_probes(u64 amount_msat, PublicKey node_id);
 };
@@ -626,7 +623,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis,
 		u64 transaction_fee_satoshis,
 		u64 outbound_payment_htlc_rounded_msat,
@@ -638,7 +635,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis,
 		u32 confirmation_height,
 		BalanceSource source
@@ -647,7 +644,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis,
 		u32 timeout_height,
 		PaymentHash payment_hash,
@@ -657,7 +654,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis,
 		u32 claimable_height,
 		PaymentHash payment_hash,
@@ -667,7 +664,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis,
 		u32 expiry_height,
 		PaymentHash payment_hash
@@ -676,7 +673,7 @@ interface LightningBalance {
 		ChannelId channel_id,
 		PublicKey counterparty_node_id,
 		Txid funding_tx_id,
-		u16 funding_tx_index,
+		u32 funding_tx_index,
 		u64 amount_satoshis
 	);
 };
@@ -695,7 +692,7 @@ interface PendingSweepBalance {
 		u64 amount_satoshis,
 		PublicKey? counterparty_node_id,
 		Txid? funding_tx_id,
-		u16? funding_tx_index
+		u32? funding_tx_index
 	);
 	BroadcastAwaitingConfirmation (
 		ChannelId? channel_id,
@@ -704,7 +701,7 @@ interface PendingSweepBalance {
 		u64 amount_satoshis,
 		PublicKey? counterparty_node_id,
 		Txid? funding_tx_id,
-		u16? funding_tx_index
+		u32? funding_tx_index
 	);
 	AwaitingThresholdConfirmations (
 		ChannelId? channel_id,
@@ -714,7 +711,7 @@ interface PendingSweepBalance {
 		u64 amount_satoshis,
 		PublicKey? counterparty_node_id,
 		Txid? funding_tx_id,
-		u16? funding_tx_index
+		u32? funding_tx_index
 	);
 };
 

src/builder.rs

@@ -943,7 +943,13 @@ 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 = KVStoreSync::write(
+					&*kv_store,
+					"monitors",
+					"",
+					&monitor.key,
+					monitor.value.clone(),
+				);
 				if result.is_err() {
 					log_error!(logger, "Failed to restore monitor: {}", result.unwrap_err());
 				}
@@ -2222,7 +2228,8 @@ fn reset_persistent_state(logger: Arc<Logger>, kv_store: Arc<DynStore>, what: Re
 	};
 
 	if node_metrics {
-		let result = kv_store.remove(
+		let result = KVStoreSync::remove(
+			&*kv_store,
 			NODE_METRICS_PRIMARY_NAMESPACE,
 			NODE_METRICS_SECONDARY_NAMESPACE,
 			NODE_METRICS_KEY,
@@ -2234,7 +2241,8 @@ fn reset_persistent_state(logger: Arc<Logger>, kv_store: Arc<DynStore>, what: Re
 	}
 
 	if scorer {
-		let result = kv_store.remove(
+		let result = KVStoreSync::remove(
+			&*kv_store,
 			SCORER_PERSISTENCE_PRIMARY_NAMESPACE,
 			SCORER_PERSISTENCE_SECONDARY_NAMESPACE,
 			SCORER_PERSISTENCE_KEY,
@@ -2246,7 +2254,8 @@ fn reset_persistent_state(logger: Arc<Logger>, kv_store: Arc<DynStore>, what: Re
 	}
 
 	if network_graph {
-		let result = kv_store.remove(
+		let result = KVStoreSync::remove(
+			&*kv_store,
 			NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
 			NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
 			NETWORK_GRAPH_PERSISTENCE_KEY,

src/event.rs

@@ -11,10 +11,6 @@ use std::collections::VecDeque;
 use std::ops::Deref;
 use std::sync::{Arc, Mutex};
 
-/*use crate::{
-	hex_utils, BumpTransactionEventHandler, ChannelManager, Error, Graph, PeerInfo, PeerStore,
-	TlvEntry, UserChannelId,
-};*/
 use bitcoin::blockdata::locktime::absolute::LockTime;
 use bitcoin::secp256k1::PublicKey;
 use bitcoin::{Amount, OutPoint};

src/io/sqlite_store/mod.rs

@@ -113,7 +113,8 @@ impl SqliteStore {
 
 		if config.transient_graph {
 			// Drop existing network graph if it has been persisted before.
-			ret.inner.remove_internal(
+			KVStoreSync::remove(
+				&ret,
 				NETWORK_GRAPH_PERSISTENCE_PRIMARY_NAMESPACE,
 				NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE,
 				NETWORK_GRAPH_PERSISTENCE_KEY,

src/io/vss_store.rs

@@ -86,14 +86,14 @@ pub struct VssStore {
 	internal_runtime: Option<tokio::runtime::Runtime>,
 	// Alby: secondary kv store for saving the network graph as it's large and shouldn't be saved to VSS
 	// NOTE: for Alby Cloud we use a transient network graph (saved in memory and rebuilt on startup)
-	secondary_kv_store: Arc<dyn KVStore + Send + Sync>,
+	secondary_kv_store: Arc<crate::types::DynStore>,
 }
 
 impl VssStore {
 	pub(crate) fn new(
 		base_url: String, store_id: String, vss_seed: [u8; 32],
 		header_provider: Arc<dyn VssHeaderProvider>,
-		secondary_kv_store: Arc<dyn KVStore + Send + Sync>,
+		secondary_kv_store: Arc<crate::types::DynStore>,
 	) -> io::Result<Self> {
 		let next_version = AtomicU64::new(1);
 		let internal_runtime = tokio::runtime::Builder::new_multi_thread()
@@ -189,7 +189,12 @@ impl KVStoreSync for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.read(primary_namespace, secondary_namespace, key);
+			return lightning::util::persist::KVStoreSync::read(
+				&*self.secondary_kv_store,
+				primary_namespace,
+				secondary_namespace,
+				key,
+			);
 		}
 
 		let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
@@ -217,7 +222,13 @@ impl KVStoreSync for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.write(primary_namespace, secondary_namespace, key, buf);
+			return lightning::util::persist::KVStoreSync::write(
+				&*self.secondary_kv_store,
+				primary_namespace,
+				secondary_namespace,
+				key,
+				buf,
+			);
 		}
 		let internal_runtime = self.internal_runtime.as_ref().ok_or_else(|| {
 			debug_assert!(false, "Failed to access internal runtime");
@@ -255,7 +266,8 @@ impl KVStoreSync for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.remove(
+			return lightning::util::persist::KVStoreSync::remove(
+				&*self.secondary_kv_store,
 				primary_namespace,
 				secondary_namespace,
 				key,
@@ -327,7 +339,12 @@ impl KVStore for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.read(primary_namespace, secondary_namespace, key);
+			return lightning::util::persist::KVStore::read(
+				&*self.secondary_kv_store,
+				primary_namespace,
+				secondary_namespace,
+				key,
+			);
 		}
 		let primary_namespace = primary_namespace.to_string();
 		let secondary_namespace = secondary_namespace.to_string();
@@ -347,7 +364,13 @@ impl KVStore for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.write(primary_namespace, secondary_namespace, key, buf);
+			return lightning::util::persist::KVStore::write(
+				&*self.secondary_kv_store,
+				primary_namespace,
+				secondary_namespace,
+				key,
+				buf,
+			);
 		}
 		let locking_key = self.build_locking_key(primary_namespace, secondary_namespace, key);
 		let (inner_lock_ref, version) = self.get_new_version_and_lock_ref(locking_key.clone());
@@ -378,7 +401,8 @@ impl KVStore for VssStore {
 			&& secondary_namespace == NETWORK_GRAPH_PERSISTENCE_SECONDARY_NAMESPACE
 			&& key == NETWORK_GRAPH_PERSISTENCE_KEY
 		{
-			return self.secondary_kv_store.remove(
+			return lightning::util::persist::KVStore::remove(
+				&*self.secondary_kv_store,
 				primary_namespace,
 				secondary_namespace,
 				key,

src/lib.rs

@@ -102,14 +102,6 @@ mod tx_broadcaster;
 mod types;
 mod wallet;
 
-/*pub use bip39;
-pub use bitcoin;
-pub use lightning;
-pub use lightning_invoice;
-pub use lightning_liquidity;
-pub use lightning_types;
-
-pub use vss_client;*/
 use std::collections::HashMap;
 use std::default::Default;
 use std::net::ToSocketAddrs;
@@ -169,27 +161,6 @@ use payment::{
 	UnifiedQrPayment,
 };
 use peer_store::{PeerInfo, PeerStore};
-/*use types::{
-	Broadcaster, BumpTransactionEventHandler, ChainMonitor, ChannelManager, DynStore, Graph,
-	KeysManager, OnionMessenger, PaymentStore, PeerManager, Router, Scorer, Sweeper, Wallet,
-};
-pub use types::{ChannelDetails, CustomTlvRecord, KeyValue, PeerDetails, TlvEntry, UserChannelId};
-#[cfg(feature = "uniffi")]
-use types::{MigrateStorage, ResetState};
-
-use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};
-
-use lightning::chain::BestBlock;
-use lightning::events::bump_transaction::Wallet as LdkWallet;
-use lightning::impl_writeable_tlv_based;
-use lightning::ln::channel_state::ChannelShutdownState;
-use lightning::ln::channelmanager::PaymentId;
-use lightning::ln::msgs::SocketAddress;
-use lightning::routing::gossip::NodeAlias;
-
-use lightning_background_processor::process_events_async;
-
-use bitcoin::secp256k1::PublicKey;*/
 
 use rand::Rng;
 use runtime::Runtime;