Merge pull request #1603 from TheBlueMatt/2022-07-no-backwards-time

[rust-lightning] / lightning / src / routing / scoring.rs

diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs
index 3ca4d13f2de7c55fc2e5b5b85142a20892870ffd..4922fad78476f56d62e6c5ebe859ce36323c93bf 100644 (file)
--- a/lightning/src/routing/scoring.rs
+++ b/lightning/src/routing/scoring.rs
@@ -1215,10 +1215,22 @@ impl<T: Time> Readable for ChannelLiquidity<T> {
                        (2, max_liquidity_offset_msat, required),
                        (4, duration_since_epoch, required),
                });
+               // On rust prior to 1.60 `Instant::duration_since` will panic if time goes backwards.
+               // We write `last_updated` as wallclock time even though its ultimately an `Instant` (which
+               // is a time from a monotonic clock usually represented as an offset against boot time).
+               // Thus, we have to construct an `Instant` by subtracting the difference in wallclock time
+               // from the one that was written. However, because `Instant` can panic if we construct one
+               // in the future, we must handle wallclock time jumping backwards, which we do by simply
+               // using `Instant::now()` in that case.
+               let wall_clock_now = T::duration_since_epoch();
+               let now = T::now();
+               let last_updated = if wall_clock_now > duration_since_epoch {
+                       now - (wall_clock_now - duration_since_epoch)
+               } else { now };
                Ok(Self {
                        min_liquidity_offset_msat,
                        max_liquidity_offset_msat,
-                       last_updated: T::now() - (T::duration_since_epoch() - duration_since_epoch),
+                       last_updated,
                })
        }
 }