staticaddr: show address on ListStaticAddressDepositsResponse

Author: hieblmi

loopd/swapclient_server.go

@@ -1772,6 +1772,11 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 		return nil, err
 	}
 
+	network, err := s.network.ChainParams()
+	if err != nil {
+		return nil, err
+	}
+
 	// Deposits filtered by state or outpoints.
 	var filteredDeposits []*looprpc.Deposit
 	if len(outpoints) > 0 {
@@ -1783,7 +1788,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 			}
 			return false
 		}
-		filteredDeposits = filter(allDeposits, f)
+		filteredDeposits = filter(allDeposits, network, f)
 
 		if len(outpoints) != len(filteredDeposits) {
 			return nil, fmt.Errorf("not all outpoints found in " +
@@ -1799,7 +1804,7 @@ func (s *swapClientServer) ListStaticAddressDeposits(ctx context.Context,
 
 			return d.IsInState(toServerState(req.StateFilter))
 		}
-		filteredDeposits = filter(allDeposits, f)
+		filteredDeposits = filter(allDeposits, network, f)
 	}
 
 	// Calculate the blocks until expiry for each deposit.
@@ -2176,7 +2181,9 @@ func (s *swapClientServer) StaticAddressLoopIn(ctx context.Context,
 
 type filterFunc func(deposits *deposit.Deposit) bool
 
-func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
+func filter(deposits []*deposit.Deposit, network *chaincfg.Params,
+	f filterFunc) []*looprpc.Deposit {
+
 	var clientDeposits []*looprpc.Deposit
 	for _, d := range deposits {
 		if !f(d) {
@@ -2190,6 +2197,7 @@ func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
 
 		hash := d.Hash
 		outpoint := wire.NewOutPoint(&hash, d.Index).String()
+		staticAddr, _ := d.AddressParams.TaprootAddress(network)
 		deposit := &looprpc.Deposit{
 			Id: d.ID[:],
 			State: toClientDepositState(
@@ -2199,6 +2207,7 @@ func filter(deposits []*deposit.Deposit, f filterFunc) []*looprpc.Deposit {
 			Value:              int64(d.Value),
 			ConfirmationHeight: d.ConfirmationHeight,
 			SwapHash:           swapHash,
+			StaticAddress:      staticAddr,
 		}
 
 		clientDeposits = append(clientDeposits, deposit)