accounts: add new IncreaseAccountBalance Store method

And use it instead of UpdateAccount in the InterceptorService's
invoiceUpdate method.

Author: ellemouton

accounts/interface.go

@@ -230,6 +230,11 @@ type Store interface {
 	AddAccountInvoice(ctx context.Context, id AccountID,
 		hash lntypes.Hash) error
 
+	// IncreaseAccountBalance increases the balance of the account with the
+	// given ID by the given amount.
+	IncreaseAccountBalance(ctx context.Context, id AccountID,
+		amount lnwire.MilliSatoshi) error
+
 	// RemoveAccount finds an account by its ID and removes it from the¨
 	// store.
 	RemoveAccount(ctx context.Context, id AccountID) error

accounts/service.go

@@ -598,21 +598,13 @@ func (s *InterceptorService) invoiceUpdate(ctx context.Context,
 		return nil
 	}
 
-	account, err := s.store.Account(ctx, acctID)
-	if err != nil {
-		return s.disableAndErrorfUnsafe(
-			"error fetching account: %w", err,
-		)
-	}
-
 	// If we get here, the current account has the invoice associated with
 	// it that was just paid. Credit the amount to the account and update it
 	// in the DB.
-	account.CurrentBalance += int64(invoice.AmountPaid)
-	if err := s.store.UpdateAccount(ctx, account); err != nil {
-		return s.disableAndErrorfUnsafe(
-			"error updating account: %w", err,
-		)
+	err := s.store.IncreaseAccountBalance(ctx, acctID, invoice.AmountPaid)
+	if err != nil {
+		return s.disableAndErrorfUnsafe("error increasing account "+
+			"balance account: %w", err)
 	}
 
 	// We've now fully processed the invoice and don't need to keep it

accounts/store_kvdb.go

@@ -7,6 +7,7 @@ import (
 	"encoding/binary"
 	"encoding/hex"
 	"fmt"
+	"math"
 	"os"
 	"time"
 
@@ -233,6 +234,27 @@ func (s *BoltStore) AddAccountInvoice(_ context.Context, id AccountID,
 	return s.updateAccount(id, update)
 }
 
+// IncreaseAccountBalance increases the balance of the account with the given ID
+// by the given amount.
+//
+// NOTE: This is part of the Store interface.
+func (s *BoltStore) IncreaseAccountBalance(_ context.Context, id AccountID,
+	amount lnwire.MilliSatoshi) error {
+
+	update := func(account *OffChainBalanceAccount) error {
+		if amount > math.MaxInt64 {
+			return fmt.Errorf("amount %d exceeds the maximum of %d",
+				amount, math.MaxInt64)
+		}
+
+		account.CurrentBalance += int64(amount)
+
+		return nil
+	}
+
+	return s.updateAccount(id, update)
+}
+
 func (s *BoltStore) updateAccount(id AccountID,
 	updateFn func(*OffChainBalanceAccount) error) error {
 

accounts/store_test.go

@@ -203,6 +203,11 @@ func TestAccountUpdateMethods(t *testing.T) {
 		// The account initially has no invoices.
 		assertInvoices()
 
+		// Adding an invoice to an account that doesnt exist yet should
+		// error out.
+		err = store.AddAccountInvoice(ctx, AccountID{}, lntypes.Hash{})
+		require.ErrorIs(t, err, ErrAccNotFound)
+
 		// Add an invoice to the account.
 		hash1 := lntypes.Hash{1, 2, 3, 4}
 		err = store.AddAccountInvoice(ctx, acct.ID, hash1)
@@ -224,6 +229,34 @@ func TestAccountUpdateMethods(t *testing.T) {
 
 		assertInvoices(hash1, hash2)
 	})
+
+	t.Run("IncreaseAccountBalance", func(t *testing.T) {
+		store := NewTestDB(t)
+
+		// Increasing the balance of an account that doesn't exist
+		// should error out.
+		err := store.IncreaseAccountBalance(ctx, AccountID{}, 100)
+		require.ErrorIs(t, err, ErrAccNotFound)
+
+		acct, err := store.NewAccount(ctx, 123, time.Time{}, "foo")
+		require.NoError(t, err)
+
+		assertBalance := func(balance int64) {
+			dbAcct, err := store.Account(ctx, acct.ID)
+			require.NoError(t, err)
+			require.EqualValues(t, balance, dbAcct.CurrentBalance)
+		}
+
+		// The account initially has a balance of 123.
+		assertBalance(123)
+
+		// Increase the balance by 100 and assert that the new balance
+		// is 223.
+		err = store.IncreaseAccountBalance(ctx, acct.ID, 100)
+		require.NoError(t, err)
+
+		assertBalance(223)
+	})
 }
 
 // TestLastInvoiceIndexes makes sure the last known invoice indexes can be