remove check of password

Author: MaggieNgWu

sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/AccountConfig.java

@@ -15,12 +15,12 @@
 
 package org.fisco.bcos.sdk.config.model;
 
-import static org.fisco.bcos.sdk.model.CryptoProviderType.HSM;
-import static org.fisco.bcos.sdk.model.CryptoProviderType.SSM;
+import org.fisco.bcos.sdk.config.exceptions.ConfigException;
 
 import java.util.Map;
 import java.util.Objects;
-import org.fisco.bcos.sdk.config.exceptions.ConfigException;
+
+import static org.fisco.bcos.sdk.model.CryptoProviderType.SSM;
 
 /** Account configuration */
 public class AccountConfig {
@@ -55,12 +55,6 @@ private void checkAccountConfig(ConfigProperty configProperty) throws ConfigExce
         Map<String, Object> cryptoProvider = configProperty.getCryptoProvider();
         if (cryptoProvider != null) {
             String cryptoType = ConfigProperty.getValue(cryptoProvider, "type", SSM);
-            if (cryptoType != null && cryptoType.equals(HSM)) {
-                if (!this.accountKeyIndex.equals("") && this.accountPassword.equals("")) {
-                    throw new ConfigException(
-                            "cannot load hsm inner key, please config the password");
-                }
-            }
         }
         if (this.accountAddress.equals("")) {
             return;

sdk-crypto/src/main/java/org/fisco/bcos/sdk/crypto/CryptoSuite.java

@@ -13,9 +13,6 @@
  */
 package org.fisco.bcos.sdk.crypto;
 
-import static org.fisco.bcos.sdk.model.CryptoProviderType.HSM;
-
-import java.security.KeyPair;
 import org.fisco.bcos.sdk.config.ConfigOption;
 import org.fisco.bcos.sdk.config.model.AccountConfig;
 import org.fisco.bcos.sdk.config.model.CryptoProviderConfig;
@@ -41,6 +38,10 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.security.KeyPair;
+
+import static org.fisco.bcos.sdk.model.CryptoProviderType.HSM;
+
 public class CryptoSuite {
 
     private static Logger logger = LoggerFactory.getLogger(CryptoSuite.class);
@@ -106,6 +107,7 @@ protected void initCryptoSuite(int cryptoTypeConfig) {
             this.hashImpl = new Keccak256();
             this.keyPairFactory = new ECDSAKeyPair();
         } else if (cryptoTypeConfig == CryptoType.SM_HSM_TYPE) {
+            logger.info("Use hsm crypto");
             this.signatureImpl = new SDFSM2Signature();
             this.hashImpl = new SDFSM3Hash();
             this.keyPairFactory = new SDFSM2KeyPair();
@@ -149,7 +151,7 @@ public void loadAccount(String accountFileFormat, String accountFilePath, String
                             + accountFileFormat
                             + ", current supported are p12 and pem");
         }
-        logger.debug("Load account from {}", accountFilePath);
+        logger.info("Load account from {}", accountFilePath);
         createKeyPair(keyTool.getKeyPair());
     }
 
@@ -162,10 +164,13 @@ private void loadAccount(ConfigOption configOption) {
         AccountConfig accountConfig = configOption.getAccountConfig();
         CryptoProviderConfig cryptoProviderConfig = config.getCryptoProviderConfig();
         String cryptoType = cryptoProviderConfig.getType();
+        logger.debug("cryptoType = "+ cryptoType);
         if (cryptoType != null && cryptoType.equals(HSM)) {
+            logger.debug("use hsm key");
             String accountKeyIndex = accountConfig.getAccountKeyIndex();
-            if (accountKeyIndex != null && !accountKeyIndex.equals("")) {
+            if (accountKeyIndex != null) {
                 loadSDFInternalAccount(accountKeyIndex, accountConfig.getAccountPassword());
+                logger.debug("Load sdf internal account, keyIndex = ", accountKeyIndex);
                 return;
             }
         }

sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/codec/encode/TransactionEncoderInterface.java

@@ -30,7 +30,7 @@ public interface TransactionEncoderInterface {
      *
      * @param rawTransaction data to be encoded
      * @param signature signature result
-     * @return encoded & signed transaction byte array
+     * @return encoded and signed transaction byte array
      */
     byte[] encode(RawTransaction rawTransaction, SignatureResult signature);
 
@@ -39,7 +39,7 @@ public interface TransactionEncoderInterface {
      *
      * @param rawTransaction data to be encoded
      * @param cryptoKeyPair keypair
-     * @return encoded & signed transaction byte array
+     * @return encoded and signed transaction byte array
      */
     byte[] encodeAndSignBytes(RawTransaction rawTransaction, CryptoKeyPair cryptoKeyPair);
 
@@ -48,7 +48,7 @@ public interface TransactionEncoderInterface {
      *
      * @param rawTransaction data to be encoded
      * @param cryptoKeyPair keypair
-     * @return encoded & signed transaction hexed String
+     * @return encoded and signed transaction hexed String
      */
     String encodeAndSign(RawTransaction rawTransaction, CryptoKeyPair cryptoKeyPair);
 
@@ -57,7 +57,7 @@ public interface TransactionEncoderInterface {
      *
      * @param rawTransaction data to be encoded
      * @param cryptoKeyPair keypair
-     * @return encoded & hashed transaction byte array
+     * @return encoded and hashed transaction byte array
      */
     byte[] encodeAndHashBytes(RawTransaction rawTransaction, CryptoKeyPair cryptoKeyPair);
 }

sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorInterface.java

@@ -14,9 +14,6 @@
  */
 package org.fisco.bcos.sdk.transaction.manager;
 
-import java.math.BigInteger;
-import java.util.List;
-import java.util.concurrent.CompletableFuture;
 import org.fisco.bcos.sdk.abi.ABICodecException;
 import org.fisco.bcos.sdk.model.TransactionReceipt;
 import org.fisco.bcos.sdk.model.callback.TransactionCallback;
@@ -27,6 +24,10 @@
 import org.fisco.bcos.sdk.transaction.model.exception.TransactionBaseException;
 import org.fisco.bcos.sdk.transaction.model.po.RawTransaction;
 
+import java.math.BigInteger;
+import java.util.List;
+import java.util.concurrent.CompletableFuture;
+
 public interface AssembleTransactionProcessorInterface {
 
     /**
@@ -50,7 +51,7 @@ public interface AssembleTransactionProcessorInterface {
      * deploy contract to fisco bcos node and get response.
      *
      * @param abi contract abi, which could be obtained by compiling solidity contract.
-     * @param signedData signed & encoded constructor data
+     * @param signedData signed and encoded constructor data
      * @return transaction response @See TransactionResponse
      */
     public TransactionResponse deployAndGetResponse(String abi, String signedData);
@@ -101,7 +102,7 @@ public CompletableFuture<TransactionReceipt> deployAsync(
 
     /**
      * deploy contract to fisco bcos node and get response by contract name. The contract loader
-     * will load the transaction abi & bin information.
+     * will load the transaction abi and bin information.
      *
      * @param contractName contract name.
      * @param params contract construct parameters
@@ -112,7 +113,7 @@ public TransactionResponse deployByContractLoader(String contractName, List<Obje
 
     /**
      * deploy contract to fisco bcos node and get response by contract name asynchronously. The
-     * contract loader will load the transaction abi & bin information.
+     * contract loader will load the transaction abi and bin information.
      *
      * @param contractName contract name.
      * @param params contract construct parameters
@@ -125,13 +126,13 @@ public void deployByContractLoaderAsync(
     /**
      * send transaction only.
      *
-     * @param signedData signed & encoded transaction data
+     * @param signedData signed and encoded transaction data
      */
     public void sendTransactionOnly(String signedData);
 
     /**
      * send transaction to fisco bcos node and get transaction receipt by contract name. The
-     * contract loader will load the transaction abi & bin information.
+     * contract loader will load the transaction abi and bin information.
      *
      * @param contractName contract name.
      * @param contractAddress contract address
@@ -185,7 +186,7 @@ public TransactionResponse sendTransactionWithStringParamsAndGetResponse(
     /**
      * send transaction to fisco bcos node asynchronously.
      *
-     * @param signedTransaction signed & encoded transaction data
+     * @param signedTransaction signed and encoded transaction data
      * @param callback transaction with callback function
      */
     public void sendTransactionAsync(String signedTransaction, TransactionCallback callback);
@@ -211,7 +212,7 @@ public void sendTransactionAsync(
     /**
      * send transaction to fisco bcos node asynchronously.
      *
-     * @param signedData signed & encoded transaction data
+     * @param signedData signed and encoded transaction data
      * @return CompletableFuture wrapper transaction receipt
      */
     public CompletableFuture<TransactionReceipt> sendTransactionAsync(String signedData);

sdk-transaction/src/main/java/org/fisco/bcos/sdk/transaction/tools/ContractLoader.java

@@ -14,13 +14,6 @@
  */
 package org.fisco.bcos.sdk.transaction.tools;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.tuple.Pair;
@@ -34,6 +27,14 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
 /**
  * ContractLoader @Description: ContractLoader
  *
@@ -47,7 +48,7 @@ public class ContractLoader {
     private Map<String, String> contractAbiMap = new HashMap<>();
 
     /**
-     * create ContractLoader, which load abi & binary files from configured file path
+     * create ContractLoader, which load abi and binary files from configured file path
      *
      * @param abiFilePath abi files path which are compiled by solc from solidity files. Don't
      *     support recursive directories.