rfqmsg: request fields blip align

rfq/negotiator.go

@@ -11,6 +11,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
 	"github.com/lightningnetwork/lnd/lnutils"
+	"github.com/lightningnetwork/lnd/lnwire"
 	"github.com/lightningnetwork/lnd/routing/route"
 )
 
@@ -106,6 +107,7 @@ func NewNegotiator(cfg NegotiatorCfg) (*Negotiator, error) {
 // an appropriate outgoing response message which should be sent to the peer.
 func (n *Negotiator) queryBidFromPriceOracle(peer route.Vertex,
 	assetSpecifier asset.Specifier, assetAmount uint64,
+	paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
 	assetRateHint fn.Option[rfqmsg.AssetRate]) (*rfqmsg.AssetRate, error) {
 
 	// TODO(ffranr): Optionally accept a peer's proposed ask price as an
@@ -119,7 +121,7 @@ func (n *Negotiator) queryBidFromPriceOracle(peer route.Vertex,
 	defer cancel()
 
 	oracleResponse, err := n.cfg.PriceOracle.QueryBidPrice(
-		ctx, assetSpecifier, assetAmount, assetRateHint,
+		ctx, assetSpecifier, assetAmount, paymentMaxAmt, assetRateHint,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query price oracle for "+
@@ -179,6 +181,7 @@ func (n *Negotiator) HandleOutgoingBuyOrder(buyOrder BuyOrder) error {
 			assetRate, err := n.queryBidFromPriceOracle(
 				*buyOrder.Peer, assetSpecifier,
 				buyOrder.MinAssetAmount,
+				fn.None[lnwire.MilliSatoshi](),
 				fn.None[rfqmsg.AssetRate](),
 			)
 			if err != nil {
@@ -227,14 +230,16 @@ func (n *Negotiator) HandleOutgoingBuyOrder(buyOrder BuyOrder) error {
 // peer.
 func (n *Negotiator) queryAskFromPriceOracle(peer *route.Vertex,
 	assetSpecifier asset.Specifier, assetAmount uint64,
+	paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
 	assetRateHint fn.Option[rfqmsg.AssetRate]) (*rfqmsg.AssetRate, error) {
 
 	// Query the price oracle for an asking price.
 	ctx, cancel := n.WithCtxQuitNoTimeout()
 	defer cancel()
 
 	oracleResponse, err := n.cfg.PriceOracle.QueryAskPrice(
-		ctx, assetSpecifier, assetAmount, assetRateHint,
+		ctx, assetSpecifier, assetAmount, paymentMaxAmt,
+		assetRateHint,
 	)
 	if err != nil {
 		return nil, fmt.Errorf("failed to query price oracle for "+
@@ -323,6 +328,7 @@ func (n *Negotiator) HandleIncomingBuyRequest(
 		// Query the price oracle for an asking price.
 		assetRate, err := n.queryAskFromPriceOracle(
 			nil, request.AssetSpecifier, request.AssetMaxAmt,
+			fn.None[lnwire.MilliSatoshi](),
 			request.AssetRateHint,
 		)
 		if err != nil {
@@ -419,7 +425,8 @@ func (n *Negotiator) HandleIncomingSellRequest(
 		// sell to us.
 		assetRate, err := n.queryBidFromPriceOracle(
 			request.Peer, request.AssetSpecifier,
-			request.AssetAmount, request.AssetRateHint,
+			request.AssetAmount, fn.None[lnwire.MilliSatoshi](),
+			request.AssetRateHint,
 		)
 		if err != nil {
 			// Send a reject message to the peer.
@@ -479,6 +486,7 @@ func (n *Negotiator) HandleOutgoingSellOrder(order SellOrder) {
 			assetRate, err := n.queryAskFromPriceOracle(
 				order.Peer, assetSpecifier,
 				order.MaxAssetAmount,
+				fn.None[lnwire.MilliSatoshi](),
 				fn.None[rfqmsg.AssetRate](),
 			)
 			if err != nil {
@@ -592,7 +600,9 @@ func (n *Negotiator) HandleIncomingBuyAccept(msg rfqmsg.BuyAccept,
 		// by the price oracle with the ask price provided by the peer.
 		assetRate, err := n.queryAskFromPriceOracle(
 			&msg.Peer, msg.Request.AssetSpecifier,
-			msg.Request.AssetMaxAmt, fn.None[rfqmsg.AssetRate](),
+			msg.Request.AssetMaxAmt,
+			fn.None[lnwire.MilliSatoshi](),
+			fn.None[rfqmsg.AssetRate](),
 		)
 		if err != nil {
 			// The price oracle returned an error. We will return
@@ -716,7 +726,8 @@ func (n *Negotiator) HandleIncomingSellAccept(msg rfqmsg.SellAccept,
 		// by the price oracle with the bid price provided by the peer.
 		assetRate, err := n.queryBidFromPriceOracle(
 			msg.Peer, msg.Request.AssetSpecifier,
-			msg.Request.AssetAmount, msg.Request.AssetRateHint,
+			msg.Request.AssetAmount, fn.None[lnwire.MilliSatoshi](),
+			msg.Request.AssetRateHint,
 		)
 		if err != nil {
 			// The price oracle returned an error. We will return

rfq/oracle.go

@@ -8,12 +8,12 @@ import (
 	"net/url"
 	"time"
 
-	"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/lightninglabs/taproot-assets/rfqmsg"
 	oraclerpc "github.com/lightninglabs/taproot-assets/taprpc/priceoraclerpc"
+	"github.com/lightningnetwork/lnd/lnwire"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/credentials"
 	"google.golang.org/grpc/credentials/insecure"
@@ -96,14 +96,17 @@ type PriceOracle interface {
 	// from another peer to provide the specified asset amount.
 	QueryAskPrice(ctx context.Context, assetSpecifier asset.Specifier,
 		assetAmount uint64,
+		paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
 		assetRateHint fn.Option[rfqmsg.AssetRate]) (
 		*OracleResponse, error)
 
 	// QueryBidPrice returns the bid price for a given asset amount.
 	// The bid price is the amount the oracle suggests a peer should pay
 	// to another peer to receive the specified asset amount.
 	QueryBidPrice(ctx context.Context, assetSpecifier asset.Specifier,
-		assetAmount uint64, assetRateHint fn.Option[rfqmsg.AssetRate]) (
+		assetAmount uint64,
+		paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
+		assetRateHint fn.Option[rfqmsg.AssetRate]) (
 		*OracleResponse, error)
 }
 
@@ -189,6 +192,7 @@ func NewRpcPriceOracle(addrStr string, dialInsecure bool) (*RpcPriceOracle,
 // QueryAskPrice returns the ask price for the given asset amount.
 func (r *RpcPriceOracle) QueryAskPrice(ctx context.Context,
 	assetSpecifier asset.Specifier, assetAmount uint64,
+	paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
 	assetRateHint fn.Option[rfqmsg.AssetRate]) (*OracleResponse,
 	error) {
 
@@ -216,6 +220,11 @@ func (r *RpcPriceOracle) QueryAskPrice(ctx context.Context,
 		return nil, err
 	}
 
+	// Marshal payment asset max amount.
+	paymentAssetMaxAmount := uint64(
+		paymentMaxAmt.UnwrapOr(lnwire.MilliSatoshi(0)),
+	)
+
 	req := &oraclerpc.QueryAssetRatesRequest{
 		TransactionType: oraclerpc.TransactionType_SALE,
 		SubjectAsset: &oraclerpc.AssetSpecifier{
@@ -229,7 +238,8 @@ func (r *RpcPriceOracle) QueryAskPrice(ctx context.Context,
 				AssetId: paymentAssetId,
 			},
 		},
-		AssetRatesHint: rpcAssetRatesHint,
+		PaymentAssetMaxAmount: paymentAssetMaxAmount,
+		AssetRatesHint:        rpcAssetRatesHint,
 	}
 
 	// Perform query.
@@ -287,7 +297,9 @@ func (r *RpcPriceOracle) QueryAskPrice(ctx context.Context,
 // QueryBidPrice returns a bid price for the given asset amount.
 func (r *RpcPriceOracle) QueryBidPrice(ctx context.Context,
 	assetSpecifier asset.Specifier, maxAssetAmount uint64,
-	assetRateHint fn.Option[rfqmsg.AssetRate]) (*OracleResponse, error) {
+	paymentMaxAmt fn.Option[lnwire.MilliSatoshi],
+	assetRateHint fn.Option[rfqmsg.AssetRate]) (*OracleResponse,
+	error) {
 
 	// For now, we only support querying the ask price with an asset ID.
 	if !assetSpecifier.HasId() {
@@ -305,6 +317,11 @@ func (r *RpcPriceOracle) QueryBidPrice(ctx context.Context,
 		copy(subjectAssetId, assetId[:])
 	})
 
+	// Marshal payment asset max amount.
+	paymentAssetMaxAmount := uint64(
+		paymentMaxAmt.UnwrapOr(lnwire.MilliSatoshi(0)),
+	)
+
 	// Construct the RPC asset rates hint.
 	rpcAssetRatesHint, err := fn.MapOptionZ(
 		assetRateHint, oraclerpc.MarshalAssetRates,
@@ -326,7 +343,8 @@ func (r *RpcPriceOracle) QueryBidPrice(ctx context.Context,
 				AssetId: paymentAssetId,
 			},
 		},
-		AssetRatesHint: rpcAssetRatesHint,
+		PaymentAssetMaxAmount: paymentAssetMaxAmount,
+		AssetRatesHint:        rpcAssetRatesHint,
 	}
 
 	// Perform query.
@@ -421,7 +439,7 @@ func NewMockPriceOracleSatPerAsset(expiryDelay uint64,
 
 // QueryAskPrice returns the ask price for the given asset amount.
 func (m *MockPriceOracle) QueryAskPrice(_ context.Context,
-	_ asset.Specifier, _ uint64,
+	_ asset.Specifier, _ uint64, _ fn.Option[lnwire.MilliSatoshi],
 	_ fn.Option[rfqmsg.AssetRate]) (*OracleResponse, error) {
 
 	// Calculate the rate expiry timestamp.
@@ -434,8 +452,8 @@ func (m *MockPriceOracle) QueryAskPrice(_ context.Context,
 }
 
 // QueryBidPrice returns a bid price for the given asset amount.
-func (m *MockPriceOracle) QueryBidPrice(_ context.Context,
-	_ asset.Specifier, _ uint64,
+func (m *MockPriceOracle) QueryBidPrice(_ context.Context, _ asset.Specifier,
+	_ uint64, _ fn.Option[lnwire.MilliSatoshi],
 	_ fn.Option[rfqmsg.AssetRate]) (*OracleResponse, error) {
 
 	// Calculate the rate expiry timestamp.

rfq/oracle_test.go

@@ -171,7 +171,8 @@ func runQueryAskPriceTest(t *testing.T, tc *testCaseQueryAskPrice) {
 	require.NoError(t, err)
 
 	resp, err := client.QueryAskPrice(
-		ctx, assetSpecifier, assetAmount, fn.Some(assetRateHint),
+		ctx, assetSpecifier, assetAmount,
+		fn.None[lnwire.MilliSatoshi](), fn.Some(assetRateHint),
 	)
 
 	// If we expect an error, ensure that it is returned.
@@ -276,6 +277,7 @@ func runQueryBidPriceTest(t *testing.T, tc *testCaseQueryBidPrice) {
 
 	resp, err := client.QueryBidPrice(
 		ctx, assetSpecifier, assetAmount,
+		fn.None[lnwire.MilliSatoshi](),
 		fn.None[rfqmsg.AssetRate](),
 	)