diff --git a/Cargo.toml b/Cargo.toml
index 525169ef3..db8c8c2e3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,13 +9,13 @@ description = "A ready-to-go node implementation built using LDK."
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-#lightning = { version = "0.0.114", features = ["max_level_trace", "std"] }
-#lightning-invoice = { version = "0.22" }
-#lightning-net-tokio = { version = "0.0.114" }
-#lightning-persister = { version = "0.0.114" }
-#lightning-background-processor = { version = "0.0.114" }
-#lightning-rapid-gossip-sync = { version = "0.0.114" }
-#lightning-transaction-sync = { version = "0.0.114", features = ["esplora-async"] }
+lightning = { version = "0.0.115", features = ["max_level_trace", "std"] }
+lightning-invoice = { version = "0.23" }
+lightning-net-tokio = { version = "0.0.115" }
+lightning-persister = { version = "0.0.115" }
+lightning-background-processor = { version = "0.0.115" }
+lightning-rapid-gossip-sync = { version = "0.0.115" }
+lightning-transaction-sync = { version = "0.0.115", features = ["esplora-async-https"] }
 
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["max_level_trace", "std"] }
 #lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
@@ -25,14 +25,6 @@ description = "A ready-to-go node implementation built using LDK."
 #lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["esplora-async"] }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506", features = ["max_level_trace", "std"] }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506" }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev="2ebbe6f30467cd7f0688673f7bfbac297e5c3506", features = ["esplora-async"] }
-
 #lightning = { path = "../rust-lightning/lightning", features = ["max_level_trace", "std"] }
 #lightning-invoice = { path = "../rust-lightning/lightning-invoice" }
 #lightning-net-tokio = { path = "../rust-lightning/lightning-net-tokio" }
diff --git a/src/event.rs b/src/event.rs
index 6744b9585..09143f224 100644
--- a/src/event.rs
+++ b/src/event.rs
@@ -351,6 +351,7 @@ where
 				via_channel_id: _,
 				via_user_channel_id: _,
 				claim_deadline: _,
+				onion_fields: _,
 			} => {
 				if let Some(info) = self.payment_store.get(&payment_hash) {
 					if info.status == PaymentStatus::Succeeded {
diff --git a/src/lib.rs b/src/lib.rs
index 859c77235..8b2d1333b 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -1191,7 +1191,7 @@ impl Node {
 		let route_params = RouteParameters { payment_params, final_value_msat: amount_msat };
 
 		let retry_strategy = Retry::Timeout(LDK_PAYMENT_RETRY_TIMEOUT);
-		let recipient_fields = RecipientOnionFields { payment_secret };
+		let recipient_fields = RecipientOnionFields { payment_secret, payment_metadata: None };
 
 		match self
 			.channel_manager
@@ -1259,7 +1259,7 @@ impl Node {
 			),
 			final_value_msat: amount_msat,
 		};
-		let recipient_fields = RecipientOnionFields { payment_secret: None };
+		let recipient_fields = RecipientOnionFields::spontaneous_empty();
 
 		match self.channel_manager.send_spontaneous_payment_with_retry(
 			Some(payment_preimage),