Skip to content

Commit 875c74b

Browse files
committed
store start time in nodeParams
1 parent 8e085ac commit 875c74b

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

eclair-core/src/main/scala/fr/acinq/eclair/NodeParams.scala

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,9 @@ case class NodeParams(nodeKeyManager: NodeKeyManager,
9898
enableTrampolinePayment: Boolean,
9999
balanceCheckInterval: FiniteDuration,
100100
blockchainWatchdogSources: Seq[String]) {
101+
102+
val startTime: TimestampSecond = TimestampSecond.now()
103+
101104
val privateKey: Crypto.PrivateKey = nodeKeyManager.nodeKey.privateKey
102105

103106
val nodeId: PublicKey = nodeKeyManager.nodeId

eclair-core/src/main/scala/fr/acinq/eclair/channel/Channel.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ import fr.acinq.eclair.transactions._
5151
import fr.acinq.eclair.wire.protocol._
5252
import scodec.bits.ByteVector
5353

54-
import java.lang.management.ManagementFactory
5554
import java.sql.SQLException
5655
import scala.collection.immutable.Queue
5756
import scala.concurrent.ExecutionContext
@@ -2620,7 +2619,7 @@ class Channel(val nodeParams: NodeParams, val wallet: OnChainChannelFunder, remo
26202619

26212620
private def handleOutdatedCommitment(channelReestablish: ChannelReestablish, d: HasCommitments) = {
26222621
nodeParams.outdatedCommitmentStrategy match {
2623-
case OutdatedCommitmentStrategy.Stop if ManagementFactory.getRuntimeMXBean.getUptime.millis < 10.minutes =>
2622+
case OutdatedCommitmentStrategy.Stop if (TimestampSecond.now() - nodeParams.startTime) < 10.minutes =>
26242623
log.error("we just restarted and may have an outdated commitment: standard procedure would be to request our peer to force-close, but eclair has been configured to halt instead. Please ensure your database is up-to-date and restart eclair.")
26252624
System.exit(1)
26262625
stop(FSM.Shutdown)

0 commit comments

Comments
 (0)