reservation: update reservation state machine

This commit updates the reservation statemachine to
allow for locking and spending of the
initial reservation.

Author: sputn1ck

reservation/fsm.go

@@ -61,6 +61,12 @@ var (
 	ReservationConfirmed = fsm.StateType("ReservationConfirmed")
 	ReservationTimedOut  = fsm.StateType("ReservationTimedOut")
 
+	ReservationLocked = fsm.StateType("ReservationLocked")
+
+	ReservationSpendBroadcasted = fsm.StateType("ReservationSpendBroadcasted")
+
+	ReservationSpendConfirmed = fsm.StateType("ReservationSpendConfirmed")
+
 	ReservationFailed = fsm.StateType("ReservationFailed")
 )
 
@@ -74,6 +80,17 @@ var (
 	OnReservationConfirmed   = fsm.EventType("OnReservationConfirmed")
 	OnReservationTimedOut    = fsm.EventType("OnReservationTimedOut")
 
+	OnReservationLocked = fsm.EventType("OnReservationLocked")
+
+	OnReservationUnlocked = fsm.EventType("OnReservationUnlocked")
+
+	OnReservationSpendBroadcasted = fsm.EventType(
+		"OnReservationSpendBroadcasted",
+	)
+	OnReservationSpendConfirmed = fsm.EventType(
+		"OnReservationSpendConfirmed",
+	)
+
 	// Failure Events
 	OnPaymentFailed = fsm.EventType("OnInvoiceCanceled")
 )
@@ -116,9 +133,25 @@ func (r *ReservationFSM) GetReservationStates() fsm.States {
 		ReservationConfirmed: fsm.State{
 			Transitions: fsm.Transitions{
 				OnReservationTimedOut: ReservationTimedOut,
+				OnReservationLocked:   ReservationLocked,
 			},
 			Action: fsm.NoOpAction,
 		},
+		ReservationLocked: fsm.State{
+			Transitions: fsm.Transitions{
+				OnReservationUnlocked:         ReservationConfirmed,
+				OnReservationSpendBroadcasted: ReservationSpendBroadcasted,
+			},
+			Action: fsm.NoOpAction,
+		},
+		ReservationSpendBroadcasted: fsm.State{
+			Transitions: fsm.Transitions{
+				OnReservationSpendConfirmed:   ReservationSpendConfirmed,
+				OnReservationSpendBroadcasted: ReservationSpendBroadcasted,
+			},
+			Action: fsm.NoOpAction,
+		},
+
 		ReservationFailed: fsm.State{
 			Action: fsm.NoOpAction,
 		},

reservation/reservation_fsm.md

@@ -3,13 +3,20 @@ stateDiagram-v2
 [*] --> ReservationInit: OnPrepayInvoice
 ReservationConfirmed
 ReservationConfirmed --> ReservationTimedOut: OnReservationTimedOut
+ReservationConfirmed --> ReservationLocked: OnReservationLocked
 ReservationFailed
 ReservationInit
 ReservationInit --> ReservationWaitForOpening: OnPaymentSent
 ReservationInit --> ReservationFailed: OnError
+ReservationLocked
+ReservationLocked --> ReservationConfirmed: OnReservationUnlocked
+ReservationLocked --> ReservationSpendBroadcasted: OnReservationSpendBroadcasted
 ReservationOpeningMsgReceived
-ReservationOpeningMsgReceived --> ReservationWaitForConfirmation: OnOpeningMessageSaved
 ReservationOpeningMsgReceived --> ReservationOpeningMsgReceived: OnError
+ReservationOpeningMsgReceived --> ReservationWaitForConfirmation: OnOpeningMessageSaved
+ReservationSpendBroadcasted
+ReservationSpendBroadcasted --> ReservationSpendBroadcasted: OnReservationSpendBroadcasted
+ReservationSpendBroadcasted --> ReservationSpendConfirmed: OnReservationSpendConfirmed
 ReservationWaitForConfirmation
 ReservationWaitForConfirmation --> ReservationConfirmed: OnReservationConfirmed
 ReservationWaitForConfirmation --> ReservationTimedOut: OnReservationTimedOut