Persist agreed quotes in RFQ service

docs/release-notes/release-notes-0.8.0.md

@@ -37,6 +37,10 @@
 
 ## Functional Updates
 
+- [RFQ buy/sell accepts are now written to the database](https://github.com/lightninglabs/taproot-assets/pull/1863)
+  `rfq_policies` table whenever a policy is agreed, giving us an audit trail
+  and keeping quotes alive across restarts.
+
 ## RPC Updates
 
 - [PR#1841](https://github.com/lightninglabs/taproot-assets/pull/1841): Remove

itest/rfq_test.go

@@ -228,6 +228,19 @@ func testRfqAssetBuyHtlcIntercept(t *harnessTest) {
 	expectedAssetID := mintedAssetId
 	require.Equal(t.t, expectedAssetID, actualAssetID)
 
+	// Restart Bob's tapd to ensure the accepted quote policy survives a
+	// restart and is restored.
+	require.NoError(t.t, ts.BobTapd.stop(false))
+	require.NoError(t.t, ts.BobTapd.start(false))
+
+	// Carol should still see the accepted quote after Bob's restart.
+	acceptedQuotes, err = ts.CarolTapd.QueryPeerAcceptedQuotes(
+		ctxt, &rfqrpc.QueryPeerAcceptedQuotesRequest{},
+	)
+	require.NoError(t.t, err)
+	require.Len(t.t, acceptedQuotes.BuyQuotes, 1)
+	acceptedQuote = acceptedQuotes.BuyQuotes[0]
+
 	// Carol will now use the accepted quote (received from Bob) to create
 	// a lightning invoice which will be given to and settled by Alice.
 	//

rfq/manager.go

@@ -118,6 +118,9 @@ type ManagerCfg struct {
 	// helps us communicate custom feature bits with our peer.
 	AuxChanNegotiator *tapfeatures.AuxChannelNegotiator
 
+	// PolicyStore provides persistence for agreed RFQ policies.
+	PolicyStore PolicyStore
+
 	// AcceptPriceDeviationPpm is the price deviation in
 	// parts per million that is accepted by the RFQ negotiator.
 	//
@@ -179,34 +182,6 @@ type Manager struct {
 	// events.
 	acceptHtlcEvents chan *AcceptHtlcEvent
 
-	// peerAcceptedBuyQuotes holds buy quotes for assets that our node has
-	// requested and that have been accepted by peer nodes. These quotes are
-	// exclusively used by our node for the acquisition of assets, as they
-	// represent agreed-upon terms for purchase transactions with our peers.
-	peerAcceptedBuyQuotes lnutils.SyncMap[SerialisedScid, rfqmsg.BuyAccept]
-
-	// peerAcceptedSellQuotes holds sell quotes for assets that our node has
-	// requested and that have been accepted by peer nodes. These quotes are
-	// exclusively used by our node for the sale of assets, as they
-	// represent agreed-upon terms for sale transactions with our peers.
-	peerAcceptedSellQuotes lnutils.SyncMap[
-		SerialisedScid, rfqmsg.SellAccept,
-	]
-
-	// localAcceptedBuyQuotes holds buy quotes for assets that our node has
-	// accepted and that have been requested by peer nodes. These quotes are
-	// exclusively used by our node for the acquisition of assets, as they
-	// represent agreed-upon terms for purchase transactions with our peers.
-	localAcceptedBuyQuotes lnutils.SyncMap[SerialisedScid, rfqmsg.BuyAccept]
-
-	// localAcceptedSellQuotes holds sell quotes for assets that our node
-	// has accepted and that have been requested by peer nodes. These quotes
-	// are exclusively used by our node for the sale of assets, as they
-	// represent agreed-upon terms for sale transactions with our peers.
-	localAcceptedSellQuotes lnutils.SyncMap[
-		SerialisedScid, rfqmsg.SellAccept,
-	]
-
 	// groupKeyLookupCache is a map that helps us quickly perform an
 	// in-memory look up of the group an asset belongs to. Since this
 	// information is static and generated during minting, it is not
@@ -234,10 +209,6 @@ func NewManager(cfg ManagerCfg) (*Manager, error) {
 		outgoingMessages: make(chan rfqmsg.OutgoingMsg),
 
 		acceptHtlcEvents: make(chan *AcceptHtlcEvent),
-		peerAcceptedBuyQuotes: lnutils.SyncMap[
-			SerialisedScid, rfqmsg.BuyAccept]{},
-		peerAcceptedSellQuotes: lnutils.SyncMap[
-			SerialisedScid, rfqmsg.SellAccept]{},
 
 		subscribers: lnutils.SyncMap[
 			uint64, *fn.EventReceiver[fn.Event]]{},
@@ -264,13 +235,14 @@ func (m *Manager) startSubsystems(ctx context.Context) error {
 		SpecifierChecker:  m.AssetMatchesSpecifier,
 		NoOpHTLCs:         m.cfg.NoOpHTLCs,
 		AuxChanNegotiator: m.cfg.AuxChanNegotiator,
+		PolicyStore:       m.cfg.PolicyStore,
 	})
 	if err != nil {
 		return fmt.Errorf("error initializing RFQ order handler: %w",
 			err)
 	}
 
-	if err := m.orderHandler.Start(); err != nil {
+	if err := m.orderHandler.Start(ctx); err != nil {
 		return fmt.Errorf("unable to start RFQ order handler: %w", err)
 	}
 
@@ -435,7 +407,7 @@ func (m *Manager) handleIncomingMessage(incomingMsg rfqmsg.IncomingMsg) error {
 			// quote so that it can be used to send a payment by our
 			// lightning node.
 			scid := msg.ShortChannelId()
-			m.peerAcceptedBuyQuotes.Store(scid, msg)
+			m.orderHandler.peerAcceptedBuyQuotes.Store(scid, msg)
 
 			// Since we're going to buy assets from our peer, we
 			// need to make sure we can identify the incoming asset
@@ -488,7 +460,7 @@ func (m *Manager) handleIncomingMessage(incomingMsg rfqmsg.IncomingMsg) error {
 			// quote so that it can be used to send a payment by our
 			// lightning node.
 			scid := msg.ShortChannelId()
-			m.peerAcceptedSellQuotes.Store(scid, msg)
+			m.orderHandler.peerAcceptedSellQuotes.Store(scid, msg)
 
 			// Notify subscribers of the incoming peer accepted
 			// asset sell quote.
@@ -522,16 +494,16 @@ func (m *Manager) handleOutgoingMessage(outgoingMsg rfqmsg.OutgoingMsg) error {
 		// we inform our peer of our decision, we inform the order
 		// handler that we are willing to sell the asset subject to a
 		// sale policy.
-		m.orderHandler.RegisterAssetSalePolicy(*msg)
-
-		// We want to store that we accepted the buy quote, in case we
-		// need to look it up for a direct peer payment.
-		m.localAcceptedBuyQuotes.Store(msg.ShortChannelId(), *msg)
+		err := m.orderHandler.RegisterAssetSalePolicy(*msg)
+		if err != nil {
+			return fmt.Errorf("error registering asset sale "+
+				"policy: %w", err)
+		}
 
 		// Since our peer is going to buy assets from us, we need to
 		// make sure we can identify the forwarded asset payment by the
 		// outgoing SCID alias within the onion packet.
-		err := m.addScidAlias(
+		err = m.addScidAlias(
 			uint64(msg.ShortChannelId()),
 			msg.Request.AssetSpecifier, msg.Peer,
 		)
@@ -545,11 +517,11 @@ func (m *Manager) handleOutgoingMessage(outgoingMsg rfqmsg.OutgoingMsg) error {
 		// we inform our peer of our decision, we inform the order
 		// handler that we are willing to buy the asset subject to a
 		// purchase policy.
-		m.orderHandler.RegisterAssetPurchasePolicy(*msg)
-
-		// We want to store that we accepted the sell quote, in case we
-		// need to look it up for a direct peer payment.
-		m.localAcceptedSellQuotes.Store(msg.ShortChannelId(), *msg)
+		err := m.orderHandler.RegisterAssetPurchasePolicy(*msg)
+		if err != nil {
+			return fmt.Errorf("error registering asset purchase "+
+				"policy: %w", err)
+		}
 	}
 
 	// Send the outgoing message to the peer.
@@ -842,10 +814,11 @@ func (m *Manager) PeerAcceptedBuyQuotes() BuyAcceptMap {
 	// Returning the map directly is not thread safe. We will therefore
 	// create a copy.
 	buyQuotesCopy := make(map[SerialisedScid]rfqmsg.BuyAccept)
-	m.peerAcceptedBuyQuotes.ForEach(
+	m.orderHandler.peerAcceptedBuyQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.BuyAccept) error {
 			if time.Now().After(accept.AssetRate.Expiry) {
-				m.peerAcceptedBuyQuotes.Delete(scid)
+				//nolint:lll
+				m.orderHandler.peerAcceptedBuyQuotes.Delete(scid)
 				return nil
 			}
 
@@ -864,10 +837,11 @@ func (m *Manager) PeerAcceptedSellQuotes() SellAcceptMap {
 	// Returning the map directly is not thread safe. We will therefore
 	// create a copy.
 	sellQuotesCopy := make(map[SerialisedScid]rfqmsg.SellAccept)
-	m.peerAcceptedSellQuotes.ForEach(
+	m.orderHandler.peerAcceptedSellQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.SellAccept) error {
 			if time.Now().After(accept.AssetRate.Expiry) {
-				m.peerAcceptedSellQuotes.Delete(scid)
+				//nolint:lll
+				m.orderHandler.peerAcceptedSellQuotes.Delete(scid)
 				return nil
 			}
 
@@ -886,10 +860,11 @@ func (m *Manager) LocalAcceptedBuyQuotes() BuyAcceptMap {
 	// Returning the map directly is not thread safe. We will therefore
 	// create a copy.
 	buyQuotesCopy := make(map[SerialisedScid]rfqmsg.BuyAccept)
-	m.localAcceptedBuyQuotes.ForEach(
+	m.orderHandler.localAcceptedBuyQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.BuyAccept) error {
 			if time.Now().After(accept.AssetRate.Expiry) {
-				m.localAcceptedBuyQuotes.Delete(scid)
+				//nolint:lll
+				m.orderHandler.localAcceptedBuyQuotes.Delete(scid)
 				return nil
 			}
 
@@ -908,10 +883,11 @@ func (m *Manager) LocalAcceptedSellQuotes() SellAcceptMap {
 	// Returning the map directly is not thread safe. We will therefore
 	// create a copy.
 	sellQuotesCopy := make(map[SerialisedScid]rfqmsg.SellAccept)
-	m.localAcceptedSellQuotes.ForEach(
+	m.orderHandler.localAcceptedSellQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.SellAccept) error {
 			if time.Now().After(accept.AssetRate.Expiry) {
-				m.localAcceptedSellQuotes.Delete(scid)
+				//nolint:lll
+				m.orderHandler.localAcceptedSellQuotes.Delete(scid)
 				return nil
 			}
 

rfq/manager_test.go

@@ -11,6 +11,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/address"
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/proof"
+	"github.com/lightninglabs/taproot-assets/rfqmsg"
 	tpchmsg "github.com/lightninglabs/taproot-assets/tapchannelmsg"
 	"github.com/lightningnetwork/lnd/lnwallet"
 	"github.com/lightningnetwork/lnd/routing/route"
@@ -59,6 +60,26 @@ var (
 	peer2        = route.Vertex{77}
 )
 
+type mockPolicyStore struct{}
+
+func (mockPolicyStore) StoreSalePolicy(context.Context,
+	rfqmsg.BuyAccept) error {
+
+	return nil
+}
+
+func (mockPolicyStore) StorePurchasePolicy(context.Context,
+	rfqmsg.SellAccept) error {
+
+	return nil
+}
+
+func (mockPolicyStore) FetchAcceptedQuotes(context.Context) (
+	[]rfqmsg.BuyAccept, []rfqmsg.SellAccept, error) {
+
+	return nil, nil, nil
+}
+
 // GroupLookupMock mocks the GroupLookup interface that is required by the
 // rfq manager to check asset IDs against asset specifiers.
 type GroupLookupMock struct{}
@@ -141,6 +162,7 @@ func assertComputeChannelAssetBalance(t *testing.T,
 	mockGroupLookup := &GroupLookupMock{}
 	cfg := ManagerCfg{
 		GroupLookup: mockGroupLookup,
+		PolicyStore: mockPolicyStore{},
 	}
 	manager, err := NewManager(cfg)
 	require.NoError(t, err)