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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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" + '
Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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('^' + ".*" + ' Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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('^' + ".*" + ' Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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" + ' Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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('^' + ".*" + ' Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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('^' + ".*" + ' Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading
, '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); } })(); })(); Add weekly nightly `rustfmt` job by tnull · Pull Request #97 · lightningdevkit/ldk-server · GitHub
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
33 changes: 33 additions & 0 deletions .github/workflows/cron-weekly-rustfmt.yml
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
name: Nightly rustfmt

permissions:
contents: write
pull-requests: write

on:
schedule:
- cron: "0 0 * * 0" # runs weekly on Sunday at 00:00
workflow_dispatch: # allows manual triggering
jobs:
format:
name: Nightly rustfmt
runs-on: ubuntu-24.04
steps:
- uses: actions/checkout@v5
- uses: dtolnay/rust-toolchain@nightly
with:
components: rustfmt
- name: Run Nightly rustfmt
# Run the formatter and manually remove trailing whitespace.
run: cargo +nightly fmt && git ls-files -- '*.rs' -z | xargs sed -E -i'' -e 's/[[:space:]]+$//'
- name: Get the current date
run: echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
- name: Create Pull Request
uses: peter-evans/create-pull-request@v7
with:
author: Fmt Bot <bot@example.com>
title: Automated nightly rustfmt (${{ env.date }})
body: |
Automated nightly `rustfmt` changes by [create-pull-request](https://github.com/peter-evans/create-pull-request) GitHub action
commit-message: ${{ env.date }} automated rustfmt nightly
labels: rustfmt
13 changes: 7 additions & 6 deletions ldk-server-client/src/client.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,8 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use prost::Message;
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};
use bitcoin_hashes::hmac::{Hmac, HmacEngine};
use bitcoin_hashes::{sha256, Hash, HashEngine};
use ldk_server_protos::api::{
Expand All@@ -32,9 +28,14 @@ use ldk_server_protos::endpoints::{
OPEN_CHANNEL_PATH, SPLICE_IN_PATH, SPLICE_OUT_PATH, UPDATE_CHANNEL_CONFIG_PATH,
};
use ldk_server_protos::error::{ErrorCode, ErrorResponse};
use prost::Message;
use reqwest::header::CONTENT_TYPE;
use reqwest::{Certificate, Client};
use std::time::{SystemTime, UNIX_EPOCH};

use crate::error::LdkServerError;
use crate::error::LdkServerErrorCode::{
AuthError, InternalError, InternalServerError, InvalidRequestError, LightningError,
};

const APPLICATION_OCTET_STREAM: &str = "application/octet-stream";

Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt11_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::proto_to_bolt11_description;
use ldk_server_protos::api::{Bolt11ReceiveRequest, Bolt11ReceiveResponse};

pub(crate) fn handle_bolt11_receive_request(
context: Context, request: Bolt11ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt11_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_node::lightning_invoice::Bolt11Invoice;
use ldk_server_protos::api::{Bolt11SendRequest, Bolt11SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt11_send_request(
context: Context, request: Bolt11SendRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/bolt12_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{Bolt12ReceiveRequest, Bolt12ReceiveResponse};

pub(crate) fn handle_bolt12_receive_request(
context: Context, request: Bolt12ReceiveRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/bolt12_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,15 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::lightning::offers::offer::Offer;
use ldk_node::lightning::routing::router::RouteParametersConfig;
use ldk_server_protos::api::{Bolt12SendRequest, Bolt12SendResponse};
use std::str::FromStr;

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

pub(crate) fn handle_bolt12_send_request(
context: Context, request: Bolt12SendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/close_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,15 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
CloseChannelRequest, CloseChannelResponse, ForceCloseChannelRequest, ForceCloseChannelResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_close_channel_request(
context: Context, request: CloseChannelRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/error.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_node::NodeError;
use std::fmt;

use ldk_node::NodeError;

#[derive(Clone, Debug, PartialEq, Eq)]
pub(crate) struct LdkServerError {
// The error message containing a generic description of the error condition in English.
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/get_balances.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::{lightning_balance_to_proto, pending_sweep_balance_to_proto};
use ldk_server_protos::api::{GetBalancesRequest, GetBalancesResponse};

pub(crate) fn handle_get_balances_request(
context: Context, _request: GetBalancesRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/get_node_info.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{GetNodeInfoRequest, GetNodeInfoResponse};
use ldk_server_protos::types::BestBlock;

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

pub(crate) fn handle_get_node_info_request(
context: Context, _request: GetNodeInfoRequest,
) -> Result<GetNodeInfoResponse, LdkServerError> {
Expand Down
7 changes: 4 additions & 3 deletions ldk-server/src/api/get_payment_details.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,13 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use crate::util::proto_adapter::payment_to_proto;
use hex::FromHex;
use ldk_node::lightning::ln::channelmanager::PaymentId;
use ldk_server_protos::api::{GetPaymentDetailsRequest, GetPaymentDetailsResponse};

pub(crate) fn handle_get_payment_details_request(
context: Context, request: GetPaymentDetailsRequest,
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/list_channels.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use crate::util::proto_adapter::channel_to_proto;
use ldk_server_protos::api::{ListChannelsRequest, ListChannelsResponse};

pub(crate) fn handle_list_channels_request(
context: Context, _request: ListChannelsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_forwarded_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,17 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
FORWARDED_PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE,
FORWARDED_PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListForwardedPaymentsRequest, ListForwardedPaymentsResponse};
use ldk_server_protos::types::{ForwardedPayment, PageToken};
use prost::Message;

pub(crate) fn handle_list_forwarded_payments_request(
context: Context, request: ListForwardedPaymentsRequest,
Expand Down
9 changes: 5 additions & 4 deletions ldk-server/src/api/list_payments.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,17 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InternalServerError;
use crate::io::persist::{
PAYMENTS_PERSISTENCE_PRIMARY_NAMESPACE, PAYMENTS_PERSISTENCE_SECONDARY_NAMESPACE,
};
use crate::service::Context;
use bytes::Bytes;
use ldk_server_protos::api::{ListPaymentsRequest, ListPaymentsResponse};
use ldk_server_protos::types::{PageToken, Payment};
use prost::Message;

pub(crate) fn handle_list_payments_request(
context: Context, request: ListPaymentsRequest,
Expand Down
5 changes: 3 additions & 2 deletions ldk-server/src/api/mod.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,11 +7,12 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use ldk_node::config::{ChannelConfig, MaxDustHTLCExposure};
use ldk_server_protos::types::channel_config::MaxDustHtlcExposure;

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

pub(crate) mod bolt11_receive;
pub(crate) mod bolt11_send;
pub(crate) mod bolt12_receive;
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/api/onchain_receive.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,9 +7,10 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

use crate::api::error::LdkServerError;
use crate::service::Context;
use ldk_server_protos::api::{OnchainReceiveRequest, OnchainReceiveResponse};

pub(crate) fn handle_onchain_receive_request(
context: Context, _request: OnchainReceiveRequest,
Expand Down
8 changes: 5 additions & 3 deletions ldk-server/src/api/onchain_send.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,12 +7,14 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use ldk_node::bitcoin::{Address, FeeRate};
use ldk_server_protos::api::{OnchainSendRequest, OnchainSendResponse};
use std::str::FromStr;

pub(crate) fn handle_onchain_send_request(
context: Context, request: OnchainSendRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/open_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::config::ChannelConfig;
use ldk_node::lightning::ln::msgs::SocketAddress;
use ldk_server_protos::api::{OpenChannelRequest, OpenChannelResponse};
use std::str::FromStr;

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::service::Context;

pub(crate) fn handle_open_channel(
context: Context, request: OpenChannelRequest,
Expand Down
10 changes: 6 additions & 4 deletions ldk-server/src/api/splice_channel.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,16 +7,18 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::InvalidRequestError;
use crate::service::Context;
use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::bitcoin::Address;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{
SpliceInRequest, SpliceInResponse, SpliceOutRequest, SpliceOutResponse,
};
use std::str::FromStr;

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

pub(crate) fn handle_splice_in_request(
context: Context, request: SpliceInRequest,
Expand Down
12 changes: 7 additions & 5 deletions ldk-server/src/api/update_channel_config.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,14 +7,16 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use std::str::FromStr;

use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};

use crate::api::build_channel_config_from_proto;
use crate::api::error::LdkServerError;
use crate::api::error::LdkServerErrorCode::{InvalidRequestError, LightningError};
use crate::service::Context;
use ldk_node::bitcoin::secp256k1::PublicKey;
use ldk_node::UserChannelId;
use ldk_server_protos::api::{UpdateChannelConfigRequest, UpdateChannelConfigResponse};
use std::str::FromStr;

pub(crate) fn handle_update_channel_config_request(
context: Context, request: UpdateChannelConfigRequest,
Expand All@@ -24,7 +26,7 @@ pub(crate) fn handle_update_channel_config_request(
.parse::<u128>()
.map_err(|_| LdkServerError::new(InvalidRequestError, "Invalid UserChannelId."))?;

//FIXME: Use ldk/ldk-node's partial config update api.
//FIXME: Use ldk/ldk-node's partial config update api.
let current_config = context
.node
.list_channels()
Expand Down
3 changes: 2 additions & 1 deletion ldk-server/src/io/events/event_publisher.rs
Original file line numberDiff line numberDiff line change
Expand Up@@ -7,10 +7,11 @@
// You may not use this file except in accordance with one or both of these
// licenses.

use crate::api::error::LdkServerError;
use async_trait::async_trait;
use ldk_server_protos::events::EventEnvelope;

use crate::api::error::LdkServerError;

/// A trait for publishing events or notifications from the LDK Server.
///
/// Implementors of this trait define how events are sent to various messaging
Expand Down
Loading