Dd 3.0.0 (#24)

适配3.0.0
WeBankBlockchain · Nov 4, 2022 · 3a27857 · 3a27857
1 parent 4aa8b75
commit 3a27857
Show file tree

Hide file tree

Showing 7 changed files with 161 additions and 58 deletions.
diff --git a/build.gradle b/build.gradle
@@ -32,10 +32,15 @@ List logger = [
 dependencies {    
     compile logger
     implementation ('com.webank:solc-gradle-plugin:1.0.2-SNAPSHOT')
-    implementation ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0-rc3')
+    compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0')
+    compile('org.fisco-bcos.code-generator:bcos-code-generator:1.0.0') {
+        exclude group: "org.fisco-bcos.java-sdk"
+        exclude group: "org.slf4j"
+    }
     implementation group: 'info.picocli', name: 'picocli', version: '4.6.1'
     implementation ("org.slf4j:slf4j-api:1.7.30")
     implementation "org.fisco-bcos:solcJ:${solcVersion}"
+//    implementation group: 'com.squareup', name: 'javapoet', version: '1.13.0'
 }
 
 

diff --git a/src/main/java/com/webank/scaffold/Main.java b/src/main/java/com/webank/scaffold/Main.java
@@ -1,10 +1,13 @@
 package com.webank.scaffold;
 
 import com.squareup.javapoet.TypeName;
+import com.squareup.javapoet.TypeSpec;
 import com.webank.scaffold.cmd.ScaffoldRunner;
 import com.webank.scaffold.constants.FileNameConstants;
+import com.webank.scaffold.handler.ContractWrapper;
 import com.webank.scaffold.handler.SolidityTypeHandler;
-import org.fisco.bcos.sdk.v3.codegen.ContractWrapper;
+import org.fisco.bcos.codegen.v3.utils.CodeGenUtils;
+import org.fisco.bcos.sdk.v3.codec.wrapper.ABIDefinition;
 import picocli.CommandLine;
 
 import java.io.InputStream;
@@ -17,8 +20,7 @@
  * @data 2021/01/20
  */
 public class Main {
-
-    public static void main(String[] args) throws Exception{
+    public static void main(String[] args) throws Exception {
         CommandLine cmd = new CommandLine(new ScaffoldRunner());
         cmd.execute(args);
     }

diff --git a/src/main/java/com/webank/scaffold/builder/StructsFileBuilder.java b/src/main/java/com/webank/scaffold/builder/StructsFileBuilder.java
@@ -2,10 +2,9 @@
 
 import com.squareup.javapoet.TypeSpec;
 import com.webank.scaffold.config.UserConfig;
-import com.webank.scaffold.handler.ContractHandler;
+import com.webank.scaffold.handler.ContractWrapper;
 import org.fisco.bcos.sdk.v3.codec.wrapper.ABIDefinition;
-import org.fisco.bcos.sdk.v3.codegen.CodeGenUtils;
-import org.fisco.bcos.sdk.v3.codegen.ContractWrapper;
+import org.fisco.bcos.codegen.v3.utils.CodeGenUtils;
 
 import java.lang.reflect.Method;
 import java.util.List;
@@ -17,12 +16,12 @@
 public class StructsFileBuilder implements JavaFileBuilder{
 
     private UserConfig config;
-    private ContractHandler handler;
+    private ContractWrapper handler;
     private List<ABIDefinition> abis;
 
     public StructsFileBuilder(String abiStr, UserConfig config) throws Exception{
         this.config = config;
-        this.handler = new ContractHandler(false);
+        this.handler = new ContractWrapper(false);
         this.abis =  CodeGenUtils.loadContractAbiDefinition(abiStr);
     }
 
@@ -40,7 +39,5 @@ public List<TypeSpec> buildTypeSpec(String fullPkg) {
         catch (Exception ex){
             throw new RuntimeException(ex);
         }
-
-
     }
 }
diff --git a/...ank/scaffold/handler/ContractHandler.java → ...ank/scaffold/handler/ContractWrapper.java b/...ank/scaffold/handler/ContractHandler.java → ...ank/scaffold/handler/ContractWrapper.java
diff --git a/src/main/java/com/webank/scaffold/handler/SolidityTypeHandler.java b/src/main/java/com/webank/scaffold/handler/SolidityTypeHandler.java
@@ -1,9 +1,7 @@
 package com.webank.scaffold.handler;
 
 import com.squareup.javapoet.TypeName;
-import com.squareup.javapoet.TypeSpec;
 import org.fisco.bcos.sdk.v3.codec.wrapper.ABIDefinition;
-import org.fisco.bcos.sdk.v3.codegen.ContractWrapper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -26,13 +24,15 @@ public class SolidityTypeHandler {
      * @return
      */
     public static TypeName convert(ABIDefinition.NamedType namedType){
-        ContractHandler handler = new ContractHandler(false);
+        ContractWrapper handler = new ContractWrapper(false);
         try{
             //如果是结构体，那么返回结构体对应类型的名字，比如xxx.xxx.xxx.Entry
             if (!namedType.getComponents().isEmpty()){
+
                 List<ABIDefinition.NamedType> list = new ArrayList<>();
                 list.add(namedType);
                 TypeName typeName = handler.buildTypeNames(list).get(0);
+//                System.out.println("aaa"+ typeName);
                 return typeName;
             }
             TypeName solType = handler.buildTypeName(namedType.getType());

diff --git a/src/main/java/com/webank/scaffold/util/ABIUtil.java b/src/main/java/com/webank/scaffold/util/ABIUtil.java
@@ -43,7 +43,6 @@
 public class ABIUtil {
 
     public static TypeSpec buildBOType(String className, List<ABIDefinition.NamedType> args){
-
         // 1.Check: No need to generate BO for functions with no args
         if(args.isEmpty()) return null;//No need
 

diff --git a/src/main/resources/templates/build.gradle.tpl b/src/main/resources/templates/build.gradle.tpl
@@ -61,7 +61,7 @@ dependencies {
     }
     testImplementation 'org.junit.jupiter:junit-jupiter-api:5.6.1'
     testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.6.1'
-    compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0-rc3'){
+    compile ('org.fisco-bcos.java-sdk:fisco-bcos-java-sdk:3.0.0'){
         exclude group: 'org.slf4j'
     }
 }