multi: refactor asset rate fields in BuyAccept

Refactor BuyAccept by replacing multiple fields with a single
asset rate field using the new AssetRate type.

Author: ffranr

rfq/manager.go

@@ -788,7 +788,7 @@ func (m *Manager) PeerAcceptedBuyQuotes() BuyAcceptMap {
 	buyQuotesCopy := make(map[SerialisedScid]rfqmsg.BuyAccept)
 	m.peerAcceptedBuyQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.BuyAccept) error {
-			if time.Now().Unix() > int64(accept.Expiry) {
+			if time.Now().After(accept.AssetRate.Expiry) {
 				m.peerAcceptedBuyQuotes.Delete(scid)
 				return nil
 			}
@@ -832,7 +832,7 @@ func (m *Manager) LocalAcceptedBuyQuotes() BuyAcceptMap {
 	buyQuotesCopy := make(map[SerialisedScid]rfqmsg.BuyAccept)
 	m.localAcceptedBuyQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.BuyAccept) error {
-			if time.Now().Unix() > int64(accept.Expiry) {
+			if time.Now().After(accept.AssetRate.Expiry) {
 				m.localAcceptedBuyQuotes.Delete(scid)
 				return nil
 			}

rfq/negotiator.go

@@ -346,10 +346,7 @@ func (n *Negotiator) HandleIncomingBuyRequest(
 		}
 
 		// Construct and send a buy accept message.
-		expiry := uint64(assetRate.Expiry.Unix())
-		msg := rfqmsg.NewBuyAcceptFromRequest(
-			request, assetRate.Rate, expiry,
-		)
+		msg := rfqmsg.NewBuyAcceptFromRequest(request, *assetRate)
 		sendOutgoingMsg(msg)
 	}()
 
@@ -549,10 +546,12 @@ func (n *Negotiator) HandleIncomingBuyAccept(msg rfqmsg.BuyAccept,
 	// TODO(ffranr): Sanity check the buy accept quote expiry
 	//  timestamp given the expiry timestamp provided by the price
 	//  oracle.
-	if !expiryWithinBounds(msg.Expiry, minAssetRatesExpiryLifetime) {
+	expiry := uint64(msg.AssetRate.Expiry.Unix())
+	if !expiryWithinBounds(expiry, minAssetRatesExpiryLifetime) {
 		// The expiry time is not within the acceptable bounds.
 		log.Debugf("Buy accept quote expiry time is not within "+
-			"acceptable bounds (expiry=%d)", msg.Expiry)
+			"acceptable bounds (asset_rate=%s)",
+			msg.AssetRate.String())
 
 		// Construct an invalid quote response event so that we can
 		// inform the peer that the quote response has not validated
@@ -633,17 +632,17 @@ func (n *Negotiator) HandleIncomingBuyAccept(msg rfqmsg.BuyAccept,
 		tolerance := rfqmath.NewBigIntFromUint64(
 			n.cfg.AcceptPriceDeviationPpm,
 		)
-		acceptablePrice := msg.AssetRate.WithinTolerance(
+		acceptablePrice := msg.AssetRate.Rate.WithinTolerance(
 			assetRate.Rate, tolerance,
 		)
 		if !acceptablePrice {
 			// The price is not within the acceptable tolerance.
 			// We will return without calling the quote accept
 			// callback.
 			log.Debugf("Buy accept price is not within "+
-				"acceptable bounds (ask_asset_rate=%v, "+
-				"oracle_asset_rate=%v)", msg.AssetRate,
-				assetRate)
+				"acceptable bounds (peer_asset_rate=%s, "+
+				"oracle_asset_rate=%s)", msg.AssetRate.String(),
+				assetRate.String())
 
 			// Construct an invalid quote response event so that we
 			// can inform the peer that the quote response has not

rfq/order.go

@@ -108,8 +108,8 @@ func NewAssetSalePolicy(quote rfqmsg.BuyAccept) *AssetSalePolicy {
 		AssetSpecifier:         quote.Request.AssetSpecifier,
 		AcceptedQuoteId:        quote.ID,
 		MaxOutboundAssetAmount: quote.Request.AssetMaxAmt,
-		AskAssetRate:           quote.AssetRate,
-		expiry:                 quote.Expiry,
+		AskAssetRate:           quote.AssetRate.Rate,
+		expiry:                 uint64(quote.AssetRate.Expiry.Unix()),
 	}
 }
 

rfqmsg/accept.go

@@ -43,12 +43,15 @@ type acceptWireMsgData struct {
 func newAcceptWireMsgDataFromBuy(q BuyAccept) (acceptWireMsgData, error) {
 	version := tlv.NewPrimitiveRecord[tlv.TlvType0](q.Version)
 	id := tlv.NewRecordT[tlv.TlvType2](q.ID)
-	expiry := tlv.NewPrimitiveRecord[tlv.TlvType4](q.Expiry)
+
+	expiryUnix := q.AssetRate.Expiry.Unix()
+	expiry := tlv.NewPrimitiveRecord[tlv.TlvType4](uint64(expiryUnix))
+
 	sig := tlv.NewPrimitiveRecord[tlv.TlvType6](q.sig)
 
 	// The rate provided in the buy acceptance message represents the
 	// exchange rate from the incoming asset to BTC.
-	rate := NewTlvFixedPointFromBigInt(q.AssetRate)
+	rate := NewTlvFixedPointFromBigInt(q.AssetRate.Rate)
 	inAssetRate := tlv.NewRecordT[tlv.TlvType8](rate)
 
 	// Currently, only BTC is supported as the outgoing asset in buy

rfqmsg/buy_accept.go

@@ -2,8 +2,8 @@ package rfqmsg
 
 import (
 	"fmt"
+	"time"
 
-	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightningnetwork/lnd/routing/route"
 )
 
@@ -30,29 +30,23 @@ type BuyAccept struct {
 	ID ID
 
 	// AssetRate is the accepted asset to BTC rate.
-	AssetRate rfqmath.BigIntFixedPoint
-
-	// Expiry is the asking price expiry lifetime unix timestamp.
-	Expiry uint64
+	AssetRate AssetRate
 
 	// sig is a signature over the serialized contents of the message.
 	sig [64]byte
 }
 
 // NewBuyAcceptFromRequest creates a new instance of a quote accept message
 // given a quote request message.
-//
-// TODO(ffranr): Use new AssetRate type for assetRate arg.
 func NewBuyAcceptFromRequest(request BuyRequest,
-	assetRate rfqmath.BigIntFixedPoint, expiry uint64) *BuyAccept {
+	assetRate AssetRate) *BuyAccept {
 
 	return &BuyAccept{
 		Peer:      request.Peer,
 		Request:   request,
 		Version:   latestBuyAcceptVersion,
 		ID:        request.ID,
 		AssetRate: assetRate,
-		Expiry:    expiry,
 	}
 }
 
@@ -70,14 +64,16 @@ func newBuyAcceptFromWireMsg(wireMsg WireMessage,
 	// currently assume that the out-asset is BTC.
 	assetRate := msgData.InAssetRate.Val.IntoBigIntFixedPoint()
 
+	// Convert the unix timestamp in seconds to a time.Time.
+	expiry := time.Unix(int64(msgData.Expiry.Val), 0)
+
 	return &BuyAccept{
 		Peer:      wireMsg.Peer,
 		Request:   request,
 		Version:   msgData.Version.Val,
 		ID:        msgData.ID.Val,
-		Expiry:    msgData.Expiry.Val,
+		AssetRate: NewAssetRate(assetRate, expiry),
 		sig:       msgData.Sig.Val,
-		AssetRate: assetRate,
 	}, nil
 }
 
@@ -128,9 +124,8 @@ func (q *BuyAccept) MsgID() ID {
 
 // String returns a human-readable string representation of the message.
 func (q *BuyAccept) String() string {
-	return fmt.Sprintf("BuyAccept(peer=%x, id=%x, ask_price=%d, "+
-		"expiry=%d, scid=%d)",
-		q.Peer[:], q.ID[:], q.AssetRate, q.Expiry, q.ShortChannelId())
+	return fmt.Sprintf("BuyAccept(peer=%x, id=%x, asset_rate=%s, scid=%d)",
+		q.Peer[:], q.ID[:], q.AssetRate.String(), q.ShortChannelId())
 }
 
 // Ensure that the message type implements the OutgoingMsg interface.

rpcserver.go

@@ -6591,10 +6591,10 @@ func marshalPeerAcceptedBuyQuotes(
 		[]*rfqrpc.PeerAcceptedBuyQuote, 0, len(quotes),
 	)
 	for scid, quote := range quotes {
-		coefficient := quote.AssetRate.Coefficient.String()
+		coefficient := quote.AssetRate.Rate.Coefficient.String()
 		rpcAskAssetRate := &rfqrpc.FixedPoint{
 			Coefficient: coefficient,
-			Scale:       uint32(quote.AssetRate.Scale),
+			Scale:       uint32(quote.AssetRate.Rate.Scale),
 		}
 
 		rpcQuote := &rfqrpc.PeerAcceptedBuyQuote{
@@ -6603,7 +6603,7 @@ func marshalPeerAcceptedBuyQuotes(
 			Scid:         uint64(scid),
 			AssetAmount:  quote.Request.AssetMaxAmt,
 			AskAssetRate: rpcAskAssetRate,
-			Expiry:       quote.Expiry,
+			Expiry:       uint64(quote.AssetRate.Expiry.Unix()),
 		}
 		rpcQuotes = append(rpcQuotes, rpcQuote)
 	}

tapchannel/aux_invoice_manager.go

@@ -266,7 +266,7 @@ func (s *AuxInvoiceManager) priceFromQuote(rfqID rfqmsg.ID) (
 		log.Debugf("Found buy quote for ID %x / SCID %d: %#v", rfqID[:],
 			rfqID.Scid(), buyQuote)
 
-		return &buyQuote.AssetRate, nil
+		return &buyQuote.AssetRate.Rate, nil
 
 	// This is a direct peer payment, so we expect to find a sell quote.
 	case isSell:

tapchannel/aux_invoice_manager_test.go

@@ -209,7 +209,9 @@ func (m *mockHtlcModifierProperty) HtlcModifier(ctx context.Context,
 			m.t.Errorf("no rfq quote found")
 		}
 
-		assetRate := lnwire.MilliSatoshi(quote.AssetRate.ToUint64())
+		assetRate := lnwire.MilliSatoshi(
+			quote.AssetRate.Rate.ToUint64(),
+		)
 		msatPerBtc := float64(btcutil.SatoshiPerBitcoin * 1000)
 		unitValue := msatPerBtc / float64(assetRate)
 		assetUnits := lnwire.MilliSatoshi(htlc.Amounts.Val.Sum())
@@ -344,8 +346,10 @@ func TestAuxInvoiceManager(t *testing.T) {
 			},
 			buyQuotes: rfq.BuyAcceptMap{
 				fn.Ptr(dummyRfqID(31)).Scid(): {
-					Peer:      testNodeID,
-					AssetRate: testAssetRate,
+					Peer: testNodeID,
+					AssetRate: rfqmsg.NewAssetRate(
+						testAssetRate, time.Now(),
+					),
 				},
 			},
 		},
@@ -376,8 +380,10 @@ func TestAuxInvoiceManager(t *testing.T) {
 			},
 			buyQuotes: rfq.BuyAcceptMap{
 				fn.Ptr(dummyRfqID(31)).Scid(): {
-					Peer:      testNodeID,
-					AssetRate: testAssetRate,
+					Peer: testNodeID,
+					AssetRate: rfqmsg.NewAssetRate(
+						testAssetRate, time.Now(),
+					),
 				},
 			},
 		},
@@ -664,12 +670,14 @@ func genBuyQuotes(t *rapid.T, rfqMap rfq.BuyAcceptMap, units, amtMsat uint64,
 		)
 	}
 
+	rateFp := rfqmath.FixedPoint[rfqmath.BigInt]{
+		Coefficient: rfqmath.NewBigInt(assetRate),
+		Scale:       0,
+	}
+
 	rfqMap[rfqScid.Scid()] = rfqmsg.BuyAccept{
-		Peer: peer,
-		AssetRate: rfqmath.FixedPoint[rfqmath.BigInt]{
-			Coefficient: rfqmath.NewBigInt(assetRate),
-			Scale:       0,
-		},
+		Peer:      peer,
+		AssetRate: rfqmsg.NewAssetRate(rateFp, time.Now()),
 	}
 }
 

taprpc/marshal.go

@@ -594,10 +594,10 @@ func MarshalAcceptedBuyQuoteEvent(
 		Scid:        uint64(event.ShortChannelId()),
 		AssetAmount: event.Request.AssetMaxAmt,
 		AskAssetRate: &rfqrpc.FixedPoint{
-			Coefficient: event.AssetRate.Coefficient.String(),
-			Scale:       uint32(event.AssetRate.Scale),
+			Coefficient: event.AssetRate.Rate.Coefficient.String(),
+			Scale:       uint32(event.AssetRate.Rate.Scale),
 		},
-		Expiry: event.Expiry,
+		Expiry: uint64(event.AssetRate.Expiry.Unix()),
 	}, nil
 }