mirrors/bitcoin-s
1
0
Fork 0
mirror of https://github.com/bitcoin-s/bitcoin-s.git synced 2025-01-19 05:43:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add AdaptorSigComputation states to states that a DLC can be cancelled in (#4158)

Browse Source
This commit is contained in:
Chris Stewart 2022-03-03 20:52:19 -06:00 committed by GitHub
parent 5113cac6c2
commit 0bb0d9acdb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/scala/org/bitcoins/core/protocol/dlc/models/DLCState.scala
View File

@ -101,6 +101,15 @@ object DLCState extends StringFactory[DLCState] {
RemoteClaimed,
Refunded)
/** The states where you can cancel a DLC in your wallet */
val cancellableState = Vector(
Offered,
AcceptComputingAdaptorSigs,
Accepted,
SignComputingAdaptorSigs,
Signed
)
override def fromString(str: String): DLCState = {
all.find(state => str.toLowerCase() == state.toString.toLowerCase) match {
case Some(state) => state

4
dlc-wallet/src/main/scala/org/bitcoins/dlc/wallet/DLCWallet.scala
View File

@ -246,8 +246,8 @@ abstract class DLCWallet
dlcDb = dlcOpt match {
case Some(db) =>
require(
db.state == DLCState.Offered || db.state == DLCState.Accepted || db.state == DLCState.Signed,
"Cannot cancel a DLC after it has been signed")
DLCState.cancellableState.exists(_ == db.state),
s"Cannot cancel a DLC after it has been signed, state=${db.state}")
db
case None =>
throw new IllegalArgumentException(