Fix getting claim id

Author: ben221199

rpc/claim.go

@@ -32,11 +32,30 @@ func convertProtobufToClaim(protobuf map[int]any, transactions map[string]any) m
 		}
 	}
 
+	if len(claimScript.ClaimData) < 85 {
+		// TODO: Older schemes
+		return claim
+	}
+
 	decodedProtobufClaimData, _ := DecodeRawProto(claimScript.ClaimData[85:])
 
-	claimID := claimScript.ClaimID
-	slices.Reverse(claimID)
-	claim["claim_id"] = hex.EncodeToString(claimID)
+		noutValue, noutOk := protobuf[2]
+    	if noutOk {
+    		nout := noutValue.(uint64)
+    		claim["nout"] = nout
+    	}
+
+    		claimID := claimScript.ClaimID
+        	if claimID == nil{
+        	        var nout uint32
+        	        noutValue, ok := noutValue.(uint32)
+        	        if ok{
+        	            nout = noutValue
+        	        }
+        		    claimID = ComputeClaimID(txidValue.([]byte),nout)
+        	}
+        	//slices.Reverse(claimID)
+        	claim["claim_id"] = hex.EncodeToString(claimID)
 
 	heightValue, heightOk := protobuf[3]
 	if heightOk {
@@ -51,14 +70,18 @@ func convertProtobufToClaim(protobuf map[int]any, transactions map[string]any) m
 
 		shortURLValue, shortURLOk := meta[3]
 		if shortURLOk {
-			shortURL := string(shortURLValue.([]uint8))
-			claim["short_url"] = "lbry://" + shortURL
+			shortURL, ok := shortURLValue.([]uint8)
+			if ok {
+				claim["short_url"] = "lbry://" + string(shortURL)
+			}
 		}
 
 		canonicalURLValue, canonicalURLOk := meta[4]
 		if canonicalURLOk {
-			canonicalURL := string(canonicalURLValue.([]uint8))
-			claim["canonical_url"] = "lbry://" + canonicalURL
+			canonicalURL, ok := canonicalURLValue.([]uint8)
+			if ok {
+				claim["canonical_url"] = "lbry://" + string(canonicalURL)
+			}
 		}
 
 		isControllingValue, isControllingOk := meta[5]
@@ -206,10 +229,16 @@ func convertProtobufToClaim(protobuf map[int]any, transactions map[string]any) m
 	tagsValue, tagsOk := decodedProtobufClaimData[11]
 	if tagsOk {
 		var tags []string
-		for _, tagValue := range tagsValue.([]any) {
-			tags = append(tags, string(tagValue.([]uint8)))
+		_, ok := tagsValue.([]any)
+		if ok {
+			for _, tagValue := range tagsValue.([]any) {
+				tag, ok := tagValue.([]uint8)
+				if ok {
+					tags = append(tags, string(tag))
+				}
+			}
+			claimValue["tags"] = tags
 		}
-		claimValue["tags"] = tags
 	}
 
 	claim["value"] = claimValue

rpc/server.go

@@ -651,6 +651,9 @@ func handleJSONRPCMessageResolve(w http.ResponseWriter, params any) {
 		txIDs := []string{}
 
 		for _, claim := range resolutionData {
+			if claim == nil {
+				continue
+			}
 			claimMap := claim.(map[int]any)
 			txidValue, txidOk := claimMap[1]
 			if txidOk {

rpc/transaction.go

@@ -197,7 +197,10 @@ func parseClaimScript(script []byte) (*ClaimScript, error) {
 		if n2 == 0 {
 			return nil, fmt.Errorf("failed to read claim data")
 		}
-		return &ClaimScript{Name: string(nameBytes), ClaimData: claimData}, nil
+		return &ClaimScript{
+		Name: string(nameBytes),
+		ClaimData: claimData,
+		}, nil
 
 	case opUpdateClaim:
 		// OP_UPDATE_CLAIM <name> <claim_id_20b> <claim_data> OP_2DROP OP_2DROP
@@ -214,8 +217,10 @@ func parseClaimScript(script []byte) (*ClaimScript, error) {
 			return nil, fmt.Errorf("failed to read claim data")
 		}
 		return &ClaimScript{
-			Name: string(nameBytes), ClaimID: claimIDBytes,
-			ClaimData: claimData, IsUpdate: true,
+			Name: string(nameBytes),
+			ClaimID: claimIDBytes,
+			ClaimData: claimData,
+			IsUpdate: true,
 		}, nil
 
 	default:
@@ -241,11 +246,11 @@ func reverseBytes(b []byte) []byte {
 }
 
 // computeClaimID computes claim_id from tx_hash (internal byte order) and output index.
-func computeClaimID(txHash []byte, nout uint32) string {
+func ComputeClaimID(txHash []byte, nout uint32) []byte {
 	buf := make([]byte, 36)
 	copy(buf, txHash)
 	binary.BigEndian.PutUint32(buf[32:], nout)
-	return hex.EncodeToString(reverseBytes(hash160(buf)))
+	return reverseBytes(hash160(buf))
 }
 
 // claimIDFromBytes converts raw claim_id bytes (from script) to display hex.