Merge pull request #438 from kyonRay/release-3.1.0

kyonRay · web-flow · commit 53d1cdd3e256 · 2021-12-07T21:17:40.000+08:00
&lt;fix&gt;(authConfig,BytesType): add authConfig from getGroupInfo, fix byte type encode base64 in Jackson.
diff --git a/sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/datatypes/BytesType.java b/sdk-codec/src/main/java/org/fisco/bcos/sdk/codec/datatypes/BytesType.java
@@ -1,6 +1,12 @@
 package org.fisco.bcos.sdk.codec.datatypes;
 
+import com.fasterxml.jackson.core.JsonGenerator;
+import com.fasterxml.jackson.databind.JsonSerializer;
+import com.fasterxml.jackson.databind.SerializerProvider;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import java.io.IOException;
 import java.util.Arrays;
+import org.fisco.bcos.sdk.utils.Hex;
 
 /** Binary sequence of bytes. */
 public abstract class BytesType implements Type<byte[]> {
@@ -14,6 +20,7 @@ public BytesType(byte[] src, String type) {
     }
 
     @Override
+    @JsonSerialize(using = bytesUsingHexSerializer.class)
     public byte[] getValue() {
         return value;
     }
@@ -53,4 +60,17 @@ public int bytes32PaddedLength() {
                 ? MAX_BYTE_LENGTH
                 : (value.length / MAX_BYTE_LENGTH + 1) * MAX_BYTE_LENGTH;
     }
+
+    public static class bytesUsingHexSerializer extends JsonSerializer<byte[]> {
+        @Override
+        public void serialize(byte[] value, JsonGenerator gen, SerializerProvider serializers)
+                throws IOException {
+            if (value == null) {
+                gen.writeNull();
+                return;
+            }
+            String hexString = Hex.toHexString(value);
+            gen.writeString(hexString);
+        }
+    }
 }
diff --git a/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/AccountConfig.java b/sdk-core/src/main/java/org/fisco/bcos/sdk/config/model/AccountConfig.java
@@ -25,7 +25,6 @@ public class AccountConfig {
     private String accountFileFormat;
     private String accountPassword;
     private String accountFilePath;
-    private Boolean authCheck;
 
     public AccountConfig() {}
 
@@ -44,9 +43,6 @@ public AccountConfig(ConfigProperty configProperty) throws ConfigException {
         if (!this.accountFilePath.equals("")) {
             this.accountFilePath = ConfigProperty.getConfigFilePath(this.accountFilePath);
         }
-        String authCheck =
-                ConfigProperty.getValue(configProperty.getAccount(), "authCheck", "false");
-        this.authCheck = Boolean.valueOf(authCheck);
         checkAccountConfig();
     }
 
@@ -103,14 +99,6 @@ public void setAccountPassword(String accountPassword) {
         this.accountPassword = accountPassword;
     }
 
-    public Boolean getAuthCheck() {
-        return authCheck;
-    }
-
-    public void setAuthCheck(Boolean authCheck) {
-        this.authCheck = authCheck;
-    }
-
     @Override
     public String toString() {
         return "AccountConfig{"
diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/Client.java
@@ -101,6 +101,13 @@ static Client build(String groupId, ConfigOption configOption, long nativePointe
      */
     Boolean isWASM();
 
+    /**
+     * Whether is auth check in chain
+     *
+     * @return true when chain in auth mode
+     */
+    Boolean isAuthCheck();
+
     /**
      * get groupId of the client
      *
diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/ClientImpl.java
@@ -50,6 +50,7 @@ public class ClientImpl implements Client {
     private String groupID = "";
     private String chainID;
     private Boolean wasm;
+    private Boolean authCheck = false;
     private Boolean smCrypto;
     // ------------basic group info --------------
 
@@ -84,14 +85,16 @@ protected void initGroupInfo() {
         this.groupNodeIniConfig = GroupNodeIniConfig.newIniConfig(nodeIniConfig);
         this.chainID = groupNodeIniConfig.getChain().getChainID();
         this.wasm = groupNodeIniConfig.getExecutor().isWasm();
+        this.authCheck = groupNodeIniConfig.getExecutor().isAuthCheck();
         this.smCrypto = groupNodeIniConfig.getChain().isSmCrypto();
         this.blockNumber = this.getBlockNumber().getBlockNumber().longValue();
 
         logger.info(
-                "init group info in rpc, chainID: {}, smCrypto: {}, wasm: {}, blockNumber: {}, GroupNodeIniConfig: {}",
+                "init group info in rpc, chainID: {}, smCrypto: {}, wasm: {}, authCheck:{}, blockNumber: {}, GroupNodeIniConfig: {}",
                 chainID,
                 smCrypto,
                 wasm,
+                authCheck,
                 blockNumber,
                 groupNodeIniConfig);
     }
@@ -146,10 +149,6 @@ public String getChainId() {
         return this.chainID;
     }
 
-    public Boolean getWasm() {
-        return this.wasm;
-    }
-
     public Boolean getSmCrypto() {
         return this.smCrypto;
     }
@@ -179,6 +178,11 @@ public Boolean isWASM() {
         return this.wasm;
     }
 
+    @Override
+    public Boolean isAuthCheck() {
+        return this.authCheck;
+    }
+
     @Override
     public BcosTransactionReceipt sendTransaction(String signedTransactionData, boolean withProof) {
         return this.sendTransaction("", signedTransactionData, withProof);
diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/GroupNodeIniConfig.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/GroupNodeIniConfig.java
@@ -20,6 +20,7 @@ public static GroupNodeIniConfig newIniConfig(GroupNodeIniInfo groupIniConfig) {
             // executor
             GroupNodeIniConfig.Executor executor = new GroupNodeIniConfig.Executor();
             executor.setWasm(groupIniConfig.getWasm());
+            executor.setAuthCheck(groupIniConfig.getAuthCheck());
 
             GroupNodeIniConfig groupNodeIniConfig = new GroupNodeIniConfig();
             groupNodeIniConfig.setChain(chain);
@@ -53,6 +54,7 @@ public void setExecutor(Executor executor) {
 
     public static class Executor {
         private boolean isWasm;
+        private boolean isAuthCheck;
 
         public boolean isWasm() {
             return isWasm;
@@ -62,9 +64,17 @@ public void setWasm(boolean wasm) {
             isWasm = wasm;
         }
 
+        public boolean isAuthCheck() {
+            return isAuthCheck;
+        }
+
+        public void setAuthCheck(boolean authCheck) {
+            isAuthCheck = authCheck;
+        }
+
         @Override
         public String toString() {
-            return "Executor{" + "isWasm=" + isWasm + '}';
+            return "Executor{" + "isWasm=" + isWasm + ", isAuthCheck=" + isAuthCheck + '}';
         }
     }
 
diff --git a/sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/GroupNodeIniInfo.java b/sdk-service/src/main/java/org/fisco/bcos/sdk/client/protocol/model/GroupNodeIniInfo.java
@@ -84,6 +84,9 @@ public String toString() {
     @JsonProperty("isWasm")
     private Boolean wasm;
 
+    @JsonProperty("isAuthCheck")
+    private Boolean isAuthCheck = false;
+
     private String nodeID;
     private String nodeName;
     private String rpcServiceName;
@@ -129,6 +132,14 @@ public void setWasm(Boolean wasm) {
         this.wasm = wasm;
     }
 
+    public Boolean getAuthCheck() {
+        return isAuthCheck;
+    }
+
+    public void setAuthCheck(Boolean authCheck) {
+        isAuthCheck = authCheck;
+    }
+
     public String getNodeID() {
         return nodeID;
     }
diff --git a/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java b/src/integration-test/java/org/fisco/bcos/sdk/transaction/manager/AssembleTransactionProcessorTest.java
@@ -448,23 +448,49 @@ public void test9ComplexSetStaticBytes() throws Exception {
                 transactionProcessor.deployByContractLoader("ComplexSol", params);
         Assert.assertEquals(response.getTransactionReceipt().getStatus(), 0);
         String contractAddress = response.getContractAddress();
+
         // setStaticByte4
-        List<String> paramsSetBytes = Lists.newArrayList(new String("1234".getBytes()));
-        TransactionResponse transactionResponse3 =
-                transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
-                        contractAddress, ABI, "setStaticByte4", paramsSetBytes);
-        System.out.println(JsonUtils.toJson(transactionResponse3));
-        Assert.assertEquals(transactionResponse3.getResults().size(), 1);
+        {
+            List<String> paramsSetBytes = Lists.newArrayList(new String("1234".getBytes()));
+            TransactionResponse transactionResponse3 =
+                    transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
+                            contractAddress, ABI, "setStaticByte4", paramsSetBytes);
+            System.out.println(JsonUtils.toJson(transactionResponse3));
+            Assert.assertEquals(transactionResponse3.getResults().size(), 1);
 
-        // get _bytes4V
-        CallResponse callResponse4 =
-                transactionProcessor.sendCall(
-                        this.cryptoKeyPair.getAddress(),
-                        contractAddress,
-                        ABI,
-                        "_bytes4V",
-                        Lists.newArrayList());
-        Assert.assertEquals(0, callResponse4.getReturnCode());
-        Assert.assertEquals(callResponse4.getResults().get(0), new Bytes4("1234".getBytes()));
+            // get _bytes4V
+            CallResponse callResponse4 =
+                    transactionProcessor.sendCall(
+                            this.cryptoKeyPair.getAddress(),
+                            contractAddress,
+                            ABI,
+                            "_bytes4V",
+                            Lists.newArrayList());
+            Assert.assertEquals(0, callResponse4.getReturnCode());
+            Assert.assertEquals(callResponse4.getResults().get(0), new Bytes4("1234".getBytes()));
+        }
+
+        // setStaticByte4 in hex
+        {
+            List<String> paramsSetBytes = Lists.newArrayList("hex://0x12345678");
+            TransactionResponse transactionResponse3 =
+                    transactionProcessor.sendTransactionWithStringParamsAndGetResponse(
+                            contractAddress, ABI, "setStaticByte4", paramsSetBytes);
+            System.out.println(JsonUtils.toJson(transactionResponse3));
+            Assert.assertEquals(transactionResponse3.getResults().size(), 1);
+
+            // get _bytes4V
+            CallResponse callResponse4 =
+                    transactionProcessor.sendCall(
+                            this.cryptoKeyPair.getAddress(),
+                            contractAddress,
+                            ABI,
+                            "_bytes4V",
+                            Lists.newArrayList());
+            String s = JsonUtils.toJson(callResponse4.getResults().get(0));
+            Assert.assertEquals(0, callResponse4.getReturnCode());
+            Assert.assertEquals(
+                    callResponse4.getResults().get(0), new Bytes4("12345678".getBytes()));
+        }
     }
 }
