Merge pull request #583 from kyonRay/master

Release-1.3.1

.github/workflows/ci_check_bcos3.yml

@@ -3,7 +3,7 @@ name: bcos3-normal-gm
 on: [pull_request]
 
 jobs:
-  normal-gm:
+  bcos3-normal-gm:
     runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
@@ -21,7 +21,7 @@ jobs:
           mysql -u root --password=123456 -h 127.0.0.1 -P 3306 -e 'status;'
           mysql --host 127.0.0.1 --port 3306 -uroot -p123456 -e "SHOW DATABASES"
 
-      - name: run ci_cross_gm_demo_check.sh
+      - name: run ci_cross_bcos3_demo_check.sh
         # The script only use ${1} as branch name. if GITHUB_BASE_REF is blank use GITHUB_REF
         run: bash -x .ci/ci_cross_bcos3_demo_check.sh ${GITHUB_BASE_REF} ${GITHUB_REF#refs/heads/}
         env:

.github/workflows/ci_check_bcos_fabric.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   bcos-fabric:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta

.github/workflows/ci_check_bcos_fabric2.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   bcos-fabric2:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta

.github/workflows/ci_check_cross_all.yml

@@ -1,10 +1,10 @@
-name: all-2groups-gm-fabric
+name: cross-all
 
 on: [pull_request]
 
 jobs:
   cross-all:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta

.github/workflows/ci_check_group_group.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   group-group:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta

.github/workflows/ci_check_normal_gm.yml

@@ -4,7 +4,7 @@ on: [pull_request]
 
 jobs:
   normal-gm:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2-beta

.github/workflows/ci_check_unittest.yml

@@ -7,7 +7,7 @@ on: [push, pull_request]
 
 jobs:
   unittest:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     steps:
       - uses: actions/checkout@v2
       - name: Set up JDK 1.8

.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

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)
 

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' }

demo/bcos3/build.sh

@@ -59,19 +59,19 @@ build_accounts() {
 
     chmod u+x get_account.sh
 
-    # generate accounts
-    mkdir -p accounts
-    cd accounts
+    # generate bcos3 normal accounts
+    mkdir -p bcos3accounts
+    cd bcos3accounts
 
     bash ../get_account.sh # normal
-    mv accounts bcos_user1
+    mv accounts bcos3_user1
     cd -
 }
 
 main() {
     build_bcos_chain "$1"
     build_accounts
-    LOG_INFO "SUCCESS: Build FISCO BCOS demo finish."
+    LOG_INFO "SUCCESS: Build FISCO BCOS3 normal demo finish."
 }
 
 main "$1"

demo/bcos3/build_gm.sh

@@ -45,7 +45,7 @@ build_bcos_chain() {
     # Build chain
     LOG_INFO "Build chain ..."
     # Setting to build 1 groups
-    bash build_chain.sh -p 30500,20400 -l 127.0.0.1:1 -o ./nodes_gm -s
+    bash build_chain.sh -p 30500,20400 -l 127.0.0.1:1 -o ./nodes_gm -s -w
 
     ./nodes_gm/127.0.0.1/start_all.sh
 }
@@ -54,26 +54,24 @@ build_accounts() {
     if [ ! -e get_gm_account.sh ]; then
         # Download
         LOG_INFO "Download get_gm_account.sh ..."
-        Download https://${GITHUB_PROXY}raw.githubusercontent.com/FISCO-BCOS/console/${BCOS_VERSION}/tools/get_gm_account.sh
+        Download "https://${GITHUB_PROXY}raw.githubusercontent.com/FISCO-BCOS/console/${BCOS3_VERSION}/tools/get_gm_account.sh"
     fi
 
     chmod u+x get_gm_account.sh
 
-    # generate accounts
-    mkdir -p accounts
-    cd accounts
+    # generate bcos3 gm accounts
+    mkdir -p bcos3accounts
+    cd bcos3accounts
 
     bash ../get_gm_account.sh # gm
-    mv accounts_gm bcos_gm_user1
-    bash ../get_gm_account.sh # gm2
-    mv accounts_gm bcos_gm_user2
+    mv accounts_gm bcos3_gm_user1
     cd -
 }
 
 main() {
     build_bcos_chain "$1"
     build_accounts
-    LOG_INFO "SUCCESS: Build FISCO BCOS GM demo finish."
+    LOG_INFO "SUCCESS: Build FISCO BCOS GM WASM demo finish."
 }
 
 main "$1"

demo/bcos3/clear.sh

@@ -7,4 +7,4 @@ if [ -e nodes_gm/127.0.0.1/stop_all.sh ]; then
     bash nodes_gm/127.0.0.1/stop_all.sh
 fi
 
-rm -rf accounts console ipconf nodes nodes_gm accounts ledger-tool
+rm -rf bcos3accounts console ipconf nodes nodes_gm ledger-tool

demo/build.sh

@@ -556,7 +556,7 @@ main() {
 
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
-            FISCO BCOS                    Fabric
+            FISCO BCOS2                    Fabric
            (4node pbft)              (first-network)
           (HelloWorld.sol)              (sacc.go)
                  |                          |

demo/build_cross_all.sh

@@ -688,7 +688,7 @@ main() {
 
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
-       FISCO BCOS          FISCO BCOS          FISCO BCOS            Fabric
+       FISCO BCOS2          FISCO BCOS2          FISCO BCOS2            Fabric
         Group 1             Group 2              Guomi           first-network
    (HelloWorldGroup1)  (HelloWorldGroup2)     (HelloWorld)         (sacc.go)
             \                 /                     \                 /

demo/build_cross_bcos3.sh

@@ -299,16 +299,16 @@ config_router_8251() {
     cd ${router_dir}
 
     # stubs bcos3_gm
-    bash add_chain.sh -t BCOS3_GM_EVM -n bcos3_gm -d conf/chains
+    bash add_chain.sh -t BCOS3_GM_WASM -n bcos3_gm -d conf/chains
     # copy cert
     cp ${ROOT}/bcos3/nodes_gm/127.0.0.1/sdk/* conf/chains/bcos3_gm/
 
     # configure to port
     sed_i 's/20200/20400/g' conf/chains/bcos3_gm/stub.toml
 
     # deploy system contracts
-    bash deploy_system_contract.sh -t BCOS3_GM_EVM -c chains/bcos3_gm -P
-    bash deploy_system_contract.sh -t BCOS3_GM_EVM -c chains/bcos3_gm -H
+    bash deploy_system_contract.sh -t BCOS3_GM_WASM -c chains/bcos3_gm -P
+    bash deploy_system_contract.sh -t BCOS3_GM_WASM -c chains/bcos3_gm -H
 
 
     # stubs bcos2_gm
@@ -435,8 +435,8 @@ deploy_bcos_sample_resource() {
 
     bash start.sh <<EOF
     login
-    bcosDeploy payment.bcos3.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
-    bcosDeploy payment.bcos3_gm.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
+    bcosDeploy payment.bcos3.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld
+    bcosDeploy payment.bcos3_gm.HelloWorld conf/contracts/liquid/hello_world/hello_world_gm.wasm conf/contracts/liquid/hello_world/hello_world.abi
     bcosDeploy payment.bcos2_gm.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
     quit
 EOF
@@ -474,7 +474,7 @@ add_bcos3_gm_account() {
     cd ${ROOT}/WeCross-Console/
     bash start.sh <<EOF
     login
-    addChainAccount BCOS3_GM_EVM conf/accounts/${name}/${address}.public.pem conf/accounts/${name}/${address}.pem ${address} true
+    addChainAccount BCOS3_GM_WASM conf/accounts/${name}/${address}.public.pem conf/accounts/${name}/${address}.pem ${address} true
     quit
 EOF
     cd -
@@ -503,11 +503,12 @@ EOF
 deploy_chain_account() {
     mkdir -p ${ROOT}/WeCross-Console/conf/accounts/
     cd ${ROOT}/WeCross-Console/conf/accounts/ && rm -rf $(ls | grep -v .sh) && cd -
-    cp -r ${ROOT}/bcos3/accounts/* ${ROOT}/WeCross-Console/conf/accounts/
+    cp -r "${ROOT}"/bcos3/bcos3accounts/* "${ROOT}"/WeCross-Console/conf/accounts/
+    cp -r "${ROOT}"/bcos/accounts/* "${ROOT}"/WeCross-Console/conf/accounts/
 
-    add_bcos3_account bcos_user1
-    add_bcos3_gm_account bcos_gm_user1
-    add_bcos2_gm_account bcos_gm_user2
+    add_bcos3_account bcos3_user1
+    add_bcos3_gm_account bcos3_gm_user1
+    add_bcos2_gm_account bcos_gm_user1
 }
 
 deploy_sample_resource() {
@@ -551,7 +552,7 @@ main() {
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
             FISCO BCOS3       FISCO BCOS3        FISCO BCOS2
-               Normal             Guomi             Guomi
+               Normal         Guomi wasm             Guomi
             (HelloWorld)       (HelloWorld)     (HelloWorld)
                  |                    \            /
                  |                     \          /

demo/build_cross_fabric2.sh

@@ -517,7 +517,7 @@ main() {
 
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
-            FISCO BCOS                    Fabric2
+            FISCO BCOS2                    Fabric2
            (4node pbft)              (test-network)
           (HelloWorld.sol)              (sacc.go)
                  |                          |

demo/build_cross_gm.sh

@@ -511,7 +511,7 @@ main() {
 
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
-                          FISCO BCOS
+                          FISCO BCOS2
                Normal                     Guomi
             (HelloWorld)               (HelloWorld)
                  |                          |

demo/build_cross_groups.sh

@@ -491,7 +491,7 @@ main() {
 
     LOG_INFO "Success! WeCross demo network is running. Framework:"
     echo -e "
-                          FISCO BCOS
+                          FISCO BCOS2
               Group 1                    Group 2
          (HelloWorldGroup1)         (HelloWorldGroup2)
                  |                          |

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})

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}

demo/profile_version.sh

@@ -1,26 +1,26 @@
 # 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
 # FISCO BCOS 3.0
-BCOS3_VERSION=v3.2.0
+BCOS3_VERSION=v3.4.0
 # FISCO BCOS Console
-BCOS3_CONSOLE_VERSION=v3.2.0
+BCOS3_CONSOLE_VERSION=v3.4.0
 
 GIT_URL_BASE='github.com'
 GITHUB_PROXY=''

release_note.txt

@@ -1 +1 @@
-v1.3.0
+v1.3.1

scripts/add_account.sh

@@ -10,7 +10,7 @@ help() {
     echo $1
     cat <<EOF
 Usage: 
-    -t <type>                           [Required] type of account, BCOS2.0 or GM_BCOS2.0 BCOS3_ECDSA_EVM or BCOS3_GM_EVM or Fabric1.4
+    -t <type>                           [Required] type of account, support: BCOS2.0, GM_BCOS2.0, Fabric1.4, Fabric2.0, BCOS3_ECDSA_EVM, BCOS3_GM_EVM, BCOS3_ECDSA_WASM, BCOS3_GM_WASM
     -n <name>                           [Required] name of account
     -d <dir>                            [Optional] generated target_directory, default conf/accounts/
     -h                                  [Optional] Help