Generalise QueryProof and InsertProof RPC endpoints to accept transfer proofs

cmd/tapcli/universe.go

@@ -435,8 +435,8 @@ func universeProofInsert(ctx *cli.Context) error {
 			LeafKey: assetKey,
 		},
 		AssetLeaf: &universerpc.AssetLeaf{
-			Asset:         rpcAsset,
-			IssuanceProof: rawProof,
+			Asset:    rpcAsset,
+			RawProof: rawProof,
 		},
 	}
 	resp, err := client.InsertProof(ctxc, req)

itest/assertions.go

@@ -1008,8 +1008,8 @@ func assertUniverseLeavesEqual(t *testing.T, uniIDs []*unirpc.ID,
 			)
 
 			require.Equal(
-				t, aLeaves.Leaves[i].IssuanceProof,
-				bLeaves.Leaves[i].IssuanceProof,
+				t, aLeaves.Leaves[i].RawProof,
+				bLeaves.Leaves[i].RawProof,
 			)
 		}
 	}

rpcserver.go

@@ -2575,8 +2575,8 @@ func marshalAssetLeaf(ctx context.Context, keys KeyLookup,
 	}
 
 	return &unirpc.AssetLeaf{
-		Asset:         rpcAsset,
-		IssuanceProof: assetLeaf.GenesisProof[:],
+		Asset:    rpcAsset,
+		RawProof: assetLeaf.GenesisProof[:],
 	}, nil
 }
 
@@ -2775,11 +2775,11 @@ func (r *rpcServer) marshalIssuanceProof(ctx context.Context,
 	}, nil
 }
 
-// QueryProof attempts to query for an issuance proof for a given asset based
-// on its UniverseKey. A UniverseKey is composed of the Universe ID
+// QueryProof attempts to query for an issuance or transfer proof for a given
+// asset based on its UniverseKey. A UniverseKey is composed of the Universe ID
 // (asset_id/group_key) and also a leaf key (outpoint || script_key). If found,
-// then the issuance proof is returned that includes an inclusion proof to the
-// known Universe root, as well as a Taproot Asset state transition or issuance
+// then the proof is returned that includes an inclusion proof to the known
+// Universe root, as well as a Taproot Asset state transition or issuance
 // proof for the said asset.
 func (r *rpcServer) QueryProof(ctx context.Context,
 	req *unirpc.UniverseKey) (*unirpc.AssetProofResponse, error) {
@@ -2813,7 +2813,7 @@ func unmarshalAssetLeaf(leaf *unirpc.AssetLeaf) (*universe.MintingLeaf, error) {
 	// itself.
 	var assetProof proof.Proof
 	if err := assetProof.Decode(
-		bytes.NewReader(leaf.IssuanceProof),
+		bytes.NewReader(leaf.RawProof),
 	); err != nil {
 		return nil, err
 	}
@@ -2826,14 +2826,14 @@ func unmarshalAssetLeaf(leaf *unirpc.AssetLeaf) (*universe.MintingLeaf, error) {
 			Genesis:  assetProof.Asset.Genesis,
 			GroupKey: assetProof.Asset.GroupKey,
 		},
-		GenesisProof: leaf.IssuanceProof,
+		GenesisProof: leaf.RawProof,
 		Amt:          assetProof.Asset.Amount,
 	}, nil
 }
 
-// InsertProof attempts to insert a new issuance proof into the Universe tree
-// specified by the UniverseKey. If valid, then the proof is inserted into the
-// database, with a new Universe root returned for the updated
+// InsertProof attempts to insert a new issuance or transfer proof into the
+// Universe tree specified by the UniverseKey. If valid, then the proof is
+// inserted into the database, with a new Universe root returned for the updated
 // asset_id/group_key.
 func (r *rpcServer) InsertProof(ctx context.Context,
 	req *unirpc.AssetProof) (*unirpc.AssetProofResponse, error) {

taprpc/universerpc/universe.proto

@@ -233,9 +233,9 @@ message AssetLeaf {
 
     // TODO(roasbeef): only needed for display? can get from proof below ^
 
-    // The asset issuance proof, which proves that the asset specified above
-    // was issued properly.
-    bytes issuance_proof = 2;
+    // The raw proof which proves that the asset was issued or transferred
+    // correctly.
+    bytes raw_proof = 2;
 }
 
 message AssetLeafResponse {

taprpc/universerpc/universe.swagger.json

@@ -1293,10 +1293,10 @@
           "$ref": "#/definitions/taprpcAsset",
           "description": "The asset included in the leaf."
         },
-        "issuance_proof": {
+        "raw_proof": {
           "type": "string",
           "format": "byte",
-          "description": "The asset issuance proof, which proves that the asset specified above\nwas issued properly."
+          "description": "The raw proof which proves that the asset was issued or transferred\ncorrectly."
         }
       }
     },

universe/base.go

@@ -213,14 +213,6 @@ func (a *MintingArchive) RegisterIssuance(ctx context.Context, id Identifier,
 		return nil, fmt.Errorf("asset id mismatch: expected %v, got %v",
 			id.AssetID, newAsset.ID())
 
-	// The outpoint of the final resting place of the asset should match
-	// the leaf key
-	//
-	// TODO(roasbeef): this restrict to issuance
-	case assetSnapshot.OutPoint != key.MintingOutpoint:
-		return nil, fmt.Errorf("outpoint mismatch: expected %v, got %v",
-			key.MintingOutpoint, assetSnapshot.OutPoint)
-
 	// The script key should also match exactly.
 	case !newAsset.ScriptKey.PubKey.IsEqual(key.ScriptKey.PubKey):
 		return nil, fmt.Errorf("script key mismatch: expected %v, "+