tapdb: modify BindMintingBatchWithTx to return batch ID

Update the SQL query in BindMintingBatchWithTx to return the batch ID.
This ID will be used for populating the universe commitment anchor rows
in the database.

Author: ffranr

tapdb/asset_minting.go

@@ -199,7 +199,8 @@ type PendingAssetStore interface {
 
 	// BindMintingBatchWithTx adds the minting transaction to an existing
 	// batch.
-	BindMintingBatchWithTx(ctx context.Context, arg BatchChainUpdate) error
+	BindMintingBatchWithTx(ctx context.Context,
+		arg BatchChainUpdate) (int64, error)
 
 	// UpdateBatchGenesisTx updates the batch tx attached to an existing
 	// batch.
@@ -382,7 +383,7 @@ func (a *AssetMintingStore) CommitMintingBatch(ctx context.Context,
 					ErrUpsertGenesisPoint, err)
 			}
 
-			err = q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
+			_, err = q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
 				RawKey:            rawBatchKey,
 				MintingTxPsbt:     psbtBuf.Bytes(),
 				ChangeOutputIndex: sqlInt32(changeIdx),
@@ -1301,14 +1302,15 @@ func (a *AssetMintingStore) CommitBatchTx(ctx context.Context,
 			return fmt.Errorf("%w: %w", ErrUpsertGenesisPoint, err)
 		}
 
-		return q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
+		_, err = q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
 			RawKey:        rawBatchKey,
 			MintingTxPsbt: psbtBuf.Bytes(),
 			ChangeOutputIndex: sqlInt32(
 				genesisPacket.ChangeOutputIndex,
 			),
 			GenesisID: sqlInt64(genesisPointID),
 		})
+		return err
 	})
 }
 
@@ -1459,7 +1461,7 @@ func (a *AssetMintingStore) AddSproutsToBatch(ctx context.Context,
 		if err := genesisPacket.Pkt.Serialize(&psbtBuf); err != nil {
 			return fmt.Errorf("%w: %w", ErrEncodePsbt, err)
 		}
-		err = q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
+		_, err = q.BindMintingBatchWithTx(ctx, BatchChainUpdate{
 			RawKey:        rawBatchKey,
 			MintingTxPsbt: psbtBuf.Bytes(),
 			ChangeOutputIndex: sqlInt32(

tapdb/sqlc/assets.sql.go

@@ -530,17 +530,18 @@ JOIN internal_keys keys
     ON keys.key_id = batches.batch_id
 WHERE keys.raw_key = $1;
 
--- name: BindMintingBatchWithTx :exec
+-- name: BindMintingBatchWithTx :one
 WITH target_batch AS (
     SELECT batch_id
     FROM asset_minting_batches batches
     JOIN internal_keys keys
         ON batches.batch_id = keys.key_id
     WHERE keys.raw_key = $1
 )
-UPDATE asset_minting_batches 
+UPDATE asset_minting_batches
 SET minting_tx_psbt = $2, change_output_index = $3, genesis_id = $4
-WHERE batch_id IN (SELECT batch_id FROM target_batch);
+WHERE batch_id IN (SELECT batch_id FROM target_batch)
+RETURNING batch_id;
 
 -- name: BindMintingBatchWithTapSibling :exec
 WITH target_batch AS (