Bump LDK dependency for wallet_utils refactor

Some types previously existing in lightning::events::bump_transaction
have been moved to lightning::util::wallet_utils.

Author: jkczyz

Cargo.toml

@@ -39,17 +39,17 @@ default = []
 #lightning-liquidity = { version = "0.2.0", features = ["std"] }
 #lightning-macros = { version = "0.2.0" }
 
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
-lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
-lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
-lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
-lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["tokio"] }
-lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
-lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
-lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["rest-client", "rpc-client", "tokio"] }
-lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
-lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std"] }
-lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f" }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["std"] }
+lightning-types = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c" }
+lightning-invoice = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["std"] }
+lightning-net-tokio = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c" }
+lightning-persister = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["tokio"] }
+lightning-background-processor = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c" }
+lightning-rapid-gossip-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c" }
+lightning-block-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["rest-client", "rpc-client", "tokio"] }
+lightning-transaction-sync = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["esplora-async-https", "time", "electrum-rustls-ring"] }
+lightning-liquidity = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["std"] }
+lightning-macros = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c" }
 
 bdk_chain = { version = "0.23.0", default-features = false, features = ["std"] }
 bdk_esplora = { version = "0.22.0", default-features = false, features = ["async-https-rustls", "tokio"]}
@@ -78,13 +78,13 @@ log = { version = "0.4.22", default-features = false, features = ["std"]}
 vss-client = { package = "vss-client-ng", version = "0.4" }
 prost = { version = "0.11.6", default-features = false}
 #bitcoin-payment-instructions = { version = "0.6" }
-bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "d3d1f9fd6d59ad901834af5cc2d2d44743d5f28e" }
+bitcoin-payment-instructions = { git = "https://github.com/jkczyz/bitcoin-payment-instructions", rev = "48f409bc1c2c140dfdb5514125ef7d714110b7f0" }
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3", features = ["winbase"] }
 
 [dev-dependencies]
-lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "2203e2dbb603850b83c986da14c0678a04bad11f", features = ["std", "_test_utils"] }
+lightning = { git = "https://github.com/lightningdevkit/rust-lightning", rev = "8bbc5ec0e4fd27071576374981d5d2b2ac18376c", features = ["std", "_test_utils"] }
 proptest = "1.0.0"
 regex = "1.5.6"
 criterion = { version = "0.7.0", features = ["async_tokio"] }

src/lib.rs

@@ -138,13 +138,13 @@ use gossip::GossipSource;
 use graph::NetworkGraph;
 use io::utils::write_node_metrics;
 use lightning::chain::BestBlock;
-use lightning::events::bump_transaction::Wallet as LdkWallet;
 use lightning::impl_writeable_tlv_based;
 use lightning::ln::channel_state::{ChannelDetails as LdkChannelDetails, ChannelShutdownState};
 use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::msgs::SocketAddress;
 use lightning::routing::gossip::NodeAlias;
 use lightning::util::persist::KVStoreSync;
+use lightning::util::wallet_utils::Wallet as LdkWallet;
 use lightning_background_processor::process_events_async;
 use liquidity::{LSPS1Liquidity, LiquiditySource};
 use logger::{log_debug, log_error, log_info, log_trace, LdkLogger, Logger};

src/types.rs

@@ -314,7 +314,7 @@ pub(crate) type Sweeper = OutputSweeper<
 pub(crate) type BumpTransactionEventHandler =
 	lightning::events::bump_transaction::BumpTransactionEventHandler<
 		Arc<Broadcaster>,
-		Arc<lightning::events::bump_transaction::Wallet<Arc<Wallet>, Arc<Logger>>>,
+		Arc<lightning::util::wallet_utils::Wallet<Arc<Wallet>, Arc<Logger>>>,
 		Arc<KeysManager>,
 		Arc<Logger>,
 	>;

src/wallet/mod.rs

@@ -33,9 +33,6 @@ use bitcoin::{
 use lightning::chain::chaininterface::BroadcasterInterface;
 use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
 use lightning::chain::{BestBlock, ClaimId, Listen};
-use lightning::events::bump_transaction::{
-	CoinSelection, CoinSelectionSource, Input, Utxo, WalletSource,
-};
 use lightning::ln::channelmanager::PaymentId;
 use lightning::ln::funding::FundingTxInput;
 use lightning::ln::inbound_payment::ExpandedKey;
@@ -46,6 +43,9 @@ use lightning::sign::{
 	PeerStorageKey, Recipient, SignerProvider, SpendableOutputDescriptor,
 };
 use lightning::util::message_signing;
+use lightning::util::wallet_utils::{
+	CoinSelection, CoinSelectionSource, Input, Utxo, WalletSource,
+};
 use lightning_invoice::RawBolt11Invoice;
 use persist::KVStoreWalletPersister;