staticaddr: return error if address already exists

Author: hieblmi

staticaddr/address/interface.go

@@ -2,15 +2,17 @@ package address
 
 import (
 	"context"
-	"fmt"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/lightninglabs/loop/staticaddr/version"
 	"github.com/lightningnetwork/lnd/keychain"
+	"google.golang.org/grpc/codes"
+	"google.golang.org/grpc/status"
 )
 
 var (
-	ErrAddressAlreadyExists = fmt.Errorf("address already exists")
+	ErrAddressAlreadyExists = status.Error(codes.AlreadyExists,
+		"address already exists")
 )
 
 // Store is the database interface that is used to store and retrieve

staticaddr/address/manager.go

@@ -97,22 +97,15 @@ func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot,
 	// If there's already a static address in the database, we can return
 	// it.
 	m.Lock()
+	defer m.Unlock()
+
 	addresses, err := m.cfg.Store.GetAllStaticAddresses(ctx)
 	if err != nil {
-		m.Unlock()
-
 		return nil, err
 	}
 	if len(addresses) > 0 {
-		clientPubKey := addresses[0].ClientPubkey
-		serverPubKey := addresses[0].ServerPubkey
-		expiry := int64(addresses[0].Expiry)
-
-		m.Unlock()
-
-		return m.GetTaprootAddress(clientPubKey, serverPubKey, expiry)
+		return nil, ErrAddressAlreadyExists
 	}
-	m.Unlock()
 
 	// We are fetching a new L402 token from the server. There is one static
 	// address per L402 token allowed.