wip

Author: guggero

go.mod

@@ -1,7 +1,7 @@
 module github.com/lightninglabs/lightning-terminal
 
 require (
-	github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53
+	github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b
 	github.com/btcsuite/btcd/btcec/v2 v2.3.4
 	github.com/btcsuite/btcd/btcutil v1.1.5
 	github.com/btcsuite/btcd/chaincfg/chainhash v1.1.0
@@ -236,4 +236,4 @@ replace google.golang.org/protobuf => github.com/lightninglabs/protobuf-go-hex-d
 
 replace github.com/lightninglabs/taproot-assets => ../taproot-assets
 
-go 1.22.6
+go 1.23.6

go.sum

@@ -651,8 +651,8 @@ github.com/boombuler/barcode v1.0.1/go.mod h1:paBWMcWSl3LHKBqUq+rly7CNSldXjb2rDl
 github.com/btcsuite/btcd v0.20.1-beta/go.mod h1:wVuoA8VJLEcwgqHBwHmzLRazpKxTv13Px/pDuV7OomQ=
 github.com/btcsuite/btcd v0.22.0-beta.0.20220111032746-97732e52810c/go.mod h1:tjmYdS6MLJ5/s0Fj4DbLgSbDHbEqLJrtnHecBFkdz5M=
 github.com/btcsuite/btcd v0.23.5-0.20231215221805-96c9fd8078fd/go.mod h1:nm3Bko6zh6bWP60UxwoT5LzdGJsQJaPo6HjduXq9p6A=
-github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53 h1:XOZ/wRGHkKv0AqxfDks5IkzaQ1Ge6fq322ZOOG5VIkU=
-github.com/btcsuite/btcd v0.24.3-0.20240921052913-67b8efd3ba53/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
+github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b h1:VQoobSrWdxICuqFU3tKVu/Lzk7BTk9SsCgRr5dUvC70=
+github.com/btcsuite/btcd v0.24.3-0.20241210095828-e646d437e95b/go.mod h1:zHK7t7sw8XbsCkD64WePHE3r3k9/XoGAcf6mXV14c64=
 github.com/btcsuite/btcd/btcec/v2 v2.1.0/go.mod h1:2VzYrv4Gm4apmbVVsSq5bqf1Ec8v56E48Vt0Y/umPgA=
 github.com/btcsuite/btcd/btcec/v2 v2.1.3/go.mod h1:ctjw4H1kknNJmRN4iP1R7bTQ+v3GJkZBd6mui8ZsAZE=
 github.com/btcsuite/btcd/btcec/v2 v2.3.4 h1:3EJjcN70HCu/mwqlUsGK8GcNVyLVxFDlWurTXGPFfiQ=

itest/assets_test.go

@@ -2208,6 +2208,69 @@ func assertSpendableBalance(t *testing.T, client *tapClient, assetID []byte,
 	}
 }
 
+// assertSpendableBalanceGroup differs from assertAssetBalance in that it
+// asserts that the entire balance is spendable. We consider something spendable
+// if we have a local script key for it.
+func assertSpendableBalanceGroup(t *testing.T, client *tapClient,
+	gropupKey []byte, expectedBalance uint64) {
+
+	t.Helper()
+
+	ctxb := context.Background()
+	ctxt, cancel := context.WithTimeout(ctxb, shortTimeout)
+	defer cancel()
+
+	err := wait.NoError(func() error {
+		utxos, err := client.ListUtxos(ctxt, &taprpc.ListUtxosRequest{})
+		if err != nil {
+			return err
+		}
+
+		assets := tapfn.FlatMap(
+			maps.Values(utxos.ManagedUtxos),
+			func(utxo *taprpc.ManagedUtxo) []*taprpc.Asset {
+				return utxo.Assets
+			},
+		)
+
+		relevantAssets := fn.Filter(func(utxo *taprpc.Asset) bool {
+			return bytes.Equal(
+				utxo.AssetGroup.TweakedGroupKey, gropupKey,
+			)
+		}, assets)
+
+		var assetSum uint64
+		for _, asset := range relevantAssets {
+			if asset.ScriptKeyIsLocal {
+				assetSum += asset.Amount
+			}
+		}
+
+		if assetSum != expectedBalance {
+			return fmt.Errorf("expected balance %d, got %d",
+				expectedBalance, assetSum)
+		}
+
+		return nil
+	}, shortTimeout)
+	if err != nil {
+		r, err2 := client.ListAssets(ctxb, &taprpc.ListAssetRequest{})
+		require.NoError(t, err2)
+
+		t.Logf("Failed to assert expected balance of %d, current "+
+			"assets: %v", expectedBalance, toProtoJSON(t, r))
+
+		utxos, err3 := client.ListUtxos(
+			ctxb, &taprpc.ListUtxosRequest{},
+		)
+		require.NoError(t, err3)
+
+		t.Logf("Current UTXOs: %v", toProtoJSON(t, utxos))
+
+		t.Fatalf("Failed to assert balance: %v", err)
+	}
+}
+
 func assertNumAssetOutputs(t *testing.T, client *tapClient, assetID []byte,
 	numPieces int) {
 

itest/litd_custom_channels_test.go

@@ -1256,9 +1256,18 @@ func testCustomChannelsGroupedAssetTranches(ctx context.Context,
 
 	// ------------
 	// Test case 1: Send a few direct keysend payment from Charlie to Dave.
+	// We want to send at least 30k assets, so we use up one channel
+	// internal tranche of assets and should at least once have an HTLC
+	// that transports assets from two tranches.
 	// ------------
-	const keySendAmount = 100
-	for i := 0; i < 5; i++ {
+	const (
+		keySendAmount  = 5000
+		numSends       = 6
+		totalFirstSend = keySendAmount * numSends
+	)
+	for i := 0; i < numSends; i++ {
+		// TODO(guggero): Actually specify group key here instead of
+		// assetID1 once that is supported by the API.
 		sendAssetKeySendPayment(
 			t.t, charlie, dave, keySendAmount, assetID1,
 			fn.None[int64](),
@@ -1269,7 +1278,9 @@ func testCustomChannelsGroupedAssetTranches(ctx context.Context,
 	// ------------
 	// Test case 2: Send a few direct keysend payment from Erin to Fabia.
 	// ------------
-	for i := 0; i < 5; i++ {
+	for i := 0; i < numSends; i++ {
+		// TODO(guggero): Actually specify group key here instead of
+		// assetID1 once that is supported by the API.
 		sendAssetKeySendPayment(
 			t.t, erin, fabia, keySendAmount, assetID1,
 			fn.None[int64](),
@@ -1290,7 +1301,10 @@ func testCustomChannelsGroupedAssetTranches(ctx context.Context,
 		noOpCoOpCloseBalanceCheck,
 	)
 
-	// TODO: assertSpendableBalance(t.t, charlieTap, assetID1, 0)
+	assertSpendableBalanceGroup(
+		t.t, charlieTap, groupKey, fundingAmount-totalFirstSend+2,
+	)
+	assertSpendableBalanceGroup(t.t, daveTap, groupKey, totalFirstSend)
 
 	// ------------
 	// Test case 4: Force close the channel between Erin and Fabia.
@@ -1340,7 +1354,37 @@ func testCustomChannelsGroupedAssetTranches(ctx context.Context,
 
 	mineBlocks(t, net, 1, 1)
 
-	// TODO: assertSpendableBalance(t.t, charlieTap, assetID1, 0)
+	// Fabia should have her sweep output confirmed now and the assets
+	// should be back in her on-chain wallet and spendable.
+	assertSpendableBalanceGroup(t.t, fabiaTap, groupKey, totalFirstSend)
+
+	// Next, we'll mine three additional blocks to trigger the CSV delay
+	// for Erin.
+	mineBlocks(t, net, 3, 0)
+
+	// We expect that Erin's sweep transaction has been broadcast.
+	erinSweepTxid, err := waitForNTxsInMempool(
+		net.Miner.Client, 1, shortTimeout,
+	)
+	require.NoError(t.t, err)
+
+	t.Logf("Erin sweep txid: %v", erinSweepTxid)
+
+	// Now we'll mine a block to confirm Erin's sweep transaction.
+	mineBlocks(t, net, 1, 0)
+
+	// Charlie should now have an asset transfer for his sweep transaction.
+	erinSweepTransfer := locateAssetTransfers(
+		t.t, erinTap, *erinSweepTxid[0],
+	)
+
+	t.Logf("Erin sweep transfer: %v", toProtoJSON(
+		t.t, erinSweepTransfer,
+	))
+
+	assertSpendableBalanceGroup(
+		t.t, erinTap, groupKey, fundingAmount-totalFirstSend,
+	)
 }
 
 // testCustomChannelsForceClose tests a force close scenario after both parties