mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2024-11-19 18:10:42 +01:00
Code Issues Projects Releases Wiki Activity

Reproduced and fixed issue with different dust limits (closes #97) (#108)

Browse Source
This commit is contained in:
Pierre-Marie Padiou 2017-07-17 19:18:27 +02:00 committed by GitHub
parent 1c3b1bfed5
commit 5c53bf5f4d
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eclair-core/src/main/scala/fr/acinq/eclair/channel/Commitments.scala
View File

@ -441,7 +441,7 @@ object Commitments extends Logging {
val remoteDelayedPubkey = Generators.derivePubKey(remoteParams.delayedPaymentBasepoint, remotePerCommitmentPoint)
val remoteRevocationPubkey = Generators.revocationPubKey(localParams.revocationBasepoint, remotePerCommitmentPoint)
val commitTx = Transactions.makeCommitTx(commitmentInput, commitTxNumber, remoteParams.paymentBasepoint, localParams.paymentBasepoint, !localParams.isFunder, Satoshi(remoteParams.dustLimitSatoshis), remotePubkey, remoteRevocationPubkey, localParams.toSelfDelay, remoteDelayedPubkey, localPubkey, spec)
val (htlcTimeoutTxs, htlcSuccessTxs) = Transactions.makeHtlcTxs(commitTx.tx, Satoshi(localParams.dustLimitSatoshis), remoteRevocationPubkey, localParams.toSelfDelay, remotePubkey, remoteDelayedPubkey, localPubkey, spec)
val (htlcTimeoutTxs, htlcSuccessTxs) = Transactions.makeHtlcTxs(commitTx.tx, Satoshi(remoteParams.dustLimitSatoshis), remoteRevocationPubkey, localParams.toSelfDelay, remotePubkey, remoteDelayedPubkey, localPubkey, spec)
(commitTx, htlcTimeoutTxs, htlcSuccessTxs)
}

4
eclair-core/src/test/scala/fr/acinq/eclair/TestConstants.scala
View File

@ -29,7 +29,7 @@ object TestConstants {
publicAddresses = new InetSocketAddress("localhost", 9731) :: Nil,
globalFeatures = "",
localFeatures = "00",
dustLimitSatoshis = 542,
dustLimitSatoshis = 500,
maxHtlcValueInFlightMsat = 150000000,
maxAcceptedHtlcs = 100,
expiryDeltaBlocks = 144,
@ -75,7 +75,7 @@ object TestConstants {
publicAddresses = new InetSocketAddress("localhost", 9732) :: Nil,
globalFeatures = "",
localFeatures = "00", // no announcement
dustLimitSatoshis = 542,
dustLimitSatoshis = 1000,
maxHtlcValueInFlightMsat = Long.MaxValue, // Bob has no limit on the combined max value of in-flight htlcs
maxAcceptedHtlcs = 30,
expiryDeltaBlocks = 144,