multi: refactor asset rate fields in SellAccept

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

Author: ffranr

rfq/manager.go

@@ -826,7 +826,7 @@ func (m *Manager) PeerAcceptedSellQuotes() SellAcceptMap {
 	sellQuotesCopy := make(map[SerialisedScid]rfqmsg.SellAccept)
 	m.peerAcceptedSellQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.SellAccept) error {
-			if time.Now().Unix() > int64(accept.Expiry) {
+			if time.Now().After(accept.AssetRate.Expiry) {
 				m.peerAcceptedSellQuotes.Delete(scid)
 				return nil
 			}
@@ -870,7 +870,7 @@ func (m *Manager) LocalAcceptedSellQuotes() SellAcceptMap {
 	sellQuotesCopy := make(map[SerialisedScid]rfqmsg.SellAccept)
 	m.localAcceptedSellQuotes.ForEach(
 		func(scid SerialisedScid, accept rfqmsg.SellAccept) error {
-			if time.Now().Unix() > int64(accept.Expiry) {
+			if time.Now().After(accept.AssetRate.Expiry) {
 				m.localAcceptedSellQuotes.Delete(scid)
 				return nil
 			}

rfq/negotiator.go

@@ -444,10 +444,7 @@ func (n *Negotiator) HandleIncomingSellRequest(
 		}
 
 		// Construct and send a sell accept message.
-		expiry := uint64(assetRate.Expiry.Unix())
-		msg := rfqmsg.NewSellAcceptFromRequest(
-			request, assetRate.Rate, expiry,
-		)
+		msg := rfqmsg.NewSellAcceptFromRequest(request, *assetRate)
 		sendOutgoingMsg(msg)
 	}()
 
@@ -677,10 +674,12 @@ func (n *Negotiator) HandleIncomingSellAccept(msg rfqmsg.SellAccept,
 	//
 	// TODO(ffranr): Sanity check the 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("Sell 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
@@ -760,7 +759,7 @@ func (n *Negotiator) HandleIncomingSellAccept(msg rfqmsg.SellAccept,
 		tolerance := rfqmath.NewBigIntFromUint64(
 			n.cfg.AcceptPriceDeviationPpm,
 		)
-		acceptablePrice := msg.AssetRate.WithinTolerance(
+		acceptablePrice := msg.AssetRate.Rate.WithinTolerance(
 			assetRate.Rate, tolerance,
 		)
 		if !acceptablePrice {

rfq/order.go

@@ -262,9 +262,9 @@ func NewAssetPurchasePolicy(quote rfqmsg.SellAccept) *AssetPurchasePolicy {
 		scid:            quote.ShortChannelId(),
 		AssetSpecifier:  quote.Request.AssetSpecifier,
 		AcceptedQuoteId: quote.ID,
-		BidAssetRate:    quote.AssetRate,
+		BidAssetRate:    quote.AssetRate.Rate,
 		PaymentMaxAmt:   quote.Request.PaymentMaxAmt,
-		expiry:          quote.Expiry,
+		expiry:          uint64(quote.AssetRate.Expiry.Unix()),
 	}
 }
 

rfqmsg/accept.go

@@ -76,7 +76,10 @@ func newAcceptWireMsgDataFromBuy(q BuyAccept) (acceptWireMsgData, error) {
 func newAcceptWireMsgDataFromSell(q SellAccept) (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)
 
 	// Currently, only BTC is supported as the incoming asset in sell
@@ -87,7 +90,7 @@ func newAcceptWireMsgDataFromSell(q SellAccept) (acceptWireMsgData, error) {
 
 	// The rate provided in the sell acceptance message represents the
 	// exchange rate from the outgoing asset to BTC.
-	rate := NewTlvFixedPointFromBigInt(q.AssetRate)
+	rate := NewTlvFixedPointFromBigInt(q.AssetRate.Rate)
 	outAssetRate := tlv.NewRecordT[tlv.TlvType10](rate)
 
 	// Encode message data component as TLV bytes.

rfqmsg/sell_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 SellAccept struct {
 	ID ID
 
 	// AssetRate is the accepted asset to BTC rate.
-	AssetRate rfqmath.BigIntFixedPoint
-
-	// Expiry is the bid price expiry lifetime unix timestamp.
-	Expiry uint64
+	AssetRate AssetRate
 
 	// sig is a signature over the serialized contents of the message.
 	sig [64]byte
 }
 
 // NewSellAcceptFromRequest creates a new instance of an asset sell quote accept
 // message given an asset sell quote request message.
-//
-// // TODO(ffranr): Use new AssetRate type for assetRate arg.
 func NewSellAcceptFromRequest(request SellRequest,
-	assetRate rfqmath.BigIntFixedPoint, expiry uint64) *SellAccept {
+	assetRate AssetRate) *SellAccept {
 
 	return &SellAccept{
 		Peer:      request.Peer,
 		Request:   request,
 		Version:   latestSellAcceptVersion,
 		ID:        request.ID,
 		AssetRate: assetRate,
-		Expiry:    expiry,
 	}
 }
 
@@ -72,15 +66,17 @@ func newSellAcceptFromWireMsg(wireMsg WireMessage,
 	// currently assume that the in-asset is BTC.
 	assetRate := msgData.OutAssetRate.Val.IntoBigIntFixedPoint()
 
+	// Convert the unix timestamp in seconds to a time.Time.
+	expiry := time.Unix(int64(msgData.Expiry.Val), 0).UTC()
+
 	// Note that the `Request` field is populated later in the RFQ stream
 	// service.
 	return &SellAccept{
 		Peer:      wireMsg.Peer,
 		Request:   request,
 		Version:   msgData.Version.Val,
 		ID:        msgData.ID.Val,
-		AssetRate: assetRate,
-		Expiry:    msgData.Expiry.Val,
+		AssetRate: NewAssetRate(assetRate, expiry),
 		sig:       msgData.Sig.Val,
 	}, nil
 }
@@ -133,9 +129,9 @@ func (q *SellAccept) MsgID() ID {
 
 // String returns a human-readable string representation of the message.
 func (q *SellAccept) String() string {
-	return fmt.Sprintf("SellAccept(peer=%x, id=%x, bid_asset_rate=%v, "+
-		"expiry=%d, scid=%d)", q.Peer[:], q.ID[:], q.AssetRate,
-		q.Expiry, q.ShortChannelId())
+	return fmt.Sprintf("SellAccept(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

@@ -6630,8 +6630,8 @@ func marshalPeerAcceptedSellQuotes(quotes map[rfq.SerialisedScid]rfqmsg.SellAcce
 	rpcQuotes := make([]*rfqrpc.PeerAcceptedSellQuote, 0, len(quotes))
 	for scid, quote := range quotes {
 		rpcAssetRate := &rfqrpc.FixedPoint{
-			Coefficient: quote.AssetRate.Coefficient.String(),
-			Scale:       uint32(quote.AssetRate.Scale),
+			Coefficient: quote.AssetRate.Rate.Coefficient.String(),
+			Scale:       uint32(quote.AssetRate.Rate.Scale),
 		}
 
 		// TODO(ffranr): Add SellRequest payment max amount to
@@ -6641,7 +6641,7 @@ func marshalPeerAcceptedSellQuotes(quotes map[rfq.SerialisedScid]rfqmsg.SellAcce
 			Id:           quote.ID[:],
 			Scid:         uint64(scid),
 			BidAssetRate: rpcAssetRate,
-			Expiry:       quote.Expiry,
+			Expiry:       uint64(quote.AssetRate.Expiry.Unix()),
 		}
 		rpcQuotes = append(rpcQuotes, rpcQuote)
 	}

tapchannel/aux_invoice_manager.go

@@ -273,7 +273,7 @@ func (s *AuxInvoiceManager) priceFromQuote(rfqID rfqmsg.ID) (
 		log.Debugf("Found sell quote for ID %x / SCID %d: %#v",
 			rfqID[:], rfqID.Scid(), sellQuote)
 
-		return &sellQuote.AssetRate, nil
+		return &sellQuote.AssetRate.Rate, nil
 
 	default:
 		return nil, fmt.Errorf("no accepted quote found for RFQ SCID "+

tapchannel/aux_traffic_shaper.go

@@ -224,7 +224,7 @@ func (s *AuxTrafficShaper) PaymentBandwidth(htlcBlob,
 	// expressed in milli-satoshis.
 	localBalanceFp := rfqmath.NewBigIntFixedPoint(localBalance, 0)
 	availableBalanceMsat := rfqmath.UnitsToMilliSatoshi(
-		localBalanceFp, quote.AssetRate,
+		localBalanceFp, quote.AssetRate.Rate,
 	)
 
 	// At this point we have acquired what we need to express the asset
@@ -283,7 +283,7 @@ func (s *AuxTrafficShaper) ProduceHtlcExtraData(totalAmount lnwire.MilliSatoshi,
 	// corresponding number of assets, then reduce the number of satoshis of
 	// the HTLC to the bare minimum that can be materialized on chain.
 	numAssetUnitsFp := rfqmath.MilliSatoshiToUnits(
-		totalAmount, quote.AssetRate,
+		totalAmount, quote.AssetRate.Rate,
 	)
 	numAssetUnits := numAssetUnitsFp.ScaleTo(0).ToUint64()
 

taprpc/marshal.go

@@ -567,8 +567,8 @@ func MarshalAcceptedSellQuoteEvent(
 	error) {
 
 	rpcAssetRate := &rfqrpc.FixedPoint{
-		Coefficient: event.AssetRate.Coefficient.String(),
-		Scale:       uint32(event.AssetRate.Scale),
+		Coefficient: event.AssetRate.Rate.Coefficient.String(),
+		Scale:       uint32(event.AssetRate.Rate.Scale),
 	}
 
 	// TODO(ffranr): Add SellRequest payment max amount to
@@ -578,7 +578,7 @@ func MarshalAcceptedSellQuoteEvent(
 		Id:           event.ID[:],
 		Scid:         uint64(event.ShortChannelId()),
 		BidAssetRate: rpcAssetRate,
-		Expiry:       event.Expiry,
+		Expiry:       uint64(event.AssetRate.Expiry.Unix()),
 	}, nil
 }