Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Implement all closing modes (mutual, forced, revoked) #72

Merged
merged 111 commits into from
Oct 21, 2020
Merged

Implement all closing modes (mutual, forced, revoked) #72

merged 111 commits into from
Oct 21, 2020

Conversation

sstone
Copy link
Member

@sstone sstone commented Oct 13, 2020

This is a merge of #63 and #64, which add support for all closing modes:

  • mutual close and fee negotiation
  • force-close (local and remote)
  • publication of revoked transactions

Romain Boisselle and others added 30 commits September 21, 2020 16:40
do not take WatchLost into account in ElectrumWatcher
1588fc2
add ChannelTypes
c02eaf2
add helper to claim spent (remote / revoked) txs outputs
bb2660e
handle watchSpent event in Normal state
2dcc738
Merge remote-tracking branch 'origin/master' into feature/force_close
f0686c5 
# Conflicts:
#	src/commonMain/kotlin/fr/acinq/eclair/channel/ChannelTypes.kt
#	src/commonMain/kotlin/fr/acinq/eclair/channel/Helpers.kt
Merge remote-tracking branch 'origin/master' into feature/force_close
fedec67 
# Conflicts:
#	src/commonMain/kotlin/fr/acinq/eclair/channel/Helpers.kt
test helper: make payment between two ChannelStates
b38fa64
Merge remote-tracking branch 'origin/test/helpers' into feature/force…
30fcd00 
…_close
first test
4499310
add htlc helper
35828fe
EclairLoggerFactory allows tests to change the default logger, and iO…
e88d9d7 
…S to display logs
Linux tests fix
ffe080d
addHtlc / fulfillHtlc / crossSign
70d0d0b
utils as extensions
b06e2b8
remove makePayment()
b8df06b
Merge remote-tracking branch 'origin/master' into feature/force_close
2d2d0b2
Merge branch 'test/helpers' into feature/force_close
c9dc8de 
# Conflicts:
#	src/commonTest/kotlin/fr/acinq/eclair/channel/TestsHelper.kt
change return type
67bc634
change return type
420b2df
Merge branch 'test/helpers' into feature/force_close
77c9a05 
# Conflicts:
#	src/commonTest/kotlin/fr/acinq/eclair/channel/TestsHelper.kt
improve test helpers
0e38b0f
fix tx signature in Helpers.Closing functions
2a4699d
first tests
1c47c07
finalize NormalStateTests on watch spent
aea3eb2
remove makePayment()
df84baf
adjustments
18da0a7
merge normal state tests
1d4b9c2
Closing state process [CMD_FULFILL_HTLC, BITCOIN_FUNDING_SPENT, BITCO…
383a89a 
…IN_TX_CONFIRMED]
improve readability
e57d38e
Closing : CMD_CLOSE, ChannelReestablish, BITCOIN_FUNDING_PUBLISH_FAIL…
5fed644 
…ED, BITCOIN_FUNDING_TIMEOUT
@sstone sstone marked this pull request as ready for review October 21, 2020 14:24
@sstone sstone merged commit 3a6dfd6 into master Oct 21, 2020
@sstone sstone deleted the mutual-close-force-close branch October 21, 2020 14:40
This was referenced Oct 22, 2020
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@romainbsl romainbsl romainbsl approved these changes

Assignees
No one assigned
Labels
None yet
Projects
No open projects
v0.1 - ready for testnet
Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@sstone @romainbsl