Merge pull request #434 from kyonRay/release-3.1.0

<fix>(codec): fix abi bytesN codec.

Author: kyonRay

sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/ABICodec.java

@@ -213,7 +213,11 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
             }
 
             if (typeStr.equals("bytes")) {
-                type = new DynamicBytes(param.getBytes());
+                byte[] bytes = ABICodecJsonWrapper.tryDecodeInputData(param);
+                if (bytes == null) {
+                    bytes = param.getBytes();
+                }
+                type = new DynamicBytes(bytes);
                 return type;
             }
 
@@ -222,6 +226,7 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
                 return type;
             }
 
+            // static bytesN
             if (typeStr.startsWith("bytes")) {
                 String lengthStr = typeStr.substring("bytes".length());
                 int length;
@@ -238,22 +243,19 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
                     logger.error(errorMsg);
                     throw new ABICodecException(errorMsg);
                 }
-
-                JsonNode jsonNode = this.objectMapper.readTree(param);
-                assert jsonNode.isArray();
-                if (jsonNode.size() != length) {
+                byte[] bytesN = ABICodecJsonWrapper.tryDecodeInputData(param);
+                if (bytesN == null) {
+                    bytesN = param.getBytes();
+                }
+                if (bytesN.length != length) {
                     String errorMsg =
                             String.format(
                                     "expected byte array at length %d but length of provided in data is %d",
-                                    length, jsonNode.size());
+                                    length, bytesN.length);
                     logger.error(errorMsg);
                     throw new ABICodecException(errorMsg);
                 }
 
-                byte[] bytes = new byte[jsonNode.size()];
-                for (int i = 0; i < jsonNode.size(); ++i) {
-                    bytes[i] = ((byte) jsonNode.get(i).asInt());
-                }
                 try {
                     Class<?> bytesClass =
                             Class.forName(
@@ -262,7 +264,7 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
                             (Type)
                                     bytesClass
                                             .getDeclaredConstructor(byte[].class)
-                                            .newInstance(bytes);
+                                            .newInstance(bytesN);
                 } catch (ClassNotFoundException
                         | NoSuchMethodException
                         | InstantiationException

sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java

@@ -296,88 +296,83 @@ void sendTransactionAsync(
      * Ledger operation: get block by hash
      *
      * @param blockHash the hashcode of the block
-     * @param returnFullTransactionObjects the boolean define the tx is full or not
+     * @param onlyTxHash the boolean define the tx is full or not
      * @return a block
      */
-    BcosBlock getBlockByHash(
-            String blockHash, boolean onlyHeader, boolean returnFullTransactionObjects);
+    BcosBlock getBlockByHash(String blockHash, boolean onlyHeader, boolean onlyTxHash);
 
     /**
      * Ledger operation: get block by hash
      *
      * @param node the node rpc request send to
      * @param blockHash the hashcode of the block
-     * @param returnFullTransactionObjects the boolean define the tx is full or not
+     * @param onlyTxHash the boolean define the tx is full or not
      * @return a block
      */
-    BcosBlock getBlockByHash(
-            String node,
-            String blockHash,
-            boolean onlyHeader,
-            boolean returnFullTransactionObjects);
+    BcosBlock getBlockByHash(String node, String blockHash, boolean onlyHeader, boolean onlyTxHash);
 
     /**
      * Ledger operation: async get block by hash
      *
      * @param blockHash the hashcode of the block
-     * @param returnFullTransactionObjects the boolean define the tx is full or not
+     * @param onlyTxHash the boolean define the tx is full or not
      * @param callback the callback that will be called when receive the response
      */
     void getBlockByHashAsync(
             String blockHash,
             boolean onlyHeader,
-            boolean returnFullTransactionObjects,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback);
 
     /**
      * Ledger operation: async get block by hash
      *
      * @param node the node rpc request send to
      * @param blockHash the hashcode of the block
-     * @param returnFullTransactionObjects the boolean define the tx is full or not
+     * @param onlyTxHash the boolean define the tx is full or not
      * @param callback the callback that will be called when receive the response
      */
     void getBlockByHashAsync(
             String node,
             String blockHash,
             boolean onlyHeader,
-            boolean returnFullTransactionObjects,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback);
 
     /**
      * Ledger operation: get block by block number
      *
      * @param blockNumber the number of the block
      * @param onlyHeader the boolean define if only return header
-     * @param isOnlyTxHash the boolean define if only return tx hash
+     * @param onlyTxHash the boolean define if only return tx hash
      * @return block
      */
-    BcosBlock getBlockByNumber(BigInteger blockNumber, boolean onlyHeader, boolean isOnlyTxHash);
+    BcosBlock getBlockByNumber(BigInteger blockNumber, boolean onlyHeader, boolean onlyTxHash);
 
     /**
      * Ledger operation: get block by block number
      *
      * @param node the node rpc request send to
      * @param blockNumber the number of the block
      * @param onlyHeader the boolean define if only return header
-     * @param isOnlyTxHash the boolean define if only return tx hash
+     * @param onlyTxHash the boolean define if only return tx hash
      * @return block
      */
     BcosBlock getBlockByNumber(
-            String node, BigInteger blockNumber, boolean onlyHeader, boolean isOnlyTxHash);
+            String node, BigInteger blockNumber, boolean onlyHeader, boolean onlyTxHash);
 
     /**
      * Ledger operation: async get block by block number
      *
      * @param blockNumber the number of the block
      * @param onlyHeader the boolean if only need header
-     * @param isOnlyTxHash the boolean if you need all transactions
+     * @param onlyTxHash the boolean if you need all transactions
      * @param callback the callback that will be called when receive the response
      */
     void getBlockByNumberAsync(
             BigInteger blockNumber,
             boolean onlyHeader,
-            boolean isOnlyTxHash,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback);
 
     /**
@@ -386,14 +381,14 @@ void getBlockByNumberAsync(
      * @param node the node rpc request send to
      * @param blockNumber the number of the block
      * @param onlyHeader the boolean if only need header
-     * @param isOnlyTxHash the boolean if you need all transactions
+     * @param onlyTxHash the boolean if you need all transactions
      * @param callback the callback that will be called when receive the response
      */
     void getBlockByNumberAsync(
             String node,
             BigInteger blockNumber,
             boolean onlyHeader,
-            boolean isOnlyTxHash,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback);
 
     /**

sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java

@@ -380,106 +380,92 @@ public void getTotalTransactionCountAsync(
     }
 
     @Override
-    public BcosBlock getBlockByHash(
-            String blockHash, boolean onlyHeader, boolean returnFullTransactionObjects) {
-        return this.getBlockByHash("", blockHash, onlyHeader, returnFullTransactionObjects);
+    public BcosBlock getBlockByHash(String blockHash, boolean onlyHeader, boolean onlyTxHash) {
+        return this.getBlockByHash("", blockHash, onlyHeader, onlyTxHash);
     }
 
     @Override
     public BcosBlock getBlockByHash(
-            String node,
-            String blockHash,
-            boolean onlyHeader,
-            boolean returnFullTransactionObjects) {
+            String node, String blockHash, boolean onlyHeader, boolean onlyTxHash) {
         node = Objects.isNull(node) ? "" : node;
         return this.callRemoteMethod(
                 this.groupID,
                 node,
                 new JsonRpcRequest(
                         JsonRpcMethods.GET_BLOCK_BY_HASH,
-                        Arrays.asList(
-                                this.groupID,
-                                node,
-                                blockHash,
-                                onlyHeader,
-                                returnFullTransactionObjects)),
+                        Arrays.asList(this.groupID, node, blockHash, onlyHeader, onlyTxHash)),
                 BcosBlock.class);
     }
 
     @Override
     public void getBlockByHashAsync(
             String blockHash,
             boolean onlyHeader,
-            boolean returnFullTransactionObjects,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback) {
-        this.getBlockByHash("", blockHash, onlyHeader, returnFullTransactionObjects);
+        this.getBlockByHash("", blockHash, onlyHeader, onlyTxHash);
     }
 
     @Override
     public void getBlockByHashAsync(
             String node,
             String blockHash,
             boolean onlyHeader,
-            boolean returnFullTransactionObjects,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback) {
         node = Objects.isNull(node) ? "" : node;
         this.asyncCallRemoteMethod(
                 this.groupID,
                 node,
                 new JsonRpcRequest(
                         JsonRpcMethods.GET_BLOCK_BY_HASH,
-                        Arrays.asList(
-                                this.groupID,
-                                node,
-                                blockHash,
-                                onlyHeader,
-                                returnFullTransactionObjects)),
+                        Arrays.asList(this.groupID, node, blockHash, onlyHeader, onlyTxHash)),
                 BcosBlock.class,
                 callback);
     }
 
     @Override
     public BcosBlock getBlockByNumber(
-            BigInteger blockNumber, boolean onlyHeader, boolean isOnlyTxHash) {
-        return this.getBlockByNumber("", blockNumber, onlyHeader, isOnlyTxHash);
+            BigInteger blockNumber, boolean onlyHeader, boolean onlyTxHash) {
+        return this.getBlockByNumber("", blockNumber, onlyHeader, onlyTxHash);
     }
 
     @Override
     public BcosBlock getBlockByNumber(
-            String node, BigInteger blockNumber, boolean onlyHeader, boolean isOnlyTxHash) {
+            String node, BigInteger blockNumber, boolean onlyHeader, boolean onlyTxHash) {
         node = Objects.isNull(node) ? "" : node;
         return this.callRemoteMethod(
                 this.groupID,
                 node,
                 new JsonRpcRequest(
                         JsonRpcMethods.GET_BLOCK_BY_NUMBER,
-                        Arrays.asList(this.groupID, node, blockNumber, onlyHeader, isOnlyTxHash)),
+                        Arrays.asList(this.groupID, node, blockNumber, onlyHeader, onlyTxHash)),
                 BcosBlock.class);
     }
 
     @Override
     public void getBlockByNumberAsync(
             BigInteger blockNumber,
             boolean onlyHeader,
-            boolean isOnlyTxHash,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback) {
-        this.getBlockByNumberAsync("", blockNumber, onlyHeader, isOnlyTxHash, callback);
+        this.getBlockByNumberAsync("", blockNumber, onlyHeader, onlyTxHash, callback);
     }
 
     @Override
     public void getBlockByNumberAsync(
             String node,
             BigInteger blockNumber,
             boolean onlyHeader,
-            boolean isOnlyTxHash,
+            boolean onlyTxHash,
             RespCallback<BcosBlock> callback) {
         node = Objects.isNull(node) ? "" : node;
         this.asyncCallRemoteMethod(
                 this.groupID,
                 node,
                 new JsonRpcRequest(
                         JsonRpcMethods.GET_BLOCK_BY_NUMBER,
-                        Arrays.asList(this.groupID, node, blockNumber, onlyHeader, isOnlyTxHash)),
+                        Arrays.asList(this.groupID, node, blockNumber, onlyHeader, onlyTxHash)),
                 BcosBlock.class,
                 callback);
     }

sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/manager/AuthManager.java

@@ -192,7 +192,7 @@ public TransactionReceipt voteProposal(BigInteger proposalId, Boolean agree) {
      * @param transactionResponse which get proposal from
      * @return proposal id
      */
-    public BigInteger getProposal(TransactionResponse transactionResponse)
+    private BigInteger getProposal(TransactionResponse transactionResponse)
             throws TransactionException {
         if (transactionResponse == null) {
             throw new TransactionException("Decode transaction response error");
@@ -236,7 +236,7 @@ public CommitteeInfo getCommitteeInfo() throws ContractException {
      * @param account the account to check
      * @return true or false
      */
-    public Boolean hasDeployAuth(String account) throws ContractException {
+    public Boolean checkDeployAuth(String account) throws ContractException {
         return contractAuthPrecompiled.hasDeployAuth(account);
     }
 

sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/CommitteeInfo.java

@@ -10,27 +10,6 @@
 public class CommitteeInfo {
     private final Logger logger = LoggerFactory.getLogger(CommitteeInfo.class);
 
-    class GovernorInfo {
-        String governorAddress;
-        BigInteger weight;
-
-        public GovernorInfo(String governorAddress, BigInteger weight) {
-            this.governorAddress = governorAddress;
-            this.weight = weight;
-        }
-
-        @Override
-        public String toString() {
-            return "GovernorInfo{"
-                    + "governorAddress='"
-                    + governorAddress
-                    + '\''
-                    + ", weight="
-                    + weight
-                    + '}';
-        }
-    }
-
     private List<GovernorInfo> governorList = new ArrayList<>();
     private int participatesRate;
     private int winRate;

sdk-transaction/src/main/java/org/fisco/bcos/sdk/contract/auth/po/GovernorInfo.java

@@ -0,0 +1,32 @@
+package org.fisco.bcos.sdk.contract.auth.po;
+
+import java.math.BigInteger;
+
+public class GovernorInfo {
+    private String governorAddress;
+    private BigInteger weight;
+
+    public String getGovernorAddress() {
+        return governorAddress;
+    }
+
+    public BigInteger getWeight() {
+        return weight;
+    }
+
+    public GovernorInfo(String governorAddress, BigInteger weight) {
+        this.governorAddress = governorAddress;
+        this.weight = weight;
+    }
+
+    @Override
+    public String toString() {
+        return "GovernorInfo{"
+                + "governorAddress='"
+                + governorAddress
+                + '\''
+                + ", weight="
+                + weight
+                + '}';
+    }
+}