staticaddr: only fetch L402 if not present

Author: hieblmi

loopd/daemon.go

@@ -580,6 +580,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 	staticAddressStore := address.NewSqlStore(baseDb)
 	addrCfg := &address.ManagerConfig{
 		AddressClient: staticAddressClient,
+		CurrentToken:  swapClient.L402Store.CurrentToken,
 		FetchL402:     swapClient.Server.FetchL402,
 		Store:         staticAddressStore,
 		WalletKit:     d.lnd.WalletKit,

staticaddr/address/manager.go

@@ -3,13 +3,15 @@ package address
 import (
 	"bytes"
 	"context"
+	"errors"
 	"fmt"
 	"sync/atomic"
 
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/lightninglabs/aperture/l402"
 	"github.com/lightninglabs/lndclient"
 	"github.com/lightninglabs/loop/staticaddr/script"
 	"github.com/lightninglabs/loop/staticaddr/version"
@@ -26,10 +28,14 @@ type ManagerConfig struct {
 	// to manage static addresses.
 	AddressClient staticaddressrpc.StaticAddressServerClient
 
+	// CurrentToken returns the token currently contained in the store or a
+	// l402.ErrNoToken error if there is none.
+	CurrentToken func() (*l402.Token, error)
+
 	// FetchL402 is the function used to fetch the l402 token.
 	FetchL402 func(context.Context) error
 
-	// Store is the database store that is used to store static address
+	// Store is the database store that is used to store static address-
 	// related records.
 	Store Store
 
@@ -123,6 +129,20 @@ func (m *Manager) Run(ctx context.Context, initChan chan struct{}) error {
 		return err
 	}
 
+	// Check if we need to fetch a new L402 token.
+	_, err = m.cfg.CurrentToken()
+	if err != nil {
+		if !errors.Is(err, l402.ErrNoToken) {
+			return err
+		}
+
+		// We are fetching a new L402 token from the server.
+		err = m.cfg.FetchL402(ctx)
+		if err != nil {
+			return err
+		}
+	}
+
 	// The address worker offloads the address creation with the server to a
 	// separate go routine.
 	go m.addrWorker(ctx)
@@ -181,12 +201,6 @@ func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot,
 func (m *Manager) newAddress(ctx context.Context) (*btcutil.AddressTaproot,
 	int64, error) {
 
-	// We are fetching a new L402 token from the server.
-	err := m.cfg.FetchL402(ctx)
-	if err != nil {
-		return nil, 0, err
-	}
-
 	clientPubKey, err := m.cfg.WalletKit.DeriveNextKey(
 		ctx, swap.StaticAddressKeyFamily,
 	)
@@ -197,10 +211,11 @@ func (m *Manager) newAddress(ctx context.Context) (*btcutil.AddressTaproot,
 	// Send our clientPubKey to the server and wait for the server to
 	// respond with he serverPubKey and the static address CSV expiry.
 	protocolVersion := version.CurrentRPCProtocolVersion()
+	serializedPubKey := clientPubKey.PubKey.SerializeCompressed()
 	resp, err := m.cfg.AddressClient.ServerNewAddress(
 		ctx, &staticaddressrpc.ServerNewAddressRequest{
 			ProtocolVersion: protocolVersion,
-			ClientKey:       clientPubKey.PubKey.SerializeCompressed(), //nolint:lll
+			ClientKey:       serializedPubKey,
 		},
 	)
 	if err != nil {