tapdb: rename table to supply_pre_commits and unique on outpoint

Rename table `mint_anchor_uni_commitments` to `supply_pre_commits` to
align with current "supply" terminology. Drop the NOT NULL constraint
on `batch_id` so the table can also store pre-commit outputs from
peer-issued assets, not just those minted locally.

Also, remove the unique index on (batch_id, tx_output_index) and add
unique index on outpoint.

Author: ffranr

tapdb/asset_minting_test.go

@@ -1838,7 +1838,8 @@ func TestTapscriptTreeManager(t *testing.T) {
 // storeSupplyPreCommit stores a mint anchor commitment in the DB.
 func storeSupplyPreCommit(t *testing.T, assetStore AssetMintingStore,
 	batchKey []byte, txOutputIndex int32,
-	taprootInternalKey keychain.KeyDescriptor, groupKey []byte) {
+	taprootInternalKey keychain.KeyDescriptor, groupKey []byte,
+	outpoint wire.OutPoint) {
 
 	ctx := context.Background()
 
@@ -1854,12 +1855,16 @@ func storeSupplyPreCommit(t *testing.T, assetStore AssetMintingStore,
 		})
 		require.NoError(t, err)
 
+		opBytes, err := encodeOutpoint(outpoint)
+		require.NoError(t, err)
+
 		_, err = q.UpsertMintAnchorUniCommitment(
 			ctx, sqlc.UpsertMintAnchorUniCommitmentParams{
 				BatchKey:             batchKey,
 				TxOutputIndex:        txOutputIndex,
 				TaprootInternalKeyID: internalKeyID,
 				GroupKey:             groupKey,
+				Outpoint:             opBytes,
 			},
 		)
 		require.NoError(t, err)
@@ -1948,16 +1953,27 @@ func TestUpsertSupplyPreCommit(t *testing.T) {
 		},
 	)
 
+	// Define pre-commit outpoint for the batch mint anchor tx.
+	txOutputIndex := int32(2)
+	txidStr := mintingBatch.GenesisPacket.FundedPsbt.Pkt.UnsignedTx.TxID()
+
+	txid, err := chainhash.NewHashFromStr(txidStr)
+	require.NoError(t, err)
+
+	preCommitOutpoint := wire.OutPoint{
+		Hash:  *txid,
+		Index: uint32(txOutputIndex),
+	}
+
 	// Serialize keys into bytes for easier handling.
 	preCommitInternalKey, _ := test.RandKeyDesc(t)
 
 	groupPubKeyBytes := group.GroupPubKey.SerializeCompressed()
 
 	// Upsert a mint anchor commitment for the batch.
-	txOutputIndex := int32(2)
 	storeSupplyPreCommit(
-		t, *assetStore, batchKey, txOutputIndex,
-		preCommitInternalKey, groupPubKeyBytes,
+		t, *assetStore, batchKey, txOutputIndex, preCommitInternalKey,
+		groupPubKeyBytes, preCommitOutpoint,
 	)
 
 	// Retrieve and inspect the mint anchor commitment we just inserted.
@@ -1966,28 +1982,28 @@ func TestUpsertSupplyPreCommit(t *testing.T) {
 		preCommitInternalKey, groupPubKeyBytes,
 	)
 
-	// Upsert-ing a new taproot internal key for the same batch should
-	// overwrite the existing one.
+	// Upsert-ing a new taproot internal key for the same pre-commit
+	// outpoint should overwrite the existing one.
 	internalKey2, _ := test.RandKeyDesc(t)
 
 	storeSupplyPreCommit(
 		t, *assetStore, batchKey, txOutputIndex, internalKey2,
-		groupPubKeyBytes,
+		groupPubKeyBytes, preCommitOutpoint,
 	)
 
 	assertSupplyPreCommit(
 		t, *assetStore, batchKey, txOutputIndex, internalKey2,
 		groupPubKeyBytes,
 	)
 
-	// Upsert-ing a new group key for the same batch should overwrite the
-	// existing one.
+	// Upsert-ing a new group key for the same pre-commit outpoint should
+	// overwrite the existing one.
 	groupPubKey2 := test.RandPubKey(t)
 	groupPubKey2Bytes := groupPubKey2.SerializeCompressed()
 
 	storeSupplyPreCommit(
 		t, *assetStore, batchKey, txOutputIndex, internalKey2,
-		groupPubKey2Bytes,
+		groupPubKey2Bytes, preCommitOutpoint,
 	)
 
 	assertSupplyPreCommit(

tapdb/migrations.go

@@ -24,7 +24,7 @@ const (
 	// daemon.
 	//
 	// NOTE: This MUST be updated when a new migration is added.
-	LatestMigrationVersion = 45
+	LatestMigrationVersion = 46
 )
 
 // DatabaseBackend is an interface that contains all methods our different

tapdb/sqlc/assets.sql.go

@@ -0,0 +1,50 @@
+-- Revert batch_id back to NOT NULL in supply_pre_commits table and
+-- rename back to mint_anchor_uni_commitments. Since SQLite doesn't support
+-- ALTER COLUMN, we need to recreate the table.
+
+-- Create a new table with the original structure (batch_id NOT NULL).
+CREATE TABLE mint_anchor_uni_commitments (
+    id INTEGER PRIMARY KEY,
+
+    -- The ID of the minting batch this universe commitment relates to.
+    batch_id INTEGER NOT NULL REFERENCES asset_minting_batches(batch_id),
+
+    -- The index of the mint batch anchor transaction pre-commitment output.
+    tx_output_index INTEGER NOT NULL,
+
+    -- The Taproot output internal key for the pre-commitment output.
+    group_key BLOB,
+
+    -- The taproot internal key ID reference.
+    taproot_internal_key_id BIGINT REFERENCES internal_keys(key_id) NOT NULL,
+
+    -- Reference to supply commitments.
+    spent_by BIGINT REFERENCES supply_commitments(commit_id),
+
+    -- The outpoint for this commitment.
+    outpoint BLOB
+);
+
+-- Copy all existing data from the old table to the new table.
+-- This will fail if there are any NULL batch_id values, which is expected
+-- behavior for a down migration that removes nullable support.
+INSERT INTO mint_anchor_uni_commitments (
+    id, batch_id, tx_output_index, group_key, taproot_internal_key_id, spent_by,
+    outpoint
+)
+SELECT
+    id, batch_id, tx_output_index, group_key, taproot_internal_key_id, spent_by,
+    outpoint
+FROM supply_pre_commits
+WHERE batch_id IS NOT NULL;
+
+-- DROP old indexes before dropping the table.
+DROP INDEX IF EXISTS supply_pre_commits_unique_outpoint;
+
+-- Drop the old table.
+DROP TABLE supply_pre_commits;
+
+-- Recreate the indexes.
+CREATE INDEX mint_anchor_uni_commitments_outpoint_idx
+    ON mint_anchor_uni_commitments(outpoint)
+    WHERE outpoint IS NOT NULL;

tapdb/sqlc/migrations/000046_mint_anchor_uni_commitments_nullable_batch_id.down.sql

@@ -0,0 +1,47 @@
+-- Make batch_id nullable in mint_anchor_uni_commitments table and rename to
+-- supply_pre_commits. Since SQLite doesn't support ALTER COLUMN, we need
+-- to recreate the table.
+
+-- Create a new table with the desired structure (batch_id nullable).
+CREATE TABLE supply_pre_commits (
+    id INTEGER PRIMARY KEY,
+
+    -- The ID of the minting batch this universe commitment relates to.
+    -- Now nullable to allow universe commitments without a specific batch.
+    batch_id INTEGER REFERENCES asset_minting_batches(batch_id),
+
+    -- The index of the mint batch anchor transaction pre-commitment output.
+    tx_output_index INTEGER NOT NULL,
+
+    -- The Taproot output internal key for the pre-commitment output.
+    group_key BLOB,
+
+    -- The taproot internal key ID reference.
+    taproot_internal_key_id BIGINT REFERENCES internal_keys(key_id) NOT NULL,
+
+    -- Reference to supply commitments.
+    spent_by BIGINT REFERENCES supply_commitments(commit_id),
+
+    -- The outpoint for this commitment.
+    outpoint BLOB NOT NULL CHECK(length(outpoint) > 0)
+);
+
+-- Copy all existing data from the old table to the new table.
+INSERT INTO supply_pre_commits (
+    id, batch_id, tx_output_index, group_key, taproot_internal_key_id, spent_by,
+    outpoint
+)
+SELECT
+    id, batch_id, tx_output_index, group_key, taproot_internal_key_id, spent_by,
+    outpoint
+FROM mint_anchor_uni_commitments;
+
+-- Drop the old index before dropping the table.
+DROP INDEX IF EXISTS mint_anchor_uni_commitments_outpoint_idx;
+
+-- Drop the old table.
+DROP TABLE mint_anchor_uni_commitments;
+
+-- Create a unique index on outpoint.
+CREATE UNIQUE INDEX supply_pre_commits_unique_outpoint
+    ON supply_pre_commits(outpoint);

tapdb/sqlc/migrations/000046_mint_anchor_uni_commitments_nullable_batch_id.up.sql

@@ -1063,7 +1063,7 @@ JOIN genesis_assets
 ORDER BY assets_meta.meta_id;
 
 -- name: UpsertMintAnchorUniCommitment :one
--- Upsert a record into the mint_anchor_uni_commitments table.
+-- Upsert a record into the supply_pre_commits table.
 -- If a record with the same batch ID and tx output index already exists, update
 -- the existing record. Otherwise, insert a new record.
 WITH target_batch AS (
@@ -1073,7 +1073,7 @@ WITH target_batch AS (
     FROM internal_keys keys
     WHERE keys.raw_key = @batch_key
 )
-INSERT INTO mint_anchor_uni_commitments (
+INSERT INTO supply_pre_commits (
     batch_id, tx_output_index, taproot_internal_key_id, group_key, spent_by, outpoint
 )
 VALUES (
@@ -1088,26 +1088,26 @@ ON CONFLICT(batch_id, tx_output_index) DO UPDATE SET
 RETURNING id;
 
 -- name: FetchMintAnchorUniCommitment :many
--- Fetch records from the mint_anchor_uni_commitments table with optional
+-- Fetch records from the supply_pre_commits table with optional
 -- filtering.
 SELECT
-    mint_anchor_uni_commitments.id,
-    mint_anchor_uni_commitments.batch_id,
-    mint_anchor_uni_commitments.tx_output_index,
-    mint_anchor_uni_commitments.group_key,
-    mint_anchor_uni_commitments.spent_by,
+    precommits.id,
+    precommits.batch_id,
+    precommits.tx_output_index,
+    precommits.group_key,
+    precommits.spent_by,
     batch_internal_keys.raw_key AS batch_key,
-    mint_anchor_uni_commitments.taproot_internal_key_id,
+    precommits.taproot_internal_key_id,
     sqlc.embed(taproot_internal_keys)
-FROM mint_anchor_uni_commitments
+FROM supply_pre_commits AS precommits
     JOIN internal_keys taproot_internal_keys
-        ON mint_anchor_uni_commitments.taproot_internal_key_id = taproot_internal_keys.key_id
+        ON precommits.taproot_internal_key_id = taproot_internal_keys.key_id
     LEFT JOIN asset_minting_batches batches
-        ON mint_anchor_uni_commitments.batch_id = batches.batch_id
+        ON precommits.batch_id = batches.batch_id
     LEFT JOIN internal_keys batch_internal_keys
         ON batches.batch_id = batch_internal_keys.key_id
 WHERE (
     (batch_internal_keys.raw_key = sqlc.narg('batch_key') OR sqlc.narg('batch_key') IS NULL) AND
-    (mint_anchor_uni_commitments.group_key = sqlc.narg('group_key') OR sqlc.narg('group_key') IS NULL) AND
+    (precommits.group_key = sqlc.narg('group_key') OR sqlc.narg('group_key') IS NULL) AND
     (taproot_internal_keys.raw_key = sqlc.narg('taproot_internal_key_raw') OR sqlc.narg('taproot_internal_key_raw') IS NULL)
 );

tapdb/sqlc/models.go

@@ -212,7 +212,7 @@ SELECT
     mac.group_key,
     mint_txn.block_height,
     mint_txn.raw_tx
-FROM mint_anchor_uni_commitments mac
+FROM supply_pre_commits mac
 JOIN asset_minting_batches amb ON mac.batch_id = amb.batch_id
 JOIN genesis_points gp ON amb.genesis_id = gp.genesis_id
 JOIN chain_txns mint_txn ON gp.anchor_tx_id = mint_txn.txn_id
@@ -225,7 +225,7 @@ WHERE
 
 -- name: MarkPreCommitmentSpentByOutpoint :exec
 -- Mark a specific pre-commitment output as spent by its outpoint.
-UPDATE mint_anchor_uni_commitments
+UPDATE supply_pre_commits
 SET spent_by = @spent_by_commit_id
 WHERE outpoint = @outpoint
     AND spent_by IS NULL;