itest: use groupkey payments & invoices in grouped asset test

Author: GeorgeTsagk

itest/assets_test.go

@@ -4,6 +4,7 @@ import (
 	"bytes"
 	"context"
 	"crypto/rand"
+	"crypto/sha256"
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
@@ -755,6 +756,7 @@ func sendAssetKeySendPayment(t *testing.T, src, dst *HarnessNode, amt uint64,
 	stream, err := srcTapd.SendPayment(ctxt, &tchrpc.SendPaymentRequest{
 		AssetId:        assetID,
 		AssetAmount:    amt,
+		GroupKey:       cfg.groupKey,
 		PaymentRequest: sendReq,
 	})
 	require.NoError(t, err)
@@ -937,6 +939,7 @@ type payConfig struct {
 	payStatus         lnrpc.Payment_PaymentStatus
 	failureReason     lnrpc.PaymentFailureReason
 	rfq               fn.Option[rfqmsg.ID]
+	groupKey          []byte
 }
 
 func defaultPayConfig() *payConfig {
@@ -951,6 +954,12 @@ func defaultPayConfig() *payConfig {
 
 type payOpt func(*payConfig)
 
+func withGroupKey(groupKey []byte) payOpt {
+	return func(c *payConfig) {
+		c.groupKey = groupKey
+	}
+}
+
 func withSmallShards() payOpt {
 	return func(c *payConfig) {
 		c.smallShards = true
@@ -1036,6 +1045,7 @@ func payInvoiceWithAssets(t *testing.T, payer, rfqPeer *HarnessNode,
 	stream, err := payerTapd.SendPayment(ctxt, &tchrpc.SendPaymentRequest{
 		AssetId:        assetID,
 		PeerPubkey:     rfqPeer.PubKey[:],
+		GroupKey:       cfg.groupKey,
 		PaymentRequest: sendReq,
 		RfqId:          rfqBytes,
 		AllowOverpay:   cfg.allowOverpay,
@@ -1097,6 +1107,7 @@ func payInvoiceWithAssets(t *testing.T, payer, rfqPeer *HarnessNode,
 
 type invoiceConfig struct {
 	errSubStr string
+	groupKey  []byte
 }
 
 func defaultInvoiceConfig() *invoiceConfig {
@@ -1113,6 +1124,12 @@ func withInvoiceErrSubStr(errSubStr string) invoiceOpt {
 	}
 }
 
+func withInvGroupKey(groupKey []byte) invoiceOpt {
+	return func(c *invoiceConfig) {
+		c.groupKey = groupKey
+	}
+}
+
 func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 	assetAmount uint64, assetID []byte,
 	opts ...invoiceOpt) *lnrpc.AddInvoiceResponse {
@@ -1136,6 +1153,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 
 	resp, err := dstTapd.AddInvoice(ctxt, &tchrpc.AddInvoiceRequest{
 		AssetId:     assetID,
+		GroupKey:    cfg.groupKey,
 		AssetAmount: assetAmount,
 		PeerPubkey:  dstRfqPeer.PubKey[:],
 		InvoiceRequest: &lnrpc.Invoice{
@@ -1180,7 +1198,7 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 // individual HTLCs that arrived for it and that they show the correct asset
 // amounts for the given ID when decoded.
 func assertInvoiceHtlcAssets(t *testing.T, node *HarnessNode,
-	addedInvoice *lnrpc.AddInvoiceResponse, assetID []byte,
+	addedInvoice *lnrpc.AddInvoiceResponse, assetID []byte, groupID []byte,
 	assetAmount uint64) {
 
 	ctxb := context.Background()
@@ -1199,7 +1217,15 @@ func assertInvoiceHtlcAssets(t *testing.T, node *HarnessNode,
 
 	t.Logf("Asset invoice: %v", toProtoJSON(t, invoice))
 
-	targetID := hex.EncodeToString(assetID)
+	var targetID string
+	switch {
+	case len(assetID) > 0:
+		targetID = hex.EncodeToString(assetID)
+
+	case len(groupID) > 0:
+		groupHash := sha256.Sum256(groupID)
+		targetID = hex.EncodeToString(groupHash[:])
+	}
 
 	var totalAssetAmount uint64
 	for _, htlc := range invoice.Htlcs {
@@ -1226,7 +1252,7 @@ func assertInvoiceHtlcAssets(t *testing.T, node *HarnessNode,
 // individual HTLCs that arrived for it and that they show the correct asset
 // amounts for the given ID when decoded.
 func assertPaymentHtlcAssets(t *testing.T, node *HarnessNode, payHash []byte,
-	assetID []byte, assetAmount uint64) {
+	assetID []byte, groupID []byte, assetAmount uint64) {
 
 	ctxb := context.Background()
 	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
@@ -1247,7 +1273,15 @@ func assertPaymentHtlcAssets(t *testing.T, node *HarnessNode, payHash []byte,
 
 	t.Logf("Asset payment: %v", toProtoJSON(t, payment))
 
-	targetID := hex.EncodeToString(assetID)
+	var targetID string
+	switch {
+	case len(assetID) > 0:
+		targetID = hex.EncodeToString(assetID)
+
+	case len(groupID) > 0:
+		groupHash := sha256.Sum256(groupID)
+		targetID = hex.EncodeToString(groupHash[:])
+	}
 
 	var totalAssetAmount uint64
 	for _, htlc := range payment.Htlcs {

itest/litd_custom_channels_test.go

@@ -261,10 +261,11 @@ func testCustomChannelsLarge(_ context.Context, net *NetworkHarness,
 	// sender side show the individual HTLCs that arrived for it and that
 	// they show the correct asset amounts when decoded.
 	assertInvoiceHtlcAssets(
-		t.t, dave, invoiceResp3, assetID, largeInvoiceAmount,
+		t.t, dave, invoiceResp3, assetID, nil, largeInvoiceAmount,
 	)
 	assertPaymentHtlcAssets(
-		t.t, charlie, invoiceResp3.RHash, assetID, largeInvoiceAmount,
+		t.t, charlie, invoiceResp3.RHash, assetID, nil,
+		largeInvoiceAmount,
 	)
 
 	// We keysend the rest, so that all the balance is on Dave's side.
@@ -450,10 +451,11 @@ func testCustomChannels(ctx context.Context, net *NetworkHarness,
 	// sender side show the individual HTLCs that arrived for it and that
 	// they show the correct asset amounts when decoded.
 	assertInvoiceHtlcAssets(
-		t.t, charlie, invoiceResp, assetID, charlieInvoiceAmount,
+		t.t, charlie, invoiceResp, assetID, nil, charlieInvoiceAmount,
 	)
 	assertPaymentHtlcAssets(
-		t.t, dave, invoiceResp.RHash, assetID, charlieInvoiceAmount,
+		t.t, dave, invoiceResp.RHash, assetID, nil,
+		charlieInvoiceAmount,
 	)
 
 	charlieAssetBalance += charlieInvoiceAmount
@@ -891,7 +893,8 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 	// ------------
 	const keySendAmount = 100
 	sendAssetKeySendPayment(
-		t.t, charlie, dave, keySendAmount, assetID, fn.None[int64](),
+		t.t, charlie, dave, keySendAmount, nil, fn.None[int64](),
+		withGroupKey(groupID),
 	)
 	logBalance(t.t, nodes, assetID, "after keysend")
 
@@ -919,10 +922,11 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 	// invoice.
 	// ------------
 	createAndPayNormalInvoice(
-		t.t, charlie, dave, dave, 20_000, assetID, withSmallShards(),
+		t.t, charlie, dave, dave, 20_000, nil, withSmallShards(),
 		withFailure(lnrpc.Payment_FAILED, failureIncorrectDetails),
+		withGroupKey(groupID),
 	)
-	logBalance(t.t, nodes, assetID, "after invoice")
+	logBalance(t.t, nodes, assetID, "after failed invoice")
 
 	// We should also be able to do a multi-hop BTC only payment, paying an
 	// invoice from Erin by Charlie.
@@ -936,22 +940,24 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 	// ------------
 	const daveInvoiceAssetAmount = 2_000
 	invoiceResp := createAssetInvoice(
-		t.t, charlie, dave, daveInvoiceAssetAmount, assetID,
+		t.t, charlie, dave, daveInvoiceAssetAmount, nil,
+		withInvGroupKey(groupID),
 	)
 	payInvoiceWithAssets(
-		t.t, charlie, dave, invoiceResp.PaymentRequest, assetID,
+		t.t, charlie, dave, invoiceResp.PaymentRequest, nil,
 		withSmallShards(),
+		withGroupKey(groupID),
 	)
 	logBalance(t.t, nodes, assetID, "after invoice")
 
 	// Make sure the invoice on the receiver side and the payment on the
 	// sender side show the individual HTLCs that arrived for it and that
 	// they show the correct asset amounts when decoded.
 	assertInvoiceHtlcAssets(
-		t.t, dave, invoiceResp, assetID, daveInvoiceAssetAmount,
+		t.t, dave, invoiceResp, nil, groupID, daveInvoiceAssetAmount,
 	)
 	assertPaymentHtlcAssets(
-		t.t, charlie, invoiceResp.RHash, assetID,
+		t.t, charlie, invoiceResp.RHash, nil, groupID,
 		daveInvoiceAssetAmount,
 	)
 
@@ -962,7 +968,8 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 	// Test case 4: Pay a normal invoice from Erin by Charlie.
 	// ------------
 	paidAssetAmount := createAndPayNormalInvoice(
-		t.t, charlie, dave, erin, 20_000, assetID, withSmallShards(),
+		t.t, charlie, dave, erin, 20_000, nil, withSmallShards(),
+		withGroupKey(groupID),
 	)
 	logBalance(t.t, nodes, assetID, "after invoice")
 
@@ -975,7 +982,8 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 	// ------------
 	const fabiaInvoiceAssetAmount1 = 1000
 	invoiceResp = createAssetInvoice(
-		t.t, erin, fabia, fabiaInvoiceAssetAmount1, assetID,
+		t.t, erin, fabia, fabiaInvoiceAssetAmount1, nil,
+		withInvGroupKey(groupID),
 	)
 	payInvoiceWithAssets(
 		t.t, charlie, dave, invoiceResp.PaymentRequest, assetID,
@@ -1015,8 +1023,8 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 		t.t, erin, fabia, fabiaInvoiceAssetAmount3, assetID,
 	)
 	payInvoiceWithAssets(
-		t.t, charlie, dave, invoiceResp.PaymentRequest, assetID,
-		withSmallShards(),
+		t.t, charlie, dave, invoiceResp.PaymentRequest, nil,
+		withSmallShards(), withGroupKey(groupID),
 	)
 	logBalance(t.t, nodes, assetID, "after invoice")
 
@@ -1033,7 +1041,8 @@ func testCustomChannelsGroupedAsset(ctx context.Context, net *NetworkHarness,
 
 	const yaraInvoiceAssetAmount1 = 1000
 	invoiceResp = createAssetInvoice(
-		t.t, dave, yara, yaraInvoiceAssetAmount1, assetID,
+		t.t, dave, yara, yaraInvoiceAssetAmount1, nil,
+		withInvGroupKey(groupID),
 	)
 	payInvoiceWithAssets(
 		t.t, charlie, dave, invoiceResp.PaymentRequest, assetID,
@@ -1941,10 +1950,10 @@ func testCustomChannelsLiquidityEdgeCases(ctx context.Context,
 	// sender side show the individual HTLCs that arrived for it and that
 	// they show the correct asset amounts when decoded.
 	assertInvoiceHtlcAssets(
-		t.t, dave, invoiceResp, assetID, bigAssetAmount,
+		t.t, dave, invoiceResp, assetID, nil, bigAssetAmount,
 	)
 	assertPaymentHtlcAssets(
-		t.t, charlie, invoiceResp.RHash, assetID, bigAssetAmount,
+		t.t, charlie, invoiceResp.RHash, assetID, nil, bigAssetAmount,
 	)
 
 	// Dave sends 200k assets and 5k sats to Yara.
@@ -2903,7 +2912,8 @@ func testCustomChannelsOraclePricing(ctx context.Context, net *NetworkHarness,
 		charliePaidMSat, rate,
 	).ScaleTo(0).ToUint64()
 	assertPaymentHtlcAssets(
-		t.t, charlie, invoiceResp.RHash, assetID, charliePaidAmount,
+		t.t, charlie, invoiceResp.RHash, assetID, nil,
+		charliePaidAmount,
 	)
 
 	// We now make sure the asset and satoshi channel balances are exactly