tapdb: extend UnspentPrecommits to include remote issuers

Update method SupplyCommitMachine.UnspentPrecommits to return
pre-commitment outputs generated by remote issuer nodes, in addition to
those from the local node.

Author: ffranr

tapdb/supply_commit.go

@@ -10,6 +10,7 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcec/v2"
+	"github.com/btcsuite/btcd/btcec/v2/schnorr"
 	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/taproot-assets/asset"
@@ -20,14 +21,21 @@ import (
 	"github.com/lightninglabs/taproot-assets/universe/supplycommit"
 	"github.com/lightninglabs/taproot-assets/universe/supplyverifier"
 	lfn "github.com/lightningnetwork/lnd/fn/v2"
+	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnutils"
 )
 
 type (
 	// UnspentMintPreCommits is an alias for the sqlc type representing an
-	// unspent supply pre-commitment row.
+	// unspent supply pre-commitment row where the local node was the
+	// issuer.
 	UnspentMintPreCommits = sqlc.FetchUnspentMintSupplyPreCommitsRow
 
+	// UnspentPreCommits is an alias for the sqlc type representing an
+	// unspent supply pre-commitment row where a remote node was the
+	// issuer.
+	UnspentPreCommits = sqlc.FetchUnspentSupplyPreCommitsRow
+
 	// SupplyCommit is an alias for the sqlc type.
 	SupplyCommit = sqlc.FetchSupplyCommitRow
 
@@ -109,6 +117,12 @@ type SupplyCommitStore interface {
 	FetchUnspentMintSupplyPreCommits(ctx context.Context,
 		groupKey []byte) ([]UnspentMintPreCommits, error)
 
+	// FetchUnspentSupplyPreCommits fetches all unspent supply
+	// pre-commitments for the specified asset group key where a remote
+	// node was the issuer.
+	FetchUnspentSupplyPreCommits(ctx context.Context,
+		groupKey []byte) ([]UnspentPreCommits, error)
+
 	// FetchSupplyCommit fetches the latest confirmed supply commitment for
 	// a given group key.
 	FetchSupplyCommit(ctx context.Context,
@@ -267,7 +281,8 @@ func NewSupplyCommitMachine(db BatchedSupplyCommitStore) *SupplyCommitMachine {
 // asset spec. The asset spec will only specify a group key, and not also an
 // asset ID.
 func (s *SupplyCommitMachine) UnspentPrecommits(ctx context.Context,
-	assetSpec asset.Specifier) lfn.Result[supplycommit.PreCommits] {
+	assetSpec asset.Specifier,
+	localIssuerOnly bool) lfn.Result[supplycommit.PreCommits] {
 
 	groupKey := assetSpec.UnwrapGroupKeyToPtr()
 	if groupKey == nil {
@@ -278,23 +293,25 @@ func (s *SupplyCommitMachine) UnspentPrecommits(ctx context.Context,
 	var preCommits supplycommit.PreCommits
 	readTx := ReadTxOption()
 	dbErr := s.db.ExecTx(ctx, readTx, func(db SupplyCommitStore) error {
-		rows, err := db.FetchUnspentMintSupplyPreCommits(
+		mintRows, err := db.FetchUnspentMintSupplyPreCommits(
 			ctx, groupKeyBytes,
 		)
-		if err != nil {
-			// It's okay if there are no unspent pre-commits.
-			if errors.Is(err, sql.ErrNoRows) {
-				return nil
-			}
-			return fmt.Errorf("error fetching unspent "+
-				"precommits: %w", err)
+		switch {
+		case errors.Is(err, sql.ErrNoRows):
+			// No unspent pre-commits minted by this local node
+			// exist for this group key. Proceed to query for
+			// pre-commits from other issuers.
+
+		case err != nil:
+			return fmt.Errorf("failed to fetch unspent local node "+
+				"issued pre-commit outputs: %w", err)
 		}
 
 		// For each pre-commitment, parse the internal key and group
 		// key, and assemble the final struct as needed by the
 		// interface.
-		preCommits = make(supplycommit.PreCommits, 0, len(rows))
-		for _, row := range rows {
+		preCommits = make(supplycommit.PreCommits, 0, len(mintRows))
+		for _, row := range mintRows {
 			internalKey, err := parseInternalKey(row.InternalKey)
 			if err != nil {
 				return fmt.Errorf("failed to parse "+
@@ -326,6 +343,76 @@ func (s *SupplyCommitMachine) UnspentPrecommits(ctx context.Context,
 			preCommits = append(preCommits, preCommit)
 		}
 
+		// If any pre-commits were found where we acted as the issuer,
+		// return early and skip querying for pre-commits from other
+		// issuers. Also return early if the caller explicitly requested
+		// only pre-commits issued by the local node.
+		if len(preCommits) > 0 || localIssuerOnly {
+			return nil
+		}
+
+		// No pre-commits found where we were the issuer. So now
+		// we'll query for pre-commits from other issuers.
+		rows, err := db.FetchUnspentSupplyPreCommits(
+			ctx, schnorr.SerializePubKey(groupKey),
+		)
+		switch {
+		case errors.Is(err, sql.ErrNoRows):
+			// No unspent pre-commits minted by peer issuer nodes
+			// exist for this group key. Return early.
+			return nil
+
+		case err != nil:
+			return fmt.Errorf("failed to fetch unspent remote "+
+				"node issued pre-commit outputs: %w", err)
+		}
+
+		// Parse rows into pre-commitment structs.
+		for _, row := range rows {
+			pubKey, err := btcec.ParsePubKey(row.TaprootInternalKey)
+			if err != nil {
+				return fmt.Errorf("failed to parse internal "+
+					"raw key: %w", err)
+			}
+
+			internalKey := keychain.KeyDescriptor{
+				PubKey: pubKey,
+			}
+
+			groupPubKey, err := schnorr.ParsePubKey(row.GroupKey)
+			if err != nil {
+				return fmt.Errorf("error parsing group key: %w",
+					err)
+			}
+
+			var mintingTx wire.MsgTx
+			err = mintingTx.Deserialize(bytes.NewReader(row.RawTx))
+			if err != nil {
+				return fmt.Errorf("error deserializing "+
+					"minting tx: %w", err)
+			}
+
+			var outpoint wire.OutPoint
+			err = readOutPoint(
+				bytes.NewReader(row.Outpoint), 0, 0, &outpoint,
+			)
+			if err != nil {
+				return fmt.Errorf("%w: %w", ErrReadOutpoint,
+					err)
+			}
+
+			preCommit := supplycommit.PreCommitment{
+				BlockHeight: uint32(
+					row.BlockHeight.Int32,
+				),
+				MintingTxn:  &mintingTx,
+				OutIdx:      outpoint.Index,
+				InternalKey: internalKey,
+				GroupPubKey: *groupPubKey,
+			}
+			preCommits = append(preCommits, preCommit)
+		}
+
 		return nil
 	})
 	if dbErr != nil {

tapdb/supply_commit_test.go

@@ -1705,7 +1705,9 @@ func TestSupplyCommitApplyStateTransition(t *testing.T) {
 
 	// Verify we have all three unspent pre-commitments before the
 	// transition.
-	precommitsRes := h.commitMachine.UnspentPrecommits(h.ctx, h.assetSpec)
+	precommitsRes := h.commitMachine.UnspentPrecommits(
+		h.ctx, h.assetSpec, true,
+	)
 	precommits, err := precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(
@@ -1730,7 +1732,9 @@ func TestSupplyCommitApplyStateTransition(t *testing.T) {
 	// After the first transition, only the two pre-commitments that were
 	// included in the transaction inputs should be marked as spent.
 	// The extra pre-commitment should remain unspent.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, h.assetSpec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(
+		h.ctx, h.assetSpec, true,
+	)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(
@@ -1760,7 +1764,9 @@ func TestSupplyCommitApplyStateTransition(t *testing.T) {
 	)
 
 	// Verify we have the extra one from before plus the new one.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, h.assetSpec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(
+		h.ctx, h.assetSpec, true,
+	)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(
@@ -1783,7 +1789,9 @@ func TestSupplyCommitApplyStateTransition(t *testing.T) {
 
 	// After the second transition, the new pre-commitment should also be
 	// spent. Finally, verify that no unspent pre-commitments remain.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, h.assetSpec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(
+		h.ctx, h.assetSpec, true,
+	)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Empty(
@@ -1805,7 +1813,7 @@ func TestSupplyCommitUnspentPrecommits(t *testing.T) {
 	)
 
 	// To start with, we shouldn't have any precommits.
-	precommitsRes := h.commitMachine.UnspentPrecommits(h.ctx, spec)
+	precommitsRes := h.commitMachine.UnspentPrecommits(h.ctx, spec, true)
 	precommits, err := precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Empty(t, precommits)
@@ -1819,7 +1827,7 @@ func TestSupplyCommitUnspentPrecommits(t *testing.T) {
 	)
 
 	// At this point, we should find a single pre commitment on disk.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec, true)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(t, precommits, 1)
@@ -1839,7 +1847,7 @@ func TestSupplyCommitUnspentPrecommits(t *testing.T) {
 	)
 
 	// We should now find two pre-commitments.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec, true)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(t, precommits, 2)
@@ -1861,7 +1869,7 @@ func TestSupplyCommitUnspentPrecommits(t *testing.T) {
 
 	// As the transaction was confirmed above, we should now only have a
 	// single pre commitment on disk.
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, spec, true)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Len(t, precommits, 1)
@@ -1872,14 +1880,18 @@ func TestSupplyCommitUnspentPrecommits(t *testing.T) {
 	otherSpec := asset.NewSpecifierOptionalGroupPubKey(
 		asset.RandID(t), otherGroupKey,
 	)
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, otherSpec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(
+		h.ctx, otherSpec, true,
+	)
 	precommits, err = precommitsRes.Unpack()
 	require.NoError(t, err)
 	require.Empty(t, precommits)
 
 	// Finally, trying with a missing group key should yield an error.
 	emptySpec := asset.NewSpecifierOptionalGroupKey(asset.RandID(t), nil)
-	precommitsRes = h.commitMachine.UnspentPrecommits(h.ctx, emptySpec)
+	precommitsRes = h.commitMachine.UnspentPrecommits(
+		h.ctx, emptySpec, true,
+	)
 	require.ErrorIs(t, precommitsRes.Err(), ErrMissingGroupKey)
 }
 

universe/supplycommit/env.go

@@ -645,8 +645,8 @@ type CommitmentTracker interface {
 	// UnspentPrecommits returns the set of unspent pre-commitments for a
 	// given asset spec. The asset spec will only specify a group key, and
 	// not also an asset ID.
-	UnspentPrecommits(ctx context.Context,
-		assetSpec asset.Specifier) lfn.Result[PreCommits]
+	UnspentPrecommits(ctx context.Context, assetSpec asset.Specifier,
+		localIssuerOnly bool) lfn.Result[PreCommits]
 
 	// SupplyCommit returns the root commitment for a given asset spec. From
 	// the PoV of the chain, this is a singleton instance.

universe/supplycommit/mock.go

@@ -66,9 +66,10 @@ type mockCommitmentTracker struct {
 }
 
 func (m *mockCommitmentTracker) UnspentPrecommits(ctx context.Context,
-	assetSpec asset.Specifier) lfn.Result[PreCommits] {
+	assetSpec asset.Specifier,
+	localIssuerOnly bool) lfn.Result[PreCommits] {
 
-	args := m.Called(ctx, assetSpec)
+	args := m.Called(ctx, assetSpec, localIssuerOnly)
 	return args.Get(0).(lfn.Result[PreCommits])
 }
 

universe/supplycommit/state_machine_test.go

@@ -397,6 +397,7 @@ func (h *supplyCommitTestHarness) expectTreeFetches() {
 func (h *supplyCommitTestHarness) expectCommitmentFetches() {
 	h.mockCommits.On(
 		"UnspentPrecommits", mock.Anything, mock.Anything,
+		mock.Anything,
 	).Return(
 		lfn.Ok[PreCommits](nil),
 	).Once()

universe/supplycommit/transitions.go

@@ -719,7 +719,7 @@ func (c *CommitTxCreateState) ProcessEvent(event Event,
 		// commitments, the current supply root (which may not exist),
 		// and the new supply root.
 		preCommits, err := env.Commitments.UnspentPrecommits(
-			ctx, env.AssetSpec,
+			ctx, env.AssetSpec, true,
 		).Unpack()
 		if err != nil {
 			return nil, fmt.Errorf("unable to fetch "+

universe/supplyverifier/env.go

@@ -30,7 +30,8 @@ type SupplyCommitView interface {
 	// UnspentPrecommits returns the set of unspent pre-commitments for a
 	// given asset spec.
 	UnspentPrecommits(ctx context.Context,
-		assetSpec asset.Specifier) lfn.Result[supplycommit.PreCommits]
+		assetSpec asset.Specifier,
+		localIssuerOnly bool) lfn.Result[supplycommit.PreCommits]
 
 	// SupplyCommit returns the latest supply commitment for a given asset
 	// spec.

universe/supplyverifier/verifier.go

@@ -97,7 +97,7 @@ func (v *Verifier) ensurePrecommitsSpent(ctx context.Context,
 
 	// Fetch all unspent pre-commitment outputs for the asset group.
 	allPreCommits, err := v.cfg.SupplyCommitView.UnspentPrecommits(
-		ctx, assetSpec,
+		ctx, assetSpec, false,
 	).Unpack()
 	if err != nil {
 		return fmt.Errorf("unable to fetch unspent pre-commitments: %w",