tapgarden+tapdb: MintingBatch.GenesisPacket to FundedMintAnchorPsbt type

Update the MintingBatch.GenesisPacket field to use the
FundedMintAnchorPsbt type to include pre-commitment output information.

Author: ffranr

tapdb/asset_minting.go

@@ -239,6 +239,11 @@ type PendingAssetStore interface {
 	// FetchAssetMetaForAsset fetches the asset meta for a given asset.
 	FetchAssetMetaForAsset(ctx context.Context,
 		assetID []byte) (sqlc.FetchAssetMetaForAssetRow, error)
+
+	// FetchMintAnchorUniCommitment fetches the mint anchor uni commitment
+	// for a given batch.
+	FetchMintAnchorUniCommitment(ctx context.Context,
+		batchID int32) (sqlc.MintAnchorUniCommitment, error)
 }
 
 var (
@@ -1164,11 +1169,59 @@ func marshalMintingBatch(ctx context.Context, q PendingAssetStore,
 		if err != nil {
 			return nil, err
 		}
-		batch.GenesisPacket = &tapsend.FundedPsbt{
-			Pkt: genesisPkt,
-			ChangeOutputIndex: extractSqlInt32[int32](
-				dbBatch.ChangeOutputIndex,
-			),
+
+		if !dbBatch.AssetsOutputIndex.Valid {
+			return nil, fmt.Errorf("missing asset anchor output " +
+				"index")
+		}
+		assetAnchorOutIdx := dbBatch.AssetsOutputIndex.Int32
+
+		// If the batch has universe commitments, we will retrieve
+		// the pre-commitment output index from the database.
+		var preCommitOut fn.Option[tapgarden.PreCommitmentOutput]
+		if dbBatch.UniverseCommitments {
+			res, err := q.FetchMintAnchorUniCommitment(
+				ctx, int32(dbBatch.BatchID),
+			)
+			if err != nil {
+				return nil, fmt.Errorf("unable to fetch mint "+
+					"anchor uni commitment: %w", err)
+			}
+
+			// Parse the internal key from the database.
+			internalKey, err := btcec.ParsePubKey(
+				res.TaprootInternalKey,
+			)
+			if err != nil {
+				return nil, fmt.Errorf("error parsing "+
+					"taproot internal key: %w", err)
+			}
+
+			// Parse the group public key from the database.
+			groupPubKey, err := btcec.ParsePubKey(res.GroupKey)
+			if err != nil {
+				return nil, fmt.Errorf("error parsing "+
+					"group public key: %w", err)
+			}
+
+			preCommitOut = fn.Some(
+				tapgarden.PreCommitmentOutput{
+					OutIdx:      uint32(res.TxOutputIndex),
+					InternalKey: *internalKey,
+					GroupPubKey: *groupPubKey,
+				},
+			)
+		}
+
+		batch.GenesisPacket = &tapgarden.FundedMintAnchorPsbt{
+			FundedPsbt: tapsend.FundedPsbt{
+				Pkt: genesisPkt,
+				ChangeOutputIndex: extractSqlInt32[int32](
+					dbBatch.ChangeOutputIndex,
+				),
+			},
+			AssetAnchorOutIdx:   uint32(assetAnchorOutIdx),
+			PreCommitmentOutput: preCommitOut,
 		}
 	}
 
@@ -1283,7 +1336,8 @@ func encodeOutpoint(outPoint wire.OutPoint) ([]byte, error) {
 // CommitBatchTx updates the genesis transaction of a batch based on the batch
 // key.
 func (a *AssetMintingStore) CommitBatchTx(ctx context.Context,
-	batchKey *btcec.PublicKey, genesisPacket *tapsend.FundedPsbt) error {
+	batchKey *btcec.PublicKey,
+	genesisPacket tapgarden.FundedMintAnchorPsbt) error {
 
 	genesisOutpoint := genesisPacket.Pkt.UnsignedTx.TxIn[0].PreviousOutPoint
 	rawBatchKey := batchKey.SerializeCompressed()
@@ -1417,7 +1471,8 @@ func fetchSeedlingGroups(ctx context.Context, q PendingAssetStore,
 // binds the genesis transaction (which will create the set of assets in the
 // batch) to the batch itself.
 func (a *AssetMintingStore) AddSproutsToBatch(ctx context.Context,
-	batchKey *btcec.PublicKey, genesisPacket *tapsend.FundedPsbt,
+	batchKey *btcec.PublicKey,
+	genesisPacket *tapgarden.FundedMintAnchorPsbt,
 	assetRoot *commitment.TapCommitment) error {
 
 	// Before we open the DB transaction below, we'll fetch the set of

tapdb/asset_minting_test.go

@@ -88,7 +88,9 @@ func assertBatchEqual(t *testing.T, a, b *tapgarden.MintingBatch) {
 	require.Equal(t, a.TapSibling(), b.TapSibling())
 	require.Equal(t, a.BatchKey, b.BatchKey)
 	require.Equal(t, a.Seedlings, b.Seedlings)
-	assertPsbtEqual(t, a.GenesisPacket, b.GenesisPacket)
+	assertPsbtEqual(
+		t, &a.GenesisPacket.FundedPsbt, &b.GenesisPacket.FundedPsbt,
+	)
 	require.Equal(t, a.RootAssetCommitment, b.RootAssetCommitment)
 }
 
@@ -842,7 +844,10 @@ func TestAddSproutsToBatch(t *testing.T) {
 	// state.
 	assertSeedlingBatchLen(t, mintingBatches, 1, 0)
 	assertBatchState(t, mintingBatches[0], tapgarden.BatchStateCommitted)
-	assertPsbtEqual(t, genesisPacket, mintingBatches[0].GenesisPacket)
+	assertPsbtEqual(
+		t, &genesisPacket.FundedPsbt,
+		&mintingBatches[0].GenesisPacket.FundedPsbt,
+	)
 	assertAssetsEqual(t, assetRoot, mintingBatches[0].RootAssetCommitment)
 
 	// We also expect that for each of the assets we created above, we're
@@ -930,7 +935,7 @@ func addRandAssets(t *testing.T, ctx context.Context,
 		batchKey:        batchKey,
 		groupKey:        &group.GroupKey.GroupPubKey,
 		groupGenAmt:     genAmt,
-		genesisPkt:      genesisPacket,
+		genesisPkt:      &genesisPacket.FundedPsbt,
 		assetRoot:       assetRoot,
 		merkleRoot:      merkleRoot[:],
 		scriptRoot:      scriptRoot[:],
@@ -981,7 +986,8 @@ func TestCommitBatchChainActions(t *testing.T) {
 		t, mintingBatches[0], tapgarden.BatchStateBroadcast,
 	)
 	assertPsbtEqual(
-		t, randAssetCtx.genesisPkt, mintingBatches[0].GenesisPacket,
+		t, randAssetCtx.genesisPkt,
+		&mintingBatches[0].GenesisPacket.FundedPsbt,
 	)
 	assertBatchSibling(t, mintingBatches[0], randAssetCtx.tapSiblingHash)
 
@@ -1486,7 +1492,10 @@ func TestGroupAnchors(t *testing.T) {
 	// state.
 	assertSeedlingBatchLen(t, mintingBatches, 1, 0)
 	assertBatchState(t, mintingBatches[0], tapgarden.BatchStateCommitted)
-	assertPsbtEqual(t, genesisPacket, mintingBatches[0].GenesisPacket)
+	assertPsbtEqual(
+		t, &genesisPacket.FundedPsbt,
+		&mintingBatches[0].GenesisPacket.FundedPsbt,
+	)
 	assertAssetsEqual(t, assetRoot, mintingBatches[0].RootAssetCommitment)
 
 	// Check that the number of group anchors and members matches the batch

tapgarden/batch.go

@@ -14,7 +14,6 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapscript"
-	"github.com/lightninglabs/taproot-assets/tapsend"
 	"github.com/lightningnetwork/lnd/keychain"
 )
 
@@ -51,7 +50,7 @@ type MintingBatch struct {
 	// GenesisPacket is the funded genesis packet that may or may not be
 	// fully signed. When broadcast, this will create all assets stored
 	// within this batch.
-	GenesisPacket *tapsend.FundedPsbt
+	GenesisPacket *FundedMintAnchorPsbt
 
 	// RootAssetCommitment is the root Taproot Asset commitment for all the
 	// assets contained in this batch.

tapgarden/caretaker.go

@@ -412,24 +412,6 @@ func (b *BatchCaretaker) assetCultivator() {
 	}
 }
 
-// extractAnchorOutputIndex extracts the anchor output index from a funded
-// genesis packet.
-func extractAnchorOutputIndex(genesisPkt *tapsend.FundedPsbt) (uint32, error) {
-	if len(genesisPkt.Pkt.UnsignedTx.TxOut) != 2 {
-		return 0, fmt.Errorf("funded genesis packet has unexpected "+
-			"number of outputs, expected 2 (txout_len=%d)",
-			len(genesisPkt.Pkt.UnsignedTx.TxOut))
-	}
-
-	anchorOutputIndex := uint32(0)
-
-	if genesisPkt.ChangeOutputIndex == 0 {
-		anchorOutputIndex = 1
-	}
-
-	return anchorOutputIndex, nil
-}
-
 // extractGenesisOutpoint extracts the genesis point (the first input from the
 // genesis transaction).
 func extractGenesisOutpoint(tx *wire.MsgTx) wire.OutPoint {
@@ -612,18 +594,12 @@ func (b *BatchCaretaker) stateStep(currentState BatchState) (BatchState, error)
 			return 0, fmt.Errorf("unable to deserialize genesis "+
 				"PSBT: %w", err)
 		}
-		changeOutputIndex := b.cfg.Batch.GenesisPacket.ChangeOutputIndex
-
-		// If the change output is first, then our commitment is second,
-		// and vice versa.
-		// TODO(jhb): return the anchor index instead of change? or both
-		// so this works for N outputs
-		b.anchorOutputIndex, err = extractAnchorOutputIndex(
-			b.cfg.Batch.GenesisPacket,
-		)
-		if err != nil {
-			return 0, err
-		}
+
+		// Unpack output indexes.
+		genesisPacket := b.cfg.Batch.GenesisPacket
+
+		changeOutputIndex := genesisPacket.ChangeOutputIndex
+		b.anchorOutputIndex = genesisPacket.AssetAnchorOutIdx
 
 		genesisPoint := extractGenesisOutpoint(genesisTxPkt.UnsignedTx)
 
@@ -671,10 +647,15 @@ func (b *BatchCaretaker) stateStep(currentState BatchState) (BatchState, error)
 		log.Infof("BatchCaretaker(%x): committing sprouts to disk",
 			b.batchKey[:])
 
-		fundedGenesisPsbt := tapsend.FundedPsbt{
-			Pkt:               genesisTxPkt,
-			ChangeOutputIndex: changeOutputIndex,
+		fundedGenesisPsbt := FundedMintAnchorPsbt{
+			FundedPsbt: tapsend.FundedPsbt{
+				Pkt:               genesisTxPkt,
+				ChangeOutputIndex: changeOutputIndex,
+			},
+			AssetAnchorOutIdx:   b.anchorOutputIndex,
+			PreCommitmentOutput: genesisPacket.PreCommitmentOutput,
 		}
+
 		// With all our commitments created, we'll commit them to disk,
 		// replacing the existing seedlings we had created for each of
 		// these assets.
@@ -801,8 +782,9 @@ func (b *BatchCaretaker) stateStep(currentState BatchState) (BatchState, error)
 
 		err = b.cfg.Log.CommitSignedGenesisTx(
 			ctx, b.cfg.Batch.BatchKey.PubKey,
-			b.cfg.Batch.GenesisPacket, b.anchorOutputIndex,
-			merkleRoot, tapCommitmentRoot[:], siblingBytes,
+			&b.cfg.Batch.GenesisPacket.FundedPsbt,
+			b.anchorOutputIndex, merkleRoot, tapCommitmentRoot[:],
+			siblingBytes,
 		)
 		if err != nil {
 			return 0, fmt.Errorf("unable to commit genesis "+

tapgarden/interface.go

@@ -234,7 +234,7 @@ type MintingStore interface {
 	// NOTE: The BatchState should transition to BatchStateCommitted upon a
 	// successful call.
 	AddSproutsToBatch(ctx context.Context, batchKey *btcec.PublicKey,
-		genesisPacket *tapsend.FundedPsbt,
+		genesisPacket *FundedMintAnchorPsbt,
 		assets *commitment.TapCommitment) error
 
 	// CommitSignedGenesisTx adds a fully signed genesis transaction to the
@@ -288,7 +288,7 @@ type MintingStore interface {
 	// CommitBatchTx adds a funded transaction to the batch, which also sets
 	// the genesis point for the batch.
 	CommitBatchTx(ctx context.Context, batchKey *btcec.PublicKey,
-		genesisTx *tapsend.FundedPsbt) error
+		genesisTx FundedMintAnchorPsbt) error
 }
 
 // ChainBridge is our bridge to the target chain. It's used to get confirmation

tapgarden/mock.go

@@ -66,9 +66,12 @@ func RandSeedlingMintingBatch(t testing.TB, numSeedlings int) *MintingBatch {
 		Seedlings:    RandSeedlings(t, numSeedlings),
 		HeightHint:   test.RandInt[uint32](),
 		CreationTime: time.Now(),
-		GenesisPacket: &tapsend.FundedPsbt{
-			Pkt:               &genesisTx,
-			ChangeOutputIndex: 1,
+		GenesisPacket: &FundedMintAnchorPsbt{
+			FundedPsbt: tapsend.FundedPsbt{
+				Pkt:               &genesisTx,
+				ChangeOutputIndex: 1,
+			},
+			AssetAnchorOutIdx: 0,
 		},
 	}
 }

tapgarden/planter.go

@@ -1323,12 +1323,13 @@ func filterFinalizedBatches(batches []*MintingBatch) ([]*MintingBatch,
 func fetchFinalizedBatch(ctx context.Context, batchStore MintingStore,
 	archiver proof.Archiver, batch *MintingBatch) (*MintingBatch, error) {
 
+	if batch.GenesisPacket == nil {
+		return nil, fmt.Errorf("batch is missing anchor tx packet")
+	}
+
 	// Collect genesis TX information from the batch to build the proof
 	// locators.
-	anchorOutputIndex, err := extractAnchorOutputIndex(batch.GenesisPacket)
-	if err != nil {
-		return nil, err
-	}
+	anchorOutputIndex := batch.GenesisPacket.AssetAnchorOutIdx
 
 	signedTx, err := psbt.Extract(batch.GenesisPacket.Pkt)
 	if err != nil {
@@ -1565,12 +1566,7 @@ func newVerboseBatch(currentBatch *MintingBatch,
 
 	// Before we can build the group key requests for each seedling, we must
 	// fetch the genesis point and anchor index for the batch.
-	anchorOutputIndex, err := extractAnchorOutputIndex(
-		currentBatch.GenesisPacket,
-	)
-	if err != nil {
-		return nil, err
-	}
+	anchorOutputIndex := currentBatch.GenesisPacket.AssetAnchorOutIdx
 
 	genesisPoint := extractGenesisOutpoint(
 		currentBatch.GenesisPacket.Pkt.UnsignedTx,
@@ -2019,10 +2015,7 @@ func (c *ChainPlanter) fundBatch(ctx context.Context, params FundParams,
 				"batch: %x %w", batchKey[:], err)
 		}
 
-		// TODO(ffranr): In a future commit, we will replace the
-		//  GenesisPacket field type so as to carry along the
-		//  pre-commitment output info.
-		batch.GenesisPacket = &mintAnchorTx.FundedPsbt
+		batch.GenesisPacket = &mintAnchorTx
 
 		return nil
 	}
@@ -2070,7 +2063,7 @@ func (c *ChainPlanter) fundBatch(ctx context.Context, params FundParams,
 	}
 
 	err = c.cfg.Log.CommitBatchTx(
-		ctx, workingBatch.BatchKey.PubKey, workingBatch.GenesisPacket,
+		ctx, workingBatch.BatchKey.PubKey, *workingBatch.GenesisPacket,
 	)
 	if err != nil {
 		return err
@@ -2151,12 +2144,7 @@ func (c *ChainPlanter) sealBatch(ctx context.Context, params SealParams,
 
 	// Before we can build the group key requests for each seedling, we must
 	// fetch the genesis point and anchor index for the batch.
-	anchorOutputIndex, err := extractAnchorOutputIndex(
-		workingBatch.GenesisPacket,
-	)
-	if err != nil {
-		return nil, err
-	}
+	anchorOutputIndex := workingBatch.GenesisPacket.AssetAnchorOutIdx
 
 	genesisPoint := extractGenesisOutpoint(
 		workingBatch.GenesisPacket.Pkt.UnsignedTx,

tapgarden/planter_test.go

@@ -1148,14 +1148,14 @@ func testBasicAssetCreation(t *mintingTestHarness) {
 	// Now that the planter is back up, a single caretaker should have been
 	// launched as well. The batch should already be funded.
 	batch := t.fetchSingleBatch(nil)
-	t.assertBatchGenesisTx(batch.GenesisPacket)
+	t.assertBatchGenesisTx(&batch.GenesisPacket.FundedPsbt)
 	t.assertNumCaretakersActive(1)
 
 	// We'll now force yet another restart to ensure correctness of the
 	// state machine. We expect the PSBT packet to still be funded.
 	t.refreshChainPlanter()
 	batch = t.fetchSingleBatch(nil)
-	t.assertBatchGenesisTx(batch.GenesisPacket)
+	t.assertBatchGenesisTx(&batch.GenesisPacket.FundedPsbt)
 
 	// Now that the batch has been ticked, and the caretaker started, there
 	// should no longer be a pending batch.
@@ -1251,7 +1251,7 @@ func testMintingTicker(t *mintingTestHarness) {
 	// that the batch is already funded.
 	t.assertBatchProgressing()
 	currentBatch := t.fetchLastBatch()
-	t.assertBatchGenesisTx(currentBatch.GenesisPacket)
+	t.assertBatchGenesisTx(&currentBatch.GenesisPacket.FundedPsbt)
 
 	// Now that the batch has been ticked, and the caretaker started, there
 	// should no longer be a pending batch.
@@ -1352,7 +1352,7 @@ func testMintingCancelFinalize(t *mintingTestHarness) {
 
 	t.assertBatchProgressing()
 	thirdBatch = t.fetchLastBatch()
-	t.assertBatchGenesisTx(thirdBatch.GenesisPacket)
+	t.assertBatchGenesisTx(&thirdBatch.GenesisPacket.FundedPsbt)
 
 	// Now that the batch has been ticked, and the caretaker started, there
 	// should no longer be a pending batch.
@@ -1761,7 +1761,7 @@ func testFundSealBeforeFinalize(t *mintingTestHarness) {
 	fundedEmptyBatch := fundedBatches[0]
 	require.Len(t, fundedEmptyBatch.Seedlings, 0)
 	require.NotNil(t, fundedEmptyBatch.GenesisPacket)
-	t.assertBatchGenesisTx(fundedEmptyBatch.GenesisPacket)
+	t.assertBatchGenesisTx(&fundedEmptyBatch.GenesisPacket.FundedPsbt)
 	require.Equal(t, defaultTapHash[:], fundedEmptyBatch.TapSibling())
 	require.True(t, fundedEmptyBatch.State() == tapgarden.BatchStatePending)