supplycommit+tapdb: populate block metadata in RootCommitment struct

Updated the RootCommitment struct to include metadata from the mined
Bitcoin block.

Author: ffranr

tapdb/supply_commit.go

@@ -10,8 +10,10 @@ import (
 	"time"
 
 	"github.com/btcsuite/btcd/btcec/v2"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/taproot-assets/asset"
+	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/mssmt"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapdb/sqlc"
@@ -330,6 +332,41 @@ func (s *SupplyCommitMachine) SupplyCommit(ctx context.Context,
 				err)
 		}
 
+		// Parse block related data from row if present.
+		var commitmentBlock fn.Option[supplycommit.CommitmentBlock]
+		if len(row.BlockHash) > 0 {
+			// Parse block height if present, otherwise return an
+			// error as it must be set if block hash is set.
+			if !row.BlockHeight.Valid {
+				return fmt.Errorf("block height must be set " +
+					"if block hash is set")
+			}
+
+			blockHeight := uint32(row.BlockHeight.Int32)
+
+			// Parse the block hash, which should be valid at this
+			// point.
+			blockHash, err := chainhash.NewHash(row.BlockHash)
+			if err != nil {
+				return fmt.Errorf("parsing block hash: %w", err)
+			}
+
+			// Parse transaction block index which should be set
+			// if the block height is set.
+			if !row.TxIndex.Valid {
+				return fmt.Errorf("transaction index must be " +
+					"set if block height is set")
+			}
+			txIndex := uint32(row.TxIndex.Int32)
+
+			commitmentBlock = fn.Some(supplycommit.CommitmentBlock{
+				Hash:      *blockHash,
+				Height:    blockHeight,
+				TxIndex:   txIndex,
+				ChainFees: row.ChainFees,
+			})
+		}
+
 		// Construct the root node directly from the stored hash and
 		// sum. Handle potential NULL values if the root wasn't set yet
 		// (though FetchSupplyCommit filters for confirmed TX, so it
@@ -355,11 +392,12 @@ func (s *SupplyCommitMachine) SupplyCommit(ctx context.Context,
 		}
 
 		rootCommitment := supplycommit.RootCommitment{
-			Txn:         &commitTx,
-			TxOutIdx:    uint32(row.OutputIndex.Int32),
-			InternalKey: internalKey,
-			OutputKey:   outputKey,
-			SupplyRoot:  rootNode,
+			Txn:             &commitTx,
+			TxOutIdx:        uint32(row.OutputIndex.Int32),
+			InternalKey:     internalKey,
+			OutputKey:       outputKey,
+			SupplyRoot:      rootNode,
+			CommitmentBlock: commitmentBlock,
 		}
 		rootCommitmentOpt = lfn.Some(rootCommitment)
 

universe/supplycommit/env.go

@@ -9,9 +9,11 @@ import (
 	"github.com/btcsuite/btcd/btcutil"
 	"github.com/btcsuite/btcd/btcutil/psbt"
 	"github.com/btcsuite/btcd/chaincfg"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/taproot-assets/asset"
+	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/mssmt"
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
@@ -143,6 +145,26 @@ func (p *PreCommitment) TxIn() *wire.TxIn {
 // PreCommits is a slice of pre-commitments.
 type PreCommits = []PreCommitment
 
+// CommitmentBlock captures the finalized on-chain state of a supply commitment
+// transaction after it has been mined. It records block-level metadata and the
+// actual fee paid to anchor the commitment.
+type CommitmentBlock struct {
+	// Height is the block height of the block that contains the
+	// commitment.
+	Height uint32
+
+	// Hash is the hash of the block that contains the commitment.
+	Hash chainhash.Hash
+
+	// TxIndex is the index of the supply commitment transaction within
+	// the block.
+	TxIndex uint32
+
+	// ChainFees is the amount in sats paid in on-chain fees for the
+	// supply commitment transaction.
+	ChainFees int64
+}
+
 // RootCommitment is the root commitment that contains the commitment to the the
 // sub-supply trees for a given asset.
 type RootCommitment struct {
@@ -164,6 +186,11 @@ type RootCommitment struct {
 	// sub-commitments. The sum value of this tree is the outstanding supply
 	// value.
 	SupplyRoot *mssmt.BranchNode
+
+	// CommitmentBlock is the block that contains the commitment to the
+	// asset supply. This may be None if the commitment has not yet
+	// been mined.
+	CommitmentBlock fn.Option[CommitmentBlock]
 }
 
 // TxIn returns the transaction input that corresponds to the root commitment.