diff --git a/.github/workflows/publish_binary.yml b/.github/workflows/publish_binary.yml index a8d37320c..9a1a21abf 100644 --- a/.github/workflows/publish_binary.yml +++ b/.github/workflows/publish_binary.yml @@ -25,7 +25,7 @@ jobs: - name: Build with Gradle run: ./gradlew assemble - name: Download plugin - run: cd dist/ && bash download_plugin.sh ALL v1.3.0 && bash download_pages.sh v1.3.0 && rm -rf src && cd - + run: cd dist/ && bash download_plugin.sh ALL v1.3.1 && bash download_pages.sh v1.3.1 && rm -rf src && cd - - name: Pack run: chmod +x dist/*.sh && mv dist WeCross && tar -zcvf WeCross.tar.gz WeCross - name: Checksum diff --git a/Changelog.md b/Changelog.md index 0d6c8195e..a8fc14fd4 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,3 +1,17 @@ +### v1.3.1 + +(2023-07-31) + +**新增** + +* 支持FISCO BCOS 3.+ WASM执行版本，支持WASM合约部署、调用等功能。 +* 新增FISCO BCOS 3.x版本EVM/WASM之间的跨链demo + +**修复** + +* 修复FISCO BCOS 3.2.0之前版本节点的兼容性问题。 +* 修复Demo脚本中的一些问题。 + ### v1.3.0 (2023-03-15) diff --git a/build.gradle b/build.gradle index dfa0b227a..c7974dee1 100644 --- a/build.gradle +++ b/build.gradle @@ -24,7 +24,7 @@ repositories { } sourceCompatibility = '1.8' -version = '1.3.0' +version = '1.3.1' task stubSourceJar(type: Jar) { into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' } diff --git a/demo/fabric/build.sh b/demo/fabric/build.sh index b58ce31d2..d062fc996 100644 --- a/demo/fabric/build.sh +++ b/demo/fabric/build.sh @@ -1,13 +1,6 @@ #!/bin/bash set -e LANG=en_US.UTF-8 -version_file="../profile_version.sh" -[[ ! -f "${version_file}" ]] && { - LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. " - exit 1 -} - -source "${version_file}" LOG_INFO() { local content=${1} echo -e "\033[32m[INFO][Fabric] ${content}\033[0m" @@ -18,6 +11,13 @@ LOG_ERROR() { echo -e "\033[31m[ERROR][Fabric] ${content}\033[0m" } +version_file="../profile_version.sh" +[[ ! -f "${version_file}" ]] && { + LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. " + exit 1 +} +source "${version_file}" + Download() { local url=${1} local file=$(basename ${url}) diff --git a/demo/fabric2/build.sh b/demo/fabric2/build.sh index 4a3d8f394..705a78d41 100644 --- a/demo/fabric2/build.sh +++ b/demo/fabric2/build.sh @@ -1,13 +1,7 @@ #!/bin/bash set -e LANG=en_US.UTF-8 -version_file="../profile_version.sh" -[[ ! -f "${version_file}" ]] && { - LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. " - exit 1 -} -source "${version_file}" LOG_INFO() { local content=${1} echo -e "\033[32m[INFO][Fabric] ${content}\033[0m" @@ -17,6 +11,12 @@ LOG_ERROR() { local content=${1} echo -e "\033[31m[ERROR][Fabric] ${content}\033[0m" } +version_file="../profile_version.sh" +[[ ! -f "${version_file}" ]] && { + LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. " + exit 1 +} +source "${version_file}" Download() { local url=${1} diff --git a/demo/profile_version.sh b/demo/profile_version.sh index 6868201a5..19e32f226 100644 --- a/demo/profile_version.sh +++ b/demo/profile_version.sh @@ -1,19 +1,19 @@ # WeCross -WECROSS_VERSION=v1.3.0 +WECROSS_VERSION=v1.3.1 # WeCross Console -WECROSS_CONSOLE_VERSION=v1.3.0 +WECROSS_CONSOLE_VERSION=v1.3.1 # WeCross Account Manager -WECROSS_ACCOUNT_MANAGER_VERSION=v1.3.0 +WECROSS_ACCOUNT_MANAGER_VERSION=v1.3.1 # WeCross BCOS2.0 Stub -WECROSS_BCOS2_STUB_VERSION=v1.3.0 +WECROSS_BCOS2_STUB_VERSION=v1.3.1 # WeCross BCOS3.0 Stub -WECROSS_BCOS3_STUB_VERSION=v1.3.0 +WECROSS_BCOS3_STUB_VERSION=v1.3.1 # WeCross Fabric1.4 Stub -WECROSS_FABRIC1_STUB_VERSION=v1.3.0 +WECROSS_FABRIC1_STUB_VERSION=v1.3.1 # WeCross Fabric2.0 Stub -WECROSS_FABRIC2_STUB_VERSION=v1.3.0 +WECROSS_FABRIC2_STUB_VERSION=v1.3.1 # WeCross Java SDK -WECROSS_JAVA_SDK_VERSION=v1.3.0 +WECROSS_JAVA_SDK_VERSION=v1.3.1 # FISCO BCOS BCOS_VERSION=v2.9.1 diff --git a/release_note.txt b/release_note.txt index 18fa8e74f..757407982 100644 --- a/release_note.txt +++ b/release_note.txt @@ -1 +1 @@ -v1.3.0 +v1.3.1 diff --git a/scripts/download_account_manager.sh b/scripts/download_account_manager.sh index 16f317f9b..41178e1b1 100644 --- a/scripts/download_account_manager.sh +++ b/scripts/download_account_manager.sh @@ -3,7 +3,7 @@ set -e LANG=en_US.UTF-8 -default_compatibility_version=v1.3.0 # update this every release +default_compatibility_version=v1.3.1 # update this every release compatibility_version= enable_build_from_resource=0 diff --git a/scripts/download_console.sh b/scripts/download_console.sh index d452f73f5..05b7904d1 100644 --- a/scripts/download_console.sh +++ b/scripts/download_console.sh @@ -3,7 +3,7 @@ set -e LANG=en_US.UTF-8 -default_compatibility_version=v1.3.0 # update this every release +default_compatibility_version=v1.3.1 # update this every release BCOS_VERSION=v2.7.2 # use this version to specify get_account script compatibility_version= diff --git a/scripts/download_demo.sh b/scripts/download_demo.sh index dc58969a6..18e3aec00 100644 --- a/scripts/download_demo.sh +++ b/scripts/download_demo.sh @@ -3,7 +3,7 @@ set -e LANG=en_US.UTF-8 -default_compatibility_version=v1.3.0 # update this every release +default_compatibility_version=v1.3.1 # update this every release compatibility_version= GIT_URL_BASE='github.com' diff --git a/scripts/download_pages.sh b/scripts/download_pages.sh index d1f7a4c65..4f301ce5d 100644 --- a/scripts/download_pages.sh +++ b/scripts/download_pages.sh @@ -34,7 +34,7 @@ Usage: bash $0 : certain tag or branch to download e.g - bash $0 v1.3.0 + bash $0 v1.3.1 EOF exit 0 } diff --git a/scripts/download_plugin.sh b/scripts/download_plugin.sh index 91149e459..75c0f2b39 100644 --- a/scripts/download_plugin.sh +++ b/scripts/download_plugin.sh @@ -50,10 +50,10 @@ Usage: : certain tag or branch to download e.g - bash $0 BCOS2 v1.3.0 - bash $0 BCOS3 v1.3.0 - bash $0 Fabric1 v1.3.0 - bash $0 Fabric2 v1.3.0 + bash $0 BCOS2 v1.3.1 + bash $0 BCOS3 v1.3.1 + bash $0 Fabric1 v1.3.1 + bash $0 Fabric2 v1.3.1 EOF exit 0 } diff --git a/scripts/download_wecross.sh b/scripts/download_wecross.sh index d7d042fb8..e91169c31 100755 --- a/scripts/download_wecross.sh +++ b/scripts/download_wecross.sh @@ -6,7 +6,7 @@ LANG=en_US.UTF-8 enable_build_from_resource=0 compatibility_version= -default_compatibility_version=v1.3.0 # update this every release +default_compatibility_version=v1.3.1 # update this every release deps_dir=$(pwd)'/WeCross/plugin/' pages_dir=$(pwd)'/WeCross/pages/' src_dir=$(pwd)'/src/' diff --git a/src/main/java/com/webank/wecross/common/WeCrossDefault.java b/src/main/java/com/webank/wecross/common/WeCrossDefault.java index 749879c55..d826fd5fb 100644 --- a/src/main/java/com/webank/wecross/common/WeCrossDefault.java +++ b/src/main/java/com/webank/wecross/common/WeCrossDefault.java @@ -4,7 +4,7 @@ import java.util.List; public class WeCrossDefault { - public static final String VERSION = "v1.3.0"; + public static final String VERSION = "v1.3.1"; public static final String TEMPLATE_URL = "http://127.0.0.1:8080/";