diff --git a/Cargo.toml b/Cargo.toml
index 90a41cdf8..6b48fc9bc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -28,13 +28,13 @@ panic = 'abort'     # Abort on panic
 default = []
 
 [dependencies]
-lightning = { version = "0.0.119", features = ["std"] }
-lightning-invoice = { version = "0.27.0" }
-lightning-net-tokio = { version = "0.0.119" }
-lightning-persister = { version = "0.0.119" }
-lightning-background-processor = { version = "0.0.119", features = ["futures"] }
-lightning-rapid-gossip-sync = { version = "0.0.119" }
-lightning-transaction-sync = { version = "0.0.119", features = ["esplora-async-https"] }
+lightning = { version = "0.0.121", features = ["std"] }
+lightning-invoice = { version = "0.29.0" }
+lightning-net-tokio = { version = "0.0.121" }
+lightning-persister = { version = "0.0.121" }
+lightning-background-processor = { version = "0.0.121", features = ["futures"] }
+lightning-rapid-gossip-sync = { version = "0.0.121" }
+lightning-transaction-sync = { version = "0.0.121", features = ["esplora-async-https", "time"] }
 
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std"] }
 #lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
@@ -75,7 +75,7 @@ prost = { version = "0.11.6", default-features = false}
 winapi = { version = "0.3", features = ["winbase"] }
 
 [dev-dependencies]
-lightning = { version = "0.0.119", features = ["std", "_test_utils"] }
+lightning = { version = "0.0.121", features = ["std", "_test_utils"] }
 #lightning = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["std", "_test_utils"] }
 electrum-client = { version = "0.15.1", default-features = true }
 bitcoincore-rpc = { version = "0.17.0", default-features = false }
diff --git a/src/types.rs b/src/types.rs
index b5926cb99..3c6104db5 100644
--- a/src/types.rs
+++ b/src/types.rs
@@ -102,7 +102,7 @@ pub(crate) type GossipSync = lightning_background_processor::GossipSync<
 	Arc<FilesystemLogger>,
 >;
 
-pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
+pub(crate) type OnionMessenger = lightning::onion_message::messenger::OnionMessenger<
 	Arc<KeysManager>,
 	Arc<KeysManager>,
 	Arc<FilesystemLogger>,
@@ -113,11 +113,11 @@ pub(crate) type OnionMessenger = lightning::onion_message::OnionMessenger<
 
 pub(crate) struct FakeMessageRouter {}
 
-impl lightning::onion_message::MessageRouter for FakeMessageRouter {
+impl lightning::onion_message::messenger::MessageRouter for FakeMessageRouter {
 	fn find_path(
 		&self, _sender: PublicKey, _peers: Vec<PublicKey>,
-		_destination: lightning::onion_message::Destination,
-	) -> Result<lightning::onion_message::OnionMessagePath, ()> {
+		_destination: lightning::onion_message::messenger::Destination,
+	) -> Result<lightning::onion_message::messenger::OnionMessagePath, ()> {
 		unimplemented!()
 	}
 	fn create_blinded_paths<