From 37a8c4cae1809540f4f1be68b232d7854249deeb Mon Sep 17 00:00:00 2001
From: Jack Robison <jackrobison@lbry.io>
Date: Mon, 13 Nov 2017 10:11:19 -0500
Subject: [PATCH] add DecodeClaimHex to python binding

---
 .gitignore                           |  2 +-
 binding/lbryschema-python-binding.go | 23 +++++++++++++++++++++--
 claim/validator.go                   |  9 +++------
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index f8a7dc5..be2499a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
 .idea/
 lbryschema-cli
 lbryschema-python-binding.h
-lbryschema-python-binding.so
\ No newline at end of file
+lbryschema-python-binding.so
diff --git a/binding/lbryschema-python-binding.go b/binding/lbryschema-python-binding.go
index 557c383..5b23071 100644
--- a/binding/lbryschema-python-binding.go
+++ b/binding/lbryschema-python-binding.go
@@ -5,17 +5,36 @@ import (
 )
 
 //export VerifySignature
-func VerifySignature(claimHex string, certificateHex string, claimAddress string, certificateId string) (bool) {
+func VerifySignature(claimHex string, certificateHex string, claimAddress string, certificateId string) bool {
 	decodedClaim, err := claim.DecodeClaimHex(claimHex)
 	if err != nil {
 		return false
 	}
 	decodedCertificate, err := claim.DecodeClaimHex(certificateHex)
+	if err != nil {
+		return false
+	}
 	result, err := decodedClaim.ValidateClaimSignature(decodedCertificate, claimAddress, certificateId)
 	if err != nil {
 		return false
 	}
-	return result
+	if result == false {
+		return false
+	}
+	return true
+}
+
+//export DecodeClaimHex
+func DecodeClaimHex(claimHex string) *C.char {
+	decodedClaim, err := claim.DecodeClaimHex(claimHex)
+	if err != nil {
+		return C.CString("decode error")
+	}
+	decoded, err := decodedClaim.RenderJSON()
+	if err != nil {
+		return C.CString("encode error")
+	}
+	return C.CString(decoded)
 }
 
 func main() {}
diff --git a/claim/validator.go b/claim/validator.go
index b7fe45a..593918e 100644
--- a/claim/validator.go
+++ b/claim/validator.go
@@ -4,7 +4,6 @@ import (
 	"../address"
 	"crypto/sha256"
 	"errors"
-	"fmt"
 	"encoding/asn1"
 	"crypto/x509/pkix"
 	"github.com/btcsuite/btcd/btcec"
@@ -30,22 +29,21 @@ func GetClaimSignatureDigest(claimAddress [25]byte, certificateId [20]byte, seri
 	return [32]byte(digest)
 }
 
-func (claim *ClaimHelper) GetCertificatePublicKey() (btcec.PublicKey, error) {
+func (claim *ClaimHelper) GetCertificatePublicKey() (*btcec.PublicKey, error) {
 	derBytes := claim.GetCertificate().GetPublicKey()
 	pub := publicKeyInfo{}
 	asn1.Unmarshal(derBytes, &pub)
 	pubkey_bytes := []byte(pub.PublicKey.Bytes)
 	p, err := btcec.ParsePubKey(pubkey_bytes, btcec.S256())
 	if err != nil {
-		fmt.Println("parse public key error: ", err)
+		return &btcec.PublicKey{}, err
 	}
-	return *p, err
+	return p, err
 }
 
 func (claim *ClaimHelper) VerifyDigest(certificate *ClaimHelper, signature [64]byte, digest [32]byte) bool {
 	public_key, err := certificate.GetCertificatePublicKey()
 	if err != nil {
-		fmt.Println("parse public key error: ", err)
 		return false
 	}
 
@@ -56,7 +54,6 @@ func (claim *ClaimHelper) VerifyDigest(certificate *ClaimHelper, signature [64]b
 		S.SetBytes(signature[32:64])
 		return ecdsa.Verify(public_key.ToECDSA(), digest[:], R, S)
 	}
-	fmt.Println("unknown curve:", claim.PublisherSignature.SignatureType.String())
 	return false
 }