Skip to content

Commit

Permalink
Merge pull request #1242 from get10101/fix/rust-bitcoin-coin-selection
Browse files Browse the repository at this point in the history
Fix `rust-bitcoin-coin-selection` dependency
  • Loading branch information
luckysori authored Sep 7, 2023
2 parents 269d899 + 696b12c commit 126a63a
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 25 deletions.
40 changes: 27 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@ resolver = "2"

[patch.crates-io]
# We should usually track the `feature/ln-dlc-channels[-10101]` branch
dlc-manager = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
dlc-messages = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
dlc = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
dlc-sled-storage-provider = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
p2pd-oracle-client = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
dlc-trie = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
simple-wallet = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "efaa92b" }
dlc-manager = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
dlc-messages = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
dlc = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
dlc-sled-storage-provider = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
p2pd-oracle-client = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
dlc-trie = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }
simple-wallet = { git = "https://github.com/p2pderivatives/rust-dlc", rev = "962265b" }

# We should usually track the `split-tx-experiment[-10101]` branch
lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "3b69cecf" }
Expand Down
7 changes: 2 additions & 5 deletions crates/ln-dlc-node/src/node/dlc_channel.rs
Original file line number Diff line number Diff line change
Expand Up @@ -62,11 +62,8 @@ where
.await?
}

/// Updates the dlc channel with the given contract input and triggers the `RenewOffer` dlc
/// message.
///
/// Note, this is only initiating the protocol and is only finished once the finalize messages
/// are exchanged.
/// Proposes and update to the DLC channel based on the provided [`ContractInput`]. A
/// [`RenewOffer`] is sent to the counterparty, kickstarting the renew protocol.
pub async fn propose_dlc_channel_update(
&self,
dlc_channel_id: &[u8; 32],
Expand Down

0 comments on commit 126a63a

Please sign in to comment.