Merge pull request #632 from WeBankFinTech/dev

v1.5.2 dev=>master

.ci/ci_check.sh

@@ -1,16 +1,16 @@
-#!/bin/bash
-
-set -e
-
-curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/build_chain.sh && chmod u+x build_chain.sh
-bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/ci/download_bin.sh) -b dev -m
-echo "127.0.0.1:4 agency1 1,2,3" > ipconf
-./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.7.0
-./nodes/127.0.0.1/start_all.sh
-./nodes/127.0.0.1/fisco-bcos -v
-cp nodes/127.0.0.1/sdk/* src/main/resources/
-cp nodes/127.0.0.1/sdk/* src/test/resources/
-#./gradlew verifyGoogleJavaFormat
-# test module needs optimization
-./gradlew build -x test
-#./gradlew test
+#!/bin/bash
+
+set -e
+
+curl -LO https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/build_chain.sh && chmod u+x build_chain.sh
+bash <(curl -s https://raw.githubusercontent.com/FISCO-BCOS/FISCO-BCOS/dev/tools/ci/download_bin.sh) -b dev -m
+echo "127.0.0.1:4 agency1 1,2,3" > ipconf
+./build_chain.sh -e bin/fisco-bcos -f ipconf -p 30300,20200,8545 -v 2.7.2
+./nodes/127.0.0.1/start_all.sh
+./nodes/127.0.0.1/fisco-bcos -v
+cp nodes/127.0.0.1/sdk/* src/main/resources/
+cp nodes/127.0.0.1/sdk/* src/test/resources/
+#./gradlew verifyGoogleJavaFormat
+# test module needs optimization
+./gradlew build -x test
+#./gradlew test

.gitignore

@@ -37,12 +37,14 @@ gradle.properties
 /bin
 *.crt
 *.key
+*.publickey
 h2
 
 /lib/
 solcjs
-v0.*.js
-v0.*.js.gz
+v0.*.*.js
+v0.*.*.js.gz
 /output/
+/conf/
 
 

.travis.yml

@@ -4,7 +4,8 @@ branches:
   - dev
 
 language: java
-
+services:
+  - mysql
 matrix:
 #  fast_finish: true
   include:
@@ -26,6 +27,29 @@ matrix:
       dist: xenial
       sudo: required
 
+    - language: java
+      jdk: openjdk11
+      os: linux
+      dist: xenial
+      sudo: required
+
+    - language: java
+      jdk: openjdk12
+      os: linux
+      dist: xenial
+      sudo: required
+
+    - language: java
+      jdk: openjdk13
+      os: linux
+      dist: xenial
+      sudo: required
+
+    - language: java
+      jdk: openjdk14
+      os: linux
+      dist: xenial
+      sudo: required
 
 before_cache:
   - rm -f  $HOME/.gradle/caches/modules-2/modules-2.lock

Changelog.md

@@ -1,3 +1,23 @@
+### v1.5.2(2021-07-16)
+
+**Add**
+- 优化合约Java项目导出功能，支持批量编译合约，支持多用户与channel端口检查
+- 合约仓库新增资产合约模板
+- 增加交易组装接口`/tran/convertRawTxStr`和编码交易函数接口`/trans/encodeFunction`
+- 支持合约IDE绑定合约地址
+
+**Fix**
+- 优化交易窗口，支持无私钥用户时直接创建私钥
+
+**兼容性**
+- 支持FISCO-BCOS v2.4.x 及以上版本
+- WeBASE-Node-Manager v1.5.0+
+- WeBASE-Sign v1.5.0+
+- WeBASE-Transaction v1.3.0+
+
+详细了解,请阅读[**技术文档**](https://webasedoc.readthedocs.io/zh_CN/latest/)。
+
+
 ### v1.5.1(2021-05-28)
 
 **Add**
@@ -13,7 +33,7 @@
 
 **兼容性**
 - 支持FISCO-BCOS v2.4.x 及以上版本
-- WeBASE-Node-Manager v1.4.1+
+- WeBASE-Node-Manager v1.5.0+
 - WeBASE-Sign v1.5.0+
 - WeBASE-Transaction v1.3.0+
 
@@ -32,7 +52,7 @@
 
 **兼容性**
 - 支持FISCO-BCOS v2.4.x 及以上版本
-- WeBASE-Node-Manager v1.4.1+
+- WeBASE-Node-Manager v1.5.0+
 - WeBASE-Sign v1.5.0+
 - WeBASE-Transaction v1.3.0+
 

README.md

@@ -1,7 +1,6 @@
 # 节点前置服务
 [![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen.svg?style=flat-square)](https://webasedoc.readthedocs.io/zh_CN/latest/docs/WeBASE/CONTRIBUTING.html)
 [![CodeFactor](https://www.codefactor.io/repository/github/webankfintech/webase-front/badge)](https://www.codefactor.io/repository/github/webankfintech/webase-front)
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/f5be085401f54e7080a654693ac260d4)](https://www.codacy.com/gh/WeBankFinTech/WeBASE-Front?utm_source=github.com&utm_medium=referral&utm_content=WeBankFinTech/WeBASE-Front&utm_campaign=Badge_Grade)
 [![Code Lines](https://tokei.rs/b1/github/WeBankFinTech/WeBASE-Front?category=code)](https://github.com/WeBankFinTech/WeBASE-Front)
 [![license](http://img.shields.io/badge/license-Apache%20v2-blue.svg)](http://www.apache.org/licenses/)
 [![GitHub (pre-)release](https://img.shields.io/github/release/WeBankFinTech/WeBASE-Front/all.svg)](https://github.com/WeBankFinTech/WeBASE-Front/releases)

build.gradle

@@ -23,7 +23,7 @@ repositories {
 
 }
 
-def spring_version="4.3.27.RELEASE"
+def spring_version="4.3.29.RELEASE"
 List spring =[
     "org.springframework:spring-core:$spring_version",
     "org.springframework:spring-beans:$spring_version",
@@ -71,7 +71,7 @@ List jaxb = [
      "javax.activation:activation:1.1.1"
 ]
 
-def jackson_version = "2.11.0"
+def jackson_version = "2.11.4"
 List jackson = [
     "com.fasterxml.jackson.core:jackson-annotations:$jackson_version",
     "com.fasterxml.jackson.core:jackson-core:$jackson_version",
@@ -90,9 +90,9 @@ List tomcat = [
 ]
 
 List scaffold = [
-    'com.webank.webase:solscaffold:1.0.1',
-    'com.webank:SmartDev-Scaffold:1.0.0-SNAPSHOT',
-    'com.webank:solc-gradle-plugin:1.0.0'
+    'com.webank.webase:solscaffold:1.0.2',
+    'com.webank:SmartDev-Scaffold:1.0.0.1',
+    'com.webank:solc-gradle-plugin:1.0.1'
 ]
 
 dependencies {

docker/build/Dockerfile

@@ -9,6 +9,7 @@ RUN apt-get update \
 #COPY --from=builder /code/dist/lib                  /dist/lib
 #COPY --from=builder /code/dist/conf_template        /dist/conf
 #COPY --from=builder /code/dist/apps                 /dist/apps
+COPY static                /dist/static
 COPY lib                  /dist/lib
 COPY conf_template        /dist/conf
 COPY apps                 /dist/apps
@@ -18,7 +19,7 @@ EXPOSE 5002
 
 ENV CLASSPATH "/dist/conf/:/dist/apps/*:/dist/lib/*"
 
-ENV JAVA_OPTS " -server -Dfile.encoding=UTF-8 -Xmx256m -Xms256m -Xmn128m -Xss512k -XX:MetaspaceSize=128m -XX:MaxMetaspaceSize=256m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/log/heap_error.log  -XX:+UseG1GC -XX:MaxGCPauseMillis=200 "
+ENV JAVA_OPTS " -server -Dfile.encoding=UTF-8 -Xmx512m -Xms512m -Xmn256m -Xss512k -XX:MetaspaceSize=256m -XX:MaxMetaspaceSize=512m -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=/log/heap_error.log  -XX:+UseG1GC -XX:MaxGCPauseMillis=200 "
 ENV APP_MAIN "com.webank.webase.front.Application"
 
 # start commond

release_note.txt

@@ -1 +1 @@
-v1.5.1
+v1.5.2

src/main/java/com/webank/webase/front/base/code/ConstantCode.java

@@ -152,6 +152,8 @@ public class ConstantCode {
     public static final RetCode WRITE_PRIVATE_KEY_CRT_KEY_FILE_FAIL = RetCode.mark(201157,"Write private key file fail!");
     // add in v1.5.1
     public static final RetCode GENERATE_CONTRACT_PROJECT_FAIL = RetCode.mark(201161, "generate project failed in scaffold");
+    // v1.5.2
+    public static final RetCode IP_FORMAT_ERROR = RetCode.mark(201162, "IP format error.");
 
 
     /* precompiled runtime check or error */

src/main/java/com/webank/webase/front/contract/ContractService.java

@@ -512,7 +512,7 @@ public void deleteContract(Long contractId, int groupId) {
      * save contract data.
      */
     public Contract saveContract(ReqContractSave contractReq) {
-        log.debug("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq));
+        log.info("start saveContract contractReq:{}", JsonUtils.toJSONString(contractReq));
         if (contractReq.getContractId() == null) {
             // new
             return newContract(contractReq);
@@ -580,6 +580,11 @@ public Contract updateContract(ReqContractSave contractReq) {
                 contractReq.getContractName(), contractReq.getContractId());
         BeanUtils.copyProperties(contractReq, contract);
         contract.setModifyTime(LocalDateTime.now());
+        if(contract.getContractAddress()!=null && contract.getContractAddress().length()>("0x").length())
+        {
+            contract.setContractStatus(ContractStatus.DEPLOYED.getValue());
+            contract.setDeployTime(LocalDateTime.now());
+        }
         contractRepository.save(contract);
         // update time
         ContractPath contractPathVo = new ContractPath();

src/main/java/com/webank/webase/front/contract/entity/ReqContractSave.java

@@ -39,4 +39,6 @@ public class ReqContractSave {
      * 合约编译的runtime-bytecode(runtime-bin)，用于交易解析
      */
     private String contractBin;
+
+    private String contractAddress;
 }