1.7.8 (#57)

* struct add support

Author: wangyue168git

WeBankBlockchain-Data-Export-sdk/WeBankBlockchain-Data-Export-parser/src/main/java/com/webank/blockchain/data/export/parser/contract/EventParser.java

@@ -55,7 +55,7 @@ public static List<EventMetaInfo> parseToInfoList(String abiStr, String contract
             contractGenOffs = genOffMap.get(contractName);
         }
         for (Map.Entry<String, List<ABIDefinition>> entry : eventsAbis.entrySet()) {
-            String eventName = StringUtils.capitalize(entry.getKey());
+            String eventName = entry.getKey();
             if (contractGenOffs != null && contractGenOffs.contains(eventName)){
                 continue;
             }

WeBankBlockchain-Data-Export-sdk/WeBankBlockchain-Data-Export-parser/src/main/java/com/webank/blockchain/data/export/parser/tools/SolJavaTypeMappingUtils.java

@@ -30,6 +30,7 @@ public static String fromSolBasicTypeToJavaType(String solBasicType) {
             return "String";
         }
         switch (solBasicType) {
+            case "tuple":
             case "address":
             case "string":
             case "bytes1":

WeBankBlockchain-Data-Export-sdk/WeBankBlockchain-Data-Export-parser/src/main/java/com/webank/blockchain/data/export/parser/tools/SolSqlTypeMappingUtils.java

@@ -29,6 +29,8 @@ public static String fromSolBasicTypeToSqlType(String solBasicType) {
             return "text";
         }
         switch (solBasicType) {
+            case "tuple" :
+                return "text";
             case "address":
                 return "varchar(256)";
             case "string":

WeBankBlockchain-Data-Export-sdk/build.gradle

@@ -9,7 +9,7 @@ apply plugin: 'signing'
 [compileJava, compileTestJava, javadoc]*.options*.encoding = 'UTF-8'
 
 group = 'com.webank'
-version = "1.7.7"
+version = "1.7.8-SNAPSHOT"
 
 allprojects {
     repositories {
@@ -55,7 +55,7 @@ dependencies {
     compile logger
     compile ('cn.hutool:hutool-all:5.3.7')
     compile group: 'com.google.guava', name: 'guava', version: '30.0-jre'
-    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.7.2')
+    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:2.9.0')
     compile 'commons-codec:commons-codec:1.4'
     compile group: "org.apache.shardingsphere", name: "shardingsphere-jdbc-core", version: '5.0.0-alpha'
     compile('ch.qos.logback:logback-core:1.2.3')

WeBankBlockchain-Data-Export-service/.gitignore

@@ -2,6 +2,8 @@
 log/
 src/main/resources
 src/test/resources
+WeBankBlockchain-Data-Export-sdk/*.properties
+WeBankBlockchain-Data-Export-sdk/*.gpg
 
 ### mac ###
 .DS_Store

WeBankBlockchain-Data-Export-service/src/main/java/com/webank/blockchain/data/export/contract/EventParser.java

@@ -54,7 +54,7 @@ public static List<EventMetaInfo> parseToInfoList(String abiStr, String contract
             contractGenOffs = genOffMap.get(contractName);
         }
         for (Map.Entry<String, List<ABIDefinition>> entry : eventsAbis.entrySet()) {
-            String eventName = StringUtils.capitalize(entry.getKey());
+            String eventName = entry.getKey();
             if (contractGenOffs != null && contractGenOffs.contains(eventName)){
                 continue;
             }

build.gradle

@@ -38,7 +38,7 @@ project(':WeBankBlockchain-Data-Export-service') {
     springBoot {
      buildInfo()
     }
-    def solcVersion = rootProject.hasProperty('solcVersion') ? solcVersion : "0.4.25.1"
+    def solcVersion = rootProject.hasProperty('solcVersion') ? solcVersion : "0.6.10.0"
 
   javadoc {
     def defaultEncoding = 'UTF-8'