tapdb: add FetchScriptKeyStore interface

Author: jharveyb

tapdb/addrs.go

@@ -92,6 +92,10 @@ type AddrBook interface {
 	// asset groups related to them.
 	GroupStore
 
+	// FetchScriptKeyStore houses the methods related to fetching all
+	// information about a script key.
+	FetchScriptKeyStore
+
 	// FetchAddrs returns all the addresses based on the constraints of the
 	// passed AddrQuery.
 	FetchAddrs(ctx context.Context, arg AddrQuery) ([]Addresses, error)
@@ -153,11 +157,6 @@ type AddrBook interface {
 	FetchGenesisByAssetID(ctx context.Context,
 		assetID []byte) (sqlc.GenesisInfoView, error)
 
-	// FetchScriptKeyByTweakedKey attempts to fetch the script key and
-	// corresponding internal key from the database.
-	FetchScriptKeyByTweakedKey(ctx context.Context,
-		tweakedScriptKey []byte) (ScriptKey, error)
-
 	// FetchInternalKeyLocator fetches the key locator for an internal key.
 	FetchInternalKeyLocator(ctx context.Context, rawKey []byte) (KeyLocator,
 		error)
@@ -1158,43 +1157,21 @@ func (t *TapAddressBook) FetchScriptKey(ctx context.Context,
 	tweakedScriptKey *btcec.PublicKey) (*asset.TweakedScriptKey, error) {
 
 	var (
-		readOpts  = NewAddrBookReadTx()
 		scriptKey *asset.TweakedScriptKey
+		err       error
 	)
-	err := t.db.ExecTx(ctx, &readOpts, func(db AddrBook) error {
-		dbKey, err := db.FetchScriptKeyByTweakedKey(
-			ctx, tweakedScriptKey.SerializeCompressed(),
-		)
-		if err != nil {
-			return err
-		}
 
-		rawKey, err := btcec.ParsePubKey(dbKey.RawKey)
-		if err != nil {
-			return fmt.Errorf("unable to parse raw key: %w", err)
-		}
-
-		scriptKey = &asset.TweakedScriptKey{
-			Tweak: dbKey.Tweak,
-			RawKey: keychain.KeyDescriptor{
-				PubKey: rawKey,
-				KeyLocator: keychain.KeyLocator{
-					Family: keychain.KeyFamily(
-						dbKey.KeyFamily,
-					),
-					Index: uint32(dbKey.KeyIndex),
-				},
-			},
-			DeclaredKnown: dbKey.DeclaredKnown.Valid,
-		}
-
-		return nil
+	readOpts := NewAddrBookReadTx()
+	dbErr := t.db.ExecTx(ctx, &readOpts, func(db AddrBook) error {
+		scriptKey, err = fetchScriptKey(ctx, db, tweakedScriptKey)
+		return err
 	})
+
 	switch {
-	case errors.Is(err, sql.ErrNoRows):
+	case errors.Is(dbErr, sql.ErrNoRows):
 		return nil, address.ErrScriptKeyNotFound
 
-	case err != nil:
+	case dbErr != nil:
 		return nil, err
 	}
 

tapdb/asset_minting.go

@@ -140,6 +140,10 @@ type PendingAssetStore interface {
 	// GroupStore houses the methods related to querying asset groups.
 	GroupStore
 
+	// FetchScriptKeyStore houses the methods related to fetching all
+	// information about a script key.
+	FetchScriptKeyStore
+
 	// TapscriptTreeStore houses the methods related to storing, fetching,
 	// and deleting tapscript trees.
 	TapscriptTreeStore
@@ -1695,6 +1699,33 @@ func (a *AssetMintingStore) FetchGroupByGroupKey(ctx context.Context,
 	return dbGroup, nil
 }
 
+// FetchScriptKeyByTweakedKey fetches the populated script key given the tweaked
+// script key.
+func (a *AssetMintingStore) FetchScriptKeyByTweakedKey(ctx context.Context,
+	tweakedKey *btcec.PublicKey) (*asset.TweakedScriptKey, error) {
+
+	var (
+		scriptKey *asset.TweakedScriptKey
+		err       error
+	)
+
+	readOpts := NewAssetStoreReadTx()
+	dbErr := a.db.ExecTx(ctx, &readOpts, func(q PendingAssetStore) error {
+		scriptKey, err = fetchScriptKey(ctx, q, tweakedKey)
+		return err
+	})
+
+	switch {
+	case errors.Is(dbErr, sql.ErrNoRows):
+		return nil, fmt.Errorf("script key not found")
+
+	case dbErr != nil:
+		return nil, err
+	}
+
+	return scriptKey, nil
+}
+
 // StoreTapscriptTree persists a Tapscript tree given a validated set of
 // TapLeafs or a TapBranch. If the store succeeds, the root hash of the
 // Tapscript tree is returned.

tapdb/assets_common.go

@@ -422,6 +422,49 @@ func upsertScriptKey(ctx context.Context, scriptKey asset.ScriptKey,
 	return scriptKeyID, nil
 }
 
+// FetchScriptKeyStore houses the methods related to fetching all information
+// about a script key.
+type FetchScriptKeyStore interface {
+	// FetchScriptKeyByTweakedKey attempts to fetch the script key and
+	// corresponding internal key from the database.
+	FetchScriptKeyByTweakedKey(ctx context.Context,
+		tweakedScriptKey []byte) (ScriptKey, error)
+}
+
+// fetchScriptKey attempts to fetch the full tweaked script key struct
+// (including the key descriptor) for the given tweaked script key.
+func fetchScriptKey(ctx context.Context, q FetchScriptKeyStore,
+	tweakedScriptKey *btcec.PublicKey) (*asset.TweakedScriptKey, error) {
+
+	dbKey, err := q.FetchScriptKeyByTweakedKey(
+		ctx, tweakedScriptKey.SerializeCompressed(),
+	)
+	if err != nil {
+		return nil, err
+	}
+
+	rawKey, err := btcec.ParsePubKey(dbKey.RawKey)
+	if err != nil {
+		return nil, fmt.Errorf("unable to parse raw key: %w", err)
+	}
+
+	scriptKey := &asset.TweakedScriptKey{
+		Tweak: dbKey.Tweak,
+		RawKey: keychain.KeyDescriptor{
+			PubKey: rawKey,
+			KeyLocator: keychain.KeyLocator{
+				Family: keychain.KeyFamily(
+					dbKey.KeyFamily,
+				),
+				Index: uint32(dbKey.KeyIndex),
+			},
+		},
+		DeclaredKnown: dbKey.DeclaredKnown.Valid,
+	}
+
+	return scriptKey, nil
+}
+
 // FetchGenesisStore houses the methods related to fetching genesis assets.
 type FetchGenesisStore interface {
 	// FetchGenesisByID returns a single genesis asset by its primary key