From 86e2000c67cb48aace852a76fd39b37f6a09aa0d Mon Sep 17 00:00:00 2001
From: Lucas Soriano del Pino <lucas_soriano@fastmail.com>
Date: Wed, 20 Dec 2023 17:33:31 +1100
Subject: [PATCH] Update to rust-lightning:0.0.117

As part of this update `rust-lightning` introduced a `ChannelId`
struct, which motivated us to also introduce the `DlcChannelId` and
`SubChannelId` structs.
---
 Cargo.toml                                    |   6 +-
 bitcoin-rpc-provider/Cargo.toml               |   2 +-
 dlc-manager/Cargo.toml                        |   6 +-
 dlc-manager/src/chain_monitor.rs              |   9 +-
 dlc-manager/src/channel/accepted_channel.rs   |   7 +-
 dlc-manager/src/channel/mod.rs                |  47 ++--
 dlc-manager/src/channel/offered_channel.rs    |   8 +-
 dlc-manager/src/channel/signed_channel.rs     |  14 +-
 dlc-manager/src/channel_updater.rs            |  25 +-
 dlc-manager/src/contract/signed_contract.rs   |   6 +-
 dlc-manager/src/contract_updater.rs           |   8 +-
 dlc-manager/src/lib.rs                        |  16 +-
 dlc-manager/src/manager.rs                    |  71 +++---
 dlc-manager/src/sub_channel_manager.rs        | 238 ++++++++++--------
 dlc-manager/src/subchannel/mod.rs             | 102 ++++----
 dlc-manager/test_inputs/offer_channel.json    |   2 +-
 dlc-manager/tests/channel_execution_tests.rs  |  30 ++-
 dlc-manager/tests/custom_signer.rs            |  15 ++
 .../tests/ln_dlc_channel_execution_tests.rs   |  61 +++--
 dlc-manager/tests/manager_execution_tests.rs  |   4 +-
 dlc-manager/tests/test_utils.rs               |  57 +++++
 dlc-messages/Cargo.toml                       |   4 +-
 dlc-messages/src/channel.rs                   | 125 ++-------
 dlc-messages/src/lib.rs                       |  27 +-
 dlc-messages/src/sub_channel.rs               |  21 +-
 dlc-sled-storage-provider/Cargo.toml          |   3 +-
 dlc-sled-storage-provider/src/lib.rs          |  22 +-
 dlc/Cargo.toml                                |   3 +-
 dlc/src/ids.rs                                | 113 +++++++++
 dlc/src/lib.rs                                |   8 +
 {dlc-messages => dlc}/src/serde_utils.rs      |   3 +
 electrs-blockchain-provider/Cargo.toml        |   4 +-
 fuzz/Cargo.toml                               |   2 +-
 mocks/Cargo.toml                              |   2 +-
 mocks/src/memory_storage_provider.rs          |  32 ++-
 sample/Cargo.toml                             |   4 +-
 sample/src/cli.rs                             |  30 ++-
 simple-wallet/Cargo.toml                      |   2 +-
 38 files changed, 657 insertions(+), 482 deletions(-)
 create mode 100644 dlc/src/ids.rs
 rename {dlc-messages => dlc}/src/serde_utils.rs (97%)

diff --git a/Cargo.toml b/Cargo.toml
index a5198501..25de8abd 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,6 +16,6 @@ members = [
 resolver = "2"
 
 [patch.crates-io]
-lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }
-lightning-net-tokio = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }
-lightning-persister = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "a57281b" }
+lightning = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "15c4ff6" }
+lightning-net-tokio = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "15c4ff6" }
+lightning-persister = { git = "https://github.com/p2pderivatives/rust-lightning/", rev = "15c4ff6" }
diff --git a/bitcoin-rpc-provider/Cargo.toml b/bitcoin-rpc-provider/Cargo.toml
index c2214c58..2feb63ef 100644
--- a/bitcoin-rpc-provider/Cargo.toml
+++ b/bitcoin-rpc-provider/Cargo.toml
@@ -9,7 +9,7 @@ bitcoin = {version = "0.29.2"}
 bitcoincore-rpc = {version = "0.16.0"}
 bitcoincore-rpc-json = {version = "0.16.0"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 log = "0.4.14"
 rust-bitcoin-coin-selection = { rev = "23a6bf85", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 simple-wallet = {path = "../simple-wallet"}
diff --git a/dlc-manager/Cargo.toml b/dlc-manager/Cargo.toml
index 08343a38..6c6b78fc 100644
--- a/dlc-manager/Cargo.toml
+++ b/dlc-manager/Cargo.toml
@@ -19,7 +19,7 @@ bitcoin = {version = "0.29.2"}
 dlc = {version = "0.4.0", path = "../dlc"}
 dlc-messages = {version = "0.4.0", path = "../dlc-messages"}
 dlc-trie = {version = "0.4.0", path = "../dlc-trie"}
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 log = "0.4.14"
 rand_chacha = {version = "0.3.1", optional = true}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
@@ -37,8 +37,8 @@ dlc-manager = {path = ".", features = ["use-serde"]}
 dlc-messages = {path = "../dlc-messages", features = ["serde"]}
 electrs-blockchain-provider = {path = "../electrs-blockchain-provider"}
 env_logger = "0.9.1"
-lightning-persister = {version = "0.0.116"}
-lightning-transaction-sync = {version = "0.0.116", features=["esplora-blocking"]}
+lightning-persister = {version = "0.0.117"}
+lightning-transaction-sync = {version = "0.0.117", features=["esplora-blocking"]}
 mocks = {path = "../mocks"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std", "global-context", "use-serde"]}
 serde = "1.0"
diff --git a/dlc-manager/src/chain_monitor.rs b/dlc-manager/src/chain_monitor.rs
index eb238312..796bc9c5 100644
--- a/dlc-manager/src/chain_monitor.rs
+++ b/dlc-manager/src/chain_monitor.rs
@@ -11,8 +11,6 @@ use lightning::ln::msgs::DecodeError;
 use lightning::util::ser::{Readable, Writeable, Writer};
 use secp256k1_zkp::EcdsaAdaptorSignature;
 
-use crate::ChannelId;
-
 /// A `ChainMonitor` keeps a list of transaction ids to watch for in the blockchain,
 /// and some associated information used to apply an action when the id is seen.
 #[derive(Debug, PartialEq, Eq)]
@@ -26,7 +24,8 @@ impl_dlc_writeable!(ChainMonitor, { (watched_tx, { cb_writeable, write_hash_map,
 
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub(crate) struct ChannelInfo {
-    pub channel_id: ChannelId,
+    /// The identifier for _either_ a Lightning channel or a DLC channel.
+    pub channel_id: [u8; 32],
     pub tx_type: TxType,
 }
 
@@ -111,7 +110,7 @@ impl ChainMonitor {
             .insert(outpoint, WatchState::new(channel_info));
     }
 
-    pub(crate) fn cleanup_channel(&mut self, channel_id: ChannelId) {
+    pub(crate) fn cleanup_channel(&mut self, channel_id: [u8; 32]) {
         log::debug!("Cleaning up data related to channel {channel_id:?}");
 
         self.watched_tx
@@ -220,7 +219,7 @@ impl WatchState {
         }
     }
 
-    fn channel_id(&self) -> ChannelId {
+    fn channel_id(&self) -> [u8; 32] {
         self.channel_info().channel_id
     }
 }
diff --git a/dlc-manager/src/channel/accepted_channel.rs b/dlc-manager/src/channel/accepted_channel.rs
index 2ed3ade1..f4e0612e 100644
--- a/dlc-manager/src/channel/accepted_channel.rs
+++ b/dlc-manager/src/channel/accepted_channel.rs
@@ -1,10 +1,11 @@
 //! # Structure and methods for channels that have been accepted.
 
 use bitcoin::{Script, Transaction};
+use dlc::DlcChannelId;
 use dlc_messages::channel::AcceptChannel;
 use secp256k1_zkp::{EcdsaAdaptorSignature, PublicKey};
 
-use crate::{contract::accepted_contract::AcceptedContract, ChannelId, ContractId};
+use crate::{contract::accepted_contract::AcceptedContract, ContractId};
 
 use super::party_points::PartyBasePoints;
 
@@ -31,9 +32,9 @@ pub struct AcceptedChannel {
     /// The script pubkey of the buffer transaction output.
     pub buffer_script_pubkey: Script,
     /// The temporary id of the channel.
-    pub temporary_channel_id: ChannelId,
+    pub temporary_channel_id: DlcChannelId,
     /// The actual id of the channel.
-    pub channel_id: ChannelId,
+    pub channel_id: DlcChannelId,
     /// The image of the per update seed used by the accept party.
     pub accept_per_update_seed: PublicKey,
     /// The accept party adaptor signature for the buffer transaction.
diff --git a/dlc-manager/src/channel/mod.rs b/dlc-manager/src/channel/mod.rs
index d05155d5..cd803679 100644
--- a/dlc-manager/src/channel/mod.rs
+++ b/dlc-manager/src/channel/mod.rs
@@ -1,10 +1,11 @@
 //! # Module containing structures and methods for working with DLC channels.
 
 use bitcoin::{hashes::Hash, Transaction, Txid};
+use dlc::DlcChannelId;
 use dlc_messages::channel::{AcceptChannel, SignChannel};
 use secp256k1_zkp::PublicKey;
 
-use crate::{ChannelId, ContractId};
+use crate::ContractId;
 
 use self::{
     accepted_channel::AcceptedChannel, offered_channel::OfferedChannel,
@@ -95,8 +96,8 @@ impl Channel {
 pub struct FailedAccept {
     /// The [`secp256k1_zkp::PublicKey`] of the counter party.
     pub counter_party: PublicKey,
-    /// The temporary [`crate::ChannelId`] of the channel.
-    pub temporary_channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] of the channel.
+    pub temporary_channel_id: DlcChannelId,
     /// An message describing the error encountered while validating the
     /// [`dlc_messages::channel::AcceptChannel`] message.
     pub error_message: String,
@@ -110,8 +111,8 @@ pub struct FailedAccept {
 pub struct FailedSign {
     /// The [`secp256k1_zkp::PublicKey`] of the counter party.
     pub counter_party: PublicKey,
-    /// The [`crate::ChannelId`] of the channel.
-    pub channel_id: ChannelId,
+    /// The [`DlcChannelId`] of the channel.
+    pub channel_id: DlcChannelId,
     /// An message describing the error encountered while validating the
     /// [`dlc_messages::channel::SignChannel`] message.
     pub error_message: String,
@@ -124,10 +125,10 @@ pub struct FailedSign {
 pub struct ClosingChannel {
     /// The [`secp256k1_zkp::PublicKey`] of the counter party.
     pub counter_party: PublicKey,
-    /// The temporary [`crate::ChannelId`] of the channel.
-    pub temporary_channel_id: ChannelId,
-    /// The [`crate::ChannelId`] for the channel.
-    pub channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] of the channel.
+    pub temporary_channel_id: DlcChannelId,
+    /// The [`DlcChannelId`] for the channel.
+    pub channel_id: DlcChannelId,
     /// The previous state the channel was before being closed, if that state was the `Signed` one,
     /// otherwise is `None`.
     pub rollback_state: Option<SignedChannel>,
@@ -145,10 +146,10 @@ pub struct ClosingChannel {
 pub struct ClosedChannel {
     /// The [`secp256k1_zkp::PublicKey`] of the counter party.
     pub counter_party: PublicKey,
-    /// The temporary [`crate::ChannelId`] of the channel.
-    pub temporary_channel_id: ChannelId,
-    /// The [`crate::ChannelId`] for the channel.
-    pub channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] of the channel.
+    pub temporary_channel_id: DlcChannelId,
+    /// The [`DlcChannelId`] for the channel.
+    pub channel_id: DlcChannelId,
 }
 
 #[derive(Clone)]
@@ -157,17 +158,17 @@ pub struct ClosedChannel {
 pub struct ClosedPunishedChannel {
     /// The [`secp256k1_zkp::PublicKey`] of the counter party.
     pub counter_party: PublicKey,
-    /// The temporary [`crate::ChannelId`] of the channel.
-    pub temporary_channel_id: ChannelId,
-    /// The [`crate::ChannelId`] for the channel.
-    pub channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] of the channel.
+    pub temporary_channel_id: DlcChannelId,
+    /// The [`DlcChannelId`] for the channel.
+    pub channel_id: DlcChannelId,
     /// The transaction id of the punishment transaction that was broadcast.
     pub punish_txid: Txid,
 }
 
 impl Channel {
-    /// Returns the temporary [`crate::ChannelId`] for the channel.
-    pub fn get_temporary_id(&self) -> ChannelId {
+    /// Returns the temporary [`DlcChannelId`] for the channel.
+    pub fn get_temporary_id(&self) -> DlcChannelId {
         match self {
             Channel::Offered(o) => o.temporary_channel_id,
             Channel::Accepted(a) => a.temporary_channel_id,
@@ -181,8 +182,8 @@ impl Channel {
         }
     }
 
-    /// Returns the [`crate::ChannelId`] for the channel.
-    pub fn get_id(&self) -> ChannelId {
+    /// Returns the [`DlcChannelId`] for the channel.
+    pub fn get_id(&self) -> DlcChannelId {
         match self {
             Channel::Offered(o) => o.temporary_channel_id,
             Channel::Accepted(a) => a.channel_id,
@@ -212,11 +213,11 @@ impl Channel {
 
 /// Generate a temporary contract id for a DLC based on the channel id and the update index of the DLC channel.
 pub fn generate_temporary_contract_id(
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     channel_update_idx: u64,
 ) -> ContractId {
     let mut data = Vec::with_capacity(65);
-    data.extend_from_slice(&channel_id);
+    data.extend_from_slice(&channel_id.inner());
     data.extend_from_slice(&channel_update_idx.to_be_bytes());
     bitcoin::hashes::sha256::Hash::hash(&data).into_inner()
 }
diff --git a/dlc-manager/src/channel/offered_channel.rs b/dlc-manager/src/channel/offered_channel.rs
index b13a8dad..7f151b8e 100644
--- a/dlc-manager/src/channel/offered_channel.rs
+++ b/dlc-manager/src/channel/offered_channel.rs
@@ -1,14 +1,14 @@
 //! # A channel is offered when an offer was made or received. This module contains
 //! the model for it and method for working with it.
 
+use dlc::DlcChannelId;
 use dlc::PartyParams;
 use dlc_messages::channel::OfferChannel;
-// use dlc_messages::channel::OfferChannel;
 use secp256k1_zkp::PublicKey;
 
 use crate::{
     contract::offered_contract::OfferedContract, conversion_utils::get_tx_input_infos,
-    error::Error, ChannelId, ContractId,
+    error::Error, ContractId,
 };
 
 use super::party_points::PartyBasePoints;
@@ -25,8 +25,8 @@ pub struct OfferedChannel {
     /// The temporary [`crate::ContractId`] of the contract that was offered for
     /// channel setup.
     pub offered_contract_id: ContractId,
-    /// The temporary [`crate::ChannelId`] of the channel.
-    pub temporary_channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] of the channel.
+    pub temporary_channel_id: DlcChannelId,
     /// The set of base points that the offer party will use during the lifetime
     /// of the channel.
     pub party_points: PartyBasePoints,
diff --git a/dlc-manager/src/channel/signed_channel.rs b/dlc-manager/src/channel/signed_channel.rs
index e6b8c7dc..94f42efc 100644
--- a/dlc-manager/src/channel/signed_channel.rs
+++ b/dlc-manager/src/channel/signed_channel.rs
@@ -3,11 +3,13 @@
 //! the possible states in which it can be as well as methods to work with it.
 
 use bitcoin::{Script, Transaction};
+use dlc::DlcChannelId;
 use dlc::PartyParams;
+use dlc::SubChannelId;
 use lightning::ln::chan_utils::CounterpartyCommitmentSecrets;
 use secp256k1_zkp::{ecdsa::Signature, EcdsaAdaptorSignature, PublicKey};
 
-use crate::{ChannelId, ContractId};
+use crate::ContractId;
 
 use super::party_points::PartyBasePoints;
 
@@ -346,12 +348,12 @@ impl SignedChannelState {
 /// A channel that had a successful setup.
 #[derive(Clone)]
 pub struct SignedChannel {
-    /// The [`crate::ChannelId`] for the channel.
-    pub channel_id: ChannelId,
+    /// The [`DlcChannelId`] for the channel.
+    pub channel_id: DlcChannelId,
     /// The [`secp256k1_zkp::PublicKey`] of the counter party's node.
     pub counter_party: PublicKey,
-    /// The temporary [`crate::ChannelId`] for the channel.
-    pub temporary_channel_id: ChannelId,
+    /// The temporary [`DlcChannelId`] for the channel.
+    pub temporary_channel_id: DlcChannelId,
     /// The contract setup parameters for the local party.
     pub own_params: PartyParams,
     /// The base points used for channel updates and revocation by the local party.
@@ -385,7 +387,7 @@ pub struct SignedChannel {
     /// The current fee rate to be used to create transactions.
     pub fee_rate_per_vb: u64,
     /// Whether this channel is embedded within a Lightning Network channel.
-    pub sub_channel_id: Option<ChannelId>,
+    pub sub_channel_id: Option<SubChannelId>,
 }
 
 impl SignedChannel {
diff --git a/dlc-manager/src/channel_updater.rs b/dlc-manager/src/channel_updater.rs
index d8c33cd3..108b90b9 100644
--- a/dlc-manager/src/channel_updater.rs
+++ b/dlc-manager/src/channel_updater.rs
@@ -22,13 +22,14 @@ use crate::{
     },
     error::Error,
     subchannel::{ClosingSubChannel, SubChannel},
-    Blockchain, ChannelId, ContractId, Signer, Time, Wallet,
+    Blockchain, ContractId, Signer, Time, Wallet,
 };
 use bitcoin::{OutPoint, Script, Sequence, Transaction};
 use dlc::{
     channel::{get_tx_adaptor_signature, verify_tx_adaptor_signature, DlcChannelTransactions},
     PartyParams,
 };
+use dlc::{DlcChannelId, SubChannelId};
 use dlc_messages::{
     channel::{
         AcceptChannel, CollaborativeCloseOffer, Reject, RenewAccept, RenewConfirm, RenewFinalize,
@@ -81,7 +82,7 @@ pub(crate) struct SubChannelSignVerifyInfo {
     pub funding_info: FundingInfo,
     pub own_adaptor_sk: SecretKey,
     pub counter_adaptor_pk: PublicKey,
-    pub sub_channel_id: ChannelId,
+    pub sub_channel_id: SubChannelId,
 }
 
 pub(crate) struct SubChannelSignInfo {
@@ -92,7 +93,7 @@ pub(crate) struct SubChannelSignInfo {
 pub(crate) struct SubChannelVerifyInfo {
     pub funding_info: FundingInfo,
     pub counter_adaptor_pk: PublicKey,
-    pub sub_channel_id: ChannelId,
+    pub sub_channel_id: SubChannelId,
 }
 
 /// Creates an [`OfferedChannel`] and an associated [`OfferedContract`] using
@@ -107,7 +108,7 @@ pub fn offer_channel<C: Signing, W: Deref, B: Deref, T: Deref>(
     wallet: &W,
     blockchain: &B,
     time: &T,
-    temporary_channel_id: ContractId,
+    temporary_channel_id: DlcChannelId,
     is_sub_channel: bool,
 ) -> Result<(OfferedChannel, OfferedContract), Error>
 where
@@ -321,8 +322,9 @@ where
     let channel_id = crate::utils::compute_id(
         dlc_transactions.fund.txid(),
         funding_vout as u16,
-        &offered_channel.temporary_channel_id,
+        &offered_channel.temporary_channel_id.inner(),
     );
+    let channel_id = DlcChannelId::from_bytes(channel_id);
 
     let buffer_adaptor_signature = get_tx_adaptor_signature(
         secp,
@@ -534,8 +536,9 @@ where
     let channel_id = crate::utils::compute_id(
         dlc_transactions.fund.txid(),
         fund_output_index as u16,
-        &offered_channel.temporary_channel_id,
+        &offered_channel.temporary_channel_id.inner(),
     );
+    let channel_id = DlcChannelId::from_bytes(channel_id);
 
     let accept_cet_adaptor_signatures: Vec<_> = (&accept_channel.cet_adaptor_signatures).into();
 
@@ -581,7 +584,7 @@ where
     chain_monitor.lock().unwrap().add_tx(
         buffer_transaction.txid(),
         ChannelInfo {
-            channel_id,
+            channel_id: channel_id.inner(),
             tx_type: TxType::BufferTx,
         },
     );
@@ -740,7 +743,7 @@ where
     chain_monitor.lock().unwrap().add_tx(
         accepted_channel.buffer_transaction.txid(),
         ChannelInfo {
-            channel_id: accepted_channel.channel_id,
+            channel_id: accepted_channel.channel_id.inner(),
             tx_type: TxType::BufferTx,
         },
     );
@@ -982,7 +985,7 @@ where
     chain_monitor.lock().unwrap().add_tx(
         settle_tx.txid(),
         ChannelInfo {
-            channel_id: channel.channel_id,
+            channel_id: channel.channel_id.inner(),
             tx_type: TxType::SettleTx,
         },
     );
@@ -1115,7 +1118,7 @@ where
     chain_monitor.lock().unwrap().add_tx(
         settle_tx.txid(),
         ChannelInfo {
-            channel_id: channel.channel_id,
+            channel_id: channel.channel_id.inner(),
             tx_type: TxType::SettleTx,
         },
     );
@@ -1960,7 +1963,7 @@ where
     chain_monitor.lock().unwrap().add_tx(
         buffer_transaction.txid(),
         ChannelInfo {
-            channel_id: signed_channel.channel_id,
+            channel_id: signed_channel.channel_id.inner(),
             tx_type: TxType::BufferTx,
         },
     );
diff --git a/dlc-manager/src/contract/signed_contract.rs b/dlc-manager/src/contract/signed_contract.rs
index f392a892..b341ccc3 100644
--- a/dlc-manager/src/contract/signed_contract.rs
+++ b/dlc-manager/src/contract/signed_contract.rs
@@ -1,9 +1,9 @@
 //! #SignedContract
 
 use crate::conversion_utils::PROTOCOL_VERSION;
-use crate::ChannelId;
 
 use super::accepted_contract::AcceptedContract;
+use dlc::DlcChannelId;
 use dlc_messages::CetAdaptorSignature;
 use dlc_messages::CetAdaptorSignatures;
 use dlc_messages::FundingSignatures;
@@ -22,8 +22,8 @@ pub struct SignedContract {
     pub offer_refund_signature: Signature,
     /// The signatures for the funding inputs of the offering party.
     pub funding_signatures: FundingSignatures,
-    /// The [`ChannelId`] to which the contract was associated if any.
-    pub channel_id: Option<ChannelId>,
+    /// The [`DlcChannelId`] to which the contract was associated if any.
+    pub channel_id: Option<DlcChannelId>,
 }
 
 impl SignedContract {
diff --git a/dlc-manager/src/contract_updater.rs b/dlc-manager/src/contract_updater.rs
index f4f14d41..5e74be53 100644
--- a/dlc-manager/src/contract_updater.rs
+++ b/dlc-manager/src/contract_updater.rs
@@ -3,7 +3,7 @@
 use std::ops::Deref;
 
 use bitcoin::{consensus::Decodable, Script, Transaction, Witness};
-use dlc::{DlcTransactions, PartyParams};
+use dlc::{DlcChannelId, DlcTransactions, PartyParams};
 use dlc_messages::{
     oracle_msgs::{OracleAnnouncement, OracleAttestation},
     AcceptDlc, FundingSignature, FundingSignatures, OfferDlc, SignDlc, WitnessElement,
@@ -20,7 +20,7 @@ use crate::{
     },
     conversion_utils::get_tx_input_infos,
     error::Error,
-    Blockchain, ChannelId, Signer, Time, Wallet,
+    Blockchain, Signer, Time, Wallet,
 };
 
 /// Creates an [`OfferedContract`] and [`OfferDlc`] message from the provided
@@ -300,7 +300,7 @@ pub(crate) fn verify_accepted_and_sign_contract_internal<S: Deref>(
     input_script_pubkey: Option<Script>,
     counter_adaptor_pk: Option<PublicKey>,
     dlc_transactions: &DlcTransactions,
-    channel_id: Option<ChannelId>,
+    channel_id: Option<DlcChannelId>,
 ) -> Result<(SignedContract, Vec<EcdsaAdaptorSignature>), Error>
 where
     S::Target: Signer,
@@ -524,7 +524,7 @@ pub(crate) fn verify_signed_contract_internal<S: Deref>(
     input_script_pubkey: Option<Script>,
     counter_adaptor_pk: Option<PublicKey>,
     signer: &S,
-    channel_id: Option<ChannelId>,
+    channel_id: Option<DlcChannelId>,
 ) -> Result<(SignedContract, Transaction), Error>
 where
     S::Target: Signer,
diff --git a/dlc-manager/src/lib.rs b/dlc-manager/src/lib.rs
index fe6c2240..1f82d345 100644
--- a/dlc-manager/src/lib.rs
+++ b/dlc-manager/src/lib.rs
@@ -47,6 +47,7 @@ use channel::signed_channel::{SignedChannel, SignedChannelStateType};
 use channel::Channel;
 use contract::PreClosedContract;
 use contract::{offered_contract::OfferedContract, signed_contract::SignedContract, Contract};
+use dlc::{DlcChannelId, SubChannelId};
 use dlc_messages::oracle_msgs::{OracleAnnouncement, OracleAttestation};
 use dlc_messages::ser_impls::{read_address, write_address};
 use error::Error;
@@ -60,9 +61,6 @@ use subchannel::SubChannel;
 /// Type alias for a contract id.
 pub type ContractId = [u8; 32];
 
-/// Type alias for a channel id.
-pub type ChannelId = [u8; 32];
-
 /// Time trait to provide current unix time. Mainly defined to facilitate testing.
 pub trait Time {
     /// Must return the unix epoch corresponding to the current time.
@@ -154,10 +152,10 @@ pub trait Storage {
     /// Update the state of the channel and optionally its associated contract
     /// atomically.
     fn upsert_channel(&self, channel: Channel, contract: Option<Contract>) -> Result<(), Error>;
-    /// Delete the channel with given [`ChannelId`] if any.
-    fn delete_channel(&self, channel_id: &ChannelId) -> Result<(), Error>;
-    /// Returns the channel with given [`ChannelId`] if any.
-    fn get_channel(&self, channel_id: &ChannelId) -> Result<Option<Channel>, Error>;
+    /// Delete the channel with given [`DlcChannelId`] if any.
+    fn delete_channel(&self, channel_id: &DlcChannelId) -> Result<(), Error>;
+    /// Returns the channel with given [`DlcChannelId`] if any.
+    fn get_channel(&self, channel_id: &DlcChannelId) -> Result<Option<Channel>, Error>;
     /// Returns the set of [`SignedChannel`] in the store. Returns only the one
     /// with matching `channel_state` if set.
     fn get_signed_channels(
@@ -172,8 +170,8 @@ pub trait Storage {
     fn get_chain_monitor(&self) -> Result<Option<ChainMonitor>, Error>;
     /// Creates or updates a [`SubChannel`].
     fn upsert_sub_channel(&self, subchannel: &SubChannel) -> Result<(), Error>;
-    /// Returns the [`SubChannel`] with given `channel_id` if it exists.
-    fn get_sub_channel(&self, channel_id: ChannelId) -> Result<Option<SubChannel>, Error>;
+    /// Returns the [`SubChannel`] with given [`ChannelId`] if it exists.
+    fn get_sub_channel(&self, channel_id: SubChannelId) -> Result<Option<SubChannel>, Error>;
     /// Return all the [`SubChannel`] within the store.
     fn get_sub_channels(&self) -> Result<Vec<SubChannel>, Error>;
     /// Returns all the [`SubChannel`] in the `Offered` state.
diff --git a/dlc-manager/src/manager.rs b/dlc-manager/src/manager.rs
index 8cda0681..164d1353 100644
--- a/dlc-manager/src/manager.rs
+++ b/dlc-manager/src/manager.rs
@@ -18,10 +18,11 @@ use crate::error::Error;
 use crate::sub_channel_manager::get_sub_channel_in_state;
 use crate::subchannel::{ClosingSubChannel, SubChannel, SubChannelState};
 use crate::utils::get_object_in_state;
-use crate::{ChannelId, ContractId, Signer};
+use crate::{ContractId, Signer};
 use bitcoin::consensus::encode::serialize_hex;
 use bitcoin::Address;
 use bitcoin::Transaction;
+use dlc::DlcChannelId;
 use dlc_messages::channel::{
     AcceptChannel, CollaborativeCloseOffer, OfferChannel, Reject, RenewAccept, RenewConfirm,
     RenewFinalize, RenewOffer, RenewRevoke, SettleAccept, SettleConfirm, SettleFinalize,
@@ -130,8 +131,8 @@ macro_rules! check_for_timed_out_channels {
                 if is_timed_out {
                     let sub_channel = if channel.is_sub_channel() {
                         log::info!(
-                            "Skipping force-closure of subchannel {}: not supported",
-                            bitcoin::hashes::hex::ToHex::to_hex(&channel.channel_id[..])
+                            "Skipping force-closure of subchannel {:?}: not supported",
+                            channel.channel_id
                         );
                         continue;
 
@@ -787,6 +788,9 @@ where
             .map(|x| self.get_oracle_announcements(&x.oracles))
             .collect::<Result<Vec<_>, Error>>()?;
 
+        let channel_id = crate::utils::get_new_temporary_id();
+        let channel_id = DlcChannelId::from_bytes(channel_id);
+
         let (offered_channel, offered_contract) = crate::channel_updater::offer_channel(
             &self.secp,
             contract_input,
@@ -797,7 +801,7 @@ where
             &self.wallet,
             &self.blockchain,
             &self.time,
-            crate::utils::get_new_temporary_id(),
+            channel_id,
             false,
         )?;
 
@@ -812,12 +816,12 @@ where
     }
 
     /// Accept a channel that was offered. Returns the [`dlc_messages::channel::AcceptChannel`]
-    /// message to be sent, the updated [`crate::ChannelId`] and [`crate::ContractId`],
+    /// message to be sent, the updated [`DlcChannelId`] and [`crate::ContractId`],
     /// as well as the public key of the offering node.
     pub fn accept_channel(
         &self,
-        channel_id: &ChannelId,
-    ) -> Result<(AcceptChannel, ChannelId, ContractId, PublicKey), Error> {
+        channel_id: &DlcChannelId,
+    ) -> Result<(AcceptChannel, DlcChannelId, ContractId, PublicKey), Error> {
         let offered_channel =
             get_channel_in_state!(self, channel_id, Offered, None as Option<PublicKey>)?;
 
@@ -860,8 +864,8 @@ where
         Ok((accept_channel, channel_id, contract_id, counter_party))
     }
 
-    /// Force close the channel with given [`crate::ChannelId`].
-    pub fn force_close_channel(&self, channel_id: &ChannelId) -> Result<(), Error> {
+    /// Force close the channel with given [`DlcChannelId`].
+    pub fn force_close_channel(&self, channel_id: &DlcChannelId) -> Result<(), Error> {
         let channel = get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
 
         self.force_close_channel_internal(channel, None, true)
@@ -872,7 +876,7 @@ where
     /// message to be sent and the public key of the counter party node.
     pub fn settle_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
         counter_payout: u64,
     ) -> Result<(SettleOffer, PublicKey), Error> {
         let mut signed_channel =
@@ -899,7 +903,7 @@ where
     /// sent to the node with the returned [`PublicKey`] id.
     pub fn accept_settle_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
     ) -> Result<(SettleAccept, PublicKey), Error> {
         let mut signed_channel =
             get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
@@ -944,7 +948,7 @@ where
     /// channel.
     pub fn renew_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
         counter_payout: u64,
         contract_input: &ContractInput,
     ) -> Result<(RenewOffer, PublicKey), Error> {
@@ -985,7 +989,7 @@ where
     /// [`PublicKey`] as node id.
     pub fn accept_renew_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
     ) -> Result<(RenewAccept, PublicKey), Error> {
         let mut signed_channel =
             get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
@@ -1023,7 +1027,10 @@ where
     /// Reject an offer to renew the contract in the channel. Returns the
     /// [`Reject`] message to be sent to the peer with the returned
     /// [`PublicKey`] node id.
-    pub fn reject_renew_offer(&self, channel_id: &ChannelId) -> Result<(Reject, PublicKey), Error> {
+    pub fn reject_renew_offer(
+        &self,
+        channel_id: &DlcChannelId,
+    ) -> Result<(Reject, PublicKey), Error> {
         let mut signed_channel =
             get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
         let offered_contract_id = signed_channel.get_contract_id().ok_or_else(|| {
@@ -1056,7 +1063,7 @@ where
     /// proposed settle offer.
     pub fn reject_settle_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
     ) -> Result<(Reject, PublicKey), Error> {
         let mut signed_channel =
             get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
@@ -1077,7 +1084,7 @@ where
     /// not broadcast the close transaction.
     pub fn offer_collaborative_close(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
         counter_payout: u64,
     ) -> Result<CollaborativeCloseOffer, Error> {
         let mut signed_channel =
@@ -1094,7 +1101,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             close_tx.txid(),
             ChannelInfo {
-                channel_id: *channel_id,
+                channel_id: channel_id.inner(),
                 tx_type: TxType::CollaborativeClose,
             },
         );
@@ -1109,7 +1116,7 @@ where
 
     /// Accept an offer to collaboratively close the channel. The close transaction
     /// will be broadcast and the state of the channel updated.
-    pub fn accept_collaborative_close(&self, channel_id: &ChannelId) -> Result<(), Error> {
+    pub fn accept_collaborative_close(&self, channel_id: &DlcChannelId) -> Result<(), Error> {
         let signed_channel =
             get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
 
@@ -1202,7 +1209,7 @@ where
             self.chain_monitor
                 .lock()
                 .unwrap()
-                .cleanup_channel(signed_channel.channel_id);
+                .cleanup_channel(signed_channel.channel_id.inner());
 
             self.store
                 .upsert_channel(closed_channel, Some(closed_contract))?;
@@ -1487,7 +1494,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             prev_buffer_txid,
             ChannelInfo {
-                channel_id: signed_channel.channel_id,
+                channel_id: signed_channel.channel_id.inner(),
                 tx_type: TxType::Revoked {
                     update_idx: signed_channel.update_idx + 1,
                     own_adaptor_signature: own_buffer_adaptor_signature,
@@ -1542,7 +1549,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             buffer_txid,
             ChannelInfo {
-                channel_id: signed_channel.channel_id,
+                channel_id: signed_channel.channel_id.inner(),
                 tx_type: TxType::Revoked {
                     update_idx: signed_channel.update_idx + 1,
                     own_adaptor_signature: own_buffer_adaptor_signature,
@@ -1756,7 +1763,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             prev_tx_id,
             ChannelInfo {
-                channel_id: signed_channel.channel_id,
+                channel_id: signed_channel.channel_id.inner(),
                 tx_type,
             },
         );
@@ -1862,7 +1869,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             prev_tx_id,
             ChannelInfo {
-                channel_id: signed_channel.channel_id,
+                channel_id: signed_channel.channel_id.inner(),
                 tx_type,
             },
         );
@@ -1873,7 +1880,7 @@ where
         self.chain_monitor.lock().unwrap().add_tx(
             buffer_tx.txid(),
             ChannelInfo {
-                channel_id: signed_channel.channel_id,
+                channel_id: signed_channel.channel_id.inner(),
                 tx_type: TxType::BufferTx,
             },
         );
@@ -1976,7 +1983,7 @@ where
         for (tx, channel_info) in watched_txs {
             let mut signed_channel = match get_channel_in_state!(
                 self,
-                &channel_info.channel_id,
+                &DlcChannelId::from_bytes(channel_info.channel_id),
                 Signed,
                 None as Option<PublicKey>
             ) {
@@ -2167,7 +2174,7 @@ where
                     self.chain_monitor
                         .lock()
                         .unwrap()
-                        .cleanup_channel(signed_channel.channel_id);
+                        .cleanup_channel(signed_channel.channel_id.inner());
                     self.store.upsert_channel(closed_channel, None)?;
                     true
                 }
@@ -2197,7 +2204,7 @@ where
                     self.chain_monitor
                         .lock()
                         .unwrap()
-                        .cleanup_channel(signed_channel.channel_id);
+                        .cleanup_channel(signed_channel.channel_id.inner());
                     self.store.upsert_channel(closed_channel, None)?;
                     true
                 }
@@ -2210,7 +2217,7 @@ where
                     self.chain_monitor
                         .lock()
                         .unwrap()
-                        .cleanup_channel(signed_channel.channel_id);
+                        .cleanup_channel(signed_channel.channel_id.inner());
                     self.store.upsert_channel(closed_channel, None)?;
                     true
                 }
@@ -2247,7 +2254,7 @@ where
                     self.chain_monitor
                         .lock()
                         .unwrap()
-                        .cleanup_channel(signed_channel.channel_id);
+                        .cleanup_channel(signed_channel.channel_id.inner());
 
                     let pre_closed_contract = contract_id
                         .map(|contract_id| {
@@ -2297,7 +2304,7 @@ where
 
     pub(crate) fn force_close_sub_channel(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &DlcChannelId,
         sub_channel: (SubChannel, &ClosingSubChannel),
     ) -> Result<(), Error> {
         let channel = get_channel_in_state!(self, channel_id, Signed, None as Option<PublicKey>)?;
@@ -2437,7 +2444,7 @@ where
         self.chain_monitor
             .lock()
             .unwrap()
-            .cleanup_channel(signed_channel.channel_id);
+            .cleanup_channel(signed_channel.channel_id.inner());
 
         self.store.upsert_channel(closed_channel, None)?;
 
@@ -2448,7 +2455,7 @@ where
     /// collaboratively closed.
     pub(crate) fn get_closed_sub_dlc_channel(
         &self,
-        channel_id: ChannelId,
+        channel_id: DlcChannelId,
         own_balance: u64,
     ) -> Result<(Channel, Option<Contract>), Error> {
         let channel = get_channel_in_state!(self, &channel_id, Signed, None::<PublicKey>)?;
diff --git a/dlc-manager/src/sub_channel_manager.rs b/dlc-manager/src/sub_channel_manager.rs
index 5f0f386b..bae3bd9d 100644
--- a/dlc-manager/src/sub_channel_manager.rs
+++ b/dlc-manager/src/sub_channel_manager.rs
@@ -3,11 +3,8 @@
 
 use std::{collections::HashMap, marker::PhantomData, ops::Deref, sync::Mutex};
 
-use bitcoin::{
-    consensus::encode::serialize_hex, hashes::hex::ToHex, OutPoint, PackedLockTime, Script,
-    Sequence, Transaction,
-};
-use dlc::{channel::sub_channel::LN_GLUE_TX_WEIGHT, PartyParams};
+use bitcoin::{hashes::hex::ToHex, OutPoint, PackedLockTime, Script, Sequence, Transaction};
+use dlc::{channel::sub_channel::LN_GLUE_TX_WEIGHT, DlcChannelId, PartyParams, SubChannelId};
 use dlc_messages::{
     channel::{AcceptChannel, OfferChannel},
     oracle_msgs::OracleAnnouncement,
@@ -28,8 +25,9 @@ use lightning::{
         },
         channelmanager::ChannelDetails,
         msgs::{ChannelMessageHandler, DecodeError, RevokeAndACK},
+        ChannelId,
     },
-    sign::ChannelSigner,
+    sign::{ChannelSigner, SignerProvider},
     util::{
         errors::APIError,
         ser::{Readable, Writeable, Writer},
@@ -51,12 +49,12 @@ use crate::{
     error::Error,
     manager::{get_channel_in_state, get_contract_in_state, Manager, CET_NSEQUENCE},
     subchannel::{
-        self, generate_temporary_channel_id, AcceptedSubChannel, CloseAcceptedSubChannel,
+        generate_temporary_dlc_channel_id, AcceptedSubChannel, CloseAcceptedSubChannel,
         CloseConfirmedSubChannel, CloseOfferedSubChannel, ClosingSubChannel, ConfirmedSubChannel,
         LNChainMonitor, LNChannelManager, LnDlcChannelSigner, LnDlcSignerProvider,
         OfferedSubChannel, ReestablishFlag, SignedSubChannel, SubChannel, SubChannelState,
     },
-    Blockchain, ChannelId, ContractId, Oracle, Signer, Storage, Time, Wallet,
+    Blockchain, Oracle, Signer, Storage, Time, Wallet,
 };
 
 const INITIAL_SPLIT_NUMBER: u64 = (1 << 48) - 1;
@@ -111,7 +109,7 @@ pub enum Action {
     /// The sub channel with specified `channel_id` should be re-accepted.
     ReAccept {
         /// The id of the sub channel.
-        channel_id: ChannelId,
+        channel_id: SubChannelId,
         /// The parameters originally generated by the local node.
         party_params: PartyParams,
         /// The inputs originally selected by the local node.
@@ -123,14 +121,14 @@ pub enum Action {
     },
     /// The given sub channel should be moved to the signed state as the revoke and ack must have
     /// been given by the peer during the reestablishment of the LN channel.
-    ForceSign(ChannelId),
+    ForceSign(SubChannelId),
     /// The included [`SubChannelCloseOffer`] message shoud be re-submitted to the peer with
     /// included public key.
     ResendCloseOffer((SubChannelCloseOffer, PublicKey)),
     /// The sub channel with specified `channel_id` should be re-accepted.
     ReAcceptCloseOffer {
         /// The id of the sub channel.
-        channel_id: ChannelId,
+        channel_id: SubChannelId,
         /// The balance of the local party in the DLC sub channel for settling it.
         own_balance: u64,
     },
@@ -171,9 +169,10 @@ pub struct SubChannelManager<
     CS: ChannelSigner,
     SP: Deref,
     LCS: LnDlcChannelSigner,
+    K: Deref,
 > where
     W::Target: Wallet,
-    M::Target: LNChannelManager<CS>,
+    M::Target: LNChannelManager<K>,
     C::Target: LNChainMonitor,
     S::Target: Storage,
     B::Target: Blockchain,
@@ -181,14 +180,16 @@ pub struct SubChannelManager<
     T::Target: Time,
     F::Target: FeeEstimator,
     SP::Target: LnDlcSignerProvider<LCS>,
+    K::Target: SignerProvider,
 {
     ln_channel_manager: M,
     dlc_channel_manager: D,
     actions: Mutex<Vec<Action>>,
     ln_chain_monitor: C,
-    phantom: std::marker::PhantomData<CS>,
+    phantom_cs: std::marker::PhantomData<CS>,
     signer_provider: SP,
     ln_channel_signers: Mutex<HashMap<ChannelId, LCS>>,
+    phantom_k: std::marker::PhantomData<K>,
 }
 
 impl<
@@ -200,20 +201,22 @@ impl<
         O: Deref,
         T: Deref,
         F: Deref,
+        K: Deref,
         D: Deref<Target = Manager<W, B, S, O, T, F>>,
         CS: ChannelSigner,
         SP: Deref,
         LCS: LnDlcChannelSigner,
-    > SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS>
+    > SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS, K>
 where
     W::Target: Wallet,
-    M::Target: LNChannelManager<CS>,
+    M::Target: LNChannelManager<K>,
     C::Target: LNChainMonitor,
     S::Target: Storage,
     B::Target: Blockchain,
     O::Target: Oracle,
     T::Target: Time,
     F::Target: FeeEstimator,
+    K::Target: SignerProvider,
     SP::Target: LnDlcSignerProvider<LCS>,
 {
     /// Creates a new [`SubChannelManager`].
@@ -228,10 +231,11 @@ where
             ln_channel_manager,
             dlc_channel_manager,
             actions: Mutex::new(actions),
-            phantom: PhantomData,
+            phantom_cs: PhantomData,
             ln_chain_monitor,
             signer_provider,
             ln_channel_signers: Mutex::new(HashMap::new()),
+            phantom_k: PhantomData,
         })
     }
 
@@ -294,14 +298,14 @@ where
     /// Returns a [`SubChannelOffer`] message to be sent to the counter party.
     pub fn offer_sub_channel(
         &self,
-        channel_id: &[u8; 32],
+        channel_id: SubChannelId,
         contract_input: &ContractInput,
         oracle_announcements: &[Vec<OracleAnnouncement>],
     ) -> Result<SubChannelOffer, Error> {
         // TODO(tibo): deal with already split channel
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(channel_id)
+            .get_channel_details(&channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!("Unknown LN channel {channel_id:02x?}"))
             })?;
@@ -310,7 +314,7 @@ where
             match self
                 .dlc_channel_manager
                 .get_store()
-                .get_sub_channel(channel_details.channel_id)?
+                .get_sub_channel(channel_details.channel_id.into())?
             {
                 Some(mut s) => match s.state {
                     SubChannelState::OffChainClosed => {
@@ -359,8 +363,7 @@ where
         let per_split_seed_pk =
             PublicKey::from_secret_key(self.dlc_channel_manager.get_secp(), &per_split_seed);
 
-        let temporary_channel_id: ContractId =
-            subchannel::generate_temporary_channel_id(*channel_id, update_idx, 0);
+        let temporary_channel_id = generate_temporary_dlc_channel_id(channel_id, update_idx, 0);
 
         let (offered_channel, mut offered_contract) = crate::channel_updater::offer_channel(
             self.dlc_channel_manager.get_secp(),
@@ -395,7 +398,7 @@ where
                     self.dlc_channel_manager.get_wallet(),
                 )?;
                 SubChannel {
-                    channel_id: channel_details.channel_id,
+                    channel_id: channel_details.channel_id.into(),
                     counter_party: channel_details.counterparty.node_id,
                     per_split_seed: Some(per_split_seed_pk),
                     fee_rate_per_vb: contract_input.fee_rate,
@@ -417,7 +420,7 @@ where
         };
 
         let msg = SubChannelOffer {
-            channel_id: channel_details.channel_id,
+            channel_id: channel_details.channel_id.into(),
             next_per_split_point,
             revocation_basepoint: sub_channel.own_base_points.revocation_basepoint,
             publish_basepoint: sub_channel.own_base_points.publish_basepoint,
@@ -451,14 +454,14 @@ where
     /// by the given [`ChannelId`].
     pub fn accept_sub_channel(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &SubChannelId,
     ) -> Result<(PublicKey, SubChannelAccept), Error> {
         self.accept_sub_channel_internal(channel_id, None)
     }
 
     fn accept_sub_channel_internal(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &SubChannelId,
         params: Option<(
             PartyParams,
             Vec<FundingInputInfo>,
@@ -476,12 +479,12 @@ where
 
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(channel_id)
+            .get_channel_details(&channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!("Unknown LN channel {channel_id:02x?}"))
             })?;
         let msg = self.ln_channel_manager.with_useable_channel_lock(
-            channel_id,
+            &channel_id.into(),
             &counter_party,
             None,
             |channel_lock| {
@@ -690,7 +693,7 @@ where
                     .add_tx(
                         split_tx.transaction.txid(),
                         ChannelInfo {
-                            channel_id: offered_sub_channel.channel_id,
+                            channel_id: offered_sub_channel.channel_id.inner(),
                             tx_type: TxType::SplitTx,
                         },
                     );
@@ -724,7 +727,7 @@ where
     }
 
     /// Start force closing the sub channel with given [`ChannelId`].
-    pub fn force_close_sub_channel(&self, channel_id: &ChannelId) -> Result<(), Error> {
+    pub fn force_close_sub_channel(&self, channel_id: &SubChannelId) -> Result<(), Error> {
         let sub_channel = self
             .dlc_channel_manager
             .get_store()
@@ -772,7 +775,7 @@ where
             // reacts properly during the closing process.
             SubChannelState::CloseAccepted(c) => {
                 self.ln_channel_manager.with_channel_lock_no_check(
-                    &sub_channel.channel_id,
+                    &sub_channel.channel_id.into(),
                     &sub_channel.counter_party,
                     |channel_lock| {
                         self.ln_channel_manager.set_funding_outpoint(
@@ -820,7 +823,7 @@ where
         let (closed_channel, closed_contract) =
             self.get_closed_dlc_channel_and_contract(dlc_channel_id, false)?;
         self.ln_channel_manager
-            .force_close_channel(&sub_channel.channel_id, &sub_channel.counter_party)?;
+            .force_close_channel(&sub_channel.channel_id.into(), &sub_channel.counter_party)?;
         sub_channel.state = SubChannelState::OnChainClosed;
         self.dlc_channel_manager
             .get_store()
@@ -831,8 +834,8 @@ where
         //TODO(tibo): this is actually unsafe, we shouldn't clean up the chain monitor before
         //having the commitment transaction confirmed on chain.
         let mut chain_monitor = self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-        chain_monitor.cleanup_channel(sub_channel.channel_id);
-        chain_monitor.cleanup_channel(dlc_channel_id);
+        chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
+        chain_monitor.cleanup_channel(dlc_channel_id.inner());
         self.dlc_channel_manager
             .get_store()
             .persist_chain_monitor(&chain_monitor)
@@ -863,8 +866,8 @@ where
             .get_store()
             .upsert_sub_channel(&sub_channel)?;
         let mut chain_monitor = self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-        chain_monitor.cleanup_channel(sub_channel.channel_id);
-        chain_monitor.cleanup_channel(dlc_channel_id);
+        chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
+        chain_monitor.cleanup_channel(dlc_channel_id.inner());
         self.dlc_channel_manager
             .get_store()
             .persist_chain_monitor(&chain_monitor)?;
@@ -932,7 +935,7 @@ where
     }
 
     /// Finalize the closing of the sub channel with specified [`ChannelId`].
-    fn finalize_force_close_sub_channels(&self, channel_id: &ChannelId) -> Result<(), Error> {
+    fn finalize_force_close_sub_channels(&self, channel_id: &SubChannelId) -> Result<(), Error> {
         let (mut closing, state) = get_sub_channel_in_state!(
             self.dlc_channel_manager,
             *channel_id,
@@ -1046,7 +1049,7 @@ where
             }
         } else if let Err(e) = self
             .ln_channel_manager
-            .force_close_channel(channel_id, &counter_party)
+            .force_close_channel(&channel_id.into(), &counter_party)
         {
             error!("Error force closing LN side of channel: {}", e);
         };
@@ -1058,7 +1061,7 @@ where
         };
 
         let mut chain_monitor = self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-        chain_monitor.cleanup_channel(closing.channel_id);
+        chain_monitor.cleanup_channel(closing.channel_id.inner());
         self.dlc_channel_manager
             .get_store()
             .persist_chain_monitor(&chain_monitor)?;
@@ -1080,7 +1083,7 @@ where
         let mut sub_channel = self
             .dlc_channel_manager
             .get_store()
-            .get_sub_channel(channel_id)?
+            .get_sub_channel(channel_id.into())?
             .ok_or(Error::InvalidParameters(format!(
                 "No channel with id {:?} found",
                 channel_id
@@ -1103,14 +1106,14 @@ where
                     sub_channel.state = SubChannelState::CounterOnChainClosed;
                     let mut chain_monitor =
                         self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                    chain_monitor.cleanup_channel(sub_channel.channel_id);
-                    chain_monitor.cleanup_channel(dlc_channel_id);
+                    chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
+                    chain_monitor.cleanup_channel(dlc_channel_id.inner());
                     (Some(closed_channel), Some(closed_contract))
                 }
                 SubChannelState::OffChainClosed => {
                     let mut chain_monitor =
                         self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                    chain_monitor.cleanup_channel(sub_channel.channel_id);
+                    chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
                     sub_channel.state = SubChannelState::CounterOnChainClosed;
                     (None, None)
                 }
@@ -1119,7 +1122,7 @@ where
                 | SubChannelState::CloseOffered(_)
                 | SubChannelState::OnChainClosed
                 | SubChannelState::CounterOnChainClosed => {
-                    info!("Got notification of LN channel ({}) closure by counter party in state {} where we do not have to react.", serialize_hex(&channel_id), sub_channel.state);
+                    info!("Got notification of LN channel ({}) closure by counter party in state {} where we do not have to react.", channel_id.to_hex(), sub_channel.state);
                     return Ok(());
                 }
                 SubChannelState::ClosedPunished(_) => {
@@ -1145,14 +1148,14 @@ where
                         sub_channel.state = SubChannelState::OnChainClosed;
                         let mut chain_monitor =
                             self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                        chain_monitor.cleanup_channel(sub_channel.channel_id);
-                        chain_monitor.cleanup_channel(dlc_channel_id);
+                        chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
+                        chain_monitor.cleanup_channel(dlc_channel_id.inner());
                         (Some(closed_channel), Some(closed_contract))
                     }
                     SubChannelState::OffChainClosed => {
                         let mut chain_monitor =
                             self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                        chain_monitor.cleanup_channel(sub_channel.channel_id);
+                        chain_monitor.cleanup_channel(sub_channel.channel_id.inner());
                         sub_channel.state = SubChannelState::OnChainClosed;
                         (None, None)
                     }
@@ -1240,6 +1243,10 @@ where
                 );
                 return Ok(());
             }
+            ClosureReason::FundingBatchClosure => {
+                info!("Channel {channel_id:?} closed due to funding batch closure.");
+                return Ok(());
+            }
         };
 
         if let Some(channel) = updated_channel {
@@ -1262,7 +1269,7 @@ where
     /// Generates an offer to collaboratively close a sub channel off chain, updating its state.
     pub fn offer_subchannel_close(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &SubChannelId,
         accept_balance: u64,
     ) -> Result<(SubChannelCloseOffer, PublicKey), Error> {
         let (mut signed_subchannel, state) = get_sub_channel_in_state!(
@@ -1342,7 +1349,7 @@ where
     /// Accept an offer to collaboratively close a sub channel off chain, updating its state.
     pub fn accept_subchannel_close_offer(
         &self,
-        channel_id: &ChannelId,
+        channel_id: &SubChannelId,
     ) -> Result<(SubChannelCloseAccept, PublicKey), Error> {
         let (mut sub_channel, state) = get_sub_channel_in_state!(
             self.dlc_channel_manager,
@@ -1359,12 +1366,12 @@ where
 
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(channel_id)
+            .get_channel_details(&channel_id.into())
             .ok_or_else(|| Error::InvalidParameters(format!("Unknown channel {channel_id:?}")))?;
 
         let ((commitment_signed, commit_tx_number), commitment_transactions) =
             self.ln_channel_manager.with_useable_channel_lock(
-                channel_id,
+                &channel_id.into(),
                 &sub_channel.counter_party,
                 None,
                 |channel_lock| {
@@ -1445,7 +1452,7 @@ where
     }
 
     /// Reject an offer to establish a sub channel.
-    pub fn reject_sub_channel_offer(&self, channel_id: ChannelId) -> Result<Reject, Error> {
+    pub fn reject_sub_channel_offer(&self, channel_id: SubChannelId) -> Result<Reject, Error> {
         let (mut sub_channel, _) = get_sub_channel_in_state!(
             self.dlc_channel_manager,
             channel_id,
@@ -1463,7 +1470,10 @@ where
     }
 
     /// Reject an offer to collaboratively close a sub channel off chain.
-    pub fn reject_sub_channel_close_offer(&self, channel_id: ChannelId) -> Result<Reject, Error> {
+    pub fn reject_sub_channel_close_offer(
+        &self,
+        channel_id: SubChannelId,
+    ) -> Result<Reject, Error> {
         let (mut sub_channel, state) = get_sub_channel_in_state!(
             self.dlc_channel_manager,
             channel_id,
@@ -1483,7 +1493,7 @@ where
     /// Moves the sub channel to the `[SubChannelState::Signed]` state when a disconnection happens while the peer is waiting for
     /// the revocation message from the remote node (the revocation secret must have been given by the remote node during the
     /// reestablishment protocol).
-    fn mark_channel_signed(&self, channel_id: ChannelId) -> Result<(), Error> {
+    fn mark_channel_signed(&self, channel_id: SubChannelId) -> Result<(), Error> {
         let (mut signed_sub_channel, state) = get_sub_channel_in_state!(
             self.dlc_channel_manager,
             channel_id,
@@ -1535,7 +1545,7 @@ where
     ) -> Result<(), Error> {
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(&sub_channel_offer.channel_id)
+            .get_channel_details(&sub_channel_offer.channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!(
                     "Unknown channel {:02x?}",
@@ -1547,7 +1557,7 @@ where
             match self
                 .dlc_channel_manager
                 .get_store()
-                .get_sub_channel(channel_details.channel_id)?
+                .get_sub_channel(channel_details.channel_id.into())?
             {
                 Some(mut s) => match s.state {
                     SubChannelState::OffChainClosed => {
@@ -1584,7 +1594,7 @@ where
                 s
             }
             None => SubChannel {
-                channel_id: channel_details.channel_id,
+                channel_id: channel_details.channel_id.into(),
                 counter_party: channel_details.counterparty.node_id,
                 per_split_seed: None,
                 fee_rate_per_vb: sub_channel_offer.fee_rate_per_vbyte,
@@ -1611,8 +1621,11 @@ where
             },
         };
 
-        let temporary_channel_id =
-            generate_temporary_channel_id(channel_details.channel_id, sub_channel.update_idx, 0);
+        let temporary_channel_id = generate_temporary_dlc_channel_id(
+            channel_details.channel_id.into(),
+            sub_channel.update_idx,
+            0,
+        );
 
         let temporary_contract_id =
             generate_temporary_contract_id(temporary_channel_id, INITIAL_SPLIT_NUMBER);
@@ -1671,7 +1684,7 @@ where
 
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(&sub_channel_accept.channel_id)
+            .get_channel_details(&sub_channel_accept.channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!(
                     "Unknown LN channel {:02x?}",
@@ -1788,7 +1801,7 @@ where
             Some(sub_channel_accept.commit_tx_number),
             |channel_lock| {
                 let split_tx_adaptor_signature = self.get_holder_split_tx_adaptor_signature(
-                    *channel_id,
+                    channel_id.into(),
                     channel_details.channel_value_satoshis,
                     channel_details.channel_keys_id,
                     &split_tx.transaction,
@@ -1908,7 +1921,7 @@ where
             .add_tx(
                 split_tx.transaction.txid(),
                 ChannelInfo {
-                    channel_id: offered_sub_channel.channel_id,
+                    channel_id: offered_sub_channel.channel_id.inner(),
                     tx_type: TxType::SplitTx,
                 },
             );
@@ -1953,7 +1966,7 @@ where
     ) -> Result<SubChannelFinalize, Error> {
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(&sub_channel_confirm.channel_id)
+            .get_channel_details(&sub_channel_confirm.channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!(
                     "Unknown LN channel {:02x?}",
@@ -1961,7 +1974,7 @@ where
                 ))
             })?;
         let msg = self.ln_channel_manager.with_useable_channel_lock(
-            &sub_channel_confirm.channel_id,
+            &sub_channel_confirm.channel_id.into(),
             counter_party,
             Some(sub_channel_confirm.commit_tx_number),
             |channel_lock| {
@@ -2026,7 +2039,8 @@ where
                 )?;
 
                 let sign_channel = dlc_messages::channel::SignChannel {
-                    channel_id: sub_channel_confirm.channel_id,
+                    // NOTE: I think this was wrong before!
+                    channel_id: dlc_channel_id,
                     cet_adaptor_signatures: sub_channel_confirm.cet_adaptor_signatures.clone(),
                     buffer_adaptor_signature: sub_channel_confirm.buffer_adaptor_signature,
                     refund_signature: sub_channel_confirm.refund_signature,
@@ -2122,7 +2136,7 @@ where
     ) -> Result<SubChannelRevoke, Error> {
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(&sub_channel_finalize.channel_id)
+            .get_channel_details(&sub_channel_finalize.channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!(
                     "Unknown LN channel {:02x?}",
@@ -2130,7 +2144,7 @@ where
                 ))
             })?;
         let msg = self.ln_channel_manager.with_useable_channel_lock(
-            &sub_channel_finalize.channel_id,
+            &sub_channel_finalize.channel_id.into(),
             counter_party,
             None,
             |channel_lock| {
@@ -2190,7 +2204,7 @@ where
                     Some(*counter_party)
                 )?;
                 let raa = RevokeAndACK {
-                    channel_id: sub_channel_finalize.channel_id,
+                    channel_id: sub_channel_finalize.channel_id.into(),
                     per_commitment_secret: sub_channel_finalize
                         .per_commitment_secret
                         .secret_bytes(),
@@ -2239,7 +2253,7 @@ where
         counter_party: &PublicKey,
     ) -> Result<(), Error> {
         self.ln_channel_manager.with_useable_channel_lock(
-            &sub_channel_revoke.channel_id,
+            &sub_channel_revoke.channel_id.into(),
             counter_party,
             None,
             |channel_lock| {
@@ -2251,7 +2265,7 @@ where
                 )?;
 
                 let raa = RevokeAndACK {
-                    channel_id: sub_channel_revoke.channel_id,
+                    channel_id: sub_channel_revoke.channel_id.into(),
                     per_commitment_secret: sub_channel_revoke.per_commitment_secret.secret_bytes(),
                     next_per_commitment_point: sub_channel_revoke.next_per_commitment_point,
                 };
@@ -2364,12 +2378,12 @@ where
     ) -> Result<SubChannelCloseConfirm, Error> {
         let channel_details = self
             .ln_channel_manager
-            .get_channel_details(&accept.channel_id)
+            .get_channel_details(&accept.channel_id.into())
             .ok_or_else(|| {
                 Error::InvalidParameters(format!("Unknown channel {:?}", accept.channel_id))
             })?;
         let close_confirm = self.ln_channel_manager.with_useable_channel_lock(
-            &accept.channel_id,
+            &accept.channel_id.into(),
             counter_party,
             Some(accept.commit_tx_number),
             |channel_lock| {
@@ -2472,7 +2486,7 @@ where
         counter_party: &PublicKey,
     ) -> Result<SubChannelCloseFinalize, Error> {
         let finalize = self.ln_channel_manager.with_useable_channel_lock(
-            &confirm.channel_id,
+            &confirm.channel_id.into(),
             counter_party,
             Some(confirm.commit_tx_number),
             |channel_lock| {
@@ -2516,7 +2530,7 @@ where
                     })?;
 
                 let raa = RevokeAndACK {
-                    channel_id: confirm.channel_id,
+                    channel_id: confirm.channel_id.into(),
                     per_commitment_secret: *confirm.commit_revocation_secret.as_ref(),
                     next_per_commitment_point: confirm.next_per_commitment_point,
                 };
@@ -2561,7 +2575,7 @@ where
                     .add_tx(
                         state.signed_subchannel.split_tx.transaction.txid(),
                         ChannelInfo {
-                            channel_id: sub_channel.channel_id,
+                            channel_id: sub_channel.channel_id.inner(),
                             tx_type: TxType::Revoked {
                                 update_idx: sub_channel.update_idx,
                                 own_adaptor_signature: state
@@ -2577,7 +2591,7 @@ where
 
                 let mut chain_monitor =
                     self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                chain_monitor.cleanup_channel(dlc_channel_id);
+                chain_monitor.cleanup_channel(dlc_channel_id.inner());
 
                 self.dlc_channel_manager
                     .get_store()
@@ -2603,7 +2617,7 @@ where
         counter_party: &PublicKey,
     ) -> Result<(), Error> {
         self.ln_channel_manager.with_useable_channel_lock(
-            &finalize.channel_id,
+            &finalize.channel_id.into(),
             counter_party,
             None,
             |channel_lock| {
@@ -2653,7 +2667,7 @@ where
                     .add_tx(
                         state.signed_subchannel.split_tx.transaction.txid(),
                         ChannelInfo {
-                            channel_id: sub_channel.channel_id,
+                            channel_id: sub_channel.channel_id.inner(),
                             tx_type: TxType::Revoked {
                                 update_idx: sub_channel.update_idx,
                                 own_adaptor_signature: state
@@ -2672,7 +2686,7 @@ where
                     ) {
                         (Some(secret), Some(point)) => {
                             let revoke_and_ack = RevokeAndACK {
-                                channel_id: finalize.channel_id,
+                                channel_id: finalize.channel_id.into(),
                                 per_commitment_secret: *secret.as_ref(),
                                 next_per_commitment_point: *point,
                             };
@@ -2691,7 +2705,7 @@ where
 
                 let mut chain_monitor =
                     self.dlc_channel_manager.get_chain_monitor().lock().unwrap();
-                chain_monitor.cleanup_channel(dlc_channel_id);
+                chain_monitor.cleanup_channel(dlc_channel_id.inner());
 
                 self.dlc_channel_manager
                     .get_store()
@@ -2728,7 +2742,9 @@ where
                     accept_points,
                     per_update_seed_pk,
                 } => {
-                    if let Some(details) = self.ln_channel_manager.get_channel_details(&channel_id)
+                    if let Some(details) = self
+                        .ln_channel_manager
+                        .get_channel_details(&channel_id.into())
                     {
                         if details.is_usable {
                             if let Ok((p, msg)) = self.accept_sub_channel_internal(
@@ -2775,7 +2791,7 @@ where
                     };
                 }
                 Action::ForceSign(id) => {
-                    if let Some(details) = self.ln_channel_manager.get_channel_details(&id) {
+                    if let Some(details) = self.ln_channel_manager.get_channel_details(&id.into()) {
                         if details.is_usable {
                             if let Err(e) = self.mark_channel_signed(id) {
                                 error!("Unexpected error {} marking channel {:?} as signed, keeping the action to retry.", e, id);
@@ -2796,7 +2812,9 @@ where
                     channel_id,
                     own_balance,
                 } => {
-                    if let Some(details) = self.ln_channel_manager.get_channel_details(&channel_id)
+                    if let Some(details) = self
+                        .ln_channel_manager
+                        .get_channel_details(&channel_id.into())
                     {
                         if details.is_usable {
                             if let Ok((msg, p)) = self.accept_subchannel_close_offer(&channel_id) {
@@ -2899,9 +2917,11 @@ where
             let mut sub_channel = match self
                 .dlc_channel_manager
                 .get_store()
-                .get_sub_channel(channel_info.channel_id)?
+                .get_sub_channel(SubChannelId::from_bytes(channel_info.channel_id))?
             {
                 None => {
+                    // TODO: An error might be too much, especially since we will get
+                    // `DlcChannelId`s here even though they are supposed to be handled elsewhere!
                     log::error!(
                         "Cannot process confirmed transaction {} for unknown subchannel {}",
                         tx.txid(),
@@ -2927,7 +2947,7 @@ where
                     SubChannelState::CloseOffered(s) => (&s.signed_subchannel, None),
                     SubChannelState::CloseAccepted(s) => {
                         if let Err(e) = self.ln_channel_manager.with_channel_lock_no_check(
-                            &sub_channel.channel_id,
+                            &sub_channel.channel_id.into(),
                             &sub_channel.counter_party,
                             |channel_lock| {
                                 self.ln_channel_manager.set_funding_outpoint(
@@ -2951,7 +2971,7 @@ where
                     }
                     SubChannelState::CloseConfirmed(s) => {
                         if let Err(e) = self.ln_channel_manager.with_channel_lock_no_check(
-                            &sub_channel.channel_id,
+                            &sub_channel.channel_id.into(),
                             &sub_channel.counter_party,
                             |channel_lock| {
                                 self.ln_channel_manager.set_funding_outpoint(
@@ -3152,13 +3172,13 @@ where
     fn on_channel_reestablish(
         &self,
         peer_id: &PublicKey,
-        channel_id: [u8; 32],
+        channel_id: ChannelId,
         peer_state: Option<u8>,
     ) -> Result<(), Error> {
         if let Some(mut channel) = self
             .dlc_channel_manager
             .get_store()
-            .get_sub_channel(channel_id)?
+            .get_sub_channel(channel_id.into())?
         {
             if &channel.counter_party != peer_id {
                 return Err(Error::InvalidParameters(format!(
@@ -3203,7 +3223,7 @@ where
                             None::<PublicKey>
                         )?;
                         let offer_msg = SubChannelOffer {
-                            channel_id,
+                            channel_id: channel_id.into(),
                             revocation_basepoint: channel.own_base_points.revocation_basepoint,
                             publish_basepoint: channel.own_base_points.publish_basepoint,
                             own_basepoint: channel.own_base_points.own_basepoint,
@@ -3232,7 +3252,7 @@ where
                 SubChannelState::Accepted(a) => {
                     self.ln_channel_manager
                         .with_useable_channel_lock(
-                            &channel.channel_id,
+                            &channel.channel_id.into(),
                             peer_id,
                             None,
                             |channel_lock| {
@@ -3276,7 +3296,7 @@ where
                                 let accept_points = dlc_channel.accept_base_points.clone();
                                 let per_update_seed_pk = dlc_channel.accept_per_update_seed;
                                 self.actions.lock().unwrap().push(Action::ReAccept {
-                                    channel_id,
+                                    channel_id: channel_id.into(),
                                     party_params,
                                     funding_inputs_info,
                                     accept_points,
@@ -3301,7 +3321,7 @@ where
                 SubChannelState::Confirmed(a) => {
                     self.ln_channel_manager
                         .with_useable_channel_lock(
-                            &channel.channel_id,
+                            &channel.channel_id.into(),
                             peer_id,
                             None,
                             |channel_lock| {
@@ -3365,11 +3385,11 @@ where
                             self.actions
                                 .lock()
                                 .unwrap()
-                                .push(Action::ForceSign(channel_id));
+                                .push(Action::ForceSign(channel_id.into()));
                         } else {
                             self.ln_channel_manager
                                 .with_useable_channel_lock(
-                                    &channel.channel_id,
+                                    &channel.channel_id.into(),
                                     peer_id,
                                     None,
                                     |channel_lock| {
@@ -3422,7 +3442,7 @@ where
                                         let accept_points = dlc_channel.own_points.clone();
                                         let per_update_seed_pk = dlc_channel.own_per_update_seed;
                                         self.actions.lock().unwrap().push(Action::ReAccept {
-                                            channel_id,
+                                            channel_id: channel_id.into(),
                                             party_params,
                                             funding_inputs_info,
                                             accept_points,
@@ -3450,7 +3470,7 @@ where
                     if let Some(counter_state) = peer_state {
                         if counter_state == ReestablishFlag::Signed as u8 {
                             let message = SubChannelCloseOffer {
-                                channel_id,
+                                channel_id: channel_id.into(),
                                 accept_balance: offered.accept_balance,
                             };
 
@@ -3463,7 +3483,7 @@ where
                 }
                 SubChannelState::CloseAccepted(accepted) => {
                     self.ln_channel_manager.with_useable_channel_lock(
-                        &channel.channel_id,
+                        &channel.channel_id.into(),
                         &channel.counter_party,
                         None,
                         |channel_lock| {
@@ -3477,7 +3497,7 @@ where
                                 .lock()
                                 .unwrap()
                                 .push(Action::ReAcceptCloseOffer {
-                                    channel_id,
+                                    channel_id: channel_id.into(),
                                     own_balance: accepted.own_balance,
                                 });
 
@@ -3497,7 +3517,7 @@ where
                     if let Some(counter_state) = peer_state {
                         if counter_state == ReestablishFlag::CloseAccepted as u8 {
                             self.ln_channel_manager.with_useable_channel_lock(
-                                &channel.channel_id,
+                                &channel.channel_id.into(),
                                 &channel.counter_party,
                                 None,
                                 |channel_lock| {
@@ -3639,7 +3659,7 @@ where
 
     fn get_closed_dlc_channel_and_contract(
         &self,
-        channel_id: [u8; 32],
+        channel_id: DlcChannelId,
         counter_closed: bool,
     ) -> Result<(Channel, Contract), Error> {
         let channel = self
@@ -3691,7 +3711,7 @@ where
         split_tx: &Transaction,
     ) -> Result<Signature, Error> {
         let mut signers = self.ln_channel_signers.lock().unwrap();
-        let signer = signers.entry(sub_channel.channel_id).or_insert(
+        let signer = signers.entry(sub_channel.channel_id.into()).or_insert(
             self.signer_provider.derive_ln_dlc_channel_signer(
                 sub_channel.fund_value_satoshis,
                 sub_channel.channel_keys_id,
@@ -3707,7 +3727,7 @@ where
 
     fn get_holder_split_tx_adaptor_signature(
         &self,
-        channel_id: [u8; 32],
+        channel_id: SubChannelId,
         channel_value_satoshis: u64,
         channel_keys_id: [u8; 32],
         split_tx: &Transaction,
@@ -3716,7 +3736,7 @@ where
     ) -> Result<EcdsaAdaptorSignature, Error> {
         let mut signers = self.ln_channel_signers.lock().unwrap();
 
-        let signer = signers.entry(channel_id).or_insert(
+        let signer = signers.entry(channel_id.into()).or_insert(
             self.signer_provider
                 .derive_ln_dlc_channel_signer(channel_value_satoshis, channel_keys_id),
         );
@@ -3740,14 +3760,15 @@ impl<
         O: Deref,
         T: Deref,
         F: Deref,
+        K: Deref,
         D: Deref<Target = Manager<W, B, S, O, T, F>>,
         CS: ChannelSigner,
         SP: Deref,
         LCS: LnDlcChannelSigner,
-    > ChannelMessageHandler for SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS>
+    > ChannelMessageHandler for SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS, K>
 where
     W::Target: Wallet,
-    M::Target: LNChannelManager<CS>,
+    M::Target: LNChannelManager<K>,
     C::Target: LNChainMonitor,
     S::Target: Storage,
     B::Target: Blockchain,
@@ -3755,6 +3776,7 @@ where
     T::Target: Time,
     F::Target: FeeEstimator,
     SP::Target: LnDlcSignerProvider<LCS>,
+    K::Target: SignerProvider,
 {
     fn handle_open_channel(
         &self,
@@ -4030,14 +4052,15 @@ impl<
         O: Deref,
         T: Deref,
         F: Deref,
+        K: Deref,
         D: Deref<Target = Manager<W, B, S, O, T, F>>,
         CS: ChannelSigner,
         SP: Deref,
         LCS: LnDlcChannelSigner,
-    > MessageSendEventsProvider for SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS>
+    > MessageSendEventsProvider for SubChannelManager<W, M, C, S, B, O, T, F, D, CS, SP, LCS, K>
 where
     W::Target: Wallet,
-    M::Target: LNChannelManager<CS>,
+    M::Target: LNChannelManager<K>,
     C::Target: LNChainMonitor,
     S::Target: Storage,
     B::Target: Blockchain,
@@ -4045,13 +4068,14 @@ where
     T::Target: Time,
     F::Target: FeeEstimator,
     SP::Target: LnDlcSignerProvider<LCS>,
+    K::Target: SignerProvider,
 {
     fn get_and_clear_pending_msg_events(&self) -> Vec<lightning::events::MessageSendEvent> {
         let mut msg_events = self.ln_channel_manager.get_and_clear_pending_msg_events();
 
         for event in msg_events.iter_mut() {
             if let lightning::events::MessageSendEvent::SendChannelReestablish { msg, .. } = event {
-                match self.dlc_channel_manager.get_store().get_sub_channel(msg.channel_id) {
+                match self.dlc_channel_manager.get_store().get_sub_channel(msg.channel_id.into()) {
                             Err(e) => error!("Unexpected error {} trying to retrieve sub channel {:?} during sending of reestablish.", e, msg.channel_id),
                             Ok(None) => trace!("No sub channel with id {:?} to reestablish", msg.channel_id),
                             Ok(Some(c)) => {
diff --git a/dlc-manager/src/subchannel/mod.rs b/dlc-manager/src/subchannel/mod.rs
index f2ff072a..d492253e 100644
--- a/dlc-manager/src/subchannel/mod.rs
+++ b/dlc-manager/src/subchannel/mod.rs
@@ -4,7 +4,7 @@
 use std::{fmt::Display, ops::Deref};
 
 use bitcoin::{hashes::Hash, OutPoint, Script, Transaction, Txid};
-use dlc::channel::sub_channel::SplitTx;
+use dlc::{channel::sub_channel::SplitTx, DlcChannelId, SubChannelId};
 use lightning::{
     chain::{
         chaininterface::{BroadcasterInterface, FeeEstimator},
@@ -15,6 +15,7 @@ use lightning::{
         chan_utils::CounterpartyCommitmentSecrets,
         channelmanager::{ChannelDetails, ChannelLock, ChannelManager},
         msgs::{ChannelMessageHandler, CommitmentSigned, RevokeAndACK},
+        ChannelId,
     },
     routing::router::Router,
     sign::{EntropySource, NodeSigner, SignerProvider, WriteableEcdsaChannelSigner},
@@ -22,15 +23,15 @@ use lightning::{
 };
 use secp256k1_zkp::{ecdsa::Signature, EcdsaAdaptorSignature, PublicKey, SecretKey};
 
-use crate::{channel::party_points::PartyBasePoints, error::Error, ChannelId, ContractId};
+use crate::{channel::party_points::PartyBasePoints, error::Error};
 
 pub mod ser;
 
 #[derive(Clone, PartialEq, Eq)]
 /// Contains information about a DLC channel embedded within a Lightning Network Channel.
 pub struct SubChannel {
-    /// The index for the channel.
-    pub channel_id: ChannelId,
+    /// The ID for the subchannel.
+    pub channel_id: SubChannelId,
     /// The [`secp256k1_zkp::PublicKey`] of the counter party's node.
     pub counter_party: PublicKey,
     /// The update index of the sub channel.
@@ -74,9 +75,9 @@ impl std::fmt::Debug for SubChannel {
 impl SubChannel {
     /// Return the channel ID of the DLC channel at given index if in a state where such a channel
     /// is supposed to exist.
-    pub fn get_dlc_channel_id(&self, index: u8) -> Option<ChannelId> {
+    pub fn get_dlc_channel_id(&self, index: u8) -> Option<DlcChannelId> {
         let temporary_channel_id =
-            generate_temporary_channel_id(self.channel_id, self.update_idx, index);
+            generate_temporary_dlc_channel_id(self.channel_id, self.update_idx, index);
         match &self.state {
             SubChannelState::Offered(_) => Some(temporary_channel_id),
             SubChannelState::Accepted(a) => Some(a.get_dlc_channel_id(temporary_channel_id, index)),
@@ -247,12 +248,16 @@ impl From<&ChannelDetails> for LnRollBackInfo {
 }
 
 impl AcceptedSubChannel {
-    fn get_dlc_channel_id(&self, temporary_channel_id: ChannelId, channel_idx: u8) -> ChannelId {
-        crate::utils::compute_id(
+    fn get_dlc_channel_id(
+        &self,
+        temporary_channel_id: DlcChannelId,
+        channel_idx: u8,
+    ) -> DlcChannelId {
+        DlcChannelId::from_bytes(crate::utils::compute_id(
             self.split_tx.transaction.txid(),
             channel_idx as u16 + 1,
-            &temporary_channel_id,
-        )
+            &temporary_channel_id.inner(),
+        ))
     }
 }
 
@@ -287,12 +292,16 @@ pub struct ConfirmedSubChannel {
 }
 
 impl ConfirmedSubChannel {
-    fn get_dlc_channel_id(&self, temporary_channel_id: ChannelId, channel_idx: u8) -> ChannelId {
-        crate::utils::compute_id(
+    fn get_dlc_channel_id(
+        &self,
+        temporary_channel_id: DlcChannelId,
+        channel_idx: u8,
+    ) -> DlcChannelId {
+        DlcChannelId::from_bytes(crate::utils::compute_id(
             self.split_tx.transaction.txid(),
             channel_idx as u16 + 1,
-            &temporary_channel_id,
-        )
+            &temporary_channel_id.inner(),
+        ))
     }
 }
 
@@ -318,12 +327,16 @@ pub struct SignedSubChannel {
 }
 
 impl SignedSubChannel {
-    fn get_dlc_channel_id(&self, temporary_channel_id: ChannelId, channel_idx: u8) -> ChannelId {
-        crate::utils::compute_id(
+    fn get_dlc_channel_id(
+        &self,
+        temporary_channel_id: DlcChannelId,
+        channel_idx: u8,
+    ) -> DlcChannelId {
+        DlcChannelId::from_bytes(crate::utils::compute_id(
             self.split_tx.transaction.txid(),
             channel_idx as u16 + 1,
-            &temporary_channel_id,
-        )
+            &temporary_channel_id.inner(),
+        ))
     }
 }
 
@@ -395,9 +408,9 @@ pub struct ClosingSubChannel {
 }
 
 /// Provides the ability to access and update Lightning Network channels.
-pub trait LNChannelManager<SP>: ChannelMessageHandler
+pub trait LNChannelManager<K: Deref>: ChannelMessageHandler
 where
-    SP: lightning::sign::ChannelSigner,
+    K::Target: SignerProvider,
 {
     /// Returns the details of the channel with given `channel_id` if found.
     fn get_channel_details(&self, channel_id: &ChannelId) -> Option<ChannelDetails>;
@@ -412,7 +425,7 @@ where
         cb: F,
     ) -> Result<T, APIError>
     where
-        F: FnOnce(&mut ChannelLock<SP>) -> Result<T, APIError>;
+        F: FnOnce(&mut ChannelLock<K>) -> Result<T, APIError>;
     /// Enable executing the provided callback while holding the lock of the channel without
     /// checking the channel state or peer connection status.
     fn with_channel_lock_no_check<F, T>(
@@ -422,12 +435,12 @@ where
         cb: F,
     ) -> Result<T, APIError>
     where
-        F: FnOnce(&mut ChannelLock<SP>) -> Result<T, APIError>;
+        F: FnOnce(&mut ChannelLock<K>) -> Result<T, APIError>;
     /// Updates the funding output for the channel and returns the [`CommitmentSigned`] message
     /// with signatures for the updated commitment transaction and HTLCs.
     fn get_updated_funding_outpoint_commitment_signed(
         &self,
-        channel_lock: &mut ChannelLock<SP>,
+        channel_lock: &mut ChannelLock<K>,
         funding_outpoint: &OutPoint,
         channel_value_satoshis: u64,
         value_to_self_msat: u64,
@@ -436,7 +449,7 @@ where
     /// message.
     fn on_commitment_signed_get_raa(
         &self,
-        channel_lock: &mut ChannelLock<SP>,
+        channel_lock: &mut ChannelLock<K>,
         commitment_signature: &Signature,
         htlc_signatures: &[Signature],
     ) -> Result<RevokeAndACK, APIError>;
@@ -444,14 +457,14 @@ where
     /// Provides and verify a [`RevokeAndACK`] message.
     fn revoke_and_ack(
         &self,
-        channel_lock: &mut ChannelLock<SP>,
+        channel_lock: &mut ChannelLock<K>,
         revoke_and_ack: &RevokeAndACK,
     ) -> Result<(), APIError>;
 
     /// Force close the channel with given `channel_id` and `counter_party_node_id`.
     fn force_close_channel(
         &self,
-        channel_id: &[u8; 32],
+        channel_id: &ChannelId,
         counter_party_node_id: &PublicKey,
     ) -> Result<(), Error>;
 
@@ -459,7 +472,7 @@ where
     /// ones.
     fn set_funding_outpoint(
         &self,
-        channel_lock: &mut ChannelLock<SP>,
+        channel_lock: &mut ChannelLock<K>,
         funding_outpoint: &lightning::chain::transaction::OutPoint,
         channel_value_satoshis: u64,
         value_to_self_msat: u64,
@@ -487,8 +500,7 @@ pub trait LNChainMonitor {
 }
 
 impl<M: Deref, T: Deref, ES: Deref, NS: Deref, K: Deref, F: Deref, R: Deref, L: Deref>
-    LNChannelManager<<K::Target as SignerProvider>::Signer>
-    for ChannelManager<M, T, ES, NS, K, F, R, L>
+    LNChannelManager<K> for ChannelManager<M, T, ES, NS, K, F, R, L>
 where
     M::Target: lightning::chain::Watch<<K::Target as SignerProvider>::Signer>,
     T::Target: BroadcasterInterface,
@@ -509,7 +521,7 @@ where
 
     fn get_updated_funding_outpoint_commitment_signed(
         &self,
-        channel_lock: &mut ChannelLock<<K::Target as SignerProvider>::Signer>,
+        channel_lock: &mut ChannelLock<K>,
         funding_outpoint: &OutPoint,
         channel_value_satoshis: u64,
         value_to_self_msat: u64,
@@ -527,7 +539,7 @@ where
 
     fn on_commitment_signed_get_raa(
         &self,
-        channel_lock: &mut ChannelLock<<K::Target as SignerProvider>::Signer>,
+        channel_lock: &mut ChannelLock<K>,
         commitment_signature: &Signature,
         htlc_signatures: &[Signature],
     ) -> Result<RevokeAndACK, APIError> {
@@ -536,7 +548,7 @@ where
 
     fn revoke_and_ack(
         &self,
-        channel_lock: &mut ChannelLock<<K::Target as SignerProvider>::Signer>,
+        channel_lock: &mut ChannelLock<K>,
         revoke_and_ack: &RevokeAndACK,
     ) -> Result<(), APIError> {
         self.revoke_and_ack_commitment(channel_lock, revoke_and_ack)
@@ -544,7 +556,7 @@ where
 
     fn force_close_channel(
         &self,
-        channel_id: &[u8; 32],
+        channel_id: &ChannelId,
         counter_party_node_id: &PublicKey,
     ) -> Result<(), Error> {
         self.force_close_broadcasting_latest_txn(channel_id, counter_party_node_id)
@@ -553,7 +565,7 @@ where
 
     fn set_funding_outpoint(
         &self,
-        channel_lock: &mut ChannelLock<<K::Target as SignerProvider>::Signer>,
+        channel_lock: &mut ChannelLock<K>,
         funding_outpoint: &lightning::chain::transaction::OutPoint,
         channel_value_satoshis: u64,
         value_to_self_msat: u64,
@@ -574,9 +586,7 @@ where
         cb: C,
     ) -> Result<RV, APIError>
     where
-        C: FnOnce(
-            &mut ChannelLock<<<K as Deref>::Target as SignerProvider>::Signer>,
-        ) -> Result<RV, APIError>,
+        C: FnOnce(&mut ChannelLock<K>) -> Result<RV, APIError>,
     {
         self.with_useable_channel_lock(channel_id, counter_party_node_id, commit_tx_number, cb)
     }
@@ -588,9 +598,7 @@ where
         cb: C,
     ) -> Result<RV, APIError>
     where
-        C: FnOnce(
-            &mut ChannelLock<<<K as Deref>::Target as SignerProvider>::Signer>,
-        ) -> Result<RV, APIError>,
+        C: FnOnce(&mut ChannelLock<K>) -> Result<RV, APIError>,
     {
         self.with_channel_lock_no_check(channel_id, counter_party_node_id, cb)
     }
@@ -642,18 +650,20 @@ where
     }
 }
 
-/// Generate a temporary channel id for a DLC channel based on the LN channel id, the update index of the
+/// Generate a temporary channel id for a DLC channel based on the subchannel id, the update index of the
 /// split transaction and the index of the DLC channel within the sub channel.
-pub fn generate_temporary_channel_id(
-    channel_id: ChannelId,
+pub fn generate_temporary_dlc_channel_id(
+    channel_id: SubChannelId,
     split_update_idx: u64,
     channel_index: u8,
-) -> ContractId {
+) -> DlcChannelId {
     let mut data = Vec::with_capacity(65);
-    data.extend_from_slice(&channel_id);
+    data.extend_from_slice(&channel_id.inner());
     data.extend_from_slice(&split_update_idx.to_be_bytes());
     data.extend_from_slice(&channel_index.to_be_bytes());
-    bitcoin::hashes::sha256::Hash::hash(&data).into_inner()
+    let bytes = bitcoin::hashes::sha256::Hash::hash(&data).into_inner();
+
+    DlcChannelId::from_bytes(bytes)
 }
 
 /// Trait to be implemented by a signing component providing the ability to sign LN/DLC split
diff --git a/dlc-manager/test_inputs/offer_channel.json b/dlc-manager/test_inputs/offer_channel.json
index 2504f0fb..55a4a041 100644
--- a/dlc-manager/test_inputs/offer_channel.json
+++ b/dlc-manager/test_inputs/offer_channel.json
@@ -1 +1 @@
-{"protocolVersion":1,"contractFlags":0,"chainHash":"06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f","temporaryContractId":[70,18,232,131,5,250,209,3,102,240,132,230,226,21,17,88,145,129,122,9,186,170,224,167,97,113,188,5,21,236,86,189],"temporaryChannelId":[123,203,234,245,246,100,117,252,84,18,27,224,26,223,88,238,60,239,247,99,155,54,131,7,197,176,9,229,185,198,71,151],"contractInfo":{"singleContractInfo":{"totalCollateral":101000000,"contractInfo":{"contractDescriptor":{"enumeratedContractDescriptor":{"payouts":[{"outcome":"a","offerPayout":101000000},{"outcome":"b","offerPayout":0},{"outcome":"c","offerPayout":101000000},{"outcome":"d","offerPayout":0}]}},"oracleInfo":{"single":{"oracleAnnouncement":{"announcementSignature":"58e271eb4ffb6084182fbc8097afe86d8aea17e096c107f831abc405030dc69d70611369918f2879176f53195d9bfc807ef50f2e1152d535174a5808ee87569a","oraclePublicKey":"de2caf701a3935c0e7d63ba43f1c65d3bfbde7117f24871714c8a82d688a5d0e","oracleEvent":{"oracleNonces":["f1f7444917012f2b7966b9de97de118bf5a39c564ed5c18188b942a006bcb696"],"eventMaturityEpoch":1623133104,"eventDescriptor":{"enumEvent":{"outcomes":["a","b","c","d"]}},"eventId":"Test"}}}}}}},"fundingPubkey":"03897aad0fe458b9800f001ae95f4d7fb8dea6cf267494ad8d63ceb7ccecc751e0","revocationBasepoint":"03a2536f9b457b10ae22da642a9cc894514ba9192deee3605085adcab86f790248","publishBasepoint":"03c165e866284766b031066cb8945a8ceacd13c524235245c5fa9bde2b521f5e2a","ownBasepoint":"037f63d5bb4df2da97c63ef02afb2e114d64a8d17d7e7e31cd52696b23423a7e89","firstPerUpdatePoint":"0223e2f88b20dbd7ecf0d2b1800e01a6baa08cb3f7f4e11524f518fe845c1786cb","payoutSpk":"0014ff7e53c1edaa115e2004d213bc82d5b79cbd2973","payoutSerialId":1085418968450537681,"offerCollateral":90000000,"fundingInputs":[{"inputSerialId":6696372491465549741,"prevTx":"0200000000010137c00b6d6f70d6a04ded5ff4b235499b9aa03f55201287190fdc86502fc891560100000000feffffff0200c2eb0b000000001600148ac1bfaf83647dba23115cc257de034f6de3336ef8572e1201000000160014dc4574b41f25cb3576ab938a444501b75edc032c0247304402205d3136d26e41df04ee02a52f2c64614e93b0704fee3bdf2d5cf6368256dff4c402207772db0e66f3771bcd2d56d1907f86ebe0621bff75d149c744fcea6819ad28dc012103d8b6143cb3a01028094ccf4a1de13f411876a8e2c856e4e6ecda48318bd17ce668000000","prevTxVout":0,"sequence":4294967295,"maxWitnessLen":107,"redeemScript":""}],"changeSpk":"00148591eaef0a9c8b2759d2c967cf60f64dec6505a5","changeSerialId":11608938898304204128,"fundOutputSerialId":11319861280411552317,"feeRatePerVb":2,"cetLocktime":1623133103,"refundLocktime":1623737904,"cetNsequence":288}
\ No newline at end of file
+{"protocolVersion":1,"contractFlags":0,"chainHash":"06226e46111a0b59caaf126043eb5bbf28c34f3a5e332a1fc7b2b73cf188910f","temporaryContractId":[70,18,232,131,5,250,209,3,102,240,132,230,226,21,17,88,145,129,122,9,186,170,224,167,97,113,188,5,21,236,86,189],"temporaryChannelId":"7bcbeaf5f66475fc54121be01adf58ee3ceff7639b368307c5b009e5b9c64797","contractInfo":{"singleContractInfo":{"totalCollateral":101000000,"contractInfo":{"contractDescriptor":{"enumeratedContractDescriptor":{"payouts":[{"outcome":"a","offerPayout":101000000},{"outcome":"b","offerPayout":0},{"outcome":"c","offerPayout":101000000},{"outcome":"d","offerPayout":0}]}},"oracleInfo":{"single":{"oracleAnnouncement":{"announcementSignature":"58e271eb4ffb6084182fbc8097afe86d8aea17e096c107f831abc405030dc69d70611369918f2879176f53195d9bfc807ef50f2e1152d535174a5808ee87569a","oraclePublicKey":"de2caf701a3935c0e7d63ba43f1c65d3bfbde7117f24871714c8a82d688a5d0e","oracleEvent":{"oracleNonces":["f1f7444917012f2b7966b9de97de118bf5a39c564ed5c18188b942a006bcb696"],"eventMaturityEpoch":1623133104,"eventDescriptor":{"enumEvent":{"outcomes":["a","b","c","d"]}},"eventId":"Test"}}}}}}},"fundingPubkey":"03897aad0fe458b9800f001ae95f4d7fb8dea6cf267494ad8d63ceb7ccecc751e0","revocationBasepoint":"03a2536f9b457b10ae22da642a9cc894514ba9192deee3605085adcab86f790248","publishBasepoint":"03c165e866284766b031066cb8945a8ceacd13c524235245c5fa9bde2b521f5e2a","ownBasepoint":"037f63d5bb4df2da97c63ef02afb2e114d64a8d17d7e7e31cd52696b23423a7e89","firstPerUpdatePoint":"0223e2f88b20dbd7ecf0d2b1800e01a6baa08cb3f7f4e11524f518fe845c1786cb","payoutSpk":"0014ff7e53c1edaa115e2004d213bc82d5b79cbd2973","payoutSerialId":1085418968450537681,"offerCollateral":90000000,"fundingInputs":[{"inputSerialId":6696372491465549741,"prevTx":"0200000000010137c00b6d6f70d6a04ded5ff4b235499b9aa03f55201287190fdc86502fc891560100000000feffffff0200c2eb0b000000001600148ac1bfaf83647dba23115cc257de034f6de3336ef8572e1201000000160014dc4574b41f25cb3576ab938a444501b75edc032c0247304402205d3136d26e41df04ee02a52f2c64614e93b0704fee3bdf2d5cf6368256dff4c402207772db0e66f3771bcd2d56d1907f86ebe0621bff75d149c744fcea6819ad28dc012103d8b6143cb3a01028094ccf4a1de13f411876a8e2c856e4e6ecda48318bd17ce668000000","prevTxVout":0,"sequence":4294967295,"maxWitnessLen":107,"redeemScript":""}],"changeSpk":"00148591eaef0a9c8b2759d2c967cf60f64dec6505a5","changeSerialId":11608938898304204128,"fundOutputSerialId":11319861280411552317,"feeRatePerVb":2,"cetLocktime":1623133103,"refundLocktime":1623737904,"cetNsequence":288}
diff --git a/dlc-manager/tests/channel_execution_tests.rs b/dlc-manager/tests/channel_execution_tests.rs
index aa9a6973..7ebd4240 100644
--- a/dlc-manager/tests/channel_execution_tests.rs
+++ b/dlc-manager/tests/channel_execution_tests.rs
@@ -4,10 +4,11 @@ mod test_utils;
 use bitcoin::Amount;
 use bitcoin_test_utils::rpc_helpers::init_clients;
 use bitcoincore_rpc::RpcApi;
+use dlc::DlcChannelId;
 use dlc_manager::contract::contract_input::ContractInput;
 use dlc_manager::manager::Manager;
+use dlc_manager::ContractId;
 use dlc_manager::{channel::Channel, contract::Contract, Blockchain, Oracle, Storage, Wallet};
-use dlc_manager::{ChannelId, ContractId};
 use dlc_messages::{ChannelMessage, Message};
 use electrs_blockchain_provider::ElectrsBlockchainProvider;
 use lightning::util::ser::Writeable;
@@ -47,7 +48,10 @@ type DlcParty = Arc<
     >,
 >;
 
-fn get_established_channel_contract_id(dlc_party: &DlcParty, channel_id: &ChannelId) -> ContractId {
+fn get_established_channel_contract_id(
+    dlc_party: &DlcParty,
+    channel_id: &DlcChannelId,
+) -> ContractId {
     let channel = dlc_party
         .lock()
         .unwrap()
@@ -773,7 +777,7 @@ fn channel_execution_test(test_params: TestParams, path: TestPath) {
 fn close_established_channel<F>(
     first: DlcParty,
     second: DlcParty,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     generate_blocks: &F,
 ) where
     F: Fn(u64),
@@ -829,7 +833,7 @@ fn close_established_channel<F>(
 fn cheat_punish<F: Fn(u64)>(
     first: DlcParty,
     second: DlcParty,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     generate_blocks: &F,
     established: bool,
 ) {
@@ -863,7 +867,7 @@ fn settle_channel(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
 ) {
     let (settle_offer, _) = first
         .lock()
@@ -914,7 +918,7 @@ fn settle_reject(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
 ) {
     let (settle_offer, _) = first
         .lock()
@@ -960,7 +964,7 @@ fn settle_race(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
 ) {
     let (settle_offer, _) = first
         .lock()
@@ -1012,7 +1016,7 @@ fn renew_channel(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     contract_input: &ContractInput,
     check_prev_contract_close: bool,
 ) {
@@ -1082,7 +1086,7 @@ fn renew_reject(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     contract_input: &ContractInput,
 ) {
     let (renew_offer, _) = first
@@ -1126,7 +1130,7 @@ fn renew_race(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     contract_input: &ContractInput,
 ) {
     let (renew_offer, _) = first
@@ -1179,7 +1183,7 @@ fn collaborative_close<F: Fn(u64)>(
     first: DlcParty,
     first_send: &Sender<Option<Message>>,
     second: DlcParty,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     sync_receive: &Receiver<()>,
     generate_blocks: &F,
 ) {
@@ -1223,7 +1227,7 @@ fn renew_timeout<F: Fn(u64)>(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     contract_input: &ContractInput,
     path: TestPath,
     generate_blocks: &F,
@@ -1307,7 +1311,7 @@ fn settle_timeout(
     second: DlcParty,
     second_send: &Sender<Option<Message>>,
     second_receive: &Receiver<()>,
-    channel_id: ChannelId,
+    channel_id: DlcChannelId,
     path: TestPath,
 ) {
     let (settle_offer, _) = first
diff --git a/dlc-manager/tests/custom_signer.rs b/dlc-manager/tests/custom_signer.rs
index 2554a4d6..163a7f77 100644
--- a/dlc-manager/tests/custom_signer.rs
+++ b/dlc-manager/tests/custom_signer.rs
@@ -429,4 +429,19 @@ impl NodeSigner for CustomKeysManager {
     ) -> Result<secp256k1_zkp::ecdsa::Signature, ()> {
         self.keys_manager.sign_gossip_message(msg)
     }
+
+    fn sign_bolt12_invoice_request(
+        &self,
+        invoice_request: &lightning::offers::invoice_request::UnsignedInvoiceRequest,
+    ) -> Result<secp256k1_zkp::schnorr::Signature, ()> {
+        self.keys_manager
+            .sign_bolt12_invoice_request(invoice_request)
+    }
+
+    fn sign_bolt12_invoice(
+        &self,
+        invoice: &lightning::offers::invoice::UnsignedBolt12Invoice,
+    ) -> Result<secp256k1_zkp::schnorr::Signature, ()> {
+        self.keys_manager.sign_bolt12_invoice(invoice)
+    }
 }
diff --git a/dlc-manager/tests/ln_dlc_channel_execution_tests.rs b/dlc-manager/tests/ln_dlc_channel_execution_tests.rs
index d5fa7e93..417f2ae1 100644
--- a/dlc-manager/tests/ln_dlc_channel_execution_tests.rs
+++ b/dlc-manager/tests/ln_dlc_channel_execution_tests.rs
@@ -22,9 +22,10 @@ use bitcoin_test_utils::rpc_helpers::init_clients;
 use bitcoincore_rpc::{Client, RpcApi};
 use console_logger::ConsoleLogger;
 use custom_signer::{CustomKeysManager, CustomSigner};
+use dlc::{DlcChannelId, SubChannelId};
 use dlc_manager::{
     channel::Channel, contract::Contract, manager::Manager, sub_channel_manager::SubChannelManager,
-    subchannel::SubChannelState, Blockchain, ChannelId, Oracle, Signer, Storage, Utxo, Wallet,
+    subchannel::SubChannelState, Blockchain, Oracle, Signer, Storage, Utxo, Wallet,
 };
 use dlc_messages::{
     sub_channel::{SubChannelAccept, SubChannelOffer},
@@ -44,12 +45,12 @@ use lightning::{
     routing::{
         gossip::{NetworkGraph, NodeId},
         router::{DefaultRouter, Path, RouteParameters},
-        scoring::{ChannelUsage, Score},
+        scoring::{ChannelUsage, ScoreLookUp, ScoreUpdate},
     },
     sign::{EntropySource, KeysManager},
     util::{config::UserConfig, ser::Writeable},
 };
-use lightning_persister::FilesystemPersister;
+use lightning_persister::fs_store::FilesystemStore;
 use lightning_transaction_sync::EsploraSyncClient;
 use log::error;
 use mocks::{
@@ -71,7 +72,7 @@ type ChainMonitor = lightning::chain::chainmonitor::ChainMonitor<
     Arc<MockBlockchain<Arc<ElectrsBlockchainProvider>>>,
     Arc<MockBlockchain<Arc<ElectrsBlockchainProvider>>>,
     Arc<ConsoleLogger>,
-    Arc<FilesystemPersister>,
+    Arc<FilesystemStore>,
 >;
 
 pub(crate) type ChannelManager = lightning::ln::channelmanager::ChannelManager<
@@ -125,6 +126,7 @@ type DlcSubChannelManager = SubChannelManager<
     CustomSigner,
     Arc<CustomKeysManager>,
     CustomSigner,
+    Arc<CustomKeysManager>,
 >;
 
 struct LnDlcParty {
@@ -139,7 +141,7 @@ struct LnDlcParty {
     blockchain: Arc<ElectrsBlockchainProvider>,
     mock_blockchain: Arc<MockBlockchain<Arc<ElectrsBlockchainProvider>>>,
     wallet: Arc<SimpleWallet<Arc<ElectrsBlockchainProvider>, Arc<MemoryStorage>>>,
-    persister: Arc<FilesystemPersister>,
+    persister: Arc<FilesystemStore>,
     esplora_sync: Arc<EsploraSyncClient<Arc<ConsoleLogger>>>,
 }
 
@@ -182,7 +184,7 @@ struct LnDlcTestParams {
     electrs: Arc<ElectrsBlockchainProvider>,
     sink_rpc: Client,
     funding_txo: lightning::chain::transaction::OutPoint,
-    channel_id: ChannelId,
+    channel_id: SubChannelId,
     test_params: TestParams,
 }
 
@@ -247,7 +249,7 @@ impl lightning::ln::peer_handler::SocketDescriptor for MockSocketDescriptor {
 }
 
 #[derive(Clone)]
-/// [`Score`] implementation that uses a fixed penalty.
+/// [`ScoreLookUp`] implementation that uses a fixed penalty.
 pub struct TestScorer {
     penalty_msat: u64,
 }
@@ -259,26 +261,28 @@ impl TestScorer {
     }
 }
 
-impl Score for TestScorer {
+impl ScoreLookUp for TestScorer {
     type ScoreParams = ();
     fn channel_penalty_msat(
         &self,
-        _short_channel_id: u64,
-        _source: &NodeId,
-        _target: &NodeId,
-        _usage: ChannelUsage,
+        _: u64,
+        _: &NodeId,
+        _: &NodeId,
+        _: ChannelUsage,
         _score_params: &Self::ScoreParams,
     ) -> u64 {
         self.penalty_msat
     }
+}
 
-    fn payment_path_failed(&mut self, _actual_path: &Path, _actual_short_channel_id: u64) {}
+impl ScoreUpdate for TestScorer {
+    fn payment_path_failed(&mut self, _path: &Path, _short_channel_id: u64) {}
 
-    fn payment_path_successful(&mut self, _actual_path: &Path) {}
+    fn payment_path_successful(&mut self, _path: &Path) {}
 
-    fn probe_failed(&mut self, _actual_path: &Path, _: u64) {}
+    fn probe_failed(&mut self, _path: &Path, _short_channel_id: u64) {}
 
-    fn probe_successful(&mut self, _actual_path: &Path) {}
+    fn probe_successful(&mut self, _path: &Path) {}
 }
 
 impl EventHandler for LnDlcParty {
@@ -361,7 +365,7 @@ impl EventHandler for LnDlcParty {
                 };
                 self.channel_manager.claim_funds(payment_preimage.unwrap());
             }
-            Event::SpendableOutputs { outputs } => {
+            Event::SpendableOutputs { outputs, .. } => {
                 let destination_address = self.wallet.get_new_address().unwrap();
                 let output_descriptors = &outputs.iter().collect::<Vec<_>>();
                 let tx_feerate = self
@@ -415,7 +419,7 @@ fn create_ln_node(
     let logger = Arc::new(console_logger::ConsoleLogger { name });
 
     std::fs::create_dir_all(data_dir).unwrap();
-    let persister = Arc::new(FilesystemPersister::new(data_dir.to_string()));
+    let persister = Arc::new(FilesystemStore::new(data_dir.to_string().into()));
 
     let mock_blockchain = Arc::new(MockBlockchain::new(blockchain_provider.clone()));
 
@@ -829,7 +833,10 @@ fn ln_dlc_force_close_after_off_chain_close() {
     test_params
         .alice_node
         .channel_manager
-        .force_close_broadcasting_latest_txn(&test_params.channel_id, &test_params.bob_node_id)
+        .force_close_broadcasting_latest_txn(
+            &test_params.channel_id.into(),
+            &test_params.bob_node_id,
+        )
         .unwrap();
 
     test_params.generate_blocks(501);
@@ -2012,7 +2019,7 @@ fn test_init() -> LnDlcTestParams {
 
     let channel_details = alice_node.channel_manager.list_channels().remove(0);
     let funding_txo = channel_details.funding_txo.expect("to have a funding txo");
-    let channel_id = channel_details.channel_id;
+    let channel_id = channel_details.channel_id.into();
     let alice_node_id = alice_node.channel_manager.get_our_node_id();
     let bob_node_id = bob_node.channel_manager.get_our_node_id();
 
@@ -2142,6 +2149,7 @@ fn make_ln_payment(alice_node: &LnDlcParty, bob_node: &LnDlcParty, final_value_m
     let route_params = RouteParameters {
         payment_params,
         final_value_msat,
+        max_total_routing_fee_msat: None,
     };
 
     let route = lightning::routing::router::find_route(
@@ -2200,7 +2208,7 @@ fn get_commit_tx_from_node(
         .expect("to be able to get latest holder commitment transaction")
 }
 
-fn settle(test_params: &LnDlcTestParams, channel_id: &ChannelId) {
+fn settle(test_params: &LnDlcTestParams, channel_id: &DlcChannelId) {
     let (settle_offer, bob_key) = test_params
         .alice_node
         .dlc_manager
@@ -2249,7 +2257,7 @@ fn settle(test_params: &LnDlcTestParams, channel_id: &ChannelId) {
         .unwrap();
 }
 
-fn renew(test_params: &LnDlcTestParams, dlc_channel_id: &ChannelId) {
+fn renew(test_params: &LnDlcTestParams, dlc_channel_id: &DlcChannelId) {
     let (renew_offer, _) = test_params
         .alice_node
         .dlc_manager
@@ -2393,7 +2401,7 @@ fn cheat_with_revoked_tx(cheat_tx: &Transaction, test_params: &mut LnDlcTestPara
 fn generate_offer(
     test_params: &TestParams,
     offerer: &LnDlcParty,
-    channel_id: &ChannelId,
+    channel_id: &SubChannelId,
 ) -> SubChannelOffer {
     let oracle_announcements = test_params
         .oracles
@@ -2411,7 +2419,7 @@ fn generate_offer(
     let offer = offerer
         .sub_channel_manager
         .offer_sub_channel(
-            channel_id,
+            *channel_id,
             &test_params.contract_input,
             &[oracle_announcements],
         )
@@ -3559,7 +3567,10 @@ fn ldk_auto_close(test_params: &mut LnDlcTestParams, commit_tx: &Transaction) {
     test_params
         .bob_node
         .channel_manager
-        .force_close_broadcasting_latest_txn(&test_params.channel_id, &test_params.alice_node_id)
+        .force_close_broadcasting_latest_txn(
+            &test_params.channel_id.into(),
+            &test_params.alice_node_id,
+        )
         .unwrap();
     test_params.alice_node.process_events();
     test_params.bob_node.process_events();
diff --git a/dlc-manager/tests/manager_execution_tests.rs b/dlc-manager/tests/manager_execution_tests.rs
index be6907d9..4df611c9 100644
--- a/dlc-manager/tests/manager_execution_tests.rs
+++ b/dlc-manager/tests/manager_execution_tests.rs
@@ -40,8 +40,8 @@ struct TestVectorPart<T> {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "dlc_messages::serde_utils::serialize_hex",
-            deserialize_with = "dlc_messages::serde_utils::deserialize_hex_string"
+            serialize_with = "serialize_hex",
+            deserialize_with = "deserialize_hex_string"
         )
     )]
     serialized: Vec<u8>,
diff --git a/dlc-manager/tests/test_utils.rs b/dlc-manager/tests/test_utils.rs
index ae0f6b66..6cff290b 100644
--- a/dlc-manager/tests/test_utils.rs
+++ b/dlc-manager/tests/test_utils.rs
@@ -30,6 +30,7 @@ use dlc_trie::{digit_decomposition::decompose_value, OracleNumericInfo};
 use mocks::mock_oracle_provider::MockOracle;
 use secp256k1_zkp::rand::{seq::SliceRandom, thread_rng, RngCore};
 use simple_wallet::{WalletBlockchainProvider, WalletStorage};
+use std::fmt::Write;
 
 pub const NB_DIGITS: u32 = 10;
 pub const MIN_SUPPORT_EXP: usize = 1;
@@ -714,3 +715,59 @@ pub fn refresh_wallet<B: Deref, W: Deref>(
         retry += 1;
     }
 }
+
+/// Serialize an hexadecimal value.
+pub fn serialize_hex<S>(hex: &[u8], s: S) -> Result<S::Ok, S::Error>
+where
+    S: serde::Serializer,
+{
+    if s.is_human_readable() {
+        let string = hex.iter().fold(String::new(), |mut s, e| {
+            write!(s, "{:02x}", e).unwrap();
+            s
+        });
+        assert!(string.len() % 2 == 0);
+        s.serialize_str(&string)
+    } else {
+        s.serialize_bytes(hex)
+    }
+}
+
+/// Deserialize an hexadecimal value represented as a string.
+pub fn deserialize_hex_string<'de, D>(deserializer: D) -> Result<Vec<u8>, D::Error>
+where
+    D: serde::de::Deserializer<'de>,
+{
+    if deserializer.is_human_readable() {
+        let string: String = serde::de::Deserialize::deserialize(deserializer)?;
+        let mut hex = vec![0; string.len() / 2];
+        from_hex(&string, &mut hex).map_err(serde::de::Error::custom)?;
+        Ok(hex)
+    } else {
+        serde::de::Deserialize::deserialize(deserializer)
+    }
+}
+
+fn from_hex(hex: &str, target: &mut [u8]) -> Result<usize, String> {
+    if hex.len() % 2 == 1 || hex.len() > target.len() * 2 {
+        return Err("Invalid hex length".to_string());
+    }
+
+    let mut b = 0;
+    let mut idx = 0;
+    for c in hex.bytes() {
+        b <<= 4;
+        match c {
+            b'A'..=b'F' => b |= c - b'A' + 10,
+            b'a'..=b'f' => b |= c - b'a' + 10,
+            b'0'..=b'9' => b |= c - b'0',
+            _ => return Err("Invalid hex character".to_string()),
+        }
+        if (idx & 1) == 1 {
+            target[idx / 2] = b;
+            b = 0;
+        }
+        idx += 1;
+    }
+    Ok(idx / 2)
+}
diff --git a/dlc-messages/Cargo.toml b/dlc-messages/Cargo.toml
index 2721b8be..aa95a603 100644
--- a/dlc-messages/Cargo.toml
+++ b/dlc-messages/Cargo.toml
@@ -12,8 +12,8 @@ use-serde = ["serde", "secp256k1-zkp/use-serde"]
 
 [dependencies]
 bitcoin = {version = "0.29.2"}
-dlc = {version = "0.4.0", path = "../dlc"}
-lightning = {version = "0.0.116"}
+dlc = {version = "0.4.0", path = "../dlc", features = ["serde"] }
+lightning = {version = "0.0.117"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std"]}
 serde = {version = "1.0", features = ["derive"], optional = true}
 log = "0.4.14"
diff --git a/dlc-messages/src/channel.rs b/dlc-messages/src/channel.rs
index c5981b3f..b48445c7 100644
--- a/dlc-messages/src/channel.rs
+++ b/dlc-messages/src/channel.rs
@@ -1,7 +1,7 @@
 //! Contains messages used for the establishment and update of DLC channels.
 
 use bitcoin::Script;
-use dlc::Error;
+use dlc::{DlcChannelId, Error};
 use lightning::ln::msgs::DecodeError;
 use lightning::util::ser::{Readable, Writeable, Writer};
 use secp256k1_zkp::{
@@ -33,8 +33,8 @@ pub struct OfferChannel {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_array"
         )
     )]
     pub chain_hash: [u8; 32],
@@ -43,7 +43,7 @@ pub struct OfferChannel {
     pub temporary_contract_id: [u8; 32],
     /// A random nonce identifying the channel until the fund transaction is
     /// created.
-    pub temporary_channel_id: [u8; 32],
+    pub temporary_channel_id: DlcChannelId,
     /// Information about the contract established during channel creation.
     pub contract_info: ContractInfo,
     /// The public key used by the offer party in the 2 of 2 funding output.
@@ -151,15 +151,8 @@ impl OfferChannel {
     serde(rename_all = "camelCase")
 )]
 pub struct AcceptChannel {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The temporary id of the channel.
-    pub temporary_channel_id: [u8; 32],
+    pub temporary_channel_id: DlcChannelId,
     /// The collateral input by the accept party.
     pub accept_collateral: u64,
     /// The [`PublicKey`] used for the fund output by the accept party.
@@ -220,15 +213,8 @@ impl_dlc_writeable!(AcceptChannel, {
 )]
 /// Message used to finalize the setup of a DLC channel.
 pub struct SignChannel {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The adaptor signatures for all CETs generated by the offer party.
     pub cet_adaptor_signatures: CetAdaptorSignatures,
     /// The adaptor signature for the buffer transaction generated by the offer
@@ -256,15 +242,8 @@ impl_dlc_writeable!(SignChannel, {
 )]
 /// Message used to offer a settlement of the channel by on of the parties.
 pub struct SettleOffer {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The payout offered to the receiving party.
     pub counter_payout: u64,
     /// The per update point to be used by the sending party to setup the next
@@ -286,15 +265,8 @@ impl_dlc_writeable!(SettleOffer, {
 )]
 /// Message used to accept a previously received settlement offer.
 pub struct SettleAccept {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The per update point to be used by the sending party to setup the next
     /// channel state.
     pub next_per_update_point: PublicKey,
@@ -317,15 +289,8 @@ impl_dlc_writeable!(SettleAccept, {
 )]
 /// Message used to confirm the settlement of a channel.
 pub struct SettleConfirm {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The pre-image of the per update point used by the sending party during
     /// the establishment of the previous channel state.
     pub prev_per_update_secret: SecretKey,
@@ -348,15 +313,8 @@ impl_dlc_writeable!(SettleConfirm, {
 )]
 /// Message used to finalize the settlement of a channel.
 pub struct SettleFinalize {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The pre-image of the per update point used by the sending party during
     /// the establishment of the previous channel state.
     pub prev_per_update_secret: SecretKey,
@@ -375,15 +333,8 @@ impl_dlc_writeable!(SettleFinalize, {
 )]
 /// Message used to offer to establish a new contract within the channel.
 pub struct RenewOffer {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The proposed payout for the receiving party for the previous channel
     /// state.
     pub counter_payout: u64,
@@ -418,15 +369,8 @@ impl_dlc_writeable!(RenewOffer, {
 )]
 /// Message used to accept the establishment of a new contract within a channel.
 pub struct RenewAccept {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The per update point to be used by the sending party to setup the next
     /// channel state.
     pub next_per_update_point: PublicKey,
@@ -451,15 +395,8 @@ impl_dlc_writeable!(RenewAccept, {
 )]
 /// Message used to confirm the establishment of a new contract within a channel.
 pub struct RenewConfirm {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The adaptor signature for the buffer transaction generated by the offer
     /// party.
     pub buffer_adaptor_signature: EcdsaAdaptorSignature,
@@ -484,15 +421,8 @@ impl_dlc_writeable!(RenewConfirm, {
 )]
 /// Message used to finalize the establishment of a new contract within a channel.
 pub struct RenewFinalize {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The pre image of the per update point used by the sending party to setup
     /// the previous channel state.
     pub per_update_secret: SecretKey,
@@ -515,15 +445,8 @@ impl_dlc_writeable!(RenewFinalize, {
 )]
 /// Message used to finalize the establishment of a new contract within a channel.
 pub struct RenewRevoke {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The pre image of the per update point used by the sending party to setup
     /// the previous channel state.
     pub per_update_secret: SecretKey,
@@ -542,15 +465,8 @@ impl_dlc_writeable!(RenewRevoke, {
 )]
 /// Message used to offer to collaboratively close a channel.
 pub struct CollaborativeCloseOffer {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
     /// The proposed payout for the receiving party to close the channel with.
     pub counter_payout: u64,
     /// The signature of the sending party for the closing transaction.
@@ -572,15 +488,8 @@ impl_dlc_writeable!(CollaborativeCloseOffer, {
 
 /// Message used to reject an received offer.
 pub struct Reject {
-    #[cfg_attr(
-        feature = "serde",
-        serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
-        )
-    )]
     /// The id of the channel referred to by the message.
-    pub channel_id: [u8; 32],
+    pub channel_id: DlcChannelId,
 }
 
 impl_dlc_writeable!(Reject, { (channel_id, writeable) });
diff --git a/dlc-messages/src/lib.rs b/dlc-messages/src/lib.rs
index b27a237e..9a238f4c 100644
--- a/dlc-messages/src/lib.rs
+++ b/dlc-messages/src/lib.rs
@@ -33,9 +33,6 @@ pub mod oracle_msgs;
 pub mod segmentation;
 pub mod sub_channel;
 
-#[cfg(any(test, feature = "serde"))]
-pub mod serde_utils;
-
 use std::fmt::Display;
 
 use crate::ser_impls::{read_ecdsa_adaptor_signature, write_ecdsa_adaptor_signature};
@@ -118,8 +115,8 @@ pub struct FundingInput {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_string"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_string"
         )
     )]
     /// The previous transaction used by the associated input in serialized format.
@@ -250,8 +247,8 @@ pub struct WitnessElement {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_string"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_string"
         )
     )]
     /// The serialized witness data.
@@ -321,8 +318,8 @@ pub struct OfferDlc {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_array"
         )
     )]
     /// The identifier of the chain on which the contract will be settled.
@@ -330,8 +327,8 @@ pub struct OfferDlc {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_array"
         )
     )]
     /// Temporary contract id to identify the contract.
@@ -438,8 +435,8 @@ pub struct AcceptDlc {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_array"
         )
     )]
     /// The temporary contract id for the contract.
@@ -495,8 +492,8 @@ pub struct SignDlc {
     #[cfg_attr(
         feature = "serde",
         serde(
-            serialize_with = "crate::serde_utils::serialize_hex",
-            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+            serialize_with = "dlc::serde_utils::serialize_hex",
+            deserialize_with = "dlc::serde_utils::deserialize_hex_array"
         )
     )]
     /// The id of the contract referred to by this message.
diff --git a/dlc-messages/src/sub_channel.rs b/dlc-messages/src/sub_channel.rs
index e1ef5c77..3dc7c2d8 100644
--- a/dlc-messages/src/sub_channel.rs
+++ b/dlc-messages/src/sub_channel.rs
@@ -1,6 +1,7 @@
 //! Module containing messages related to DLC on Lightning channels.
 
 use bitcoin::Script;
+use dlc::SubChannelId;
 use secp256k1_zkp::{ecdsa::Signature, EcdsaAdaptorSignature, PublicKey, SecretKey};
 
 use crate::ser_impls::{read_ecdsa_adaptor_signature, write_ecdsa_adaptor_signature};
@@ -17,7 +18,7 @@ use lightning::util::ser::{Readable, Writeable, Writer};
 /// A message to offer the establishment of a DLC channel within a preexisting Lightning channel.
 pub struct SubChannelOffer {
     /// The id of the Lightning channel the message refers to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The base point that will be used by the offer party for revocation of the DLC channel
     /// transactions.
     pub revocation_basepoint: PublicKey,
@@ -90,7 +91,7 @@ impl_dlc_writeable!(
 )]
 pub struct SubChannelAccept {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The base point that will be used by the offer party for revocation of the split
     /// transaction.
     pub revocation_basepoint: PublicKey,
@@ -166,7 +167,7 @@ impl_dlc_writeable!(
 )]
 pub struct SubChannelConfirm {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The adaptor signature used for revocation of the split transaction.
     pub split_adaptor_signature: EcdsaAdaptorSignature,
     /// The signature for the new commitment transaction.
@@ -208,7 +209,7 @@ impl_dlc_writeable!(SubChannelConfirm, {
 )]
 pub struct SubChannelFinalize {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The pre-image of the revocation point used for the old commitment transaction.
     pub per_commitment_secret: SecretKey,
     /// The commitment point for the next Lightning commitment transaction.
@@ -233,7 +234,7 @@ impl_dlc_writeable!(SubChannelFinalize, {
 )]
 pub struct SubChannelRevoke {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The pre-image of the revocation point used for the old commitment transaction.
     pub per_commitment_secret: SecretKey,
     /// The commitment point for the next Lightning commitment transaction.
@@ -256,7 +257,7 @@ impl_dlc_writeable!(SubChannelRevoke, {
 )]
 pub struct SubChannelCloseOffer {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The balance proposed to the counter party.
     pub accept_balance: u64,
 }
@@ -276,7 +277,7 @@ impl_dlc_writeable!(SubChannelCloseOffer, {
 )]
 pub struct SubChannelCloseAccept {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The signature for the new commitment transaction The signature for the new commitment
     /// transaction.
     pub commit_signature: Signature,
@@ -303,7 +304,7 @@ impl_dlc_writeable!(SubChannelCloseAccept, {
 )]
 pub struct SubChannelCloseConfirm {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The signature for the new commitment transaction The signature for the new commitment
     /// transaction.
     pub commit_signature: Signature,
@@ -339,7 +340,7 @@ impl_dlc_writeable!(SubChannelCloseConfirm, {
 )]
 pub struct SubChannelCloseFinalize {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
     /// The pre-image of the split transaction revocation point.
     pub split_revocation_secret: SecretKey,
     /// The pre-image of the commit transaction revocation point.
@@ -365,7 +366,7 @@ impl_dlc_writeable!(SubChannelCloseFinalize, {
 )]
 pub struct Reject {
     /// The id of the Lightning channel the message relates to.
-    pub channel_id: [u8; 32],
+    pub channel_id: SubChannelId,
 }
 
 impl_dlc_writeable!(Reject, { (channel_id, writeable) });
diff --git a/dlc-sled-storage-provider/Cargo.toml b/dlc-sled-storage-provider/Cargo.toml
index f627f6d5..e9ec6f8a 100644
--- a/dlc-sled-storage-provider/Cargo.toml
+++ b/dlc-sled-storage-provider/Cargo.toml
@@ -13,8 +13,9 @@ wallet = ["bitcoin", "secp256k1-zkp", "simple-wallet"]
 
 [dependencies]
 bitcoin = {version = "0.29", optional = true}
+dlc = {path = "../dlc"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 log = "0.4.14"
 secp256k1-zkp = {version = "0.7", optional = true}
 simple-wallet = {path = "../simple-wallet", optional = true}
diff --git a/dlc-sled-storage-provider/src/lib.rs b/dlc-sled-storage-provider/src/lib.rs
index eec82724..32a45a5e 100644
--- a/dlc-sled-storage-provider/src/lib.rs
+++ b/dlc-sled-storage-provider/src/lib.rs
@@ -16,6 +16,7 @@ extern crate sled;
 
 #[cfg(feature = "wallet")]
 use bitcoin::{Address, Txid};
+use dlc::{DlcChannelId, SubChannelId};
 use dlc_manager::chain_monitor::ChainMonitor;
 use dlc_manager::channel::accepted_channel::AcceptedChannel;
 use dlc_manager::channel::offered_channel::OfferedChannel;
@@ -352,12 +353,12 @@ impl Storage for SledStorageProvider {
                 |(channel_db, contract_db)| -> ConflictableTransactionResult<(), UnabortableTransactionError> {
                     match &channel {
                         a @ Channel::Accepted(_) | a @ Channel::Signed(_) => {
-                            channel_db.remove(&a.get_temporary_id())?;
+                            channel_db.remove(&a.get_temporary_id().inner())?;
                         }
                         _ => {}
                     };
 
-                    channel_db.insert(&channel.get_id(), serialized.clone())?;
+                    channel_db.insert(&channel.get_id().inner(), serialized.clone())?;
 
                     if let Some(c) = contract.as_ref() {
                         insert_contract(
@@ -377,17 +378,17 @@ impl Storage for SledStorageProvider {
         Ok(())
     }
 
-    fn delete_channel(&self, channel_id: &dlc_manager::ChannelId) -> Result<(), Error> {
+    fn delete_channel(&self, channel_id: &DlcChannelId) -> Result<(), Error> {
         self.channel_tree()?
-            .remove(channel_id)
+            .remove(channel_id.inner())
             .map_err(to_storage_error)?;
         Ok(())
     }
 
-    fn get_channel(&self, channel_id: &dlc_manager::ChannelId) -> Result<Option<Channel>, Error> {
+    fn get_channel(&self, channel_id: &DlcChannelId) -> Result<Option<Channel>, Error> {
         match self
             .channel_tree()?
-            .get(channel_id)
+            .get(channel_id.inner())
             .map_err(to_storage_error)?
         {
             Some(res) => Ok(Some(deserialize_channel(&res)?)),
@@ -446,20 +447,17 @@ impl Storage for SledStorageProvider {
     fn upsert_sub_channel(&self, subchannel: &SubChannel) -> Result<(), Error> {
         let serialized = serialize_sub_channel(subchannel)?;
         self.sub_channel_tree()?
-            .insert(subchannel.channel_id, serialized)
+            .insert(subchannel.channel_id.inner(), serialized)
             .map_err(to_storage_error)?;
 
         self.sub_channel_tree()?.flush().map_err(to_storage_error)?;
         Ok(())
     }
 
-    fn get_sub_channel(
-        &self,
-        channel_id: dlc_manager::ChannelId,
-    ) -> Result<Option<SubChannel>, Error> {
+    fn get_sub_channel(&self, channel_id: SubChannelId) -> Result<Option<SubChannel>, Error> {
         match self
             .sub_channel_tree()?
-            .get(channel_id)
+            .get(channel_id.inner())
             .map_err(to_storage_error)?
         {
             Some(res) => Ok(Some(deserialize_sub_channel(&res)?)),
diff --git a/dlc/Cargo.toml b/dlc/Cargo.toml
index c74d446b..79a14f75 100644
--- a/dlc/Cargo.toml
+++ b/dlc/Cargo.toml
@@ -9,10 +9,11 @@ version = "0.4.0"
 
 [dependencies]
 bitcoin = {version = "0.29.2"}
+lightning = {version = "0.0.117"}
 miniscript = "8.0.0"
 secp256k1-sys = {version = "0.6.1" }
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand-std"]}
-serde = {version = "1.0", default-features = false, optional = true}
+serde = {version = "1.0", features = ["derive"], optional = true}
 
 [features]
 # for benchmarks
diff --git a/dlc/src/ids.rs b/dlc/src/ids.rs
new file mode 100644
index 00000000..30d061d8
--- /dev/null
+++ b/dlc/src/ids.rs
@@ -0,0 +1,113 @@
+use lightning::ln::msgs::DecodeError;
+use lightning::ln::ChannelId;
+use lightning::util::ser::Readable;
+use lightning::util::ser::Writeable;
+use lightning::util::ser::Writer;
+
+// TODO: Implement Debug/Display as hex string
+
+/// The identifier for a DLC channel.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq, Hash)]
+pub struct DlcChannelId(
+    #[cfg_attr(
+        feature = "serde",
+        serde(
+            serialize_with = "crate::serde_utils::serialize_hex",
+            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+        )
+    )]
+    [u8; 32],
+);
+
+impl DlcChannelId {
+    /// Create a new DLC channel ID from the provided data.
+    pub fn from_bytes(bytes: [u8; 32]) -> Self {
+        Self(bytes)
+    }
+
+    /// Get the 32-byte array representation of the DLC channel ID.
+    pub fn inner(&self) -> [u8; 32] {
+        self.0
+    }
+}
+
+impl Writeable for DlcChannelId {
+    fn write<W: Writer>(&self, writer: &mut W) -> Result<(), std::io::Error> {
+        self.0.write(writer)
+    }
+}
+
+impl Readable for DlcChannelId {
+    fn read<R: std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
+        let mut buf = [0; 32];
+        reader.read_exact(&mut buf)?;
+
+        Ok(Self(buf))
+    }
+}
+
+/// The identifier for a subchannel.
+#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[derive(Clone, Copy, Debug, PartialEq, Eq)]
+pub struct SubChannelId(
+    #[cfg_attr(
+        feature = "serde",
+        serde(
+            serialize_with = "crate::serde_utils::serialize_hex",
+            deserialize_with = "crate::serde_utils::deserialize_hex_array"
+        )
+    )]
+    [u8; 32],
+);
+
+impl SubChannelId {
+    /// Create a new subchannel ID from the provided data.
+    pub fn from_bytes(bytes: [u8; 32]) -> Self {
+        Self(bytes)
+    }
+
+    /// Get the 32-byte array representation of the subchannel ID.
+    pub fn inner(&self) -> [u8; 32] {
+        self.0
+    }
+}
+
+impl Writeable for SubChannelId {
+    fn write<W: Writer>(&self, writer: &mut W) -> Result<(), std::io::Error> {
+        self.0.write(writer)
+    }
+}
+
+impl Readable for SubChannelId {
+    fn read<R: std::io::Read>(reader: &mut R) -> Result<Self, DecodeError> {
+        let mut buf = [0; 32];
+        reader.read_exact(&mut buf)?;
+
+        Ok(Self(buf))
+    }
+}
+
+impl From<ChannelId> for SubChannelId {
+    fn from(value: ChannelId) -> Self {
+        Self::from_bytes(value.0)
+    }
+}
+
+impl From<&ChannelId> for SubChannelId {
+    fn from(value: &ChannelId) -> Self {
+        SubChannelId::from_bytes(value.0)
+    }
+}
+
+impl From<SubChannelId> for ChannelId {
+    fn from(value: SubChannelId) -> Self {
+        Self(value.inner())
+    }
+}
+
+impl From<&SubChannelId> for ChannelId {
+    fn from(value: &SubChannelId) -> Self {
+        Self(value.inner())
+    }
+}
diff --git a/dlc/src/lib.rs b/dlc/src/lib.rs
index f9e0fd3a..11c05705 100644
--- a/dlc/src/lib.rs
+++ b/dlc/src/lib.rs
@@ -14,6 +14,7 @@
 
 extern crate bitcoin;
 extern crate core;
+extern crate lightning;
 extern crate miniscript;
 extern crate secp256k1_sys;
 extern crate secp256k1_zkp;
@@ -38,10 +39,17 @@ use secp256k1_zkp::{
 use serde::{Deserialize, Serialize};
 use std::fmt;
 
+mod ids;
+
 pub mod channel;
 pub mod secp_utils;
 pub mod util;
 
+#[cfg(feature = "serde")]
+pub mod serde_utils;
+
+pub use ids::{DlcChannelId, SubChannelId};
+
 /// Minimum value that can be included in a transaction output. Under this value,
 /// outputs are discarded
 /// See: https://github.com/discreetlogcontracts/dlcspecs/blob/master/Transactions.md#change-outputs
diff --git a/dlc-messages/src/serde_utils.rs b/dlc/src/serde_utils.rs
similarity index 97%
rename from dlc-messages/src/serde_utils.rs
rename to dlc/src/serde_utils.rs
index a176f23c..d9fdcf41 100644
--- a/dlc-messages/src/serde_utils.rs
+++ b/dlc/src/serde_utils.rs
@@ -1,5 +1,8 @@
 //! Utility functions to serialize hexadecimal values as strings in json.
 
+#[cfg(feature = "serde")]
+extern crate serde;
+
 use std::fmt::Write;
 
 /// Serialize an hexadecimal value.
diff --git a/electrs-blockchain-provider/Cargo.toml b/electrs-blockchain-provider/Cargo.toml
index 958f5318..d994393c 100644
--- a/electrs-blockchain-provider/Cargo.toml
+++ b/electrs-blockchain-provider/Cargo.toml
@@ -9,8 +9,8 @@ version = "0.1.0"
 bitcoin = {version = "0.29"}
 bitcoin-test-utils = {path = "../bitcoin-test-utils"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.116"}
-lightning-block-sync = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
+lightning-block-sync = {version = "0.0.117"}
 log = "0.4.14"
 reqwest = {version = "0.11", features = ["blocking", "json"]}
 serde = {version = "*", features = ["derive"]}
diff --git a/fuzz/Cargo.toml b/fuzz/Cargo.toml
index a9fe6b17..6cc1f982 100644
--- a/fuzz/Cargo.toml
+++ b/fuzz/Cargo.toml
@@ -10,7 +10,7 @@ cargo-fuzz = true
 [dependencies]
 dlc-messages = {path = "../dlc-messages"}
 honggfuzz = "0.5"
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 
 [workspace]
 members = ["."]
diff --git a/mocks/Cargo.toml b/mocks/Cargo.toml
index 9e68dcdc..ec343029 100644
--- a/mocks/Cargo.toml
+++ b/mocks/Cargo.toml
@@ -9,6 +9,6 @@ bitcoin = "0.29"
 dlc = {path = "../dlc"}
 dlc-manager = {path = "../dlc-manager"}
 dlc-messages = {path = "../dlc-messages"}
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 secp256k1-zkp = {version = "0.7.0", features = ["bitcoin_hashes", "rand", "rand-std", "global-context"]}
 simple-wallet = {path = "../simple-wallet"}
diff --git a/mocks/src/memory_storage_provider.rs b/mocks/src/memory_storage_provider.rs
index 7375123a..228429d6 100644
--- a/mocks/src/memory_storage_provider.rs
+++ b/mocks/src/memory_storage_provider.rs
@@ -1,4 +1,5 @@
 use bitcoin::{Address, OutPoint, Txid};
+use dlc::{DlcChannelId, SubChannelId};
 use dlc_manager::chain_monitor::ChainMonitor;
 use dlc_manager::channel::{
     offered_channel::OfferedChannel,
@@ -11,7 +12,7 @@ use dlc_manager::contract::{
 use dlc_manager::sub_channel_manager::Action;
 use dlc_manager::subchannel::{SubChannel, SubChannelState};
 use dlc_manager::Storage;
-use dlc_manager::{error::Error as DaemonError, ChannelId, ContractId, Utxo};
+use dlc_manager::{error::Error as DaemonError, ContractId, Utxo};
 use secp256k1_zkp::{PublicKey, SecretKey};
 use simple_wallet::WalletStorage;
 use std::collections::HashMap;
@@ -19,11 +20,11 @@ use std::sync::{Mutex, RwLock};
 
 pub struct MemoryStorage {
     contracts: RwLock<HashMap<ContractId, Contract>>,
-    channels: RwLock<HashMap<ChannelId, Channel>>,
-    sub_channels: RwLock<HashMap<ChannelId, SubChannel>>,
+    channels: RwLock<HashMap<[u8; 32], Channel>>,
+    sub_channels: RwLock<HashMap<[u8; 32], SubChannel>>,
     contracts_saved: Mutex<Option<HashMap<ContractId, Contract>>>,
-    channels_saved: Mutex<Option<HashMap<ChannelId, Channel>>>,
-    sub_channels_saved: Mutex<Option<HashMap<ChannelId, SubChannel>>>,
+    channels_saved: Mutex<Option<HashMap<[u8; 32], Channel>>>,
+    sub_channels_saved: Mutex<Option<HashMap<[u8; 32], SubChannel>>>,
     addresses: RwLock<HashMap<Address, SecretKey>>,
     utxos: RwLock<HashMap<OutPoint, Utxo>>,
     key_pairs: RwLock<HashMap<PublicKey, SecretKey>>,
@@ -207,11 +208,11 @@ impl Storage for MemoryStorage {
             let mut map = self.channels.write().expect("Could not get write lock");
             match &channel {
                 a @ Channel::Accepted(_) | a @ Channel::Signed(_) => {
-                    map.remove(&a.get_temporary_id());
+                    map.remove(&a.get_temporary_id().inner());
                 }
                 _ => {}
             };
-            map.insert(channel.get_id(), channel);
+            map.insert(channel.get_id().inner(), channel);
         }
         if let Some(c) = contract {
             self.update_contract(&c)?;
@@ -219,15 +220,15 @@ impl Storage for MemoryStorage {
         Ok(())
     }
 
-    fn delete_channel(&self, channel_id: &ChannelId) -> Result<(), DaemonError> {
+    fn delete_channel(&self, channel_id: &DlcChannelId) -> Result<(), DaemonError> {
         let mut map = self.channels.write().expect("Could not get write lock");
-        map.remove(channel_id);
+        map.remove(&channel_id.inner());
         Ok(())
     }
 
-    fn get_channel(&self, channel_id: &ChannelId) -> Result<Option<Channel>, DaemonError> {
+    fn get_channel(&self, channel_id: &DlcChannelId) -> Result<Option<Channel>, DaemonError> {
         let map = self.channels.read().expect("could not get read lock");
-        Ok(map.get(channel_id).cloned())
+        Ok(map.get(&channel_id.inner()).cloned())
     }
 
     fn get_signed_channels(
@@ -279,19 +280,16 @@ impl Storage for MemoryStorage {
 
     fn upsert_sub_channel(&self, subchannel: &SubChannel) -> Result<(), DaemonError> {
         let mut map = self.sub_channels.write().expect("Could not get write lock");
-        map.insert(subchannel.channel_id, subchannel.clone());
+        map.insert(subchannel.channel_id.inner(), subchannel.clone());
         Ok(())
     }
 
-    fn get_sub_channel(
-        &self,
-        channel_id: dlc_manager::ChannelId,
-    ) -> Result<Option<SubChannel>, DaemonError> {
+    fn get_sub_channel(&self, channel_id: SubChannelId) -> Result<Option<SubChannel>, DaemonError> {
         let res = self
             .sub_channels
             .read()
             .expect("could not get read lock")
-            .get(&channel_id)
+            .get(&channel_id.inner())
             .cloned();
         Ok(res)
     }
diff --git a/sample/Cargo.toml b/sample/Cargo.toml
index 3c3b3cac..369663e6 100644
--- a/sample/Cargo.toml
+++ b/sample/Cargo.toml
@@ -12,8 +12,8 @@ dlc-manager = {path = "../dlc-manager", features = ["use-serde", "parallel"]}
 dlc-messages = {path = "../dlc-messages"}
 dlc-sled-storage-provider = {path = "../dlc-sled-storage-provider"}
 futures = "0.3"
-lightning = {version = "0.0.116"}
-lightning-net-tokio = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
+lightning-net-tokio = {version = "0.0.117"}
 p2pd-oracle-client = {path = "../p2pd-oracle-client"}
 serde = "1.0"
 serde_json = "1.0"
diff --git a/sample/src/cli.rs b/sample/src/cli.rs
index a8eba015..f33c6d08 100644
--- a/sample/src/cli.rs
+++ b/sample/src/cli.rs
@@ -5,6 +5,7 @@ use crate::DlcMessageHandler;
 use crate::PeerManager;
 use bitcoin::network::constants::Network;
 use bitcoin::secp256k1::PublicKey;
+use dlc::DlcChannelId;
 use dlc_manager::channel::signed_channel::SignedChannelState;
 use dlc_manager::channel::signed_channel::SignedChannelStateType;
 use dlc_manager::contract::contract_input::ContractInput;
@@ -14,7 +15,7 @@ use dlc_messages::ChannelMessage;
 use dlc_messages::Message as DlcMessage;
 use dlc_messages::OnChainMessage;
 use hex_utils::{hex_str, to_slice};
-use lightning::ln::msgs::NetAddress;
+use lightning::ln::msgs::SocketAddress;
 use serde::Deserialize;
 use serde_json::Value;
 use std::convert::TryInto;
@@ -46,7 +47,7 @@ pub struct OracleConfig {
 #[derive(Debug)]
 pub struct NetworkConfig {
     pub peer_listening_port: u16,
-    pub announced_listen_addr: Option<NetAddress>,
+    pub announced_listen_addr: Option<SocketAddress>,
 }
 
 #[derive(Debug, Deserialize)]
@@ -80,11 +81,11 @@ where
             .as_str()
             .expect("Error parsing announcedListeAddr");
         match IpAddr::from_str(buf) {
-            Ok(IpAddr::V4(a)) => Some(NetAddress::IPv4 {
+            Ok(IpAddr::V4(a)) => Some(SocketAddress::TcpIpV4 {
                 addr: a.octets(),
                 port: peer_listening_port,
             }),
-            Ok(IpAddr::V6(a)) => Some(NetAddress::IPv6 {
+            Ok(IpAddr::V6(a)) => Some(SocketAddress::TcpIpV6 {
                 addr: a.octets(),
                 port: peer_listening_port,
             }),
@@ -316,7 +317,7 @@ pub(crate) async fn poll_for_user_input(
                         .iter()
                         .filter(|x| !x.is_offer_party)
                     {
-                        let channel_id = hex_str(&offer.temporary_channel_id);
+                        let channel_id = hex_str(&offer.temporary_channel_id.inner());
                         let channel_offer_json_path =
                             format!("{}/{}.json", offers_path, channel_id);
                         if fs::metadata(&channel_offer_json_path).is_err() {
@@ -333,6 +334,7 @@ pub(crate) async fn poll_for_user_input(
                 }
                 a @ "acceptchannel" => {
                     let channel_id = read_id_or_continue!(words, a, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
 
                     let (msg, _, _, node_id) = dlc_manager
                         .lock()
@@ -345,6 +347,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 s @ "offersettlechannel" => {
                     let channel_id = read_id_or_continue!(words, s, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let counter_payout: u64 = match words.next().map(|w| w.parse().ok()) {
                         Some(Some(p)) => p,
                         _ => {
@@ -366,6 +370,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 l @ "acceptsettlechanneloffer" => {
                     let channel_id = read_id_or_continue!(words, l, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let (msg, node_id) = dlc_manager
                         .lock()
                         .unwrap()
@@ -379,6 +385,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 l @ "rejectsettlechanneloffer" => {
                     let channel_id = read_id_or_continue!(words, l, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let (msg, node_id) = dlc_manager
                         .lock()
                         .unwrap()
@@ -396,7 +404,7 @@ pub(crate) async fn poll_for_user_input(
                         .unwrap()
                         .iter()
                     {
-                        let channel_id = hex_str(&channel.channel_id);
+                        let channel_id = hex_str(&channel.channel_id.inner());
                         let own_payout = match channel.state {
                             SignedChannelState::SettledReceived { own_payout, .. } => own_payout,
                             _ => continue,
@@ -409,6 +417,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 o @ "offerchannelrenew" => {
                     let channel_id = read_id_or_continue!(words, o, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let (counter_payout, contract_path) =
                         match (words.next().map(|x| x.parse()), words.next()) {
                             (Some(Ok(payout)), Some(s)) => (payout, s),
@@ -442,7 +452,7 @@ pub(crate) async fn poll_for_user_input(
                         .unwrap()
                         .iter()
                     {
-                        let channel_id = hex_str(&channel.channel_id);
+                        let channel_id = hex_str(&channel.channel_id.inner());
                         let own_payout = match channel.state {
                             SignedChannelState::RenewOffered {
                                 counter_payout,
@@ -466,6 +476,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 l @ "acceptrenewchannel" => {
                     let channel_id = read_id_or_continue!(words, l, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let (msg, node_id) = dlc_manager
                         .lock()
                         .unwrap()
@@ -479,6 +491,8 @@ pub(crate) async fn poll_for_user_input(
                 }
                 l @ "rejectrenewchanneloffer" => {
                     let channel_id = read_id_or_continue!(words, l, "channel id");
+                    let channel_id = DlcChannelId::from_bytes(channel_id);
+
                     let (msg, node_id) = dlc_manager
                         .lock()
                         .unwrap()
@@ -496,7 +510,7 @@ pub(crate) async fn poll_for_user_input(
                         .unwrap()
                         .iter()
                     {
-                        let channel_id = hex_str(&channel.channel_id);
+                        let channel_id = hex_str(&channel.channel_id.inner());
                         println!(
                             "Signed channel {:?} with {}",
                             channel_id, channel.counter_party
diff --git a/simple-wallet/Cargo.toml b/simple-wallet/Cargo.toml
index cae4eac2..08cade5f 100644
--- a/simple-wallet/Cargo.toml
+++ b/simple-wallet/Cargo.toml
@@ -9,7 +9,7 @@ version = "0.1.0"
 bitcoin = "0.29"
 dlc = {path = "../dlc"}
 dlc-manager = {path = "../dlc-manager"}
-lightning = {version = "0.0.116"}
+lightning = {version = "0.0.117"}
 rust-bitcoin-coin-selection = { rev = "23a6bf85", git = "https://github.com/p2pderivatives/rust-bitcoin-coin-selection", features = ["rand"]}
 secp256k1-zkp = {version = "0.7.0"}