mirrors/eclair
1
0
Fork 0
mirror of https://github.com/ACINQ/eclair.git synced 2025-02-21 22:11:46 +01:00
Code Issues Projects Releases Wiki Activity

includes all IN msg in commit tx

Browse source
This commit is contained in:
pm47 2016-04-28 19:07:47 +02:00
parent 8904aefbb1
commit 8c7484256e
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
eclair-demo/src/main/scala/fr/acinq/eclair/channel/Channel.scala
View file

@ -535,8 +535,8 @@ class Channel(val them: ActorRef, val blockchain: ActorRef, val params: OurChann
case Event(msg@update_commit(theirSig, theirAck), d@DATA_NORMAL(ack_in, ack_out, ourParams, theirParams, shaChain, htlcIdx, staged, previousCommitment, ReadyForSig(theirNextRevocationHash))) =>
// counterparty initiated a new commitment
val committed_changes = staged.takeWhile(c => c.direction == IN || c.ack <= theirAck)
val uncommitted_changes = staged.drop(committed_changes.size)
val committed_changes = staged.filter(c => c.direction == IN || c.ack <= theirAck)
val uncommitted_changes = staged.filterNot(committed_changes.contains(_))
// TODO : we should check that this is the correct state (see acknowledge discussion)
val proposal = UpdateProposal(previousCommitment.index + 1, previousCommitment.state.commit_changes(committed_changes), theirNextRevocationHash)
val ourRevocationHash = Crypto.sha256(ShaChain.shaChainFromSeed(ourParams.shaSeed, proposal.index))