resolve conflicts

Author: chenyukang

crates/fiber-lib/src/fiber/channel.rs

@@ -5701,7 +5701,12 @@ impl ChannelActorState {
         let delay_epoch = EpochNumberWithFraction::from_full_value(self.commitment_delay_epoch);
         let epoch_delay_milliseconds =
             (delay_epoch.number() as f64 * MILLI_SECONDS_PER_EPOCH as f64 * 2.0 / 3.0) as u64;
-        let expect_expiry = current_time + epoch_delay_milliseconds;
+        let pending_tlc_count = self
+            .tlc_state
+            .all_tlcs()
+            .filter(|tlc| tlc.removed_confirmed_at.is_none())
+            .count() as u64;
+        let expect_expiry = current_time + epoch_delay_milliseconds * (pending_tlc_count + 1);
         if expiry < expect_expiry {
             error!(
                 "TLC expiry {} is too soon, current time + epoch delay: {}",

crates/fiber-lib/src/fiber/history.rs

@@ -175,6 +175,8 @@ impl InternalResult {
             );
         }
     }
+
+    #[cfg(test)]
     pub fn fail_range_pairs(&mut self, nodes: &[SessionRouteNode], start: usize, end: usize) {
         for index in start.max(1)..=end {
             self.fail_pair(nodes, index);
@@ -242,6 +244,8 @@ impl InternalResult {
                     self.succeed_range_pairs(nodes, 0, len - 1);
                 }
                 TlcErrorCode::ExpiryTooSoon | TlcErrorCode::ExpiryTooFar => {
+                    // these two error code will not be reported from last hop in theory
+                    // anyway, don't retry payment anymore
                     need_retry = false;
                 }
                 _ => {
@@ -293,17 +297,12 @@ impl InternalResult {
                 | TlcErrorCode::ChannelDisabled
                 | TlcErrorCode::TemporaryNodeFailure
                 | TlcErrorCode::RequiredNodeFeatureMissing
-                | TlcErrorCode::AmountBelowMinimum => {
+                | TlcErrorCode::AmountBelowMinimum
+                | TlcErrorCode::ExpiryTooSoon
+                | TlcErrorCode::ExpiryTooFar => {
                     self.fail_pair_balanced(nodes, index + 1);
                     self.succeed_range_pairs(nodes, 0, index);
                 }
-                TlcErrorCode::ExpiryTooSoon | TlcErrorCode::ExpiryTooFar => {
-                    if index == 1 {
-                        self.fail_node(nodes, 1);
-                    } else {
-                        self.fail_range_pairs(nodes, 0, index - 1);
-                    }
-                }
                 TlcErrorCode::IncorrectOrUnknownPaymentDetails => {
                     need_retry = false;
                 }

crates/fiber-lib/src/fiber/network.rs

@@ -2760,7 +2760,7 @@ where
     }
 
     fn set_amp_custom_records(&self, attempts: &mut [Attempt], payment_hash: Hash256) {
-        debug_assert!(attempts.len() > 0);
+        debug_assert!(!attempts.is_empty());
 
         let root = AmpSecret::random();
         let secrets = AmpSecret::gen_random_sequence(root, attempts.len() as u16);

crates/fiber-lib/src/store/.schema.json

@@ -3,7 +3,7 @@
   "AmpPaymentData": "673a52cf08513b5dc5272c75f880337f9a8392d37e29ce0a6205f3f61e54a58b",
   "AmpSecret": "a17107d5b43b69f1a75985fcee5eea56751e3b30a37f2e343e69885642800481",
   "AnnouncedNodeName": "73035cf37b0bbc724336af8a5982ca40a37d6fdcb6f7b0fed98158b4afb51260",
-  "Attempt": "f5ff2b3b64a2631633ddcf8f957feb21e8a863b02638a617157cb498ae641504",
+  "Attempt": "81aa827fa414d50908f82bfa259019fa863b045f13de069e0b83d20fe7dd27f8",
   "AttemptStatus": "b18d88f1743ca9a7b657daa273e3ec3cab475113c2b34704792f8ca7a382313a",
   "Attribute": "bee9e44e53d7428c6881544b3859b5074d3ec016f45ba027fba7b92d1c9c2d4b",
   "BroadcastMessage": "c15fb7747e489e3ace898276a811a61060f3913bf8d6143ed9ab895d97128469",

tests/bruno/e2e/watchtower/force-close-with-consecutive-settlement/10-node1-add-tlc2.bru

@@ -37,8 +37,9 @@ assert {
 }
 
 script:pre-request {
-  // 10 seconds expiry
-  let expiry = "0x" + (Date.now() + 1000 * 10).toString(16);
+  // default 2/3 commitment_delay_epoch is 6 * 2/3 * 2 = 8 seconds in test environment
+  // requires (pending_tlc_count + 1 ) * 8 = 16 seconds for expiry, we use 17 as a safe margin
+  let expiry = "0x" + (Date.now() + 1000 * 17).toString(16);
   bru.setVar("expiry", expiry);
 }
 

tests/bruno/e2e/watchtower/force-close-with-consecutive-settlement/11-node1-add-tlc3.bru

@@ -37,8 +37,9 @@ assert {
 }
 
 script:pre-request {
-  // 10 seconds expiry
-  let expiry = "0x" + (Date.now() + 1000 * 10).toString(16);
+  // default 2/3 commitment_delay_epoch is 6 * 2/3 * 2 = 8 seconds in test environment
+  // requires (pending_tlc_count + 1) * 8 = 24 seconds for expiry, we use 25 as a safe margin
+  let expiry = "0x" + (Date.now() + 1000 * 25).toString(16);
   bru.setVar("expiry", expiry);
 }
 

tests/bruno/e2e/watchtower/force-close-with-consecutive-settlement/16-generate-blocks-for-onchain-timestamp-updates.bru

@@ -29,8 +29,8 @@ assert {
 }
 
 script:pre-request {
-  // wait 10 seconds for the onchain timestamp to be updated
-  await new Promise(r => setTimeout(r, 10000));
+  // wait 20 seconds for the onchain timestamp to be updated
+  await new Promise(r => setTimeout(r, 30000));
 }
 
 script:post-response {

tests/bruno/e2e/watchtower/force-close-with-pending-tlcs-and-stop-watchtower/10-node2-add-tlc2.bru

@@ -37,8 +37,8 @@ assert {
 }
 
 script:pre-request {
-  // 10 seconds expiry
-  let expiry = "0x" + (Date.now() + 1000 * 10).toString(16);
+  // 17 seconds expiry
+  let expiry = "0x" + (Date.now() + 1000 * 17).toString(16);
   bru.setVar("expiry", expiry);
 }
 

tests/bruno/e2e/watchtower/force-close-with-pending-tlcs-and-stop-watchtower/16-generate-blocks-for-onchain-timestamp-updates.bru

@@ -29,8 +29,8 @@ assert {
 }
 
 script:pre-request {
-  // wait 10 seconds for the onchain timestamp to be updated
-  await new Promise(r => setTimeout(r, 10000));
+  // wait 20 seconds for the onchain timestamp to be updated
+  await new Promise(r => setTimeout(r, 20000));
 }
 
 script:post-response {

tests/bruno/e2e/watchtower/force-close-with-pending-tlcs-and-udt/11-node1-add-tlc2.bru

@@ -37,8 +37,8 @@ assert {
 }
 
 script:pre-request {
-  // 10 seconds expiry
-  let expiry = "0x" + (Date.now() + 1000 * 10).toString(16);
+  // 17 seconds expiry
+  let expiry = "0x" + (Date.now() + 1000 * 17).toString(16);
   bru.setVar("expiry", expiry);
 }