From 785bfdc4acc742aa1e28bf2080ad3cfeea02e186 Mon Sep 17 00:00:00 2001
From: zhangshuang <zhangshuang3@jd.com>
Date: Sun, 15 Nov 2020 09:14:54 +0800
Subject: [PATCH 1/2] modify version to 1.4.0 release, and add miss code

---
 core                                          |  2 +-
 deploy/deploy-gateway/pom.xml                 |  2 +-
 deploy/deploy-peer/pom.xml                    | 20 ++++++++++++++++++-
 .../main/resources/scripts/active-parti.sh    | 10 ++++++++++
 .../main/resources/scripts/deactive-parti.sh  | 10 ++++++++++
 .../src/main/resources/scripts/reg-parti.sh   | 10 ++++++++++
 deploy/pom.xml                                |  4 ++--
 explorer                                      |  2 +-
 framework                                     |  2 +-
 libs/bft-smart                                |  2 +-
 test                                          |  2 +-
 11 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
 create mode 100644 deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
 create mode 100644 deploy/deploy-peer/src/main/resources/scripts/reg-parti.sh

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 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-gateway</artifactId>
 
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 @@
 	<parent>
 		<groupId>com.jd.blockchain</groupId>
 		<artifactId>deploy-root</artifactId>
-		<version>1.4.0-SNAPSHOT</version>
+		<version>1.4.0.RELEASE</version>
 	</parent>
 	<artifactId>deploy-peer</artifactId>
 
@@ -58,6 +58,24 @@
 			<version>${core.version}</version>
 		</dependency>
 
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-regparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-activeparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>com.jd.blockchain</groupId>
+			<artifactId>tools-deactiveparti-booter</artifactId>
+			<version>${core.version}</version>
+		</dependency>
+
 	</dependencies>
 
 	<build>
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..df895210
--- /dev/null
+++ b/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+OME=$(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..0dc00080
--- /dev/null
+++ b/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+OME=$(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 @@
 		<relativePath>../project/parent</relativePath>
 	</parent>
 	<artifactId>deploy-root</artifactId>
-	<version>1.4.0-SNAPSHOT</version>
+	<version>1.4.0.RELEASE</version>
 	<packaging>pom</packaging>
 
 	<properties>
-		<core.version>1.4.0-SNAPSHOT</core.version>
+		<core.version>1.4.0.RELEASE</core.version>
 	</properties>
 
 	<modules>
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

From 0adb2b536885aab295d4f3d9602b06458f96372a Mon Sep 17 00:00:00 2001
From: zhangshuang <zhangshuang3@jd.com>
Date: Sun, 15 Nov 2020 10:50:02 +0800
Subject: [PATCH 2/2] fix shell error

---
 deploy/deploy-peer/src/main/resources/scripts/active-parti.sh   | 2 +-
 deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh b/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
index df895210..648f6963 100644
--- a/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
+++ b/deploy/deploy-peer/src/main/resources/scripts/active-parti.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OME=$(cd `dirname $0`;cd ../; pwd)
+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"
diff --git a/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh b/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
index 0dc00080..67ad5314 100644
--- a/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
+++ b/deploy/deploy-peer/src/main/resources/scripts/deactive-parti.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OME=$(cd `dirname $0`;cd ../; pwd)
+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"