Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Track HTLCs in rfq policies #1186

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
+324 −73
Open

Track HTLCs in rfq policies #1186

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4eb7e88
taprpc: add scid parameter to tchrpc.SendPayment
GeorgeTsagk Nov 28, 2024
f2557d3
rpcserver: skip rfq negotiation on manual SendPayment rfq
GeorgeTsagk Nov 28, 2024
8acf339
multi: add SubscribeHtlcEvents call
GeorgeTsagk Nov 28, 2024
5c62e34
rfq: policies track accepted htlcs
GeorgeTsagk Nov 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions chain_bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
"github.com/lightninglabs/taproot-assets/tapgarden"
"github.com/lightningnetwork/lnd/chainntnfs"
"github.com/lightningnetwork/lnd/funding"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lnwallet/chainfee"
"github.com/lightningnetwork/lnd/lnwire"
"github.com/lightningnetwork/lnd/routing/route"
Expand Down Expand Up @@ -376,9 +377,17 @@ func (l *LndRouterClient) DeleteLocalAlias(ctx context.Context, alias,
return l.lnd.Router.XDeleteLocalChanAlias(ctx, alias, baseScid)
}

func (l *LndRouterClient) SubscribeHtlcEvents(
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: requires Godoc comment (for the same method in the HtlcSubscriber interface as well).

ctx context.Context) (<-chan *routerrpc.HtlcEvent,
<-chan error, error) {

return l.lnd.Router.SubscribeHtlcEvents(ctx)
}

// Ensure LndRouterClient implements the rfq.HtlcInterceptor interface.
var _ rfq.HtlcInterceptor = (*LndRouterClient)(nil)
var _ rfq.ScidAliasManager = (*LndRouterClient)(nil)
var _ rfq.HtlcSubscriber = (*LndRouterClient)(nil)

// LndInvoicesClient is an LND invoices RPC client.
type LndInvoicesClient struct {
Expand Down
5 changes: 5 additions & 0 deletions rfq/manager.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,10 @@ type ManagerCfg struct {
// intercept and accept/reject HTLCs.
HtlcInterceptor HtlcInterceptor

// HtlcSubscriber is a subscriber that is used to retrieve live HTLC
// event updates.
HtlcSubscriber HtlcSubscriber

// PriceOracle is the price oracle that the RFQ manager will use to
// determine whether a quote is accepted or rejected.
PriceOracle PriceOracle
Expand Down Expand Up @@ -207,6 +211,7 @@ func (m *Manager) startSubsystems(ctx context.Context) error {
m.orderHandler, err = NewOrderHandler(OrderHandlerCfg{
CleanupInterval: CacheCleanupInterval,
HtlcInterceptor: m.cfg.HtlcInterceptor,
HtlcSubscriber: m.cfg.HtlcSubscriber,
AcceptHtlcEvents: m.acceptHtlcEvents,
})
if err != nil {
Expand Down
8 changes: 8 additions & 0 deletions rfq/order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/lightninglabs/taproot-assets/rfqmath"
"github.com/lightninglabs/taproot-assets/rfqmsg"
"github.com/lightningnetwork/lnd/input"
"github.com/lightningnetwork/lnd/lnrpc/routerrpc"
"github.com/lightningnetwork/lnd/lnutils"
"github.com/lightningnetwork/lnd/lnwallet"
"github.com/lightningnetwork/lnd/lnwire"
Expand Down Expand Up @@ -843,3 +844,10 @@ type HtlcInterceptor interface {
// to respond to HTLCs.
InterceptHtlcs(context.Context, lndclient.HtlcInterceptHandler) error
}

// HtlcSubscriber is an interface that contains the function necessary for
// retrieving live HTLC event updates.
type HtlcSubscriber interface {
SubscribeHtlcEvents(ctx context.Context) (<-chan *routerrpc.HtlcEvent,
<-chan error, error)
}
1 change: 1 addition & 0 deletions tapcfg/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -395,6 +395,7 @@ func genServerConfig(cfg *Config, cfgLogger btclog.Logger,
rfq.ManagerCfg{
PeerMessenger: msgTransportClient,
HtlcInterceptor: lndRouterClient,
HtlcSubscriber: lndRouterClient,
PriceOracle: priceOracle,
ChannelLister: walletAnchor,
AliasManager: lndRouterClient,
Expand Down