Merge pull request #227 from youwenbusi/develop

v3.0.0 final commit

Author: youwenbusi

CHANGELOG.md

@@ -1,3 +1,8 @@
+### V3.0.0 (2022-12-15)
+* 优化功能:
+1. 修复registerPolicy失败和部署Evidence合约失败
+2. 集成weid-java-sdk 3.0.0和weid-kit 3.0.0
+
 ### V1.3.1 (2022-10-14)
 * 优化功能:
 1. 前端获取weid列表的方式改变

VERSION

@@ -1 +1 @@
-1.3.1-rc2-SNAPSHOT
+3.0.0-rc.1

build.gradle

@@ -35,7 +35,7 @@ def repo ="${repoType}"
 sourceCompatibility = 1.8
 targetCompatibility = 1.8
 
-[compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
+[compileJava, compileTestJava, javadoc]*.options*.encoding = 'utf-8'
 
 // In this section you declare where to find the dependencies of your project
 repositories {
@@ -127,6 +127,10 @@ configurations {
    all*.exclude group: "org.apache.logging.log4j", module: "log4j-to-slf4j"
 }
 
+configurations.all {
+    resolutionStrategy.cacheChangingModulesFor 0, 'seconds'
+}
+
 // In this section you declare the dependencies for your production and test code
 dependencies {
     localDeps lombok
@@ -142,6 +146,7 @@ dependencies {
                 exclude group: "javax.validation", module: "validation-api"
                 exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
             }
+            compile("com.webank:weid-kit:3.0.0-rc.1")
         }
     }
     if (gradleVer.startsWith("5")) {
@@ -154,6 +159,7 @@ dependencies {
                 exclude group: "javax.validation", module: "validation-api"
                 exclude group: "org.codehaus.jackson", module: "jackson-mapper-asl"
             }
+            compile("com.webank:weid-kit:3.0.0-rc.1")
         } else {
             compileOnly files('dist/lib/lombok-1.18.12.jar')
             annotationProcessor files('dist/lib/lombok-1.18.12.jar')
@@ -187,7 +193,7 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
 artifacts {
     archives jar
     archives sourcesJar
-    //archives javadocJar
+    archives javadocJar
 }
 
 
@@ -318,9 +324,9 @@ signing {
 }
 
 gradle.taskGraph.whenReady { taskGraph ->
-    if (taskGraph.allTasks.any { it.name == 'build' || it.name == 'assemble' }) {
+    if (taskGraph.allTasks.any { it.name == 'build' || it.name == 'signDocsJar' || it.name == 'assemble' }) {
         tasks.findAll {
-            it.name == 'signArchives' || it.name == 'signDocsJar' || it.name == 'signTestJar'
+            it.name == 'signArchives' || it.name == 'signTestJar'
         }.each { task ->
             task.enabled = false
         }

common/script/tpl/weidentity.properties.tpl

@@ -14,7 +14,6 @@ chain.id=${CHAIN_ID}
 amop.request.timeout=5000
 
 amop.id=${AMOP_ID}
-amop.privateKey="xeewrwervvwv"
 
 # Blockchain node info.
 nodes=${BLOCKCHIAN_NODE_INFO}

gradle.properties

@@ -1,5 +1,5 @@
 org.gradle.jvmargs='-Dfile.encoding=UTF-8'
-weidSdkVersion=1.8.6-rc.3-SNAPSHOT
+weidSdkVersion=3.0.0-rc.1
 repoType=zn
 jdkTlsNamedGroups=secp256r1,secp256k1
 signing.keyId=

run.config

@@ -5,13 +5,13 @@
 #fill with your node ip and channel_listen_port, example: 0.0.0.0:20200
 #if you have more than one node ,you can put them with separator","
 #for example: 0.0.0.0:20200,0:0:0:1:20200 
-blockchain_address=127.0.0.1:23200
+blockchain_address=127.0.0.1:25200
 
 #this build tool supports FISCO BCOS 2.0 and FISCO BCOS 3.0
 #if you want to build on FISCO BCOS 2.0, please fill with "2".
 #if you want to build on FISCO BCOS 3.0, please fill with "3".
 #and default value is "2" with FISCO BCOS 2.0.
-blockchain_fiscobcos_version=2
+blockchain_fiscobcos_version=3
 
 #your organization name, used for communication on blockchain.
 org_id=webank
@@ -23,7 +23,7 @@ amop_id=11
 chain_id=1
 
 #group id
-group_id=1
+group_id=group0
 
 #sdk use sm ssl, 0:非国密；1:国密
 sm_crypto=1
@@ -41,4 +41,4 @@ redis_password=
 #"stg" to set the test environment, "prd" to set the production environment.
 #If you do not set it, the system will use allOrg as the environment by default. 
 #It is not recommended. Production use default configuration
-cns_profile_active=prdabe
+cns_profile_active=prdabf

src/main/java/com/webank/weid/command/DeployContract.java

@@ -2,25 +2,24 @@
 
 package com.webank.weid.command;
 
-import com.webank.weid.contract.deploy.v3.DeployContractV3;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
 import com.beust.jcommander.JCommander;
-import com.webank.weid.config.ContractConfig;
-import com.webank.weid.config.FiscoConfig;
+import com.webank.weid.blockchain.config.ContractConfig;
+import com.webank.weid.blockchain.config.FiscoConfig;
+import com.webank.weid.blockchain.constant.CnsType;
+import com.webank.weid.blockchain.deploy.v2.DeployContractV2;
+import com.webank.weid.blockchain.deploy.v3.DeployContractV3;
 import com.webank.weid.config.StaticConfig;
-import com.webank.weid.constant.CnsType;
 import com.webank.weid.constant.DataFrom;
-import com.webank.weid.contract.deploy.v2.DeployContractV2;
 import com.webank.weid.dto.DeployInfo;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
 import com.webank.weid.service.ConfigService;
 import com.webank.weid.service.ContractService;
 import com.webank.weid.service.GuideService;
 import com.webank.weid.util.FileUtils;
 import com.webank.weid.util.WeIdSdkUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import static com.webank.weid.constant.ChainVersion.FISCO_V2;
 
@@ -69,9 +68,9 @@ public static void main(String[] args) {
         WeIdPrivateKey currentPrivateKey = WeIdSdkUtils.getCurrentPrivateKey();
         // 写入全局配置中
         if (FISCO_V2.getVersion() == Integer.parseInt(fiscoConfig.getVersion())) {
-            DeployContractV2.putGlobalValue(fiscoConfig, contract, currentPrivateKey);
+            DeployContractV2.putGlobalValue(fiscoConfig, contract, currentPrivateKey.getPrivateKey());
         } else {
-            DeployContractV3.putGlobalValue(fiscoConfig, contract, currentPrivateKey);
+            DeployContractV3.putGlobalValue(fiscoConfig, contract, currentPrivateKey.getPrivateKey());
 
         }
         System.out.println("begin enable the hash.");

src/main/java/com/webank/weid/command/DeployEvidence.java

@@ -2,16 +2,15 @@
 
 package com.webank.weid.command;
 
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-
 import com.beust.jcommander.JCommander;
-import com.webank.weid.config.FiscoConfig;
+import com.webank.weid.blockchain.config.FiscoConfig;
 import com.webank.weid.config.StaticConfig;
 import com.webank.weid.constant.DataFrom;
 import com.webank.weid.service.ContractService;
 import com.webank.weid.service.GuideService;
 import com.webank.weid.util.WeIdSdkUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 
 public class DeployEvidence extends StaticConfig {
 
@@ -47,7 +46,7 @@ public static void main(String[] args) {
             System.out.println("[DeployEvidence] the evidence deploy successfully, cns --> " + hash);
             System.exit(0);
         } else {
-            System.out.println("[DeployEvidence] the evidence deploy faile， please check the log.");
+            System.out.println("[DeployEvidence] the evidence deploy fail， please check the log.");
             System.exit(1);
         }
 

src/main/java/com/webank/weid/command/RegistCpt.java

@@ -2,12 +2,6 @@
 
 package com.webank.weid.command;
 
-import java.io.File;
-import java.io.IOException;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-
 import com.beust.jcommander.JCommander;
 import com.webank.weid.config.StaticConfig;
 import com.webank.weid.constant.DataFrom;
@@ -16,11 +10,16 @@
 import com.webank.weid.protocol.base.WeIdAuthentication;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
 import com.webank.weid.protocol.response.ResponseData;
-import com.webank.weid.rpc.WeIdService;
-import com.webank.weid.service.impl.WeIdServiceImpl;
 import com.webank.weid.service.WeIdSdkService;
+import com.webank.weid.service.impl.WeIdServiceImpl;
+import com.webank.weid.service.rpc.WeIdService;
 import com.webank.weid.util.FileUtils;
 import com.webank.weid.util.WeIdSdkUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.io.File;
+import java.io.IOException;
 
 /**
  * @author tonychen 2019/4/11

src/main/java/com/webank/weid/command/RegisterEvidenceByGroup.java

@@ -2,32 +2,32 @@
 
 package com.webank.weid.command;
 
-import com.webank.weid.constant.ChainVersion;
-import com.webank.weid.contract.deploy.v3.RegisterAddressV3;
-import java.math.BigInteger;
-
-import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.math.NumberUtils;
-
 import com.beust.jcommander.JCommander;
-import com.webank.weid.config.FiscoConfig;
-import com.webank.weid.constant.CnsType;
+import com.webank.weid.blockchain.config.FiscoConfig;
+import com.webank.weid.blockchain.constant.CnsType;
+import com.webank.weid.blockchain.deploy.v2.RegisterAddressV2;
+import com.webank.weid.blockchain.deploy.v3.RegisterAddressV3;
+import com.webank.weid.blockchain.service.fisco.BaseServiceFisco;
+import com.webank.weid.blockchain.service.fisco.CryptoFisco;
+import com.webank.weid.blockchain.service.fisco.server.WeServer;
+import com.webank.weid.constant.ChainVersion;
 import com.webank.weid.constant.WeIdConstant;
 import com.webank.weid.contract.deploy.AddressProcess;
-import com.webank.weid.contract.deploy.v2.RegisterAddressV2;
 import com.webank.weid.contract.v2.DataBucket;
 import com.webank.weid.protocol.base.WeIdPrivateKey;
-import com.webank.weid.service.BaseService;
-import com.webank.weid.service.fisco.WeServer;
 import com.webank.weid.util.DataToolUtils;
 import com.webank.weid.util.WeIdSdkUtils;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.math.NumberUtils;
 import org.fisco.bcos.sdk.abi.datatypes.generated.Bytes32;
 import org.fisco.bcos.sdk.abi.datatypes.generated.tuples.generated.Tuple2;
 import org.fisco.bcos.sdk.client.Client;
 import org.fisco.bcos.sdk.crypto.keypair.CryptoKeyPair;
 import org.fisco.bcos.sdk.v3.crypto.CryptoSuite;
 
+import java.math.BigInteger;
+
 /**
  *  todo support v3 test
  * @author marsli
@@ -64,7 +64,7 @@ public static void main(String[] args) {
             System.out.println("[RegisterEvidenceByGroup] begin register evidenceAddress by cns and groupId, cns = "+ cns + ", groupId = " + goupIdStr);
             // 检查群组是否存在
             String groupId = goupIdStr;
-            boolean checkGroupId = BaseService.checkGroupId(goupIdStr);
+            boolean checkGroupId = BaseServiceFisco.checkGroupId(goupIdStr);
             if (!checkGroupId) {
                 System.out.println("[RegisterEvidenceByGroup] input error, the group does not exists, Abort.");
                 System.exit(1);
@@ -77,7 +77,7 @@ public static void main(String[] args) {
             WeServer<?, ?, ?> weServer = WeServer.getInstance(fiscoConfig, groupId);
             // v2 chain
             if (ChainVersion.FISCO_V2.getVersion() == Integer.parseInt(fiscoConfig.getVersion())) {
-                CryptoKeyPair credentials = DataToolUtils.cryptoSuite.getKeyPairFactory()
+                CryptoKeyPair credentials = CryptoFisco.cryptoSuite.getKeyPairFactory()
                     .createKeyPair(new BigInteger(privatekey));
                 // 加载DataBucket
                 DataBucket dataBucket = DataBucket.load(
@@ -102,7 +102,7 @@ public static void main(String[] args) {
                 // 将地址注册到cns中
                 CnsType cnsType = CnsType.SHARE;
                 // 注册SHARE CNS 默认主群组
-                RegisterAddressV2.registerBucketToCns(cnsType, currentPrivateKey);
+                RegisterAddressV2.registerBucketToCns(cnsType, currentPrivateKey.getPrivateKey());
                 // 根据群组和evidence Address获取hash
                 String hash = AddressProcess.getHashForShare(groupId, evidenceAddress);
                 // 将evidence地址注册到cns中 默认主群组
@@ -111,19 +111,19 @@ public static void main(String[] args) {
                     hash,
                     evidenceAddress,
                     WeIdConstant.CNS_EVIDENCE_ADDRESS,
-                    currentPrivateKey
+                    currentPrivateKey.getPrivateKey()
                 );
                 // 将群组编号注册到cns中 默认主群组
                 RegisterAddressV2.registerAddress(
                     cnsType,
                     hash,
                     groupId,
                     WeIdConstant.CNS_GROUP_ID,
-                    currentPrivateKey
+                    currentPrivateKey.getPrivateKey()
                 );
             } else {
                 org.fisco.bcos.sdk.v3.crypto.keypair.CryptoKeyPair credentials =
-                    new CryptoSuite(DataToolUtils.cryptoSuite.getCryptoTypeConfig()).getKeyPairFactory()
+                    new CryptoSuite(CryptoFisco.cryptoSuite.getCryptoTypeConfig()).getKeyPairFactory()
                     .createKeyPair(new BigInteger(privatekey));
                 // 加载DataBucket
                 com.webank.weid.contract.v3.DataBucket dataBucket =
@@ -150,7 +150,7 @@ public static void main(String[] args) {
                 // 将地址注册到cns中
                 CnsType cnsType = CnsType.SHARE;
                 // 注册SHARE CNS 默认主群组
-                RegisterAddressV3.registerBucketToCns(cnsType, currentPrivateKey);
+                RegisterAddressV3.registerBucketToCns(cnsType, currentPrivateKey.getPrivateKey());
                 // 根据群组和evidence Address获取hash
                 String hash = AddressProcess.getHashForShare(groupId, evidenceAddress);
                 // 将evidence地址注册到cns中 默认主群组
@@ -159,15 +159,15 @@ public static void main(String[] args) {
                     hash,
                     evidenceAddress,
                     WeIdConstant.CNS_EVIDENCE_ADDRESS,
-                    currentPrivateKey
+                    currentPrivateKey.getPrivateKey()
                 );
                 // 将群组编号注册到cns中 默认主群组
                 RegisterAddressV3.registerAddress(
                     cnsType,
                     hash,
                     groupId,
                     WeIdConstant.CNS_GROUP_ID,
-                    currentPrivateKey
+                    currentPrivateKey.getPrivateKey()
                 );
 
             }