mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 07:17:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

Re-derive signers upon deserializing OnchainTxHandler

Browse source 
Similar to the previous commit, we introduce a new serialization version
that doesn't store a monitor's signer. Since the monitor already knows
of a channel's `channel_keys_id`, there's no need to store any new data
to re-derive all private key material for said channel.
This commit is contained in:
Wilmer Paulino 2022-11-21 12:49:05 -08:00
parent f053860f2e
commit bfc848e892
No known key found for this signature in database
GPG key ID: 6DF57B9F9514972F
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lightning/src/chain/channelmonitor.rs
View file

@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
return Err(DecodeError::InvalidValue); return Err(DecodeError::InvalidValue);
} }
} }
let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?; let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
reader, (keys_manager, channel_value_satoshis, channel_keys_id)
)?;
let lockdown_from_offchain = Readable::read(reader)?; let lockdown_from_offchain = Readable::read(reader)?;
let holder_tx_signed = Readable::read(reader)?; let holder_tx_signed = Readable::read(reader)?;

24
lightning/src/chain/onchaintx.rs
View file

@ -21,6 +21,7 @@ use bitcoin::hash_types::{Txid, BlockHash};
use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature}; use bitcoin::secp256k1::{Secp256k1, ecdsa::Signature};
use bitcoin::secp256k1; use bitcoin::secp256k1;
use crate::chain::keysinterface::BaseSign;
use crate::ln::msgs::DecodeError; use crate::ln::msgs::DecodeError;
use crate::ln::PaymentPreimage; use crate::ln::PaymentPreimage;
#[cfg(anchors)] #[cfg(anchors)]
@ -303,8 +304,12 @@ impl<ChannelSigner: Sign> OnchainTxHandler<ChannelSigner> {
} }
} }
impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler<K::Signer> { impl<'a, K: KeysInterface> ReadableArgs<(&'a K, u64, [u8; 32])> for OnchainTxHandler<K::Signer> {
fn read<R: io::Read>(reader: &mut R, keys_manager: &'a K) -> Result<Self, DecodeError> { fn read<R: io::Read>(reader: &mut R, args: (&'a K, u64, [u8; 32])) -> Result<Self, DecodeError> {
let keys_manager = args.0;
let channel_value_satoshis = args.1;
let channel_keys_id = args.2;
let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION); let _ver = read_ver_prefix!(reader, SERIALIZATION_VERSION);
let destination_script = Readable::read(reader)?; let destination_script = Readable::read(reader)?;
@ -316,16 +321,21 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K> for OnchainTxHandler<K::Signer> {
let channel_parameters = Readable::read(reader)?; let channel_parameters = Readable::read(reader)?;
// Read the serialized signer bytes, but don't deserialize them, as we'll obtain our signer
// by re-deriving the private key material.
let keys_len: u32 = Readable::read(reader)?; let keys_len: u32 = Readable::read(reader)?;
let mut keys_data = Vec::with_capacity(cmp::min(keys_len as usize, MAX_ALLOC_SIZE)); let mut bytes_read = 0;
while keys_data.len() != keys_len as usize { while bytes_read != keys_len as usize {
// Read 1KB at a time to avoid accidentally allocating 4GB on corrupted channel keys // Read 1KB at a time to avoid accidentally allocating 4GB on corrupted channel keys
let mut data = [0; 1024]; let mut data = [0; 1024];
let read_slice = &mut data[0..cmp::min(1024, keys_len as usize - keys_data.len())]; let bytes_to_read = cmp::min(1024, keys_len as usize - bytes_read);
let read_slice = &mut data[0..bytes_to_read];
reader.read_exact(read_slice)?; reader.read_exact(read_slice)?;
keys_data.extend_from_slice(read_slice); bytes_read += bytes_to_read;
} }
let signer = keys_manager.read_chan_signer(&keys_data)?;
let mut signer = keys_manager.derive_channel_signer(channel_value_satoshis, channel_keys_id);
signer.provide_channel_parameters(&channel_parameters);
let pending_claim_requests_len: u64 = Readable::read(reader)?; let pending_claim_requests_len: u64 = Readable::read(reader)?;
let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128)); let mut pending_claim_requests = HashMap::with_capacity(cmp::min(pending_claim_requests_len as usize, MAX_ALLOC_SIZE / 128));