Merge branch 'refs/heads/main' into monitor-upd-persister

Author: arturgontijo

README.md

@@ -44,7 +44,7 @@ fn main() {
 	node.event_handled();
 
 	let invoice = Bolt11Invoice::from_str("INVOICE_STR").unwrap();
-	node.bolt11_payment().send(&invoice).unwrap();
+	node.bolt11_payment().send(&invoice, None).unwrap();
 
 	node.stop().unwrap();
 }

bindings/ldk_node.udl

@@ -58,10 +58,11 @@ interface Builder {
 	void set_chain_source_bitcoind_rpc(string rpc_host, u16 rpc_port, string rpc_user, string rpc_password);
 	void set_gossip_source_p2p();
 	void set_gossip_source_rgs(string rgs_server_url);
-	void set_liquidity_source_lsps2(SocketAddress address, PublicKey node_id, string? token);
+	void set_liquidity_source_lsps1(PublicKey node_id, SocketAddress address, string? token);
+	void set_liquidity_source_lsps2(PublicKey node_id, SocketAddress address, string? token);
 	void set_storage_dir_path(string storage_dir_path);
-	void set_filesystem_logger(string? log_file_path, LogLevel? log_level);
-	void set_log_facade_logger(LogLevel log_level);
+	void set_filesystem_logger(string? log_file_path, LogLevel? max_log_level);
+	void set_log_facade_logger(LogLevel? max_log_level);
 	void set_custom_logger(LogWriter log_writer);
 	void set_network(Network network);
 	[Throws=BuildError]
@@ -100,6 +101,7 @@ interface Node {
 	SpontaneousPayment spontaneous_payment();
 	OnchainPayment onchain_payment();
 	UnifiedQrPayment unified_qr_payment();
+	LSPS1Liquidity lsps1_liquidity();
 	[Throws=NodeError]
 	void connect(PublicKey node_id, SocketAddress address, boolean persist);
 	[Throws=NodeError]
@@ -126,6 +128,8 @@ interface Node {
 	NetworkGraph network_graph();
 	string sign_message([ByRef]sequence<u8> msg);
 	boolean verify_signature([ByRef]sequence<u8> msg, [ByRef]string sig, [ByRef]PublicKey pkey);
+	[Throws=NodeError]
+	bytes export_pathfinding_scores();
 };
 
 [Enum]
@@ -211,6 +215,13 @@ interface UnifiedQrPayment {
 	QrPaymentResult send([ByRef]string uri_str);
 };
 
+interface LSPS1Liquidity {
+	[Throws=NodeError]
+	LSPS1OrderStatus request_channel(u64 lsp_balance_sat, u64 client_balance_sat, u32 channel_expiry_blocks, boolean announce_channel);
+	[Throws=NodeError]
+	LSPS1OrderStatus check_order_status(OrderId order_id);
+};
+
 [Error]
 enum NodeError {
 	"AlreadyRunning",
@@ -258,6 +269,8 @@ enum NodeError {
 	"InvalidUri",
 	"InvalidQuantity",
 	"InvalidNodeAlias",
+	"InvalidDateTime",
+	"InvalidFeeRate",
 	"DuplicatePayment",
 	"UnsupportedCurrency",
 	"InsufficientFunds",
@@ -416,6 +429,59 @@ dictionary CustomTlvRecord {
 	sequence<u8> value;
 };
 
+dictionary LSPS1OrderStatus {
+	OrderId order_id;
+	OrderParameters order_params;
+	PaymentInfo payment_options;
+	ChannelOrderInfo? channel_state;
+};
+
+dictionary OrderParameters {
+	u64 lsp_balance_sat;
+	u64 client_balance_sat;
+	u16 required_channel_confirmations;
+	u16 funding_confirms_within_blocks;
+	u32 channel_expiry_blocks;
+	string? token;
+	boolean announce_channel;
+};
+
+dictionary PaymentInfo {
+	Bolt11PaymentInfo? bolt11;
+	OnchainPaymentInfo? onchain;
+};
+
+dictionary Bolt11PaymentInfo {
+	PaymentState state;
+	DateTime expires_at;
+	u64 fee_total_sat;
+	u64 order_total_sat;
+	Bolt11Invoice invoice;
+};
+
+dictionary OnchainPaymentInfo {
+	PaymentState state;
+	DateTime expires_at;
+	u64 fee_total_sat;
+	u64 order_total_sat;
+	Address address;
+	u16? min_onchain_payment_confirmations;
+	FeeRate min_fee_for_0conf;
+	Address? refund_onchain_address;
+};
+
+dictionary ChannelOrderInfo {
+	DateTime funded_at;
+	OutPoint funding_outpoint;
+	DateTime expires_at;
+};
+
+enum PaymentState {
+	"ExpectPayment",
+	"Paid",
+	"Refunded",
+};
+
 [Enum]
 interface MaxTotalRoutingFeeLimit {
 	None ();
@@ -662,3 +728,9 @@ typedef string UntrustedString;
 
 [Custom]
 typedef string NodeAlias;
+
+[Custom]
+typedef string OrderId;
+
+[Custom]
+typedef string DateTime;

src/balance.rs

@@ -325,9 +325,9 @@ pub enum PendingSweepBalance {
 	},
 	/// A spending transaction has been confirmed on-chain and is awaiting threshold confirmations.
 	///
-	/// It will be considered irrevocably confirmed after reaching [`ANTI_REORG_DELAY`].
+	/// It will be pruned after reaching [`PRUNE_DELAY_BLOCKS`] confirmations.
 	///
-	/// [`ANTI_REORG_DELAY`]: lightning::chain::channelmonitor::ANTI_REORG_DELAY
+	/// [`PRUNE_DELAY_BLOCKS`]: lightning::util::sweep::PRUNE_DELAY_BLOCKS
 	AwaitingThresholdConfirmations {
 		/// The identifier of the channel this balance belongs to.
 		channel_id: Option<ChannelId>,