tapdb: Update AssetQueryFilters to handle additional filter options

Author: itsrachelfish

tapdb/assets_store.go

@@ -858,7 +858,7 @@ func (a *AssetStore) dbAssetsToChainAssets(dbAssets []ConfirmedAsset,
 // constraintsToDbFilter maps application level constraints to the set of
 // filters we use in the SQL queries.
 func (a *AssetStore) constraintsToDbFilter(
-	query *AssetQueryFilters) QueryAssetFilters {
+	query *AssetQueryFilters) (QueryAssetFilters, error) {
 
 	assetFilter := QueryAssetFilters{
 		Now: sql.NullTime{
@@ -868,17 +868,36 @@ func (a *AssetStore) constraintsToDbFilter(
 	}
 	if query != nil {
 		if query.MinAmt != 0 {
-			assetFilter.MinAmt = sql.NullInt64{
-				Int64: int64(query.MinAmt),
-				Valid: true,
-			}
+			assetFilter.MinAmt = sqlInt64(query.MinAmt)
+		}
+
+		if query.MaxAmt != 0 {
+			assetFilter.MaxAmt = sqlInt64(query.MaxAmt)
 		}
+
 		if query.MinAnchorHeight != 0 {
 			assetFilter.MinAnchorHeight = sqlInt32(
 				query.MinAnchorHeight,
 			)
 		}
 
+		if query.ScriptKey != nil {
+			key := query.ScriptKey.PubKey
+			assetFilter.TweakedScriptKey = key.SerializeCompressed()
+		}
+
+		if query.AnchorPoint != nil {
+			anchorPointBytes, err := encodeOutpoint(
+				*query.AnchorPoint,
+			)
+			if err != nil {
+				return QueryAssetFilters{}, fmt.Errorf(
+					"unable to encode outpoint: %w", err)
+			}
+
+			assetFilter.AnchorPoint = anchorPointBytes
+		}
+
 		// Add asset ID bytes and group key bytes to the filter. These
 		// byte arrays are empty if the asset ID or group key is not
 		// specified in the query.
@@ -903,7 +922,7 @@ func (a *AssetStore) constraintsToDbFilter(
 		}
 	}
 
-	return assetFilter
+	return assetFilter, nil
 }
 
 // specificAssetFilter maps the given asset parameters to the set of filters
@@ -975,6 +994,13 @@ type AssetQueryFilters struct {
 	// MinAnchorHeight is the minimum block height the asset's anchor tx
 	// must have been confirmed at.
 	MinAnchorHeight int32
+
+	// ScriptKey allows filtering by asset script key.
+	ScriptKey *asset.ScriptKey
+
+	// AnchorPoint allows filtering by the outpoint the asset is anchored
+	// to.
+	AnchorPoint *wire.OutPoint
 }
 
 // QueryBalancesByAsset queries the balances for assets or alternatively
@@ -1194,7 +1220,10 @@ func (a *AssetStore) FetchAllAssets(ctx context.Context, includeSpent,
 
 	// We'll now map the application level filtering to the type of
 	// filtering our database query understands.
-	assetFilter := a.constraintsToDbFilter(query)
+	assetFilter, err := a.constraintsToDbFilter(query)
+	if err != nil {
+		return nil, err
+	}
 
 	// By default, the spent boolean is null, which means we'll fetch all
 	// assets. Only if we should exclude spent assets, we'll set the spent
@@ -1995,9 +2024,12 @@ func (a *AssetStore) ListEligibleCoins(ctx context.Context,
 
 	// First, we'll map the commitment constraints to our database query
 	// filters.
-	assetFilter := a.constraintsToDbFilter(&AssetQueryFilters{
+	assetFilter, err := a.constraintsToDbFilter(&AssetQueryFilters{
 		CommitmentConstraints: constraints,
 	})
+	if err != nil {
+		return nil, err
+	}
 
 	// We only want to select unspent and non-leased commitments.
 	assetFilter.Spent = sqlBool(false)

tapdb/sqlc/assets.sql.go

@@ -498,6 +498,7 @@ JOIN chain_txns txns
 -- specified.
 WHERE (
     assets.amount >= COALESCE(sqlc.narg('min_amt'), assets.amount) AND
+    assets.amount <= COALESCE(sqlc.narg('max_amt'), assets.amount) AND
     assets.spent = COALESCE(sqlc.narg('spent'), assets.spent) AND
     (key_group_info_view.tweaked_group_key = sqlc.narg('key_group_filter') OR
       sqlc.narg('key_group_filter') IS NULL) AND

tapdb/sqlc/queries/assets.sql

@@ -39,6 +39,10 @@ type CommitmentConstraints struct {
 	// to satisfy the constraints.
 	MinAmt uint64
 
+	// MaxAmt specifies the maximum amount that an asset commitment needs to
+	// hold to satisfy the constraints.
+	MaxAmt uint64
+
 	// PrevIDs are the set of inputs allowed to be used.
 	PrevIDs []asset.PrevID