Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions protos/src/lib.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -229,6 +229,24 @@ pub struct OpenChannelResponse {
#[prost(bytes = "bytes", tag = "1")]
pub user_channel_id: ::prost::bytes::Bytes,
}
/// Update the config for a previously opened channel.
/// See more: <https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config>
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigRequest {
/// The hex-encoded local `user_channel_id` of this channel.
#[prost(string, tag = "1")]
pub user_channel_id: ::prost::alloc::string::String,
/// The hex-encoded public key of the counterparty node to update channel config with.
#[prost(string, tag = "2")]
pub counterparty_node_id: ::prost::alloc::string::String,
/// The updated channel configuration settings for a channel.
#[prost(message, optional, tag = "3")]
pub channel_config: ::core::option::Option<ChannelConfig>,
}
#[allow(clippy::derive_partial_eq_without_eq)]
#[derive(Clone, PartialEq, ::prost::Message)]
pub struct UpdateChannelConfigResponse {}
/// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
/// See more: <https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html>
#[allow(clippy::derive_partial_eq_without_eq)]
Expand Down
17 changes: 17 additions & 0 deletions protos/src/proto/ldk_node_server.proto
Original file line numberDiff line numberDiff line change
Expand Up@@ -220,6 +220,23 @@ message OpenChannelResponse {
bytes user_channel_id = 1;
}

// Update the config for a previously opened channel.
// See more: https://docs.rs/ldk-node/latest/ldk_node/struct.Node.html#method.update_channel_config
message UpdateChannelConfigRequest {

// The hex-encoded local `user_channel_id` of this channel.
string user_channel_id = 1;

// The hex-encoded public key of the counterparty node to update channel config with.
string counterparty_node_id = 2;

// The updated channel configuration settings for a channel.
ChannelConfig channel_config = 3;
}

message UpdateChannelConfigResponse {
}

// ChannelConfig represents the configuration settings for a channel in a Lightning Network node.
// See more: https://docs.rs/lightning/latest/lightning/util/config/struct.ChannelConfig.html
message ChannelConfig {
Expand Down
1 change: 1 addition & 0 deletions server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,3 +10,4 @@ pub(crate) mod list_payments;
pub(crate) mod onchain_receive;
pub(crate) mod onchain_send;
pub(crate) mod open_channel;
pub(crate) mod update_channel_config;
75 changes: 75 additions & 0 deletions server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,75 @@
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_node::{Node, UserChannelId};
use protos::channel_config::MaxDustHtlcExposure;
use protos::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;
use std::sync::Arc;

pub(crate) const UPDATE_CHANNEL_CONFIG_PATH: &str = "UpdateChannelConfig";

pub(crate) fn handle_update_channel_config_request(
node: Arc<Node>, request: UpdateChannelConfigRequest,
) -> Result<UpdateChannelConfigResponse, ldk_node::NodeError> {
let user_channel_id: u128 =
request.user_channel_id.parse().map_err(|_| ldk_node::NodeError::InvalidChannelId)?;

//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = node
.list_channels()
.into_iter()
.find(|c| c.user_channel_id.0 == user_channel_id)
.ok_or_else(|| ldk_node::NodeError::InvalidChannelId)?
.config;
Comment on lines +17 to +23

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should we do this now?

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Afaiu, Currently there is no api in ldk-node for partial config update, this will have to wait until next ldk-node release.

Since the functionality/user-interface here is equivalent, I don't think there is much point in waiting till then.
Created: lightningdevkit/ldk-node#385

We can remove this once that is complete.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah, right!


let updated_channel_config =
build_updated_channel_config(current_config, request.channel_config.unwrap());

let counterparty_node_id = PublicKey::from_str(&request.counterparty_node_id)
.map_err(|_| ldk_node::NodeError::InvalidPublicKey)?;
node.update_channel_config(
&UserChannelId(user_channel_id),
counterparty_node_id,
updated_channel_config,
)
.map_err(ldk_node::NodeError::from)?;

Ok(UpdateChannelConfigResponse {})
}

fn build_updated_channel_config(
current_config: ChannelConfig, proto_channel_config: protos::ChannelConfig,
) -> ChannelConfig {
let max_dust_htlc_exposure = proto_channel_config
.max_dust_htlc_exposure
.map(|max_dust_htlc_exposure| match max_dust_htlc_exposure {
MaxDustHtlcExposure::FixedLimitMsat(limit_msat) => {
MaxDustHTLCExposure::FixedLimit { limit_msat }
},
MaxDustHtlcExposure::FeeRateMultiplier(multiplier) => {
MaxDustHTLCExposure::FeeRateMultiplier { multiplier }
},
})
.unwrap_or(current_config.max_dust_htlc_exposure);

let cltv_expiry_delta = proto_channel_config
.cltv_expiry_delta.map(|c| u16::try_from(c).unwrap())
.unwrap_or(current_config.cltv_expiry_delta);

ChannelConfig {
forwarding_fee_proportional_millionths: proto_channel_config
.forwarding_fee_proportional_millionths
.unwrap_or(current_config.forwarding_fee_proportional_millionths),
forwarding_fee_base_msat: proto_channel_config
.forwarding_fee_base_msat
.unwrap_or(current_config.forwarding_fee_base_msat),
cltv_expiry_delta,
max_dust_htlc_exposure,
force_close_avoidance_max_fee_satoshis: proto_channel_config
.force_close_avoidance_max_fee_satoshis
.unwrap_or(current_config.force_close_avoidance_max_fee_satoshis),
accept_underpaying_htlcs: proto_channel_config
.accept_underpaying_htlcs
.unwrap_or(current_config.accept_underpaying_htlcs),
}
}
6 changes: 6 additions & 0 deletions server/src/service.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,6 +25,9 @@ use crate::api::list_payments::{handle_list_payments_request, LIST_PAYMENTS_PATH
use crate::api::onchain_receive::{handle_onchain_receive_request, ONCHAIN_RECEIVE_PATH};
use crate::api::onchain_send::{handle_onchain_send_request, ONCHAIN_SEND_PATH};
use crate::api::open_channel::{handle_open_channel, OPEN_CHANNEL_PATH};
use crate::api::update_channel_config::{
handle_update_channel_config_request, UPDATE_CHANNEL_CONFIG_PATH,
};

#[derive(Clone)]
pub struct NodeService {
Expand DownExpand Up@@ -62,6 +65,9 @@ impl Service<Request<Incoming>> for NodeService {
OPEN_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_open_channel)),
CLOSE_CHANNEL_PATH => Box::pin(handle_request(node, req, handle_close_channel_request)),
LIST_CHANNELS_PATH => Box::pin(handle_request(node, req, handle_list_channels_request)),
UPDATE_CHANNEL_CONFIG_PATH => {
Box::pin(handle_request(node, req, handle_update_channel_config_request))
},
GET_PAYMENT_DETAILS_PATH => {
Box::pin(handle_request(node, req, handle_get_payment_details_request))
},
Expand Down