Merge pull request #561 from lightninglabs/uni-events-proof-type

Universe events stats handle universe identity proof type

cmd/tapcli/universe.go

@@ -10,10 +10,15 @@ import (
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 	unirpc "github.com/lightninglabs/taproot-assets/taprpc/universerpc"
+	"github.com/lightninglabs/taproot-assets/universe"
 	"github.com/lightningnetwork/lnd/lncfg"
 	"github.com/urfave/cli"
 )
 
+const (
+	proofTypeName = "proof_type"
+)
+
 func getUniverseClient(ctx *cli.Context) (universerpc.UniverseClient, func()) {
 	conn := getClientConn(ctx, false)
 
@@ -59,11 +64,26 @@ var universeRootsCommand = cli.Command{
 			Name:  groupKeyName,
 			Usage: "the group key of the universe to query for",
 		},
+		cli.StringFlag{
+			Name: proofTypeName,
+			Usage: "the type of proof to show the roots for, " +
+				"either 'issuance' or 'transfer'",
+			Value: universe.ProofTypeIssuance.String(),
+		},
 	},
 	Action: universeRoots,
 }
 
 func parseUniverseID(ctx *cli.Context, mustParse bool) (*universerpc.ID, error) {
+	proofType, err := universe.ParseStrProofType(ctx.String(proofTypeName))
+	if err != nil {
+		return nil, err
+	}
+	rpcProofType, err := tap.MarshalUniProofType(proofType)
+	if err != nil {
+		return nil, err
+	}
+
 	switch {
 	// Both the asset ID and the group key can't be set.
 	case ctx.IsSet(assetIDName) && ctx.IsSet(groupKeyName):
@@ -83,6 +103,7 @@ func parseUniverseID(ctx *cli.Context, mustParse bool) (*universerpc.ID, error)
 			Id: &universerpc.ID_AssetId{
 				AssetId: assetIDBytes,
 			},
+			ProofType: rpcProofType,
 		}, nil
 
 	case ctx.IsSet(groupKeyName):
@@ -97,6 +118,7 @@ func parseUniverseID(ctx *cli.Context, mustParse bool) (*universerpc.ID, error)
 			Id: &universerpc.ID_GroupKey{
 				GroupKey: groupKeyBytes,
 			},
+			ProofType: rpcProofType,
 		}, nil
 
 	// Neither was set, so we'll return nil.
@@ -156,6 +178,12 @@ var universeDeleteRootCommand = cli.Command{
 			Name:  groupKeyName,
 			Usage: "the group key of the universe to delete",
 		},
+		cli.StringFlag{
+			Name: proofTypeName,
+			Usage: "the type of proof to delete the roots for, " +
+				"either 'issuance' or 'transfer'",
+			Value: universe.ProofTypeIssuance.String(),
+		},
 	},
 	Action: deleteUniverseRoot,
 }
@@ -201,6 +229,12 @@ var universeKeysCommand = cli.Command{
 			Name:  groupKeyName,
 			Usage: "the group key of the universe to query for",
 		},
+		cli.StringFlag{
+			Name: proofTypeName,
+			Usage: "the type of proof to show the keys for, " +
+				"either 'issuance' or 'transfer'",
+			Value: universe.ProofTypeIssuance.String(),
+		},
 	},
 	Action: universeKeys,
 }
@@ -242,6 +276,12 @@ var universeLeavesCommand = cli.Command{
 			Name:  groupKeyName,
 			Usage: "the group key of the universe to query for",
 		},
+		cli.StringFlag{
+			Name: proofTypeName,
+			Usage: "the type of proof to show the leaves for, " +
+				"either 'issuance' or 'transfer'",
+			Value: universe.ProofTypeIssuance.String(),
+		},
 	},
 	Action: universeLeaves,
 }
@@ -279,23 +319,31 @@ var universeProofArgs = []cli.Flag{
 		Usage: "the group key of the universe to query for",
 	},
 	cli.StringFlag{
-		Name:  outpointName,
-		Usage: "the target outpoint on chain to locate a tap proof within",
+		Name: outpointName,
+		Usage: "the target outpoint on chain to locate a tap proof " +
+			"within",
+	},
+	cli.StringFlag{
+		Name: scriptKeyName,
+		Usage: "the script key (scoped to an assetID) to query a " +
+			"proof for",
 	},
 	cli.StringFlag{
-		Name:  scriptKeyName,
-		Usage: "the script key (scoped to an assetID) to query a proof for",
+		Name: proofTypeName,
+		Usage: "the type of proof to query for, either 'issuance' or " +
+			"'transfer'",
+		Value: universe.ProofTypeIssuance.String(),
 	},
 }
 
 var universeProofCommand = cli.Command{
 	Name:      "proofs",
 	ShortName: "p",
-	Usage:     "retreive or insert a new Universe proof",
+	Usage:     "retrieve or insert a new Universe proof",
 	Description: `
 	Query for the set of proofs known by the target universe. A proof may
 	be either an issuance proof, or a proof that some transfer took place
-	on chain. Proofs are namesapced based on a top level assetID/groupKey,
+	on chain. Proofs are namespaced based on a top level assetID/groupKey,
 	so that must be specified for each command.
 
 	Two sub-commands are available: proof querying (query) and proof

itest/loadtest/mint_batch_test.go

@@ -137,6 +137,7 @@ func mintTest(t *testing.T, ctx context.Context, cfg *Config) {
 		Id: &unirpc.ID_GroupKey{
 			GroupKey: collectGroupKey[1:],
 		},
+		ProofType: unirpc.ProofType_PROOF_TYPE_ISSUANCE,
 	}
 	uniLeaves, err := alice.AssetLeaves(ctx, &collectUniID)
 	require.NoError(t, err)

itest/mint_batch_stress_test.go

@@ -191,6 +191,7 @@ func mintBatchStressTest(
 		Id: &unirpc.ID_GroupKey{
 			GroupKey: collectGroupKey[1:],
 		},
+		ProofType: unirpc.ProofType_PROOF_TYPE_ISSUANCE,
 	}
 	uniLeaves, err := alice.AssetLeaves(ctx, &collectUniID)
 	require.NoError(t, err)

rpcserver.go

@@ -3207,9 +3207,8 @@ func (r *rpcServer) QueryProof(ctx context.Context,
 		return nil, err
 	}
 
-	rpcsLog.Debugf("[QueryProof]: fetching proof at "+
-		"(universeID=%x, leafKey=%x)", universeID,
-		leafKey.UniverseKey())
+	rpcsLog.Debugf("[QueryProof]: fetching proof at (universeID=%v, "+
+		"leafKey=%x)", universeID, leafKey.UniverseKey())
 
 	// Keep a record of whether the proof type was specified by the client.
 	unspecifiedArgProofType :=
@@ -3244,14 +3243,14 @@ func (r *rpcServer) QueryProof(ctx context.Context,
 		)
 		if err != nil {
 			rpcsLog.Debugf("[QueryProof]: error querying for "+
-				"proof at (universeID=%x, leafKey=%x)",
+				"proof at (universeID=%v, leafKey=%x)",
 				universeID, leafKey.UniverseKey())
 			return nil, err
 		}
 	}
 	if err != nil {
 		rpcsLog.Debugf("[QueryProof]: error querying for proof at "+
-			"(universeID=%x, leafKey=%x)", universeID,
+			"(universeID=%v, leafKey=%x)", universeID,
 			leafKey.UniverseKey())
 		return nil, err
 	}
@@ -3260,9 +3259,8 @@ func (r *rpcServer) QueryProof(ctx context.Context,
 	// not be fully specified
 	proof := proofs[0]
 
-	rpcsLog.Debugf("[QueryProof]: found proof at "+
-		"(universeID=%x, leafKey=%x)", universeID,
-		leafKey.UniverseKey())
+	rpcsLog.Debugf("[QueryProof]: found proof at (universeID=%v, "+
+		"leafKey=%x)", universeID, leafKey.UniverseKey())
 
 	return r.marshalIssuanceProof(ctx, req, proof)
 }
@@ -3335,7 +3333,7 @@ func (r *rpcServer) InsertProof(ctx context.Context,
 	}
 
 	rpcsLog.Debugf("[InsertProof]: inserting proof at "+
-		"(universeID=%x, leafKey=%x)", universeID,
+		"(universeID=%v, leafKey=%x)", universeID,
 		leafKey.UniverseKey())
 
 	newUniverseState, err := r.cfg.BaseUniverse.RegisterIssuance(

tapdb/sqlc/migrations/000007_universe.up.sql

@@ -80,11 +80,10 @@ CREATE VIEW universe_stats AS
         COUNT(CASE WHEN u.event_type = 'SYNC' THEN 1 ELSE NULL END) AS total_asset_syncs,
         COUNT(CASE WHEN u.event_type = 'NEW_PROOF' THEN 1 ELSE NULL END) AS total_asset_proofs,
         roots.asset_id,
-        roots.group_key,
-        roots.namespace_root
+        roots.group_key
     FROM universe_events u
     JOIN universe_roots roots ON u.universe_root_id = roots.id
-    GROUP BY roots.asset_id, roots.group_key, roots.namespace_root;
+    GROUP BY roots.asset_id, roots.group_key;
 
 -- This table contains global configuration for universe federation syncing.
 CREATE TABLE IF NOT EXISTS federation_global_sync_config (

tapdb/sqlc/queries/universe.sql

@@ -113,14 +113,18 @@ SELECT * FROM universe_servers;
 -- name: InsertNewSyncEvent :exec
 WITH group_key_root_id AS (
     SELECT id
-    FROM universe_roots
+    FROM universe_roots roots
     WHERE group_key = @group_key_x_only
+      AND roots.proof_type = @proof_type
 ), asset_id_root_id AS (
     SELECT leaves.universe_root_id AS id
     FROM universe_leaves leaves
+    JOIN universe_roots roots
+        ON leaves.universe_root_id = roots.id
     JOIN genesis_info_view gen
         ON leaves.asset_genesis_id = gen.gen_asset_id
-    WHERE gen.asset_id = @asset_id 
+    WHERE gen.asset_id = @asset_id
+        AND roots.proof_type = @proof_type
     LIMIT 1
 )
 INSERT INTO universe_events (
@@ -138,14 +142,18 @@ INSERT INTO universe_events (
 -- name: InsertNewProofEvent :exec
 WITH group_key_root_id AS (
     SELECT id
-    FROM universe_roots
+    FROM universe_roots roots
     WHERE group_key = @group_key_x_only
+        AND roots.proof_type = @proof_type
 ), asset_id_root_id AS (
     SELECT leaves.universe_root_id AS id
     FROM universe_leaves leaves
-             JOIN genesis_info_view gen
-                  ON leaves.asset_genesis_id = gen.gen_asset_id
+    JOIN universe_roots roots
+        ON leaves.universe_root_id = roots.id
+    JOIN genesis_info_view gen
+        ON leaves.asset_genesis_id = gen.gen_asset_id
     WHERE gen.asset_id = @asset_id
+        AND roots.proof_type = @proof_type
     LIMIT 1
 )
 INSERT INTO universe_events (

tapdb/universe_stats.go

@@ -140,6 +140,7 @@ func (u *UniverseStats) LogSyncEvent(ctx context.Context,
 			EventTimestamp: u.clock.Now().UTC().Unix(),
 			AssetID:        uniID.AssetID[:],
 			GroupKeyXOnly:  groupKeyXOnly,
+			ProofType:      uniID.ProofType.String(),
 		})
 	})
 }
@@ -165,6 +166,7 @@ func (u *UniverseStats) LogSyncEvents(ctx context.Context,
 				EventTimestamp: u.clock.Now().UTC().Unix(),
 				AssetID:        uniID.AssetID[:],
 				GroupKeyXOnly:  groupKeyXOnly,
+				ProofType:      uniID.ProofType.String(),
 			})
 			if err != nil {
 				return err
@@ -191,6 +193,7 @@ func (u *UniverseStats) LogNewProofEvent(ctx context.Context,
 			EventTimestamp: u.clock.Now().UTC().Unix(),
 			AssetID:        uniID.AssetID[:],
 			GroupKeyXOnly:  groupKeyXOnly,
+			ProofType:      uniID.ProofType.String(),
 		})
 	})
 }
@@ -215,6 +218,7 @@ func (u *UniverseStats) LogNewProofEvents(ctx context.Context,
 				EventTimestamp: u.clock.Now().UTC().Unix(),
 				AssetID:        uniID.AssetID[:],
 				GroupKeyXOnly:  groupKeyXOnly,
+				ProofType:      uniID.ProofType.String(),
 			})
 			if err != nil {
 				return err