Merge pull request #611 from cyjseagull/release-3.0.0-rc4

release 3.0.0 rc4

Author: cyjseagull

Changelog.md

@@ -1,3 +1,38 @@
+## v3.0.0-rc4
+(2022-7-1)
+
+请阅读Java SDK v3.x+文档：
+
+- [中文用户手册](https://fisco-bcos-doc.readthedocs.io/zh_CN/latest/docs/develop/sdk/java_sdk/index.html)
+
+### 新增
+
+* 新增`TableCRUDService`，适配v3.0.0-rc4节点的CRUD Table的接口
+* `AuthManger`
+  * 新增共识节点变更提案、系统配置变更提案、升级计算逻辑提案等的接口
+  * 新增冻结、解冻合约功能接口
+  * 新增创建提案、修改合约ACL状态的异步接口
+  * 新增批量获取提案的接口
+  * 新增提案执行结果的事件监听接口
+
+### 更新
+
+* 使用密码库`webank-blockchain-java-crypto`替代`key-mini-toolkit`
+* 升级`bcos-sdk-jni`到`3.0.0-rc4`
+
+### 修复
+
+* 修复合约编解码相关的bug
+* 修复ReceiptParser获取预编译合约返回值时出现的编码问题
+* 增加单测覆盖率，修复大部分不合理的代码
+
+### 兼容性说明
+
+- 不兼容 FISCO BCOS 2.0+ 版本
+- 兼容java-sdk v3.x的历史版本
+- 支持[3.0.0-rc4](https://github.com/FISCO-BCOS/FISCO-BCOS/releases/tag/v3.0.0-rc4)版本
+
+
 ## v3.0.0-rc3
 (2022-03-31)
 

build.gradle

@@ -17,29 +17,30 @@ ext {
         ossrhPassword = "xxx"
     }
     // jackson version
-    jacksonVersion = '2.12.4'
+    jacksonVersion = '2.13.2.2'
     commonsIOVersion = '2.4'
     commonsLang3Version = '3.12.0'
     commonIOVersion = '2.4'
     javapoetVersion = '1.13.0'
     picocliVersion = '4.6.1'
     toml4jVersion = "0.7.2"
     bcprovJDK15onVersion = '1.69'
-    keyMiniToolkit = "1.0.4"
+    // keyMiniToolkit = "1.0.4"
+    webankJavaCryptoVersion = "1.0.2"
 
     junitVersion = '4.13.2'
     commonsCollections4Version = "4.4"
     guavaVersion = '30.1.1-jre'
 
     config2Version = '2.7'
-    bcosSdkJniVersion = "3.0.0-rc3"
+    bcosSdkJniVersion = "3.0.0-rc4"
 }
 
 // check.dependsOn integrationTest
 // integrationTest.mustRunAfter test
 allprojects {
     group = 'org.fisco-bcos.java-sdk'
-    version = '3.0.0-rc3'
+    version = '3.0.0-rc4'
     apply plugin: 'maven-publish'
     apply plugin: 'idea'
     apply plugin: 'eclipse'
@@ -76,6 +77,7 @@ allprojects {
         testImplementation("junit:junit:${junitVersion}")
         testImplementation("org.apache.commons:commons-collections4:${commonsCollections4Version}")
         testImplementation("com.google.guava:guava:${guavaVersion}")
+        testImplementation("org.mockito:mockito-core:4.6.0")
     }
 
     clean.doLast {
@@ -188,7 +190,8 @@ dependencies {
     api("commons-io:commons-io:${commonsIOVersion}")
     api("com.squareup:javapoet:${javapoetVersion}")
     api("info.picocli:picocli:${picocliVersion}")
-    api("com.webank:key-mini-toolkit:${keyMiniToolkit}")
+    // api("com.webank:key-mini-toolkit:${keyMiniToolkit}")
+    api ("com.webank:webank-blockchain-java-crypto:${webankJavaCryptoVersion}")
     api("com.moandjiezana.toml:toml4j:${toml4jVersion}")
     api("org.apache.commons:commons-configuration2:${config2Version}")
 

sdk-amop/src/main/java/org/fisco/bcos/sdk/v3/amop/Amop.java

@@ -37,6 +37,7 @@ public interface Amop {
      *
      * @param configOption the config object
      * @return Amop instance
+     * @throws JniException throw when build AMOP service failed
      */
     static Amop build(ConfigOption configOption) throws JniException {
         long nativePointer = BcosSDKJniObj.create(configOption.getJniConfig());
@@ -49,11 +50,19 @@ static Amop build(ConfigOption configOption) throws JniException {
      *
      * @param nativePointer the
      * @return Amop instance
+     * @throws JniException throw when build AMOP service failed
      */
     static Amop build(long nativePointer) throws JniException {
         return new AmopImp(nativePointer);
     }
 
+    /**
+     * Subscribe a normal topic.
+     *
+     * @param topics the topic name
+     */
+    void subscribeTopic(Set<String> topics);
+
     /**
      * Subscribe a normal topic.
      *
@@ -72,24 +81,27 @@ static Amop build(long nativePointer) throws JniException {
     /**
      * Send amop msg
      *
-     * @param content the sent message
+     * @param topic topic name
+     * @param timeout timeout config
+     * @param content the message be sent
      * @param callback the callback that will be called when receive the AMOP response
      */
     void sendAmopMsg(String topic, byte[] content, int timeout, AmopResponseCallback callback);
 
     /**
      * Send response msg
      *
-     * @param endpoint
-     * @param seq
-     * @param conteng
+     * @param endpoint send endpoint
+     * @param seq response seq
+     * @param content response content
      */
-    void sendResponse(String endpoint, String seq, byte[] conteng);
+    void sendResponse(String endpoint, String seq, byte[] content);
 
     /**
      * Send amop msg
      *
-     * @param content the broadcasted AMOP message
+     * @param topic topic name
+     * @param content the AMOP message to be broadcast
      */
     void broadcastAmopMsg(String topic, byte[] content);
 

sdk-amop/src/main/java/org/fisco/bcos/sdk/v3/amop/AmopImp.java

@@ -38,6 +38,11 @@ public AmopImp(long nativePointer) throws JniException {
         start();
     }
 
+    @Override
+    public void subscribeTopic(Set<String> topics) {
+        amopJni.subscribeTopic(topics);
+    }
+
     @Override
     public void subscribeTopic(String topicName, AmopRequestCallback callback) {
         amopJni.subscribeTopic(topicName, callback);

sdk-codec/src/main/java/org/fisco/bcos/sdk/v3/codec/ContractCodec.java

@@ -25,6 +25,7 @@
 import java.util.List;
 import org.apache.commons.lang3.tuple.Pair;
 import org.fisco.bcos.sdk.v3.codec.abi.Constant;
+import org.fisco.bcos.sdk.v3.codec.datatypes.AbiTypes;
 import org.fisco.bcos.sdk.v3.codec.datatypes.Address;
 import org.fisco.bcos.sdk.v3.codec.datatypes.Bool;
 import org.fisco.bcos.sdk.v3.codec.datatypes.DynamicArray;
@@ -100,7 +101,7 @@ public byte[] encodeConstructor(String abi, String bin, List<Object> params)
                     ContractCodecTools.encode(
                             ContractCodecTools.decodeABIObjectValue(inputABIObject, params),
                             isWasm);
-            return encodeConstructorFromBytes(bin, encodeParams, abi);
+            return encodeConstructorFromBytes(bin, encodeParams);
         } catch (Exception e) {
             logger.error(" exception in encodeConstructor : {}", e.getMessage());
         }
@@ -131,7 +132,18 @@ private Type buildType(ABIDefinition.NamedType namedType, String param)
                 Type element = buildType(subType, subNodeStr);
                 elements.add(element);
             }
-            type = paramType.isFixedList() ? new StaticArray(elements) : new DynamicArray(elements);
+            if (elements.isEmpty()) {
+                Class<? extends Type> arrayClass = AbiTypes.getType(paramType.rawType);
+                type =
+                        paramType.isFixedList()
+                                ? new StaticArray(arrayClass, elements)
+                                : new DynamicArray(arrayClass, elements);
+            } else {
+                type =
+                        paramType.isFixedList()
+                                ? new StaticArray(elements.get(0).getClass(), elements)
+                                : new DynamicArray(elements.get(0).getClass(), elements);
+            }
             return type;
         } else if (typeStr.equals("tuple")) {
             List<Type> components = new ArrayList<>();
@@ -330,7 +342,7 @@ public byte[] encodeConstructorFromString(String abi, String bin, List<String> p
                 paramBytes =
                         org.fisco.bcos.sdk.v3.codec.abi.FunctionEncoder.encodeConstructor(types);
             }
-            return encodeConstructorFromBytes(bin, paramBytes, abi);
+            return encodeConstructorFromBytes(bin, paramBytes);
         } catch (Exception e) {
             String errorMsg =
                     " cannot encode in encodeMethodFromObject with appropriate interface ABI, cause:"
@@ -340,7 +352,7 @@ public byte[] encodeConstructorFromString(String abi, String bin, List<String> p
         }
     }
 
-    public byte[] encodeConstructorFromBytes(String bin, byte[] params, String abi)
+    public byte[] encodeConstructorFromBytes(String bin, byte[] params)
             throws ContractCodecException {
         try {
             ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -358,7 +370,6 @@ public byte[] encodeConstructorFromBytes(String bin, byte[] params, String abi)
                 } else {
                     deployParams.add(new Uint8(0));
                 }
-                // deployParams.add(new Utf8String(abi));
                 outputStream.write(FunctionEncoder.encodeParameters(deployParams, null));
             }
             return outputStream.toByteArray();

sdk-codec/src/main/java/org/fisco/bcos/sdk/v3/codec/abi/FunctionReturnDecoder.java

@@ -81,7 +81,7 @@ public <T extends Type> Type decodeIndexedValue(
                     || Utf8String.class.isAssignableFrom(type)) {
                 return TypeDecoder.decodeBytes(Hex.decode(input), Bytes32.class);
             } else {
-                return TypeDecoder.decode(Hex.decode(input), 0, type);
+                return TypeDecoder.decode(Hex.decode(input), 0, typeReference);
             }
         } catch (ClassNotFoundException e) {
             throw new UnsupportedOperationException("Invalid class reference provided", e);
@@ -143,7 +143,7 @@ private static List<Type> build(String input, List<TypeReference<Type>> outputPa
                         offset += Type.MAX_BYTE_LENGTH * length;
                     }
                 } else {
-                    result = TypeDecoder.decode(rawInput, dataOffset, classType);
+                    result = TypeDecoder.decode(rawInput, dataOffset, typeReference);
                     offset += Type.MAX_BYTE_LENGTH;
                 }
                 results.add(result);