Skip to content

Commit db7f185

Browse files
kyonRaykyonRay
authored
Merge pull request #583 from kyonRay/master
Release-1.3.1
2 parents 6303fc0 + bcd5560 commit db7f185

33 files changed

+96
-83
lines changed

Diff for: ‎.github/workflows/ci_check_bcos3.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: bcos3-normal-gm
33
on: [pull_request]
44

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

Diff for: ‎.github/workflows/ci_check_bcos_fabric.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
jobs:
66
bcos-fabric:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v2-beta

Diff for: ‎.github/workflows/ci_check_bcos_fabric2.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
jobs:
66
bcos-fabric2:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v2-beta

Diff for: ‎.github/workflows/ci_check_cross_all.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
name: all-2groups-gm-fabric
1+
name: cross-all
22

33
on: [pull_request]
44

55
jobs:
66
cross-all:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v2-beta

Diff for: ‎.github/workflows/ci_check_group_group.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
jobs:
66
group-group:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v2-beta

Diff for: ‎.github/workflows/ci_check_normal_gm.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ on: [pull_request]
44

55
jobs:
66
normal-gm:
7-
runs-on: ubuntu-18.04
7+
runs-on: ubuntu-20.04
88
steps:
99
- uses: actions/checkout@v2
1010
- uses: actions/setup-node@v2-beta

Diff for: ‎.github/workflows/ci_check_unittest.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ on: [push, pull_request]
77

88
jobs:
99
unittest:
10-
runs-on: ubuntu-18.04
10+
runs-on: ubuntu-20.04
1111
steps:
1212
- uses: actions/checkout@v2
1313
- name: Set up JDK 1.8

Diff for: ‎.github/workflows/publish_binary.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
- name: Build with Gradle
2626
run: ./gradlew assemble
2727
- name: Download plugin
28-
run: cd dist/ && bash download_plugin.sh ALL v1.3.0 && bash download_pages.sh v1.3.0 && rm -rf src && cd -
28+
run: cd dist/ && bash download_plugin.sh ALL v1.3.1 && bash download_pages.sh v1.3.1 && rm -rf src && cd -
2929
- name: Pack
3030
run: chmod +x dist/*.sh && mv dist WeCross && tar -zcvf WeCross.tar.gz WeCross
3131
- name: Checksum

Diff for: ‎Changelog.md

+14
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
### v1.3.1
2+
3+
(2023-07-31)
4+
5+
**新增**
6+
7+
* 支持FISCO BCOS 3.+ WASM执行版本，支持WASM合约部署、调用等功能。
8+
* 新增FISCO BCOS 3.x版本EVM/WASM之间的跨链demo
9+
10+
**修复**
11+
12+
* 修复FISCO BCOS 3.2.0之前版本节点的兼容性问题。
13+
* 修复Demo脚本中的一些问题。
14+
115
### v1.3.0
216
(2023-03-15)
317

Diff for: ‎build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ repositories {
2424
}
2525

2626
sourceCompatibility = '1.8'
27-
version = '1.3.0'
27+
version = '1.3.1'
2828

2929
task stubSourceJar(type: Jar) {
3030
into 'com/webank/wecross/stub', { from 'src/main/java/com/webank/wecross/stub' }

Diff for: ‎demo/bcos3/build.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -59,19 +59,19 @@ build_accounts() {
5959

6060
chmod u+x get_account.sh
6161

62-
# generate accounts
63-
mkdir -p accounts
64-
cd accounts
62+
# generate bcos3 normal accounts
63+
mkdir -p bcos3accounts
64+
cd bcos3accounts
6565

6666
bash ../get_account.sh # normal
67-
mv accounts bcos_user1
67+
mv accounts bcos3_user1
6868
cd -
6969
}
7070

7171
main() {
7272
build_bcos_chain "$1"
7373
build_accounts
74-
LOG_INFO "SUCCESS: Build FISCO BCOS demo finish."
74+
LOG_INFO "SUCCESS: Build FISCO BCOS3 normal demo finish."
7575
}
7676

7777
main "$1"

Diff for: ‎demo/bcos3/build_gm.sh

+7-9
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ build_bcos_chain() {
4545
# Build chain
4646
LOG_INFO "Build chain ..."
4747
# Setting to build 1 groups
48-
bash build_chain.sh -p 30500,20400 -l 127.0.0.1:1 -o ./nodes_gm -s
48+
bash build_chain.sh -p 30500,20400 -l 127.0.0.1:1 -o ./nodes_gm -s -w
4949

5050
./nodes_gm/127.0.0.1/start_all.sh
5151
}
@@ -54,26 +54,24 @@ build_accounts() {
5454
if [ ! -e get_gm_account.sh ]; then
5555
# Download
5656
LOG_INFO "Download get_gm_account.sh ..."
57-
Download https://${GITHUB_PROXY}raw.githubusercontent.com/FISCO-BCOS/console/${BCOS_VERSION}/tools/get_gm_account.sh
57+
Download "https://${GITHUB_PROXY}raw.githubusercontent.com/FISCO-BCOS/console/${BCOS3_VERSION}/tools/get_gm_account.sh"
5858
fi
5959

6060
chmod u+x get_gm_account.sh
6161

62-
# generate accounts
63-
mkdir -p accounts
64-
cd accounts
62+
# generate bcos3 gm accounts
63+
mkdir -p bcos3accounts
64+
cd bcos3accounts
6565

6666
bash ../get_gm_account.sh # gm
67-
mv accounts_gm bcos_gm_user1
68-
bash ../get_gm_account.sh # gm2
69-
mv accounts_gm bcos_gm_user2
67+
mv accounts_gm bcos3_gm_user1
7068
cd -
7169
}
7270

7371
main() {
7472
build_bcos_chain "$1"
7573
build_accounts
76-
LOG_INFO "SUCCESS: Build FISCO BCOS GM demo finish."
74+
LOG_INFO "SUCCESS: Build FISCO BCOS GM WASM demo finish."
7775
}
7876

7977
main "$1"

Diff for: ‎demo/bcos3/clear.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ if [ -e nodes_gm/127.0.0.1/stop_all.sh ]; then
77
bash nodes_gm/127.0.0.1/stop_all.sh
88
fi
99

10-
rm -rf accounts console ipconf nodes nodes_gm accounts ledger-tool
10+
rm -rf bcos3accounts console ipconf nodes nodes_gm ledger-tool

Diff for: ‎demo/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ main() {
556556

557557
LOG_INFO "Success! WeCross demo network is running. Framework:"
558558
echo -e "
559-
FISCO BCOS Fabric
559+
FISCO BCOS2 Fabric
560560
(4node pbft) (first-network)
561561
(HelloWorld.sol) (sacc.go)
562562
| |

Diff for: ‎demo/build_cross_all.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -688,7 +688,7 @@ main() {
688688

689689
LOG_INFO "Success! WeCross demo network is running. Framework:"
690690
echo -e "
691-
FISCO BCOS FISCO BCOS FISCO BCOS Fabric
691+
FISCO BCOS2 FISCO BCOS2 FISCO BCOS2 Fabric
692692
Group 1 Group 2 Guomi first-network
693693
(HelloWorldGroup1) (HelloWorldGroup2) (HelloWorld) (sacc.go)
694694
\ / \ /

Diff for: ‎demo/build_cross_bcos3.sh

+12-11
Original file line numberDiff line numberDiff line change
@@ -299,16 +299,16 @@ config_router_8251() {
299299
cd ${router_dir}
300300

301301
# stubs bcos3_gm
302-
bash add_chain.sh -t BCOS3_GM_EVM -n bcos3_gm -d conf/chains
302+
bash add_chain.sh -t BCOS3_GM_WASM -n bcos3_gm -d conf/chains
303303
# copy cert
304304
cp ${ROOT}/bcos3/nodes_gm/127.0.0.1/sdk/* conf/chains/bcos3_gm/
305305

306306
# configure to port
307307
sed_i 's/20200/20400/g' conf/chains/bcos3_gm/stub.toml
308308

309309
# deploy system contracts
310-
bash deploy_system_contract.sh -t BCOS3_GM_EVM -c chains/bcos3_gm -P
311-
bash deploy_system_contract.sh -t BCOS3_GM_EVM -c chains/bcos3_gm -H
310+
bash deploy_system_contract.sh -t BCOS3_GM_WASM -c chains/bcos3_gm -P
311+
bash deploy_system_contract.sh -t BCOS3_GM_WASM -c chains/bcos3_gm -H
312312

313313

314314
# stubs bcos2_gm
@@ -435,8 +435,8 @@ deploy_bcos_sample_resource() {
435435

436436
bash start.sh <<EOF
437437
login
438-
bcosDeploy payment.bcos3.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
439-
bcosDeploy payment.bcos3_gm.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
438+
bcosDeploy payment.bcos3.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld
439+
bcosDeploy payment.bcos3_gm.HelloWorld conf/contracts/liquid/hello_world/hello_world_gm.wasm conf/contracts/liquid/hello_world/hello_world.abi
440440
bcosDeploy payment.bcos2_gm.HelloWorld conf/contracts/solidity/HelloWorld.sol HelloWorld 1.0
441441
quit
442442
EOF
@@ -474,7 +474,7 @@ add_bcos3_gm_account() {
474474
cd ${ROOT}/WeCross-Console/
475475
bash start.sh <<EOF
476476
login
477-
addChainAccount BCOS3_GM_EVM conf/accounts/${name}/${address}.public.pem conf/accounts/${name}/${address}.pem ${address} true
477+
addChainAccount BCOS3_GM_WASM conf/accounts/${name}/${address}.public.pem conf/accounts/${name}/${address}.pem ${address} true
478478
quit
479479
EOF
480480
cd -
@@ -503,11 +503,12 @@ EOF
503503
deploy_chain_account() {
504504
mkdir -p ${ROOT}/WeCross-Console/conf/accounts/
505505
cd ${ROOT}/WeCross-Console/conf/accounts/ && rm -rf $(ls | grep -v .sh) && cd -
506-
cp -r ${ROOT}/bcos3/accounts/* ${ROOT}/WeCross-Console/conf/accounts/
506+
cp -r "${ROOT}"/bcos3/bcos3accounts/* "${ROOT}"/WeCross-Console/conf/accounts/
507+
cp -r "${ROOT}"/bcos/accounts/* "${ROOT}"/WeCross-Console/conf/accounts/
507508

508-
add_bcos3_account bcos_user1
509-
add_bcos3_gm_account bcos_gm_user1
510-
add_bcos2_gm_account bcos_gm_user2
509+
add_bcos3_account bcos3_user1
510+
add_bcos3_gm_account bcos3_gm_user1
511+
add_bcos2_gm_account bcos_gm_user1
511512
}
512513

513514
deploy_sample_resource() {
@@ -551,7 +552,7 @@ main() {
551552
LOG_INFO "Success! WeCross demo network is running. Framework:"
552553
echo -e "
553554
FISCO BCOS3 FISCO BCOS3 FISCO BCOS2
554-
Normal Guomi Guomi
555+
Normal Guomi wasm Guomi
555556
(HelloWorld) (HelloWorld) (HelloWorld)
556557
| \ /
557558
| \ /

Diff for: ‎demo/build_cross_fabric2.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -517,7 +517,7 @@ main() {
517517

518518
LOG_INFO "Success! WeCross demo network is running. Framework:"
519519
echo -e "
520-
FISCO BCOS Fabric2
520+
FISCO BCOS2 Fabric2
521521
(4node pbft) (test-network)
522522
(HelloWorld.sol) (sacc.go)
523523
| |

Diff for: ‎demo/build_cross_gm.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ main() {
511511

512512
LOG_INFO "Success! WeCross demo network is running. Framework:"
513513
echo -e "
514-
FISCO BCOS
514+
FISCO BCOS2
515515
Normal Guomi
516516
(HelloWorld) (HelloWorld)
517517
| |

Diff for: ‎demo/build_cross_groups.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ main() {
491491

492492
LOG_INFO "Success! WeCross demo network is running. Framework:"
493493
echo -e "
494-
FISCO BCOS
494+
FISCO BCOS2
495495
Group 1 Group 2
496496
(HelloWorldGroup1) (HelloWorldGroup2)
497497
| |

Diff for: ‎demo/fabric/build.sh

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,6 @@
11
#!/bin/bash
22
set -e
33
LANG=en_US.UTF-8
4-
version_file="../profile_version.sh"
5-
[[ ! -f "${version_file}" ]] && {
6-
LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. "
7-
exit 1
8-
}
9-
10-
source "${version_file}"
114
LOG_INFO() {
125
local content=${1}
136
echo -e "\033[32m[INFO][Fabric] ${content}\033[0m"
@@ -18,6 +11,13 @@ LOG_ERROR() {
1811
echo -e "\033[31m[ERROR][Fabric] ${content}\033[0m"
1912
}
2013

14+
version_file="../profile_version.sh"
15+
[[ ! -f "${version_file}" ]] && {
16+
LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. "
17+
exit 1
18+
}
19+
source "${version_file}"
20+
2121
Download() {
2222
local url=${1}
2323
local file=$(basename ${url})

Diff for: ‎demo/fabric2/build.sh

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,7 @@
11
#!/bin/bash
22
set -e
33
LANG=en_US.UTF-8
4-
version_file="../profile_version.sh"
5-
[[ ! -f "${version_file}" ]] && {
6-
LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. "
7-
exit 1
8-
}
94

10-
source "${version_file}"
115
LOG_INFO() {
126
local content=${1}
137
echo -e "\033[32m[INFO][Fabric] ${content}\033[0m"
@@ -17,6 +11,12 @@ LOG_ERROR() {
1711
local content=${1}
1812
echo -e "\033[31m[ERROR][Fabric] ${content}\033[0m"
1913
}
14+
version_file="../profile_version.sh"
15+
[[ ! -f "${version_file}" ]] && {
16+
LOG_ERROR " ${version_file} not exist, please check if the demo is the latest. "
17+
exit 1
18+
}
19+
source "${version_file}"
2020

2121
Download() {
2222
local url=${1}

Diff for: ‎demo/profile_version.sh

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
# WeCross
2-
WECROSS_VERSION=v1.3.0
2+
WECROSS_VERSION=v1.3.1
33
# WeCross Console
4-
WECROSS_CONSOLE_VERSION=v1.3.0
4+
WECROSS_CONSOLE_VERSION=v1.3.1
55
# WeCross Account Manager
6-
WECROSS_ACCOUNT_MANAGER_VERSION=v1.3.0
6+
WECROSS_ACCOUNT_MANAGER_VERSION=v1.3.1
77
# WeCross BCOS2.0 Stub
8-
WECROSS_BCOS2_STUB_VERSION=v1.3.0
8+
WECROSS_BCOS2_STUB_VERSION=v1.3.1
99
# WeCross BCOS3.0 Stub
10-
WECROSS_BCOS3_STUB_VERSION=v1.3.0
10+
WECROSS_BCOS3_STUB_VERSION=v1.3.1
1111
# WeCross Fabric1.4 Stub
12-
WECROSS_FABRIC1_STUB_VERSION=v1.3.0
12+
WECROSS_FABRIC1_STUB_VERSION=v1.3.1
1313
# WeCross Fabric2.0 Stub
14-
WECROSS_FABRIC2_STUB_VERSION=v1.3.0
14+
WECROSS_FABRIC2_STUB_VERSION=v1.3.1
1515
# WeCross Java SDK
16-
WECROSS_JAVA_SDK_VERSION=v1.3.0
16+
WECROSS_JAVA_SDK_VERSION=v1.3.1
1717

1818
# FISCO BCOS
1919
BCOS_VERSION=v2.9.1
2020
# FISCO BCOS 3.0
21-
BCOS3_VERSION=v3.2.0
21+
BCOS3_VERSION=v3.4.0
2222
# FISCO BCOS Console
23-
BCOS3_CONSOLE_VERSION=v3.2.0
23+
BCOS3_CONSOLE_VERSION=v3.4.0
2424

2525
GIT_URL_BASE='github.com'
2626
GITHUB_PROXY=''

Diff for: ‎release_note.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.3.0
1+
v1.3.1

Diff for: ‎scripts/add_account.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ help() {
1010
echo $1
1111
cat <<EOF
1212
Usage:
13-
-t <type> [Required] type of account, BCOS2.0 or GM_BCOS2.0 BCOS3_ECDSA_EVM or BCOS3_GM_EVM or Fabric1.4
13+
-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
1414
-n <name> [Required] name of account
1515
-d <dir> [Optional] generated target_directory, default conf/accounts/
1616
-h [Optional] Help

0 commit comments

Comments
 (0)