f Update to a pre-rebase version branch of tx-sync

Author: tnull

Cargo.toml

@@ -22,14 +22,15 @@ description = "A ready-to-go node implementation based on LDK."
 #lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
 #lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main" }
-
-lightning = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate", features = ["max_level_trace", "std"] }
-lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate" }
-lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate" }
-lightning-persister = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate" }
-lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate" }
-lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate" }
-lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate", features = ["esplora-async"] }
+#lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", branch="main", features = ["esplora-async"] }
+
+lightning = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["max_level_trace", "std"] }
+lightning-invoice = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+lightning-net-tokio = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+lightning-persister = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+lightning-background-processor = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+lightning-rapid-gossip-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase" }
+lightning-transaction-sync = { git = "https://github.com/tnull/rust-lightning", branch="2022-11-add-transaction-sync-crate-pre-rebase", features = ["esplora-async"] }
 
 #lightning = { path = "../rust-lightning/lightning", features = ["max_level_trace", "std"] }
 #lightning-invoice = { path = "../rust-lightning/lightning-invoice" }

src/lib.rs

@@ -366,11 +366,11 @@ impl Builder {
 			.expect("System time error: Clock may have gone backwards");
 		let peer_manager: Arc<PeerManager> = Arc::new(PeerManager::new(
 			lightning_msg_handler,
-			keys_manager.get_node_secret(Recipient::Node).unwrap(),
 			cur_time.as_secs().try_into().expect("System time error"),
 			&ephemeral_bytes,
 			Arc::clone(&logger),
 			IgnoringMessageHandler {},
+			Arc::clone(&keys_manager),
 		));
 
 		// Step 13: Init payment info storage
@@ -945,6 +945,7 @@ impl Node {
 			amount_msat,
 			description.to_string(),
 			expiry_secs,
+			None,
 		) {
 			Ok(inv) => {
 				log_info!(self.logger, "Invoice created: {}", inv);

src/types.rs

@@ -60,6 +60,7 @@ pub(crate) type PeerManager = lightning::ln::peer_handler::PeerManager<
 	Arc<OnionMessenger>,
 	Arc<FilesystemLogger>,
 	IgnoringMessageHandler,
+	Arc<WalletKeysManager<bdk::sled::Tree>>,
 >;
 
 pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<

src/wallet.rs

@@ -12,7 +12,7 @@ use lightning::chain::keysinterface::{
 	EntropySource, InMemorySigner, KeyMaterial, KeysManager, NodeSigner, Recipient, SignerProvider,
 	SpendableOutputDescriptor,
 };
-use lightning::ln::msgs::DecodeError;
+use lightning::ln::msgs::{DecodeError, UnsignedGossipMessage};
 use lightning::ln::script::ShutdownScript;
 
 use bdk::blockchain::{Blockchain, EsploraBlockchain};
@@ -22,8 +22,8 @@ use bdk::{FeeRate, SignOptions, SyncOptions};
 
 use bitcoin::bech32::u5;
 use bitcoin::secp256k1::ecdh::SharedSecret;
-use bitcoin::secp256k1::ecdsa::RecoverableSignature;
-use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey, Signing};
+use bitcoin::secp256k1::ecdsa::{RecoverableSignature, Signature};
+use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, Signing};
 use bitcoin::{Script, Transaction, TxOut};
 
 use std::collections::HashMap;
@@ -271,10 +271,6 @@ impl<D> NodeSigner for WalletKeysManager<D>
 where
 	D: BatchDatabase,
 {
-	fn get_node_secret(&self, recipient: Recipient) -> Result<SecretKey, ()> {
-		self.inner.get_node_secret(recipient)
-	}
-
 	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 		self.inner.get_node_id(recipient)
 	}
@@ -294,6 +290,10 @@ where
 	) -> Result<RecoverableSignature, ()> {
 		self.inner.sign_invoice(hrp_bytes, invoice_data, recipient)
 	}
+
+	fn sign_gossip_message(&self, msg: UnsignedGossipMessage<'_>) -> Result<Signature, ()> {
+		self.inner.sign_gossip_message(msg)
+	}
 }
 
 impl<D> EntropySource for WalletKeysManager<D>