staticaddr: lock deposit map

Author: hieblmi

staticaddr/deposit/manager.go

@@ -74,8 +74,11 @@ type ManagerConfig struct {
 type Manager struct {
 	cfg *ManagerConfig
 
-	// mu guards access to activeDeposits map.
-	mu sync.Mutex
+	// mu guards access to the activeDeposits map.
+	muActiveDeposits sync.Mutex
+
+	// mu guards access to the deposits map.
+	muDeposits sync.Mutex
 
 	// initChan signals the daemon that the address manager has completed
 	// its initialization.
@@ -136,12 +139,12 @@ func (m *Manager) Run(ctx context.Context, currentHeight uint32) error {
 		select {
 		case height := <-newBlockChan:
 			// Inform all active deposits about a new block arrival.
-			m.mu.Lock()
+			m.muActiveDeposits.Lock()
 			activeDeposits := make([]*FSM, 0, len(m.activeDeposits))
 			for _, fsm := range m.activeDeposits {
 				activeDeposits = append(activeDeposits, fsm)
 			}
-			m.mu.Unlock()
+			m.muActiveDeposits.Unlock()
 
 			for _, fsm := range activeDeposits {
 				select {
@@ -159,9 +162,9 @@ func (m *Manager) Run(ctx context.Context, currentHeight uint32) error {
 			// If deposits notify us about their finalization,
 			// flush the finalized deposit from memory and end the
 			// fsm's block notif goroutine.
-			m.mu.Lock()
+			m.muActiveDeposits.Lock()
 			fsm := m.activeDeposits[outpoint]
-			m.mu.Unlock()
+			m.muActiveDeposits.Unlock()
 
 			// End the fsm's block notif go routine.
 			select {
@@ -171,9 +174,9 @@ func (m *Manager) Run(ctx context.Context, currentHeight uint32) error {
 				return ctx.Err()
 			}
 
-			m.mu.Lock()
+			m.muActiveDeposits.Lock()
 			delete(m.activeDeposits, outpoint)
-			m.mu.Unlock()
+			m.muActiveDeposits.Unlock()
 
 		case err = <-newBlockErrChan:
 			return err
@@ -222,9 +225,9 @@ func (m *Manager) recoverDeposits(ctx context.Context) error {
 			}
 		}()
 
-		m.mu.Lock()
+		m.muActiveDeposits.Lock()
 		m.activeDeposits[d.OutPoint] = fsm
-		m.mu.Unlock()
+		m.muActiveDeposits.Unlock()
 	}
 
 	return nil
@@ -344,9 +347,9 @@ func (m *Manager) createNewDeposit(ctx context.Context,
 		return nil, err
 	}
 
-	m.mu.Lock()
+	m.muDeposits.Lock()
 	m.deposits[deposit.OutPoint] = deposit
-	m.mu.Unlock()
+	m.muDeposits.Unlock()
 
 	return deposit, nil
 }
@@ -387,8 +390,8 @@ func (m *Manager) getBlockHeight(ctx context.Context,
 // filterNewDeposits filters the given utxos for new deposits that we haven't
 // seen before.
 func (m *Manager) filterNewDeposits(utxos []*lnwallet.Utxo) []*lnwallet.Utxo {
-	m.mu.Lock()
-	defer m.mu.Unlock()
+	m.muDeposits.Lock()
+	defer m.muDeposits.Unlock()
 
 	var newDeposits []*lnwallet.Utxo
 	for _, utxo := range utxos {
@@ -424,9 +427,9 @@ func (m *Manager) startDepositFsm(ctx context.Context, deposit *Deposit) error {
 	}
 
 	// Add the FSM to the active FSMs map.
-	m.mu.Lock()
+	m.muActiveDeposits.Lock()
 	m.activeDeposits[deposit.OutPoint] = fsm
-	m.mu.Unlock()
+	m.muActiveDeposits.Unlock()
 
 	return nil
 }
@@ -437,8 +440,8 @@ func (m *Manager) startDepositFsm(ctx context.Context, deposit *Deposit) error {
 func (m *Manager) GetActiveDepositsInState(stateFilter fsm.StateType) (
 	[]*Deposit, error) {
 
-	m.mu.Lock()
-	defer m.mu.Unlock()
+	m.muActiveDeposits.Lock()
+	defer m.muActiveDeposits.Unlock()
 
 	var deposits []*Deposit
 	for _, fsm := range m.activeDeposits {
@@ -472,8 +475,8 @@ func (m *Manager) GetActiveDepositsInState(stateFilter fsm.StateType) (
 func (m *Manager) AllOutpointsActiveDeposits(outpoints []wire.OutPoint,
 	targetState fsm.StateType) ([]*Deposit, bool) {
 
-	m.mu.Lock()
-	defer m.mu.Unlock()
+	m.muActiveDeposits.Lock()
+	defer m.muActiveDeposits.Unlock()
 
 	_, deposits := m.toActiveDeposits(&outpoints)
 	if deposits == nil {
@@ -531,10 +534,10 @@ func (m *Manager) TransitionDeposits(ctx context.Context, deposits []*Deposit,
 		outpoints[i] = d.OutPoint
 	}
 
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
+	m.muActiveDeposits.Lock()
 	stateMachines, _ := m.toActiveDeposits(&outpoints)
+	m.muActiveDeposits.Unlock()
+
 	if stateMachines == nil {
 		return fmt.Errorf("deposits not found in active deposits")
 	}