Release 1.1.1

Release 1.1.1

.github/workflows/publish_binary.yml

@@ -21,7 +21,7 @@ jobs:
     - name: Build with Gradle
       run: ./gradlew assemble
     - name: Download plugin
-      run: cd dist/ && bash download_plugin.sh BCOS2 v1.1.0 && bash download_plugin.sh Fabric1 v1.1.0 && bash download_pages.sh v1.1.0  && rm -rf src && cd -
+      run: cd dist/ && bash download_plugin.sh BCOS2 v1.1.1 && bash download_plugin.sh Fabric1 v1.1.1 && bash download_pages.sh v1.1.1  && rm -rf src && cd -
     - name: Pack
       run: chmod +x dist/*.sh && mv dist WeCross && tar -zcvf WeCross.tar.gz WeCross
     - name: Checksum

.github/workflows/publish_scripts.yml

@@ -0,0 +1,39 @@
+name: Upload files to resources
+# upload scripts to release on push to master: WeCross latest download resources
+on:
+  release:
+    types: [prereleased]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v1
+    - name: Upload upgrade_account_manager.sh
+      uses: svenstaro/upload-release-action@v1-release
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: scripts/upgrade_account_manager.sh
+        asset_name: upgrade_account_manager.sh
+        tag: ${{ github.ref }}
+        overwrite: true
+
+    - name: Upload upgrade_console.sh
+      uses: svenstaro/upload-release-action@v1-release
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: scripts/upgrade_console.sh
+        asset_name: upgrade_console.sh
+        tag: ${{ github.ref }}
+        overwrite: true
+
+    - name: Upload upgrade_wecross.sh
+      uses: svenstaro/upload-release-action@v1-release
+      with:
+        repo_token: ${{ secrets.GITHUB_TOKEN }}
+        file: scripts/upgrade_wecross.sh
+        asset_name: upgrade_wecross.sh
+        tag: ${{ github.ref }}
+        overwrite: true

.gitignore

@@ -60,3 +60,5 @@ routers/
 null/
 verifiers/
 /src/test/resources/verifier.toml
+/src/test/resources/pages
+/src/test/resources/conf

Changelog.md

@@ -1,6 +1,18 @@
+### v1.1.1
+
+(2021-04-02)
+
+**更改**
+
+* 支持RPC端口的URL地址前缀可配，以兼容更多的部署环境
+* 各组件启动时打印版本号，使操作更清晰
+* Demo添加启停脚本，支持启动、停止已经部署好的Demo
+* 可视化管理台用户体验优化
+* 优化区块头验证代码结构
+
 ### v1.1.0
 
-(2020-02-02)
+(2021-02-02)
 
 **功能**
 
@@ -13,7 +25,7 @@
 
 ### v1.0.1
 
-(2020-01-15)
+(2021-01-15)
 
 **功能**
 

build.gradle

@@ -24,7 +24,7 @@ repositories {
 }
 
 sourceCompatibility = '1.8'
-version = '1.1.0'
+version = '1.1.1'
 
 task stubSourceJar(type: Jar) {
     into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' }
@@ -130,9 +130,9 @@ dependencies {
     compile 'com.moandjiezana.toml:toml4j:0.7.2'
     compile 'org.apache.commons:commons-lang3:3.11'
     compile 'com.fasterxml.jackson.core:jackson-databind:2.11.2' // must not lower than 2.11.0 to support abi translate
-    compile 'org.springframework.boot:spring-boot-starter-log4j2:2.3.8.RELEASE'
-    compile 'org.springframework.boot:spring-boot-starter-actuator:2.3.8.RELEASE'
-    compile 'org.springframework.boot:spring-boot-configuration-processor:2.3.8.RELEASE'
+    compile 'org.springframework.boot:spring-boot-starter-log4j2:2.3.9.RELEASE'
+    compile 'org.springframework.boot:spring-boot-starter-actuator:2.3.9.RELEASE'
+    compile 'org.springframework.boot:spring-boot-configuration-processor:2.3.9.RELEASE'
     compile 'org.asynchttpclient:async-http-client:2.12.2'
     compile 'org.bouncycastle:bcprov-jdk15on:1.60'
     compile 'commons-codec:commons-codec:1.14'

demo/.prepare.sh

@@ -26,7 +26,7 @@ version_file="profile_version.sh"
 }
 
 source "${version_file}"
-LOG_INFO "source ${version_file}, WeCross Version=${WECROSS_VERSION}"
+LOG_INFO "WeCross Version: ${WECROSS_VERSION}"
 
 Download() {
     local url=${1}

demo/bcos/build.sh

@@ -22,7 +22,7 @@ version_file="../profile_version.sh"
 }
 
 source "${version_file}"
-LOG_INFO "source ${version_file}, WeCross Version=${WECROSS_VERSION}"
+LOG_INFO "WeCross Version: ${WECROSS_VERSION}"
 
 Download() {
     local url=${1}

demo/bcos/build_gm.sh

@@ -22,7 +22,7 @@ version_file="../profile_version.sh"
 }
 
 source "${version_file}"
-LOG_INFO "source ${version_file}, WeCross Version=${WECROSS_VERSION}"
+LOG_INFO "WeCross Version: ${WECROSS_VERSION}"
 
 Download() {
     local url=${1}

demo/bcos/start.sh

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+SHELL_FOLDER="$(cd "$(dirname "$0")" && pwd)"
+
+LOG_ERROR() {
+    echo -e "\033[31m[ERROR] $@\033[0m"
+}
+
+LOG_INFO() {
+    echo -e "\033[32m[INFO] $@\033[0m"
+}
+
+if [ ! -e ${SHELL_FOLDER}/nodes/127.0.0.1/start_all.sh ] && [ ! -e ${SHELL_FOLDER}/nodes_gm/127.0.0.1/start_all.sh ]; then
+    LOG_ERROR "FISCO-BCOS demo has not been built."
+    LOG_INFO "Please use \"build.sh\" directly."
+    exit 1
+fi
+
+if [ -e ${SHELL_FOLDER}/nodes/127.0.0.1/start_all.sh ]; then
+    bash ${SHELL_FOLDER}/nodes/127.0.0.1/start_all.sh
+fi
+
+if [ -e ${SHELL_FOLDER}/nodes_gm/127.0.0.1/start_all.sh ]; then
+    bash ${SHELL_FOLDER}/nodes_gm/127.0.0.1/start_all.sh
+fi
+

demo/bcos/stop.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+SHELL_FOLDER="$(cd "$(dirname "$0")" && pwd)"
+
+if [ -e ${SHELL_FOLDER}/nodes/127.0.0.1/stop_all.sh ]; then
+    bash ${SHELL_FOLDER}/nodes/127.0.0.1/stop_all.sh
+fi
+
+if [ -e ${SHELL_FOLDER}/nodes_gm/127.0.0.1/stop_all.sh ]; then
+    bash ${SHELL_FOLDER}/nodes_gm/127.0.0.1/stop_all.sh
+fi

demo/build.sh

@@ -28,7 +28,7 @@ version_file="profile_version.sh"
 }
 
 source "${version_file}"
-LOG_INFO "source ${version_file}, WeCross Version=${WECROSS_VERSION}"
+LOG_INFO "WeCross Version: ${WECROSS_VERSION}"
 
 Download() {
     local url=${1}
@@ -86,43 +86,43 @@ check_db_service() {
     LOG_INFO "Database configuration OK!"
 }
 
-check_port_avaliable() {
+check_port_available() {
     port=$1
     name=$2
     if [ "$(lsof -i:$port | wc -l)" -ne "0" ]; then
-        LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain or application is running?"
+        LOG_ERROR "${name} port ${port} is not available. Are there any other blockchain or application is running?"
         exit 1
     fi
 }
 
-check_account_manager_avaliable() {
-    check_port_avaliable 8340 WeCross-Account-Manager
+check_account_manager_available() {
+    check_port_available 8340 WeCross-Account-Manager
 }
 
-check_fabric_avaliable() {
-    check_port_avaliable 7050 Fabric-Orderer
-    check_port_avaliable 7051 Fabric-Peer
-    check_port_avaliable 8051 Fabric-Peer
-    check_port_avaliable 9051 Fabric-Peer
-    check_port_avaliable 10051 Fabric-Peer
+check_fabric_available() {
+    check_port_available 7050 Fabric-Orderer
+    check_port_available 7051 Fabric-Peer
+    check_port_available 8051 Fabric-Peer
+    check_port_available 9051 Fabric-Peer
+    check_port_available 10051 Fabric-Peer
 }
 
-check_bcos_avaliable() {
+check_bcos_available() {
     # 30300,20200,8545
-    check_port_avaliable 30300 BCOS-P2P
-    check_port_avaliable 20200 BCOS-Channel
-    check_port_avaliable 8545 BCOS-RPC
+    check_port_available 30300 BCOS-P2P
+    check_port_available 20200 BCOS-Channel
+    check_port_available 8545 BCOS-RPC
 
-    check_port_avaliable 30301 BCOS-P2P
-    check_port_avaliable 20201 BCOS-Channel
-    check_port_avaliable 8546 BCOS-RPC
+    check_port_available 30301 BCOS-P2P
+    check_port_available 20201 BCOS-Channel
+    check_port_available 8546 BCOS-RPC
 }
 
-check_wecross_avaliable() {
-    check_port_avaliable 8250 WeCross-8250-25500
-    check_port_avaliable 25500 WeCross-8250-25500
-    check_port_avaliable 8251 WeCross-8251-25501
-    check_port_avaliable 25501 WeCross-8251-25501
+check_wecross_available() {
+    check_port_available 8250 WeCross-8250-25500
+    check_port_available 25500 WeCross-8250-25500
+    check_port_available 8251 WeCross-8251-25501
+    check_port_available 25501 WeCross-8251-25501
 }
 
 check_env() {
@@ -132,10 +132,10 @@ check_env() {
     check_command docker-compose
     check_command mysql
     check_docker_service
-    check_fabric_avaliable
-    check_bcos_avaliable
-    check_wecross_avaliable
-    check_account_manager_avaliable
+    check_fabric_available
+    check_bcos_available
+    check_wecross_available
+    check_account_manager_available
 }
 
 build_bcos() {

demo/build_cross_all.sh

@@ -28,7 +28,7 @@ version_file="profile_version.sh"
 }
 
 source "${version_file}"
-LOG_INFO "source ${version_file}, WeCross Version=${WECROSS_VERSION}"
+LOG_INFO "WeCross Version: ${WECROSS_VERSION}"
 
 Download() {
     local url=${1}
@@ -86,16 +86,16 @@ check_db_service() {
     LOG_INFO "Database configuration OK!"
 }
 
-check_port_avaliable() {
+check_port_available() {
     port=$1
     name=$2
     if [ "$(lsof -i:$port | wc -l)" -ne "0" ]; then
-        LOG_ERROR "${name} port ${port} is not avaliable. Are there any other blockchain or application is running?"
+        LOG_ERROR "${name} port ${port} is not available. Are there any other blockchain or application is running?"
         exit 1
     fi
 }
 
-check_java_avaliable() {
+check_java_available() {
     # java version "9"
     # java version "1.8.0_281"
     # openjdk version "15.0.2" 2021-01-19
@@ -134,34 +134,34 @@ check_java_avaliable() {
     LOG_INFO "Java check OK!"
 }
 
-check_account_manager_avaliable() {
-    check_port_avaliable 8340 WeCross-Account-Manager
+check_account_manager_available() {
+    check_port_available 8340 WeCross-Account-Manager
 }
 
-check_fabric_avaliable() {
-    check_port_avaliable 7050 Fabric-Orderer
-    check_port_avaliable 7051 Fabric-Peer
-    check_port_avaliable 8051 Fabric-Peer
-    check_port_avaliable 9051 Fabric-Peer
-    check_port_avaliable 10051 Fabric-Peer
+check_fabric_available() {
+    check_port_available 7050 Fabric-Orderer
+    check_port_available 7051 Fabric-Peer
+    check_port_available 8051 Fabric-Peer
+    check_port_available 9051 Fabric-Peer
+    check_port_available 10051 Fabric-Peer
 }
 
-check_bcos_avaliable() {
+check_bcos_available() {
     # 30300,20200,8545
-    check_port_avaliable 30300 BCOS-P2P
-    check_port_avaliable 20200 BCOS-Channel
-    check_port_avaliable 8545 BCOS-RPC
+    check_port_available 30300 BCOS-P2P
+    check_port_available 20200 BCOS-Channel
+    check_port_available 8545 BCOS-RPC
 
-    check_port_avaliable 30310 BCOS-GM-P2P
-    check_port_avaliable 20210 BCOS-GM-Channel
-    check_port_avaliable 8555 BCOS-GM-RPC
+    check_port_available 30310 BCOS-GM-P2P
+    check_port_available 20210 BCOS-GM-Channel
+    check_port_available 8555 BCOS-GM-RPC
 }
 
-check_wecross_avaliable() {
-    check_port_avaliable 8250 WeCross-8250-25500
-    check_port_avaliable 25500 WeCross-8250-25500
-    check_port_avaliable 8251 WeCross-8251-25501
-    check_port_avaliable 25501 WeCross-8251-25501
+check_wecross_available() {
+    check_port_available 8250 WeCross-8250-25500
+    check_port_available 25500 WeCross-8250-25500
+    check_port_available 8251 WeCross-8251-25501
+    check_port_available 25501 WeCross-8251-25501
 }
 
 check_env() {
@@ -170,12 +170,12 @@ check_env() {
     check_command docker
     check_command docker-compose
     check_command mysql
-    check_java_avaliable
+    check_java_available
     check_docker_service
-    check_fabric_avaliable
-    check_bcos_avaliable
-    check_wecross_avaliable
-    check_account_manager_avaliable
+    check_fabric_available
+    check_bcos_available
+    check_wecross_available
+    check_account_manager_available
 }
 
 build_bcos() {