multi: rename ExtractPreCommitFromProof to NewPreCommitFromProof

Renamed supplyverifier.ExtractPreCommitFromProof to
NewPreCommitFromProof for clearer semantics and consistency
with naming conventions.

Author: ffranr

tapdb/universe.go

@@ -16,7 +16,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapdb/sqlc"
 	"github.com/lightninglabs/taproot-assets/universe"
-	"github.com/lightninglabs/taproot-assets/universe/supplyverifier"
+	"github.com/lightninglabs/taproot-assets/universe/supplycommit"
 	lfn "github.com/lightningnetwork/lnd/fn/v2"
 	"github.com/lightningnetwork/lnd/keychain"
 )
@@ -628,7 +628,7 @@ func maybeUpsertSupplyPreCommit(ctx context.Context, dbTx UpsertAssetStore,
 		return err
 	}
 
-	preCommitOutput, err := supplyverifier.ExtractPreCommitOutput(
+	preCommitOutput, err := supplycommit.NewPreCommitFromProof(
 		issuanceProof, delegationKey,
 	)
 	if err != nil {

universe/supplycommit/env.go

@@ -365,6 +365,57 @@ type PreCommitment struct {
 	GroupPubKey btcec.PublicKey
 }
 
+// NewPreCommitFromProof extracts and returns the supply pre-commitment from the
+// given issuance proof and delegation key.
+func NewPreCommitFromProof(issuanceProof proof.Proof,
+	delegationKey btcec.PublicKey) (PreCommitment, error) {
+
+	var zero PreCommitment
+
+	// Identify txOut in mint anchor transaction which corresponds to the
+	// supply pre-commitment output.
+	//
+	// Construct the expected pre-commit tx out.
+	expectedTxOut, err := tapgarden.PreCommitTxOut(delegationKey)
+	if err != nil {
+		return zero, fmt.Errorf("unable to derive expected pre-commit "+
+			"txout: %w", err)
+	}
+
+	var preCommitTxOutIndex int32 = -1
+	for idx := range issuanceProof.AnchorTx.TxOut {
+		txOut := *issuanceProof.AnchorTx.TxOut[idx]
+
+		// Compare txOut to the expected pre-commit tx out.
+		isValueEqual := txOut.Value == expectedTxOut.Value
+		isPkScriptEqual := bytes.Equal(
+			txOut.PkScript, expectedTxOut.PkScript,
+		)
+
+		if isValueEqual && isPkScriptEqual {
+			preCommitTxOutIndex = int32(idx)
+			break
+		}
+	}
+
+	// If we didn't find the pre-commit tx out, then return an error.
+	if preCommitTxOutIndex == -1 {
+		return zero, fmt.Errorf("unable to find pre-commit tx out in " +
+			"issuance anchor tx")
+	}
+
+	// Calculate the outpoint of the supply pre-commitment.
+	return PreCommitment{
+		BlockHeight: issuanceProof.BlockHeight,
+		MintingTxn:  &issuanceProof.AnchorTx,
+		OutIdx:      uint32(preCommitTxOutIndex),
+		InternalKey: keychain.KeyDescriptor{
+			PubKey: &delegationKey,
+		},
+		GroupPubKey: issuanceProof.Asset.GroupKey.GroupPubKey,
+	}, nil
+}
+
 // TxIn returns the transaction input that corresponds to the pre-commitment.
 func (p *PreCommitment) TxIn() *wire.TxIn {
 	return &wire.TxIn{

universe/supplyverifier/verifier.go

@@ -16,7 +16,6 @@ import (
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/tapgarden"
 	"github.com/lightninglabs/taproot-assets/universe/supplycommit"
-	"github.com/lightningnetwork/lnd/keychain"
 )
 
 // VerifierCfg is the configuration for the verifier.
@@ -539,7 +538,9 @@ func (v *Verifier) verifyIssuanceLeaf(ctx context.Context,
 
 	// Attempt to extract the pre-commitment output from the issuance proof
 	// anchor transaction.
-	_, err = ExtractPreCommitOutput(issuanceProof, delegationKey)
+	_, err = supplycommit.NewPreCommitFromProof(
+		issuanceProof, delegationKey,
+	)
 	if err != nil {
 		return fmt.Errorf("unable to extract pre-commit output from "+
 			"issuance proof anchor tx: %w", err)
@@ -822,53 +823,3 @@ func (v *Verifier) VerifyCommit(ctx context.Context,
 		unspentPreCommits,
 	)
 }
-
-// ExtractPreCommitOutput extracts and returns the supply pre-commitment output
-// from the given issuance proof and asset metadata reveal.
-func ExtractPreCommitOutput(issuanceProof proof.Proof,
-	delegationKey btcec.PublicKey) (supplycommit.PreCommitment, error) {
-
-	var zero supplycommit.PreCommitment
-
-	// Identify txOut in mint anchor transaction which corresponds to the
-	// supply pre-commitment output.
-	//
-	// Construct the expected pre-commit tx out.
-	expectedTxOut, err := tapgarden.PreCommitTxOut(delegationKey)
-	if err != nil {
-		return zero, fmt.Errorf("unable to derive expected pre-commit "+
-			"txout: %w", err)
-	}
-
-	var preCommitTxOutIndex int32 = -1
-	for idx := range issuanceProof.AnchorTx.TxOut {
-		txOut := *issuanceProof.AnchorTx.TxOut[idx]
-
-		// Compare txOut to the expected pre-commit tx out.
-		isValueEqual := txOut.Value == expectedTxOut.Value
-		isPkScriptEqual := bytes.Equal(
-			txOut.PkScript, expectedTxOut.PkScript,
-		)
-
-		if isValueEqual && isPkScriptEqual {
-			preCommitTxOutIndex = int32(idx)
-		}
-	}
-
-	// If we didn't find the pre-commit tx out, then return an error.
-	if preCommitTxOutIndex == -1 {
-		return zero, fmt.Errorf("unable to find pre-commit tx out in " +
-			"issuance anchor tx")
-	}
-
-	// Calculate the outpoint of the supply pre-commitment.
-	return supplycommit.PreCommitment{
-		BlockHeight: issuanceProof.BlockHeight,
-		MintingTxn:  &issuanceProof.AnchorTx,
-		OutIdx:      uint32(preCommitTxOutIndex),
-		InternalKey: keychain.KeyDescriptor{
-			PubKey: &delegationKey,
-		},
-		GroupPubKey: issuanceProof.Asset.GroupKey.GroupPubKey,
-	}, nil
-}