add transinfo in createEvidence

global.status

@@ -0,0 +1 @@
+{"authority_issuer_current_cpt_id":1000,"none_authority_issuer_current_cpt_id":2000007,"authority_issuer_current_policy_id":1000,"none_authority_issuer_current_policy_id":2000000,"presentationId":1}

src/main/java/com/webank/weid/constant/CredentialConstant.java

@@ -137,7 +137,8 @@ public final class CredentialConstant {
      * The Credential Proof Type Enumerate.
      */
     public static enum CredentialProofType {
-        ECDSA("Secp256k1");
+        ECDSA("Secp256k1"),
+        SM2("SM2");
 
         /**
          * The Type Name of the Credential Proof.

src/main/java/com/webank/weid/service/impl/CredentialPojoServiceImpl.java

@@ -25,6 +25,7 @@
 import com.webank.weid.util.*;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -1047,7 +1048,7 @@ public ResponseData<CredentialPojo> createCredential(CreateCredentialPojoArgs ar
             String creator = args.getWeIdAuthentication().getWeId();
             result.putProofValue(ParamKeyConstant.PROOF_CREATOR, creator);
             //TODO：目前CredentialProofType只有ECDSA类型，需要添加SM2
-            String proofType = CredentialProofType.ECDSA.getTypeName();
+            String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName();
             result.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType);
             result.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature);
             result.setSalt(saltMap);
@@ -1074,7 +1075,7 @@ private ResponseData<CredentialPojo> createLiteCredential(CredentialPojo credent
         String signature = DataToolUtils.SigBase64Serialization(
                 DataToolUtils.signToRsvSignature(rawData, privateKey)
         );
-        String proofType = CredentialProofType.ECDSA.getTypeName();
+        String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName();
         credentialPojo.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType);
         credentialPojo.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature);
         ResponseData<CredentialPojo> responseData = new ResponseData<>(
@@ -1158,7 +1159,7 @@ public ResponseData<CredentialPojo> addSignature(
         String creator = callerAuth.getWeId();
         result.putProofValue(ParamKeyConstant.PROOF_CREATOR, creator);
 
-        String proofType = CredentialProofType.ECDSA.getTypeName();
+        String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName();
         result.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType);
         result.putProofValue(ParamKeyConstant.PROOF_SIGNATURE, signature);
         result.setSalt(saltMap);
@@ -1896,7 +1897,7 @@ private void generatePresentationProof(
         WeIdAuthentication weIdAuthentication,
         PresentationE presentation) {
 
-        String proofType = CredentialProofType.ECDSA.getTypeName();
+        String proofType = DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName();
         presentation.putProofValue(ParamKeyConstant.PROOF_TYPE, proofType);
 
         Long proofCreated = DateUtils.getNoMillisecondTimeStamp();

src/main/java/com/webank/weid/service/impl/CredentialServiceImpl.java

@@ -94,7 +94,6 @@ public ResponseData<CredentialWrapper> createCredential(CreateCredentialArgs arg
             credentialWrapper.setDisclosure(disclosureMap);
 
             // Construct Credential Proof
-            //替换国密
             Map<String, String> credentialProof = CredentialUtils.buildCredentialProof(
                     result,
                     args.getWeIdPrivateKey().getPrivateKey(),

src/main/java/com/webank/weid/service/impl/EvidenceServiceImpl.java

@@ -411,7 +411,7 @@ private ResponseData<Boolean> addByCustomKey(
                     weIdPrivateKey.getPrivateKey()
             );
             if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-                return new ResponseData<>(true, ErrorCode.SUCCESS);
+                return new ResponseData<>(true, ErrorCode.SUCCESS, resp.getTransactionInfo());
             } else {
                 return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage());
             }
@@ -425,7 +425,7 @@ private ResponseData<Boolean> addByCustomKey(
                     weIdPrivateKey.getPrivateKey()
             );
             if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-                return new ResponseData<>(true, ErrorCode.SUCCESS);
+                return new ResponseData<>(true, ErrorCode.SUCCESS, resp.getTransactionInfo());
             } else {
                 return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage());
             }
@@ -554,7 +554,7 @@ private ResponseData<String> hashToNewEvidence(String hashValue, String privateK
                     privateKey
             );
             if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-                return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS);
+                return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo());
             } else {
                 return new ResponseData<>(StringUtils.EMPTY, resp.getErrorCode(), resp.getErrorMessage());
             }
@@ -812,7 +812,7 @@ public ResponseData<String> createEvidenceWithLogAndCustomKey(
                     privateKey
             );
             if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-                return new ResponseData<>(hashValue, ErrorCode.SUCCESS);
+                return new ResponseData<>(hashValue, ErrorCode.SUCCESS, resp.getTransactionInfo());
             } else {
                 return new ResponseData<>(StringUtils.EMPTY, resp.getErrorCode(), resp.getErrorMessage());
             }
@@ -869,7 +869,7 @@ public ResponseData<Boolean> revoke(Hashable object, WeIdAuthentication weIdAuth
                 weIdAuthentication.getWeIdPrivateKey().getPrivateKey()
         );
         if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-            return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS);
+            return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo());
         } else {
             return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage());
         }
@@ -901,7 +901,7 @@ public ResponseData<Boolean> unRevoke(Hashable object, WeIdAuthentication weIdAu
                 weIdAuthentication.getWeIdPrivateKey().getPrivateKey()
         );
         if (resp.getErrorCode() == ErrorCode.SUCCESS.getCode()) {
-            return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS);
+            return new ResponseData<>(resp.getResult(), ErrorCode.SUCCESS, resp.getTransactionInfo());
         } else {
             return new ResponseData<>(false, resp.getErrorCode(), resp.getErrorMessage());
         }

src/main/java/com/webank/weid/util/CredentialPojoUtils.java

@@ -968,7 +968,7 @@ private static ErrorCode isCredentialProofValid(Map<String, Object> proof) {
             }
         }
         // If the Proof type is ECDSA or other signature based scheme, check signature
-        if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName())) {
+        if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName()) || type.equalsIgnoreCase(CredentialProofType.SM2.getTypeName())) {
             if (proof.get(ParamKeyConstant.PROOF_SIGNATURE) == null) {
                 return ErrorCode.CREDENTIAL_SIGNATURE_BROKEN;
             } else {

src/main/java/com/webank/weid/util/CredentialUtils.java

@@ -11,6 +11,7 @@
 import com.webank.weid.protocol.request.CreateCredentialArgs;
 import org.apache.commons.lang3.StringUtils;
 import org.fisco.bcos.sdk.abi.datatypes.generated.Bytes32;
+import org.fisco.bcos.sdk.model.CryptoType;
 
 import java.nio.charset.StandardCharsets;
 import java.util.*;
@@ -453,7 +454,7 @@ private static ErrorCode isCredentialProofValid(Map<String, String> proof) {
             return ErrorCode.CREDENTIAL_ISSUER_INVALID;
         }
         // If the Proof type is ECDSA or other signature based scheme, check signature
-        if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName())) {
+        if (type.equalsIgnoreCase(CredentialProofType.ECDSA.getTypeName()) || type.equalsIgnoreCase(CredentialProofType.SM2.getTypeName())) {
             String signature = proof.get(ParamKeyConstant.CREDENTIAL_SIGNATURE);
             if (StringUtils.isEmpty(signature) || !DataToolUtils.isValidBase64String(signature)) {
                 return ErrorCode.CREDENTIAL_SIGNATURE_BROKEN;
@@ -468,7 +469,7 @@ private static ErrorCode isCredentialProofValid(Map<String, String> proof) {
      * @return Context value in String.
      */
     public static String getDefaultCredentialProofType() {
-        return CredentialConstant.CredentialProofType.ECDSA.getTypeName();
+        return DataToolUtils.cryptoType == CryptoType.ECDSA_TYPE? CredentialProofType.ECDSA.getTypeName():CredentialProofType.SM2.getTypeName();
     }
 
     private static boolean isCredentialProofTypeValid(String type) {

src/test/java/com/webank/weid/util/TestSignatureUtils.java

@@ -28,7 +28,7 @@ public void testSignatureUtils()
         throws Exception {
 
         String privateKey =
-            "58317564669857453586637110679746175832914889677346286855728850144028639639411";
+            "58317564669857453586637110679736175832914889667346286865928840144018638639411";
         //CryptoKeyPair keyPair = com.webank.weid.blockchain.service.fisco.CryptoFisco.cryptoSuite.getKeyPairFactory().createKeyPair(new BigInteger(privateKey));
         //logger.info("publicKey:{} ", keyPair.getHexPublicKey());
         //BigInteger publicKey = DataToolUtils.publicKeyFromPrivate(new BigInteger(privateKey));
@@ -44,7 +44,7 @@ public void testSignatureUtils()
         //logger.info("privateKey:{}", keyPair.getHexPrivateKey());
 
         String str = "hello world...........................yes";
-        String encodedTransaction = "+QO0hAi2YVSFF0h25/+FF0h25/+Cr7KUBpkSD2WtUaFvOjCsTBmdGldzoWuAuQOEY171pQAAAAAAAAAAAAAAACjm35JDYfxrsw1HaGOliu0ub1toAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0xNjk1MzcxNzQ0NTA0AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcWRpZDp3ZWlkOjEwMToweDI4ZTZkZjkyNDM2MWZjNmJiMzBkNDc2ODYzYTU4YWVkMmU2ZjViNjgja2V5cy0zYTg2MDMzZCxFZDI1NTE5VmVyaWZpY2F0aW9uS2V5MjAyMCxkaWQ6d2VpZDoxMDE6MHgyOGU2ZGY5MjQzNjFmYzZiYjMwZDQ3Njg2M2E1OGFlZDJlNmY1YjY4LHo1cnJmM3VQQ2d3ek1CWjRqMnpuMWhZVzF2QWc2OFdUVTZTZFpFQnl3aUdGTnpUZWVZNHR4cFRZTDJHQnJRWmlIdVRjcXg5RjJ5dzlKUndKSjF0NVI2YzY1dG5KTDh2ZUN5VDg1cms2dXlrRGM2aDk0ZVZOSnh3QUg1NlI0OHRoRDd5RlR5VUVTR2RNenVId3oydThHdWRIWXVlZkJzdG1MRktFSjQ2V0tEdnZ4QjlDRlg0ZkZWaG85ZDFYRW9ranpaeVRSRTFFMktiOFg1NkZrU3NibjZCUgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAemRpZDp3ZWlkOjEwMToweDI4ZTZkZjkyNDM2MWZjNmJiMzBkNDc2ODYzYTU4YWVkMmU2ZjViNjgjMDRiOGQ4YWUsV2VJZGVudGl0eSxodHRwczovL2dpdGh1Yi5jb20vV2VCYW5rQmxvY2tjaGFpbi9XZUlkZW50aXR5AAAAAAAAAQGA";
+        String encodedTransaction = "+QO0hAi2YVuFF0h25/+FF0h25/+Cr7qUBpkSD2WtUaFvOjCsTBmdGldzoWuAuQOEY171pQAAAAAAAAAAAAAAAFsCVdizVm+rfGFI2R29uQi6Z7wQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAKgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA0xNjk2MDc0NDI0NjQ1AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABcmRpZDp3ZWlkOjEwMToweDViMDI1NWQ4YjM1NjZmYWI3YzYxNDhkOTFkYmRiOTA4YmE2N2JjMTAja2V5cy0xZjBlYzc1NyxFZDI1NTE5VmVyaWZpY2F0aW9uS2V5MjAyMCxkaWQ6d2VpZDoxMDE6MHg1YjAyNTVkOGIzNTY2ZmFiN2M2MTQ4ZDkxZGJkYjkwOGJhNjdiYzEwLHpOVDRBd1N4c3pDWldZOVJLakVqcFE0dFdMektEd2NDWndkRG9IaHNwSlZjRXNBenVLaHBkekhpWnNBYkd3YjNaaXFBSk5peVRVaVMyakExRlZnRU5Zb0xRalNkWDVQOG55Y2FyWHc2OWRRd2NxazNDN0V4NlFjOW8zOG5zWnZIbm1kc3J0WXdKN1FlM2p0TkRFUVZ4TndaSjN1cHhmR3E5eXBlZXU4ZDJoZm5VcXV3R3lUUmhMaEpmNTdQcU5XU2czMWRwYVBxNjVqeE1xdmVzTXpENVVobmgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAemRpZDp3ZWlkOjEwMToweDViMDI1NWQ4YjM1NjZmYWI3YzYxNDhkOTFkYmRiOTA4YmE2N2JjMTAjMDRiOGQ4YWUsV2VJZGVudGl0eSxodHRwczovL2dpdGh1Yi5jb20vV2VCYW5rQmxvY2tjaGFpbi9XZUlkZW50aXR5AAAAAAAAAQGA";
         byte[] decodeTransaction = DataToolUtils.base64Decode(encodedTransaction.getBytes());
         String decodeTransactionStr = new String(decodeTransaction);
         //address = DataToolUtils.addressFromPublic(new BigInteger(decodeTransaction));