fixup

Author: sputn1ck

assets/client.go

@@ -1,9 +1,17 @@
 package assets
 
 import (
+	"context"
+	"fmt"
+	"math/big"
 	"os"
+	"time"
 
+	"github.com/btcsuite/btcd/btcutil"
+	"github.com/lightninglabs/taproot-assets/rfqmath"
 	"github.com/lightninglabs/taproot-assets/taprpc"
+	"github.com/lightninglabs/taproot-assets/taprpc/priceoraclerpc"
+	"github.com/lightninglabs/taproot-assets/taprpc/rfqrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/tapchannelrpc"
 	"github.com/lightningnetwork/lnd/macaroons"
 	"google.golang.org/grpc"
@@ -33,6 +41,15 @@ func DefaultTapdConfig() *TapdConfig {
 	}
 }
 
+// TapdClient is a client for the Tap daemon.
+type TapdClient struct {
+	cc *grpc.ClientConn
+	taprpc.TaprootAssetsClient
+	tapchannelrpc.TaprootAssetChannelsClient
+	priceoraclerpc.PriceOracleClient
+	rfqrpc.RfqClient
+}
+
 // NewTapdClient retusn a new taproot assets client.
 func NewTapdClient(config *TapdConfig) (*TapdClient, error) {
 	// Create the client connection to the server.
@@ -46,6 +63,8 @@ func NewTapdClient(config *TapdConfig) (*TapdClient, error) {
 		cc:                         conn,
 		TaprootAssetsClient:        taprpc.NewTaprootAssetsClient(conn),
 		TaprootAssetChannelsClient: tapchannelrpc.NewTaprootAssetChannelsClient(conn),
+		PriceOracleClient:          priceoraclerpc.NewPriceOracleClient(conn),
+		RfqClient:                  rfqrpc.NewRfqClient(conn),
 	}
 
 	return client, nil
@@ -56,11 +75,57 @@ func (c *TapdClient) Close() {
 	c.cc.Close()
 }
 
-// TapdClient is a client for the Tap daemon.
-type TapdClient struct {
-	cc *grpc.ClientConn
-	taprpc.TaprootAssetsClient
-	tapchannelrpc.TaprootAssetChannelsClient
+func (c *TapdClient) GetSatAmountForAsset(ctx context.Context,
+	amt btcutil.Amount, assetId, peerPubkey []byte) (btcutil.Amount,
+	error) {
+
+	rfq, err := c.RfqClient.AddAssetSellOrder(
+		ctx, &rfqrpc.AddAssetSellOrderRequest{
+			AssetSpecifier: &rfqrpc.AssetSpecifier{
+				Id: &rfqrpc.AssetSpecifier_AssetId{ // nolint:lll
+					AssetId: assetId,
+				},
+			},
+			PeerPubKey:     peerPubkey,
+			PaymentMaxAmt:  uint64(amt),
+			Expiry:         uint64(time.Now().Add(1 * time.Hour).Unix()),
+			TimeoutSeconds: 60,
+		})
+	if err != nil {
+		return 0, err
+	}
+	if rfq.GetInvalidQuote() != nil {
+		return 0, fmt.Errorf("invalid RFQ: %v", rfq.GetInvalidQuote())
+	}
+	if rfq.GetRejectedQuote() != nil {
+		return 0, fmt.Errorf("rejected RFQ: %v", rfq.GetRejectedQuote())
+	}
+
+	if rfq.GetAcceptedQuote() != nil {
+		payRate := rfq.GetAcceptedQuote().BidAssetRate
+
+		coefficient := new(big.Int)
+		coefficient, ok := coefficient.SetString(payRate.Coefficient, 10)
+		if !ok {
+			return 0, fmt.Errorf("failed to parse coefficient %v",
+				payRate.Coefficient)
+		}
+
+		amt := rfqmath.FixedPointFromUint64[rfqmath.BigInt](
+			uint64(amt), 0,
+		)
+
+		price := rfqmath.FixedPoint[rfqmath.BigInt]{
+			Coefficient: rfqmath.NewBigInt(coefficient),
+			Scale:       uint8(payRate.Scale),
+		}
+
+		msats := rfqmath.UnitsToMilliSatoshi(amt, price)
+
+		return msats.ToSatoshis(), nil
+	}
+
+	return 0, fmt.Errorf("no accepted quote")
 }
 
 func getClientConn(config *TapdConfig) (*grpc.ClientConn, error) {

client.go

@@ -506,6 +506,18 @@ func (s *Client) resumeSwaps(ctx context.Context,
 func (s *Client) LoopOut(globalCtx context.Context,
 	request *OutRequest) (*LoopOutSwapInfo, error) {
 
+	if request.AssetId != nil {
+		satAmt, err := s.assetClient.GetSatAmountForAsset(
+			globalCtx, request.AssetAmount, request.AssetId,
+			request.AssetEdgeNode,
+		)
+		if err != nil {
+			return nil, err
+		}
+
+		request.Amount = satAmt
+	}
+
 	log.Infof("LoopOut %v to %v (channels: %v)",
 		request.Amount, request.DestAddr, request.OutgoingChanSet,
 	)
@@ -586,11 +598,24 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 		return nil, err
 	}
 
-	if request.Amount < terms.MinSwapAmount {
+	satAmount := request.Amount
+	// If we use an Asset we'll rfq to check if the sat amount meets the
+	// min swap amount criteria.
+	if request.AssetId != nil {
+		satAmount, err = s.assetClient.GetSatAmountForAsset(
+			ctx, btcutil.Amount(request.Amount), request.AssetId,
+			request.PeerPubkey,
+		)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	if satAmount < terms.MinSwapAmount {
 		return nil, ErrSwapAmountTooLow
 	}
 
-	if request.Amount > terms.MaxSwapAmount {
+	if satAmount > terms.MaxSwapAmount {
 		return nil, ErrSwapAmountTooHigh
 	}
 
@@ -601,7 +626,7 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 	}
 
 	quote, err := s.Server.GetLoopOutQuote(
-		ctx, request.Amount, expiry, request.SwapPublicationDeadline,
+		ctx, satAmount, expiry, request.SwapPublicationDeadline,
 		request.Initiator,
 	)
 	if err != nil {
@@ -620,6 +645,7 @@ func (s *Client) LoopOutQuote(ctx context.Context,
 		MinerFee:        minerFee,
 		PrepayAmount:    quote.PrepayAmount,
 		SwapPaymentDest: quote.SwapPaymentDest,
+		InvoiceAmtSat:   satAmount,
 	}, nil
 }
 

cmd/loop/loopout.go

@@ -205,6 +205,10 @@ func loopOut(ctx *cli.Context) error {
 		if err != nil {
 			return err
 		}
+		if !ctx.IsSet("asset_edge_node") {
+			return fmt.Errorf("asset edge node is required when " +
+				"assetid is set")
+		}
 	}
 
 	var assetEdgeNode []byte
@@ -239,6 +243,8 @@ func loopOut(ctx *cli.Context) error {
 		Amt:                     int64(amt),
 		ConfTarget:              sweepConfTarget,
 		SwapPublicationDeadline: uint64(swapDeadline.Unix()),
+		AssetId:                 assetId,
+		AssetEdgeNode:           assetEdgeNode,
 	}
 	quote, err := client.LoopOutQuote(context.Background(), quoteReq)
 	if err != nil {

cmd/loop/quote.go

@@ -267,8 +267,15 @@ func printQuoteOutResp(req *looprpc.QuoteRequest,
 
 	totalFee := resp.HtlcSweepFeeSat + resp.SwapFeeSat
 
-	fmt.Printf(satAmtFmt, "Send off-chain:", req.Amt)
-	fmt.Printf(satAmtFmt, "Receive on-chain:", req.Amt-totalFee)
+	if req.AssetId != nil {
+		fmt.Printf("%-36s %12d assets\n",
+			"Assets Send off-chain:", req.Amt)
+		fmt.Printf(satAmtFmt, "Sats Send off-chain:",
+			resp.InvoiceAmtSat)
+	} else {
+		fmt.Printf(satAmtFmt, "Send off-chain:", resp.InvoiceAmtSat)
+	}
+	fmt.Printf(satAmtFmt, "Receive on-chain:", resp.InvoiceAmtSat-totalFee)
 
 	if !verbose {
 		fmt.Printf(satAmtFmt, "Estimated total fee:", totalFee)

interface.go

@@ -108,6 +108,10 @@ type OutRequest struct {
 	// tapd server have multiple channels with different peers for the given
 	// asset id.
 	AssetEdgeNode []byte
+
+	// AssetAmount is the amount of the asset that will be used to pay for
+	// the swap. This is only set if the asset id is set.
+	AssetAmount btcutil.Amount
 }
 
 // Out contains the full details of a loop out request. This includes things
@@ -155,6 +159,12 @@ type LoopOutQuoteRequest struct {
 	// initiated the swap (loop CLI, autolooper, LiT UI and so on) and is
 	// appended to the user agent string.
 	Initiator string
+
+	// AssetId is the asset that we'll quote for.
+	AssetId []byte
+
+	// PeerPubkey is the pubkey of the peer that we'll quote for.
+	PeerPubkey []byte
 }
 
 // LoopOutTerms are the server terms on which it executes swaps.
@@ -191,6 +201,9 @@ type LoopOutQuote struct {
 	// SwapPaymentDest is the node pubkey where to swap payment needs to be
 	// sent to.
 	SwapPaymentDest [33]byte
+
+	// InvoiceAmtSat is the amount of the invoice in satoshis.
+	InvoiceAmtSat btcutil.Amount
 }
 
 // LoopInRequest contains the required parameters for the swap.

loopd/swapclient_server.go

@@ -206,8 +206,18 @@ func (s *swapClientServer) LoopOut(ctx context.Context,
 		Label:                   in.Label,
 		Initiator:               in.Initiator,
 		PaymentTimeout:          paymentTimeout,
-		AssetId:                 in.AssetId,
-		AssetEdgeNode:           in.AssetEdgeNode,
+	}
+
+	// If the asset id is set, we need to set the asset amount and asset id
+	// in the request.
+	if in.AssetId != nil {
+		req.AssetAmount = btcutil.Amount(in.Amt)
+		req.AssetId = in.AssetId
+		req.AssetEdgeNode = in.AssetEdgeNode
+
+		// We'll set the sat amount to zero, as this gets set later
+		// when we calculate the total amount to send.
+		req.Amount = 0
 	}
 
 	switch {
@@ -714,6 +724,8 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 		SweepConfTarget:         confTarget,
 		SwapPublicationDeadline: publicactionDeadline,
 		Initiator:               defaultLoopdInitiator,
+		AssetId:                 req.AssetId,
+		PeerPubkey:              req.AssetEdgeNode,
 	})
 	if err != nil {
 		return nil, err
@@ -725,6 +737,7 @@ func (s *swapClientServer) LoopOutQuote(ctx context.Context,
 		SwapFeeSat:      int64(quote.SwapFee),
 		SwapPaymentDest: quote.SwapPaymentDest[:],
 		ConfTarget:      confTarget,
+		InvoiceAmtSat:   int64(quote.InvoiceAmtSat),
 	}, nil
 }
 

loopout.go

@@ -655,7 +655,7 @@ func (s *loopOutSwap) payInvoices(ctx context.Context) {
 	s.prePaymentChan = s.payInvoice(
 		ctx, s.PrepayInvoice, s.MaxPrepayRoutingFee,
 		s.LoopOutContract.OutgoingChanSet,
-		s.LoopOutContract.PaymentTimeout, RoutingPluginNone, false, false,
+		s.LoopOutContract.PaymentTimeout, RoutingPluginNone, false, true,
 	)
 }
 
@@ -762,9 +762,13 @@ func (s *loopOutSwap) payInvoiceWithAssetClient(ctx context.Context,
 				continue
 			}
 
-			return &lndclient.PaymentStatus{
-				State: payRes.Status,
-			}, nil
+			if payRes.Status == lnrpc.Payment_SUCCEEDED ||
+				payRes.Status == lnrpc.Payment_FAILED {
+
+				return &lndclient.PaymentStatus{
+					State: payRes.Status,
+				}, nil
+			}
 		}
 	}
 }