Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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
TheBlueMatt merged 1 commit into from
Dec 20, 2022
Merged

Split KeysInterface into EntropySource, NodeSigner, and SignerProvider #1910

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 35 additions & 23 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
rand_bytes_id: atomic::AtomicU32,
enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
fn get_secure_random_bytes(&self) -> [u8; 32] {
let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
res[30-4..30].copy_from_slice(&id.to_le_bytes());
res
}
}

impl NodeSigner for KeyProvider {
fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
}

fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
let secp_ctx = Secp256k1::signing_only();
Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
}

fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
}

fn get_destination_script(&self) -> Script {
let secp_ctx = Secp256k1::signing_only();
let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
}
}

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
let secp_ctx = Secp256k1::signing_only();
let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
ShutdownScript::new_p2wpkh(&pubkey_hash)
}
impl SignerProvider for KeyProvider {
type Signer = EnforcingSigner;

fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
}

fn get_secure_random_bytes(&self) -> [u8; 32] {
let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
res[30-4..30].copy_from_slice(&id.to_le_bytes());
res
}

fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
})
}

fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
fn get_destination_script(&self) -> Script {
let secp_ctx = Secp256k1::signing_only();
let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
}

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
let secp_ctx = Secp256k1::signing_only();
let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
ShutdownScript::new_p2wpkh(&pubkey_hash)
}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down
56 changes: 34 additions & 22 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
counter: AtomicU64,
signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
fn get_secure_random_bytes(&self) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
}
}

impl NodeSigner for KeyProvider {
fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
Ok(self.node_secret.clone())
}

fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
let secp_ctx = Secp256k1::signing_only();
Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
}

fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
self.inbound_payment_key.clone()
}

fn get_destination_script(&self) -> Script {
let secp_ctx = Secp256k1::signing_only();
let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
}
}

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
let secp_ctx = Secp256k1::signing_only();
let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
ShutdownScript::new_p2wpkh(&pubkey_hash)
}
impl SignerProvider for KeyProvider {
type Signer = EnforcingSigner;

fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
}, state, false)
}

fn get_secure_random_bytes(&self) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
}

fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
))
}

fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
fn get_destination_script(&self) -> Script {
let secp_ctx = Secp256k1::signing_only();
let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
}

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
let secp_ctx = Secp256k1::signing_only();
let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
ShutdownScript::new_p2wpkh(&pubkey_hash)
}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
let input = Arc::new(InputData {
Expand Down
42 changes: 27 additions & 15 deletions fuzz/src/onion_message.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
node_secret: SecretKey,
counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
fn get_secure_random_bytes(&self) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
}
}

impl NodeSigner for KeyProvider {
fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
Ok(self.node_secret.clone())
}

fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
let secp_ctx = Secp256k1::signing_only();
Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
}

fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
let mut node_secret = self.get_node_secret(recipient)?;
if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

fn get_destination_script(&self) -> Script { unreachable!() }
fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
}
}

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
type Signer = EnforcingSigner;

fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
unreachable!()
}

fn get_secure_random_bytes(&self) -> [u8; 32] {
let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
(ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
}

fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
unreachable!()
}
fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
use lightning::util::logger::{Logger, Record};
Expand Down
16 changes: 8 additions & 8 deletions lightning-background-processor/src/lib.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
EventHandlerFuture: core::future::Future<Output = ()>,
EventHandler: Fn(Event) -> EventHandlerFuture,
PS: 'static + Deref + Send,
M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
CA::Target: 'static + chain::Access,
CF::Target: 'static + chain::Filter,
CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
T::Target: 'static + BroadcasterInterface,
K::Target: 'static + KeysInterface,
F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger,
P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
CMH::Target: 'static + ChannelMessageHandler,
OMH::Target: 'static + OnionMessageHandler,
RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
RMH: 'static + Deref + Send + Sync,
EH: 'static + EventHandler + Send,
PS: 'static + Deref + Send,
M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
where
CA::Target: 'static + chain::Access,
CF::Target: 'static + chain::Filter,
CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
T::Target: 'static + BroadcasterInterface,
K::Target: 'static + KeysInterface,
F::Target: 'static + FeeEstimator,
L::Target: 'static + Logger,
P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
CMH::Target: 'static + ChannelMessageHandler,
OMH::Target: 'static + OnionMessageHandler,
RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
use bitcoin::network::constants::Network;
use lightning::chain::{BestBlock, Confirm, chainmonitor};
use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
use lightning::chain::transaction::OutPoint;
use lightning::get_event_msg;
use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n 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;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
Split KeysInterface into EntropySource, NodeSigner, and SignerProvider#1910

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

TheBlueMatt
merged 1 commit into

from

Dec 20, 2022
 Merged


Split KeysInterface into EntropySource, NodeSigner, and SignerProvider
#1910
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


58 changes: 35 additions & 23 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -36,7 +36,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, chainmonitor, chan
use lightning::chain::channelmonitor::{ChannelMonitor, MonitorEvent};
use lightning::chain::transaction::OutPoint;
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient};
use lightning::chain::keysinterface::{KeyMaterial, KeysInterface, InMemorySigner, Recipient, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{self, ChainParameters, ChannelManager, PaymentSendFailure, ChannelManagerReadArgs, PaymentId};
use lightning::ln::channel::FEE_SPIKE_BUFFER_FEE_INCREASE_MULTIPLE;
Expand DownExpand Up@@ -160,13 +160,26 @@ struct KeyProvider {
	rand_bytes_id: atomic::AtomicU32,
	enforcement_states: Mutex<HashMap<[u8;32], Arc<Mutex<EnforcementState>>>>,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id]).unwrap())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -179,19 +192,13 @@ impl KeysInterface for KeyProvider {
 KeyMaterial([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, self.node_id])
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed) as u8;
Expand All@@ -217,13 +224,6 @@ impl KeysInterface for KeyProvider {
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let mut res = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, self.node_id];
 res[30-4..30].copy_from_slice(&id.to_le_bytes());
 res
	}

	fn read_chan_signer(&self, buffer: &[u8]) -> Result<Self::Signer, DecodeError> {
 let mut reader = std::io::Cursor::new(buffer);

Expand All@@ -237,11 +237,23 @@ impl KeysInterface for KeyProvider {
 })
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, self.node_id]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, self.node_id]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

impl KeyProvider {
	fn make_enforcement_state_cell(&self, commitment_seed: [u8; 32]) -> Arc<Mutex<EnforcementState>> {
 let mut revoked_commitments = self.enforcement_states.lock().unwrap();
Expand Down

56 changes: 34 additions & 22 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -33,7 +33,7 @@ use lightning::chain::{BestBlock, ChannelMonitorUpdateStatus, Confirm, Listen};
use lightning::chain::chaininterface::{BroadcasterInterface, ConfirmationTarget, FeeEstimator};
use lightning::chain::chainmonitor;
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::{PaymentHash, PaymentPreimage, PaymentSecret};
use lightning::ln::channelmanager::{ChainParameters, ChannelManager, PaymentId};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor,IgnoringMessageHandler};
Expand DownExpand Up@@ -265,13 +265,25 @@ struct KeyProvider {
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -284,19 +296,13 @@ impl KeysInterface for KeyProvider {
 self.inbound_payment_key.clone()
	}

	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed) as u8;
Expand DownExpand Up@@ -337,12 +343,6 @@ impl KeysInterface for KeyProvider {
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, mut data: &[u8]) -> Result<EnforcingSigner, DecodeError> {
 let inner: InMemorySigner = ReadableArgs::read(&mut data, self.node_secret.clone())?;
 let state = Arc::new(Mutex::new(EnforcementState::new()));
Expand All@@ -354,11 +354,23 @@ impl KeysInterface for KeyProvider {
 ))
	}

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	fn get_destination_script(&self) -> Script {
 let secp_ctx = Secp256k1::signing_only();
 let channel_monitor_claim_key = SecretKey::from_slice(&hex::decode("0fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff").unwrap()[..]).unwrap();
 let our_channel_monitor_claim_key_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &channel_monitor_claim_key).serialize());
 Builder::new().push_opcode(opcodes::all::OP_PUSHBYTES_0).push_slice(&our_channel_monitor_claim_key_hash[..]).into_script()
	}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript {
 let secp_ctx = Secp256k1::signing_only();
 let secret_key = SecretKey::from_slice(&[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1]).unwrap();
 let pubkey_hash = WPubkeyHash::hash(&PublicKey::from_secret_key(&secp_ctx, &secret_key).serialize());
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}
}

impl KeysInterface for KeyProvider {}

#[inline]
pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let input = Arc::new(InputData {
Expand Down

42 changes: 27 additions & 15 deletions
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
// Imports that need to be added manually
use bitcoin::bech32::u5;
use bitcoin::blockdata::script::Script;
use bitcoin::secp256k1::{PublicKey, Scalar, SecretKey};
use bitcoin::secp256k1::{PublicKey, Scalar, Secp256k1, SecretKey};
use bitcoin::secp256k1::ecdh::SharedSecret;
use bitcoin::secp256k1::ecdsa::RecoverableSignature;

use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface};
use lightning::chain::keysinterface::{Recipient, KeyMaterial, KeysInterface, EntropySource, NodeSigner, SignerProvider};
use lightning::ln::msgs::{self, DecodeError, OnionMessageHandler};
use lightning::ln::script::ShutdownScript;
use lightning::util::enforcing_trait_impls::EnforcingSigner;
Expand DownExpand Up@@ -90,13 +90,25 @@ struct KeyProvider {
	node_secret: SecretKey,
	counter: AtomicU64,
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;

impl EntropySource for KeyProvider {
	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}
}

impl NodeSigner for KeyProvider {
	fn get_node_secret(&self, _recipient: Recipient) -> Result<SecretKey, ()> {
 Ok(self.node_secret.clone())
	}

	fn get_node_id(&self, recipient: Recipient) -> Result<PublicKey, ()> {
 let secp_ctx = Secp256k1::signing_only();
 Ok(PublicKey::from_secret_key(&secp_ctx, &self.get_node_secret(recipient)?))
	}

	fn ecdh(&self, recipient: Recipient, other_key: &PublicKey, tweak: Option<&Scalar>) -> Result<SharedSecret, ()> {
 let mut node_secret = self.get_node_secret(recipient)?;
 if let Some(tweak) = tweak {
Expand All@@ -107,29 +119,29 @@ impl KeysInterface for KeyProvider {

	fn get_inbound_payment_key_material(&self) -> KeyMaterial { unreachable!() }

	fn get_destination_script(&self) -> Script { unreachable!() }
	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
}

	fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
impl SignerProvider for KeyProvider {
	type Signer = EnforcingSigner;

	fn generate_channel_keys_id(&self, _inbound: bool, _channel_value_satoshis: u64, _user_channel_id: u128) -> [u8; 32] { unreachable!() }

	fn derive_channel_signer(&self, _channel_value_satoshis: u64, _channel_keys_id: [u8; 32]) -> Self::Signer {
 unreachable!()
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
 let ctr = self.counter.fetch_add(1, Ordering::Relaxed);
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
 (ctr >> 8*7) as u8, (ctr >> 8*6) as u8, (ctr >> 8*5) as u8, (ctr >> 8*4) as u8, (ctr >> 8*3) as u8, (ctr >> 8*2) as u8, (ctr >> 8*1) as u8, 14, (ctr >> 8*0) as u8]
	}

	fn read_chan_signer(&self, _data: &[u8]) -> Result<EnforcingSigner, DecodeError> { unreachable!() }

	fn sign_invoice(&self, _hrp_bytes: &[u8], _invoice_data: &[u5], _recipient: Recipient) -> Result<RecoverableSignature, ()> {
 unreachable!()
	}
	fn get_destination_script(&self) -> Script { unreachable!() }

fn get_shutdown_scriptpubkey(&self) -> ShutdownScript { unreachable!() }
}

impl KeysInterface for KeyProvider {}

#[cfg(test)]
mod tests {
	use lightning::util::logger::{Logger, Record};
Expand Down

16 changes: 8 additions & 8 deletions
lightning-background-processor/src/lib.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ extern crate lightning_rapid_gossip_sync;
use lightning::chain;
use lightning::chain::chaininterface::{BroadcasterInterface, FeeEstimator};
use lightning::chain::chainmonitor::{ChainMonitor, Persist};
use lightning::chain::keysinterface::KeysInterface;
use lightning::chain::keysinterface::{KeysInterface, SignerProvider};
use lightning::ln::channelmanager::ChannelManager;
use lightning::ln::msgs::{ChannelMessageHandler, OnionMessageHandler, RoutingMessageHandler};
use lightning::ln::peer_handler::{CustomMessageHandler, PeerManager, SocketDescriptor};
Expand DownExpand Up@@ -352,7 +352,7 @@ pub async fn process_events_async<
	EventHandlerFuture: core::future::Future<Output = ()>,
	EventHandler: Fn(Event) -> EventHandlerFuture,
	PS: 'static + Deref + Send,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
	M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
	CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
	PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
	RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -370,12 +370,12 @@ pub async fn process_events_async<
where
	CA::Target: 'static + chain::Access,
	CF::Target: 'static + chain::Filter,
	CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
	CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
	T::Target: 'static + BroadcasterInterface,
	K::Target: 'static + KeysInterface,
	F::Target: 'static + FeeEstimator,
	L::Target: 'static + Logger,
	P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
	P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
	CMH::Target: 'static + ChannelMessageHandler,
	OMH::Target: 'static + OnionMessageHandler,
	RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -469,7 +469,7 @@ impl BackgroundProcessor {
 RMH: 'static + Deref + Send + Sync,
 EH: 'static + EventHandler + Send,
 PS: 'static + Deref + Send,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as KeysInterface>::Signer, CF, T, F, L, P>> + Send + Sync,
 M: 'static + Deref<Target = ChainMonitor<<K::Target as SignerProvider>::Signer, CF, T, F, L, P>> + Send + Sync,
 CM: 'static + Deref<Target = ChannelManager<CW, T, K, F, L>> + Send + Sync,
 PGS: 'static + Deref<Target = P2PGossipSync<G, CA, L>> + Send + Sync,
 RGS: 'static + Deref<Target = RapidGossipSync<G, L>> + Send,
Expand All@@ -484,12 +484,12 @@ impl BackgroundProcessor {
	where
 CA::Target: 'static + chain::Access,
 CF::Target: 'static + chain::Filter,
 CW::Target: 'static + chain::Watch<<K::Target as KeysInterface>::Signer>,
 CW::Target: 'static + chain::Watch<<K::Target as SignerProvider>::Signer>,
 T::Target: 'static + BroadcasterInterface,
 K::Target: 'static + KeysInterface,
 F::Target: 'static + FeeEstimator,
 L::Target: 'static + Logger,
 P::Target: 'static + Persist<<K::Target as KeysInterface>::Signer>,
 P::Target: 'static + Persist<<K::Target as SignerProvider>::Signer>,
 CMH::Target: 'static + ChannelMessageHandler,
 OMH::Target: 'static + OnionMessageHandler,
 RMH::Target: 'static + RoutingMessageHandler,
Expand DownExpand Up@@ -570,7 +570,7 @@ mod tests {
	use bitcoin::network::constants::Network;
	use lightning::chain::{BestBlock, Confirm, chainmonitor};
	use lightning::chain::channelmonitor::ANTI_REORG_DELAY;
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, KeysInterface, KeysManager};
	use lightning::chain::keysinterface::{InMemorySigner, Recipient, EntropySource, KeysInterface, KeysManager, NodeSigner};
	use lightning::chain::transaction::OutPoint;
	use lightning::get_event_msg;
	use lightning::ln::channelmanager::{self, BREAKDOWN_TIMEOUT, ChainParameters, ChannelManager, SimpleArcChannelManager};
Expand Down
Loading