diff --git a/.gitmodules b/.gitmodules
index 36679fd36..d1f45a686 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -9,16 +9,20 @@
 [submodule "scripts/txtool/txtool/proto"]
 	path = scripts/txtool/txtool/proto
 	url = https://github.com/cryptape/cita-proto.git
+	branch = master
 [submodule "scripts/contracts/tests/contracts"]
 	path = scripts/contracts/tests/contracts
 	url = https://github.com/cryptape/test-contracts.git
+	branch = master
 [submodule "scripts/contracts/interaction"]
 	path = scripts/contracts/interaction
 	url = https://github.com/cryptape/cita-sys-interaction.git
+	branch = master
 [submodule "scripts/config_tool/genesis"]
 	path = scripts/config_tool/genesis
 	url = https://github.com/cryptape/genesis.git
-	tag = v0.24.0
+	branch = master
 [submodule "tests/jsondata"]
 	path = tests/jsondata
 	url = https://github.com/cryptape/cita-testdata.git
+	branch = master
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4309072ef..f536454fd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@ All notable changes to this project will be documented in this file. And this pr
 
 ## [Unreleased]
 
+## [v0.24.0] - 2019-05-18
+
 ### Framework
 
 - [Optimization] Support new protocol version 2. [@ouwenkg]
@@ -25,6 +27,8 @@ All notable changes to this project will be documented in this file. And this pr
 
 - [Feature] Use new P2P library. [@jerry-yu]
 - [Feature] Let network be configuration. [@jerry-yu]
+- [Fix] Fix bug for saving wrong session id. [@jerry-yu]
+- [Fix] Fix for operating repeated peer key. [@jerry-yu]
 
 ### Chain
 
@@ -36,6 +40,7 @@ All notable changes to this project will be documented in this file. And this pr
 
 - [Fix] Fix Bft panic when new ordinary node syncs the blocks. [@leeyr338]
 - [Fix] Fix the bug that chain can't product block after restart docker. [@leeyr338]
+- [Fix] Fix the bug for jumping round when delayed. [@jerry-yu]
 
 ### Forever
 
@@ -805,12 +810,13 @@ Release the first version of CITA.
 [set quota price]: https://docs.citahub.com/zh-CN/cita/system/price
 [sidechain exit mechanism]: https://docs.nervos.org/cita/#/crosschain/crosschain_contract_example
 
-[Unreleased]: https://github.com/cryptape/cita/compare/v0.23.1...HEAD
-[v0.23.1]: https://github.com/cryptape/cita/compare/v0.23...v0.23.1
-[v0.23.0]: https://github.com/cryptape/cita/compare/v0.22...v0.23.0
+[Unreleased]: https://github.com/cryptape/cita/compare/v0.24.0...HEAD
+[v0.24.0]: https://github.com/cryptape/cita/compare/v0.23.0...v0.24.0
+[v0.23.1]: https://github.com/cryptape/cita/compare/v0.23.0...v0.23.1
+[v0.23.0]: https://github.com/cryptape/cita/compare/v0.22.0...v0.23.0
 [v0.22.0]: https://github.com/cryptape/cita/compare/v0.21...v0.22.0
 [v0.21.1]: https://github.com/cryptape/cita/compare/v0.21...v0.21.1
-[v0.21.0]: https://github.com/cryptape/cita/compare/v0.20...v0.21.0
+[v0.21.0]: https://github.com/cryptape/cita/compare/v0.20...v0.21
 [v0.20.3]: https://github.com/cryptape/cita/compare/v0.20.2...v0.20.3
 [v0.20.2]: https://github.com/cryptape/cita/compare/v0.20.1...v0.20.2
 [v0.20.1]: https://github.com/cryptape/cita/compare/v0.20...v0.20.1
diff --git a/scripts/contracts/tests/contracts b/scripts/contracts/tests/contracts
index a7b95c771..a7a2ff2f9 160000
--- a/scripts/contracts/tests/contracts
+++ b/scripts/contracts/tests/contracts
@@ -1 +1 @@
-Subproject commit a7b95c771722f8bd4f3db5697b388c06434067f2
+Subproject commit a7a2ff2f9d11da4f9f944e268d70c8d274678de6
diff --git a/scripts/txtool/txtool/proto b/scripts/txtool/txtool/proto
index 6c11e06f7..b1409605b 160000
--- a/scripts/txtool/txtool/proto
+++ b/scripts/txtool/txtool/proto
@@ -1 +1 @@
-Subproject commit 6c11e06f7c5aad009f655ee0fdbf7c72c64d215f
+Subproject commit b1409605bd4f7cf9b857d43fcad1b44b435df3a6