Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Move spendable output descriptors key behind signer interface by ariard · Pull Request #562 · lightningdevkit/rust-lightning · GitHub
Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move spendable output descriptors key behind signer interface by ariard · Pull Request #562 · lightningdevkit/rust-lightning · GitHub
Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' Move spendable output descriptors key behind signer interface by ariard · Pull Request #562 · lightningdevkit/rust-lightning · GitHub
Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move spendable output descriptors key behind signer interface by ariard · Pull Request #562 · lightningdevkit/rust-lightning · GitHub
Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' Move spendable output descriptors key behind signer interface by ariard · Pull Request #562 · lightningdevkit/rust-lightning · GitHub
Skip to content

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

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

Move spendable output descriptors key behind signer interface - #562

Closed
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon
Closed

Move spendable output descriptors key behind signer interface#562
ariard wants to merge 10 commits into
lightningdevkit:masterfrom
ariard:2020-03-remove-seckey-chanmon

Conversation

@ariard

Copy link
Copy Markdown

Build on top of #559 + #560 + #561.

Once merged, we don't have hot private keys anymore in OnchainTxHandler/ChannelMonitor :)

Ok(secp_ctx.sign(&sighash, &self.funding_key))
}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

the witness_script could be derived here rather than passed in, if I'm not mistaken

}

fn sign_delayed_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, witness_script: &Script, amount: u64, per_commitment_point: &PublicKey, secp_ctx: &Secp256k1<T>) {
if let Ok(htlc_key) = chan_utils::derive_private_key(&secp_ctx, &per_commitment_point, &self.delayed_payment_base_key) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

failing here likely indicates a serious internal error, so should propagate the error to the caller

}
}

fn sign_payment_transaction<T: secp256k1::Signing>(&self, spend_tx: &mut Transaction, input: usize, amount: u64, per_commitment_point: &PublicKey, network: Network, secp_ctx: &Secp256k1<T>) {

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

see two comments on sign_delayed_transaction

@ariard

Copy link
Copy Markdown
Author

Rebased on top of #561+#562+#598

@codecov

codecovBot commented Apr 25, 2020

Copy link
Copy Markdown

Codecov Report

Merging #562 into master will increase coverage by 0.00%.
The diff coverage is 95.86%.

Impacted file tree graph

@@ Coverage Diff @@## master #562 +/- ##
========================================
Coverage 91.10% 91.10% ========================================
Files 34 34 Lines 20447 20565 +118 ========================================
+ Hits 18628 18736 +108 - Misses 1819 1829 +10 
Impacted FilesCoverage Δ
lightning/src/ln/functional_test_utils.rs94.63% <ø> (ø)
lightning/src/ln/onchaintx.rs94.05% <91.39%> (-0.82%)⬇️
lightning/src/ln/channelmonitor.rs95.58% <96.42%> (+0.08%)⬆️
lightning/src/chain/keysinterface.rs97.42% <100.00%> (+0.44%)⬆️
lightning/src/ln/chan_utils.rs97.19% <100.00%> (ø)
lightning/src/ln/functional_tests.rs97.05% <100.00%> (-0.10%)⬇️
lightning/src/util/enforcing_trait_impls.rs100.00% <100.00%> (ø)
lightning/src/util/ser_macros.rs97.27% <0.00%> (+0.68%)⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 12e2a81...7a23c0c. Read the comment docs.

Antoine Riard added 10 commits April 27, 2020 19:02
…TxCache
Used in next commits to avoid passing script between ChannelMonitor
and OnchainTxHandler. ChannelMonitor duplicata will be removed
in future commits.
As we can't predict if any and which revoked commitment tx is
going to appear onchain we have by design to cache all htlc information
to regenerate htlc script if needed.
As we cache more and more transaction elements in OnchainTxHandler
we should dry up completly InputMaterial until them being replaced
directly by InputDescriptor
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits.
OnchainTxHandler
By moving script generation inside OnchainTxHandler, we may dry-up
further ChannelMonitor in next commits
Add sign_delayed_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework.
Add sign_payment_transaction in ChanSigner to be able to spend
SpendableOutputDescriptor in test framework
@ariard

Copy link
Copy Markdown
Author

Closed by #610

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants

@ariard@devrandom