Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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" + '
Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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('^' + ".*" + ' Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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('^' + ".*" + ' Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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" + ' Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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('^' + ".*" + ' Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
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); } })(); })(); Reject invalid parameters instead of silently dropping them by benthecarman · Pull Request #182 · lightningdevkit/ldk-server · GitHub
Skip to content
Open
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
5 changes: 5 additions & 0 deletions ldk-server-cli/src/main.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -779,6 +779,11 @@ async fn main() {
);
},
Commands::Bolt12Receive { description, amount, expiry_secs, quantity } => {
if quantity.is_some() && amount.is_none() {
handle_error_msg(
"quantity can only be set for fixed-amount offers (amount must be provided)",

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Debatable, @TheBlueMatt previously wanted to drop quantity from the LDK Node API (lightningdevkit/ldk-node#642, but was closed as abandoned). Matt, do you still think we should?

);
}
let amount_msat = amount.map(|a| a.to_msat());
handle_response_result::<_, Bolt12ReceiveResponse>(
client
Expand Down
30 changes: 18 additions & 12 deletions ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,23 +13,29 @@ use hex::DisplayHex;
use ldk_server_grpc::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;

pub(crate) async fn handle_bolt12_receive_request(
context: Arc<Context>, request: Bolt12ReceiveRequest,
) -> Result<Bolt12ReceiveResponse, LdkServerError> {
let offer = match request.amount_msat {
Some(amount_msat) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
request.quantity,
)?,
None => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};
let offer =
match (request.amount_msat, request.quantity) {
(Some(amount_msat), quantity) => context.node.bolt12_payment().receive(
amount_msat,
&request.description,
request.expiry_secs,
quantity,
)?,
(None, Some(_)) => return Err(LdkServerError::new(
InvalidRequestError,
"quantity can only be set for fixed-amount offers (amount_msat must be provided)",
)),
(None, None) => context
.node
.bolt12_payment()
.receive_variable_amount(&request.description, request.expiry_secs)?,
};

let offer_id = offer.id().0.to_lower_hex_string();
let response = Bolt12ReceiveResponse { offer: offer.to_string(), offer_id };
Expand Down
7 changes: 6 additions & 1 deletion ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -30,7 +30,12 @@ pub(crate) async fn handle_onchain_send_request(
)
})?;

let fee_rate = request.fee_rate_sat_per_vb.and_then(FeeRate::from_sat_per_vb);
let fee_rate = match request.fee_rate_sat_per_vb {
Some(rate) => Some(FeeRate::from_sat_per_vb(rate).ok_or_else(|| {
LdkServerError::new(InvalidRequestError, format!("Invalid fee rate: {} sat/vB", rate))
})?),
None => None,
};
let txid = match (request.amount_sats, request.send_all) {
(Some(amount_sats), None) => {
context.node.onchain_payment().send_to_address(&address, amount_sats, fee_rate)?
Expand Down