FISCO-BCOS · cyjseagull · Sep 21, 2020 · Sep 21, 2020
diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/DagTransfer.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -51,9 +52,7 @@ protected DagTransfer(String contractAddress, Client client, CryptoInterface cre
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt userTransfer(String user_a, String user_b, BigInteger amount) {

diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/HelloWorld.java
@@ -13,6 +13,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -45,9 +46,7 @@ protected HelloWorld(String contractAddress, Client client, CryptoInterface cred
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt set(String n) {

diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/Ok.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.eventsub.EventCallback;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -54,9 +55,7 @@ protected Ok(String contractAddress, Client client, CryptoInterface credential)
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt trans(BigInteger num) {

diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/OkD.java
@@ -18,6 +18,7 @@
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.eventsub.EventCallback;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -55,9 +56,7 @@ protected OkD(String contractAddress, Client client, CryptoInterface credential)
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public BigInteger get() throws ContractException {

diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/ParallelOk.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -61,9 +62,7 @@ protected ParallelOk(String contractAddress, Client client, CryptoInterface cred
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt registerParallelFunction(

diff --git a/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java b/src/demo/java/org/fisco/bcos/sdk/demo/contract/TableTest.java
@@ -22,6 +22,7 @@
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.eventsub.EventCallback;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -92,9 +93,7 @@ protected TableTest(String contractAddress, Client client, CryptoInterface crede
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt update(String name, BigInteger item_id, String item_name) {

diff --git a/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java b/src/main/java/org/fisco/bcos/sdk/amop/topic/AmopMsgHandler.java
@@ -34,6 +34,7 @@
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.crypto.keystore.KeyManager;
 import org.fisco.bcos.sdk.model.AmopMsg;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.Message;
 import org.fisco.bcos.sdk.model.MsgType;
 import org.fisco.bcos.sdk.model.Response;
@@ -219,7 +220,7 @@ public int checkSignature(String topic, byte[] randomValue, byte[] signature) {
         Iterator<KeyManager> pks = pubKeys.iterator();
         while (pks.hasNext()) {
             KeyManager km = pks.next();
-            CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE);
+            CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE);
             if (cryptoInterface.verify(
                     km,
                     Hex.toHexString(cryptoInterface.hash(randomValue)),
@@ -255,7 +256,7 @@ public void onPrivateTopicRandomValue(ChannelHandlerContext ctx, AmopMsg msg) {
             logger.error("topic:{} not subscribed, reject message", getSimpleTopic(topic));
             return;
         } else {
-            CryptoInterface cryptoInterface = new CryptoInterface(CryptoInterface.ECDSA_TYPE);
+            CryptoInterface cryptoInterface = new CryptoInterface(CryptoType.ECDSA_TYPE);
             try {
                 signature =
                         cryptoInterface.sign(km, Hex.toHexString(cryptoInterface.hash(randValue)));

diff --git a/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java b/src/main/java/org/fisco/bcos/sdk/codegen/SolidityContractWrapper.java
@@ -58,6 +58,7 @@
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
 import org.fisco.bcos.sdk.eventsub.EventCallback;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 import org.fisco.bcos.sdk.utils.Collection;
@@ -117,7 +118,8 @@ public void generateJavaFiles(
         List<ABIDefinition> abiDefinitions = CodeGenUtils.loadContractAbiDefinition(abi);
         TypeSpec.Builder classBuilder = createClassBuilder(className, bin, smBin, abi);
 
-        classBuilder.addMethod(buildGetBinaryMethod(CryptoInterface.class, CREDENTIAL));
+        classBuilder.addMethod(
+                buildGetBinaryMethod(CryptoInterface.class, CryptoType.class, CREDENTIAL));
         classBuilder.addMethod(buildConstructor(CryptoInterface.class, CREDENTIAL));
 
         classBuilder.addFields(buildFuncNameConstants(abiDefinitions));
@@ -315,7 +317,8 @@ private Iterable<FieldSpec> buildFuncNameConstants(List<ABIDefinition> functionD
         return fields;
     }
 
-    private static MethodSpec buildGetBinaryMethod(Class authType, String authName) {
+    private static MethodSpec buildGetBinaryMethod(
+            Class authType, Class cryptoType, String authName) {
         MethodSpec.Builder toReturn =
                 MethodSpec.methodBuilder(GET_BINARY_FUNC)
                         .addParameter(authType, authName)
@@ -325,7 +328,7 @@ private static MethodSpec buildGetBinaryMethod(Class authType, String authName)
         toReturn.addStatement(
                 "return ($N.getCryptoTypeConfig() == $T.ECDSA_TYPE ? $N : $N)",
                 authName,
-                authType,
+                cryptoType,
                 BINARY_NAME,
                 SM_BINARY_NAME);
         return toReturn.build();

diff --git a/src/main/java/org/fisco/bcos/sdk/config/Config.java b/src/main/java/org/fisco/bcos/sdk/config/Config.java
@@ -20,7 +20,7 @@
 import java.io.IOException;
 import org.fisco.bcos.sdk.config.exceptions.ConfigException;
 import org.fisco.bcos.sdk.config.model.ConfigProperty;
-import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 
 /**
  * Config is to load config file and verify.
@@ -30,7 +30,7 @@
 public class Config {
     public static ConfigOption load(String tomlConfigFile) throws ConfigException {
         // default load ECDSA config
-        return load(tomlConfigFile, CryptoInterface.ECDSA_TYPE);
+        return load(tomlConfigFile, CryptoType.ECDSA_TYPE);
     }
     /**
      * @param tomlConfigFile

diff --git a/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java b/src/main/java/org/fisco/bcos/sdk/config/ConfigOption.java
@@ -23,7 +23,7 @@
 import org.fisco.bcos.sdk.config.model.CryptoMaterialConfig;
 import org.fisco.bcos.sdk.config.model.NetworkConfig;
 import org.fisco.bcos.sdk.config.model.ThreadPoolConfig;
-import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 
 /**
  * ConfigOption is the java object of the config file.
@@ -40,7 +40,7 @@ public class ConfigOption {
     private ConfigProperty configProperty;
 
     public ConfigOption(ConfigProperty configProperty) throws ConfigException {
-        this(configProperty, CryptoInterface.ECDSA_TYPE);
+        this(configProperty, CryptoType.ECDSA_TYPE);
     }
 
     public ConfigOption(ConfigProperty configProperty, int cryptoType) throws ConfigException {

diff --git a/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java b/src/main/java/org/fisco/bcos/sdk/config/model/CryptoMaterialConfig.java
@@ -18,7 +18,7 @@
 import java.io.File;
 import java.util.Map;
 import org.fisco.bcos.sdk.config.exceptions.ConfigException;
-import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -80,11 +80,11 @@ public CryptoMaterialConfig getDefaultCaCertPath(int cryptoType, String certPath
         CryptoMaterialConfig cryptoMaterialConfig = new CryptoMaterialConfig();
         cryptoMaterialConfig.setCertPath(certPath);
         String smDir = "gm";
-        if (cryptoType == CryptoInterface.ECDSA_TYPE) {
+        if (cryptoType == CryptoType.ECDSA_TYPE) {
             cryptoMaterialConfig.setCaCertPath(certPath + File.separator + "ca.crt");
             cryptoMaterialConfig.setSdkCertPath(certPath + File.separator + "sdk.crt");
             cryptoMaterialConfig.setSdkPrivateKeyPath(certPath + File.separator + "sdk.key");
-        } else if (cryptoType == CryptoInterface.SM_TYPE) {
+        } else if (cryptoType == CryptoType.SM_TYPE) {
             cryptoMaterialConfig.setCaCertPath(
                     certPath + File.separator + smDir + File.separator + "gmca.crt");
             cryptoMaterialConfig.setSdkCertPath(

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/cns/CNSPrecompiled.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -49,9 +50,7 @@ protected CNSPrecompiled(String contractAddress, Client client, CryptoInterface
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public String selectByName(String name) throws ContractException {

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/consensus/ConsensusPrecompiled.java
@@ -15,6 +15,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -46,9 +47,7 @@ protected ConsensusPrecompiled(
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt addObserver(String param0) {

diff --git a/...ava/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java b/...ava/org/fisco/bcos/sdk/contract/precompiled/contractmgr/ContractLifeCyclePrecompiled.java
@@ -18,6 +18,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -53,9 +54,7 @@ protected ContractLifeCyclePrecompiled(
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public Tuple2<BigInteger, String> getStatus(String addr) throws ContractException {

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/CRUD.java
@@ -18,6 +18,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -52,9 +53,7 @@ protected CRUD(String contractAddress, Client client, CryptoInterface credential
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt update(

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/crud/table/TableFactory.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -45,9 +46,7 @@ protected TableFactory(String contractAddress, Client client, CryptoInterface cr
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt createTable(String param0, String param1, String param2) {

diff --git a/...n/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java b/...n/java/org/fisco/bcos/sdk/contract/precompiled/permission/ChainGovernancePrecompiled.java
@@ -18,6 +18,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -69,9 +70,7 @@ protected ChainGovernancePrecompiled(
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public String listOperators() throws ContractException {

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/permission/PermissionPrecompiled.java
@@ -17,6 +17,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -54,9 +55,7 @@ protected PermissionPrecompiled(
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt insert(String table_name, String addr) {

diff --git a/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java b/src/main/java/org/fisco/bcos/sdk/contract/precompiled/sysconfig/SystemConfigPrecompiled.java
@@ -16,6 +16,7 @@
 import org.fisco.bcos.sdk.contract.Contract;
 import org.fisco.bcos.sdk.contract.exceptions.ContractException;
 import org.fisco.bcos.sdk.crypto.CryptoInterface;
+import org.fisco.bcos.sdk.model.CryptoType;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.transaction.model.callback.TransactionCallback;
 
@@ -43,9 +44,7 @@ protected SystemConfigPrecompiled(
     }
 
     public static String getBinary(CryptoInterface credential) {
-        return (credential.getCryptoTypeConfig() == CryptoInterface.ECDSA_TYPE
-                ? BINARY
-                : SM_BINARY);
+        return (credential.getCryptoTypeConfig() == CryptoType.ECDSA_TYPE ? BINARY : SM_BINARY);
     }
 
     public TransactionReceipt setValueByKey(String key, String value) {