Fix nonce not becoming available when swap is cancelled from a funding or funded state

jeffyanta · jeffyanta · commit 44bdbcfa99ac · 2026-01-16T10:03:16.000-05:00
diff --git a/ocp/worker/swap/util.go b/ocp/worker/swap/util.go
@@ -281,7 +281,7 @@ func (p *runtime) markNonceReleasedDueToSubmittedTransaction(ctx context.Context
 }
 
 func (p *runtime) markNonceAvailableDueToCancelledSwap(ctx context.Context, record *swap.Record) error {
-	err := p.validateSwapState(record, swap.StateCreated)
+	err := p.validateSwapState(record, swap.StateCreated, swap.StateFunding, swap.StateFunded)
 	if err != nil {
 		return err
 	}

Original file line number	Diff line number	Diff line change
`@@ -281,7 +281,7 @@ func (p *runtime) markNonceReleasedDueToSubmittedTransaction(ctx context.Context`
`281`	`281`	`}`
`282`	`282`
`283`	`283`	`func (p runtime) markNonceAvailableDueToCancelledSwap(ctx context.Context, record swap.Record) error {`
`284`		`- err := p.validateSwapState(record, swap.StateCreated)`
	`284`	`+ err := p.validateSwapState(record, swap.StateCreated, swap.StateFunding, swap.StateFunded)`
`285`	`285`	`if err != nil {`
`286`	`286`	`return err`
`287`	`287`	`}`