Skip to content

Minor post-#3623 cleanups #3841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 10, 2025
Merged

Minor post-#3623 cleanups #3841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cd31737
Clean up some unnecessary ()s in `sign/mod.rs`
TheBlueMatt Jun 10, 2025
9ad6525
Clean up allocations in `internal_peer_storage_retrieval`
TheBlueMatt Jun 10, 2025
25bde68
Run `rustfmt` on `internal_peer_storage_retrieval`
TheBlueMatt Jun 10, 2025
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
40 changes: 19 additions & 21 deletions lightning/src/ln/channelmanager.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8546,37 +8546,35 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
}
}

#[rustfmt::skip]
fn internal_peer_storage_retrieval(&self, counterparty_node_id: PublicKey, msg: msgs::PeerStorageRetrieval) -> Result<(), MsgHandleErrInternal> {
fn internal_peer_storage_retrieval(
&self, peer_node_id: PublicKey, msg: msgs::PeerStorageRetrieval,
) -> Result<(), MsgHandleErrInternal> {
// TODO: Check if have any stale or missing ChannelMonitor.
let logger = WithContext::from(&self.logger, Some(counterparty_node_id), None, None);
let err = MsgHandleErrInternal::from_chan_no_close(
ChannelError::Ignore("Invalid PeerStorageRetrieval message received.".into()),
ChannelId([0; 32]),
);
let err_str = || {
format!("Invalid PeerStorage received from {}", counterparty_node_id)
let logger = WithContext::from(&self.logger, Some(peer_node_id), None, None);
let err = || {
MsgHandleErrInternal::from_chan_no_close(
ChannelError::Ignore("Invalid PeerStorageRetrieval message received.".into()),
ChannelId([0; 32]),
)
};

let encrypted_ops = match EncryptedOurPeerStorage::new(msg.data) {
Ok(encrypted_ops) => encrypted_ops,
Err(_) => {
log_debug!(logger, "{}", err_str());
return Err(err);
}
Err(()) => {
log_debug!(logger, "Received a peer backup which wasn't long enough to be valid");
return Err(err());
},
};

let decrypted_data = match encrypted_ops.decrypt(&self.node_signer.get_peer_storage_key()) {
let decrypted = match encrypted_ops.decrypt(&self.node_signer.get_peer_storage_key()) {
Ok(decrypted_ops) => decrypted_ops.into_vec(),
Err(_) => {
log_debug!(logger, "{}", err_str());
return Err(err);
}
Err(()) => {
log_debug!(logger, "Received a peer backup which was corrupted");
return Err(err());
},
};

if decrypted_data.is_empty() {
log_debug!(logger, "Received a peer storage from peer {} with 0 channels.", log_pubkey!(counterparty_node_id));
}
log_trace!(logger, "Got valid {}-byte peer backup from {}", decrypted.len(), peer_node_id);

Ok(())
}
Expand Down
10 changes: 5 additions & 5 deletions lightning/src/sign/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1858,11 +1858,11 @@ impl KeysManager {
pub fn new(seed: &[u8; 32], starting_time_secs: u64, starting_time_nanos: u32) -> Self {
// Constants for key derivation path indices used in this function.
const NODE_SECRET_INDEX: ChildNumber = ChildNumber::Hardened { index: 0 };
const DESTINATION_SCRIPT_INDEX: ChildNumber = ChildNumber::Hardened { index: (1) };
const SHUTDOWN_PUBKEY_INDEX: ChildNumber = ChildNumber::Hardened { index: (2) };
const CHANNEL_MASTER_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: (3) };
const INBOUND_PAYMENT_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: (5) };
const PEER_STORAGE_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: (6) };
const DESTINATION_SCRIPT_INDEX: ChildNumber = ChildNumber::Hardened { index: 1 };
const SHUTDOWN_PUBKEY_INDEX: ChildNumber = ChildNumber::Hardened { index: 2 };
const CHANNEL_MASTER_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: 3 };
const INBOUND_PAYMENT_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: 5 };
const PEER_STORAGE_KEY_INDEX: ChildNumber = ChildNumber::Hardened { index: 6 };

let secp_ctx = Secp256k1::new();
// Note that when we aren't serializing the key, network doesn't matter
Expand Down
Loading