mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-03-13 03:14:26 +01:00
Code Issues Projects Releases Wiki Activity

small changes

Browse source 
- change default parameters and explain them better
- remove checks on incomming HTLCs
This commit is contained in:
Thomas HUET 2024-08-09 11:26:41 +02:00
parent 6e8d67550c
commit a3573765d3
3 changed files with 9 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/release-notes/eclair-vnext.md
View file

@ -37,7 +37,7 @@ To configure, edit `eclair.conf`:
```eclair.conf ```eclair.conf
// We assign reputations to our peers to prioritize payments during congestion. // We assign reputations to our peers to prioritize payments during congestion.
// The reputation is computed as fees paid divided by what should have been paid if all payments were successful. // The reputation is computed as fees paid divided by what should have been paid if all payments were successful.
eclair.peer-reputation { eclair.relay.peer-reputation {
// Set this parameter to false to disable the reputation algorithm and simply relay the incoming endorsement // Set this parameter to false to disable the reputation algorithm and simply relay the incoming endorsement
// value, as described by https://github.com/lightning/blips/blob/master/blip-0004.md, // value, as described by https://github.com/lightning/blips/blob/master/blip-0004.md,
enabled = true enabled = true

8
eclair-core/src/main/resources/reference.conf
View file

@ -245,12 +245,14 @@ eclair {
// value, as described by https://github.com/lightning/blips/blob/master/blip-0004.md, // value, as described by https://github.com/lightning/blips/blob/master/blip-0004.md,
enabled = true enabled = true
// Reputation decays with the following half life to emphasize recent behavior. // Reputation decays with the following half life to emphasize recent behavior.
half-life = 7 days half-life = 15 days
// Payments that stay pending for longer than this get penalized. // Payments that stay pending for longer than this get penalized.
max-relay-duration = 12 seconds max-relay-duration = 12 seconds
// Pending payments are counted as failed, and because they could potentially stay pending for a very long time, // Pending payments are counted as failed, and because they could potentially stay pending for a very long time,
// the following multiplier is applied. // the following multiplier is applied. We want it to be as close as possible to the true cost of a worst case
pending-multiplier = 1000 // A pending payment counts as a thousand failed ones. // HTLC (max-cltv-delta / max-relay-duration, around 100000 with default parameters) while still being comparable
// to the number of HTLCs received per peer during twice the half life.
pending-multiplier = 200 // A pending payment counts as two hundred failed ones.
} }
} }

27
eclair-core/src/main/scala/fr/acinq/eclair/channel/Commitments.scala
View file

@ -565,14 +565,6 @@ case class Commitment(fundingTxIndex: Long,
return Left(TooManyAcceptedHtlcs(params.channelId, maximum = params.localParams.maxAcceptedHtlcs)) return Left(TooManyAcceptedHtlcs(params.channelId, maximum = params.localParams.maxAcceptedHtlcs))
} }
// Jamming protection
// Must be the last checks so that they can be ignored for shadow deployment.
for ((amountMsat, i) <- incomingHtlcs.toSeq.map(_.amountMsat).sorted.zipWithIndex) {
if ((amountMsat.toLong < 1) || (math.log(amountMsat.toLong.toDouble) * params.localParams.maxAcceptedHtlcs / math.log(params.localParams.maxHtlcValueInFlightMsat.toLong.toDouble / params.localParams.maxAcceptedHtlcs) < i)) {
return Left(TooManySmallHtlcs(params.channelId, number = i + 1, below = amountMsat))
}
}
Right(()) Right(())
} }
@ -901,7 +893,7 @@ case class Commitments(params: ChannelParams,
.getOrElse(Right(copy(changes = changes1, originChannels = originChannels1), add)) .getOrElse(Right(copy(changes = changes1, originChannels = originChannels1), add))
} }
def receiveAdd(add: UpdateAddHtlc, feerates: FeeratesPerKw, feeConf: OnChainFeeConf)(implicit log: LoggingAdapter): Either[ChannelException, Commitments] = { def receiveAdd(add: UpdateAddHtlc, feerates: FeeratesPerKw, feeConf: OnChainFeeConf): Either[ChannelException, Commitments] = {
if (add.id != changes.remoteNextHtlcId) { if (add.id != changes.remoteNextHtlcId) {
return Left(UnexpectedHtlcId(channelId, expected = changes.remoteNextHtlcId, actual = add.id)) return Left(UnexpectedHtlcId(channelId, expected = changes.remoteNextHtlcId, actual = add.id))
} }
@ -914,21 +906,8 @@ case class Commitments(params: ChannelParams,
val changes1 = changes.addRemoteProposal(add).copy(remoteNextHtlcId = changes.remoteNextHtlcId + 1) val changes1 = changes.addRemoteProposal(add).copy(remoteNextHtlcId = changes.remoteNextHtlcId + 1)
// we verify that this htlc is allowed in every active commitment // we verify that this htlc is allowed in every active commitment
val canReceiveAdds = active.map(_.canReceiveAdd(add.amountMsat, params, changes1, feerates, feeConf)) active.map(_.canReceiveAdd(add.amountMsat, params, changes1, feerates, feeConf))
// Log only for jamming protection. .collectFirst { case Left(f) => Left(f) }
canReceiveAdds.collectFirst {
case Left(f: TooManySmallHtlcs) =>
log.info("TooManySmallHtlcs: {} incoming HTLCs are below {}}", f.number, f.below)
Metrics.dropHtlc(f, Tags.Directions.Incoming)
}
canReceiveAdds.flatMap { // TODO: We ignore jamming protection, delete this flatMap to activate jamming protection.
case Left(_: TooManySmallHtlcs) | Left(_: ConfidenceTooLow) => None
case x => Some(x)
}
.collectFirst { case Left(f) =>
Metrics.dropHtlc(f, Tags.Directions.Incoming)
Left(f)
}
.getOrElse(Right(copy(changes = changes1))) .getOrElse(Right(copy(changes = changes1)))
} }