Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

Closed
ariard wants to merge 13 commits into from
Closed

Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain #198

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
f3c9a72
Refactor KeyStorage as Storage
Nov 27, 2018
691cdf4
Track outputs fron local commitment tx
Nov 27, 2018
e29605e
Track HTLCSource in ChannelMonitor
Nov 30, 2018
199a338
Return refs from build_commitment_transaction, removing clone()s
TheBlueMatt Nov 30, 2018
e8a1620
Add is_resolving_output in ChannelMonitor
Nov 30, 2018
5b2b798
Detect onchain timeout of a HTLC in ChannelManager block_connected
Oct 5, 2018
2bd7e48
Harden test_htlc_on_chain_success with asserts
Oct 5, 2018
09487d3
Implement fail backward in case of detection of revoked tx
Oct 9, 2018
6c1b48f
Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to
Oct 10, 2018
892baf5
Add test test_onchain_to_onchain_claim
Nov 21, 2018
2cd7589
Typify payment_hash and payment_preimage
Nov 23, 2018
5d9b69b
Add test_duplicate_payment_hash_one_failure_one_success
Nov 30, 2018
12163b5
Add detection of HTLC outputs resolved by remote peer justice tx
Dec 3, 2018
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
18 changes: 9 additions & 9 deletions fuzz/fuzz_targets/full_stack_target.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
}, our_network_key, Arc::clone(&logger)));

let mut should_forward = false;
let mut payments_received: Vec<[u8; 32]> = Vec::new();
let mut payments_received: Vec<PaymentHash> = Vec::new();
let mut payments_sent = 0;
let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
Ok(route) => route,
Err(_) => return,
};
let mut payment_hash = [0; 32];
payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
let mut payment_hash = PaymentHash([0; 32]);
payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
let mut sha = Sha256::new();
sha.input(&payment_hash);
sha.result(&mut payment_hash);
sha.input(&payment_hash.0[..]);
sha.result(&mut payment_hash.0[..]);
payments_sent += 1;
match channelmanager.send_payment(route, payment_hash) {
Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
// for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
// fulfill this HTLC, but if they are, we can just take the first byte and
// place that anywhere in our preimage.
if &payment[1..] != &[0; 31] {
if &payment.0[1..] != &[0; 31] {
channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
} else {
let mut payment_preimage = [0; 32];
payment_preimage[0] = payment[0];
let mut payment_preimage = PaymentPreimage([0; 32]);
payment_preimage.0[0] = payment.0[0];
channelmanager.claim_funds(payment_preimage);
}
}
Expand Down
6 changes: 4 additions & 2 deletions src/ln/chan_utils.rs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
pub offered: bool,
pub amount_msat: u64,
pub cltv_expiry: u32,
pub payment_hash: [u8; 32],
pub payment_hash: PaymentHash,
pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
let payment_hash160 = {
let mut ripemd = Ripemd160::new();
ripemd.input(&htlc.payment_hash);
ripemd.input(&htlc.payment_hash.0[..]);
let mut res = [0; 20];
ripemd.result(&mut res);
res
Expand Down
193 changes: 116 additions & 77 deletions src/ln/channel.rs
View file
Open in desktop

Large diffs are not rendered by default.

677 changes: 620 additions & 57 deletions src/ln/channelmanager.rs
View file
Open in desktop

Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

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
Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain#198

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

 Closed

ariard
wants to merge
13
commits into

from

 Closed


Ready for Review : Handle resolution in case of channel going onchain, pass state backward offchain
#198
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


13 commits


Select commit
Hold shift + click to select a range
f3c9a72

Refactor KeyStorage as Storage

Nov 27, 2018
691cdf4

Track outputs fron local commitment tx

Nov 27, 2018
e29605e

Track HTLCSource in ChannelMonitor

Nov 30, 2018
199a338

Return refs from build_commitment_transaction, removing clone()s


TheBlueMatt Nov 30, 2018
e8a1620

Add is_resolving_output in ChannelMonitor

Nov 30, 2018
5b2b798

Detect onchain timeout of a HTLC in ChannelManager block_connected

Oct 5, 2018
2bd7e48

Harden test_htlc_on_chain_success with asserts

Oct 5, 2018
09487d3

Implement fail backward in case of detection of revoked tx

Oct 9, 2018
6c1b48f

Add const ACCEPTED_HTLC_SCRIPT_WEIGHT and OFFERED_HTLC_SCRIPT_WEIGHT to

Oct 10, 2018
892baf5

Add test test_onchain_to_onchain_claim

Nov 21, 2018
2cd7589

Typify payment_hash and payment_preimage

Nov 23, 2018
5d9b69b

Add test_duplicate_payment_hash_one_failure_one_success

Nov 30, 2018
12163b5

Add detection of HTLC outputs resolved by remote peer justice tx

Dec 3, 2018

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


18 changes: 9 additions & 9 deletions
fuzz/fuzz_targets/full_stack_target.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -17,7 +17,7 @@ use lightning::chain::chaininterface::{BroadcasterInterface,ConfirmationTarget,C
use lightning::chain::transaction::OutPoint;
use lightning::chain::keysinterface::{ChannelKeys, KeysInterface};
use lightning::ln::channelmonitor;
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason};
use lightning::ln::channelmanager::{ChannelManager, PaymentFailReason, PaymentHash, PaymentPreimage};
use lightning::ln::peer_handler::{MessageHandler,PeerManager,SocketDescriptor};
use lightning::ln::router::Router;
use lightning::util::events::{EventsProvider,Event};
Expand DownExpand Up@@ -328,7 +328,7 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
	}, our_network_key, Arc::clone(&logger)));

	let mut should_forward = false;
	let mut payments_received: Vec<[u8; 32]> = Vec::new();
	let mut payments_received: Vec<PaymentHash> = Vec::new();
	let mut payments_sent = 0;
	let mut pending_funding_generation: Vec<([u8; 32], u64, Script)> = Vec::new();
	let mut pending_funding_signatures = HashMap::new();
Expand DownExpand Up@@ -380,11 +380,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 Ok(route) => route,
 Err(_) => return,
 };
 let mut payment_hash = [0; 32];
 payment_hash[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut payment_hash = PaymentHash([0; 32]);
 payment_hash.0[0..8].copy_from_slice(&be64_to_array(payments_sent));
 let mut sha = Sha256::new();
 sha.input(&payment_hash);
 sha.result(&mut payment_hash);
 sha.input(&payment_hash.0[..]);
 sha.result(&mut payment_hash.0[..]);
 payments_sent += 1;
 match channelmanager.send_payment(route, payment_hash) {
 Ok(_) => {},
Expand DownExpand Up@@ -418,11 +418,11 @@ pub fn do_test(data: &[u8], logger: &Arc<Logger>) {
 // for the remaining bytes. Thus, if not all remaining bytes are 0s we cannot
 // fulfill this HTLC, but if they are, we can just take the first byte and
 // place that anywhere in our preimage.
 if &payment[1..] != &[0; 31] {
 if &payment.0[1..] != &[0; 31] {
 channelmanager.fail_htlc_backwards(&payment, PaymentFailReason::PreimageUnknown);
 } else {
 let mut payment_preimage = [0; 32];
 payment_preimage[0] = payment[0];
 let mut payment_preimage = PaymentPreimage([0; 32]);
 payment_preimage.0[0] = payment.0[0];
 channelmanager.claim_funds(payment_preimage);
 }
 }
Expand Down

6 changes: 4 additions & 2 deletions
src/ln/chan_utils.rs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,8 @@ use bitcoin::blockdata::opcodes;
use bitcoin::blockdata::transaction::{TxIn,TxOut,OutPoint,Transaction};
use bitcoin::util::hash::{Hash160,Sha256dHash};

use ln::channelmanager::PaymentHash;

use secp256k1::key::{PublicKey,SecretKey};
use secp256k1::Secp256k1;
use secp256k1;
Expand DownExpand Up@@ -156,15 +158,15 @@ pub struct HTLCOutputInCommitment {
	pub offered: bool,
	pub amount_msat: u64,
	pub cltv_expiry: u32,
	pub payment_hash: [u8; 32],
	pub payment_hash: PaymentHash,
	pub transaction_output_index: u32,
}

#[inline]
pub fn get_htlc_redeemscript_with_explicit_keys(htlc: &HTLCOutputInCommitment, a_htlc_key: &PublicKey, b_htlc_key: &PublicKey, revocation_key: &PublicKey) -> Script {
	let payment_hash160 = {
 let mut ripemd = Ripemd160::new();
 ripemd.input(&htlc.payment_hash);
 ripemd.input(&htlc.payment_hash.0[..]);
 let mut res = [0; 20];
 ripemd.result(&mut res);
 res
Expand Down

193 changes: 116 additions & 77 deletions
src/ln/channel.rs

View file


Open in desktop


Large diffs are not rendered by default.


677 changes: 620 additions & 57 deletions
src/ln/channelmanager.rs

View file


Open in desktop


Large diffs are not rendered by default.

Loading