Multi rfq receive itest

go.mod

@@ -28,7 +28,7 @@ require (
 	github.com/lightninglabs/pool v0.6.5-beta.0.20250305125211-4e860ec4e77f
 	github.com/lightninglabs/pool/auctioneerrpc v1.1.3-0.20250305125211-4e860ec4e77f
 	github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f
-	github.com/lightninglabs/taproot-assets v0.5.2-0.20250424162728-b6000498210d
+	github.com/lightninglabs/taproot-assets v0.5.2-0.20250425170006-2a288fb33aa5
 	github.com/lightningnetwork/lnd v0.19.0-beta.rc3
 	github.com/lightningnetwork/lnd/cert v1.2.2
 	github.com/lightningnetwork/lnd/clock v1.1.1

go.sum

@@ -1171,8 +1171,10 @@ github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f h1:5p
 github.com/lightninglabs/pool/poolrpc v1.0.1-0.20250305125211-4e860ec4e77f/go.mod h1:lGs2hSVZ+GFpdv3btaIl9icG5/gz7BBRfvmD2iqqNl0=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display h1:w7FM5LH9Z6CpKxl13mS48idsu6F+cEZf0lkyiV+Dq9g=
 github.com/lightninglabs/protobuf-go-hex-display v1.34.2-hex-display/go.mod h1:qYOHts0dSfpeUzUFpOMr/WGzszTmLH+DiWniOlNbLDw=
-github.com/lightninglabs/taproot-assets v0.5.2-0.20250424162728-b6000498210d h1:8WcOFToO9iY62c6ghbAaJfVP8qudzdrK89OXiOri9K4=
-github.com/lightninglabs/taproot-assets v0.5.2-0.20250424162728-b6000498210d/go.mod h1:6kQm7VC4yWAwczJaxfOWlCOQ4TuzfCLUkGKBwVONN7k=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250425153005-204964fc27bf h1:YzLfqaqcfkgIfp7spgVvCyHG312EWKqQBI2lqcPGr/w=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250425153005-204964fc27bf/go.mod h1:6kQm7VC4yWAwczJaxfOWlCOQ4TuzfCLUkGKBwVONN7k=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250425170006-2a288fb33aa5 h1:RuO65IW6CwjBsuDy/+Vo4viDqUoSFzZrZUiurjZIl9M=
+github.com/lightninglabs/taproot-assets v0.5.2-0.20250425170006-2a288fb33aa5/go.mod h1:6kQm7VC4yWAwczJaxfOWlCOQ4TuzfCLUkGKBwVONN7k=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb h1:yfM05S8DXKhuCBp5qSMZdtSwvJ+GFzl94KbXMNB1JDY=
 github.com/lightningnetwork/lightning-onion v1.2.1-0.20240712235311-98bd56499dfb/go.mod h1:c0kvRShutpj3l6B9WtTsNTBUtjSmjZXbJd9ZBRQOSKI=
 github.com/lightningnetwork/lnd v0.19.0-beta.rc3 h1:XWMlyZvBrp69AnQqrshLOOPZjOl4hFWR1RD4ceCXt9k=

itest/assets_test.go

@@ -67,6 +67,196 @@ var (
 	failureNone             = lnrpc.PaymentFailureReason_FAILURE_REASON_NONE
 )
 
+func createTestMultiRFQAssetNetwork(t *harnessTest, net *NetworkHarness,
+	charlieTap, daveTap, erinTap, fabiaTap, yaraTap, universeTap *tapClient,
+	mintedAsset *taprpc.Asset, assetSendAmount, fundingAmount uint64,
+	pushSat int64) (*lnrpc.ChannelPoint, *lnrpc.ChannelPoint,
+	*lnrpc.ChannelPoint) {
+
+	ctxb := context.Background()
+	assetID := mintedAsset.AssetGenesis.AssetId
+	var groupKey []byte
+	if mintedAsset.AssetGroup != nil {
+		groupKey = mintedAsset.AssetGroup.TweakedGroupKey
+	}
+
+	fundingScriptTree := tapscript.NewChannelFundingScriptTree()
+	fundingScriptKey := fundingScriptTree.TaprootKey
+	fundingScriptTreeBytes := fundingScriptKey.SerializeCompressed()
+
+	// We need to send some assets to Dave, so he can fund an asset channel
+	// with Fabia.
+	daveAddr, err := daveTap.NewAddr(ctxb, &taprpc.NewAddrRequest{
+		Amt:     assetSendAmount,
+		AssetId: assetID,
+		ProofCourierAddr: fmt.Sprintf(
+			"%s://%s", proof.UniverseRpcCourierType,
+			charlieTap.node.Cfg.LitAddr(),
+		),
+	})
+	require.NoError(t.t, err)
+
+	t.Logf("Sending %v asset units to Dave...", assetSendAmount)
+
+	// Send the assets to Dave.
+	itest.AssertAddrCreated(t.t, daveTap, mintedAsset, daveAddr)
+	sendResp, err := charlieTap.SendAsset(ctxb, &taprpc.SendAssetRequest{
+		TapAddrs: []string{daveAddr.Encoded},
+	})
+	require.NoError(t.t, err)
+	itest.ConfirmAndAssertOutboundTransfer(
+		t.t, t.lndHarness.Miner.Client, charlieTap, sendResp, assetID,
+		[]uint64{mintedAsset.Amount - assetSendAmount, assetSendAmount},
+		0, 1,
+	)
+	itest.AssertNonInteractiveRecvComplete(t.t, daveTap, 1)
+
+	// We need to send some assets to Erin, so he can fund an asset channel
+	// with Fabia.
+	erinAddr, err := erinTap.NewAddr(ctxb, &taprpc.NewAddrRequest{
+		Amt:     assetSendAmount,
+		AssetId: assetID,
+		ProofCourierAddr: fmt.Sprintf(
+			"%s://%s", proof.UniverseRpcCourierType,
+			charlieTap.node.Cfg.LitAddr(),
+		),
+	})
+	require.NoError(t.t, err)
+
+	t.Logf("Sending %v asset units to Erin...", assetSendAmount)
+
+	// Send the assets to Erin.
+	itest.AssertAddrCreated(t.t, erinTap, mintedAsset, erinAddr)
+	sendResp, err = charlieTap.SendAsset(ctxb, &taprpc.SendAssetRequest{
+		TapAddrs: []string{erinAddr.Encoded},
+	})
+	require.NoError(t.t, err)
+	itest.ConfirmAndAssertOutboundTransfer(
+		t.t, t.lndHarness.Miner.Client, charlieTap, sendResp, assetID,
+		[]uint64{
+			mintedAsset.Amount - 2*assetSendAmount, assetSendAmount,
+		}, 1, 2,
+	)
+	itest.AssertNonInteractiveRecvComplete(t.t, erinTap, 1)
+
+	// We need to send some assets to Yara, so he can fund an asset channel
+	// with Fabia.
+	yaraAddr, err := yaraTap.NewAddr(ctxb, &taprpc.NewAddrRequest{
+		Amt:     assetSendAmount,
+		AssetId: assetID,
+		ProofCourierAddr: fmt.Sprintf(
+			"%s://%s", proof.UniverseRpcCourierType,
+			charlieTap.node.Cfg.LitAddr(),
+		),
+	})
+	require.NoError(t.t, err)
+
+	t.Logf("Sending %v asset units to Yara...", assetSendAmount)
+
+	// Send the assets to Yara.
+	itest.AssertAddrCreated(t.t, yaraTap, mintedAsset, yaraAddr)
+	sendResp, err = charlieTap.SendAsset(ctxb, &taprpc.SendAssetRequest{
+		TapAddrs: []string{yaraAddr.Encoded},
+	})
+	require.NoError(t.t, err)
+	itest.ConfirmAndAssertOutboundTransfer(
+		t.t, t.lndHarness.Miner.Client, charlieTap, sendResp, assetID,
+		[]uint64{
+			mintedAsset.Amount - 3*assetSendAmount, assetSendAmount,
+		}, 2, 3,
+	)
+	itest.AssertNonInteractiveRecvComplete(t.t, yaraTap, 1)
+
+	// We fund the Dave->Fabia channel.
+	fundRespDF, err := daveTap.FundChannel(
+		ctxb, &tchrpc.FundChannelRequest{
+			AssetAmount:        fundingAmount,
+			AssetId:            assetID,
+			PeerPubkey:         fabiaTap.node.PubKey[:],
+			FeeRateSatPerVbyte: 5,
+			PushSat:            pushSat,
+		},
+	)
+	require.NoError(t.t, err)
+	t.Logf("Funded channel between Dave and Fabia: %v", fundRespDF)
+
+	// We fund the Erin->Fabia channel.
+	fundRespEF, err := erinTap.FundChannel(
+		ctxb, &tchrpc.FundChannelRequest{
+			AssetAmount:        fundingAmount,
+			AssetId:            assetID,
+			PeerPubkey:         fabiaTap.node.PubKey[:],
+			FeeRateSatPerVbyte: 5,
+			PushSat:            pushSat,
+		},
+	)
+	require.NoError(t.t, err)
+	t.Logf("Funded channel between Erin and Fabia: %v", fundRespEF)
+
+	// We fund the Yara->Fabia channel.
+	fundRespYF, err := yaraTap.FundChannel(
+		ctxb, &tchrpc.FundChannelRequest{
+			AssetAmount:        fundingAmount,
+			AssetId:            assetID,
+			PeerPubkey:         fabiaTap.node.PubKey[:],
+			FeeRateSatPerVbyte: 5,
+			PushSat:            pushSat,
+		},
+	)
+	require.NoError(t.t, err)
+	t.Logf("Funded channel between Yara and Fabia: %v", fundRespYF)
+
+	// Make sure the pending channel shows up in the list and has the
+	// custom records set as JSON.
+	assertPendingChannels(
+		t.t, daveTap.node, mintedAsset, 1, fundingAmount, 0,
+	)
+	assertPendingChannels(
+		t.t, erinTap.node, mintedAsset, 1, fundingAmount, 0,
+	)
+	assertPendingChannels(
+		t.t, yaraTap.node, mintedAsset, 1, fundingAmount, 0,
+	)
+
+	// Now that we've looked at the pending channels, let's actually confirm
+	// all three of them.
+	mineBlocks(t, net, 6, 3)
+
+	// We'll be tracking the expected asset balances throughout the test, so
+	// we can assert it after each action.
+	charlieAssetBalance := mintedAsset.Amount - 3*assetSendAmount
+	daveAssetBalance := assetSendAmount - fundingAmount
+	erinAssetBalance := assetSendAmount - fundingAmount
+	yaraAssetBalance := assetSendAmount - fundingAmount
+
+	assertAssetBalance(t.t, charlieTap, assetID, charlieAssetBalance)
+	assertAssetBalance(t.t, daveTap, assetID, daveAssetBalance)
+	assertAssetBalance(t.t, erinTap, assetID, erinAssetBalance)
+	assertAssetBalance(t.t, yaraTap, assetID, yaraAssetBalance)
+
+	assertNumAssetOutputs(t.t, charlieTap, assetID, 1)
+	assertNumAssetOutputs(t.t, daveTap, assetID, 1)
+	assertNumAssetOutputs(t.t, erinTap, assetID, 1)
+	assertNumAssetOutputs(t.t, yaraTap, assetID, 1)
+
+	// Assert that the proofs for both channels has been uploaded to the
+	// designated Universe server.
+	assertUniverseProofExists(
+		t.t, universeTap, assetID, groupKey, fundingScriptTreeBytes,
+		fmt.Sprintf("%v:%v", fundRespDF.Txid, fundRespDF.OutputIndex),
+	)
+	assertUniverseProofExists(
+		t.t, universeTap, assetID, groupKey, fundingScriptTreeBytes,
+		fmt.Sprintf("%v:%v", fundRespEF.Txid, fundRespEF.OutputIndex),
+	)
+	assertUniverseProofExists(
+		t.t, universeTap, assetID, groupKey, fundingScriptTreeBytes,
+		fmt.Sprintf("%v:%v", fundRespYF.Txid, fundRespYF.OutputIndex),
+	)
+
+	return nil, nil, nil
+}
+
 // createTestAssetNetwork sends asset funds from Charlie to Dave and Erin, so
 // they can fund asset channels with Yara and Fabia, respectively. So the asset
 // channels created are Charlie->Dave, Dave->Yara, Erin->Fabia. The channels
@@ -1119,7 +1309,7 @@ func sendKeySendPayment(t *testing.T, src, dst *HarnessNode,
 	stream, err := src.RouterClient.SendPaymentV2(ctxt, req)
 	require.NoError(t, err)
 
-	result, err := getPaymentResult(stream)
+	result, err := getPaymentResult(stream, false)
 	require.NoError(t, err)
 	require.Equal(t, lnrpc.Payment_SUCCEEDED, result.Status)
 }
@@ -1170,19 +1360,27 @@ func payInvoiceWithSatoshi(t *testing.T, payer *HarnessNode,
 	}
 
 	ctxb := context.Background()
-	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
+	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout*5)
 	defer cancel()
 
+	shardSize := uint64(0)
+
+	if cfg.smallShards {
+		shardSize = 80_000_000
+	}
+
 	sendReq := &routerrpc.SendPaymentRequest{
 		PaymentRequest:   invoice.PaymentRequest,
 		TimeoutSeconds:   int32(PaymentTimeout.Seconds()),
-		MaxShardSizeMsat: 80_000_000,
-		FeeLimitMsat:     1_000_000,
+		MaxShardSizeMsat: shardSize,
+		FeeLimitMsat:     10_000_000,
 	}
 	stream, err := payer.RouterClient.SendPaymentV2(ctxt, sendReq)
 	require.NoError(t, err)
 
-	result, err := getPaymentResult(stream)
+	result, err := getPaymentResult(
+		stream, cfg.payStatus == lnrpc.Payment_IN_FLIGHT,
+	)
 	if cfg.errSubStr != "" {
 		require.ErrorContains(t, err, cfg.errSubStr)
 	} else {
@@ -1462,16 +1660,21 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 
 	timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
 
-	t.Logf("Asking peer %x for quote to buy assets to receive for "+
-		"invoice over %d units; waiting up to %ds",
-		dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
+	var peerPubKey []byte
+	if dstRfqPeer != nil {
+		peerPubKey = dstRfqPeer.PubKey[:]
+
+		t.Logf("Asking peer %x for quote to buy assets to receive for "+
+			"invoice over %d units; waiting up to %ds",
+			dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
+	}
 
 	dstTapd := newTapClient(t, dst)
 
 	request := &tchrpc.AddInvoiceRequest{
 		GroupKey:    cfg.groupKey,
 		AssetAmount: assetAmount,
-		PeerPubkey:  dstRfqPeer.PubKey[:],
+		PeerPubkey:  peerPubKey,
 		InvoiceRequest: &lnrpc.Invoice{
 			Memo: fmt.Sprintf("this is an asset invoice for "+
 				"%d units", assetAmount),
@@ -1515,7 +1718,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 
 	t.Logf("Got quote for %d mSats at %3f msat/unit from peer %x with "+
 		"SCID %d", decodedInvoice.NumMsat, mSatPerUnit,
-		dstRfqPeer.PubKey[:], resp.AcceptedBuyQuote.Scid)
+		resp.AcceptedBuyQuote.Peer, resp.AcceptedBuyQuote.Scid)
 
 	return resp.InvoiceResult
 }
@@ -1649,9 +1852,15 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 
 	timeoutSeconds := int64(rfq.DefaultInvoiceExpiry.Seconds())
 
+	var rfqPeer []byte
+
+	if dstRfqPeer != nil {
+		rfqPeer = dstRfqPeer.PubKey[:]
+	}
+
 	t.Logf("Asking peer %x for quote to buy assets to receive for "+
 		"invoice for %d units; waiting up to %ds",
-		dstRfqPeer.PubKey[:], assetAmount, timeoutSeconds)
+		rfqPeer, assetAmount, timeoutSeconds)
 
 	dstTapd := newTapClient(t, dst)
 
@@ -1664,7 +1873,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 	payHash := preimage.Hash()
 	request := &tchrpc.AddInvoiceRequest{
 		AssetAmount: assetAmount,
-		PeerPubkey:  dstRfqPeer.PubKey[:],
+		PeerPubkey:  rfqPeer,
 		InvoiceRequest: &lnrpc.Invoice{
 			Memo: fmt.Sprintf("this is an asset invoice for "+
 				"%d units", assetAmount),
@@ -1702,7 +1911,7 @@ func createAssetHodlInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 	require.EqualValues(t, uint64(numMSats), uint64(decodedInvoice.NumMsat))
 
 	t.Logf("Got quote for %d msat at %v msat/unit from peer %x with SCID "+
-		"%d", decodedInvoice.NumMsat, mSatPerUnit, dstRfqPeer.PubKey[:],
+		"%d", decodedInvoice.NumMsat, mSatPerUnit, rfqPeer,
 		resp.AcceptedBuyQuote.Scid)
 
 	return assetHodlInvoice{

itest/litd_accounts_test.go

@@ -416,21 +416,28 @@ func payNode(invoiceCtx, paymentCtx context.Context, t *harnessTest,
 	stream, err := from.SendPaymentV2(paymentCtx, sendReq)
 	require.NoError(t.t, err)
 
-	result, err := getPaymentResult(stream)
+	result, err := getPaymentResult(stream, false)
 	require.NoError(t.t, err)
 	require.Equal(t.t, result.Status, lnrpc.Payment_SUCCEEDED)
 }
 
-func getPaymentResult(stream routerrpc.Router_SendPaymentV2Client) (
-	*lnrpc.Payment, error) {
+func getPaymentResult(stream routerrpc.Router_SendPaymentV2Client,
+	isHodl bool) (*lnrpc.Payment, error) {
 
 	for {
 		payment, err := stream.Recv()
 		if err != nil {
 			return nil, err
 		}
 
-		if payment.Status != lnrpc.Payment_IN_FLIGHT {
+		// If this is a hodl payment, then we'll return the first
+		// expected response. Otherwise, we'll wait until the in flight
+		// clears to we can observe the other payment states.
+		switch {
+		case isHodl:
+			return payment, nil
+
+		case payment.Status != lnrpc.Payment_IN_FLIGHT:
 			return payment, nil
 		}
 	}