Merge pull request #892 from hieblmi/resign-withdrawal

staticaddr: allow rbf'ing withdrawal transactions

Author: hieblmi

staticaddr/deposit/fsm.go

@@ -297,6 +297,9 @@ func (f *FSM) DepositStatesV0() fsm.States {
 		Withdrawing: fsm.State{
 			Transitions: fsm.Transitions{
 				OnWithdrawn: Withdrawn,
+				// OnWithdrawInitiated is sent if a fee bump was
+				// requested and the withdrawal was republished.
+				OnWithdrawInitiated: Withdrawing,
 				// Upon recovery, we go back to the Deposited
 				// state. The deposit by then has a withdrawal
 				// address stamped to it which will cause it to
@@ -358,7 +361,8 @@ func (f *FSM) DepositStatesV0() fsm.States {
 		},
 		Withdrawn: fsm.State{
 			Transitions: fsm.Transitions{
-				OnExpiry: Expired,
+				OnExpiry:    Expired,
+				OnWithdrawn: Withdrawn,
 			},
 			Action: f.FinalizeDepositAction,
 		},
@@ -374,11 +378,6 @@ func (f *FSM) updateDeposit(ctx context.Context,
 		return
 	}
 
-	f.Debugf("NextState: %v, PreviousState: %v, Event: %v",
-		notification.NextState, notification.PreviousState,
-		notification.Event,
-	)
-
 	type checkStateFunc func(state fsm.StateType) bool
 	type setStateFunc func(state fsm.StateType)
 	checkFunc := checkStateFunc(f.deposit.IsInState)
@@ -393,6 +392,11 @@ func (f *FSM) updateDeposit(ctx context.Context,
 		return
 	}
 
+	f.Debugf("NextState: %v, PreviousState: %v, Event: %v",
+		notification.NextState, notification.PreviousState,
+		notification.Event,
+	)
+
 	err := f.cfg.Store.UpdateDeposit(ctx, f.deposit)
 	if err != nil {
 		f.Errorf("unable to update deposit: %w", err)