diff --git a/core b/core index ce1d81dd..8592001e 160000 --- a/core +++ b/core @@ -1 +1 @@ -Subproject commit ce1d81ddeb51ddc2f96c5d7e1a89b7383ace9352 +Subproject commit 8592001ea0af771c88357767031b59377b3d2a40 diff --git a/deploy/deploy-gateway/pom.xml b/deploy/deploy-gateway/pom.xml index a28fbe3b..aaa989eb 100644 --- a/deploy/deploy-gateway/pom.xml +++ b/deploy/deploy-gateway/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.0-SNAPSHOT + 1.4.0.RELEASE deploy-gateway diff --git a/deploy/deploy-peer/pom.xml b/deploy/deploy-peer/pom.xml index b9edadbe..b3520323 100644 --- a/deploy/deploy-peer/pom.xml +++ b/deploy/deploy-peer/pom.xml @@ -5,7 +5,7 @@ com.jd.blockchain deploy-root - 1.4.0-SNAPSHOT + 1.4.0.RELEASE deploy-peer @@ -58,6 +58,24 @@ ${core.version} + + com.jd.blockchain + tools-regparti-booter + ${core.version} + + + + com.jd.blockchain + tools-activeparti-booter + ${core.version} + + + + com.jd.blockchain + tools-deactiveparti-booter + ${core.version} + + diff --git a/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh b/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh new file mode 100644 index 00000000..648f6963 --- /dev/null +++ b/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +HOME=$(cd `dirname $0`;cd ../; pwd) +boot_file=$(ls ../libs | grep tools-activeparti-booter-) +if [ ! -n "$boot_file" ]; then + echo "tools-activeparti-booter is null" +else + echo "active participant" + java -jar $HOME/libs/$boot_file $* +fi \ No newline at end of file diff --git a/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh b/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh new file mode 100644 index 00000000..67ad5314 --- /dev/null +++ b/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +HOME=$(cd `dirname $0`;cd ../; pwd) +boot_file=$(ls ../libs | grep tools-deactiveparti-booter-) +if [ ! -n "$boot_file" ]; then + echo "tools-deactiveparti-booter is null" +else + echo "deactive participant" + java -jar $HOME/libs/$boot_file $* +fi \ No newline at end of file diff --git a/deploy/deploy-peer/src/main/resources/scripts/reg-parti.sh b/deploy/deploy-peer/src/main/resources/scripts/reg-parti.sh new file mode 100644 index 00000000..cd31b360 --- /dev/null +++ b/deploy/deploy-peer/src/main/resources/scripts/reg-parti.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +HOME=$(cd `dirname $0`;cd ../; pwd) + boot_file=$(ls ../libs | grep tools-regparti-booter-) + if [ ! -n "$boot_file" ]; then + echo "tools-regparti-booter is null" + else + echo "register new participant" + java -jar $HOME/libs/$boot_file $* + fi \ No newline at end of file diff --git a/deploy/pom.xml b/deploy/pom.xml index 98b06e0a..20df00f4 100644 --- a/deploy/pom.xml +++ b/deploy/pom.xml @@ -9,11 +9,11 @@ ../project/parent deploy-root - 1.4.0-SNAPSHOT + 1.4.0.RELEASE pom - 1.4.0-SNAPSHOT + 1.4.0.RELEASE diff --git a/explorer b/explorer index f79293ab..3ffc3324 160000 --- a/explorer +++ b/explorer @@ -1 +1 @@ -Subproject commit f79293ab00e5ac74382d442ec5027604ee8260ea +Subproject commit 3ffc3324c9fe20307cc36c07c361daa1f5d3f11e diff --git a/framework b/framework index 4b6516c4..647bcffa 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit 4b6516c469753d124b0d9bde1c1d46e6f661e221 +Subproject commit 647bcffa1a4b0a6cf4df0db8e55247ca84890224 diff --git a/libs/bft-smart b/libs/bft-smart index 8a3c8963..a038dcf6 160000 --- a/libs/bft-smart +++ b/libs/bft-smart @@ -1 +1 @@ -Subproject commit 8a3c8963b270e1126ed1fdc8573fafe92ed1e3f3 +Subproject commit a038dcf677d0fc5ed2f72794606c332538fe85fa diff --git a/test b/test index 334d9f1c..f0bcf9a1 160000 --- a/test +++ b/test @@ -1 +1 @@ -Subproject commit 334d9f1c584a2dd2adb959c3f9bf00d7e5a51202 +Subproject commit f0bcf9a13568af8d1b6c036463246de9719734bd