rfq+rfqmsg: use new AssetRate type in NewSellRequest func argument

As a result of this change the price oracle's quote expiry value is
used in the request constructor.

Author: ffranr

rfq/negotiator.go

@@ -450,11 +450,11 @@ func (n *Negotiator) HandleOutgoingSellOrder(order SellOrder) {
 		// We calculate a proposed ask price for our peer's
 		// consideration. If a price oracle is not specified we will
 		// skip this step.
-		var assetRate fn.Option[rfqmath.BigIntFixedPoint]
+		var assetRate fn.Option[rfqmsg.AssetRate]
 
 		if n.cfg.PriceOracle != nil {
 			// Query the price oracle for an asking price.
-			rate, _, err := n.queryAskFromPriceOracle(
+			rate, expiryUnix, err := n.queryAskFromPriceOracle(
 				order.Peer, order.AssetID, order.AssetGroupKey,
 				order.MaxAssetAmount,
 				fn.None[rfqmsg.AssetRate](),
@@ -466,7 +466,10 @@ func (n *Negotiator) HandleOutgoingSellOrder(order SellOrder) {
 				return
 			}
 
-			assetRate = fn.Some[rfqmath.BigIntFixedPoint](*rate)
+			expiry := time.Unix(int64(expiryUnix), 0)
+			assetRate = fn.Some[rfqmsg.AssetRate](
+				rfqmsg.NewAssetRate(*rate, expiry),
+			)
 		}
 
 		request, err := rfqmsg.NewSellRequest(

rfqmsg/sell_request.go

@@ -7,7 +7,6 @@ import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/fn"
-	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightningnetwork/lnd/routing/route"
 	"github.com/lightningnetwork/lnd/tlv"
 )
@@ -51,21 +50,13 @@ type SellRequest struct {
 // NewSellRequest creates a new asset sell quote request.
 func NewSellRequest(peer route.Vertex, assetID *asset.ID,
 	assetGroupKey *btcec.PublicKey, assetAmount uint64,
-	rateHint fn.Option[rfqmath.BigIntFixedPoint]) (*SellRequest,
-	error) {
+	assetRateHint fn.Option[AssetRate]) (*SellRequest, error) {
 
 	id, err := NewID()
 	if err != nil {
 		return nil, fmt.Errorf("unable to generate random id: %w", err)
 	}
 
-	// Construct a suggested asset rate if a rate hint is provided.
-	var assetRateHint fn.Option[AssetRate]
-	rateHint.WhenSome(func(rate rfqmath.BigIntFixedPoint) {
-		expiry := time.Now().Add(DefaultQuoteLifetime).UTC()
-		assetRateHint = fn.Some(NewAssetRate(rate, expiry))
-	})
-
 	return &SellRequest{
 		Peer:          peer,
 		Version:       latestSellRequestVersion,