]> git.bitcoin.ninja Git - rust-lightning/commitdiff
Fix comment spelling and clarify algebra a bit. 2019-01-remote-htlc-timeout-broadcast
authorMatt Corallo <git@bluematt.me>
Fri, 11 Jan 2019 21:31:30 +0000 (16:31 -0500)
committerMatt Corallo <git@bluematt.me>
Sun, 13 Jan 2019 18:12:04 +0000 (13:12 -0500)
src/ln/channelmonitor.rs

index c71800e594acde70ce4e2df59b86b2e19bb27d72..3cd76203439b73417b79b222bbb916265e4f219a 100644 (file)
@@ -1821,9 +1821,12 @@ impl ChannelMonitor {
                                        // least CLTV_CLAIM_BUFFER blocks prior to the inbound HTLC.
                                        //  aka outbound_cltv + HTLC_FAIL_TIMEOUT_BLOCKS == height - CLTV_CLAIM_BUFFER
                                        //      inbound_cltv == height + CLTV_CLAIM_BUFFER
-                                       //      outbound_cltv + HTLC_FAIL_TIMEOUT_BLOCKS + CLTV_CLAIM_BUFER <= inbound_cltv - CLTV_CLAIM_BUFFER
-                                       //      HTLC_FAIL_TIMEOUT_BLOCKS + 2*CLTV_CLAIM_BUFER <= inbound_cltv - outbound_cltv
-                                       //      HTLC_FAIL_TIMEOUT_BLOCKS + 2*CLTV_CLAIM_BUFER <= CLTV_EXPIRY_DELTA
+                                       //      outbound_cltv + HTLC_FAIL_TIMEOUT_BLOCKS + CLTV_CLAIM_BUFFER <= inbound_cltv - CLTV_CLAIM_BUFFER
+                                       //      HTLC_FAIL_TIMEOUT_BLOCKS + 2*CLTV_CLAIM_BUFFER <= inbound_cltv - outbound_cltv
+                                       //      CLTV_EXPIRY_DELTA <= inbound_cltv - outbound_cltv (by check in ChannelManager::decode_update_add_htlc_onion)
+                                       //      HTLC_FAIL_TIMEOUT_BLOCKS + 2*CLTV_CLAIM_BUFFER <= CLTV_EXPIRY_DELTA
+                                       //  The final, above, condition is checked for statically in channelmanager
+                                       //  with CHECK_CLTV_EXPIRY_SANITY_2.
                                        let htlc_outbound = $local_tx == htlc.offered;
                                        if ( htlc_outbound && htlc.cltv_expiry + HTLC_FAIL_TIMEOUT_BLOCKS <= height) ||
                                           (!htlc_outbound && htlc.cltv_expiry <= height + CLTV_CLAIM_BUFFER && self.payment_preimages.contains_key(&htlc.payment_hash)) {