StaticAddr: fix deposit detection

loopd/daemon.go

@@ -592,6 +592,7 @@ func (d *Daemon) initialize(withMacaroonService bool) error {
 			Store:         staticAddressStore,
 			WalletKit:     d.lnd.WalletKit,
 			ChainParams:   d.lnd.ChainParams,
+			ChainNotifier: d.lnd.ChainNotifier,
 		}
 		staticAddressManager = address.NewManager(addrCfg)
 

loopdb/sqlc/migrations/000009_static_address.up.sql

@@ -34,5 +34,9 @@ CREATE TABLE IF NOT EXISTS static_addresses (
     -- Note that this version is not upgraded if the client upgrades or
     -- downgrades their protocol version for static address outputs already in
     -- use.
-    protocol_version INTEGER NOT NULL
+    protocol_version INTEGER NOT NULL,
+
+    -- initiation_height is the block height at which the static address was
+    -- created.
+    initiation_height INT NOT NULL
 );

loopdb/sqlc/queries/static_addresses.sql

@@ -13,13 +13,15 @@ INSERT INTO static_addresses (
     client_key_family,
     client_key_index,
     pkscript,
-    protocol_version
+    protocol_version,
+    initiation_height
 ) VALUES (
              $1,
              $2,
              $3,
              $4,
              $5,
              $6,
-             $7
+             $7,
+             $8
          );

staticaddr/address/interface.go

@@ -54,4 +54,7 @@ type Parameters struct {
 
 	// ProtocolVersion is the protocol version of the static address.
 	ProtocolVersion version.AddressProtocolVersion
+
+	// InitiationHeight is the height at which the address was initiated.
+	InitiationHeight int32
 }

staticaddr/address/manager.go

@@ -40,13 +40,19 @@ type ManagerConfig struct {
 	// ChainParams is the chain configuration(mainnet, testnet...) this
 	// manager uses.
 	ChainParams *chaincfg.Params
+
+	// ChainNotifier is the chain notifier that is used to listen for new
+	// blocks.
+	ChainNotifier lndclient.ChainNotifierClient
 }
 
 // Manager manages the address state machines.
 type Manager struct {
 	cfg *ManagerConfig
 
 	sync.Mutex
+
+	currentHeight int32
 }
 
 // NewManager creates a new address manager.
@@ -58,8 +64,26 @@ func NewManager(cfg *ManagerConfig) *Manager {
 
 // Run runs the address manager.
 func (m *Manager) Run(ctx context.Context) error {
-	<-ctx.Done()
-	return nil
+	newBlockChan, newBlockErrChan, err :=
+		m.cfg.ChainNotifier.RegisterBlockEpochNtfn(ctx)
+
+	if err != nil {
+		return err
+	}
+
+	for {
+		select {
+		case currentHeight := <-newBlockChan:
+			m.currentHeight = currentHeight
+
+		case err = <-newBlockErrChan:
+			return err
+
+		case <-ctx.Done():
+			// Signal subroutines that the manager is exiting.
+			return ctx.Err()
+		}
+	}
 }
 
 // NewAddress starts a new address creation flow.
@@ -86,6 +110,11 @@ func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot,
 	}
 	m.Unlock()
 
+	// Ensure that we have that we have a sane current block height.
+	if m.currentHeight == 0 {
+		return nil, fmt.Errorf("current block height is unknown")
+	}
+
 	// We are fetching a new L402 token from the server. There is one static
 	// address per L402 token allowed.
 	err = m.cfg.FetchL402(ctx)
@@ -147,6 +176,7 @@ func (m *Manager) NewAddress(ctx context.Context) (*btcutil.AddressTaproot,
 		ProtocolVersion: version.AddressProtocolVersion(
 			protocolVersion,
 		),
+		InitiationHeight: m.currentHeight,
 	}
 	err = m.cfg.Store.CreateStaticAddress(ctx, addrParams)
 	if err != nil {

staticaddr/address/manager_test.go

@@ -97,7 +97,7 @@ func TestManager(t *testing.T) {
 	// Start the manager.
 	go func() {
 		err := testContext.manager.Run(ctxb)
-		require.NoError(t, err)
+		require.ErrorIs(t, err, context.Canceled)
 	}()
 
 	// Create the expected static address.
@@ -179,6 +179,7 @@ func NewAddressManagerTestContext(t *testing.T) *ManagerTestContext {
 		WalletKit:     mockLnd.WalletKit,
 		ChainParams:   mockLnd.ChainParams,
 		AddressClient: mockStaticAddressClient,
+		ChainNotifier: mockLnd.ChainNotifier,
 		FetchL402:     func(context.Context) error { return nil },
 	}
 

staticaddr/address/sql_store.go

@@ -28,13 +28,14 @@ func (s *SqlStore) CreateStaticAddress(ctx context.Context,
 	addrParams *Parameters) error {
 
 	createArgs := sqlc.CreateStaticAddressParams{
-		ClientPubkey:    addrParams.ClientPubkey.SerializeCompressed(),
-		ServerPubkey:    addrParams.ServerPubkey.SerializeCompressed(),
-		Expiry:          int32(addrParams.Expiry),
-		ClientKeyFamily: int32(addrParams.KeyLocator.Family),
-		ClientKeyIndex:  int32(addrParams.KeyLocator.Index),
-		Pkscript:        addrParams.PkScript,
-		ProtocolVersion: int32(addrParams.ProtocolVersion),
+		ClientPubkey:     addrParams.ClientPubkey.SerializeCompressed(),
+		ServerPubkey:     addrParams.ServerPubkey.SerializeCompressed(),
+		Expiry:           int32(addrParams.Expiry),
+		ClientKeyFamily:  int32(addrParams.KeyLocator.Family),
+		ClientKeyIndex:   int32(addrParams.KeyLocator.Index),
+		Pkscript:         addrParams.PkScript,
+		ProtocolVersion:  int32(addrParams.ProtocolVersion),
+		InitiationHeight: addrParams.InitiationHeight,
 	}
 
 	return s.baseDB.Queries.CreateStaticAddress(ctx, createArgs)
@@ -106,5 +107,6 @@ func (s *SqlStore) toAddressParameters(row sqlc.StaticAddress) (
 		ProtocolVersion: version.AddressProtocolVersion(
 			row.ProtocolVersion,
 		),
+		InitiationHeight: row.InitiationHeight,
 	}, nil
 }

staticaddr/deposit/manager.go

@@ -336,10 +336,11 @@ func (m *Manager) getBlockHeight(ctx context.Context,
 			"deposit, %w", err)
 	}
 
-	notifChan, errChan, err := m.cfg.ChainNotifier.RegisterConfirmationsNtfn( //nolint:lll
-		ctx, &utxo.OutPoint.Hash, addressParams.PkScript, MinConfs,
-		int32(m.initiationHeight),
-	)
+	notifChan, errChan, err :=
+		m.cfg.ChainNotifier.RegisterConfirmationsNtfn(
+			ctx, &utxo.OutPoint.Hash, addressParams.PkScript,
+			MinConfs, addressParams.InitiationHeight,
+		)
 	if err != nil {
 		return 0, err
 	}