invoices: add CancelSet flag to HtlcModifier

Author: GeorgeTsagk

invoices_client.go

@@ -54,6 +54,10 @@ type InvoiceHtlcModifyResponse struct {
 	// HTLC in case of custom channels. To not modify the amount and use the
 	// on-chain amount, set this to 0.
 	AmtPaid lnwire.MilliSatoshi
+
+	// CancelSet is a flag that indicates whether the HTLCs associated with
+	// the invoice should get cancelled.
+	CancelSet bool
 }
 
 // InvoiceHtlcModifyHandler is a function that handles an HTLC modification
@@ -379,7 +383,8 @@ func (s *invoicesClient) HtlcModifier(ctx context.Context,
 						ChanId: key.ChanID.ToUint64(),
 						HtlcId: key.HtlcID,
 					},
-					AmtPaid: &amtPaid,
+					AmtPaid:   &amtPaid,
+					CancelSet: resp.CancelSet,
 				}
 
 				if err := stream.Send(rpcResp); err != nil {

macaroon_recipes.go

@@ -43,6 +43,7 @@ var (
 		"EstimateFeeToP2WSH":     "EstimateFee",
 		"OpenChannelStream":      "OpenChannel",
 		"ListSweepsVerbose":      "ListSweeps",
+		"MinRelayFee":            "EstimateFee",
 	}
 
 	// ignores is a list of method names on the client implementations that

walletkit_client.go

@@ -540,6 +540,25 @@ func (m *walletKitClient) EstimateFeeRate(ctx context.Context, confTarget int32)
 	return chainfee.SatPerKWeight(resp.SatPerKw), nil
 }
 
+// MinRelayFee returns the current minimum relay fee based on our chain backend
+// in sat/kw.
+func (m *walletKitClient) MinRelayFee(ctx context.Context) (
+	chainfee.SatPerKWeight, error) {
+
+	rpcCtx, cancel := context.WithTimeout(ctx, m.timeout)
+	defer cancel()
+
+	rpcCtx = m.walletKitMac.WithMacaroonAuth(rpcCtx)
+	resp, err := m.client.EstimateFee(rpcCtx, &walletrpc.EstimateFeeRequest{
+		ConfTarget: 6,
+	})
+	if err != nil {
+		return 0, err
+	}
+
+	return chainfee.SatPerKWeight(resp.MinRelayFeeSatPerKw), nil
+}
+
 // ListSweeps returns a list of sweep transaction ids known to our node.
 // Note that this function only looks up transaction ids (Verbose=false), and
 // does not query our wallet for the full set of transactions.