Re-derive signers instead of persisting them#1867

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 7 commits into from
Dec 6, 2022
Merged

Re-derive signers instead of persisting them #1867

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b04d1b8
Split KeysInterface::get_channel_signer into two
wpaulino Nov 21, 2022
648a69a
Rename KeysInterface ready_channel to provide_channel_parameters
wpaulino Nov 29, 2022
f053860
Re-derive signers upon deserializing Channel
wpaulino Nov 21, 2022
bfc848e
Re-derive signers upon deserializing OnchainTxHandler
wpaulino Nov 21, 2022
215619b
Avoid use of OnlyReadsKeysInterface
wpaulino Nov 21, 2022
607cd6f
Drop Clone requirement from Sign
wpaulino Nov 29, 2022
444fce7
Remove unnecessary byte_utils helpers
wpaulino Dec 1, 2022
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
13 changes: 9 additions & 4 deletions fuzz/src/chanmon_consistency.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
ShutdownScript::new_p2wpkh(&pubkey_hash)
}

fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
[id; 32]
}

fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
let secp_ctx = Secp256k1::signing_only();
let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
let id = channel_keys_id[0];
let keys = InMemorySigner::new(
&secp_ctx,
self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
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, 6, self.node_id]).unwrap(),
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, 7, self.node_id]).unwrap(),
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, 8, self.node_id]).unwrap(),
[id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
[id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
channel_value_satoshis,
[0; 32],
channel_keys_id,
);
let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down
25 changes: 19 additions & 6 deletions fuzz/src/full_stack.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
node_secret: SecretKey,
inbound_payment_key: KeyMaterial,
counter: AtomicU64,
signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>

@arik-soarik-soDec 6, 2022

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?

}
impl KeysInterface for KeyProvider {
type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
ShutdownScript::new_p2wpkh(&pubkey_hash)
}

fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
[ctr; 32]
}

fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
let secp_ctx = Secp256k1::signing_only();
EnforcingSigner::new(if inbound {
let ctr = channel_keys_id[0];
let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
EnforcingSigner::new_with_revoked(if inbound {
InMemorySigner::new(
&secp_ctx,
self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
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, 5, ctr]).unwrap(),
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
channel_value_satoshis,
[0; 32],
channel_keys_id,
)
} else {
InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
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, 11, ctr]).unwrap(),
[0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
channel_value_satoshis,
[0; 32],
channel_keys_id,
)
})
}, state, false)
}

fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
let keys_manager = Arc::new(KeyProvider {
node_secret: our_network_key.clone(),
inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
counter: AtomicU64::new(0),
signer_state: RefCell::new(HashMap::new())
});
let mut config = UserConfig::default();
config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down
4 changes: 3 additions & 1 deletion fuzz/src/onion_message.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
}

Expand Down
30 changes: 16 additions & 14 deletions lightning/src/chain/channelmonitor.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
w.write_all(&byte_utils::be64_to_array(0))?;
w.write_all(&(0 as u64).to_be_bytes())?;
write_tlv_fields!(w, {
(0, self.counterparty_delayed_payment_base_key, required),
(2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
self.channel_keys_id.write(writer)?;
self.holder_revocation_basepoint.write(writer)?;
writer.write_all(&self.funding_info.0.txid[..])?;
writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
self.funding_info.1.write(writer)?;
self.current_counterparty_commitment_txid.write(writer)?;
self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
},
}

writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

self.commitment_secrets.write(writer)?;

macro_rules! serialize_htlc_in_commitment {
($htlc_output: expr) => {
writer.write_all(&[$htlc_output.offered as u8; 1])?;
writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
writer.write_all(&$htlc_output.payment_hash.0[..])?;
$htlc_output.transaction_output_index.write(writer)?;
}
}

writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
writer.write_all(&txid[..])?;
writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
|| Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
}
}

writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
writer.write_all(&txid[..])?;
writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
}

writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
writer.write_all(&payment_hash.0[..])?;
writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
for payment_preimage in self.payment_preimages.values() {
writer.write_all(&payment_preimage.0[..])?;
}
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
}
}

writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
for event in self.pending_events.iter() {
event.write(writer)?;
}

self.best_block.block_hash().write(writer)?;
writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
writer.write_all(&self.best_block.height().to_be_bytes())?;

writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
entry.write(writer)?;
}
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
return Err(DecodeError::InvalidValue);
}
}
let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
reader, (keys_manager, channel_value_satoshis, channel_keys_id)
)?;

let lockdown_from_offchain = Readable::read(reader)?;
let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
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
Re-derive signers instead of persisting them#1867

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 7 commits into

from

Dec 6, 2022
 Merged


Re-derive signers instead of persisting them
#1867
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


7 commits


Select commit
Hold shift + click to select a range
b04d1b8

Split KeysInterface::get_channel_signer into two


wpaulino Nov 21, 2022
648a69a

Rename KeysInterface ready_channel to provide_channel_parameters


wpaulino Nov 29, 2022
f053860

Re-derive signers upon deserializing Channel


wpaulino Nov 21, 2022
bfc848e

Re-derive signers upon deserializing OnchainTxHandler


wpaulino Nov 21, 2022
215619b

Avoid use of OnlyReadsKeysInterface


wpaulino Nov 21, 2022
607cd6f

Drop Clone requirement from Sign


wpaulino Nov 29, 2022
444fce7

Remove unnecessary byte_utils helpers


wpaulino Dec 1, 2022

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


13 changes: 9 additions & 4 deletions
fuzz/src/chanmon_consistency.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -193,9 +193,14 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, _inbound: bool, channel_value_satoshis: u64) -> 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;
 [id; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 let id = self.rand_bytes_id.fetch_add(1, atomic::Ordering::Relaxed);
 let id = channel_keys_id[0];
 let keys = InMemorySigner::new(
 &secp_ctx,
 self.get_node_secret(Recipient::Node).unwrap(),
Expand All@@ -204,9 +209,9 @@ impl KeysInterface for KeyProvider {
 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, 6, self.node_id]).unwrap(),
 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, 7, self.node_id]).unwrap(),
 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, 8, self.node_id]).unwrap(),
 [id as u8, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 [id, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, self.node_id],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 );
 let revoked_commitment = self.make_enforcement_state_cell(keys.commitment_seed);
 EnforcingSigner::new_with_revoked(keys, revoked_commitment, false)
Expand Down

25 changes: 19 additions & 6 deletions
fuzz/src/full_stack.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -263,6 +263,7 @@ struct KeyProvider {
	node_secret: SecretKey,
	inbound_payment_key: KeyMaterial,
	counter: AtomicU64,
	signer_state: RefCell<HashMap<u8, (bool, Arc<Mutex<EnforcementState>>)>>
@arik-soarik-soDec 6, 2022

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

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

I know it's internal only, but a comment here would be extremely helpful. I think a comment above counter would be helpful, too. What are we counting, right?
}
impl KeysInterface for KeyProvider {
	type Signer = EnforcingSigner;
Expand DownExpand Up@@ -297,10 +298,17 @@ impl KeysInterface for KeyProvider {
 ShutdownScript::new_p2wpkh(&pubkey_hash)
	}

	fn get_channel_signer(&self, inbound: bool, channel_value_satoshis: u64) -> 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;
 self.signer_state.borrow_mut().insert(ctr, (inbound, Arc::new(Mutex::new(EnforcementState::new()))));
 [ctr; 32]
	}

	fn derive_channel_signer(&self, channel_value_satoshis: u64, channel_keys_id: [u8; 32]) -> Self::Signer {
 let secp_ctx = Secp256k1::signing_only();
 EnforcingSigner::new(if inbound {
 let ctr = channel_keys_id[0];
 let (inbound, state) = self.signer_state.borrow().get(&ctr).unwrap().clone();
 EnforcingSigner::new_with_revoked(if inbound {
 InMemorySigner::new(
 &secp_ctx,
 self.node_secret.clone(),
Expand All@@ -311,7 +319,7 @@ impl KeysInterface for KeyProvider {
 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, 5, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 6, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 } else {
 InMemorySigner::new(
Expand All@@ -324,9 +332,9 @@ impl KeysInterface for KeyProvider {
 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, 11, ctr]).unwrap(),
 [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 12, ctr],
 channel_value_satoshis,
[0; 32],
channel_keys_id,
 )
 })
 }, state, false)
	}

	fn get_secure_random_bytes(&self) -> [u8; 32] {
Expand DownExpand Up@@ -390,7 +398,12 @@ pub fn do_test(data: &[u8], logger: &Arc<dyn Logger>) {
	let monitor = Arc::new(chainmonitor::ChainMonitor::new(None, broadcast.clone(), Arc::clone(&logger), fee_est.clone(),
 Arc::new(TestPersister { update_ret: Mutex::new(ChannelMonitorUpdateStatus::Completed) })));

	let keys_manager = Arc::new(KeyProvider { node_secret: our_network_key.clone(), inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()), counter: AtomicU64::new(0) });
	let keys_manager = Arc::new(KeyProvider {
 node_secret: our_network_key.clone(),
 inbound_payment_key: KeyMaterial(inbound_payment_key.try_into().unwrap()),
 counter: AtomicU64::new(0),
 signer_state: RefCell::new(HashMap::new())
	});
	let mut config = UserConfig::default();
	config.channel_config.forwarding_fee_proportional_millionths = slice_to_be32(get_slice!(4));
	config.channel_handshake_config.announced_channel = get_slice!(1)[0] != 0;
Expand Down

4 changes: 3 additions & 1 deletion
fuzz/src/onion_message.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -111,7 +111,9 @@ impl KeysInterface for KeyProvider {

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

	fn get_channel_signer(&self, _inbound: bool, _channel_value_satoshis: u64) -> 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!()
	}

Expand Down

30 changes: 16 additions & 14 deletions
lightning/src/chain/channelmonitor.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -291,7 +291,7 @@ struct CounterpartyCommitmentParameters {

impl Writeable for CounterpartyCommitmentParameters {
	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
 w.write_all(&byte_utils::be64_to_array(0))?;
 w.write_all(&(0 as u64).to_be_bytes())?;
 write_tlv_fields!(w, {
 (0, self.counterparty_delayed_payment_base_key, required),
 (2, self.counterparty_htlc_base_key, required),
Expand DownExpand Up@@ -945,7 +945,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 self.channel_keys_id.write(writer)?;
 self.holder_revocation_basepoint.write(writer)?;
 writer.write_all(&self.funding_info.0.txid[..])?;
 writer.write_all(&byte_utils::be16_to_array(self.funding_info.0.index))?;
 writer.write_all(&self.funding_info.0.index.to_be_bytes())?;
 self.funding_info.1.write(writer)?;
 self.current_counterparty_commitment_txid.write(writer)?;
 self.prev_counterparty_commitment_txid.write(writer)?;
Expand All@@ -972,24 +972,24 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 },
 }

 writer.write_all(&byte_utils::be16_to_array(self.on_holder_tx_csv))?;
 writer.write_all(&self.on_holder_tx_csv.to_be_bytes())?;

 self.commitment_secrets.write(writer)?;

 macro_rules! serialize_htlc_in_commitment {
 ($htlc_output: expr) => {
 writer.write_all(&[$htlc_output.offered as u8; 1])?;
 writer.write_all(&byte_utils::be64_to_array($htlc_output.amount_msat))?;
 writer.write_all(&byte_utils::be32_to_array($htlc_output.cltv_expiry))?;
 writer.write_all(&$htlc_output.amount_msat.to_be_bytes())?;
 writer.write_all(&$htlc_output.cltv_expiry.to_be_bytes())?;
 writer.write_all(&$htlc_output.payment_hash.0[..])?;
 $htlc_output.transaction_output_index.write(writer)?;
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_claimable_outpoints.len() as u64))?;
 writer.write_all(&(self.counterparty_claimable_outpoints.len() as u64).to_be_bytes())?;
 for (ref txid, ref htlc_infos) in self.counterparty_claimable_outpoints.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be64_to_array(htlc_infos.len() as u64))?;
 writer.write_all(&(htlc_infos.len() as u64).to_be_bytes())?;
 for &(ref htlc_output, ref htlc_source) in htlc_infos.iter() {
 debug_assert!(htlc_source.is_none() || Some(**txid) == self.current_counterparty_commitment_txid
 || Some(**txid) == self.prev_counterparty_commitment_txid,
Expand All@@ -999,13 +999,13 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_commitment_txn_on_chain.len() as u64))?;
 writer.write_all(&(self.counterparty_commitment_txn_on_chain.len() as u64).to_be_bytes())?;
 for (ref txid, commitment_number) in self.counterparty_commitment_txn_on_chain.iter() {
 writer.write_all(&txid[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
 }

 writer.write_all(&byte_utils::be64_to_array(self.counterparty_hash_commitment_number.len() as u64))?;
 writer.write_all(&(self.counterparty_hash_commitment_number.len() as u64).to_be_bytes())?;
 for (ref payment_hash, commitment_number) in self.counterparty_hash_commitment_number.iter() {
 writer.write_all(&payment_hash.0[..])?;
 writer.write_all(&byte_utils::be48_to_array(*commitment_number))?;
Expand All@@ -1023,7 +1023,7 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 writer.write_all(&byte_utils::be48_to_array(self.current_counterparty_commitment_number))?;
 writer.write_all(&byte_utils::be48_to_array(self.current_holder_commitment_number))?;

 writer.write_all(&byte_utils::be64_to_array(self.payment_preimages.len() as u64))?;
 writer.write_all(&(self.payment_preimages.len() as u64).to_be_bytes())?;
 for payment_preimage in self.payment_preimages.values() {
 writer.write_all(&payment_preimage.0[..])?;
 }
Expand All@@ -1044,15 +1044,15 @@ impl<Signer: Sign> Writeable for ChannelMonitorImpl<Signer> {
 }
 }

 writer.write_all(&byte_utils::be64_to_array(self.pending_events.len() as u64))?;
 writer.write_all(&(self.pending_events.len() as u64).to_be_bytes())?;
 for event in self.pending_events.iter() {
 event.write(writer)?;
 }

 self.best_block.block_hash().write(writer)?;
 writer.write_all(&byte_utils::be32_to_array(self.best_block.height()))?;
 writer.write_all(&self.best_block.height().to_be_bytes())?;

 writer.write_all(&byte_utils::be64_to_array(self.onchain_events_awaiting_threshold_conf.len() as u64))?;
 writer.write_all(&(self.onchain_events_awaiting_threshold_conf.len() as u64).to_be_bytes())?;
 for ref entry in self.onchain_events_awaiting_threshold_conf.iter() {
 entry.write(writer)?;
 }
Expand DownExpand Up@@ -3789,7 +3789,9 @@ impl<'a, K: KeysInterface> ReadableArgs<&'a K>
 return Err(DecodeError::InvalidValue);
 }
 }
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(reader, keys_manager)?;
 let onchain_tx_handler: OnchainTxHandler<K::Signer> = ReadableArgs::read(
 reader, (keys_manager, channel_value_satoshis, channel_keys_id)
 )?;

 let lockdown_from_offchain = Readable::read(reader)?;
 let holder_tx_signed = Readable::read(reader)?;
Expand Down
Loading