Merge pull request #292 from WeBankFinTech/release/1.8.0

Release/1.8.0

Author: junqizhang-dev

CHANGELOG.md

@@ -1,3 +1,11 @@
+### V1.7.0
+Features: 
+1. FISCO BCOS 1.3.x support is fully removed - please use the FISCO BCOS 2.x node version respectively.
+2. Evidence and WeIdDocument query performance improved due to support batch type blockchain node data lookup.
+3. Authority Issuer can be registered by any WeID while only administrator can recognize.
+4. Greatly enhanced WeID-Build-Tools functionalities.
+5. Persistence now supports Redis as storage layer.
+
 ### V1.6.3-hotfix-1 (2020-08-26)
 - Bugfixes:
 1. Use batch block transaction receipts getter to improve evidence performance.

VERSION

@@ -1 +1 @@
-1.7.1
+1.8.0

build.gradle

@@ -153,7 +153,7 @@ dependencies {
     localDeps 'org.projectlombok:lombok:1.18.10'
     if (!gradle.startParameter.isOffline()) {
         compile logger, lombok, apache_commons, json, mysql_driver, redisson, zxing, rpc, pdfbox, protobuf, caffeine, oval
-        compile("com.webank:weid-contract-java:1.2.28") {
+        compile("com.webank:weid-contract-java:1.2.29") {
             exclude group: "org.slf4j", module: "slf4j-log4j12"
         }
         compile fileTree(dir: 'lib', include: '*.jar')

docs/zh_CN/docs/weidentity-java-sdk-doc.rst

@@ -13752,7 +13752,7 @@ com.webank.weid.protocol.base.CredentialPojo
 
    // Enforce a Register/Update system CPT first
    WeIdAuthentication sdkAuthen = new WeIdAuthentication();
-   ECKeyPair keyPair = ECKeyPair.create(new BigInteger(privateKey));
+   ECKeyPair keyPair = DataToolUtils.createKeyPairFromPrivate(privateKey);
    String keyWeId = WeIdUtils
        .convertAddressToWeId(new Address(Keys.getAddress(keyPair)).toString());
    sdkAuthen.setWeId(keyWeId);

src/main/java/com/webank/weid/config/FiscoConfig.java

@@ -132,6 +132,26 @@ public class FiscoConfig {
     @NotNull(message = "the v2.node-key-path is undefined")
     @NotEmpty(message = "the value of v2.node-key-path is null")
     private String v2NodeKeyPath;
+
+    @NotNull(message = "the gm.ca-crt-path is undefined")
+    @NotEmpty(message = "the value of gm.ca-crt-path is null")
+    private String gmCaCrtPath;
+
+    @NotNull(message = "the gm.sdk-crt-path is undefined")
+    @NotEmpty(message = "the value of gm.sdk-crt-path is null")
+    private String gmSdkCrtPath;
+
+    @NotNull(message = "the gm.sdk-key-path is undefined")
+    @NotEmpty(message = "the value of gm.sdk-key-path is null")
+    private String gmSdkKeyPath;
+
+    @NotNull(message = "the gmen.sdk-crt-path is undefined")
+    @NotEmpty(message = "the value of gmen.sdk-crt-path is null")
+    private String gmenSdkCrtPath;
+
+    @NotNull(message = "the gmen.sdk-key-path is undefined")
+    @NotEmpty(message = "the value of gmen.sdk-key-path is null")
+    private String gmenSdkKeyPath;
 
     @NotNull(message = "the blockchain.orgid is undefined")
     @NotEmpty(message = "the value of blockchain.orgid is null")
@@ -174,6 +194,11 @@ public boolean load() {
             v2CaCrtPath = PropertyUtils.getProperty("v2.ca-crt-path");
             v2NodeCrtPath = PropertyUtils.getProperty("v2.node-crt-path");
             v2NodeKeyPath = PropertyUtils.getProperty("v2.node-key-path");
+            gmCaCrtPath = PropertyUtils.getProperty("gm.ca-crt-path");
+            gmSdkCrtPath = PropertyUtils.getProperty("gm.sdk-crt-path");
+            gmSdkKeyPath = PropertyUtils.getProperty("gm.sdk-key-path");
+            gmenSdkCrtPath = PropertyUtils.getProperty("gmen.sdk-crt-path");
+            gmenSdkKeyPath = PropertyUtils.getProperty("gmen.sdk-key-path");
             currentOrgId = PropertyUtils.getProperty("blockchain.orgid");
             amopId = PropertyUtils.getProperty("amop.id");
             cnsContractFollow = PropertyUtils.getProperty("cns.contract.follow");

src/main/java/com/webank/weid/protocol/cpt/Cpt109.java

@@ -19,6 +19,8 @@
 
 package com.webank.weid.protocol.cpt;
 
+import com.github.reinert.jjschema.Attributes;
+
 import lombok.Data;
 
 /**
@@ -28,6 +30,8 @@
  */
 
 @Data
+@Attributes(title = "Trusted Timestamp", 
+    description = "Trusted Timestamp from authorized 3rd-party, or chain consensus")
 public class Cpt109 {
 
     /**

src/main/java/com/webank/weid/protocol/response/WeIdListResult.java

@@ -0,0 +1,17 @@
+package com.webank.weid.protocol.response;
+
+import java.util.List;
+
+import lombok.Data;
+
+/**
+ * get WeId and errorCode by pubkeyList response.
+ *
+ */
+@Data
+public class WeIdListResult {
+
+    private List<String> weIdList;
+
+    private List<Integer> errorCodeList;
+}

src/main/java/com/webank/weid/rpc/AuthorityIssuerService.java

@@ -169,4 +169,10 @@ ResponseData<List<String>> getAllSpecificTypeIssuerList(
      * @return WeID
      */
     ResponseData<String> getWeIdByOrgId(String orgId);
+    
+    /**
+     * get the issuer count.
+     * @return the all issuer
+     */
+    ResponseData<Integer> getIssuerCount();
 }

src/main/java/com/webank/weid/rpc/CptService.java

@@ -19,6 +19,8 @@
 
 package com.webank.weid.rpc;
 
+import java.util.List;
+
 import com.webank.wedpr.selectivedisclosure.CredentialTemplateEntity;
 
 import com.webank.weid.protocol.base.Cpt;
@@ -101,4 +103,20 @@ public interface CptService {
      * @return The updated CPT info
      */
     ResponseData<CredentialTemplateEntity> queryCredentialTemplate(Integer cptId);
+    
+    /**
+     * Get CPTIDS from chain.
+     *
+     * @param startPos start position
+     * @param num batch number
+     * @return CPTID list
+     */
+    ResponseData<List<Integer>> getCptIdList(Integer startPos, Integer num);
+    
+    /**
+     * Get CPT count.
+     *
+     * @return the cpt count
+     */
+    ResponseData<Integer> getCptCount();
 }

src/main/java/com/webank/weid/rpc/PolicyService.java

@@ -86,4 +86,11 @@ ResponseData<Integer> registerPresentationPolicy(List<Integer> claimPolicyIdList
      * @return claim policy list
      */
     ResponseData<List<Integer>> getAllClaimPolicies(Integer startPos, Integer num);
+    
+    /**
+     * Get Policy count.
+     *
+     * @return the Policy count
+     */
+    ResponseData<Integer> getPolicyCount();
 }