loopd: multi addresses in GetStaticAddressSummary

Author: hieblmi

loopd/swapclient_server.go

@@ -38,6 +38,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntypes"
+	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/queue"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/lightningnetwork/lnd/zpay32"
@@ -1914,78 +1915,142 @@ func (s *swapClientServer) GetStaticAddressSummary(ctx context.Context,
 	_ *looprpc.StaticAddressSummaryRequest) (
 	*looprpc.StaticAddressSummaryResponse, error) {
 
+	summaries := make(map[string]*looprpc.StaticAddressSummary)
+
 	allDeposits, err := s.depositManager.GetAllDeposits(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	var (
-		totalNumDeposits = len(allDeposits)
-		valueUnconfirmed int64
-		valueDeposited   int64
-		valueExpired     int64
-		valueWithdrawn   int64
-		valueLoopedIn    int64
-		htlcTimeoutSwept int64
-	)
+	pkScriptDepositMap := make(map[string][]*deposit.Deposit)
+	for _, d := range allDeposits {
+		pkScript := string(d.AddressParams.PkScript)
+		pkScriptDepositMap[pkScript] = append(
+			pkScriptDepositMap[pkScript], d,
+		)
+	}
 
-	// Value unconfirmed.
-	utxos, err := s.staticAddressManager.ListUnspent(
-		ctx, 0, deposit.MinConfs-1,
-	)
+	network, err := s.network.ChainParams()
 	if err != nil {
 		return nil, err
 	}
-	for _, u := range utxos {
-		valueUnconfirmed += int64(u.Value)
-	}
+	for pkScript, deposits := range pkScriptDepositMap {
+		if len(deposits) == 0 {
+			continue
+		}
 
-	// Confirmed total values by category.
-	for _, d := range allDeposits {
-		value := int64(d.Value)
-		switch d.GetState() {
-		case deposit.Deposited:
-			valueDeposited += value
+		address, err := deposits[0].AddressParams.TaprootAddress(network)
+		if err != nil {
+			return nil, err
+		}
+		summary := &looprpc.StaticAddressSummary{
+			StaticAddress:        address,
+			RelativeExpiryBlocks: uint64(deposits[0].AddressParams.Expiry),
+			TotalNumDeposits:     uint32(len(deposits)),
+		}
+
+		for _, d := range deposits {
+			value := int64(d.Value)
+			switch d.GetState() {
+			case deposit.Deposited:
+				summary.ValueDepositedSatoshis += value
 
-		case deposit.Expired:
-			valueExpired += value
+			case deposit.Expired:
+				summary.ValueExpiredSatoshis += value
 
-		case deposit.Withdrawn:
-			valueWithdrawn += value
+			case deposit.Withdrawn:
+				summary.ValueWithdrawnSatoshis += value
 
-		case deposit.LoopedIn:
-			valueLoopedIn += value
+			case deposit.LoopedIn:
+				summary.ValueLoopedInSatoshis += value
 
-		case deposit.HtlcTimeoutSwept:
-			htlcTimeoutSwept += value
+			case deposit.HtlcTimeoutSwept:
+				summary.ValueHtlcTimeoutSweepsSatoshis += value
+			}
 		}
+
+		// Store per-address summary pointer directly.
+		summaries[pkScript] = summary
 	}
 
-	params, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
+	listUnspentMap := make(map[string][]*lnwallet.Utxo)
+	preDepositedUtxos, err := s.staticAddressManager.ListUnspent(
+		ctx, 0, deposit.MinConfs-1,
+	)
 	if err != nil {
 		return nil, err
 	}
 
-	network, err := s.network.ChainParams()
+	for _, utxo := range preDepositedUtxos {
+		pkScript := string(utxo.PkScript)
+		listUnspentMap[pkScript] = append(
+			listUnspentMap[pkScript], utxo,
+		)
+	}
+
+	for pkScript, utxos := range listUnspentMap {
+		notDepositedValue := int64(0)
+		for _, utxo := range utxos {
+			notDepositedValue += int64(utxo.Value)
+		}
+
+		if _, ok := summaries[pkScript]; ok {
+			summaries[pkScript].ValueUnconfirmedSatoshis =
+				notDepositedValue
+		} else {
+			params := s.staticAddressManager.GetParameters([]byte(pkScript))
+			staticAddress, err := params.TaprootAddress(network)
+			if err != nil {
+				return nil, err
+			}
+			summaries[pkScript] = &looprpc.StaticAddressSummary{
+				StaticAddress:            staticAddress,
+				RelativeExpiryBlocks:     uint64(params.Expiry),
+				ValueUnconfirmedSatoshis: notDepositedValue,
+			}
+		}
+	}
+
+	deprecatedParams, err := s.staticAddressManager.GetStaticAddressParameters(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	address, err := params.TaprootAddress(network)
+	deprecatedAddress, err := deprecatedParams.TaprootAddress(network)
 	if err != nil {
 		return nil, err
 	}
 
+	deprecatedSummary := &looprpc.StaticAddressSummary{
+		StaticAddress:                  deprecatedAddress,
+		RelativeExpiryBlocks:           0,
+		TotalNumDeposits:               0,
+		ValueDepositedSatoshis:         0,
+		ValueExpiredSatoshis:           0,
+		ValueWithdrawnSatoshis:         0,
+		ValueLoopedInSatoshis:          0,
+		ValueHtlcTimeoutSweepsSatoshis: 0,
+		ValueUnconfirmedSatoshis:       0,
+	}
+	results := make([]*looprpc.StaticAddressSummary, 0, len(summaries))
+	for _, summary := range summaries {
+		if summary.StaticAddress == deprecatedAddress {
+			deprecatedSummary = summary
+		}
+		results = append(results, summary)
+	}
+
 	return &looprpc.StaticAddressSummaryResponse{
-		StaticAddress:                  address,
-		RelativeExpiryBlocks:           uint64(params.Expiry),
-		TotalNumDeposits:               uint32(totalNumDeposits),
-		ValueUnconfirmedSatoshis:       valueUnconfirmed,
-		ValueDepositedSatoshis:         valueDeposited,
-		ValueExpiredSatoshis:           valueExpired,
-		ValueWithdrawnSatoshis:         valueWithdrawn,
-		ValueLoopedInSatoshis:          valueLoopedIn,
-		ValueHtlcTimeoutSweepsSatoshis: htlcTimeoutSwept,
+		StaticAddress:                  deprecatedSummary.StaticAddress,
+		RelativeExpiryBlocks:           deprecatedSummary.RelativeExpiryBlocks,
+		TotalNumDeposits:               deprecatedSummary.TotalNumDeposits,
+		ValueUnconfirmedSatoshis:       deprecatedSummary.ValueUnconfirmedSatoshis,
+		ValueDepositedSatoshis:         deprecatedSummary.ValueDepositedSatoshis,
+		ValueExpiredSatoshis:           deprecatedSummary.ValueExpiredSatoshis,
+		ValueWithdrawnSatoshis:         deprecatedSummary.ValueWithdrawnSatoshis,
+		ValueLoopedInSatoshis:          deprecatedSummary.ValueLoopedInSatoshis,
+		ValueHtlcTimeoutSweepsSatoshis: deprecatedSummary.ValueHtlcTimeoutSweepsSatoshis,
+		PerAddressSummaries:            results,
 	}, nil
 }