diff --git a/.travis.yml b/.travis.yml
index 01fd06f227..8fc7d2e416 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,12 +14,12 @@ env:
 matrix:
   include:
     - os: osx
-      rust: 1.31.0
+      rust: 1.31.1
       install:
         - cargo fmt --version || rustup component add rustfmt
         - cargo clippy --version || rustup component add clippy
       env: SUITE=ci
-    - rust: 1.31.0
+    - rust: 1.31.1
       addons:
         apt:
           packages:
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 977898a966..631539b3b3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,51 @@ All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
 
+# [v0.4.0](https://github.com/nervosnetwork/ckb/compare/v0.3.0...v0.4.0) (2019-01-14)
+
+
+### Bug Fixes
+
+* unnecessary shared data clone ([4bf9555](https://github.com/nervosnetwork/ckb/commit/4bf9555))
+
+### Features
+
+* upgrade to Rust 1.31.1
+* **cell model**: rename CellBase to Cellbase ([71dec8b](https://github.com/nervosnetwork/ckb/commit/71dec8b))
+* **cell model**: rename CellStatus old -> dead, current -> live ([ede5108](https://github.com/nervosnetwork/ckb/commit/ede5108))
+* **cell model**: rename OutofBound -> OutOfBound ([f348821](https://github.com/nervosnetwork/ckb/commit/f348821))
+* **cell model**: rename `CellOutput#contract` to `CellOutput#_type` ([6e128c1](https://github.com/nervosnetwork/ckb/commit/6e128c1))
+* **consensus**: add block level script cycle limit ([22adb37](https://github.com/nervosnetwork/ckb/commit/22adb37))
+* **consensus**: past blocks median time based header timestamp verification ([c63d64b](https://github.com/nervosnetwork/ckb/commit/c63d64b))
+* **infrastructure**: new merkle tree implementation ([#143](https://github.com/nervosnetwork/ckb/issues/143)) ([bb83898](https://github.com/nervosnetwork/ckb/commit/bb83898))
+* **infrastructure**: upgrade `config-rs` and use enum in config parsing ([#156](https://github.com/nervosnetwork/ckb/issues/156)) ([aebeb7f](https://github.com/nervosnetwork/ckb/commit/aebeb7f))
+* **p2p framework**: remove broken kad discovery protocol ([f2d86ba](https://github.com/nervosnetwork/ckb/commit/f2d86ba))
+* **p2p framework**: use SQLite implement PeerStore to replace current MemoryPeerStore ([#127](https://github.com/nervosnetwork/ckb/pull/127))
+* **p2p protocol**: add transaction filter ([6717b1f](https://github.com/nervosnetwork/ckb/commit/6717b1f))
+* **p2p protocol**: unify h256 and ProposalShortId serialization (#125) ([62f57c0](https://github.com/nervosnetwork/ckb/commit/62f57c0)), closes [#125](https://github.com/nervosnetwork/ckb/issues/125)
+* **peripheral**: add RPC `max_request_body_size` config ([4ecf813](https://github.com/nervosnetwork/ckb/commit/4ecf813))
+* **peripheral**: add cycle costs to CKB syscalls ([6e10311](https://github.com/nervosnetwork/ckb/commit/6e10311))
+* **peripheral**: jsonrpc types wrappers: use hex in JSON for binary fields ([dd1ed0b](https://github.com/nervosnetwork/ckb/commit/dd1ed0b))
+* **scripting**: remove obsolete secp256k1 script in CKB ([abf6b5b](https://github.com/nervosnetwork/ckb/commit/abf6b5b))
+* refactor: rename ambiguous tx error ([58cb857](https://github.com/nervosnetwork/ckb/commit/58cb857))
+
+
+### BREAKING CHANGES
+
+* JSONRPC changes, see the diff of [rpc/doc.md](https://github.com/nervosnetwork/ckb/pull/167/files#diff-4f42fac509e2d1b81953e419e628555c)
+    * Binary fields encoded as integer array are now all in 0x-prefix hex string.
+    * Rename transaction output `contract` to `type`
+    * Rename CellStatus old -> dead, current -> live
+* P2P message schema changes, see the diff of
+  [protocol/src/protocol.fbs](https://github.com/nervosnetwork/ckb/pull/167/files#diff-bc09df1e2436ea8b2e4fa1e9b2086977)
+    * Add struct `H256` for all H256 fields.
+    * Add struct `ProposalShortId`
+* Config changes, see the diff of
+  [nodes\_template/default.json](https://github.com/nervosnetwork/ckb/pull/167/files#diff-315cb39dece2d25661200bb13db8458c)
+    * Add a new option `max_request_body_size` in section `rpc`.
+    * Changed the default miner `type_hash`
+
+
 # [v0.3.0](https://github.com/nervosnetwork/ckb/compare/v0.2.0...v0.3.0) (2019-01-02)
 
 
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 1d3cf0a951..ffcbeb0a10 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -1,7 +1,12 @@
 # Contributing
 
 When contributing to this repository, please first discuss the change you wish to make via issue,
-email, or any other method with the community before making a change.
+email, or any other method with the community before making a change. The developer mailing list
+([English] | [Chinese]) should be used to discuss complicated or controversial changes before working
+on a patch set.
+
+[english]: https://groups.google.com/a/nervos.org/d/forum/ckb-dev
+[chinese]: https://groups.google.com/a/nervos.org/d/forum/ckb-dev-zh
 
 Please note we have a code of conduct, please follow it in all your interactions with the project.
 
diff --git a/Cargo.lock b/Cargo.lock
index 2dc5640a0d..5a82d681c6 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -27,6 +27,11 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "antidote"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "arrayref"
 version = "0.3.5"
@@ -73,15 +78,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "avl-merkle"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "hash 0.3.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "hash 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -148,7 +153,7 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -217,6 +222,14 @@ dependencies = [
  "byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "bloom-filters"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "bs58"
 version = "0.2.2"
@@ -224,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "build-info"
-version = "0.3.0"
+version = "0.4.0"
 
 [[package]]
 name = "byte-tools"
@@ -297,108 +310,107 @@ dependencies = [
 
 [[package]]
 name = "ckb"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "build-info 0.3.0",
- "ckb-chain 0.3.0",
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-instrument 0.3.0",
- "ckb-miner 0.3.0",
- "ckb-network 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-pool 0.3.0",
- "ckb-pow 0.3.0",
- "ckb-rpc 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-sync 0.3.0",
- "ckb-util 0.3.0",
+ "build-info 0.4.0",
+ "ckb-chain 0.4.0",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-instrument 0.4.0",
+ "ckb-miner 0.4.0",
+ "ckb-network 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-pool 0.4.0",
+ "ckb-pow 0.4.0",
+ "ckb-rpc 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-sync 0.4.0",
+ "ckb-util 0.4.0",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "config 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "crypto 0.3.0",
+ "config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crypto 0.4.0",
  "ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "dir 0.3.0",
- "faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
+ "dir 0.4.0",
+ "hash 0.4.0",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "logger 0.3.0",
+ "logger 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-benches"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-pow 0.3.0",
+ "ckb-pow 0.4.0",
  "criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-chain"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-verification 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-verification 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-chain-spec"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-core 0.3.0",
- "ckb-pow 0.3.0",
- "ckb-protocol 0.3.0",
+ "ckb-core 0.4.0",
+ "ckb-pow 0.4.0",
+ "ckb-protocol 0.4.0",
  "flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-core"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bit-vec 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-util 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "crypto 0.3.0",
+ "ckb-util 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crypto 0.4.0",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
- "merkle-root 0.3.0",
+ "hash 0.4.0",
+ "merkle-root 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-db"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-util 0.3.0",
+ "ckb-util 0.4.0",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "rocksdb 0.10.0 (git+https://github.com/nervosnetwork/rust-rocksdb)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -406,135 +418,145 @@ dependencies = [
 
 [[package]]
 name = "ckb-instrument"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-chain 0.3.0",
- "ckb-core 0.3.0",
- "ckb-shared 0.3.0",
+ "ckb-chain 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-shared 0.4.0",
  "indicatif 0.10.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-miner"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-core 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-pool 0.3.0",
- "ckb-pow 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-util 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-core 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-pool 0.4.0",
+ "ckb-pow 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-util 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc 0.10.2 (git+https://github.com/quake/rust-jsonrpc)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-network"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-util 0.3.0",
+ "ckb-util 0.4.0",
+ "criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libp2p 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multihash 0.8.1-pre (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "r2d2 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "r2d2_sqlite 0.7.0 (git+https://github.com/jjyr/r2d2-sqlite?rev=8ade92077977c4860562b1337b95ec8ed2000711)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "snap 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)",
  "unsigned-varint 0.2.1 (git+https://github.com/paritytech/unsigned-varint)",
 ]
 
 [[package]]
 name = "ckb-notify"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-core 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-core 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-pool"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-chain 0.3.0",
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-verification 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-chain 0.4.0",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-verification 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
+ "hash 0.4.0",
  "linked-hash-map 0.5.1 (git+https://github.com/nervosnetwork/linked-hash-map?rev=df27f21)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.0 (git+https://github.com/nervosnetwork/lru-cache)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-pow"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-core 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
+ "ckb-core 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "hash 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-protocol"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-core 0.3.0",
- "ckb-util 0.3.0",
+ "ckb-core 0.4.0",
+ "ckb-util 0.4.0",
  "flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
+ "hash 0.4.0",
+ "merkle-root 0.4.0",
+ "merkle-tree 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "siphasher 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-rpc"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-chain 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-miner 0.3.0",
- "ckb-network 0.3.0",
- "ckb-pool 0.3.0",
- "ckb-pow 0.3.0",
- "ckb-protocol 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-sync 0.3.0",
- "ckb-verification 0.3.0",
+ "ckb-chain 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-miner 0.4.0",
+ "ckb-network 0.4.0",
+ "ckb-pool 0.4.0",
+ "ckb-pow 0.4.0",
+ "ckb-protocol 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-sync 0.4.0",
+ "ckb-verification 0.4.0",
+ "faster-hex 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-core 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-http-server 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -543,24 +565,26 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-script"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-core 0.3.0",
- "ckb-protocol 0.3.0",
- "ckb-vm 0.1.0 (git+https://github.com/nervosnetwork/ckb-vm?rev=1622ba0)",
- "crypto 0.3.0",
- "faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-core 0.4.0",
+ "ckb-protocol 0.4.0",
+ "ckb-vm 0.1.0 (git+https://github.com/nervosnetwork/ckb-vm?rev=dd90ed1)",
+ "crypto 0.4.0",
+ "faster-hex 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
+ "hash 0.4.0",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -568,42 +592,44 @@ dependencies = [
 
 [[package]]
 name = "ckb-shared"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "avl-merkle 0.3.0",
+ "avl-merkle 0.4.0",
  "bincode 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-util 0.3.0",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-util 0.4.0",
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "lru-cache 0.1.0 (git+https://github.com/nervosnetwork/lru-cache)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-sync"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
- "ckb-chain 0.3.0",
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-network 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-pool 0.3.0",
- "ckb-protocol 0.3.0",
- "ckb-shared 0.3.0",
- "ckb-util 0.3.0",
- "ckb-verification 0.3.0",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "bloom-filters 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ckb-chain 0.4.0",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-network 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-pool 0.4.0",
+ "ckb-protocol 0.4.0",
+ "ckb-shared 0.4.0",
+ "ckb-util 0.4.0",
+ "ckb-verification 0.4.0",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -611,33 +637,33 @@ dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-util"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "ckb-verification"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "ckb-chain 0.3.0",
- "ckb-chain-spec 0.3.0",
- "ckb-core 0.3.0",
- "ckb-db 0.3.0",
- "ckb-notify 0.3.0",
- "ckb-pow 0.3.0",
- "ckb-script 0.3.0",
- "ckb-shared 0.3.0",
+ "ckb-chain 0.4.0",
+ "ckb-chain-spec 0.4.0",
+ "ckb-core 0.4.0",
+ "ckb-db 0.4.0",
+ "ckb-notify 0.4.0",
+ "ckb-pow 0.4.0",
+ "ckb-script 0.4.0",
+ "ckb-shared 0.4.0",
  "faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "hash 0.3.0",
- "merkle-root 0.3.0",
+ "hash 0.4.0",
+ "merkle-root 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -646,11 +672,11 @@ dependencies = [
 [[package]]
 name = "ckb-vm"
 version = "0.1.0"
-source = "git+https://github.com/nervosnetwork/ckb-vm?rev=1622ba0#1622ba042e573b21868f44b4909ae34632a7674d"
+source = "git+https://github.com/nervosnetwork/ckb-vm?rev=dd90ed1#dd90ed1ea23dfc72e25031314ce56a19dbe4ac47"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)",
+ "goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -698,15 +724,15 @@ dependencies = [
 
 [[package]]
 name = "config"
-version = "0.9.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "nom 4.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "rust-ini 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
  "serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "toml 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "yaml-rust 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -720,7 +746,7 @@ dependencies = [
  "clicolors-control 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "termios 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -756,29 +782,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "atty 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "criterion-plot 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "criterion-plot 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "criterion-stats 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools-num 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "simplelog 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "walkdir 2.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "criterion-plot"
-version = "0.2.5"
+version = "0.2.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "cast 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "itertools 0.7.11 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -796,13 +824,12 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.3.4"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "crossbeam-epoch 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "crossbeam-utils 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -879,14 +906,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "crypto"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "crunchy 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
+ "faster-hex 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "secp256k1 0.9.1 (git+https://github.com/nervosnetwork/rust-secp256k1)",
 ]
 
@@ -896,7 +923,7 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -919,13 +946,13 @@ dependencies = [
 [[package]]
 name = "datastore"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "base64 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chashmap 2.2.1 (git+https://github.com/redox-os/tfs)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
  "tempfile 3.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -939,7 +966,7 @@ dependencies = [
 
 [[package]]
 name = "dir"
-version = "0.3.0"
+version = "0.4.0"
 
 [[package]]
 name = "either"
@@ -985,16 +1012,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "failure"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "backtrace 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)",
- "failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "failure_derive"
-version = "0.1.3"
+version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1021,6 +1048,11 @@ name = "faster-hex"
 version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
+[[package]]
+name = "faster-hex"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "flatbuffers"
 version = "0.5.0"
@@ -1107,7 +1139,7 @@ dependencies = [
 
 [[package]]
 name = "goblin"
-version = "0.0.17"
+version = "0.0.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1143,13 +1175,13 @@ dependencies = [
  "pest_derive 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "hash"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
  "tiny-keccak 1.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1253,7 +1285,7 @@ dependencies = [
  "console 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "number_prefix 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -1298,9 +1330,9 @@ version = "0.10.2"
 source = "git+https://github.com/quake/rust-jsonrpc#2ada29a270a2242df01c1bece375989311e33fe0"
 dependencies = [
  "hyper 0.10.15 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1310,9 +1342,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1335,7 +1367,7 @@ source = "git+https://github.com/nervosnetwork/jsonrpc.git?branch=2018-edition#e
 dependencies = [
  "jsonrpc-core 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "jsonrpc-pubsub 9.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1411,27 +1443,27 @@ dependencies = [
 [[package]]
 name = "libp2p"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-dns 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-floodsub 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-identify 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-kad 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-mplex 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-peerstore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-ping 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-ratelimit 0.1.1 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-relay 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-secio 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-tcp-transport 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-transport-timeout 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-uds 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-websocket 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-yamux 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-dns 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-floodsub 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-identify 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-kad 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-mplex 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-peerstore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-ping 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-ratelimit 0.1.1 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-relay 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-secio 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-tcp-transport 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-transport-timeout 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-uds 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-websocket 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-yamux 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-current-thread 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1441,20 +1473,20 @@ dependencies = [
 [[package]]
 name = "libp2p-core"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "multihash 0.8.1-pre (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "multistream-select 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "multihash 0.8.1-pre (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "multistream-select 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "rw-stream-sink 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "smallvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1462,12 +1494,12 @@ dependencies = [
 [[package]]
 name = "libp2p-dns"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "tokio-dns-unofficial 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1475,16 +1507,16 @@ dependencies = [
 [[package]]
 name = "libp2p-floodsub"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 1.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1496,15 +1528,15 @@ dependencies = [
 [[package]]
 name = "libp2p-identify"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-peerstore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-peerstore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1515,20 +1547,20 @@ dependencies = [
 [[package]]
 name = "libp2p-kad"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "arrayvec 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)",
  "bigint 4.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "datastore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "datastore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-identify 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-ping 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-identify 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-ping 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1542,12 +1574,12 @@ dependencies = [
 [[package]]
 name = "libp2p-mplex"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1558,29 +1590,29 @@ dependencies = [
 [[package]]
 name = "libp2p-peerstore"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "datastore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "datastore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "owning_ref 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-ping"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "multistream-select 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "multistream-select 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1590,11 +1622,11 @@ dependencies = [
 [[package]]
 name = "libp2p-ratelimit"
 version = "0.1.1"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "aio-limited 0.1.0 (git+https://github.com/paritytech/aio-limited.git)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1603,14 +1635,14 @@ dependencies = [
 [[package]]
 name = "libp2p-relay"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "libp2p-peerstore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "libp2p-peerstore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1621,32 +1653,32 @@ dependencies = [
 [[package]]
 name = "libp2p-secio"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "asn1_der 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "protobuf 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)",
- "ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)",
- "rw-stream-sink 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "rw-stream-sink 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-tcp-transport"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "tk-listen 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-tcp 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1655,10 +1687,10 @@ dependencies = [
 [[package]]
 name = "libp2p-transport-timeout"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-timer 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
@@ -1666,25 +1698,25 @@ dependencies = [
 [[package]]
 name = "libp2p-uds"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "tokio-uds 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "libp2p-websocket"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "rw-stream-sink 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "rw-stream-sink 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
  "websocket 0.20.3 (git+https://github.com/tomaka/rust-websocket?branch=send)",
@@ -1693,11 +1725,11 @@ dependencies = [
 [[package]]
 name = "libp2p-yamux"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
- "libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
+ "libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-io 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1715,6 +1747,16 @@ dependencies = [
  "make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "libsqlite3-sys"
+version = "0.11.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "pkg-config 0.3.14 (registry+https://github.com/rust-lang/crates.io-index)",
+ "vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "linked-hash-map"
 version = "0.3.0"
@@ -1724,6 +1766,11 @@ dependencies = [
  "serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "linked-hash-map"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+
 [[package]]
 name = "linked-hash-map"
 version = "0.5.1"
@@ -1761,18 +1808,18 @@ dependencies = [
 
 [[package]]
 name = "logger"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
  "ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
- "parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "regex 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -1784,6 +1831,14 @@ dependencies = [
  "linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "lru-cache"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "make-cmd"
 version = "0.1.0"
@@ -1819,12 +1874,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "merkle-root"
-version = "0.3.0"
+version = "0.4.0"
 dependencies = [
- "hash 0.3.0",
+ "hash 0.4.0",
+ "merkle-tree 0.4.0",
  "numext-fixed-hash 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "merkle-tree"
+version = "0.4.0"
+dependencies = [
+ "proptest 0.8.7 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "mime"
 version = "0.2.6"
@@ -1875,19 +1938,19 @@ dependencies = [
 [[package]]
 name = "multiaddr"
 version = "0.3.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "integer-encoding 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "multihash 0.8.1-pre (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "multihash 0.8.1-pre (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "multihash"
 version = "0.8.1-pre"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "sha1 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "sha2 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1897,7 +1960,7 @@ dependencies = [
 [[package]]
 name = "multistream-select"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2021,13 +2084,13 @@ name = "numext-fixed-hash"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-constructor 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-fixed-uint 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2035,11 +2098,11 @@ name = "numext-fixed-uint"
 version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
  "heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "numext-constructor 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2110,7 +2173,7 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2146,7 +2209,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "smallvec 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2260,6 +2323,25 @@ dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "r2d2"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+ "scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
+[[package]]
+name = "r2d2_sqlite"
+version = "0.7.0"
+source = "git+https://github.com/jjyr/r2d2-sqlite?rev=8ade92077977c4860562b1337b95ec8ed2000711#8ade92077977c4860562b1337b95ec8ed2000711"
+dependencies = [
+ "r2d2 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rand"
 version = "0.3.22"
@@ -2294,19 +2376,18 @@ dependencies = [
 
 [[package]]
 name = "rand"
-version = "0.6.1"
+version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "autocfg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_os 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2315,7 +2396,7 @@ name = "rand_chacha"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
  "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -2337,7 +2418,7 @@ name = "rand_hc"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2349,28 +2430,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_pcg"
-version = "0.1.1"
+name = "rand_os"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
+ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+ "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rand_xorshift"
-version = "0.1.0"
+name = "rand_pcg"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
-name = "rayon"
-version = "0.8.2"
+name = "rand_xorshift"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2457,14 +2542,13 @@ dependencies = [
 
 [[package]]
 name = "ring"
-version = "0.12.1"
+version = "0.13.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)",
- "lazy_static 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
+ "cc 1.0.27 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lazy_static 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2476,6 +2560,17 @@ dependencies = [
  "librocksdb-sys 5.11.3 (git+https://github.com/nervosnetwork/rust-rocksdb)",
 ]
 
+[[package]]
+name = "rusqlite"
+version = "0.16.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+ "libsqlite3-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "time 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "rust-crypto"
 version = "0.2.36"
@@ -2490,7 +2585,7 @@ dependencies = [
 
 [[package]]
 name = "rust-ini"
-version = "0.12.2"
+version = "0.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2525,7 +2620,7 @@ dependencies = [
 [[package]]
 name = "rw-stream-sink"
 version = "0.1.0"
-source = "git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0#cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0"
+source = "git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch#6a61b9705cc8340fb9a40ff0df41f03042c80a5a"
 dependencies = [
  "bytes 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2564,6 +2659,14 @@ dependencies = [
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
+[[package]]
+name = "scheduled-thread-pool"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+dependencies = [
+ "antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "scoped-tls"
 version = "0.1.2"
@@ -2643,7 +2746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
 name = "serde"
-version = "1.0.82"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -2660,7 +2763,7 @@ dependencies = [
 
 [[package]]
 name = "serde_derive"
-version = "1.0.82"
+version = "1.0.84"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "proc-macro2 0.4.24 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -2670,12 +2773,12 @@ dependencies = [
 
 [[package]]
 name = "serde_json"
-version = "1.0.33"
+version = "1.0.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "itoa 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -2866,7 +2969,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
  "cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)",
  "remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "winapi 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -3104,7 +3207,7 @@ dependencies = [
  "futures 0.1.25 (registry+https://github.com/rust-lang/crates.io-index)",
  "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "num_cpus 1.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
- "rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)",
+ "rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)",
  "tokio-executor 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
@@ -3166,7 +3269,7 @@ name = "toml"
 version = "0.4.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 dependencies = [
- "serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)",
+ "serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
@@ -3266,7 +3369,7 @@ dependencies = [
 
 [[package]]
 name = "untrusted"
-version = "0.5.1"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 
 [[package]]
@@ -3435,6 +3538,7 @@ dependencies = [
 "checksum aho-corasick 0.6.9 (registry+https://github.com/rust-lang/crates.io-index)" = "1e9a933f4e58658d7b12defcf96dc5c720f20832deebe3e0a19efd3b6aaeeb9e"
 "checksum aio-limited 0.1.0 (git+https://github.com/paritytech/aio-limited.git)" = "<none>"
 "checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
+"checksum antidote 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5"
 "checksum arrayref 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "0d382e583f07208808f6b1249e60848879ba3543f57c32277bf52d69c2f0f0ee"
 "checksum arrayvec 0.4.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d18513977c2d8261c448511c5c53dc66b26dfccbc3d4446672dea1e71a7d8a26"
 "checksum asn1_der 0.5.10 (registry+https://github.com/rust-lang/crates.io-index)" = "766afdc5c6d7c15de1abe4c9c15e360be3aa972c363ba5b606be3c4271235886"
@@ -3456,6 +3560,7 @@ dependencies = [
 "checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
 "checksum blake2-rfc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "5d6d530bdd2d52966a6d03b7a964add7ae1a288d25214066fd4b600f0f796400"
 "checksum block-buffer 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a076c298b9ecdb530ed9d967e74a6027d6a7478924520acddcddc24c1c8ab3ab"
+"checksum bloom-filters 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b233192e97c6e528c071bd83180c5d4f35846b9aff4670ea8e05e3ba0daa5e30"
 "checksum bs58 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0de79cfb98e7aa9988188784d8664b4b5dad6eaaa0863b91d9a4ed871d4f7a42"
 "checksum byte-tools 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "560c32574a12a89ecd91f5e742165893f86e3ab98d21f8ea548658eb9eef5f40"
 "checksum byteorder 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "96c8b41881888cc08af32d47ac4edd52bc7fa27fef774be47a92443756451304"
@@ -3467,20 +3572,20 @@ dependencies = [
 "checksum cfg-if 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "082bb9b28e00d3c9d39cc03e64ce4cea0f1bb9b3fde493f0cbc008472d22bdf4"
 "checksum chashmap 2.2.1 (git+https://github.com/redox-os/tfs)" = "<none>"
 "checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
-"checksum ckb-vm 0.1.0 (git+https://github.com/nervosnetwork/ckb-vm?rev=1622ba0)" = "<none>"
+"checksum ckb-vm 0.1.0 (git+https://github.com/nervosnetwork/ckb-vm?rev=dd90ed1)" = "<none>"
 "checksum clang-sys 0.21.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e414af9726e1d11660801e73ccc7fb81803fb5f49e5903a25b348b2b3b480d2e"
 "checksum clap 2.32.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b957d88f4b6a63b9d70d5f454ac8011819c6efa7727858f458ab71c756ce2d3e"
 "checksum clicolors-control 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "51872be694bb3bcbd1ea95c6dd467c2c46c6c64d287e1c9084ace7c3116ae9c0"
 "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
-"checksum config 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "13490293b8a84cc82cd531da41adeae82cd9eaa40e926ac18865aa361f9c9f60"
+"checksum config 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "3e82d07fac0a5eeaa9d959b5194d01bb66e414665f547416958d2b430f8f4852"
 "checksum console 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ba5561f4d4d89e0f246d4dd83846d96f617e886b96c7aee36e68791c98f89ce"
 "checksum constant_time_eq 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8ff012e225ce166d4422e0e78419d901719760f62ae2b7969ca6b564d1b54a9e"
 "checksum core-foundation 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "25bfd746d203017f7d5cbd31ee5d8e17f94b6521c7af77ece6c9e4b2d4b16c67"
 "checksum core-foundation-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "065a5d7ffdcbc8fa145d6f0746f3555025b9097a9e9cda59f7467abae670c78d"
 "checksum criterion 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c47d2b548c5647e1a436dc0cb78d4ebf51b6bf7ab101ed76662828bdd4d3a24a"
-"checksum criterion-plot 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6e649d6aacdbbdb94ec659561a309a71336fc5655ed408f3afd28df2fc0c4f4f"
+"checksum criterion-plot 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd5f81689739e463ece7a6b62c6ec63bdab5c4e28fe05ff451769e87d1511411"
 "checksum criterion-stats 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ff43cac80562f91ead0b617c1be74edf350adfaa195809d355de98dfc8f9237d"
-"checksum crossbeam-channel 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5b2a9ea8f77c7f9efd317a8a5645f515d903a2d86ee14d2337a5facd1bd52c12"
+"checksum crossbeam-channel 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "137bc235f622ffaa0428e3854e24acb53291fc0b3ff6fb2cb75a8be6fb02f06b"
 "checksum crossbeam-deque 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f739f8c5363aca78cfb059edf753d8f0d36908c348f3d8d1503f03d8b75d9cf3"
 "checksum crossbeam-deque 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "05e44b8cf3e1a625844d1750e1f7820da46044ff6d28f4d43e455ba3e5bb2c13"
 "checksum crossbeam-epoch 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "927121f5407de9956180ff5e936fe3cf4324279280001cd56b669d28ee7e9150"
@@ -3492,18 +3597,19 @@ dependencies = [
 "checksum csv 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "9fd1c44c58078cfbeaf11fbb3eac9ae5534c23004ed770cc4bfb48e658ae4f04"
 "checksum csv-core 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa5cdef62f37e6ffe7d1f07a381bc0db32b7a3ff1cac0de56cb0d81e71f53d65"
 "checksum ctrlc 3.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "630391922b1b893692c6334369ff528dcc3a9d8061ccf4c803aa8f83cb13db5e"
-"checksum datastore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
+"checksum datastore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
 "checksum digest 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "03b072242a8cbaf9c145665af9d250c59af3b958f83ed6824e13533cf76d5b90"
 "checksum either 1.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3be565ca5c557d7f59e7cfcf1844f9e3033650c929c6566f511e8005f205c1d0"
 "checksum env_logger 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3ddf21e73e016298f5cb37d6ef8e8da8e39f91f9ec8b0df44b7deb16a9f8cd5b"
 "checksum env_logger 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "afb070faf94c85d17d50ca44f6ad076bce18ae92f0037d350947240a36e9d42e"
 "checksum eth-secp256k1 0.5.7 (git+https://github.com/paritytech/rust-secp256k1)" = "<none>"
 "checksum etrace 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f17311e68ea07046ee809b8513f6c259518bc10173681d98c21f8c3926f56f40"
-"checksum failure 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6dd377bcc1b1b7ce911967e3ec24fa19c3224394ec05b54aa7b083d498341ac7"
-"checksum failure_derive 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "64c2d913fe8ed3b6c6518eedf4538255b989945c14c2a7d5cbff62a5e2120596"
+"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2"
+"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1"
 "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
 "checksum faketime 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17087bd8c5a4a3e8bd40ecd9d3bda587459abcf67ca94211df09ec8451404cf8"
 "checksum faster-hex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2ea2e4ecc921ec2cbb8b10f0d400fe448554779d2ac5e0bfbb065836d9d8483a"
+"checksum faster-hex 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "47f8b8e3249896f1acb065d02f2c94ca2e9a697a2f28131f1e88377eb2aeb2f0"
 "checksum flatbuffers 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea0c34f669be9911826facafe996adfda978aeee67285a13556869e2d8b8331f"
 "checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3"
 "checksum foreign-types 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
@@ -3516,7 +3622,7 @@ dependencies = [
 "checksum generic-array 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ef25c5683767570c2bbd7deba372926a55eaae9982d7726ee2a1050239d45b9d"
 "checksum glob 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "8be18de09a56b60ed0edf84bc9df007e30040691af7acd1c41874faac5895bfb"
 "checksum globset 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4743617a7464bbda3c8aec8558ff2f9429047e025771037df561d383337ff865"
-"checksum goblin 0.0.17 (registry+https://github.com/rust-lang/crates.io-index)" = "5911d7df7b8f65ab676c5327b50acea29d3c6a1a4ad05e444cf5dce321b26db2"
+"checksum goblin 0.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "c65cd533b33e3d04c6e393225fa8919ddfcf5862ca8919c7f9a167c312ef41c2"
 "checksum h2 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "1ac030ae20dee464c5d0f36544d8b914a6bc606da44a57e052d2b0f5dae129e0"
 "checksum handlebars 0.32.4 (registry+https://github.com/rust-lang/crates.io-index)" = "d89ec99d1594f285d4590fc32bac5f75cdab383f1123d504d27862c644a807dd"
 "checksum heapsize 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1679e6ea370dee694f91f1dc469bf94cf8f52051d147aec3e1f9497c6fc22461"
@@ -3546,31 +3652,34 @@ dependencies = [
 "checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
 "checksum libc 0.2.45 (registry+https://github.com/rust-lang/crates.io-index)" = "2d2857ec59fadc0773853c664d2d18e7198e83883e7060b63c924cb077bd5c74"
 "checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9"
-"checksum libp2p 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-core 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-dns 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-floodsub 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-identify 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-kad 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-mplex 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-peerstore 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-ping 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-ratelimit 0.1.1 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-relay 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-secio 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-tcp-transport 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-transport-timeout 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-uds 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-websocket 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum libp2p-yamux 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
+"checksum libp2p 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-core 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-dns 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-floodsub 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-identify 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-kad 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-mplex 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-peerstore 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-ping 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-ratelimit 0.1.1 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-relay 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-secio 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-tcp-transport 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-transport-timeout 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-uds 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-websocket 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum libp2p-yamux 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
 "checksum librocksdb-sys 5.11.3 (git+https://github.com/nervosnetwork/rust-rocksdb)" = "<none>"
+"checksum libsqlite3-sys 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6864266fa0d613f5382997f6152280edeccfd46173285459b627d6319526f5c9"
 "checksum linked-hash-map 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6d262045c5b87c0861b3f004610afd0e2c851e2908d08b6c870cbb9d5f494ecd"
+"checksum linked-hash-map 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7860ec297f7008ff7a1e3382d7f7e1dcd69efc94751a2284bafc3d013c2aa939"
 "checksum linked-hash-map 0.5.1 (git+https://github.com/nervosnetwork/linked-hash-map?rev=df27f21)" = "<none>"
 "checksum linked-hash-map 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "70fb39025bc7cdd76305867c4eccf2f2dcf6e9a57f5b21a93e1c2d86cd03ec9e"
 "checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c"
 "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b"
 "checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
 "checksum lru-cache 0.1.0 (git+https://github.com/nervosnetwork/lru-cache)" = "<none>"
+"checksum lru-cache 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4d06ff7ff06f729ce5f4e227876cb88d10bc59cd4ae1e09fbb2bde15c850dc21"
 "checksum make-cmd 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a8ca8afbe8af1785e09636acb5a41e08a765f5f0340568716c18a8700ba3c0d3"
 "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08"
 "checksum memchr 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "148fab2e51b4f1cfc66da2a7c32981d1d3c083a803978268bb11fe4b86925e7a"
@@ -3580,9 +3689,9 @@ dependencies = [
 "checksum mio 0.6.16 (registry+https://github.com/rust-lang/crates.io-index)" = "71646331f2619b1026cc302f87a2b8b648d5c6dd6937846a16cc8ce0f347f432"
 "checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125"
 "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919"
-"checksum multiaddr 0.3.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum multihash 0.8.1-pre (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
-"checksum multistream-select 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
+"checksum multiaddr 0.3.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum multihash 0.8.1-pre (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
+"checksum multistream-select 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
 "checksum native-tls 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "f74dbadc8b43df7864539cedb7bc91345e532fdd913cfdc23ad94f4d2d40fbc0"
 "checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88"
 "checksum nix 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d37e713a259ff641624b6cb20e3b12b2952313ba36b6823c0f16e6cfd9e5de17"
@@ -3605,7 +3714,7 @@ dependencies = [
 "checksum parking_lot 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "149d8f5b97f3c1133e3cfcd8886449959e856b557ff281e292b733d7c69e005e"
 "checksum parking_lot 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d4d05f1349491390b1730afba60bb20d55761bef489a954546b58b4b34e1e2ac"
 "checksum parking_lot 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "f0802bff09003b291ba756dc7e79313e51cc31667e94afbe847def490424cde5"
-"checksum parking_lot 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9723236a9525c757d9725b993511e3fc941e33f27751942232f0058298297edf"
+"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337"
 "checksum parking_lot_core 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "4db1a8ccf734a7bce794cc19b3df06ed87ab2f3907036b693c68f56b4d4537fa"
 "checksum parking_lot_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ad7f7e6ebdc79edff6fdcb87a55b620174f7a989e3eb31b65231f4af57f00b8c"
 "checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9"
@@ -3624,18 +3733,20 @@ dependencies = [
 "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
 "checksum quote 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e920b65c65f10b2ae65c831a81a073a89edd28c7cce89475bff467ab4167a"
 "checksum quote 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "53fa22a1994bd0f9372d7a816207d8a2677ad0325b073f5c5332760f0fb62b5c"
+"checksum r2d2 0.8.3 (registry+https://github.com/rust-lang/crates.io-index)" = "5d746fc8a0dab19ccea7ff73ad535854e90ddb3b4b8cdce953dd5cd0b2e7bd22"
+"checksum r2d2_sqlite 0.7.0 (git+https://github.com/jjyr/r2d2-sqlite?rev=8ade92077977c4860562b1337b95ec8ed2000711)" = "<none>"
 "checksum rand 0.3.22 (registry+https://github.com/rust-lang/crates.io-index)" = "15a732abf9d20f0ad8eeb6f909bf6868722d9a06e1e50802b6a70351f40b4eb1"
 "checksum rand 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "8356f47b32624fef5b3301c1be97e5944ecdd595409cc5da11d05f211db6cfbd"
 "checksum rand 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e464cd887e869cddcae8792a4ee31d23c7edd516700695608f5b98c67ee0131c"
-"checksum rand 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ae9d223d52ae411a33cf7e54ec6034ec165df296ccd23533d671a28252b6f66a"
+"checksum rand 0.6.3 (registry+https://github.com/rust-lang/crates.io-index)" = "b65e163105a6284f841bd23100a015895f54340e88a5ffc9ca7b8b33827cfce0"
 "checksum rand_chacha 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "771b009e3a508cb67e8823dda454aaa5368c7bc1c16829fb77d3e980440dd34a"
 "checksum rand_core 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1961a422c4d189dfb50ffa9320bf1f2a9bd54ecb92792fb9477f99a1045f3372"
 "checksum rand_core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0905b6b7079ec73b314d4c748701f6931eb79fd97c668caa3f1899b22b32c6db"
 "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4"
 "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08"
+"checksum rand_os 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de5ac4de1c2973e1391dc305cb0fbf8788cb58068e98255439b7485a77022273"
 "checksum rand_pcg 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "086bd09a33c7044e56bb44d5bdde5a60e7f119a9e95b0775f545de759a32fe05"
 "checksum rand_xorshift 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "effa3fcaa47e18db002bdde6060944b6d2f9cfd8db471c30e873448ad9187be3"
-"checksum rayon 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b614fe08b6665cb9a231d07ac1364b0ef3cb3698f1239ee0c4c3a88a524f54c8"
 "checksum rayon 1.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "373814f27745b2686b350dd261bfd24576a6fb0e2c5919b3a2b6005f820b0473"
 "checksum rayon-core 1.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b055d1e92aba6877574d8fe604a63c8b5df60f60e5982bf7ccbb1338ea527356"
 "checksum redox_syscall 0.1.44 (registry+https://github.com/rust-lang/crates.io-index)" = "a84bcd297b87a545980a2d25a0beb72a1f490c31f0a9fde52fca35bfbb1ceb70"
@@ -3645,20 +3756,22 @@ dependencies = [
 "checksum regex-syntax 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "7d707a4fa2637f2dca2ef9fd02225ec7661fe01a53623c1e6515b6916511f7a7"
 "checksum regex-syntax 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "4e47a2ed29da7a9e1960e1639e7a982e6edc6d49be308a3b02daf511504a16d1"
 "checksum remove_dir_all 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3488ba1b9a2084d38645c4c08276a1752dcbf2c7130d74f1569681ad5d2799c5"
-"checksum ring 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "6f7d28b30a72c01b458428e0ae988d4149c20d902346902be881e3edc4bb325c"
+"checksum ring 0.13.5 (registry+https://github.com/rust-lang/crates.io-index)" = "2c4db68a2e35f3497146b7e4563df7d4773a2433230c5e4b448328e31740458a"
 "checksum rocksdb 0.10.0 (git+https://github.com/nervosnetwork/rust-rocksdb)" = "<none>"
+"checksum rusqlite 0.16.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6381ddfe91dbb659b4b132168da15985bc84162378cf4fcdc4eb99c857d063e2"
 "checksum rust-crypto 0.2.36 (registry+https://github.com/rust-lang/crates.io-index)" = "f76d05d3993fd5f4af9434e8e436db163a12a9d40e1a58a726f27a01dfd12a2a"
-"checksum rust-ini 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ac66e816614e124a692b6ac1b8437237a518c9155a3aacab83a373982630c715"
+"checksum rust-ini 0.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3e52c148ef37f8c375d49d5a73aa70713125b7f19095948a923f80afdeb22ec2"
 "checksum rustc-demangle 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "01b90379b8664dd83460d59bdc5dd1fd3172b8913788db483ed1325171eab2f7"
 "checksum rustc-serialize 0.3.24 (registry+https://github.com/rust-lang/crates.io-index)" = "dcf128d1287d2ea9d80910b5f1120d0b8eede3fbf1abe91c40d39ea7d51e6fda"
 "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
 "checksum rusty-fork 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "9591f190d2852720b679c21f66ad929f9f1d7bb09d1193c26167586029d8489c"
-"checksum rw-stream-sink 0.1.0 (git+https://github.com/libp2p/rust-libp2p?rev=cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0)" = "<none>"
+"checksum rw-stream-sink 0.1.0 (git+https://github.com/nervosnetwork/rust-libp2p?branch=ring_patch)" = "<none>"
 "checksum ryu 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "eb9e9b8cde282a9fe6a42dd4681319bfb63f121b8a8ee9439c6f4107e58a46f7"
 "checksum safemem 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e27a8b19b835f7aea908818e871f5cc3a5a186550c30773be987e155e8163d8f"
 "checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9"
 "checksum same-file 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8f20c4be53a8a1ff4c1f1b2bd14570d2f634628709752f0702ecdd2b3f9a5267"
 "checksum schannel 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "0e1a231dc10abf6749cfa5d7767f25888d484201accbd919b66ab5413c502d56"
+"checksum scheduled-thread-pool 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1a2ff3fc5223829be817806c6441279c676e454cc7da608faf03b0ccc09d3889"
 "checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28"
 "checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27"
 "checksum scroll 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "2f84d114ef17fd144153d608fba7c446b0145d038985e7a8cc5d08bb0ce20383"
@@ -3669,10 +3782,10 @@ dependencies = [
 "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
 "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 "checksum serde 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "9dad3f759919b92c3068c696c15c3d17238234498bbdcc80f2c469606f948ac8"
-"checksum serde 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "6fa52f19aee12441d5ad11c9a00459122bd8f98707cadf9778c540674f1935b6"
+"checksum serde 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "0e732ed5a5592c17d961555e3b552985baf98d50ce418b7b655f31f6ba7eb1b7"
 "checksum serde-hjson 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "0b833c5ad67d52ced5f5938b2980f32a9c1c5ef047f0b4fb3127e7a423c76153"
-"checksum serde_derive 1.0.82 (registry+https://github.com/rust-lang/crates.io-index)" = "96a7f9496ac65a2db5929afa087b54f8fc5008dcfbe48a8874ed20049b0d6154"
-"checksum serde_json 1.0.33 (registry+https://github.com/rust-lang/crates.io-index)" = "c37ccd6be3ed1fdf419ee848f7c758eb31b054d7cd3ae3600e3bae0adf569811"
+"checksum serde_derive 1.0.84 (registry+https://github.com/rust-lang/crates.io-index)" = "b4d6115a3ca25c224e409185325afc16a0d5aaaabc15c42b09587d6f1ba39a5b"
+"checksum serde_json 1.0.34 (registry+https://github.com/rust-lang/crates.io-index)" = "bdf540260cfee6da923831f4776ddc495ada940c30117977c70f1313a6130545"
 "checksum serde_test 0.8.23 (registry+https://github.com/rust-lang/crates.io-index)" = "110b3dbdf8607ec493c22d5d947753282f3bae73c0f56d322af1e8c78e4c23d5"
 "checksum sha1 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cc30b1e1e8c40c121ca33b86c23308a090d19974ef001b4bf6e61fd1a0fb095c"
 "checksum sha1 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "171698ce4ec7cbb93babeb3190021b4d72e96ccb98e33d277ae4ea959d6f2d9e"
@@ -3739,7 +3852,7 @@ dependencies = [
 "checksum unreachable 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "382810877fe448991dfc7f0dd6e3ae5d58088fd0ea5e35189655f84e6814fa56"
 "checksum unsigned-varint 0.2.1 (git+https://github.com/paritytech/unsigned-varint)" = "<none>"
 "checksum unsigned-varint 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5fb8abc4b7d8158bdfbbaaccc35331ed3c30c2673e99000d7ae665a2eb6576f4"
-"checksum untrusted 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f392d7819dbe58833e26872f5f6f0d68b7bbbe90fc3667e98731c4a15ad9a7ae"
+"checksum untrusted 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "55cd1f4b4e96b46aeb8d4855db4a7a9bd96eeeb5c6a1ab54593328761642ce2f"
 "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a"
 "checksum utf8-ranges 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "796f7e48bef87609f7ade7e06495a87d5cd06c7866e6a5cbfceffc558a243737"
 "checksum vcpkg 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "def296d3eb3b12371b2c7d0e83bfe1403e4db2d7a0bba324a12b21c4ee13143d"
diff --git a/Cargo.toml b/Cargo.toml
index 94f73ab7fc..ac3c0ca91f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
@@ -35,7 +35,6 @@ serde_json = "1.0"
 crypto = { path = "util/crypto"}
 ckb-instrument = { path = "util/instrument", features = ["progress_bar"] }
 hash = { path = "util/hash"}
-faster-hex = "0.1"
 build-info = { path = "util/build-info" }
 
 [dev-dependencies]
@@ -49,6 +48,7 @@ members = [
     "util/avl",
     "util/logger",
     "util/hash",
+    "util/merkle-tree",
     "util/merkle-root",
     "util/crypto",
     "util/dir",
diff --git a/README.md b/README.md
index d862bbcaee..033bf17b0c 100644
--- a/README.md
+++ b/README.md
@@ -20,23 +20,25 @@ Nervos CKB is released under the terms of the MIT license. See [COPYING](COPYING
 ## Development Process
 
 This project is still in development, and it's NOT in production-ready status.
-The wiki also lists some [known issues](https://github.com/nervosnetwork/ckb/wiki/Known-Issues) that we are currently working on.
+The board also lists some [known issues](https://github.com/nervosnetwork/ckb/projects/2) that we are currently working on.
 
 The `master` branch is regularly built and tested, however, it is not guaranteed to be completely stable; The `develop` branch is the work branch to merge new features, and it's not stable. The CHANGELOG is available in [Releases](https://github.com/nervosnetwork/ckb/releases) and [CHANGELOG.md](https://github.com/nervosnetwork/ckb/blob/master/CHANGELOG.md) in the `master` branch.
 
+## How to Contribute
+
 The contribution workflow is described in [CONTRIBUTING.md](CONTRIBUTING.md), and security policy is described in [SECURITY.md](SECURITY.md). To propose new protocol or standard for Nervos, see [Nervos RFC](https://github.com/nervosnetwork/rfcs).
 
 ---
 
 ## Build dependencies
 
-CKB is currently tested mainly with `stable-1.31.0` on Linux and Mac OSX.
+CKB is currently tested mainly with `stable-1.31.1` on Linux and Mac OSX.
 
 We recommend installing Rust through [rustup](https://www.rustup.rs/)
 
 ```bash
 # Get rustup from rustup.rs, then in your `ckb` folder:
-rustup override set 1.31.0
+rustup override set 1.31.1
 rustup component add rustfmt
 rustup component add clippy
 ```
@@ -48,20 +50,13 @@ You also need to get the following packages：
 * Ubuntu and Debian:
 
 ```shell
-sudo apt-get install git autoconf flex bison texinfo libtool pkg-config libssl-dev libclang-dev
-```
-
-If you are on Ubuntu 18.04, you might run into `'stdarg.h' file not found` error, this is because `librocksdb-sys` fails to find the correct include path. A temporary fix until `librocksdb-sys` fixes this problem is as follows:
-
-```shell
-sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stdarg.h /usr/include/stdarg.h
-sudo ln -s /usr/lib/gcc/x86_64-linux-gnu/7/include/stddef.h /usr/include/stddef.h
+sudo apt-get install git gcc libc6-dev pkg-config libssl-dev libclang-dev clang
 ```
 
 * Archlinux
 
 ```shell
-sudo pacman -Sy git autoconf flex bison texinfo libtool pkg-config openssl-1.0 clang
+sudo pacman -Sy git gcc pkgconf openssl-1.0 clang
 ```
 
 If you get openssl related errors in compiling, try the following environment variables to specify openssl-1.0:
diff --git a/benches/Cargo.toml b/benches/Cargo.toml
index feb28d7bf8..e8d4a79822 100644
--- a/benches/Cargo.toml
+++ b/benches/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-benches"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/chain/Cargo.toml b/chain/Cargo.toml
index f134046cdb..662162aafe 100644
--- a/chain/Cargo.toml
+++ b/chain/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-chain"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/chain/src/chain.rs b/chain/src/chain.rs
index b55d0bb49c..134f24135c 100644
--- a/chain/src/chain.rs
+++ b/chain/src/chain.rs
@@ -22,6 +22,7 @@ use std::thread::{self, JoinHandle};
 pub struct ChainService<CI> {
     shared: Shared<CI>,
     notify: NotifyController,
+    block_verifier: BlockVerifier<Shared<CI>>,
 }
 
 #[derive(Clone)]
@@ -59,7 +60,12 @@ pub struct BlockInsertionResult {
 
 impl<CI: ChainIndex + 'static> ChainService<CI> {
     pub fn new(shared: Shared<CI>, notify: NotifyController) -> ChainService<CI> {
-        ChainService { shared, notify }
+        let block_verifier = BlockVerifier::new(shared.clone());
+        ChainService {
+            shared,
+            notify,
+            block_verifier,
+        }
     }
 
     pub fn start<S: ToString>(
@@ -92,7 +98,7 @@ impl<CI: ChainIndex + 'static> ChainService<CI> {
     fn process_block(&mut self, block: Arc<Block>) -> Result<(), ProcessBlockError> {
         debug!(target: "chain", "begin processing block: {}", block.header().hash());
         if self.shared.consensus().verification {
-            BlockVerifier::new(self.shared.clone())
+            self.block_verifier
                 .verify(&block)
                 .map_err(ProcessBlockError::Verification)?
         }
@@ -535,7 +541,7 @@ pub mod test {
 
         let out_point = OutPoint::new(root_hash, 0);
         let state = shared.cell(&out_point);
-        assert!(state.is_current());
+        assert!(state.is_live());
     }
 
     #[test]
diff --git a/core/Cargo.toml b/core/Cargo.toml
index 7748a7a96e..e11b8f16db 100644
--- a/core/Cargo.toml
+++ b/core/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-core"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/core/src/cell.rs b/core/src/cell.rs
index 96214710a1..e6114d9b1a 100644
--- a/core/src/cell.rs
+++ b/core/src/cell.rs
@@ -7,39 +7,39 @@ use std::slice;
 #[derive(Clone, PartialEq, Debug)]
 pub enum CellStatus {
     /// Cell exists and has not been spent.
-    Current(CellOutput),
+    Live(CellOutput),
     /// Cell exists and has been spent.
-    Old,
+    Dead,
     /// Cell does not exist.
     Unknown,
 }
 
 impl CellStatus {
-    pub fn is_current(&self) -> bool {
+    pub fn is_live(&self) -> bool {
         match *self {
-            CellStatus::Current(_) => true,
+            CellStatus::Live(_) => true,
             _ => false,
         }
     }
 
-    pub fn is_old(&self) -> bool {
-        self == &CellStatus::Old
+    pub fn is_dead(&self) -> bool {
+        self == &CellStatus::Dead
     }
 
     pub fn is_unknown(&self) -> bool {
         self == &CellStatus::Unknown
     }
 
-    pub fn get_current(&self) -> Option<&CellOutput> {
+    pub fn get_live(&self) -> Option<&CellOutput> {
         match *self {
-            CellStatus::Current(ref output) => Some(output),
+            CellStatus::Live(ref output) => Some(output),
             _ => None,
         }
     }
 
-    pub fn take_current(self) -> Option<CellOutput> {
+    pub fn take_live(self) -> Option<CellOutput> {
         match self {
-            CellStatus::Current(output) => Some(output),
+            CellStatus::Live(output) => Some(output),
             _ => None,
         }
     }
@@ -68,7 +68,7 @@ pub trait CellProvider {
                 if seen_inputs.insert(input.clone()) {
                     self.cell(input)
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             })
             .collect();
@@ -80,7 +80,7 @@ pub trait CellProvider {
                 if seen_inputs.insert(dep.clone()) {
                     self.cell(dep)
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             })
             .collect();
@@ -106,7 +106,7 @@ pub trait CellProvider {
                 if seen_inputs.insert(input.clone()) {
                     self.cell_at(input, parent)
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             })
             .collect();
@@ -118,7 +118,7 @@ pub trait CellProvider {
                 if seen_inputs.insert(dep.clone()) {
                     self.cell_at(dep, parent)
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             })
             .collect();
@@ -156,7 +156,7 @@ impl ResolvedTransaction {
     }
 
     pub fn is_double_spend(&self) -> bool {
-        self.cells_iter().any(|state| state.is_old())
+        self.cells_iter().any(|state| state.is_dead())
     }
 
     pub fn is_orphan(&self) -> bool {
@@ -164,7 +164,7 @@ impl ResolvedTransaction {
     }
 
     pub fn is_fully_resolved(&self) -> bool {
-        self.cells_iter().all(|state| state.is_current())
+        self.cells_iter().all(|state| state.is_live())
     }
 }
 
@@ -180,16 +180,16 @@ mod tests {
     impl CellProvider for CellMemoryDb {
         fn cell(&self, o: &OutPoint) -> CellStatus {
             match self.cells.get(o) {
-                Some(&Some(ref cell_output)) => CellStatus::Current(cell_output.clone()),
-                Some(&None) => CellStatus::Old,
+                Some(&Some(ref cell_output)) => CellStatus::Live(cell_output.clone()),
+                Some(&None) => CellStatus::Dead,
                 None => CellStatus::Unknown,
             }
         }
 
         fn cell_at(&self, o: &OutPoint, _: &H256) -> CellStatus {
             match self.cells.get(o) {
-                Some(&Some(ref cell_output)) => CellStatus::Current(cell_output.clone()),
-                Some(&None) => CellStatus::Old,
+                Some(&Some(ref cell_output)) => CellStatus::Live(cell_output.clone()),
+                Some(&None) => CellStatus::Dead,
                 None => CellStatus::Unknown,
             }
         }
@@ -217,14 +217,14 @@ mod tests {
             capacity: 2,
             data: vec![],
             lock: H256::default(),
-            contract: None,
+            type_: None,
         };
 
         db.cells.insert(p1.clone(), Some(o.clone()));
         db.cells.insert(p2.clone(), None);
 
-        assert_eq!(CellStatus::Current(o), db.cell(&p1));
-        assert_eq!(CellStatus::Old, db.cell(&p2));
+        assert_eq!(CellStatus::Live(o), db.cell(&p1));
+        assert_eq!(CellStatus::Dead, db.cell(&p2));
         assert_eq!(CellStatus::Unknown, db.cell(&p3));
     }
 }
diff --git a/core/src/error.rs b/core/src/error.rs
index ff5b7c10cc..192fe039a3 100644
--- a/core/src/error.rs
+++ b/core/src/error.rs
@@ -18,11 +18,3 @@ impl From<CrypError> for Error {
         Error::InvalidSignature(e)
     }
 }
-
-#[derive(Debug, PartialEq, Eq)]
-pub enum TxError {
-    OutofBound,
-    NotMatch,
-    EmptyGroup,
-    WrongFormat,
-}
diff --git a/core/src/header.rs b/core/src/header.rs
index b085f62140..64f5f87429 100644
--- a/core/src/header.rs
+++ b/core/src/header.rs
@@ -16,6 +16,11 @@ impl Seal {
     pub fn new(nonce: u64, proof: Vec<u8>) -> Self {
         Seal { nonce, proof }
     }
+
+    pub fn destruct(self) -> (u64, Vec<u8>) {
+        let Seal { nonce, proof } = self;
+        (nonce, proof)
+    }
 }
 
 #[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Debug, Default)]
@@ -82,6 +87,10 @@ impl Header {
         self.raw.version
     }
 
+    pub fn seal(&self) -> &Seal {
+        &self.seal
+    }
+
     pub fn number(&self) -> BlockNumber {
         self.raw.number
     }
@@ -166,6 +175,11 @@ impl HeaderBuilder {
         self
     }
 
+    pub fn seal(mut self, seal: Seal) -> Self {
+        self.inner.seal = seal;
+        self
+    }
+
     pub fn version(mut self, version: u32) -> Self {
         self.inner.raw.version = version;
         self
diff --git a/core/src/lib.rs b/core/src/lib.rs
index 00deb432d3..2f28190c73 100644
--- a/core/src/lib.rs
+++ b/core/src/lib.rs
@@ -20,3 +20,4 @@ pub use crate::error::Error;
 pub type PublicKey = numext_fixed_hash::H512;
 pub type BlockNumber = u64;
 pub type Capacity = u64;
+pub type Cycle = u64;
diff --git a/core/src/script.rs b/core/src/script.rs
index f86473196a..c3bc528eb4 100644
--- a/core/src/script.rs
+++ b/core/src/script.rs
@@ -49,6 +49,14 @@ pub struct Script {
     pub signed_args: Vec<Vec<u8>>,
 }
 
+type ScriptTuple = (
+    u8,
+    Vec<Vec<u8>>,
+    Option<H256>,
+    Option<Vec<u8>>,
+    Vec<Vec<u8>>,
+);
+
 impl Script {
     pub fn new(
         version: u8,
@@ -66,6 +74,17 @@ impl Script {
         }
     }
 
+    pub fn destruct(self) -> ScriptTuple {
+        let Script {
+            version,
+            args,
+            reference,
+            binary,
+            signed_args,
+        } = self;
+        (version, args, reference, binary, signed_args)
+    }
+
     pub fn bytes_len(&self) -> usize {
         mem::size_of::<u8>()
             + self.args.iter().map(|a| a.len()).sum::<usize>()
diff --git a/core/src/transaction.rs b/core/src/transaction.rs
index ccaf942835..097337e070 100644
--- a/core/src/transaction.rs
+++ b/core/src/transaction.rs
@@ -42,6 +42,11 @@ impl OutPoint {
     pub fn is_null(&self) -> bool {
         self.hash.is_zero() && self.index == u32::max_value()
     }
+
+    pub fn destruct(self) -> (H256, u32) {
+        let OutPoint { hash, index } = self;
+        (hash, index)
+    }
 }
 
 #[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
@@ -72,6 +77,14 @@ impl CellInput {
             ),
         }
     }
+
+    pub fn destruct(self) -> (OutPoint, Script) {
+        let CellInput {
+            previous_output,
+            unlock,
+        } = self;
+        (previous_output, unlock)
+    }
 }
 
 #[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
@@ -79,22 +92,33 @@ pub struct CellOutput {
     pub capacity: Capacity,
     pub data: Vec<u8>,
     pub lock: H256,
-    pub contract: Option<Script>,
+    #[serde(rename = "type")]
+    pub type_: Option<Script>,
 }
 
 impl CellOutput {
-    pub fn new(capacity: Capacity, data: Vec<u8>, lock: H256, contract: Option<Script>) -> Self {
+    pub fn new(capacity: Capacity, data: Vec<u8>, lock: H256, type_: Option<Script>) -> Self {
         CellOutput {
             capacity,
             data,
             lock,
-            contract,
+            type_,
         }
     }
 
     pub fn data_hash(&self) -> H256 {
         sha3_256(&self.data).into()
     }
+
+    pub fn destruct(self) -> (Capacity, Vec<u8>, H256, Option<Script>) {
+        let CellOutput {
+            capacity,
+            data,
+            lock,
+            type_,
+        } = self;
+        (capacity, data, lock, type_)
+    }
 }
 
 #[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Debug, Default)]
@@ -105,12 +129,18 @@ pub struct Transaction {
     outputs: Vec<CellOutput>,
 }
 
+#[derive(Debug, PartialEq, Eq, Clone)]
+pub struct IndexTransaction {
+    pub index: usize,
+    pub transaction: Transaction,
+}
+
 impl CellOutput {
     pub fn bytes_len(&self) -> usize {
         mem::size_of::<Capacity>()
             + self.data.len()
             + H256::size_of()
-            + self.contract.as_ref().map_or(0, |s| s.bytes_len())
+            + self.type_.as_ref().map_or(0, |s| s.bytes_len())
     }
 }
 
@@ -132,6 +162,10 @@ impl DerefMut for ProposalShortId {
 }
 
 impl ProposalShortId {
+    pub fn new(inner: [u8; 10]) -> Self {
+        ProposalShortId(inner)
+    }
+
     pub fn from_slice(slice: &[u8]) -> Option<Self> {
         if slice.len() == 10usize {
             let mut id = [0u8; 10];
@@ -156,6 +190,10 @@ impl ProposalShortId {
     pub fn zero() -> Self {
         ProposalShortId([0; 10])
     }
+
+    pub fn into_inner(self) -> [u8; 10] {
+        self.0
+    }
 }
 
 impl Transaction {
@@ -259,6 +297,11 @@ impl TransactionBuilder {
         self
     }
 
+    pub fn deps_clear(mut self) -> Self {
+        self.inner.deps.clear();
+        self
+    }
+
     pub fn input(mut self, input: CellInput) -> Self {
         self.inner.inputs.push(input);
         self
@@ -284,6 +327,11 @@ impl TransactionBuilder {
         self
     }
 
+    pub fn outputs_clear(mut self) -> Self {
+        self.inner.outputs.clear();
+        self
+    }
+
     pub fn build(self) -> Transaction {
         self.inner
     }
diff --git a/core/src/uncle.rs b/core/src/uncle.rs
index 06bc0267a4..c6a41925cf 100644
--- a/core/src/uncle.rs
+++ b/core/src/uncle.rs
@@ -29,6 +29,18 @@ impl From<Block> for UncleBlock {
 }
 
 impl UncleBlock {
+    pub fn new(
+        header: Header,
+        cellbase: Transaction,
+        proposal_transactions: Vec<ProposalShortId>,
+    ) -> UncleBlock {
+        UncleBlock {
+            header,
+            cellbase,
+            proposal_transactions,
+        }
+    }
+
     pub fn header(&self) -> &Header {
         &self.header
     }
diff --git a/db/Cargo.toml b/db/Cargo.toml
index ea3ee7e4a9..fb2127d1f8 100644
--- a/db/Cargo.toml
+++ b/db/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-db"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/db/src/diskdb.rs b/db/src/diskdb.rs
index 3287d04e86..5950b68613 100644
--- a/db/src/diskdb.rs
+++ b/db/src/diskdb.rs
@@ -115,7 +115,7 @@ mod tests {
         assert_eq!(None, db.read(Some(1), &vec![0, 0]).unwrap());
         assert_eq!(Some(vec![1, 1, 1]), db.read(Some(1), &vec![1, 1]).unwrap());
 
-        //return err when col doesn't exist
+        // return err when col doesn't exist
         assert!(db.read(Some(2), &vec![0, 0]).is_err());
     }
 
@@ -168,7 +168,7 @@ mod tests {
             None,
             db.partial_read(Some(1), &vec![1, 1], &(3..0)).unwrap()
         );
-        //return err when col doesn't exist
+        // return err when col doesn't exist
         assert!(db.partial_read(Some(2), &vec![0, 0], &(0..1)).is_err());
 
         assert_eq!(
diff --git a/db/src/memorydb.rs b/db/src/memorydb.rs
index 72895425b4..9289044576 100644
--- a/db/src/memorydb.rs
+++ b/db/src/memorydb.rs
@@ -97,7 +97,7 @@ mod tests {
         assert_eq!(None, db.read(Some(1), &vec![0, 0]).unwrap());
         assert_eq!(Some(vec![1, 1, 1]), db.read(Some(1), &vec![1, 1]).unwrap());
 
-        //return err when col doesn't exist
+        // return err when col doesn't exist
         assert!(db.read(Some(2), &vec![0, 0]).is_err());
     }
 
@@ -142,7 +142,7 @@ mod tests {
             None,
             db.partial_read(Some(1), &vec![1, 1], &(3..0)).unwrap()
         );
-        //return err when col doesn't exist
+        // return err when col doesn't exist
         assert!(db.partial_read(Some(2), &vec![0, 0], &(0..1)).is_err());
 
         assert_eq!(
diff --git a/devtools/playground/random_transaction.rb b/devtools/playground/random_transaction.rb
deleted file mode 100755
index 94abc7c579..0000000000
--- a/devtools/playground/random_transaction.rb
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env ruby
-require 'json'
-require 'net/http'
-require 'uri'
-
-URL      = ARGV[0] || "http://localhost:8114"
-CKB_BIN  = ARGV[1] || "./target/debug/ckb"
-ACCOUNTS = [
-    {
-        name: "miner",
-        type_hash: "321c1ca2887fb8eddaaa7e917399f71e63e03a1c83ff75ed12099a01115ea2ff",
-        private_key: "e79f3207ea4980b7fed79956d5934249ceac4751a4fae01a0f7c4a96884bc4e3",
-        utxo: []
-    },
-    {
-        name: "alice",
-        type_hash: "67295822d1f852602a7d398edfe9ad42734cf41999c084ea8a401ff7cc994cfa",
-        private_key: "76e853efa8245389e33f6fe49dcbd359eb56be2f6c3594e12521d2a806d32156",
-        utxo: []
-    },
-    {
-        name: "bob",
-        type_hash: "45996d79e9403f99eb2d79c4f649d45be4b5ab8458e359f5421ff1ab4e88e9f4",
-        private_key: "9f7fd78dffeda83b77c5c2d7eeaccb05120457787defdbb46da6d2186bf28f13",
-        utxo: []
-    }
-]
-
-class Fixnum
-    def random_split(set = nil, repeats = false)
-        set ||= 1..self
-        set = [*set]
-        return if set.empty? || set.min > self || set.inject(0, :+) < self
-        tried_numbers = []
-        while (not_tried = (set - tried_numbers).select {|n| n <= self }).any?
-            tried_numbers << number = not_tried.sample
-            return [number] if number == self
-            new_set = set.dup
-            new_set.delete_at(new_set.index(number)) unless repeats
-            randomized_rest = (self-number).random_split(new_set, repeats)
-            return [number] + randomized_rest if randomized_rest
-        end
-    end
-end
-
-def pull_transactions
-    number = rpc('get_tip_header')[:raw][:number]
-    block_hash = rpc('get_block_hash', "[#{number}]")
-    block = rpc('get_block', "[\"#{block_hash}\"]")
-    block[:transactions].each do |tx|
-        tx[:transaction][:outputs].each_with_index do |output, i|
-            if match = ACCOUNTS.find{|account| output[:lock] == "0x#{account[:type_hash]}" }
-                match[:utxo] << {hash: tx[:hash], index: i, capacity: output[:capacity]}
-            end
-        end
-    end
-end
-
-def send_transactions
-    account = ACCOUNTS.sample
-    if account[:utxo].size > 0
-        utxo = account[:utxo].sample(account[:utxo].size / 2 + 1)
-        total = utxo.inject(0){|s, o| s + o[:capacity]}
-        inputs = utxo.map do |o|
-            account[:utxo].delete(o)
-            {
-                previous_output: {
-                    hash: o[:hash],
-                    index: o[:index]
-                },
-                unlock: {
-                    version: 0,
-                    args: [account[:name].bytes.to_a],
-                    signed_args: []
-                }
-            }
-        end
-        outputs = total.random_split(100..10000).map do |capacity|
-            {
-                capacity: capacity,
-                data: [0],
-                lock: "0x#{ACCOUNTS.sample[:type_hash]}"
-            }
-        end
-        transaction = {
-            version: 0,
-            deps: [],
-            inputs: inputs,
-            outputs: outputs,
-        }
-        signed = `#{CKB_BIN} cli sign -p #{account[:private_key]} -u '#{transaction.to_json}'`
-        rpc('send_transaction', "[#{signed}]")
-    end
-end
-
-def rpc(method, params = "null")
-    puts "rpc method: #{method}, params: #{params}"
-    response = Net::HTTP.post(
-        URI(URL),
-        "{\"id\": 1, \"jsonrpc\": \"2.0\", \"method\": \"#{method}\", \"params\": #{params}}",
-        "Content-Type" => "application/json")
-    JSON.parse(response.body, symbolize_names: true)[:result]
-end
-
-10.times do
-    pull_transactions
-    send_transactions
-    sleep(5)
-end
diff --git a/miner/Cargo.toml b/miner/Cargo.toml
index 669cd5fe0f..41f75f364b 100644
--- a/miner/Cargo.toml
+++ b/miner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-miner"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/network/Cargo.toml b/network/Cargo.toml
index 31727a9a31..74236a7566 100644
--- a/network/Cargo.toml
+++ b/network/Cargo.toml
@@ -1,10 +1,13 @@
 [package]
 name = "ckb-network"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
 
+[features]
+db-trace = ["rusqlite/trace"]
+
 [dependencies]
 rand = "0.6"
 fnv = "1.0"
@@ -17,5 +20,19 @@ bytes = "0.4.9"
 tokio = "0.1.8"
 futures = { version = "0.1.19", features = ["use_std"] }
 snap = "0.2"
-libp2p = { git = "https://github.com/libp2p/rust-libp2p", rev="cfdfca1a06fb2deb9ebcc15a63d715ebddb23bd0", default-features = false, features = ["libp2p-secio", "libp2p-secio-secp256k1"] }
+libp2p = { git = "https://github.com/nervosnetwork/rust-libp2p", branch = "ring_patch",  default-features = false, features = ["libp2p-secio", "libp2p-secio-secp256k1"] }
 faketime = "0.2.0"
+rusqlite = {version = "0.16.0", features = ["bundled"]}
+lazy_static = "1.2.0"
+multihash = { git = "https://github.com/nervosnetwork/rust-libp2p", branch = "ring_patch" }
+r2d2 = "0.8.3"
+r2d2_sqlite = {git = "https://github.com/jjyr/r2d2-sqlite", rev="8ade92077977c4860562b1337b95ec8ed2000711"}
+
+[dev-dependencies]
+criterion = "0.2"
+tempfile = "3.0.5"
+
+[[bench]]
+name = "sqlite_peer_store"
+harness = false
+path = "src/benches/sqlite_peer_store.rs"
diff --git a/network/src/benches/sqlite_peer_store.rs b/network/src/benches/sqlite_peer_store.rs
new file mode 100644
index 0000000000..1da4188d83
--- /dev/null
+++ b/network/src/benches/sqlite_peer_store.rs
@@ -0,0 +1,142 @@
+#[macro_use]
+extern crate criterion;
+extern crate ckb_network;
+extern crate ckb_util;
+extern crate tempfile;
+
+use ckb_network::{
+    peer_store::{sqlite, PeerStore, SqlitePeerStore},
+    random_peer_id, Endpoint, ToMultiaddr,
+};
+use ckb_util::Mutex;
+use criterion::Criterion;
+use std::fs;
+use std::rc::Rc;
+use tempfile::tempdir;
+
+fn insert_peer_info_benchmark(c: &mut Criterion) {
+    c.bench_function("insert 100 peer_info", |b| {
+        b.iter({
+            let mut peer_store = SqlitePeerStore::default();
+            let peer_ids = (0..100)
+                .map(|_| random_peer_id().unwrap())
+                .collect::<Vec<_>>();
+            let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+            move || {
+                for peer_id in peer_ids.clone() {
+                    peer_store.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+                }
+            }
+        })
+    });
+    c.bench_function("insert 1000 peer_info", |b| {
+        b.iter({
+            let mut peer_store = SqlitePeerStore::default();
+            let peer_ids = (0..1000)
+                .map(|_| random_peer_id().unwrap())
+                .collect::<Vec<_>>();
+            let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+            move || {
+                for peer_id in peer_ids.clone() {
+                    peer_store.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+                }
+            }
+        })
+    });
+
+    // filesystem benchmark
+    let dir = tempdir().expect("temp dir");
+    let file_path = dir.path().join("test.db").to_str().unwrap().to_string();
+    c.bench_function("insert 100 peer_info on filesystem", move |b| {
+        b.iter({
+            let file_path = file_path.clone();
+            let _ = fs::remove_file(file_path.clone());
+            let mut peer_store =
+                SqlitePeerStore::new(sqlite::open_pool(sqlite::StorePath::File(file_path), 8));
+            let peer_ids = (0..100)
+                .map(|_| random_peer_id().unwrap())
+                .collect::<Vec<_>>();
+            let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+            move || {
+                for peer_id in peer_ids.clone() {
+                    peer_store.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+                }
+            }
+        })
+    });
+}
+
+fn random_order_benchmark(c: &mut Criterion) {
+    {
+        let peer_store = Rc::new(Mutex::new(SqlitePeerStore::default()));
+        let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+        {
+            let mut peer_store = peer_store.lock();
+            for _ in 0..8000 {
+                let peer_id = random_peer_id().unwrap();
+                peer_store.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+                let _ = peer_store.add_discovered_address(&peer_id, addr.clone());
+            }
+        }
+        c.bench_function("random order 1000 / 8000 peer_info", {
+            let peer_store = Rc::clone(&peer_store);
+            move |b| {
+                b.iter({
+                    let peer_store = Rc::clone(&peer_store);
+                    move || {
+                        let peer_store = Rc::clone(&peer_store);
+                        let count = 1000;
+                        assert_eq!(
+                            peer_store.lock().peers_to_attempt(count).len() as u32,
+                            count
+                        );
+                    }
+                })
+            }
+        });
+        c.bench_function("random order 2000 / 8000 peer_info", {
+            let peer_store = Rc::clone(&peer_store);
+            move |b| {
+                b.iter({
+                    let peer_store = Rc::clone(&peer_store);
+                    move || {
+                        let peer_store = Rc::clone(&peer_store);
+                        let count = 2000;
+                        assert_eq!(
+                            peer_store.lock().peers_to_attempt(count).len() as u32,
+                            count
+                        );
+                    }
+                })
+            }
+        });
+    }
+
+    // filesystem benchmark
+    let dir = tempdir().expect("temp dir");
+    let file_path = dir.path().join("test.db").to_str().unwrap().to_string();
+    c.bench_function(
+        "random order 1000 / 8000 peer_info on filesystem",
+        move |b| {
+            b.iter({
+                let file_path = file_path.clone();
+                let _ = fs::remove_file(file_path.clone());
+                let mut peer_store =
+                    SqlitePeerStore::new(sqlite::open_pool(sqlite::StorePath::File(file_path), 8));
+                let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+                for _ in 0..8000 {
+                    let peer_id = random_peer_id().unwrap();
+                    peer_store.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+                    let _ = peer_store.add_discovered_address(&peer_id, addr.clone());
+                }
+                move || {
+                    let count = 1000;
+                    assert_eq!(peer_store.peers_to_attempt(count).len() as u32, count);
+                }
+            })
+        },
+    );
+}
+
+criterion_group!(benches, insert_peer_info_benchmark, random_order_benchmark);
+criterion_main!(benches);
diff --git a/network/src/ckb_protocol_handler.rs b/network/src/ckb_protocol_handler.rs
index b1a6d69bff..5ccec469a0 100644
--- a/network/src/ckb_protocol_handler.rs
+++ b/network/src/ckb_protocol_handler.rs
@@ -91,7 +91,7 @@ impl CKBProtocolContext for DefaultCKBProtocolContext {
     // ban peer
     fn ban_peer(&self, peer_index: PeerIndex, timeout: Duration) {
         if let Some(peer_id) = self.network.get_peer_id(peer_index) {
-            self.network.ban_peer(peer_id, timeout)
+            self.network.ban_peer(&peer_id, timeout)
         }
     }
     // disconnect from peer
diff --git a/network/src/ckb_service.rs b/network/src/ckb_service.rs
index 850660b49d..bd0d77e753 100644
--- a/network/src/ckb_service.rs
+++ b/network/src/ckb_service.rs
@@ -12,24 +12,19 @@ use faketime::unix_time_as_millis;
 use futures::future::{self, Future};
 use futures::Stream;
 use libp2p::core::{Endpoint, Multiaddr, UniqueConnecState};
-use libp2p::kad;
 use log::{error, info};
 use std::boxed::Box;
 use std::io::{Error as IoError, ErrorKind as IoErrorKind};
 use std::sync::Arc;
 use tokio;
 
-pub struct CKBService {
-    // used to update kbuckets
-    pub kad_system: Arc<kad::KadSystem>,
-}
+pub struct CKBService;
 
 impl CKBService {
     fn handle_protocol_connection(
         network: Arc<Network>,
         peer_id: PeerId,
         protocol_output: CKBProtocolOutput<Arc<CKBProtocolHandler>>,
-        kad_system: Arc<kad::KadSystem>,
         addr: Multiaddr,
     ) -> Box<Future<Item = (), Error = IoError> + Send> {
         let protocol_id = protocol_output.protocol_id;
@@ -78,10 +73,7 @@ impl CKBService {
                 let network = Arc::clone(&network);
                 let protocol_handler = Arc::clone(&protocol_handler);
                 let peer_id = peer_id.clone();
-                let kad_system = Arc::clone(&kad_system);
                 move |data| {
-                    // update kad_system when we received data
-                    kad_system.update_kbuckets(peer_id.clone());
                     network.modify_peer(&peer_id, |peer| {
                         peer.last_message_time = Some(unix_time_as_millis())
                     });
@@ -176,13 +168,8 @@ impl<T: Send> ProtocolService<T> for CKBService {
     ) -> Box<Future<Item = (), Error = IoError> + Send> {
         match protocol {
             Protocol::CKBProtocol(output, peer_id, addr) => {
-                let handling_future = Self::handle_protocol_connection(
-                    network,
-                    peer_id,
-                    output,
-                    Arc::clone(&self.kad_system),
-                    addr,
-                );
+                let handling_future =
+                    Self::handle_protocol_connection(network, peer_id, output, addr);
                 Box::new(handling_future) as Box<Future<Item = _, Error = _> + Send>
             }
             _ => Box::new(future::ok(())) as Box<Future<Item = _, Error = _> + Send>,
diff --git a/network/src/discovery_service.rs b/network/src/discovery_service.rs
deleted file mode 100644
index e656f89b14..0000000000
--- a/network/src/discovery_service.rs
+++ /dev/null
@@ -1,679 +0,0 @@
-#![allow(clippy::needless_pass_by_value)]
-
-use crate::peer_store::Status;
-use crate::protocol::Protocol;
-use crate::protocol_service::ProtocolService;
-use crate::transport::TransportOutput;
-use crate::Network;
-use ckb_util::Mutex;
-use fnv::FnvHashMap;
-use futures::future::{self, Future};
-use futures::sync::{mpsc, oneshot};
-use futures::Stream;
-use libp2p::core::{upgrade, MuxedTransport, PeerId};
-use libp2p::core::{Endpoint, Multiaddr, UniqueConnec};
-use libp2p::core::{PublicKey, SwarmController};
-use libp2p::{kad, Transport};
-use log::{debug, error, info};
-use rand::{self, Rng};
-use std::boxed::Box;
-use std::error::Error;
-use std::io::{Error as IoError, ErrorKind as IoErrorKind};
-use std::iter::Iterator;
-use std::sync::Arc;
-use std::time::Duration;
-use std::time::Instant;
-use std::usize;
-use tokio::io::{AsyncRead, AsyncWrite};
-use tokio::prelude::{task, Async, Poll};
-use tokio::spawn;
-use tokio::timer::Interval;
-use tokio::timer::Timeout;
-
-pub(crate) struct DiscoveryService {
-    timeout: Duration,
-    pub(crate) kad_system: Arc<kad::KadSystem>,
-    default_response_neighbour_count: usize,
-    kad_manage: Arc<Mutex<KadManage>>,
-}
-
-impl<T: Send> ProtocolService<T> for DiscoveryService {
-    type Output = (
-        kad::KadConnecController,
-        Box<Stream<Item = kad::KadIncomingRequest, Error = IoError> + Send>,
-    );
-
-    fn convert_to_protocol(
-        peer_id: Arc<PeerId>,
-        addr: &Multiaddr,
-        (kad_connection_controller, kad_stream): Self::Output,
-    ) -> Protocol<T> {
-        Protocol::Kad(
-            kad_connection_controller,
-            kad_stream,
-            PeerId::clone(&peer_id),
-            addr.clone(),
-        )
-    }
-
-    fn handle(
-        &self,
-        network: Arc<Network>,
-        protocol: Protocol<T>,
-    ) -> Box<Future<Item = (), Error = IoError> + Send> {
-        if let Protocol::Kad(kad_controller, stream, peer_id, addr) = protocol {
-            match self.handle_kademlia_connection(
-                network,
-                peer_id,
-                addr,
-                kad_controller,
-                Endpoint::Listener,
-                stream,
-            ) {
-                Ok(future) => Box::new(future) as Box<Future<Item = _, Error = _> + Send>,
-                Err(err) => Box::new(future::err(err)) as Box<Future<Item = _, Error = _> + Send>,
-            }
-        } else {
-            Box::new(future::ok(())) as Box<Future<Item = _, Error = _> + Send>
-        }
-    }
-}
-
-impl DiscoveryService {
-    pub fn new(
-        timeout: Duration,
-        default_response_neighbour_count: usize,
-        kad_manage: Arc<Mutex<KadManage>>,
-        kad_system: Arc<kad::KadSystem>,
-    ) -> Self {
-        DiscoveryService {
-            timeout,
-            kad_system,
-            default_response_neighbour_count,
-            kad_manage,
-        }
-    }
-
-    fn handle_kademlia_connection(
-        &self,
-        network: Arc<Network>,
-        peer_id: PeerId,
-        _client_addr: Multiaddr,
-        kad_connection_controller: kad::KadConnecController,
-        _endpoint: Endpoint,
-        kademlia_stream: Box<Stream<Item = kad::KadIncomingRequest, Error = IoError> + Send>,
-    ) -> Result<Box<Future<Item = (), Error = IoError> + Send>, IoError> {
-        let handling_future = Box::new(
-            future::loop_fn(kademlia_stream, {
-                let peer_id = peer_id.clone();
-                let kad_system = Arc::clone(&self.kad_system);
-                let timeout = self.timeout;
-                let respond_peers_count = self.default_response_neighbour_count;
-                let kad_manage = Arc::clone(&self.kad_manage);
-                move |kademlia_stream| {
-                    let network = Arc::clone(&network);
-                    let peer_id = peer_id.clone();
-                    let next_future = kademlia_stream.into_future().map_err(|(err, _)| {
-                        debug!(target: "discovery","kad stream error: {}", err);
-                        err
-                    });
-                    let kad_manage = Arc::clone(&kad_manage);
-                    Timeout::new(next_future, timeout)
-                        .map_err({
-                            move |err| {
-                                info!(target: "discovery", "kad timeout error {:?}", err.description());
-                                IoError::new(
-                                    IoErrorKind::Other,
-                                    format!("discovery request timeout {:?}", err.description()),
-                                )
-                            }
-                        }).and_then({
-                            let kad_system = Arc::clone(&kad_system);
-                            let kad_manage = Arc::clone(&kad_manage);
-                            move |(req, next_stream)| {
-                                kad_system.update_kbuckets(peer_id.clone());
-                                match req {
-                                    Some(kad::KadIncomingRequest::FindNode {
-                                        searched,
-                                        responder,
-                                    }) => {
-                                        let kad_peers = Self::build_kademlia_response(
-                                            kad_system,
-                                            Arc::clone(&network),
-                                            &searched,
-                                            respond_peers_count,
-                                            );
-                                        debug!(target:"network", "kad respond nodes count: {}", kad_peers.len());
-                                        responder.respond(kad_peers);
-                                    },
-                                    Some(kad::KadIncomingRequest::PingPong) => (),
-                                    None => {
-                                        debug!(target: "discovery","finish kad stream");
-                                        return Ok(future::Loop::Break(()))
-                                    }
-                                }
-                                let mut kad_manage = kad_manage.lock();
-                                if let Some(to_notify) = kad_manage.to_notify.take() {
-                                    to_notify.notify();
-                                }
-                                Ok(future::Loop::Continue(next_stream))
-                            }
-                        })
-                }
-            }).then({
-                let peer_id = peer_id.clone();
-                move |val| {
-                    debug!(
-                        target: "discovery",
-                        "Kad connection closed when handling peer {:?} reason: {:?}",
-                        peer_id,
-                        val
-                    );
-                    val
-                }
-            }),
-        ) as Box<Future<Item = _, Error = _> + Send>;
-
-        let kad_unique_connec = {
-            let mut kad_manage = self.kad_manage.lock();
-            if let Some(to_notify) = kad_manage.to_notify.take() {
-                to_notify.notify();
-            }
-            kad_manage.complete_kad_connection(peer_id.clone(), kad_connection_controller.clone());
-            kad_manage.fetch_unique_connec(peer_id.clone())
-        };
-        Ok(Box::new(
-            kad_unique_connec
-                .tie_or_passthrough(kad_connection_controller, handling_future)
-                .then({
-                    let kad_manage = Arc::clone(&self.kad_manage);
-                    // drop kad connection
-                    move |val| {
-                        info!("kad exit because {:?}", val);
-                        let mut kad_manage = kad_manage.lock();
-                        if let Some(to_notify) = kad_manage.to_notify.take() {
-                            to_notify.notify();
-                        }
-                        kad_manage.drop_connection(&peer_id);
-                        val
-                    }
-                }),
-        ))
-    }
-
-    fn build_kademlia_response(
-        kad_system: Arc<kad::KadSystem>,
-        network: Arc<Network>,
-        searched_peer_id: &PeerId,
-        respond_peers_count: usize,
-    ) -> Vec<kad::KadPeer> {
-        let mut kad_peers = kad_system
-            .known_closest_peers(searched_peer_id)
-            .map({
-                let kad_system = Arc::clone(&kad_system);
-                let network = Arc::clone(&network);
-                move |peer_id| {
-                    if peer_id == *kad_system.local_peer_id() {
-                        debug!(
-                            target: "discovery",
-                            "response self address to kad {:?}",
-                            network.listened_addresses.read().clone()
-                        );
-                        kad::KadPeer {
-                            node_id: peer_id.clone(),
-                            multiaddrs: network.listened_addresses.read().clone(),
-                            connection_ty: kad::KadConnectionType::Connected,
-                        }
-                    } else {
-                        let peer_store = network.peer_store().read();
-                        let multiaddrs = match peer_store
-                            .peer_addrs(&peer_id)
-                            .map(|i| i.take(10).map(|addr| addr.to_owned()).collect::<Vec<_>>())
-                        {
-                            Some(addrs) => addrs,
-                            None => Vec::new(),
-                        };
-                        let connection_ty = match peer_store.peer_status(&peer_id) {
-                            Status::Connected => kad::KadConnectionType::Connected,
-                            _ => kad::KadConnectionType::NotConnected,
-                        };
-                        debug!(
-                            target: "discovery",
-                            "response other address to kad {:?} {:?}",
-                            peer_id,
-                            multiaddrs.clone()
-                        );
-                        kad::KadPeer {
-                            node_id: peer_id.clone(),
-                            multiaddrs,
-                            connection_ty,
-                        }
-                    }
-                }
-            })
-            .filter(|kad_peer| {
-                kad_peer.node_id == *kad_system.local_peer_id() || !kad_peer.multiaddrs.is_empty()
-            })
-            .take(respond_peers_count)
-            .collect::<Vec<_>>();
-        // Here we must return at least 1 KadPeer, otherwise kad stream will close
-        if kad_peers.is_empty() {
-            kad_peers.push(kad::KadPeer {
-                node_id: kad_system.local_peer_id().to_owned(),
-                multiaddrs: network.listened_addresses.read().clone(),
-                connection_ty: kad::KadConnectionType::Connected,
-            });
-        }
-        kad_peers
-    }
-}
-
-pub(crate) struct DiscoveryQueryService<SwarmTran, Tran, TranOut, T>
-where
-    SwarmTran: MuxedTransport<Output = Protocol<T>> + Clone + Send + 'static,
-    SwarmTran::MultiaddrFuture: Send + 'static,
-    SwarmTran::Dial: Send,
-    SwarmTran::Listener: Send,
-    SwarmTran::ListenerUpgrade: Send,
-    SwarmTran::Incoming: Send,
-    SwarmTran::IncomingUpgrade: Send,
-    Tran: MuxedTransport<Output = TransportOutput<TranOut>> + Clone + Send + 'static,
-    Tran::MultiaddrFuture: Send + 'static,
-    Tran::Dial: Send,
-    Tran::Listener: Send,
-    Tran::ListenerUpgrade: Send,
-    Tran::Incoming: Send,
-    Tran::IncomingUpgrade: Send,
-    TranOut: AsyncRead + AsyncWrite + Send + 'static,
-{
-    network: Arc<Network>,
-    swarm_controller: SwarmController<SwarmTran, Box<Future<Item = (), Error = IoError> + Send>>,
-    transport: Tran,
-    query_interval: Interval,
-    kad_controller_request_sender: mpsc::UnboundedSender<PeerId>,
-    kad_controller_request_receiver: mpsc::UnboundedReceiver<PeerId>,
-    kad_query_events:
-        Vec<Box<Stream<Item = kad::KadQueryEvent<Vec<PeerId>>, Error = IoError> + Send>>,
-    kad_system: Arc<kad::KadSystem>,
-    kad_manage: Arc<Mutex<KadManage>>,
-}
-
-impl<SwarmTran, Tran, TranOut, T> DiscoveryQueryService<SwarmTran, Tran, TranOut, T>
-where
-    SwarmTran: MuxedTransport<Output = Protocol<T>> + Clone + Send + 'static,
-    SwarmTran::MultiaddrFuture: Send + 'static,
-    SwarmTran::Dial: Send,
-    SwarmTran::Listener: Send,
-    SwarmTran::ListenerUpgrade: Send,
-    SwarmTran::Incoming: Send,
-    SwarmTran::IncomingUpgrade: Send,
-    Tran: MuxedTransport<Output = TransportOutput<TranOut>> + Clone + Send + 'static,
-    Tran::MultiaddrFuture: Send + 'static,
-    Tran::Dial: Send,
-    Tran::Listener: Send,
-    Tran::ListenerUpgrade: Send,
-    Tran::Incoming: Send,
-    Tran::IncomingUpgrade: Send,
-    TranOut: AsyncRead + AsyncWrite + Send + 'static,
-    T: Send,
-{
-    pub fn new(
-        network: Arc<Network>,
-        swarm_controller: SwarmController<
-            SwarmTran,
-            Box<Future<Item = (), Error = IoError> + Send>,
-        >,
-        transport: Tran,
-        discovery_interval: Duration,
-        kad_system: Arc<kad::KadSystem>,
-        kad_manage: Arc<Mutex<KadManage>>,
-    ) -> Self {
-        let (kad_controller_request_sender, kad_controller_request_receiver) = mpsc::unbounded();
-        DiscoveryQueryService {
-            network,
-            swarm_controller,
-            transport,
-            query_interval: Interval::new(
-                Instant::now() + Duration::from_secs(5),
-                discovery_interval,
-            ),
-            kad_query_events: Vec::with_capacity(10),
-            kad_system,
-            kad_manage,
-            kad_controller_request_sender,
-            kad_controller_request_receiver,
-        }
-    }
-
-    // start discovery peers
-    fn perform_random_query(&mut self) {
-        // Use random key to search,
-        // NOTICE, this can't prevent "Eclipse Attack" because attacker can still compute
-        // our neighbours before they respond our query, but use the random key can make
-        // attacker harder to apply attacking.
-        let mut key = vec![0u8; 32];
-        rand::thread_rng().fill(&mut key[..]);
-        let random_key = PublicKey::Ed25519(key);
-        let random_peer_id = random_key.into_peer_id();
-        let query = self.kad_system.find_node(random_peer_id, {
-            let kad_manage = Arc::clone(&self.kad_manage);
-            let kad_controller_request_sender = self.kad_controller_request_sender.clone();
-            move |peer_id| {
-                let (tx, rx) = oneshot::channel();
-                let mut kad_manage = kad_manage.lock();
-                kad_manage
-                    .kad_pending_dials
-                    .entry(peer_id.clone())
-                    .or_insert_with(Vec::new)
-                    .push(tx);
-                debug!(target: "discovery", "find node from {:?} pending: {}", peer_id, kad_manage.kad_pending_dials[&peer_id].len());
-                kad_controller_request_sender.unbounded_send(peer_id.clone()).expect("send kad controller request");
-                rx.map_err(|err| {
-                    IoError::new(
-                        IoErrorKind::Other,
-                        format!("Fetch kad controller failed {}", err),
-                    )
-                })
-            }
-        });
-        self.kad_query_events.push(Box::new(query));
-    }
-
-    fn handle_kad_controller_request(&self, peer_id: PeerId) {
-        let mut kad_manage = self.kad_manage.lock();
-        if &peer_id == self.network.local_peer_id() {
-            debug!(
-            target: "discovery",
-            "ignore kad dial to self"
-            );
-            kad_manage.kad_pending_dials.remove(&peer_id);
-            return;
-        }
-        let peer_store = self.network.peer_store().read();
-        if let Some(addrs) = peer_store.peer_addrs(&peer_id) {
-            for addr in addrs {
-                // dial by kad_manage
-                if kad_manage
-                    .ensure_connection(
-                        peer_id.clone(),
-                        addr,
-                        self.transport.clone(),
-                        &self.swarm_controller,
-                    )
-                    .is_ok()
-                {
-                    return;
-                }
-            }
-        }
-        debug!(
-            target: "discovery",
-            "can't open kad stream for {:?}, because no address usable",
-            peer_id
-        );
-        kad_manage.kad_pending_dials.remove(&peer_id);
-    }
-}
-
-impl<SwarmTran, Tran, TranOut, T> Stream for DiscoveryQueryService<SwarmTran, Tran, TranOut, T>
-where
-    SwarmTran: MuxedTransport<Output = Protocol<T>> + Clone + Send + 'static,
-    SwarmTran::MultiaddrFuture: Send + 'static,
-    SwarmTran::Dial: Send,
-    SwarmTran::Listener: Send,
-    SwarmTran::ListenerUpgrade: Send,
-    SwarmTran::Incoming: Send,
-    SwarmTran::IncomingUpgrade: Send,
-    Tran: MuxedTransport<Output = TransportOutput<TranOut>> + Clone + Send + 'static,
-    Tran::MultiaddrFuture: Send + 'static,
-    Tran::Dial: Send,
-    Tran::Listener: Send,
-    Tran::ListenerUpgrade: Send,
-    Tran::Incoming: Send,
-    Tran::IncomingUpgrade: Send,
-    TranOut: AsyncRead + AsyncWrite + Send + 'static,
-    T: Send,
-{
-    type Item = ();
-    type Error = IoError;
-
-    fn poll(&mut self) -> Poll<Option<()>, IoError> {
-        // 1. handle kad queries response: response, finish...
-        for n in (0..self.kad_query_events.len()).rev() {
-            let mut query = self.kad_query_events.swap_remove(n);
-            loop {
-                match query.poll() {
-                    Ok(Async::Ready(Some(kad::KadQueryEvent::PeersReported(kad_peers)))) => {
-                        let mut peer_store = self.network.peer_store().write();
-                        debug!(target:"network", "discovery new nodes count: {}", kad_peers.len());
-                        for peer in kad_peers {
-                            debug!(target:"network", "discovery new node {:?}", peer);
-                            // store peer info in peerstore
-                            let _ =
-                                peer_store.add_discovered_addresses(&peer.node_id, peer.multiaddrs);
-                        }
-                    }
-                    Ok(Async::Ready(Some(kad::KadQueryEvent::Finished(out)))) => {
-                        debug!(target: "discovery", "Kad query finished and respond {} result", out.len());
-                        break;
-                    }
-                    Ok(Async::Ready(None)) => {
-                        error!(target: "discovery", "Kad query None result");
-                        break;
-                    }
-                    Ok(Async::NotReady) => {
-                        // put back
-                        self.kad_query_events.push(query);
-                        break;
-                    }
-                    Err(err) => {
-                        error!(target: "discovery", "Kad query error: {}", err);
-                        break;
-                    }
-                }
-            }
-        }
-
-        // 2. handle dial requests
-        loop {
-            match self.kad_controller_request_receiver.poll() {
-                Ok(Async::NotReady) => break,
-                Ok(Async::Ready(Some(peer_id))) => self.handle_kad_controller_request(peer_id),
-                Ok(Async::Ready(None)) => {
-                    error!("kad_controller_request_receiver closed unexpected!");
-                    return Ok(Async::Ready(None));
-                }
-                Err(err) => {
-                    error!("kad_controller_request_receiver error unexpected!");
-                    return Err(IoError::new(
-                        IoErrorKind::Other,
-                        format!(
-                            "discovery service kad_controller_request_receiver error: {:?}",
-                            err
-                        ),
-                    ));
-                }
-            }
-        }
-        // 3. handle periodic queries
-        loop {
-            match self.query_interval.poll() {
-                Ok(Async::NotReady) => break,
-                Ok(Async::Ready(Some(_))) => self.perform_random_query(),
-                Ok(Async::Ready(None)) => {
-                    error!("query task timer closed unexpected!");
-                    return Ok(Async::Ready(None));
-                }
-                Err(err) => {
-                    error!("query task timer error: {:?}", err);
-                    return Err(IoError::new(
-                        IoErrorKind::Other,
-                        format!("discovery service timer error: {:?}", err),
-                    ));
-                }
-            }
-        }
-
-        let mut kad_manage = self.kad_manage.lock();
-        kad_manage.to_notify = Some(task::current());
-        Ok(Async::NotReady)
-    }
-}
-
-const MAX_DIALING_COUNT: usize = 30;
-const MAX_CONNECTING_COUNT: usize = 30;
-const KAD_DIAL_TIMEOUT_SECS: u64 = 15;
-
-pub(crate) struct KadManage {
-    kad_connections: FnvHashMap<PeerId, UniqueConnec<kad::KadConnecController>>,
-    kad_pending_dials: FnvHashMap<PeerId, Vec<oneshot::Sender<kad::KadConnecController>>>,
-    kad_dialing_peers: FnvHashMap<PeerId, Instant>,
-    kad_upgrade: kad::KadConnecConfig,
-    pub(crate) to_notify: Option<task::Task>,
-}
-
-impl KadManage {
-    pub fn new(_network: Arc<Network>, kad_upgrade: kad::KadConnecConfig) -> Self {
-        KadManage {
-            kad_connections: FnvHashMap::with_capacity_and_hasher(10, Default::default()),
-            kad_pending_dials: FnvHashMap::with_capacity_and_hasher(10, Default::default()),
-            kad_dialing_peers: FnvHashMap::with_capacity_and_hasher(10, Default::default()),
-            kad_upgrade,
-            to_notify: None,
-        }
-    }
-
-    // check and remove timeout dials
-    fn check_unused_conn(&mut self) {
-        let now = Instant::now();
-        let timeout = Duration::from_secs(KAD_DIAL_TIMEOUT_SECS);
-        self.kad_dialing_peers
-            .retain(move |_peer_id, added_at| now.duration_since(*added_at) > timeout);
-    }
-
-    fn complete_kad_connection(
-        &mut self,
-        peer_id: PeerId,
-        kad_connection_controller: kad::KadConnecController,
-    ) {
-        debug!(target: "discovery", "incoming new kad connection for {:?}", peer_id);
-        if let Some(txs) = self.kad_pending_dials.remove(&peer_id) {
-            debug!(target: "discovery", "incoming new kad connection send to waiting queries {:?}", txs.len());
-            for tx in txs {
-                let _ = tx.send(kad_connection_controller.clone());
-            }
-        }
-        // remove dialing status
-        self.kad_dialing_peers.remove(&peer_id);
-    }
-
-    fn connected_peers(&self) -> impl Iterator<Item = &PeerId> {
-        self.kad_connections
-            .iter()
-            .filter_map(|(key, unique_connec)| {
-                if unique_connec.is_alive() {
-                    Some(key)
-                } else {
-                    None
-                }
-            })
-    }
-
-    fn fetch_unique_connec(&mut self, peer_id: PeerId) -> UniqueConnec<kad::KadConnecController> {
-        self.kad_connections
-            .entry(peer_id)
-            .or_insert_with(UniqueConnec::empty)
-            .to_owned()
-    }
-
-    #[allow(clippy::let_and_return)]
-    fn ensure_connection<Tran, To, St, T: Send>(
-        &mut self,
-        peer_id: PeerId,
-        addr: &Multiaddr,
-        transport: Tran,
-        swarm_controller: &SwarmController<St, Box<Future<Item = (), Error = IoError> + Send>>,
-    ) -> Result<(), IoError>
-    where
-        Tran: MuxedTransport<Output = TransportOutput<To>> + Clone + Send + 'static,
-        Tran::MultiaddrFuture: Send + 'static,
-        Tran::Dial: Send,
-        Tran::Listener: Send,
-        Tran::ListenerUpgrade: Send,
-        Tran::Incoming: Send,
-        Tran::IncomingUpgrade: Send,
-        To: AsyncRead + AsyncWrite + Send + 'static,
-        St: MuxedTransport<Output = Protocol<T>> + Clone + Send + 'static,
-        St::Dial: Send,
-        St::MultiaddrFuture: Send,
-        St::Listener: Send,
-        St::ListenerUpgrade: Send,
-        St::Incoming: Send,
-        St::IncomingUpgrade: Send,
-    {
-        debug!(target: "discovery", "dial kad connection to {:?} {:?}", peer_id, addr);
-        let kad_connection = self.fetch_unique_connec(peer_id.clone());
-        if kad_connection.is_alive() {
-            return Ok(());
-        }
-
-        // remove unused connections
-        self.check_unused_conn();
-        // check peer
-        if self.kad_dialing_peers.contains_key(&peer_id)
-            || self.kad_dialing_peers.len() >= MAX_DIALING_COUNT
-        {
-            debug!(target: "discovery", "we are already dialing to {:?} {:?}", peer_id, addr);
-            return Ok(());
-        }
-        let is_connected = self
-            .kad_connections
-            .get(&peer_id)
-            .map(|unique_connec| unique_connec.is_alive())
-            .unwrap_or(false);
-        let count_of_connected_peers = self.connected_peers().count();
-        if is_connected || count_of_connected_peers >= MAX_CONNECTING_COUNT {
-            debug!(target: "discovery", "we are already connected to {:?} {:?}", peer_id, addr);
-            // should return a error?
-            return Ok(());
-        }
-        //set peer to dialing list
-        self.kad_dialing_peers
-            .entry(peer_id.clone())
-            .or_insert_with(Instant::now);
-
-        let kad_upgrade = self.kad_upgrade.clone();
-        let transport = transport
-            .and_then(move |out, endpoint, client_addr| {
-                upgrade::apply(out.socket, kad_upgrade.clone(), endpoint, client_addr)
-            })
-            .and_then({
-                let peer_id = peer_id.clone();
-                move |(kad_connection_controller, kad_stream), _, client_addr| {
-                    debug!(target: "discovery", "upgraded kad connection!!!!!! {:?}",  peer_id);
-                    // wrap kad output into our own protocol
-                    client_addr.map(move |client_addr| {
-                        let out = Protocol::Kad(
-                            kad_connection_controller,
-                            kad_stream,
-                            peer_id.clone(),
-                            client_addr.clone(),
-                        );
-                        (out, future::ok(client_addr))
-                    })
-                }
-            });
-
-        let dial_future = kad_connection.dial(swarm_controller, addr, transport);
-        spawn(dial_future.then(|err| {
-            debug!(target: "discovery", "dialing result {:?}", err);
-            future::ok(())
-        }));
-        Ok(())
-    }
-
-    fn drop_connection(&mut self, peer_id: &PeerId) {
-        debug!(target: "discovery","drop kad connection from {:?}", peer_id);
-        self.kad_connections.remove(peer_id);
-    }
-}
diff --git a/network/src/identify_service.rs b/network/src/identify_service.rs
index d1a58e5ee9..03cba6f094 100644
--- a/network/src/identify_service.rs
+++ b/network/src/identify_service.rs
@@ -79,8 +79,8 @@ impl IdentifyService {
         }
 
         // update peer addrs in peerstore
-        let peer_store = network.peer_store();
-        let _ = peer_store
+        let _ = network
+            .peer_store()
             .write()
             .add_discovered_addresses(peer_id, info.listen_addrs.clone());
         Ok(())
diff --git a/network/src/lib.rs b/network/src/lib.rs
index 36dc6be110..df737ccf0b 100644
--- a/network/src/lib.rs
+++ b/network/src/lib.rs
@@ -3,16 +3,14 @@
 mod ckb_protocol;
 mod ckb_protocol_handler;
 mod ckb_service;
-mod discovery_service;
 mod errors;
 mod identify_service;
-mod memory_peer_store;
 mod network;
 mod network_config;
 mod network_group;
 mod network_service;
 mod outbound_peer_service;
-mod peer_store;
+pub mod peer_store;
 mod peers_registry;
 mod ping_service;
 mod protocol;
@@ -35,7 +33,7 @@ pub use libp2p::{
 pub type TimerToken = usize;
 pub type ProtocolId = [u8; 3];
 
-use libp2p::secio;
+use multihash::{encode, Hash};
 use rand::Rng;
 use serde_derive::Deserialize;
 use std::sync::Arc;
@@ -108,9 +106,11 @@ impl From<Config> for NetworkConfig {
 }
 
 pub fn random_peer_id() -> Result<PeerId, Error> {
-    let mut key: [u8; 32] = [0; 32];
-    rand::thread_rng().fill(&mut key);
-    let local_private_key = secio::SecioKeyPair::secp256k1_raw_key(&key)
-        .map_err(|err| ErrorKind::Other(err.description().to_string()))?;
-    Ok(local_private_key.to_peer_id())
+    let mut seed: [u8; 32] = [0; 32];
+    rand::thread_rng().fill(&mut seed);
+    let random_key = encode(Hash::SHA2256, &seed)
+        .expect("sha2256 encode")
+        .into_bytes();
+    let peer_id = PeerId::from_bytes(random_key).expect("convert key to peer_id");
+    Ok(peer_id)
 }
diff --git a/network/src/memory_peer_store.rs b/network/src/memory_peer_store.rs
deleted file mode 100644
index c0ca1f9793..0000000000
--- a/network/src/memory_peer_store.rs
+++ /dev/null
@@ -1,188 +0,0 @@
-use crate::peer_store::{Behaviour, PeerStore, ReportResult, Score, ScoringSchema, Status};
-use crate::PeerId;
-use fnv::FnvHashMap;
-use libp2p::core::Multiaddr;
-use log::{debug, trace};
-use std::time::{Duration, Instant};
-
-#[derive(Debug)]
-struct PeerInfo {
-    addresses: Vec<Multiaddr>,
-    last_updated_at: Instant,
-    score: Score,
-    status: Status,
-}
-
-// NOTICE MemoryPeerStore is used for test environment only!!!
-pub struct MemoryPeerStore {
-    bootnodes: Vec<(PeerId, Multiaddr)>,
-    peers: FnvHashMap<PeerId, PeerInfo>,
-    ban_list: FnvHashMap<PeerId, Instant>,
-    schema: ScoringSchema,
-}
-
-impl MemoryPeerStore {
-    pub fn new(scoring_schema: ScoringSchema) -> Self {
-        MemoryPeerStore {
-            bootnodes: Default::default(),
-            peers: Default::default(),
-            ban_list: Default::default(),
-            schema: scoring_schema,
-        }
-    }
-
-    fn add_peer(&mut self, peer_id: PeerId, addresses: Vec<Multiaddr>) -> bool {
-        if self.peers.get(&peer_id).is_some() {
-            return false;
-        }
-        let now = Instant::now();
-        let peer = PeerInfo {
-            addresses,
-            last_updated_at: now,
-            score: self.schema.peer_init_score(),
-            status: Status::Unknown,
-        };
-        self.peers.insert(peer_id, peer);
-        true
-    }
-}
-
-impl PeerStore for MemoryPeerStore {
-    fn new_connected_peer(&mut self, peer_id: &PeerId, address: Multiaddr) {
-        self.add_discovered_address(peer_id, address).unwrap();
-    }
-
-    fn scoring_schema(&self) -> &ScoringSchema {
-        &self.schema
-    }
-
-    fn add_discovered_address(&mut self, peer_id: &PeerId, address: Multiaddr) -> Result<(), ()> {
-        self.add_discovered_addresses(peer_id, vec![address])
-            .map(|_| ())
-    }
-
-    fn add_discovered_addresses(
-        &mut self,
-        peer_id: &PeerId,
-        addresses: Vec<Multiaddr>,
-    ) -> Result<usize, ()> {
-        if let Some(peer) = self.peers.get_mut(&peer_id) {
-            let now = Instant::now();
-            let origin_addrs_len = peer.addresses.len();
-            for addr in addresses {
-                if !peer.addresses.contains(&addr) {
-                    peer.addresses.push(addr);
-                }
-            }
-            peer.last_updated_at = now;
-            return Ok(peer.addresses.len() - origin_addrs_len);
-        }
-        let len = addresses.len();
-        self.add_peer(peer_id.to_owned(), addresses);
-        Ok(len)
-    }
-
-    fn report(&mut self, peer_id: &PeerId, behaviour: Behaviour) -> ReportResult {
-        if self.is_banned(peer_id) {
-            return ReportResult::Banned;
-        }
-        let behaviour_score = match self.schema.get_score(behaviour) {
-            Some(score) => score,
-            None => {
-                debug!(target: "network", "behaviour {:?} is undefined", behaviour);
-                return ReportResult::Ok;
-            }
-        };
-        // apply reported score
-        let score = match self.peers.get_mut(peer_id) {
-            Some(peer) => {
-                peer.score = peer.score.saturating_add(behaviour_score);
-                peer.score
-            }
-            None => return ReportResult::Ok,
-        };
-        // ban peer is score is lower than ban_score
-        if score < self.schema.ban_score() {
-            let default_ban_timeout = self.schema.default_ban_timeout();
-            self.ban_peer(peer_id.to_owned(), default_ban_timeout);
-            return ReportResult::Banned;
-        }
-        ReportResult::Ok
-    }
-
-    fn update_status(&mut self, peer_id: &PeerId, status: Status) {
-        if let Some(peer) = self.peers.get_mut(&peer_id) {
-            let now = Instant::now();
-            peer.last_updated_at = now;
-            peer.status = status;
-        }
-    }
-
-    fn peer_status(&self, peer_id: &PeerId) -> Status {
-        match self.peers.get(&peer_id) {
-            Some(peer) => peer.status,
-            None => Status::Unknown,
-        }
-    }
-
-    fn peer_score(&self, peer_id: &PeerId) -> Option<Score> {
-        self.peers.get(peer_id).map(|peer| peer.score)
-    }
-
-    fn add_bootnode(&mut self, peer_id: PeerId, addr: Multiaddr) {
-        self.bootnodes.push((peer_id.clone(), addr.clone()));
-        self.add_peer(peer_id, vec![addr]);
-    }
-
-    fn bootnodes<'a>(&'a self) -> Box<dyn Iterator<Item = (&'a PeerId, &'a Multiaddr)> + 'a> {
-        let mut bootnodes = self
-            .peers_to_attempt()
-            .chain(self.bootnodes.iter().map(|(peer_id, addr)| (peer_id, addr)))
-            .collect::<Vec<_>>();
-        bootnodes.dedup();
-        let iter = bootnodes.into_iter();
-        Box::new(iter) as Box<_>
-    }
-
-    fn peer_addrs<'a>(
-        &'a self,
-        peer_id: &'a PeerId,
-    ) -> Option<Box<dyn Iterator<Item = &'a Multiaddr> + 'a>> {
-        let iter = match self.peers.get(peer_id) {
-            Some(peer) => peer.addresses.iter(),
-            None => return None,
-        };
-        Some(Box::new(iter) as Box<_>)
-    }
-
-    fn peers_to_attempt<'a>(
-        &'a self,
-    ) -> Box<dyn Iterator<Item = (&'a PeerId, &'a Multiaddr)> + 'a> {
-        trace!(
-        target: "network",
-        "try fetch attempt peers from {:?}",
-        self.peers.iter().collect::<Vec<_>>()
-        );
-        let peers = self.peers.iter().filter_map(move |(peer_id, peer_info)| {
-            if peer_info.status == Status::Connected || peer_info.addresses.is_empty() {
-                None
-            } else {
-                Some((peer_id, &peer_info.addresses[0]))
-            }
-        });
-        Box::new(peers) as Box<_>
-    }
-
-    fn ban_peer(&mut self, peer_id: PeerId, timeout: Duration) {
-        let now = Instant::now();
-        let timeout_at = now + timeout;
-        self.ban_list.insert(peer_id, timeout_at);
-    }
-
-    fn is_banned(&self, peer_id: &PeerId) -> bool {
-        if let Some(timeout_at) = self.ban_list.get(peer_id) {
-            return *timeout_at > Instant::now();
-        }
-        false
-    }
-}
diff --git a/network/src/network.rs b/network/src/network.rs
index d6cce5b71d..b141f6e7cf 100644
--- a/network/src/network.rs
+++ b/network/src/network.rs
@@ -4,11 +4,9 @@ use crate::ckb_protocol::{CKBProtocol, CKBProtocols};
 use crate::ckb_protocol_handler::CKBProtocolHandler;
 use crate::ckb_protocol_handler::DefaultCKBProtocolContext;
 use crate::ckb_service::CKBService;
-use crate::discovery_service::{DiscoveryQueryService, DiscoveryService, KadManage};
 use crate::identify_service::IdentifyService;
-use crate::memory_peer_store::MemoryPeerStore;
 use crate::outbound_peer_service::OutboundPeerService;
-use crate::peer_store::PeerStore;
+use crate::peer_store::{Behaviour, PeerStore, SqlitePeerStore};
 use crate::peers_registry::{ConnectionStatus, PeerConnection, PeerIdentifyInfo, PeersRegistry};
 use crate::ping_service::PingService;
 use crate::protocol::Protocol;
@@ -26,7 +24,7 @@ use futures::Stream;
 use libp2p::core::{upgrade, MuxedTransport, PeerId};
 use libp2p::core::{Endpoint, Multiaddr, UniqueConnec};
 use libp2p::core::{PublicKey, SwarmController};
-use libp2p::{self, identify, kad, ping, secio, Transport, TransportTimeout};
+use libp2p::{self, identify, ping, secio, Transport, TransportTimeout};
 use log::{debug, info, trace, warn};
 use std::boxed::Box;
 use std::io::{Error as IoError, ErrorKind as IoErrorKind};
@@ -35,10 +33,8 @@ use std::time::Duration;
 use std::usize;
 use tokio::io::{AsyncRead, AsyncWrite};
 
-// const WAIT_LOCK_TIMEOUT: u64 = 3;
-const KBUCKETS_TIMEOUT: u64 = 600;
 const DIAL_BOOTNODE_TIMEOUT: u64 = 20;
-const PEER_ADDRS_COUNT: usize = 5;
+const PEER_ADDRS_COUNT: u32 = 5;
 
 #[derive(Debug, Clone)]
 pub struct SessionInfo {
@@ -78,6 +74,10 @@ pub struct Network {
 }
 
 impl Network {
+    pub fn report(&self, peer_id: &PeerId, behaviour: Behaviour) {
+        self.peer_store.write().report(peer_id, behaviour);
+    }
+
     pub fn drop_peer(&self, peer_id: &PeerId) {
         self.peers_registry.write().drop_peer(&peer_id);
     }
@@ -150,11 +150,7 @@ impl Network {
 
     pub(crate) fn get_peer_addresses(&self, peer_id: &PeerId) -> Vec<Multiaddr> {
         let peer_store = self.peer_store.read();
-        let addrs = peer_store.peer_addrs(&peer_id).map(|i| {
-            i.take(PEER_ADDRS_COUNT)
-                .map(|addr| addr.to_owned())
-                .collect::<Vec<_>>()
-        });
+        let addrs = peer_store.peer_addrs(&peer_id, PEER_ADDRS_COUNT);
         addrs.unwrap_or_default()
     }
 
@@ -174,9 +170,9 @@ impl Network {
     }
 
     #[inline]
-    pub(crate) fn ban_peer(&self, peer_id: PeerId, timeout: Duration) {
+    pub(crate) fn ban_peer(&self, peer_id: &PeerId, timeout: Duration) {
         let mut peers_registry = self.peers_registry.write();
-        peers_registry.drop_peer(&peer_id);
+        peers_registry.drop_peer(peer_id);
         self.peer_store.write().ban_peer(peer_id, timeout);
     }
 
@@ -476,7 +472,7 @@ impl Network {
         };
         let listened_addresses = config.public_addresses.clone();
         let peer_store: Arc<RwLock<dyn PeerStore>> = {
-            let mut peer_store = MemoryPeerStore::new(Default::default());
+            let mut peer_store = SqlitePeerStore::default();
             let bootnodes = config.bootnodes()?;
             for (peer_id, addr) in bootnodes {
                 peer_store.add_bootnode(peer_id, addr);
@@ -558,37 +554,7 @@ impl Network {
                 ),
             ));
         }
-        let kad_upgrade = kad::KadConnecConfig::new();
-        let kad_manage = Arc::new(Mutex::new(KadManage::new(
-            Arc::clone(&network),
-            kad_upgrade.clone(),
-        )));
-        let kad_system = {
-            let peer_store = network.peer_store().read();
-            let known_initial_peers: Box<Iterator<Item = PeerId>> = Box::new(
-                peer_store
-                    .bootnodes()
-                    .map(|(peer_id, _)| peer_id.to_owned())
-                    .take(100)
-                    .collect::<Vec<_>>()
-                    .into_iter(),
-            ) as Box<_>;
-            Arc::new(kad::KadSystem::without_init(kad::KadSystemConfig {
-                parallelism: 1,
-                local_peer_id: local_peer_id.clone(),
-                kbuckets_timeout: Duration::from_secs(KBUCKETS_TIMEOUT),
-                request_timeout: config.discovery_timeout,
-                known_initial_peers,
-            }))
-        };
-
         let ping_service = Arc::new(PingService::new(config.ping_interval, config.ping_timeout));
-        let discovery_service = Arc::new(DiscoveryService::new(
-            config.discovery_timeout,
-            config.discovery_response_count,
-            Arc::clone(&kad_manage),
-            Arc::clone(&kad_system),
-        ));
         let identify_service = Arc::new(IdentifyService {
             client_version,
             protocol_version,
@@ -596,9 +562,7 @@ impl Network {
             identify_interval: config.identify_interval,
         });
 
-        let ckb_protocol_service = Arc::new(CKBService {
-            kad_system: Arc::clone(&kad_system),
-        });
+        let ckb_protocol_service = Arc::new(CKBService {});
         let timer_service = Arc::new(TimerService {
             timer_registry: Arc::clone(&timer_registry),
         });
@@ -611,7 +575,6 @@ impl Network {
             let transport = basic_transport.clone();
             transport.and_then({
                 let network = Arc::clone(&network);
-                let kad_upgrade = kad_upgrade.clone();
                 move |out, endpoint, fut| {
                     let peer_id = Arc::new(out.peer_id);
                     let original_addr = out.original_addr;
@@ -620,10 +583,6 @@ impl Network {
                         let peer_id = Arc::clone(&peer_id);
                         move |out, addr| PingService::convert_to_protocol(peer_id, addr, out)
                     });
-                    let discovery_upgrade = upgrade::map_with_addr(kad_upgrade, {
-                        let peer_id = Arc::clone(&peer_id);
-                        move |out, addr| DiscoveryService::convert_to_protocol(peer_id, addr, out)
-                    });
                     let identify_upgrade =
                         upgrade::map_with_addr(identify::IdentifyProtocolConfig, {
                             let peer_id = Arc::clone(&peer_id);
@@ -639,10 +598,7 @@ impl Network {
                         });
                     let all_upgrade = upgrade::or(
                         ckb_protocols_upgrade,
-                        upgrade::or(
-                            identify_upgrade,
-                            upgrade::or(ping_upgrade, discovery_upgrade),
-                        ),
+                        upgrade::or(identify_upgrade, ping_upgrade),
                     );
                     upgrade::apply(out.socket, all_upgrade, endpoint, fut)
                 }
@@ -650,7 +606,6 @@ impl Network {
         };
         let (swarm_controller, swarm_events) = libp2p::core::swarm(handling_transport, {
             let ping_service = Arc::clone(&ping_service);
-            let discovery_service = Arc::clone(&discovery_service);
             let identify_service = Arc::clone(&identify_service);
             let ckb_protocol_service = Arc::clone(&ckb_protocol_service);
             let network = Arc::clone(&network);
@@ -658,7 +613,6 @@ impl Network {
                 Protocol::Ping(..) | Protocol::Pong(..) => ping_service
                     .handle(Arc::clone(&network), protocol)
                     as Box<Future<Item = (), Error = IoError> + Send>,
-                Protocol::Kad(..) => discovery_service.handle(Arc::clone(&network), protocol),
                 Protocol::IdentifyRequest(..) | Protocol::IdentifyResponse(..) => {
                     identify_service.handle(Arc::clone(&network), protocol)
                 }
@@ -709,29 +663,24 @@ impl Network {
                 );
             }
 
-            let peer_store = network.peer_store().read();
-            // dial bootnodes
-            for (peer_id, addr) in peer_store.bootnodes().take(max_outbound) {
+            let bootnodes = network
+                .peer_store()
+                .read()
+                .bootnodes((max_outbound / 2) as u32)
+                .clone();
+            // dial half bootnodes
+            for (peer_id, addr) in bootnodes {
                 debug!(target: "network", "dial bootnode {:?} {:?}", peer_id, addr);
                 network.dial_to_peer(
                     basic_transport.clone(),
-                    addr,
-                    peer_id,
+                    &addr,
+                    &peer_id,
                     &swarm_controller,
                     dial_timeout,
                 );
             }
         }
 
-        let _discovery_query_service = DiscoveryQueryService::new(
-            Arc::clone(&network),
-            swarm_controller.clone(),
-            basic_transport.clone(),
-            config.discovery_interval,
-            Arc::clone(&kad_system),
-            Arc::clone(&kad_manage),
-        );
-
         // prepare services futures
         let futures: Vec<Box<Future<Item = (), Error = IoError> + Send>> = vec![
             Box::new(swarm_events.for_each(|_| Ok(()))),
diff --git a/network/src/network_group.rs b/network/src/network_group.rs
index 9b9d1cdf06..93c1d1d688 100644
--- a/network/src/network_group.rs
+++ b/network/src/network_group.rs
@@ -13,20 +13,26 @@ pub trait NetworkGroup {
     fn network_group(&self) -> Group;
 }
 
-fn extract_ip_addr(addr: &Multiaddr) -> Option<IpAddr> {
-    for addr_component in addr {
-        match addr_component {
-            AddrComponent::IP4(ipv4) => return Some(IpAddr::V4(ipv4)),
-            AddrComponent::IP6(ipv6) => return Some(IpAddr::V6(ipv6)),
-            _ => (),
+pub trait MultiaddrExt {
+    fn extract_ip_addr(&self) -> Option<IpAddr>;
+}
+
+impl MultiaddrExt for Multiaddr {
+    fn extract_ip_addr(&self) -> Option<IpAddr> {
+        for addr_component in self {
+            match addr_component {
+                AddrComponent::IP4(ipv4) => return Some(IpAddr::V4(ipv4)),
+                AddrComponent::IP6(ipv6) => return Some(IpAddr::V6(ipv6)),
+                _ => (),
+            }
         }
+        None
     }
-    None
 }
 
 impl NetworkGroup for Multiaddr {
     fn network_group(&self) -> Group {
-        if let Some(ip_addr) = extract_ip_addr(self) {
+        if let Some(ip_addr) = self.extract_ip_addr() {
             if ip_addr.is_loopback() {
                 return Group::LocalNetwork;
             }
diff --git a/network/src/network_service.rs b/network/src/network_service.rs
index 6e4dec23d5..a42b89bafe 100644
--- a/network/src/network_service.rs
+++ b/network/src/network_service.rs
@@ -2,10 +2,8 @@ use crate::ckb_protocol::CKBProtocol;
 use crate::ckb_protocol_handler::CKBProtocolHandler;
 use crate::ckb_protocol_handler::{CKBProtocolContext, DefaultCKBProtocolContext};
 use crate::network::Network;
-use crate::peer_store::PeerStore;
 use crate::NetworkConfig;
 use crate::{Error, ErrorKind, ProtocolId};
-use ckb_util::RwLock;
 use futures::future::Future;
 use futures::sync::oneshot;
 use log::{debug, info};
@@ -32,12 +30,6 @@ impl NetworkService {
         self.network.external_url()
     }
 
-    #[allow(dead_code)]
-    #[inline]
-    pub(crate) fn peer_store(&self) -> &RwLock<dyn PeerStore> {
-        &self.network.peer_store()
-    }
-
     pub fn with_protocol_context<F, T>(&self, protocol_id: ProtocolId, f: F) -> Option<T>
     where
         F: FnOnce(&CKBProtocolContext) -> T,
diff --git a/network/src/outbound_peer_service.rs b/network/src/outbound_peer_service.rs
index 8c5b7f0e15..9cdffc7ca5 100644
--- a/network/src/outbound_peer_service.rs
+++ b/network/src/outbound_peer_service.rs
@@ -87,18 +87,17 @@ impl<T: Send + 'static> ProtocolService<T> for OutboundPeerService {
                     - connection_status.unreserved_outbound)
                     as usize;
                 if new_outbound > 0 {
-                    let peer_store = network.peer_store().read();
-                    for (peer_id, addr) in peer_store
-                        .peers_to_attempt()
-                        .take(new_outbound)
-                        .filter_map(|(peer_id, addr)| {
-                            if network.local_peer_id() != peer_id {
-                                Some((peer_id.clone(), addr.clone()))
-                            } else {
-                                None
-                            }
-                        })
-                    {
+                    let attempt_peers = network
+                        .peer_store()
+                        .read()
+                        .peers_to_attempt(new_outbound as u32);
+                    for (peer_id, addr) in attempt_peers.iter().filter_map(|(peer_id, addr)| {
+                        if network.local_peer_id() != peer_id {
+                            Some((peer_id.clone(), addr.clone()))
+                        } else {
+                            None
+                        }
+                    }) {
                         network.dial_to_peer(
                             transport.clone(),
                             &addr,
diff --git a/network/src/peer_store.rs b/network/src/peer_store.rs
index 17c997c46f..3d30797745 100644
--- a/network/src/peer_store.rs
+++ b/network/src/peer_store.rs
@@ -1,6 +1,13 @@
+mod db;
+pub mod sqlite;
+pub use crate::peer_store::sqlite_peer_store::SqlitePeerStore;
+#[cfg(db_trace)]
+pub mod db_trace;
+pub(crate) mod sqlite_peer_store;
+
 use crate::PeerId;
 use fnv::FnvHashMap;
-use libp2p::core::Multiaddr;
+use libp2p::core::{Endpoint, Multiaddr};
 use std::time::Duration;
 
 #[allow(dead_code)]
@@ -14,9 +21,20 @@ pub enum Behaviour {
 }
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
 pub enum Status {
-    Connected,
-    Disconnected,
-    Unknown,
+    Connected = 0,
+    Disconnected = 1,
+    Unknown = 2,
+}
+
+impl From<u8> for Status {
+    fn from(i: u8) -> Self {
+        match i {
+            0 => Status::Connected,
+            1 => Status::Disconnected,
+            2 => Status::Unknown,
+            _ => Status::Unknown,
+        }
+    }
 }
 
 #[derive(Debug, Copy, Clone, Eq, PartialEq)]
@@ -25,11 +43,15 @@ pub enum ReportResult {
     Banned,
 }
 
+#[allow(dead_code)]
 impl ReportResult {
-    #[allow(dead_code)]
     pub fn is_banned(self) -> bool {
         self == ReportResult::Banned
     }
+
+    pub fn is_ok(self) -> bool {
+        self == ReportResult::Ok
+    }
 }
 
 pub type Score = i32;
@@ -86,7 +108,7 @@ impl Default for ScoringSchema {
 
 pub trait PeerStore: Send + Sync {
     // initial or update peer_info in peer_store
-    fn new_connected_peer(&mut self, peer_id: &PeerId, address: Multiaddr);
+    fn new_connected_peer(&mut self, peer_id: &PeerId, address: Multiaddr, endpoint: Endpoint);
     // add peer discovered addresses, return numbers of new inserted line, return Err if peer not exists
     fn add_discovered_address(&mut self, peer_id: &PeerId, address: Multiaddr) -> Result<(), ()>;
     fn add_discovered_addresses(
@@ -100,14 +122,10 @@ pub trait PeerStore: Send + Sync {
     fn peer_score(&self, peer_id: &PeerId) -> Option<Score>;
     fn add_bootnode(&mut self, peer_id: PeerId, addr: Multiaddr);
     // should return high scored nodes if possible, otherwise, return boostrap nodes
-    fn bootnodes<'a>(&'a self) -> Box<dyn Iterator<Item = (&'a PeerId, &'a Multiaddr)> + 'a>;
-    fn peer_addrs<'a>(
-        &'a self,
-        peer_id: &'a PeerId,
-    ) -> Option<Box<dyn Iterator<Item = &'a Multiaddr> + 'a>>;
-    fn peers_to_attempt<'a>(&'a self)
-        -> Box<dyn Iterator<Item = (&'a PeerId, &'a Multiaddr)> + 'a>;
-    fn ban_peer(&mut self, peer_id: PeerId, timeout: Duration);
+    fn bootnodes(&self, count: u32) -> Vec<(PeerId, Multiaddr)>;
+    fn peer_addrs(&self, peer_id: &PeerId, count: u32) -> Option<Vec<Multiaddr>>;
+    fn peers_to_attempt(&self, count: u32) -> Vec<(PeerId, Multiaddr)>;
+    fn ban_peer(&mut self, peer_id: &PeerId, timeout: Duration);
     fn is_banned(&self, peer_id: &PeerId) -> bool;
     fn scoring_schema(&self) -> &ScoringSchema;
     fn peer_score_or_default(&self, peer_id: &PeerId) -> Score {
diff --git a/network/src/peer_store/db.rs b/network/src/peer_store/db.rs
new file mode 100644
index 0000000000..37653ef2e1
--- /dev/null
+++ b/network/src/peer_store/db.rs
@@ -0,0 +1,274 @@
+use super::{Multiaddr, PeerId, Score, Status};
+use crate::network_group::{Group, NetworkGroup};
+use crate::peer_store::sqlite::Error as SqliteError;
+use libp2p::core::Endpoint;
+use rusqlite::types::ToSql;
+use rusqlite::OptionalExtension;
+use rusqlite::{Connection, NO_PARAMS};
+use std::iter::FromIterator;
+use std::time::Duration;
+
+type DBResult<T> = Result<T, SqliteError>;
+
+pub fn create_tables(conn: &Connection) -> DBResult<()> {
+    let sql = r#"
+    CREATE TABLE IF NOT EXISTS peer_info (
+    id INTEGER PRIMARY KEY NOT NULL,
+    peer_id BINARY UNIQUE NOT NULL,
+    connected_addr BINARY NOT NULL,
+    network_group BINARY NOT NULL,
+    score INTEGER NOT NULL,
+    status INTEGER NOT NULL,
+    endpoint INTEGER NOT NULL,
+    ban_time INTEGER NOT NULL,
+    connected_time INTEGER NOT NULL
+    );
+    "#;
+    conn.execute_batch(sql)?;
+    let sql = r#"
+    CREATE TABLE IF NOT EXISTS peer_addr (
+    id INTEGER PRIMARY KEY NOT NULL,
+    peer_info_id INTEGER NOT NULL,
+    addr BINARY NOT NULL
+    );
+    CREATE UNIQUE INDEX IF NOT EXISTS idx_peer_info_id_addr_on_peer_addr ON peer_addr (peer_info_id, addr);
+    "#;
+    conn.execute_batch(sql)?;
+    let sql = r#"
+    CREATE TABLE IF NOT EXISTS ban_list (
+    id INTEGER PRIMARY KEY NOT NULL,
+    ip BINARY UNIQUE NOT NULL,
+    ban_time INTEGER NOT NULL
+    );
+    "#;
+    conn.execute_batch(sql).map_err(Into::into)
+}
+
+#[derive(Debug)]
+pub struct PeerInfo {
+    pub id: u32,
+    pub peer_id: PeerId,
+    pub connected_addr: Multiaddr,
+    pub score: Score,
+    pub status: Status,
+    pub endpoint: Endpoint,
+    pub ban_time: Duration,
+    pub connected_time: Duration,
+}
+
+impl PeerInfo {
+    pub fn insert(
+        conn: &Connection,
+        peer_id: &PeerId,
+        connected_addr: &Multiaddr,
+        endpoint: Endpoint,
+        score: Score,
+        connected_time: Duration,
+    ) -> DBResult<usize> {
+        let network_group = connected_addr.network_group();
+        let mut stmt = conn.prepare("INSERT INTO peer_info (peer_id, connected_addr, score, status, endpoint, connected_time, network_group, ban_time) 
+                                    VALUES(:peer_id, :connected_addr, :score, :status, :endpoint, :connected_time, :network_group, 0)").expect("prepare");
+        stmt.execute_named(&[
+            (":peer_id", &peer_id.as_bytes()),
+            (":connected_addr", &connected_addr.to_bytes()),
+            (":score", &score),
+            (":status", &status_to_u8(Status::Unknown)),
+            (":endpoint", &endpoint_to_bool(endpoint)),
+            (":connected_time", &duration_to_secs(connected_time)),
+            (":network_group", &network_group_to_bytes(&network_group)),
+        ])
+        .map_err(Into::into)
+    }
+    pub fn update(
+        conn: &Connection,
+        id: u32,
+        connected_addr: &Multiaddr,
+        endpoint: Endpoint,
+        connected_time: Duration,
+    ) -> DBResult<usize> {
+        let mut stmt = conn
+            .prepare(
+                "UPDATE peer_info SET connected_addr=:connected_addr, endpoint=:endpoint, connected_time=:connected_time WHERE id=:id",
+                )
+            .expect("prepare");
+        stmt.execute_named(&[
+            (":connected_addr", &connected_addr.to_bytes()),
+            (":endpoint", &endpoint_to_bool(endpoint)),
+            (":connected_time", &duration_to_secs(connected_time)),
+            (":id", &id),
+        ])
+        .map_err(Into::into)
+    }
+
+    pub fn delete(conn: &Connection, id: u32) -> DBResult<usize> {
+        conn.execute("DELETE FROM peer_info WHERE id=?1", &[id])
+            .map_err(Into::into)
+    }
+
+    pub fn get_by_peer_id(conn: &Connection, peer_id: &PeerId) -> DBResult<Option<PeerInfo>> {
+        conn.query_row("SELECT id, peer_id, connected_addr, score, status, endpoint, ban_time, connected_time FROM peer_info WHERE peer_id=?1 LIMIT 1", &[&peer_id.as_bytes()], |row| PeerInfo {
+            id: row.get(0),
+            peer_id: PeerId::from_bytes(row.get(1)).expect("parse peer_id"),
+            connected_addr: Multiaddr::from_bytes(row.get(2)).expect("parse multiaddr"),
+            score: row.get(3),
+            status: u8_to_status(row.get::<_, u8>(4)),
+            endpoint: bool_to_endpoint(row.get::<_, bool>(5)),
+            ban_time: secs_to_duration(row.get(6)),
+            connected_time: secs_to_duration(row.get(7)),
+        }).optional().map_err(Into::into)
+    }
+
+    pub fn update_score(conn: &Connection, id: u32, score: Score) -> DBResult<usize> {
+        let mut stmt = conn.prepare("UPDATE peer_info SET score=:score WHERE id=:id")?;
+        stmt.execute_named(&[(":score", &score), (":id", &id)])
+            .map_err(Into::into)
+    }
+
+    pub fn update_status(conn: &Connection, id: u32, status: Status) -> DBResult<usize> {
+        let mut stmt = conn.prepare("UPDATE peer_info SET status=:status WHERE id=:id")?;
+        stmt.execute_named(&[(":status", &status_to_u8(status)), (":id", &id)])
+            .map_err(Into::into)
+    }
+
+    pub fn largest_network_group(conn: &Connection) -> DBResult<Vec<PeerInfo>> {
+        let (network_group, _group_peers_count) = conn
+            .query_row::<(Vec<u8>, u32), _, _>("SELECT network_group, COUNT(network_group) AS network_group_count FROM peer_info
+                                               GROUP BY network_group ORDER BY network_group_count DESC LIMIT 1",
+                                               NO_PARAMS, |r| (r.get(0), r.get(1)))?;
+        let mut stmt = conn.prepare("SELECT id, peer_id, connected_addr, score, status, endpoint, ban_time, connected_time FROM peer_info
+                                    WHERE network_group=:network_group")?;
+        let rows = stmt.query_map_named(&[(":network_group", &network_group)], |row| PeerInfo {
+            id: row.get(0),
+            peer_id: PeerId::from_bytes(row.get(1)).expect("parse peer_id"),
+            connected_addr: Multiaddr::from_bytes(row.get(2)).expect("parse multiaddr"),
+            score: row.get(3),
+            status: u8_to_status(row.get::<_, u8>(4)),
+            endpoint: bool_to_endpoint(row.get::<_, bool>(5)),
+            ban_time: secs_to_duration(row.get(6)),
+            connected_time: secs_to_duration(row.get(7)),
+        })?;
+        Result::from_iter(rows).map_err(Into::into)
+    }
+
+    pub fn count(conn: &Connection) -> DBResult<u32> {
+        conn.query_row::<u32, _, _>("SELECT COUNT(*) FROM peer_info", NO_PARAMS, |r| r.get(0))
+            .map_err(Into::into)
+    }
+}
+
+pub struct PeerAddr;
+
+impl PeerAddr {
+    pub fn insert(conn: &Connection, peer_info_id: u32, addr: &Multiaddr) -> DBResult<usize> {
+        let mut stmt = conn.prepare(
+            "INSERT OR IGNORE INTO peer_addr (peer_info_id, addr)
+                     VALUES(:peer_info_id, :addr)",
+        )?;
+        stmt.execute_named(&[
+            (":peer_info_id", &peer_info_id),
+            (":addr", &addr.to_bytes()),
+        ])
+        .map_err(Into::into)
+    }
+
+    pub fn get_addrs(conn: &Connection, id: u32, count: u32) -> DBResult<Vec<Multiaddr>> {
+        let mut stmt =
+            conn.prepare("SELECT addr FROM peer_addr WHERE peer_info_id == :id LIMIT :count")?;
+        let rows = stmt.query_map_named(&[(":id", &id), (":count", &count)], |row| {
+            Multiaddr::from_bytes(row.get(0)).expect("parse multiaddr")
+        })?;
+        Result::from_iter(rows).map_err(Into::into)
+    }
+
+    pub fn delete_by_peer_id(conn: &Connection, id: u32) -> DBResult<usize> {
+        conn.execute("DELETE FROM peer_addr WHERE peer_info_id=?1", &[id])
+            .map_err(Into::into)
+    }
+}
+
+pub fn get_peers_to_attempt(conn: &Connection, count: u32) -> DBResult<Vec<(PeerId, Multiaddr)>> {
+    // random select peers
+    let mut stmt = conn.prepare("SELECT id, peer_id FROM peer_info WHERE status != :connected_status AND ban_time < strftime('%s','now') ORDER BY RANDOM() LIMIT :count")?;
+    let rows = stmt.query_map_named(
+        &[
+            (
+                ":connected_status",
+                &status_to_u8(Status::Connected) as &ToSql,
+            ),
+            (":count", &count),
+        ],
+        |row| {
+            (
+                row.get::<_, u32>(0),
+                PeerId::from_bytes(row.get(1)).expect("parse peer_id"),
+            )
+        },
+    )?;
+
+    let mut peers = Vec::with_capacity(count as usize);
+    for row in rows {
+        let (id, peer_id) = row?;
+        let mut addrs = PeerAddr::get_addrs(conn, id, 1)?;
+        if let Some(addr) = addrs.pop() {
+            peers.push((peer_id, addr));
+        }
+    }
+    Ok(peers)
+}
+
+pub fn insert_ban_record(conn: &Connection, ip: &[u8], ban_time: Duration) -> DBResult<usize> {
+    let mut stmt =
+        conn.prepare("INSERT OR REPLACE INTO ban_list (ip, ban_time) VALUES(:ip, :ban_time);")?;
+    stmt.execute_named(&[(":ip", &ip), (":ban_time", &duration_to_secs(ban_time))])
+        .map_err(Into::into)
+}
+
+pub fn get_ban_records(conn: &Connection, now: Duration) -> DBResult<Vec<(Vec<u8>, Duration)>> {
+    let mut stmt = conn.prepare("SELECT ip, ban_time FROM ban_list WHERE ban_time > :now")?;
+    let rows = stmt.query_map_named(&[(":now", &duration_to_secs(now))], |row| {
+        (row.get::<_, Vec<u8>>(0), secs_to_duration(row.get(1)))
+    })?;
+    Result::from_iter(rows).map_err(Into::into)
+}
+
+pub fn clear_expires_banned_ip(conn: &Connection, now: Duration) -> DBResult<Vec<Vec<u8>>> {
+    let mut stmt = conn.prepare("SELECT ip FROM ban_list WHERE ban_time < :now")?;
+    let rows = stmt.query_map_named(&[(":now", &duration_to_secs(now))], |row| {
+        row.get::<_, Vec<u8>>(0)
+    })?;
+    let mut stmt = conn.prepare("DELETE FROM ban_list WHERE ban_time < :now")?;
+    stmt.execute_named(&[(":now", &duration_to_secs(now))])?;
+    Result::from_iter(rows).map_err(Into::into)
+}
+
+fn status_to_u8(status: Status) -> u8 {
+    status as u8
+}
+
+fn u8_to_status(i: u8) -> Status {
+    Status::from(i)
+}
+
+fn secs_to_duration(secs: u32) -> Duration {
+    Duration::from_secs(secs.into())
+}
+
+fn duration_to_secs(duration: Duration) -> u32 {
+    duration.as_secs() as u32
+}
+
+fn endpoint_to_bool(endpoint: Endpoint) -> bool {
+    endpoint == Endpoint::Listener
+}
+
+fn bool_to_endpoint(is_inbound: bool) -> Endpoint {
+    if is_inbound {
+        Endpoint::Listener
+    } else {
+        Endpoint::Dialer
+    }
+}
+
+fn network_group_to_bytes(network_group: &Group) -> Vec<u8> {
+    format!("{:?}", network_group).into_bytes()
+}
diff --git a/network/src/peer_store/db_trace.rs b/network/src/peer_store/db_trace.rs
new file mode 100644
index 0000000000..00e1fd6c15
--- /dev/null
+++ b/network/src/peer_store/db_trace.rs
@@ -0,0 +1,26 @@
+#![allow(dead_code)]
+use ckb_util::Mutex;
+use fnv::FnvHashMap;
+use lazy_static::lazy_static;
+use rusqlite::Connection;
+use std::time::Duration;
+
+lazy_static! {
+    pub static ref PROFILE_INFORMATION: Mutex<FnvHashMap<String, (Duration, u32)>> =
+        Mutex::new(Default::default());
+}
+
+pub fn start_profile(conn: &mut Connection) {
+    conn.profile(Some(profiler));
+}
+
+pub fn stop_profile(conn: &mut Connection) {
+    conn.profile(None);
+}
+
+fn profiler(s: &str, d: Duration) {
+    let mut profiled = PROFILE_INFORMATION.lock();
+    let (ref mut total_duration, ref mut count) = profiled.entry(s.to_owned()).or_default();
+    *total_duration += d;
+    *count += 1;
+}
diff --git a/network/src/peer_store/sqlite.rs b/network/src/peer_store/sqlite.rs
new file mode 100644
index 0000000000..e0262cb3d6
--- /dev/null
+++ b/network/src/peer_store/sqlite.rs
@@ -0,0 +1,87 @@
+#![allow(dead_code)]
+use lazy_static::lazy_static;
+use r2d2::{Error as PoolError, Pool};
+use r2d2_sqlite::SqliteConnectionManager;
+use rusqlite::OpenFlags;
+pub use rusqlite::{Connection, Error as SqliteError};
+
+pub type ConnectionPool = Pool<SqliteConnectionManager>;
+pub type PooledConnection = r2d2::PooledConnection<SqliteConnectionManager>;
+
+lazy_static! {
+    static ref MEMORY_OPEN_FLAGS: OpenFlags = OpenFlags::SQLITE_OPEN_READ_WRITE
+        | OpenFlags::SQLITE_OPEN_CREATE
+        | OpenFlags::SQLITE_OPEN_SHARED_CACHE
+        | OpenFlags::SQLITE_OPEN_NO_MUTEX;
+    static ref FILE_OPEN_FLAGS: OpenFlags = OpenFlags::SQLITE_OPEN_READ_WRITE
+        | OpenFlags::SQLITE_OPEN_CREATE
+        | OpenFlags::SQLITE_OPEN_NO_MUTEX;
+}
+
+pub enum StorePath {
+    Memory,
+    File(String),
+}
+
+pub fn open_pool(store_path: StorePath, max_size: u32) -> ConnectionPool {
+    let manager = match store_path {
+        StorePath::Memory => {
+            let manager = SqliteConnectionManager::memory();
+            manager.with_flags(*MEMORY_OPEN_FLAGS)
+        }
+        StorePath::File(file_path) => {
+            let manager = SqliteConnectionManager::file(file_path);
+            manager.with_flags(*FILE_OPEN_FLAGS)
+        }
+    };
+    Pool::builder()
+        .max_size(max_size)
+        .build(manager)
+        .expect("build connection pool")
+}
+
+pub fn open(store_path: StorePath) -> Result<Connection, Error> {
+    match store_path {
+        StorePath::Memory => {
+            Connection::open_in_memory_with_flags(*MEMORY_OPEN_FLAGS).map_err(|err| err.into())
+        }
+        StorePath::File(file_path) => {
+            Connection::open_with_flags(file_path, *FILE_OPEN_FLAGS).map_err(|err| err.into())
+        }
+    }
+}
+
+#[derive(Debug)]
+pub enum Error {
+    Pool(PoolError),
+    Sqlite(SqliteError),
+}
+
+impl From<PoolError> for Error {
+    fn from(err: PoolError) -> Self {
+        Error::Pool(err)
+    }
+}
+
+impl From<SqliteError> for Error {
+    fn from(err: SqliteError) -> Self {
+        Error::Sqlite(err)
+    }
+}
+
+pub trait ConnectionPoolExt {
+    fn fetch<I, F: FnMut(&mut PooledConnection) -> Result<I, Error>>(
+        &self,
+        f: F,
+    ) -> Result<I, Error>;
+}
+
+impl ConnectionPoolExt for ConnectionPool {
+    fn fetch<I, F: FnMut(&mut PooledConnection) -> Result<I, Error>>(
+        &self,
+        mut f: F,
+    ) -> Result<I, Error> {
+        let mut connection = self.get()?;
+        f(&mut connection)
+    }
+}
diff --git a/network/src/peer_store/sqlite_peer_store.rs b/network/src/peer_store/sqlite_peer_store.rs
new file mode 100644
index 0000000000..cf0dd91e82
--- /dev/null
+++ b/network/src/peer_store/sqlite_peer_store.rs
@@ -0,0 +1,353 @@
+use super::{Behaviour, Multiaddr, PeerId, PeerStore, ReportResult, Score, ScoringSchema, Status};
+use crate::network_group::MultiaddrExt;
+use crate::peer_store::db;
+use crate::peer_store::sqlite::{self, ConnectionPool, ConnectionPoolExt};
+use faketime::unix_time;
+use fnv::FnvHashMap;
+use libp2p::core::Endpoint;
+use log::debug;
+use std::net::IpAddr;
+use std::time::Duration;
+
+pub(crate) const PEER_STORE_LIMIT: u32 = 8192;
+pub(crate) const PEER_NOT_SEEN_TIMEOUT_SECS: u32 = 14 * 24 * 3600;
+const BAN_LIST_CLEAR_EXPIRES_SIZE: usize = 255;
+const DEFAULT_POOL_SIZE: u32 = 16;
+
+// Scoring and ban:
+// Because peer_id is easy to forge, we should consider to identify a peer by it's connected_addr
+// instead of peer_id
+// Howerver connected_addr maybe same for multiple inbound peers, these peers may in the same sub network or our node may behind a reverse proxy, so we can't just reject them.
+// A solution is to identify and score a peer by it's peer_id, but ban a peer through it connected_addr, it's
+// mean when a peer got banned, we're no longer accept new peers from the same connected_addr.
+
+pub struct SqlitePeerStore {
+    bootnodes: Vec<(PeerId, Multiaddr)>,
+    schema: ScoringSchema,
+    ban_list: FnvHashMap<Vec<u8>, Duration>,
+    pool: ConnectionPool,
+}
+
+impl Default for SqlitePeerStore {
+    fn default() -> Self {
+        let pool = sqlite::open_pool(sqlite::StorePath::Memory, DEFAULT_POOL_SIZE);
+        SqlitePeerStore::new(pool)
+    }
+}
+
+impl SqlitePeerStore {
+    pub fn new(connection_pool: ConnectionPool) -> Self {
+        let mut peer_store = SqlitePeerStore {
+            bootnodes: Vec::new(),
+            schema: Default::default(),
+            ban_list: Default::default(),
+            pool: connection_pool,
+        };
+        peer_store.prepare().expect("prepare tables");
+        peer_store
+    }
+
+    fn prepare(&mut self) -> Result<(), sqlite::Error> {
+        self.create_tables()?;
+        self.load_banlist()
+    }
+
+    fn create_tables(&mut self) -> Result<(), sqlite::Error> {
+        self.pool.fetch(|conn| db::create_tables(conn))
+    }
+
+    fn load_banlist(&mut self) -> Result<(), sqlite::Error> {
+        self.clear_expires_banned_ip()?;
+        let now = unix_time();
+        let ban_records = self.pool.fetch(|conn| db::get_ban_records(conn, now))?;
+        for (ip, ban_time) in ban_records {
+            self.ban_list.insert(ip, ban_time);
+        }
+        Ok(())
+    }
+
+    fn ban_ip(&mut self, addr: &Multiaddr, timeout: Duration) {
+        let ip = match addr.extract_ip_addr() {
+            Some(IpAddr::V4(ipv4)) => ipv4.octets().to_vec(),
+            Some(IpAddr::V6(ipv6)) => ipv6.octets().to_vec(),
+            None => return,
+        };
+        let ban_time = unix_time() + timeout;
+        {
+            self.pool
+                .fetch(|conn| db::insert_ban_record(&conn, &ip, ban_time))
+                .expect("ban ip");
+        }
+        self.ban_list.insert(ip, ban_time);
+        if self.ban_list.len() > BAN_LIST_CLEAR_EXPIRES_SIZE {
+            self.clear_expires_banned_ip().expect("clear ban list");
+        }
+    }
+
+    fn is_addr_banned(&self, addr: &Multiaddr) -> bool {
+        let ip = match addr.extract_ip_addr() {
+            Some(IpAddr::V4(ipv4)) => ipv4.octets().to_vec(),
+            Some(IpAddr::V6(ipv6)) => ipv6.octets().to_vec(),
+            None => return false,
+        };
+        let now = unix_time();
+        match self.ban_list.get(&ip) {
+            Some(ban_time) => *ban_time > now,
+            None => false,
+        }
+    }
+
+    fn clear_expires_banned_ip(&mut self) -> Result<(), sqlite::Error> {
+        let now = unix_time();
+        let ips = self
+            .pool
+            .fetch(|conn| db::clear_expires_banned_ip(conn, now))?;
+        for ip in ips {
+            self.ban_list.remove(&ip);
+        }
+        Ok(())
+    }
+
+    // check and try to delete peer_info if peer_infos reach limit
+    fn check_store_limit(&mut self) -> Result<(), ()> {
+        let peer_info_count = self
+            .pool
+            .fetch(|conn| db::PeerInfo::count(conn))
+            .expect("peer info count");
+        if peer_info_count < PEER_STORE_LIMIT {
+            return Ok(());
+        }
+        let candidate_peers = {
+            let peers = self
+                .pool
+                .fetch(|conn| db::PeerInfo::largest_network_group(conn))
+                .expect("query largest network group");
+            let not_seen_timeout =
+                unix_time() - Duration::from_secs(PEER_NOT_SEEN_TIMEOUT_SECS.into());
+            peers
+                .into_iter()
+                .filter(move |peer| peer.connected_time < not_seen_timeout)
+        };
+        let candidate_peer = match candidate_peers.min_by_key(|peer| peer.score) {
+            Some(peer) => peer,
+            None => return Err(()),
+        };
+
+        if candidate_peer.score >= self.schema.peer_init_score() {
+            return Err(());
+        }
+        self.pool
+            .fetch(|conn| {
+                let tx = conn.transaction().expect("db tx");
+                db::PeerInfo::delete(&tx, candidate_peer.id)?;
+                db::PeerAddr::delete_by_peer_id(&tx, candidate_peer.id)?;
+                tx.commit().map_err(Into::into)
+            })
+            .expect("delete peer");
+        Ok(())
+    }
+
+    fn get_and_upsert_peer_info_with(
+        &mut self,
+        peer_id: &PeerId,
+        addr: &Multiaddr,
+        endpoint: Endpoint,
+        connected_time: Duration,
+    ) -> db::PeerInfo {
+        self.pool
+            .fetch(|conn| {
+                db::PeerInfo::get_by_peer_id(conn, peer_id).and_then(|peer| match peer {
+                    Some(mut peer) => {
+                        db::PeerInfo::update(conn, peer.id, &addr, endpoint, connected_time)
+                            .expect("update peer info");
+                        peer.connected_addr = addr.to_owned();
+                        peer.endpoint = endpoint;
+                        peer.connected_time = connected_time;
+                        Ok(Some(peer))
+                    }
+                    None => {
+                        db::PeerInfo::insert(
+                            conn,
+                            peer_id,
+                            &addr,
+                            endpoint,
+                            self.scoring_schema().peer_init_score(),
+                            connected_time,
+                        )?;
+                        db::PeerInfo::get_by_peer_id(conn, &peer_id)
+                    }
+                })
+            })
+            .expect("upsert peer info")
+            .expect("get peer info")
+    }
+
+    fn get_or_insert_peer_info(&mut self, peer_id: &PeerId) -> db::PeerInfo {
+        let now = unix_time();
+        let addr = &Multiaddr::from_bytes(Vec::new()).expect("null multiaddr");
+        self.pool
+            .fetch(|conn| {
+                db::PeerInfo::get_by_peer_id(conn, peer_id).and_then(|peer| match peer {
+                    Some(peer) => Ok(Some(peer)),
+                    None => {
+                        db::PeerInfo::insert(
+                            conn,
+                            peer_id,
+                            &addr,
+                            Endpoint::Listener,
+                            self.scoring_schema().peer_init_score(),
+                            now,
+                        )?;
+                        db::PeerInfo::get_by_peer_id(conn, &peer_id)
+                    }
+                })
+            })
+            .expect("get or insert peer info")
+            .expect("get peer info")
+    }
+
+    fn get_peer_info(&self, peer_id: &PeerId) -> Option<db::PeerInfo> {
+        self.pool
+            .fetch(|conn| db::PeerInfo::get_by_peer_id(conn, peer_id))
+            .expect("get peer info")
+    }
+}
+
+impl PeerStore for SqlitePeerStore {
+    fn new_connected_peer(&mut self, peer_id: &PeerId, addr: Multiaddr, endpoint: Endpoint) {
+        if self.check_store_limit().is_err() {
+            return;
+        }
+        let now = unix_time();
+        // upsert peer_info
+        self.get_and_upsert_peer_info_with(peer_id, &addr, endpoint, now);
+    }
+
+    fn add_discovered_address(&mut self, peer_id: &PeerId, addr: Multiaddr) -> Result<(), ()> {
+        self.check_store_limit()?;
+        let id = self.get_or_insert_peer_info(peer_id).id;
+        let inserted = self
+            .pool
+            .fetch(|conn| db::PeerAddr::insert(&conn, id, &addr))
+            .expect("insert addr");
+        if inserted > 0 {
+            Ok(())
+        } else {
+            Err(())
+        }
+    }
+
+    fn add_discovered_addresses(
+        &mut self,
+        peer_id: &PeerId,
+        addrs: Vec<Multiaddr>,
+    ) -> Result<usize, ()> {
+        self.check_store_limit()?;
+        let id = self.get_or_insert_peer_info(peer_id).id;
+        let count = self
+            .pool
+            .fetch(|conn| {
+                let mut count = 0;
+                for addr in &addrs {
+                    count += db::PeerAddr::insert(&conn, id, &addr)?;
+                }
+                Ok(count)
+            })
+            .expect("insert addrs");
+        Ok(count)
+    }
+
+    fn report(&mut self, peer_id: &PeerId, behaviour: Behaviour) -> ReportResult {
+        if self.is_banned(peer_id) {
+            return ReportResult::Banned;
+        }
+        let behaviour_score = match self.schema.get_score(behaviour) {
+            Some(score) => score,
+            None => {
+                debug!(target: "network", "behaviour {:?} is undefined", behaviour);
+                return ReportResult::Ok;
+            }
+        };
+        let peer = self.get_or_insert_peer_info(peer_id);
+        let now = unix_time();
+        let score = peer.score.saturating_add(behaviour_score);
+        if score < self.schema.ban_score() {
+            let ban_time = self.schema.default_ban_timeout() + now;
+            self.ban_peer(peer_id, ban_time);
+            return ReportResult::Banned;
+        }
+        self.pool
+            .fetch(|conn| db::PeerInfo::update_score(&conn, peer.id, score))
+            .expect("update peer score");
+        ReportResult::Ok
+    }
+
+    fn update_status(&mut self, peer_id: &PeerId, status: Status) {
+        if let Some(peer) = self.get_peer_info(peer_id) {
+            self.pool
+                .fetch(|conn| db::PeerInfo::update_status(&conn, peer.id, status))
+                .expect("update status");
+        }
+    }
+
+    fn peer_status(&self, peer_id: &PeerId) -> Status {
+        self.get_peer_info(peer_id)
+            .map(|peer| peer.status)
+            .unwrap_or_else(|| Status::Unknown)
+    }
+
+    fn peer_score(&self, peer_id: &PeerId) -> Option<Score> {
+        self.get_peer_info(peer_id).map(|peer| peer.score)
+    }
+
+    fn add_bootnode(&mut self, peer_id: PeerId, addr: Multiaddr) {
+        self.new_connected_peer(&peer_id, addr.clone(), Endpoint::Dialer);
+        self.bootnodes.push((peer_id, addr));
+    }
+    // should return high scored nodes if possible, otherwise, return boostrap nodes
+    fn bootnodes(&self, count: u32) -> Vec<(PeerId, Multiaddr)> {
+        let mut peers = self
+            .pool
+            .fetch(|conn| db::get_peers_to_attempt(&conn, count))
+            .expect("get peers to attempt");
+        if peers.len() < count as usize {
+            for (peer_id, addr) in &self.bootnodes {
+                let peer = (peer_id.to_owned(), addr.to_owned());
+                if !peers.contains(&peer) {
+                    peers.push(peer);
+                }
+            }
+        }
+        peers
+    }
+    fn peer_addrs<'a>(&'a self, peer_id: &'a PeerId, count: u32) -> Option<Vec<Multiaddr>> {
+        self.get_peer_info(peer_id).map(|peer| {
+            self.pool
+                .fetch(|conn| db::PeerAddr::get_addrs(&conn, peer.id, count))
+                .expect("get peer addrs")
+        })
+    }
+
+    fn peers_to_attempt(&self, count: u32) -> Vec<(PeerId, Multiaddr)> {
+        self.pool
+            .fetch(|conn| db::get_peers_to_attempt(&conn, count))
+            .expect("get peers to attempt")
+    }
+
+    fn ban_peer(&mut self, peer_id: &PeerId, timeout: Duration) {
+        if let Some(peer) = self.get_peer_info(peer_id) {
+            self.ban_ip(&peer.connected_addr, timeout);
+        }
+    }
+
+    fn is_banned(&self, peer_id: &PeerId) -> bool {
+        if let Some(peer) = self.get_peer_info(peer_id) {
+            return self.is_addr_banned(&peer.connected_addr);
+        }
+        false
+    }
+
+    fn scoring_schema(&self) -> &ScoringSchema {
+        &self.schema
+    }
+}
diff --git a/network/src/peers_registry.rs b/network/src/peers_registry.rs
index 08fa608d19..da9657bea3 100644
--- a/network/src/peers_registry.rs
+++ b/network/src/peers_registry.rs
@@ -378,7 +378,7 @@ impl PeersRegistry {
     ) -> PeerIndex {
         self.peer_store
             .write()
-            .new_connected_peer(&peer_id, connected_addr.clone());
+            .new_connected_peer(&peer_id, connected_addr.clone(), endpoint);
         let mut peer = PeerConnection::new(connected_addr, endpoint);
         peer.connected_time = Some(unix_time_as_millis());
         let peer_index = self.peers.or_insert(peer_id.clone(), peer);
diff --git a/network/src/ping_service.rs b/network/src/ping_service.rs
index 64bc1b8f20..a6a1906f4b 100644
--- a/network/src/ping_service.rs
+++ b/network/src/ping_service.rs
@@ -146,7 +146,6 @@ impl<T: Send> ProtocolService<T> for PingService {
                                 Future::then(Timeout::new(ping_future, ping_timeout), {
                                     let network = Arc::clone(&network);
                                     move |result| -> Result<(), IoError> {
-                                        let mut peer_store = network.peer_store().write();
                                         match result {
                                             Ok(peer_id) => {
                                                 let now = unix_time_as_millis();
@@ -155,7 +154,7 @@ impl<T: Send> ProtocolService<T> for PingService {
                                                     peer.ping = Some(ping);
                                                     peer.last_ping_time = Some(now);
                                                 });
-                                                peer_store.report(&peer_id, Behaviour::Ping);
+                                                network.report(&peer_id, Behaviour::Ping);
                                                 trace!(
                                                     target: "network",
                                                     "received pong from {:?} in {:?}",
@@ -165,8 +164,7 @@ impl<T: Send> ProtocolService<T> for PingService {
                                                 Ok(())
                                             }
                                             Err(err) => {
-                                                peer_store
-                                                    .report(&peer_id, Behaviour::FailedToPing);
+                                                network.report(&peer_id, Behaviour::FailedToPing);
                                                 network.drop_peer(&peer_id);
                                                 trace!(
                                                     target: "network",
diff --git a/network/src/protocol.rs b/network/src/protocol.rs
index d715f52cc1..a9c1214e45 100644
--- a/network/src/protocol.rs
+++ b/network/src/protocol.rs
@@ -1,19 +1,13 @@
 use crate::ckb_protocol::CKBProtocolOutput;
 use crate::CKBProtocolHandler;
-use futures::{Future, Stream};
+use futures::Future;
 use libp2p::core::{Multiaddr, PeerId};
 use libp2p::identify::{IdentifyInfo, IdentifySender};
-use libp2p::{kad, ping};
+use libp2p::ping;
 use std::io::Error as IoError;
 use std::sync::Arc;
 
 pub enum Protocol<T> {
-    Kad(
-        kad::KadConnecController,
-        Box<Stream<Item = kad::KadIncomingRequest, Error = IoError> + Send>,
-        PeerId,
-        Multiaddr,
-    ),
     Pong(Box<Future<Item = (), Error = IoError> + Send>, PeerId),
     Ping(
         ping::Pinger,
diff --git a/network/src/tests/mod.rs b/network/src/tests/mod.rs
index eee2314adb..416b9cb864 100644
--- a/network/src/tests/mod.rs
+++ b/network/src/tests/mod.rs
@@ -1,2 +1,3 @@
-#[cfg(test)]
 mod peers_registry;
+#[cfg(test)]
+mod sqlite_peer_store;
diff --git a/network/src/tests/peers_registry.rs b/network/src/tests/peers_registry.rs
index 5fad5d2626..6fefca04a8 100644
--- a/network/src/tests/peers_registry.rs
+++ b/network/src/tests/peers_registry.rs
@@ -1,6 +1,5 @@
 use crate::{
-    memory_peer_store::MemoryPeerStore,
-    peer_store::{Behaviour, PeerStore},
+    peer_store::{Behaviour, PeerStore, SqlitePeerStore},
     peers_registry::{PeersRegistry, EVICTION_PROTECT_PEERS},
     random_peer_id, ToMultiaddr,
 };
@@ -9,10 +8,13 @@ use faketime::unix_time_as_millis;
 use std::default::Default;
 use std::sync::Arc;
 
+fn new_peer_store() -> impl PeerStore {
+    SqlitePeerStore::default()
+}
+
 #[test]
 fn test_accept_inbound_peer_in_reserve_only_mode() {
-    let peer_store: Arc<RwLock<dyn PeerStore>> =
-        Arc::new(RwLock::new(MemoryPeerStore::new(Default::default())));
+    let peer_store: Arc<RwLock<dyn PeerStore>> = Arc::new(RwLock::new(new_peer_store()));
     let reserved_peer = random_peer_id().unwrap();
     let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
 
@@ -34,8 +36,7 @@ fn test_accept_inbound_peer_in_reserve_only_mode() {
 
 #[test]
 fn test_accept_inbound_peer_until_full() {
-    let peer_store: Arc<RwLock<dyn PeerStore>> =
-        Arc::new(RwLock::new(MemoryPeerStore::new(Default::default())));
+    let peer_store: Arc<RwLock<dyn PeerStore>> = Arc::new(RwLock::new(new_peer_store()));
     let reserved_peer = random_peer_id().unwrap();
     let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
     // accept node until inbound connections is full
@@ -74,8 +75,7 @@ fn test_accept_inbound_peer_eviction() {
     // 1. should evict from largest network groups
     // 2. should never evict reserved peer
     // 3. should evict lowest scored peer
-    let peer_store: Arc<RwLock<dyn PeerStore>> =
-        Arc::new(RwLock::new(MemoryPeerStore::new(Default::default())));
+    let peer_store: Arc<RwLock<dyn PeerStore>> = Arc::new(RwLock::new(new_peer_store()));
     let reserved_peer = random_peer_id().unwrap();
     let evict_target = random_peer_id().unwrap();
     let lowest_score_peer = random_peer_id().unwrap();
diff --git a/network/src/tests/sqlite_peer_store.rs b/network/src/tests/sqlite_peer_store.rs
new file mode 100644
index 0000000000..8c39cf45f3
--- /dev/null
+++ b/network/src/tests/sqlite_peer_store.rs
@@ -0,0 +1,152 @@
+use crate::{
+    peer_store::{
+        sqlite_peer_store::{PEER_NOT_SEEN_TIMEOUT_SECS, PEER_STORE_LIMIT},
+        Behaviour, PeerStore, SqlitePeerStore, Status,
+    },
+    random_peer_id, Endpoint, ToMultiaddr,
+};
+use std::time::Duration;
+
+#[test]
+fn test_new_connected_peer() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    let peer_id = random_peer_id().unwrap();
+    let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    peer_store.new_connected_peer(&peer_id, addr, Endpoint::Dialer);
+    assert_eq!(
+        peer_store.peer_score(&peer_id).unwrap(),
+        peer_store.scoring_schema().peer_init_score()
+    );
+    assert_eq!(peer_store.peer_addrs(&peer_id, 1).unwrap().len(), 0);
+}
+
+#[test]
+fn test_add_discovered_address() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    let peer_id = random_peer_id().unwrap();
+    peer_store
+        .add_discovered_address(&peer_id, "/ip4/127.0.0.1".to_multiaddr().unwrap())
+        .expect("add discovered address");
+    assert_eq!(peer_store.peer_addrs(&peer_id, 2).unwrap().len(), 1);
+    peer_store
+        .add_discovered_addresses(
+            &peer_id,
+            vec![
+                "/ip4/127.0.0.1".to_multiaddr().unwrap(),
+                "/ip4/192.168.2.2".to_multiaddr().unwrap(),
+                "/ip4/192.168.2.3".to_multiaddr().unwrap(),
+            ],
+        )
+        .expect("add discovered address");
+    assert_eq!(peer_store.peer_addrs(&peer_id, 4).unwrap().len(), 3);
+}
+
+#[test]
+fn test_report() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    let peer_id = random_peer_id().unwrap();
+    assert!(peer_store.report(&peer_id, Behaviour::Ping).is_ok());
+    assert!(
+        peer_store.peer_score_or_default(&peer_id) > peer_store.scoring_schema().peer_init_score()
+    );
+}
+
+#[test]
+fn test_update_status() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    let peer_id = random_peer_id().unwrap();
+    peer_store.update_status(&peer_id, Status::Connected);
+    assert_eq!(peer_store.peer_status(&peer_id), Status::Unknown);
+    let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    peer_store.new_connected_peer(&peer_id, addr, Endpoint::Listener);
+    peer_store.update_status(&peer_id, Status::Connected);
+    assert_eq!(peer_store.peer_status(&peer_id), Status::Connected);
+}
+
+#[test]
+fn test_ban_peer() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    let peer_id = random_peer_id().unwrap();
+    peer_store.ban_peer(&peer_id, Duration::from_secs(10));
+    assert!(!peer_store.is_banned(&peer_id));
+    let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    peer_store.new_connected_peer(&peer_id, addr, Endpoint::Listener);
+    peer_store.ban_peer(&peer_id, Duration::from_secs(10));
+    assert!(peer_store.is_banned(&peer_id));
+}
+
+#[test]
+fn test_bootnodes() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    assert!(peer_store.bootnodes(1).is_empty());
+    let peer_id = random_peer_id().unwrap();
+    let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    peer_store.add_bootnode(peer_id.clone(), addr.clone());
+    assert_eq!(peer_store.bootnodes(2).len(), 1);
+    let peer_id2 = random_peer_id().unwrap();
+    peer_store
+        .add_discovered_address(&peer_id2, addr.clone())
+        .expect("add discovered address");
+    assert_eq!(
+        peer_store.bootnodes(3),
+        vec![(peer_id2, addr.clone()), (peer_id, addr)]
+    );
+}
+
+#[test]
+fn test_peers_to_attempt() {
+    let mut peer_store: Box<dyn PeerStore> = Box::new(SqlitePeerStore::default());
+    assert!(peer_store.peers_to_attempt(1).is_empty());
+    let peer_id = random_peer_id().unwrap();
+    let addr = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    peer_store.add_bootnode(peer_id.clone(), addr.clone());
+    assert!(peer_store.peers_to_attempt(1).is_empty());
+    let peer_id2 = random_peer_id().unwrap();
+    peer_store
+        .add_discovered_address(&peer_id2, addr.clone())
+        .expect("add discovered address");
+    assert_eq!(peer_store.peers_to_attempt(2).len(), 1);
+    peer_store.update_status(&peer_id2, Status::Connected);
+    assert!(peer_store.peers_to_attempt(1).is_empty());
+}
+
+#[test]
+fn test_delete_peer_info() {
+    let mut peer_store = SqlitePeerStore::default();
+    let addr1 = "/ip4/127.0.0.1".to_multiaddr().unwrap();
+    let addr2 = "/ip4/192.163.1.1".to_multiaddr().unwrap();
+    for _ in 0..(PEER_STORE_LIMIT - 2) {
+        peer_store.new_connected_peer(
+            &random_peer_id().unwrap(),
+            addr1.clone(),
+            Endpoint::Listener,
+        );
+    }
+    let evict_target = random_peer_id().unwrap();
+    let fake_target = random_peer_id().unwrap();
+    {
+        // make sure these 2 peers become candidate in eviction
+        let recent_not_seen_time =
+            faketime::unix_time() - Duration::from_secs((PEER_NOT_SEEN_TIMEOUT_SECS + 1) as u64);
+        let faketime_file = faketime::millis_tempfile(recent_not_seen_time.as_secs() * 1000)
+            .expect("create faketime file");
+        faketime::enable(&faketime_file);
+        peer_store.new_connected_peer(&evict_target, addr1.clone(), Endpoint::Listener);
+        peer_store.new_connected_peer(&fake_target, addr2, Endpoint::Listener);
+    }
+    peer_store.report(&evict_target, Behaviour::FailedToPing);
+    peer_store.report(&fake_target, Behaviour::FailedToPing);
+    peer_store.report(&fake_target, Behaviour::FailedToPing);
+    // evict_target has lower score than init score
+    assert!(
+        peer_store.peer_score_or_default(&evict_target)
+            < peer_store.scoring_schema().peer_init_score()
+    );
+    // should evict evict_target and accept this
+    peer_store.new_connected_peer(&random_peer_id().unwrap(), addr1, Endpoint::Listener);
+    // evict_target is evicted in previous step
+    assert_eq!(
+        peer_store.peer_score_or_default(&evict_target),
+        peer_store.scoring_schema().peer_init_score()
+    );
+}
diff --git a/nodes_template/default.json b/nodes_template/default.json
index ec30d28433..06aad1df4e 100644
--- a/nodes_template/default.json
+++ b/nodes_template/default.json
@@ -3,7 +3,8 @@
         "rpc modules": [
             "List of API modules",
             ["Net", "Pool", "Miner", "Chain"]
-        ]
+        ],
+        "rpc max_request_body_size": "Default is 10MiB = 10 * 1024 * 1024"
     },
 
     "data_dir": "default",
@@ -27,7 +28,8 @@
     },
     "rpc": {
         "listen_address": "0.0.0.0:8114",
-        "modules": ["Net", "Pool", "Miner", "Chain"]
+        "modules": ["Net", "Pool", "Miner", "Chain"],
+        "max_request_body_size": 10485760
     },
     "sync": {
         "verification_level": "Full",
@@ -42,7 +44,7 @@
     },
     "miner": {
         "new_transactions_threshold": 8,
-        "type_hash": "0x321c1ca2887fb8eddaaa7e917399f71e63e03a1c83ff75ed12099a01115ea2ff",
+        "type_hash": "0x0da2fe99fe549e082d4ed483c2e968a89ea8d11aabf5d79e5cbf06522de6e674",
         "rpc_url": "http://127.0.0.1:8114/",
         "poll_interval": 5,
         "max_transactions": 10000,
diff --git a/nodes_template/spec/dev.json b/nodes_template/spec/dev.json
index 66253ac45b..76549dd2c5 100644
--- a/nodes_template/spec/dev.json
+++ b/nodes_template/spec/dev.json
@@ -32,10 +32,10 @@
         "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"
     },
     "params": {
-        "initial_block_reward": 50000
+        "initial_block_reward": 50000,
+        "max_block_cycles": 100000000
     },
     "system_cells": [
-        {"path": "cells/verify"},
         {"path": "cells/always_success"}
     ],
     "pow": {
diff --git a/notify/Cargo.toml b/notify/Cargo.toml
index 13eab3707f..5c2f9bd5b1 100644
--- a/notify/Cargo.toml
+++ b/notify/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-notify"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/pool/Cargo.toml b/pool/Cargo.toml
index 5f64010536..416f8fcf64 100644
--- a/pool/Cargo.toml
+++ b/pool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-pool"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/pool/src/tests/pool.rs b/pool/src/tests/pool.rs
index 7c980e634d..86fdf07aca 100644
--- a/pool/src/tests/pool.rs
+++ b/pool/src/tests/pool.rs
@@ -150,18 +150,18 @@ fn test_add_pool() {
     assert_eq!(pool.service.total_size(), 2);
     expect_output_parent!(
         pool.service,
-        CellStatus::Current(_),
+        CellStatus::Live(_),
         OutPoint::new(child_tx_hash.clone(), 0)
     );
     expect_output_parent!(
         pool.service,
-        CellStatus::Old,
+        CellStatus::Dead,
         OutPoint::new(parent_tx_hash.clone(), 0),
         OutPoint::new(parent_tx_hash.clone(), 1)
     );
     expect_output_parent!(
         pool.service,
-        CellStatus::Current(_),
+        CellStatus::Live(_),
         OutPoint::new(pool.tx_hash.clone(), 8)
     );
     expect_output_parent!(
diff --git a/pool/src/txs_pool/pool.rs b/pool/src/txs_pool/pool.rs
index 2c6b9f2417..cc203b4617 100644
--- a/pool/src/txs_pool/pool.rs
+++ b/pool/src/txs_pool/pool.rs
@@ -125,8 +125,8 @@ where
 {
     fn cell(&self, o: &OutPoint) -> CellStatus {
         match { self.pool.txo_status(o) } {
-            TxoStatus::Spent => CellStatus::Old,
-            TxoStatus::InPool => CellStatus::Current(self.pool.get_output(o).unwrap()),
+            TxoStatus::Spent => CellStatus::Dead,
+            TxoStatus::InPool => CellStatus::Live(self.pool.get_output(o).unwrap()),
             TxoStatus::Unknown => self.shared.cell(o),
         }
     }
@@ -415,7 +415,7 @@ where
         self.is_acceptable()?;
 
         if tx.is_cellbase() {
-            return Err(PoolError::CellBase);
+            return Err(PoolError::Cellbase);
         }
 
         self.check_duplicate(&tx)?;
@@ -433,7 +433,7 @@ where
                     CellStatus::Unknown => {
                         unknowns.push(inputs[i].clone());
                     }
-                    CellStatus::Old => {
+                    CellStatus::Dead => {
                         self.cache.insert(tx.proposal_short_id(), tx);
                         return Err(PoolError::DoubleSpent);
                     }
@@ -446,7 +446,7 @@ where
                     CellStatus::Unknown => {
                         unknowns.push(deps[i].clone());
                     }
-                    CellStatus::Old => {
+                    CellStatus::Dead => {
                         self.cache.insert(tx.proposal_short_id(), tx);
                         return Err(PoolError::DoubleSpent);
                     }
@@ -457,7 +457,7 @@ where
             if unknowns.is_empty() {
                 // TODO: Parallel
                 TransactionVerifier::new(&rtx)
-                    .verify()
+                    .verify(self.shared.consensus().max_block_cycles())
                     .map_err(PoolError::InvalidTx)?;
             }
         }
@@ -480,7 +480,8 @@ where
 
         for tx in txs {
             let rtx = self.resolve_transaction(&tx);
-            let rs = TransactionVerifier::new(&rtx).verify();
+            let rs =
+                TransactionVerifier::new(&rtx).verify(self.shared.consensus().max_block_cycles());
             if rs.is_ok() {
                 self.pool.add_transaction(tx);
             } else if rs == Err(TransactionError::DoubleSpent) {
diff --git a/pool/src/txs_pool/types.rs b/pool/src/txs_pool/types.rs
index d5a6639714..8490182673 100644
--- a/pool/src/txs_pool/types.rs
+++ b/pool/src/txs_pool/types.rs
@@ -76,8 +76,8 @@ pub enum PoolError {
     OverCapacity,
     /// A duplicate output
     DuplicateOutput,
-    /// Coinbase transaction
-    CellBase,
+    /// tx_pool don't accept cellbase-like tx
+    Cellbase,
     /// TimeOut
     TimeOut,
     /// Blocknumber is not right
diff --git a/pow/Cargo.toml b/pow/Cargo.toml
index 9303172846..8834a7d9eb 100644
--- a/pow/Cargo.toml
+++ b/pow/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-pow"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
 
diff --git a/pow/src/clicker.rs b/pow/src/clicker.rs
index 87ad3bfa2a..87721d0baf 100644
--- a/pow/src/clicker.rs
+++ b/pow/src/clicker.rs
@@ -6,7 +6,7 @@ use std::any::Any;
 /// Clicker meant to serve as a pow engine Stub
 ///
 /// - submit fake pow solution
-/// - verify consistent return ture
+/// - verify consistent return true
 #[derive(Clone, Debug)]
 pub struct Clicker {
     rx: crossbeam_channel::Receiver<u64>,
diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml
index 57661091ce..9bb8235f38 100644
--- a/protocol/Cargo.toml
+++ b/protocol/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-protocol"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
 
@@ -14,3 +14,5 @@ hash = { path = "../util/hash"}
 siphasher = "0.2.2"
 rand = "0.6"
 ckb-util = { path = "../util" }
+merkle-tree = { path = "../util/merkle-tree"}
+merkle-root = { path = "../util/merkle-root"}
diff --git a/protocol/src/builder.rs b/protocol/src/builder.rs
index 6d91b7f6ed..5d7fafffb5 100644
--- a/protocol/src/builder.rs
+++ b/protocol/src/builder.rs
@@ -2,13 +2,14 @@ use crate::protocol_generated::ckb::protocol::{
     Block as FbsBlock, BlockBuilder, BlockProposalBuilder, BlockTransactionsBuilder,
     Bytes as FbsBytes, BytesBuilder, CellInput as FbsCellInput, CellInputBuilder,
     CellOutput as FbsCellOutput, CellOutputBuilder, CompactBlock, CompactBlockBuilder,
-    GetBlockProposalBuilder, GetBlockTransactionsBuilder, GetBlocks as FbsGetBlocks,
-    GetBlocksBuilder, GetHeaders as FbsGetHeaders, GetHeadersBuilder, Header as FbsHeader,
-    HeaderBuilder, Headers as FbsHeaders, HeadersBuilder, OutPoint as FbsOutPoint, OutPointBuilder,
-    PrefilledTransactionBuilder, RelayMessage, RelayMessageBuilder, RelayPayload,
+    FilteredBlock, FilteredBlockBuilder, GetBlockProposalBuilder, GetBlockTransactionsBuilder,
+    GetBlocks as FbsGetBlocks, GetBlocksBuilder, GetHeaders as FbsGetHeaders, GetHeadersBuilder,
+    Header as FbsHeader, HeaderBuilder, Headers as FbsHeaders, HeadersBuilder,
+    IndexTransactionBuilder, OutPoint as FbsOutPoint, OutPointBuilder,
+    ProposalShortId as FbsProposalShortId, RelayMessage, RelayMessageBuilder, RelayPayload,
     Script as FbsScript, ScriptBuilder, SyncMessage, SyncMessageBuilder, SyncPayload,
     Transaction as FbsTransaction, TransactionBuilder, UncleBlock as FbsUncleBlock,
-    UncleBlockBuilder,
+    UncleBlockBuilder, H256 as FbsH256,
 };
 use crate::{short_transaction_id, short_transaction_id_keys};
 use ckb_core::block::Block;
@@ -17,6 +18,8 @@ use ckb_core::script::Script;
 use ckb_core::transaction::{CellInput, CellOutput, OutPoint, ProposalShortId, Transaction};
 use ckb_core::uncle::UncleBlock;
 use flatbuffers::{FlatBufferBuilder, WIPOffset};
+use merkle_root::H256Sha3;
+use merkle_tree::Tree;
 use numext_fixed_hash::H256;
 use numext_fixed_uint::U256;
 use rand::{thread_rng, Rng};
@@ -40,25 +43,25 @@ impl<'a> FbsBytes<'a> {
 
 impl<'a> FbsHeader<'a> {
     pub fn build<'b>(fbb: &mut FlatBufferBuilder<'b>, header: &Header) -> WIPOffset<FbsHeader<'b>> {
-        let parent_hash = FbsBytes::build(fbb, header.parent_hash().as_bytes());
-        let txs_commit = FbsBytes::build(fbb, header.txs_commit().as_bytes());
-        let txs_proposal = FbsBytes::build(fbb, header.txs_proposal().as_bytes());
+        let parent_hash = header.parent_hash().into();
+        let txs_commit = header.txs_commit().into();
+        let txs_proposal = header.txs_proposal().into();
         let difficulty = FbsBytes::build(fbb, &uint_to_bytes(header.difficulty()));
         let proof = FbsBytes::build(fbb, &header.proof());
-        let cellbase_id = FbsBytes::build(fbb, header.cellbase_id().as_bytes());
-        let uncles_hash = FbsBytes::build(fbb, header.uncles_hash().as_bytes());
+        let cellbase_id = header.cellbase_id().into();
+        let uncles_hash = header.uncles_hash().into();
         let mut builder = HeaderBuilder::new(fbb);
         builder.add_version(header.version());
-        builder.add_parent_hash(parent_hash);
+        builder.add_parent_hash(&parent_hash);
         builder.add_timestamp(header.timestamp());
         builder.add_number(header.number());
-        builder.add_txs_commit(txs_commit);
-        builder.add_txs_proposal(txs_proposal);
+        builder.add_txs_commit(&txs_commit);
+        builder.add_txs_proposal(&txs_proposal);
         builder.add_difficulty(difficulty);
         builder.add_nonce(header.nonce());
         builder.add_proof(proof);
-        builder.add_cellbase_id(cellbase_id);
-        builder.add_uncles_hash(uncles_hash);
+        builder.add_cellbase_id(&cellbase_id);
+        builder.add_uncles_hash(&uncles_hash);
         builder.add_uncles_count(header.uncles_count());
         builder.finish()
     }
@@ -104,9 +107,9 @@ impl<'a> FbsOutPoint<'a> {
         fbb: &mut FlatBufferBuilder<'b>,
         out_point: &OutPoint,
     ) -> WIPOffset<FbsOutPoint<'b>> {
-        let hash = FbsBytes::build(fbb, out_point.hash.as_bytes());
+        let hash = (&out_point.hash).into();
         let mut builder = OutPointBuilder::new(fbb);
-        builder.add_hash(hash);
+        builder.add_hash(&hash);
         builder.add_index(out_point.index);
         builder.finish()
     }
@@ -117,11 +120,11 @@ impl<'a> FbsCellInput<'a> {
         fbb: &mut FlatBufferBuilder<'b>,
         cell_input: &CellInput,
     ) -> WIPOffset<FbsCellInput<'b>> {
-        let hash = FbsBytes::build(fbb, cell_input.previous_output.hash.as_bytes());
+        let hash = (&cell_input.previous_output.hash).into();
         let unlock = FbsScript::build(fbb, &cell_input.unlock);
 
         let mut builder = CellInputBuilder::new(fbb);
-        builder.add_hash(hash);
+        builder.add_hash(&hash);
         builder.add_index(cell_input.previous_output.index);
         builder.add_unlock(unlock);
         builder.finish()
@@ -139,10 +142,7 @@ impl<'a> FbsScript<'a> {
 
         let binary = script.binary.as_ref().map(|s| FbsBytes::build(fbb, s));
 
-        let reference = script
-            .reference
-            .as_ref()
-            .map(|b| FbsBytes::build(fbb, b.as_bytes()));
+        let reference = script.reference.as_ref().map(Into::into);
 
         let vec = script
             .signed_args
@@ -157,7 +157,7 @@ impl<'a> FbsScript<'a> {
         if let Some(s) = binary {
             builder.add_binary(s);
         }
-        if let Some(r) = reference {
+        if let Some(ref r) = reference {
             builder.add_reference(r);
         }
         builder.add_signed_args(signed_args);
@@ -171,17 +171,14 @@ impl<'a> FbsCellOutput<'a> {
         cell_output: &CellOutput,
     ) -> WIPOffset<FbsCellOutput<'b>> {
         let data = FbsBytes::build(fbb, &cell_output.data);
-        let lock = FbsBytes::build(fbb, &cell_output.lock.as_bytes());
-        let contract = cell_output
-            .contract
-            .as_ref()
-            .map(|s| FbsScript::build(fbb, s));
+        let lock = (&cell_output.lock).into();
+        let type_ = cell_output.type_.as_ref().map(|s| FbsScript::build(fbb, s));
         let mut builder = CellOutputBuilder::new(fbb);
         builder.add_capacity(cell_output.capacity);
         builder.add_data(data);
-        builder.add_lock(lock);
-        if let Some(s) = contract {
-            builder.add_contract(s);
+        builder.add_lock(&lock);
+        if let Some(s) = type_ {
+            builder.add_type_(s);
         }
         builder.finish()
     }
@@ -208,8 +205,8 @@ impl<'a> FbsBlock<'a> {
         let vec = block
             .proposal_transactions()
             .iter()
-            .map(|id| FbsBytes::build(fbb, &id[..]))
-            .collect::<Vec<_>>();
+            .map(Into::into)
+            .collect::<Vec<FbsProposalShortId>>();
         let proposal_transactions = fbb.create_vector(&vec);
 
         let mut builder = BlockBuilder::new(fbb);
@@ -232,8 +229,8 @@ impl<'a> FbsUncleBlock<'a> {
         let vec = uncle_block
             .proposal_transactions
             .iter()
-            .map(|id| FbsBytes::build(fbb, &id[..]))
-            .collect::<Vec<_>>();
+            .map(Into::into)
+            .collect::<Vec<FbsProposalShortId>>();
         let proposal_transactions = fbb.create_vector(&vec);
 
         let mut builder = UncleBlockBuilder::new(fbb);
@@ -267,8 +264,8 @@ impl<'a> FbsGetHeaders<'a> {
     ) -> WIPOffset<FbsGetHeaders<'b>> {
         let vec = block_locator_hashes
             .iter()
-            .map(|hash| FbsBytes::build(fbb, hash.as_bytes()))
-            .collect::<Vec<_>>();
+            .map(Into::into)
+            .collect::<Vec<FbsH256>>();
         let block_locator_hashes = fbb.create_vector(&vec);
         let mut builder = GetHeadersBuilder::new(fbb);
         // TODO remove version from protocol?
@@ -287,8 +284,8 @@ impl<'a> FbsGetBlocks<'a> {
     ) -> WIPOffset<FbsGetBlocks<'b>> {
         let vec = block_hashes
             .iter()
-            .map(|hash| FbsBytes::build(fbb, hash.as_bytes()))
-            .collect::<Vec<_>>();
+            .map(Into::into)
+            .collect::<Vec<FbsH256>>();
         let block_hashes = fbb.create_vector(&vec);
         let mut builder = GetBlocksBuilder::new(fbb);
         builder.add_block_hashes(block_hashes);
@@ -340,6 +337,70 @@ impl<'a> SyncMessage<'a> {
         builder.add_payload(fbs_block.as_union_value());
         builder.finish()
     }
+
+    pub fn build_filtered_block<'b>(
+        fbb: &mut FlatBufferBuilder<'b>,
+        block: &Block,
+        transactions_index: &[usize],
+    ) -> WIPOffset<SyncMessage<'b>> {
+        let filtered_block = FilteredBlock::build(fbb, &block, transactions_index);
+        let mut builder = SyncMessageBuilder::new(fbb);
+        builder.add_payload_type(SyncPayload::FilteredBlock);
+        builder.add_payload(filtered_block.as_union_value());
+        builder.finish()
+    }
+}
+
+impl<'a> FilteredBlock<'a> {
+    pub fn build<'b>(
+        fbb: &mut FlatBufferBuilder<'b>,
+        block: &Block,
+        transactions_index: &[usize],
+    ) -> WIPOffset<FilteredBlock<'b>> {
+        if transactions_index.is_empty() {
+            // create an empty FilteredBlock
+            let header = FbsHeader::build(fbb, &block.header());
+
+            let mut builder = FilteredBlockBuilder::new(fbb);
+            builder.add_header(header);
+            builder.finish()
+        } else {
+            let transactions = transactions_index
+                .iter()
+                .map(|ti| {
+                    let fbs_transaction =
+                        FbsTransaction::build(fbb, &block.commit_transactions()[*ti]);
+                    let mut builder = IndexTransactionBuilder::new(fbb);
+                    builder.add_index(*ti as u32);
+                    builder.add_transaction(fbs_transaction);
+                    builder.finish()
+                })
+                .collect::<Vec<_>>();
+
+            let tree = Tree::<H256Sha3>::new(
+                &block
+                    .commit_transactions()
+                    .iter()
+                    .map(|tx| tx.hash())
+                    .collect::<Vec<_>>(),
+            );
+            let lemmas = tree
+                .get_proof(transactions_index)
+                .map(|proof| proof.lemmas)
+                .unwrap_or_else(Vec::new);
+
+            let header = FbsHeader::build(fbb, &block.header());
+            let fbs_transactions = fbb.create_vector(&transactions);
+            let fbs_hashes =
+                fbb.create_vector(&lemmas.iter().map(Into::into).collect::<Vec<FbsH256>>());
+
+            let mut builder = FilteredBlockBuilder::new(fbb);
+            builder.add_header(header);
+            builder.add_transactions(fbs_transactions);
+            builder.add_hashes(fbs_hashes);
+            builder.finish()
+        }
+    }
 }
 
 impl<'a> CompactBlock<'a> {
@@ -365,7 +426,7 @@ impl<'a> CompactBlock<'a> {
                 || transaction.is_cellbase()
             {
                 let fbs_transaction = FbsTransaction::build(fbb, transaction);
-                let mut builder = PrefilledTransactionBuilder::new(fbb);
+                let mut builder = IndexTransactionBuilder::new(fbb);
                 builder.add_index(transaction_index as u32);
                 builder.add_transaction(fbs_transaction);
                 prefilled_transactions.push(builder.finish());
@@ -389,8 +450,8 @@ impl<'a> CompactBlock<'a> {
         let vec = block
             .proposal_transactions()
             .iter()
-            .map(|id| FbsBytes::build(fbb, &id[..]))
-            .collect::<Vec<_>>();
+            .map(Into::into)
+            .collect::<Vec<FbsProposalShortId>>();
         let proposal_transactions = fbb.create_vector(&vec);
 
         let mut builder = CompactBlockBuilder::new(fbb);
@@ -434,10 +495,10 @@ impl<'a> RelayMessage<'a> {
         indexes: &[u32],
     ) -> WIPOffset<RelayMessage<'b>> {
         let get_block_transactions = {
-            let hash = FbsBytes::build(fbb, hash.as_bytes());
+            let fbs_hash = hash.into();
             let indexes = fbb.create_vector(indexes);
             let mut builder = GetBlockTransactionsBuilder::new(fbb);
-            builder.add_hash(hash);
+            builder.add_hash(&fbs_hash);
             builder.add_indexes(indexes);
             builder.finish()
         };
@@ -454,7 +515,7 @@ impl<'a> RelayMessage<'a> {
         transactions: &[Transaction],
     ) -> WIPOffset<RelayMessage<'b>> {
         let block_transactions = {
-            let hash = FbsBytes::build(fbb, hash.as_bytes());;
+            let fbs_hash = hash.into();
             let vec = transactions
                 .iter()
                 .map(|transaction| FbsTransaction::build(fbb, transaction))
@@ -462,7 +523,7 @@ impl<'a> RelayMessage<'a> {
             let transactions = fbb.create_vector(&vec);
 
             let mut builder = BlockTransactionsBuilder::new(fbb);
-            builder.add_hash(hash);
+            builder.add_hash(&fbs_hash);
             builder.add_transactions(transactions);
             builder.finish()
         };
@@ -481,8 +542,8 @@ impl<'a> RelayMessage<'a> {
         let get_block_proposal = {
             let vec = proposal_transactions
                 .iter()
-                .map(|id| FbsBytes::build(fbb, &id[..]))
-                .collect::<Vec<_>>();
+                .map(Into::into)
+                .collect::<Vec<FbsProposalShortId>>();
             let proposal_transactions = fbb.create_vector(&vec);
             let mut builder = GetBlockProposalBuilder::new(fbb);
             builder.add_block_number(block_number);
diff --git a/protocol/src/convert.rs b/protocol/src/convert.rs
index 5c48fd0901..95595f3f7b 100644
--- a/protocol/src/convert.rs
+++ b/protocol/src/convert.rs
@@ -4,6 +4,86 @@ use ckb_core;
 use numext_fixed_hash::H256;
 use numext_fixed_uint::U256;
 
+impl From<&H256> for ckb_protocol::H256 {
+    fn from(h256: &H256) -> Self {
+        let bytes = h256.as_fixed_bytes();
+        Self::new(
+            bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7],
+            bytes[8], bytes[9], bytes[10], bytes[11], bytes[12], bytes[13], bytes[14], bytes[15],
+            bytes[16], bytes[17], bytes[18], bytes[19], bytes[20], bytes[21], bytes[22], bytes[23],
+            bytes[24], bytes[25], bytes[26], bytes[27], bytes[28], bytes[29], bytes[30], bytes[31],
+        )
+    }
+}
+
+impl From<&ckb_protocol::H256> for H256 {
+    fn from(h256: &ckb_protocol::H256) -> Self {
+        H256::from_slice(&[
+            h256.u0(),
+            h256.u1(),
+            h256.u2(),
+            h256.u3(),
+            h256.u4(),
+            h256.u5(),
+            h256.u6(),
+            h256.u7(),
+            h256.u8_(),
+            h256.u9(),
+            h256.u10(),
+            h256.u11(),
+            h256.u12(),
+            h256.u13(),
+            h256.u14(),
+            h256.u15(),
+            h256.u16_(),
+            h256.u17(),
+            h256.u18(),
+            h256.u19(),
+            h256.u20(),
+            h256.u21(),
+            h256.u22(),
+            h256.u23(),
+            h256.u24(),
+            h256.u25(),
+            h256.u26(),
+            h256.u27(),
+            h256.u28(),
+            h256.u29(),
+            h256.u30(),
+            h256.u31(),
+        ])
+        .unwrap()
+    }
+}
+
+impl From<&ckb_core::transaction::ProposalShortId> for ckb_protocol::ProposalShortId {
+    fn from(short_id: &ckb_core::transaction::ProposalShortId) -> Self {
+        let bytes = *short_id;
+        Self::new(
+            bytes[0], bytes[1], bytes[2], bytes[3], bytes[4], bytes[5], bytes[6], bytes[7],
+            bytes[8], bytes[9],
+        )
+    }
+}
+
+impl From<&ckb_protocol::ProposalShortId> for ckb_core::transaction::ProposalShortId {
+    fn from(short_id: &ckb_protocol::ProposalShortId) -> Self {
+        Self::from_slice(&[
+            short_id.u0(),
+            short_id.u1(),
+            short_id.u2(),
+            short_id.u3(),
+            short_id.u4(),
+            short_id.u5(),
+            short_id.u6(),
+            short_id.u7(),
+            short_id.u8_(),
+            short_id.u9(),
+        ])
+        .unwrap()
+    }
+}
+
 impl<'a> From<ckb_protocol::Block<'a>> for ckb_core::block::Block {
     fn from(block: ckb_protocol::Block<'a>) -> Self {
         let commit_transactions =
@@ -15,13 +95,12 @@ impl<'a> From<ckb_protocol::Block<'a>> for ckb_core::block::Block {
             .map(Into::into)
             .collect();
 
-        let proposal_transactions =
-            FlatbuffersVectorIterator::new(block.proposal_transactions().unwrap())
-                .filter_map(|s| {
-                    s.seq()
-                        .and_then(ckb_core::transaction::ProposalShortId::from_slice)
-                })
-                .collect();
+        let proposal_transactions = block
+            .proposal_transactions()
+            .unwrap()
+            .iter()
+            .map(Into::into)
+            .collect();
 
         ckb_core::block::BlockBuilder::default()
             .header(block.header().unwrap().into())
@@ -37,14 +116,12 @@ impl<'a> From<ckb_protocol::UncleBlock<'a>> for ckb_core::uncle::UncleBlock {
         ckb_core::uncle::UncleBlock {
             header: uncle_block.header().unwrap().into(),
             cellbase: uncle_block.cellbase().unwrap().into(),
-            proposal_transactions: FlatbuffersVectorIterator::new(
-                uncle_block.proposal_transactions().unwrap(),
-            )
-            .filter_map(|s| {
-                s.seq()
-                    .and_then(ckb_core::transaction::ProposalShortId::from_slice)
-            })
-            .collect(),
+            proposal_transactions: uncle_block
+                .proposal_transactions()
+                .unwrap()
+                .iter()
+                .map(Into::into)
+                .collect(),
         }
     }
 }
@@ -53,27 +130,17 @@ impl<'a> From<ckb_protocol::Header<'a>> for ckb_core::header::Header {
     fn from(header: ckb_protocol::Header<'a>) -> Self {
         ckb_core::header::HeaderBuilder::default()
             .version(header.version())
-            .parent_hash(
-                H256::from_slice(header.parent_hash().and_then(|b| b.seq()).unwrap()).unwrap(),
-            )
+            .parent_hash(header.parent_hash().unwrap().into())
             .timestamp(header.timestamp())
             .number(header.number())
-            .txs_commit(
-                H256::from_slice(header.txs_commit().and_then(|b| b.seq()).unwrap()).unwrap(),
-            )
-            .txs_proposal(
-                H256::from_slice(header.txs_proposal().and_then(|b| b.seq()).unwrap()).unwrap(),
-            )
+            .txs_commit(header.txs_commit().unwrap().into())
+            .txs_proposal(header.txs_proposal().unwrap().into())
             .difficulty(
                 U256::from_little_endian(header.difficulty().and_then(|b| b.seq()).unwrap())
                     .unwrap(),
             )
-            .cellbase_id(
-                H256::from_slice(header.cellbase_id().and_then(|b| b.seq()).unwrap()).unwrap(),
-            )
-            .uncles_hash(
-                H256::from_slice(header.uncles_hash().and_then(|b| b.seq()).unwrap()).unwrap(),
-            )
+            .cellbase_id(header.cellbase_id().unwrap().into())
+            .uncles_hash(header.uncles_hash().unwrap().into())
             .nonce(header.nonce())
             .proof(header.proof().and_then(|b| b.seq()).unwrap().to_vec())
             .uncles_count(header.uncles_count())
@@ -107,7 +174,7 @@ impl<'a> From<ckb_protocol::Transaction<'a>> for ckb_core::transaction::Transact
 impl<'a> From<ckb_protocol::OutPoint<'a>> for ckb_core::transaction::OutPoint {
     fn from(out_point: ckb_protocol::OutPoint<'a>) -> Self {
         ckb_core::transaction::OutPoint {
-            hash: H256::from_slice(out_point.hash().and_then(|b| b.seq()).unwrap()).unwrap(),
+            hash: out_point.hash().unwrap().into(),
             index: out_point.index(),
         }
     }
@@ -128,10 +195,7 @@ impl<'a> From<ckb_protocol::Script<'a>> for ckb_core::script::Script {
             args,
             binary: script.binary().and_then(|s| s.seq()).map(|s| s.to_vec()),
             signed_args,
-            reference: script
-                .reference()
-                .and_then(|s| s.seq())
-                .map(|s| H256::from_slice(s).unwrap()),
+            reference: script.reference().map(Into::into),
         }
     }
 }
@@ -140,7 +204,7 @@ impl<'a> From<ckb_protocol::CellInput<'a>> for ckb_core::transaction::CellInput
     fn from(cell_input: ckb_protocol::CellInput<'a>) -> Self {
         ckb_core::transaction::CellInput {
             previous_output: ckb_core::transaction::OutPoint {
-                hash: H256::from_slice(cell_input.hash().and_then(|b| b.seq()).unwrap()).unwrap(),
+                hash: cell_input.hash().unwrap().into(),
                 index: cell_input.index(),
             },
             unlock: cell_input.unlock().unwrap().into(),
@@ -153,8 +217,17 @@ impl<'a> From<ckb_protocol::CellOutput<'a>> for ckb_core::transaction::CellOutpu
         ckb_core::transaction::CellOutput {
             capacity: cell_output.capacity(),
             data: cell_output.data().and_then(|b| b.seq()).unwrap().to_vec(),
-            lock: H256::from_slice(cell_output.lock().and_then(|b| b.seq()).unwrap()).unwrap(),
-            contract: cell_output.contract().map(Into::into),
+            lock: cell_output.lock().unwrap().into(),
+            type_: cell_output.type_().map(Into::into),
+        }
+    }
+}
+
+impl<'a> From<ckb_protocol::IndexTransaction<'a>> for ckb_core::transaction::IndexTransaction {
+    fn from(it: ckb_protocol::IndexTransaction<'a>) -> Self {
+        ckb_core::transaction::IndexTransaction {
+            index: it.index() as usize,
+            transaction: it.transaction().unwrap().into(),
         }
     }
 }
diff --git a/protocol/src/protocol.fbs b/protocol/src/protocol.fbs
index c0cb272110..e4d0218011 100644
--- a/protocol/src/protocol.fbs
+++ b/protocol/src/protocol.fbs
@@ -5,6 +5,10 @@ union SyncPayload {
     Headers,
     GetBlocks,
     Block,
+    SetFilter,
+    AddFilter,
+    ClearFilter,
+    FilteredBlock,
 }
 
 table SyncMessage {
@@ -17,12 +21,12 @@ table Bytes {
 
 table GetHeaders {
     version:                uint32;
-    block_locator_hashes:   [Bytes];
-    hash_stop:              Bytes;
+    block_locator_hashes:   [H256];
+    hash_stop:              H256;
 }
 
 table GetBlocks {
-    block_hashes:           [Bytes];
+    block_hashes:           [H256];
 }
 
 table Headers {
@@ -31,16 +35,16 @@ table Headers {
 
 table Header {
     version:        uint32;
-    parent_hash:    Bytes;
+    parent_hash:    H256;
     timestamp:      uint64;
     number:         uint64;
-    txs_commit:     Bytes;
-    txs_proposal:   Bytes;
+    txs_commit:     H256;
+    txs_proposal:   H256;
     difficulty:     Bytes;
     nonce:          uint64;
     proof:          Bytes;
-    cellbase_id:    Bytes;
-    uncles_hash:    Bytes;
+    cellbase_id:    H256;
+    uncles_hash:    H256;
     uncles_count:   uint32;
 }
 
@@ -48,13 +52,13 @@ table Block {
     header:                 Header;
     uncles:                 [UncleBlock];
     commit_transactions:    [Transaction];
-    proposal_transactions:  [Bytes];
+    proposal_transactions:  [ProposalShortId];
 }
 
 table UncleBlock {
     header:                 Header;
     cellbase:               Transaction;
-    proposal_transactions:  [Bytes];
+    proposal_transactions:  [ProposalShortId];
 }
 
 table Transaction {
@@ -65,12 +69,12 @@ table Transaction {
 }
 
 table OutPoint {
-    hash:           Bytes;
+    hash:           H256;
     index:          uint32;
 }
 
 table CellInput {
-    hash:           Bytes;
+    hash:           H256;
     index:          uint32;
     unlock:         Script;
 }
@@ -78,15 +82,15 @@ table CellInput {
 table CellOutput {
     capacity:       uint64;
     data:           Bytes;
-    lock:           Bytes;
-    contract:       Script;
+    lock:           H256;
+    type:           Script;
 }
 
 table Script {
     version:        uint8;
     args:           [Bytes];
     binary:         Bytes;
-    reference:      Bytes;
+    reference:      H256;
     signed_args:    [Bytes];
 }
 
@@ -109,31 +113,98 @@ table CompactBlock {
     header:                     Header;
     nonce:                      uint64;
     short_ids:                  [Bytes];
-    prefilled_transactions:     [PrefilledTransaction];
+    prefilled_transactions:     [IndexTransaction];
     uncles:                     [UncleBlock];
-    proposal_transactions:      [Bytes];
+    proposal_transactions:      [ProposalShortId];
 }
 
-table PrefilledTransaction {
+table IndexTransaction {
     index:                      uint32;
     transaction:                Transaction;
 }
 
 table GetBlockTransactions {
-    hash:                      Bytes;
+    hash:                      H256;
     indexes:                   [uint32];
 }
 
 table BlockTransactions {
-    hash:                      Bytes;
+    hash:                      H256;
     transactions:              [Transaction];
 }
 
 table GetBlockProposal {
     block_number:              uint64;
-    proposal_transactions:     [Bytes];
+    proposal_transactions:     [ProposalShortId];
 }
 
 table BlockProposal {
     transactions:              [Transaction];
 }
+
+struct ProposalShortId {
+    u0: uint8;
+    u1: uint8;
+    u2: uint8;
+    u3: uint8;
+    u4: uint8;
+    u5: uint8;
+    u6: uint8;
+    u7: uint8;
+    u8: uint8;
+    u9: uint8;
+}
+
+struct H256 {
+    u0: uint8;
+    u1: uint8;
+    u2: uint8;
+    u3: uint8;
+    u4: uint8;
+    u5: uint8;
+    u6: uint8;
+    u7: uint8;
+    u8: uint8;
+    u9: uint8;
+    u10: uint8;
+    u11: uint8;
+    u12: uint8;
+    u13: uint8;
+    u14: uint8;
+    u15: uint8;
+    u16: uint8;
+    u17: uint8;
+    u18: uint8;
+    u19: uint8;
+    u20: uint8;
+    u21: uint8;
+    u22: uint8;
+    u23: uint8;
+    u24: uint8;
+    u25: uint8;
+    u26: uint8;
+    u27: uint8;
+    u28: uint8;
+    u29: uint8;
+    u30: uint8;
+    u31: uint8;
+}
+
+table SetFilter {
+    filter: [uint8];
+    num_hashes: uint8;
+    hash_seed: uint32;
+}
+
+table AddFilter {
+    filter: [uint8];
+}
+
+table ClearFilter {
+}
+
+table FilteredBlock {
+    header: Header;
+    transactions: [IndexTransaction];
+    hashes: [H256];
+}
diff --git a/protocol/src/protocol_generated.rs b/protocol/src/protocol_generated.rs
index 06b5955265..fafe9f1076 100644
--- a/protocol/src/protocol_generated.rs
+++ b/protocol/src/protocol_generated.rs
@@ -33,11 +33,15 @@ pub enum SyncPayload {
   Headers = 2,
   GetBlocks = 3,
   Block = 4,
+  SetFilter = 5,
+  AddFilter = 6,
+  ClearFilter = 7,
+  FilteredBlock = 8,
 
 }
 
 const ENUM_MIN_SYNC_PAYLOAD: u8 = 0;
-const ENUM_MAX_SYNC_PAYLOAD: u8 = 4;
+const ENUM_MAX_SYNC_PAYLOAD: u8 = 8;
 
 impl<'a> flatbuffers::Follow<'a> for SyncPayload {
   type Inner = Self;
@@ -71,21 +75,29 @@ impl flatbuffers::Push for SyncPayload {
 }
 
 #[allow(non_camel_case_types)]
-const ENUM_VALUES_SYNC_PAYLOAD:[SyncPayload; 5] = [
+const ENUM_VALUES_SYNC_PAYLOAD:[SyncPayload; 9] = [
   SyncPayload::NONE,
   SyncPayload::GetHeaders,
   SyncPayload::Headers,
   SyncPayload::GetBlocks,
-  SyncPayload::Block
+  SyncPayload::Block,
+  SyncPayload::SetFilter,
+  SyncPayload::AddFilter,
+  SyncPayload::ClearFilter,
+  SyncPayload::FilteredBlock
 ];
 
 #[allow(non_camel_case_types)]
-const ENUM_NAMES_SYNC_PAYLOAD:[&'static str; 5] = [
+const ENUM_NAMES_SYNC_PAYLOAD:[&'static str; 9] = [
     "NONE",
     "GetHeaders",
     "Headers",
     "GetBlocks",
-    "Block"
+    "Block",
+    "SetFilter",
+    "AddFilter",
+    "ClearFilter",
+    "FilteredBlock"
 ];
 
 pub fn enum_name_sync_payload(e: SyncPayload) -> &'static str {
@@ -170,6 +182,318 @@ pub fn enum_name_relay_payload(e: RelayPayload) -> &'static str {
 }
 
 pub struct RelayPayloadUnionTableOffset {}
+// struct ProposalShortId, aligned to 1
+#[repr(C, align(1))]
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct ProposalShortId {
+  u0_: u8,
+  u1_: u8,
+  u2_: u8,
+  u3_: u8,
+  u4_: u8,
+  u5_: u8,
+  u6_: u8,
+  u7_: u8,
+  u8__: u8,
+  u9_: u8,
+} // pub struct ProposalShortId
+impl flatbuffers::SafeSliceAccess for ProposalShortId {}
+impl<'a> flatbuffers::Follow<'a> for ProposalShortId {
+  type Inner = &'a ProposalShortId;
+  #[inline]
+  fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+    <&'a ProposalShortId>::follow(buf, loc)
+  }
+}
+impl<'a> flatbuffers::Follow<'a> for &'a ProposalShortId {
+  type Inner = &'a ProposalShortId;
+  #[inline]
+  fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+    flatbuffers::follow_cast_ref::<ProposalShortId>(buf, loc)
+  }
+}
+impl<'b> flatbuffers::Push for ProposalShortId {
+    type Output = ProposalShortId;
+    #[inline]
+    fn push(&self, dst: &mut [u8], _rest: &[u8]) {
+        let src = unsafe {
+            ::std::slice::from_raw_parts(self as *const ProposalShortId as *const u8, Self::size())
+        };
+        dst.copy_from_slice(src);
+    }
+}
+impl<'b> flatbuffers::Push for &'b ProposalShortId {
+    type Output = ProposalShortId;
+
+    #[inline]
+    fn push(&self, dst: &mut [u8], _rest: &[u8]) {
+        let src = unsafe {
+            ::std::slice::from_raw_parts(*self as *const ProposalShortId as *const u8, Self::size())
+        };
+        dst.copy_from_slice(src);
+    }
+}
+
+
+impl ProposalShortId {
+  pub fn new<'a>(_u0: u8, _u1: u8, _u2: u8, _u3: u8, _u4: u8, _u5: u8, _u6: u8, _u7: u8, _u8_: u8, _u9: u8) -> Self {
+    ProposalShortId {
+      u0_: _u0.to_little_endian(),
+      u1_: _u1.to_little_endian(),
+      u2_: _u2.to_little_endian(),
+      u3_: _u3.to_little_endian(),
+      u4_: _u4.to_little_endian(),
+      u5_: _u5.to_little_endian(),
+      u6_: _u6.to_little_endian(),
+      u7_: _u7.to_little_endian(),
+      u8__: _u8_.to_little_endian(),
+      u9_: _u9.to_little_endian(),
+
+    }
+  }
+  pub fn u0<'a>(&'a self) -> u8 {
+    self.u0_.from_little_endian()
+  }
+  pub fn u1<'a>(&'a self) -> u8 {
+    self.u1_.from_little_endian()
+  }
+  pub fn u2<'a>(&'a self) -> u8 {
+    self.u2_.from_little_endian()
+  }
+  pub fn u3<'a>(&'a self) -> u8 {
+    self.u3_.from_little_endian()
+  }
+  pub fn u4<'a>(&'a self) -> u8 {
+    self.u4_.from_little_endian()
+  }
+  pub fn u5<'a>(&'a self) -> u8 {
+    self.u5_.from_little_endian()
+  }
+  pub fn u6<'a>(&'a self) -> u8 {
+    self.u6_.from_little_endian()
+  }
+  pub fn u7<'a>(&'a self) -> u8 {
+    self.u7_.from_little_endian()
+  }
+  pub fn u8_<'a>(&'a self) -> u8 {
+    self.u8__.from_little_endian()
+  }
+  pub fn u9<'a>(&'a self) -> u8 {
+    self.u9_.from_little_endian()
+  }
+}
+
+// struct H256, aligned to 1
+#[repr(C, align(1))]
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub struct H256 {
+  u0_: u8,
+  u1_: u8,
+  u2_: u8,
+  u3_: u8,
+  u4_: u8,
+  u5_: u8,
+  u6_: u8,
+  u7_: u8,
+  u8__: u8,
+  u9_: u8,
+  u10_: u8,
+  u11_: u8,
+  u12_: u8,
+  u13_: u8,
+  u14_: u8,
+  u15_: u8,
+  u16__: u8,
+  u17_: u8,
+  u18_: u8,
+  u19_: u8,
+  u20_: u8,
+  u21_: u8,
+  u22_: u8,
+  u23_: u8,
+  u24_: u8,
+  u25_: u8,
+  u26_: u8,
+  u27_: u8,
+  u28_: u8,
+  u29_: u8,
+  u30_: u8,
+  u31_: u8,
+} // pub struct H256
+impl flatbuffers::SafeSliceAccess for H256 {}
+impl<'a> flatbuffers::Follow<'a> for H256 {
+  type Inner = &'a H256;
+  #[inline]
+  fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+    <&'a H256>::follow(buf, loc)
+  }
+}
+impl<'a> flatbuffers::Follow<'a> for &'a H256 {
+  type Inner = &'a H256;
+  #[inline]
+  fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+    flatbuffers::follow_cast_ref::<H256>(buf, loc)
+  }
+}
+impl<'b> flatbuffers::Push for H256 {
+    type Output = H256;
+    #[inline]
+    fn push(&self, dst: &mut [u8], _rest: &[u8]) {
+        let src = unsafe {
+            ::std::slice::from_raw_parts(self as *const H256 as *const u8, Self::size())
+        };
+        dst.copy_from_slice(src);
+    }
+}
+impl<'b> flatbuffers::Push for &'b H256 {
+    type Output = H256;
+
+    #[inline]
+    fn push(&self, dst: &mut [u8], _rest: &[u8]) {
+        let src = unsafe {
+            ::std::slice::from_raw_parts(*self as *const H256 as *const u8, Self::size())
+        };
+        dst.copy_from_slice(src);
+    }
+}
+
+
+impl H256 {
+  pub fn new<'a>(_u0: u8, _u1: u8, _u2: u8, _u3: u8, _u4: u8, _u5: u8, _u6: u8, _u7: u8, _u8_: u8, _u9: u8, _u10: u8, _u11: u8, _u12: u8, _u13: u8, _u14: u8, _u15: u8, _u16_: u8, _u17: u8, _u18: u8, _u19: u8, _u20: u8, _u21: u8, _u22: u8, _u23: u8, _u24: u8, _u25: u8, _u26: u8, _u27: u8, _u28: u8, _u29: u8, _u30: u8, _u31: u8) -> Self {
+    H256 {
+      u0_: _u0.to_little_endian(),
+      u1_: _u1.to_little_endian(),
+      u2_: _u2.to_little_endian(),
+      u3_: _u3.to_little_endian(),
+      u4_: _u4.to_little_endian(),
+      u5_: _u5.to_little_endian(),
+      u6_: _u6.to_little_endian(),
+      u7_: _u7.to_little_endian(),
+      u8__: _u8_.to_little_endian(),
+      u9_: _u9.to_little_endian(),
+      u10_: _u10.to_little_endian(),
+      u11_: _u11.to_little_endian(),
+      u12_: _u12.to_little_endian(),
+      u13_: _u13.to_little_endian(),
+      u14_: _u14.to_little_endian(),
+      u15_: _u15.to_little_endian(),
+      u16__: _u16_.to_little_endian(),
+      u17_: _u17.to_little_endian(),
+      u18_: _u18.to_little_endian(),
+      u19_: _u19.to_little_endian(),
+      u20_: _u20.to_little_endian(),
+      u21_: _u21.to_little_endian(),
+      u22_: _u22.to_little_endian(),
+      u23_: _u23.to_little_endian(),
+      u24_: _u24.to_little_endian(),
+      u25_: _u25.to_little_endian(),
+      u26_: _u26.to_little_endian(),
+      u27_: _u27.to_little_endian(),
+      u28_: _u28.to_little_endian(),
+      u29_: _u29.to_little_endian(),
+      u30_: _u30.to_little_endian(),
+      u31_: _u31.to_little_endian(),
+
+    }
+  }
+  pub fn u0<'a>(&'a self) -> u8 {
+    self.u0_.from_little_endian()
+  }
+  pub fn u1<'a>(&'a self) -> u8 {
+    self.u1_.from_little_endian()
+  }
+  pub fn u2<'a>(&'a self) -> u8 {
+    self.u2_.from_little_endian()
+  }
+  pub fn u3<'a>(&'a self) -> u8 {
+    self.u3_.from_little_endian()
+  }
+  pub fn u4<'a>(&'a self) -> u8 {
+    self.u4_.from_little_endian()
+  }
+  pub fn u5<'a>(&'a self) -> u8 {
+    self.u5_.from_little_endian()
+  }
+  pub fn u6<'a>(&'a self) -> u8 {
+    self.u6_.from_little_endian()
+  }
+  pub fn u7<'a>(&'a self) -> u8 {
+    self.u7_.from_little_endian()
+  }
+  pub fn u8_<'a>(&'a self) -> u8 {
+    self.u8__.from_little_endian()
+  }
+  pub fn u9<'a>(&'a self) -> u8 {
+    self.u9_.from_little_endian()
+  }
+  pub fn u10<'a>(&'a self) -> u8 {
+    self.u10_.from_little_endian()
+  }
+  pub fn u11<'a>(&'a self) -> u8 {
+    self.u11_.from_little_endian()
+  }
+  pub fn u12<'a>(&'a self) -> u8 {
+    self.u12_.from_little_endian()
+  }
+  pub fn u13<'a>(&'a self) -> u8 {
+    self.u13_.from_little_endian()
+  }
+  pub fn u14<'a>(&'a self) -> u8 {
+    self.u14_.from_little_endian()
+  }
+  pub fn u15<'a>(&'a self) -> u8 {
+    self.u15_.from_little_endian()
+  }
+  pub fn u16_<'a>(&'a self) -> u8 {
+    self.u16__.from_little_endian()
+  }
+  pub fn u17<'a>(&'a self) -> u8 {
+    self.u17_.from_little_endian()
+  }
+  pub fn u18<'a>(&'a self) -> u8 {
+    self.u18_.from_little_endian()
+  }
+  pub fn u19<'a>(&'a self) -> u8 {
+    self.u19_.from_little_endian()
+  }
+  pub fn u20<'a>(&'a self) -> u8 {
+    self.u20_.from_little_endian()
+  }
+  pub fn u21<'a>(&'a self) -> u8 {
+    self.u21_.from_little_endian()
+  }
+  pub fn u22<'a>(&'a self) -> u8 {
+    self.u22_.from_little_endian()
+  }
+  pub fn u23<'a>(&'a self) -> u8 {
+    self.u23_.from_little_endian()
+  }
+  pub fn u24<'a>(&'a self) -> u8 {
+    self.u24_.from_little_endian()
+  }
+  pub fn u25<'a>(&'a self) -> u8 {
+    self.u25_.from_little_endian()
+  }
+  pub fn u26<'a>(&'a self) -> u8 {
+    self.u26_.from_little_endian()
+  }
+  pub fn u27<'a>(&'a self) -> u8 {
+    self.u27_.from_little_endian()
+  }
+  pub fn u28<'a>(&'a self) -> u8 {
+    self.u28_.from_little_endian()
+  }
+  pub fn u29<'a>(&'a self) -> u8 {
+    self.u29_.from_little_endian()
+  }
+  pub fn u30<'a>(&'a self) -> u8 {
+    self.u30_.from_little_endian()
+  }
+  pub fn u31<'a>(&'a self) -> u8 {
+    self.u31_.from_little_endian()
+  }
+}
+
 pub enum SyncMessageOffset {}
 #[derive(Copy, Clone, Debug, PartialEq)]
 
@@ -255,6 +579,46 @@ impl<'a> SyncMessage<'a> {
     }
   }
 
+  #[inline]
+  #[allow(non_snake_case)]
+  pub fn payload_as_set_filter(&'a self) -> Option<SetFilter> {
+    if self.payload_type() == SyncPayload::SetFilter {
+      self.payload().map(|u| SetFilter::init_from_table(u))
+    } else {
+      None
+    }
+  }
+
+  #[inline]
+  #[allow(non_snake_case)]
+  pub fn payload_as_add_filter(&'a self) -> Option<AddFilter> {
+    if self.payload_type() == SyncPayload::AddFilter {
+      self.payload().map(|u| AddFilter::init_from_table(u))
+    } else {
+      None
+    }
+  }
+
+  #[inline]
+  #[allow(non_snake_case)]
+  pub fn payload_as_clear_filter(&'a self) -> Option<ClearFilter> {
+    if self.payload_type() == SyncPayload::ClearFilter {
+      self.payload().map(|u| ClearFilter::init_from_table(u))
+    } else {
+      None
+    }
+  }
+
+  #[inline]
+  #[allow(non_snake_case)]
+  pub fn payload_as_filtered_block(&'a self) -> Option<FilteredBlock> {
+    if self.payload_type() == SyncPayload::FilteredBlock {
+      self.payload().map(|u| FilteredBlock::init_from_table(u))
+    } else {
+      None
+    }
+  }
+
 }
 
 pub struct SyncMessageArgs {
@@ -418,19 +782,19 @@ impl<'a> GetHeaders<'a> {
     self._tab.get::<u32>(GetHeaders::VT_VERSION, Some(0)).unwrap()
   }
   #[inline]
-  pub fn block_locator_hashes(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(GetHeaders::VT_BLOCK_LOCATOR_HASHES, None)
+  pub fn block_locator_hashes(&self) -> Option<&'a [H256]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<H256>>>(GetHeaders::VT_BLOCK_LOCATOR_HASHES, None).map(|v| v.safe_slice() )
   }
   #[inline]
-  pub fn hash_stop(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(GetHeaders::VT_HASH_STOP, None)
+  pub fn hash_stop(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(GetHeaders::VT_HASH_STOP, None)
   }
 }
 
 pub struct GetHeadersArgs<'a> {
     pub version: u32,
-    pub block_locator_hashes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
-    pub hash_stop: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub block_locator_hashes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , H256>>>,
+    pub hash_stop: Option<&'a  H256>,
 }
 impl<'a> Default for GetHeadersArgs<'a> {
     #[inline]
@@ -452,12 +816,12 @@ impl<'a: 'b, 'b> GetHeadersBuilder<'a, 'b> {
     self.fbb_.push_slot::<u32>(GetHeaders::VT_VERSION, version, 0);
   }
   #[inline]
-  pub fn add_block_locator_hashes(&mut self, block_locator_hashes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_block_locator_hashes(&mut self, block_locator_hashes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , H256>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(GetHeaders::VT_BLOCK_LOCATOR_HASHES, block_locator_hashes);
   }
   #[inline]
-  pub fn add_hash_stop(&mut self, hash_stop: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(GetHeaders::VT_HASH_STOP, hash_stop);
+  pub fn add_hash_stop(&mut self, hash_stop: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(GetHeaders::VT_HASH_STOP, hash_stop);
   }
   #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> GetHeadersBuilder<'a, 'b> {
@@ -510,13 +874,13 @@ impl<'a> GetBlocks<'a> {
     pub const VT_BLOCK_HASHES: flatbuffers::VOffsetT = 4;
 
   #[inline]
-  pub fn block_hashes(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(GetBlocks::VT_BLOCK_HASHES, None)
+  pub fn block_hashes(&self) -> Option<&'a [H256]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<H256>>>(GetBlocks::VT_BLOCK_HASHES, None).map(|v| v.safe_slice() )
   }
 }
 
 pub struct GetBlocksArgs<'a> {
-    pub block_hashes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
+    pub block_hashes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , H256>>>,
 }
 impl<'a> Default for GetBlocksArgs<'a> {
     #[inline]
@@ -532,7 +896,7 @@ pub struct GetBlocksBuilder<'a: 'b, 'b> {
 }
 impl<'a: 'b, 'b> GetBlocksBuilder<'a, 'b> {
   #[inline]
-  pub fn add_block_hashes(&mut self, block_hashes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_block_hashes(&mut self, block_hashes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , H256>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(GetBlocks::VT_BLOCK_HASHES, block_hashes);
   }
   #[inline]
@@ -688,8 +1052,8 @@ impl<'a> Header<'a> {
     self._tab.get::<u32>(Header::VT_VERSION, Some(0)).unwrap()
   }
   #[inline]
-  pub fn parent_hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_PARENT_HASH, None)
+  pub fn parent_hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Header::VT_PARENT_HASH, None)
   }
   #[inline]
   pub fn timestamp(&self) -> u64 {
@@ -700,12 +1064,12 @@ impl<'a> Header<'a> {
     self._tab.get::<u64>(Header::VT_NUMBER, Some(0)).unwrap()
   }
   #[inline]
-  pub fn txs_commit(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_TXS_COMMIT, None)
+  pub fn txs_commit(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Header::VT_TXS_COMMIT, None)
   }
   #[inline]
-  pub fn txs_proposal(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_TXS_PROPOSAL, None)
+  pub fn txs_proposal(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Header::VT_TXS_PROPOSAL, None)
   }
   #[inline]
   pub fn difficulty(&self) -> Option<Bytes<'a>> {
@@ -720,12 +1084,12 @@ impl<'a> Header<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_PROOF, None)
   }
   #[inline]
-  pub fn cellbase_id(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_CELLBASE_ID, None)
+  pub fn cellbase_id(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Header::VT_CELLBASE_ID, None)
   }
   #[inline]
-  pub fn uncles_hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Header::VT_UNCLES_HASH, None)
+  pub fn uncles_hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Header::VT_UNCLES_HASH, None)
   }
   #[inline]
   pub fn uncles_count(&self) -> u32 {
@@ -735,16 +1099,16 @@ impl<'a> Header<'a> {
 
 pub struct HeaderArgs<'a> {
     pub version: u32,
-    pub parent_hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub parent_hash: Option<&'a  H256>,
     pub timestamp: u64,
     pub number: u64,
-    pub txs_commit: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub txs_proposal: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub txs_commit: Option<&'a  H256>,
+    pub txs_proposal: Option<&'a  H256>,
     pub difficulty: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
     pub nonce: u64,
     pub proof: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub cellbase_id: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub uncles_hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub cellbase_id: Option<&'a  H256>,
+    pub uncles_hash: Option<&'a  H256>,
     pub uncles_count: u32,
 }
 impl<'a> Default for HeaderArgs<'a> {
@@ -776,8 +1140,8 @@ impl<'a: 'b, 'b> HeaderBuilder<'a, 'b> {
     self.fbb_.push_slot::<u32>(Header::VT_VERSION, version, 0);
   }
   #[inline]
-  pub fn add_parent_hash(&mut self, parent_hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_PARENT_HASH, parent_hash);
+  pub fn add_parent_hash(&mut self, parent_hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Header::VT_PARENT_HASH, parent_hash);
   }
   #[inline]
   pub fn add_timestamp(&mut self, timestamp: u64) {
@@ -788,12 +1152,12 @@ impl<'a: 'b, 'b> HeaderBuilder<'a, 'b> {
     self.fbb_.push_slot::<u64>(Header::VT_NUMBER, number, 0);
   }
   #[inline]
-  pub fn add_txs_commit(&mut self, txs_commit: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_TXS_COMMIT, txs_commit);
+  pub fn add_txs_commit(&mut self, txs_commit: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Header::VT_TXS_COMMIT, txs_commit);
   }
   #[inline]
-  pub fn add_txs_proposal(&mut self, txs_proposal: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_TXS_PROPOSAL, txs_proposal);
+  pub fn add_txs_proposal(&mut self, txs_proposal: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Header::VT_TXS_PROPOSAL, txs_proposal);
   }
   #[inline]
   pub fn add_difficulty(&mut self, difficulty: flatbuffers::WIPOffset<Bytes<'b >>) {
@@ -808,12 +1172,12 @@ impl<'a: 'b, 'b> HeaderBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_PROOF, proof);
   }
   #[inline]
-  pub fn add_cellbase_id(&mut self, cellbase_id: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_CELLBASE_ID, cellbase_id);
+  pub fn add_cellbase_id(&mut self, cellbase_id: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Header::VT_CELLBASE_ID, cellbase_id);
   }
   #[inline]
-  pub fn add_uncles_hash(&mut self, uncles_hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Header::VT_UNCLES_HASH, uncles_hash);
+  pub fn add_uncles_hash(&mut self, uncles_hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Header::VT_UNCLES_HASH, uncles_hash);
   }
   #[inline]
   pub fn add_uncles_count(&mut self, uncles_count: u32) {
@@ -888,8 +1252,8 @@ impl<'a> Block<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Transaction<'a>>>>>(Block::VT_COMMIT_TRANSACTIONS, None)
   }
   #[inline]
-  pub fn proposal_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(Block::VT_PROPOSAL_TRANSACTIONS, None)
+  pub fn proposal_transactions(&self) -> Option<&'a [ProposalShortId]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<ProposalShortId>>>(Block::VT_PROPOSAL_TRANSACTIONS, None).map(|v| v.safe_slice() )
   }
 }
 
@@ -897,7 +1261,7 @@ pub struct BlockArgs<'a> {
     pub header: Option<flatbuffers::WIPOffset<Header<'a >>>,
     pub uncles: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<UncleBlock<'a >>>>>,
     pub commit_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Transaction<'a >>>>>,
-    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
+    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , ProposalShortId>>>,
 }
 impl<'a> Default for BlockArgs<'a> {
     #[inline]
@@ -928,7 +1292,7 @@ impl<'a: 'b, 'b> BlockBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(Block::VT_COMMIT_TRANSACTIONS, commit_transactions);
   }
   #[inline]
-  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , ProposalShortId>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(Block::VT_PROPOSAL_TRANSACTIONS, proposal_transactions);
   }
   #[inline]
@@ -994,15 +1358,15 @@ impl<'a> UncleBlock<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<Transaction<'a>>>(UncleBlock::VT_CELLBASE, None)
   }
   #[inline]
-  pub fn proposal_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(UncleBlock::VT_PROPOSAL_TRANSACTIONS, None)
+  pub fn proposal_transactions(&self) -> Option<&'a [ProposalShortId]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<ProposalShortId>>>(UncleBlock::VT_PROPOSAL_TRANSACTIONS, None).map(|v| v.safe_slice() )
   }
 }
 
 pub struct UncleBlockArgs<'a> {
     pub header: Option<flatbuffers::WIPOffset<Header<'a >>>,
     pub cellbase: Option<flatbuffers::WIPOffset<Transaction<'a >>>,
-    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
+    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , ProposalShortId>>>,
 }
 impl<'a> Default for UncleBlockArgs<'a> {
     #[inline]
@@ -1028,7 +1392,7 @@ impl<'a: 'b, 'b> UncleBlockBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Transaction>>(UncleBlock::VT_CELLBASE, cellbase);
   }
   #[inline]
-  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , ProposalShortId>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(UncleBlock::VT_PROPOSAL_TRANSACTIONS, proposal_transactions);
   }
   #[inline]
@@ -1196,8 +1560,8 @@ impl<'a> OutPoint<'a> {
     pub const VT_INDEX: flatbuffers::VOffsetT = 6;
 
   #[inline]
-  pub fn hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(OutPoint::VT_HASH, None)
+  pub fn hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(OutPoint::VT_HASH, None)
   }
   #[inline]
   pub fn index(&self) -> u32 {
@@ -1206,7 +1570,7 @@ impl<'a> OutPoint<'a> {
 }
 
 pub struct OutPointArgs<'a> {
-    pub hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub hash: Option<&'a  H256>,
     pub index: u32,
 }
 impl<'a> Default for OutPointArgs<'a> {
@@ -1224,8 +1588,8 @@ pub struct OutPointBuilder<'a: 'b, 'b> {
 }
 impl<'a: 'b, 'b> OutPointBuilder<'a, 'b> {
   #[inline]
-  pub fn add_hash(&mut self, hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(OutPoint::VT_HASH, hash);
+  pub fn add_hash(&mut self, hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(OutPoint::VT_HASH, hash);
   }
   #[inline]
   pub fn add_index(&mut self, index: u32) {
@@ -1286,8 +1650,8 @@ impl<'a> CellInput<'a> {
     pub const VT_UNLOCK: flatbuffers::VOffsetT = 8;
 
   #[inline]
-  pub fn hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(CellInput::VT_HASH, None)
+  pub fn hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(CellInput::VT_HASH, None)
   }
   #[inline]
   pub fn index(&self) -> u32 {
@@ -1300,7 +1664,7 @@ impl<'a> CellInput<'a> {
 }
 
 pub struct CellInputArgs<'a> {
-    pub hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub hash: Option<&'a  H256>,
     pub index: u32,
     pub unlock: Option<flatbuffers::WIPOffset<Script<'a >>>,
 }
@@ -1320,8 +1684,8 @@ pub struct CellInputBuilder<'a: 'b, 'b> {
 }
 impl<'a: 'b, 'b> CellInputBuilder<'a, 'b> {
   #[inline]
-  pub fn add_hash(&mut self, hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(CellInput::VT_HASH, hash);
+  pub fn add_hash(&mut self, hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(CellInput::VT_HASH, hash);
   }
   #[inline]
   pub fn add_index(&mut self, index: u32) {
@@ -1376,7 +1740,7 @@ impl<'a> CellOutput<'a> {
         args: &'args CellOutputArgs<'args>) -> flatbuffers::WIPOffset<CellOutput<'bldr>> {
       let mut builder = CellOutputBuilder::new(_fbb);
       builder.add_capacity(args.capacity);
-      if let Some(x) = args.contract { builder.add_contract(x); }
+      if let Some(x) = args.type_ { builder.add_type_(x); }
       if let Some(x) = args.lock { builder.add_lock(x); }
       if let Some(x) = args.data { builder.add_data(x); }
       builder.finish()
@@ -1385,7 +1749,7 @@ impl<'a> CellOutput<'a> {
     pub const VT_CAPACITY: flatbuffers::VOffsetT = 4;
     pub const VT_DATA: flatbuffers::VOffsetT = 6;
     pub const VT_LOCK: flatbuffers::VOffsetT = 8;
-    pub const VT_CONTRACT: flatbuffers::VOffsetT = 10;
+    pub const VT_TYPE_: flatbuffers::VOffsetT = 10;
 
   #[inline]
   pub fn capacity(&self) -> u64 {
@@ -1396,20 +1760,20 @@ impl<'a> CellOutput<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(CellOutput::VT_DATA, None)
   }
   #[inline]
-  pub fn lock(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(CellOutput::VT_LOCK, None)
+  pub fn lock(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(CellOutput::VT_LOCK, None)
   }
   #[inline]
-  pub fn contract(&self) -> Option<Script<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Script<'a>>>(CellOutput::VT_CONTRACT, None)
+  pub fn type_(&self) -> Option<Script<'a>> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<Script<'a>>>(CellOutput::VT_TYPE_, None)
   }
 }
 
 pub struct CellOutputArgs<'a> {
     pub capacity: u64,
     pub data: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub lock: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub contract: Option<flatbuffers::WIPOffset<Script<'a >>>,
+    pub lock: Option<&'a  H256>,
+    pub type_: Option<flatbuffers::WIPOffset<Script<'a >>>,
 }
 impl<'a> Default for CellOutputArgs<'a> {
     #[inline]
@@ -1418,7 +1782,7 @@ impl<'a> Default for CellOutputArgs<'a> {
             capacity: 0,
             data: None,
             lock: None,
-            contract: None,
+            type_: None,
         }
     }
 }
@@ -1436,12 +1800,12 @@ impl<'a: 'b, 'b> CellOutputBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(CellOutput::VT_DATA, data);
   }
   #[inline]
-  pub fn add_lock(&mut self, lock: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(CellOutput::VT_LOCK, lock);
+  pub fn add_lock(&mut self, lock: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(CellOutput::VT_LOCK, lock);
   }
   #[inline]
-  pub fn add_contract(&mut self, contract: flatbuffers::WIPOffset<Script<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Script>>(CellOutput::VT_CONTRACT, contract);
+  pub fn add_type_(&mut self, type_: flatbuffers::WIPOffset<Script<'b >>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Script>>(CellOutput::VT_TYPE_, type_);
   }
   #[inline]
   pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> CellOutputBuilder<'a, 'b> {
@@ -1514,8 +1878,8 @@ impl<'a> Script<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Script::VT_BINARY, None)
   }
   #[inline]
-  pub fn reference(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(Script::VT_REFERENCE, None)
+  pub fn reference(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(Script::VT_REFERENCE, None)
   }
   #[inline]
   pub fn signed_args(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
@@ -1527,7 +1891,7 @@ pub struct ScriptArgs<'a> {
     pub version: u8,
     pub args: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
     pub binary: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
-    pub reference: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub reference: Option<&'a  H256>,
     pub signed_args: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
 }
 impl<'a> Default for ScriptArgs<'a> {
@@ -1560,8 +1924,8 @@ impl<'a: 'b, 'b> ScriptBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Script::VT_BINARY, binary);
   }
   #[inline]
-  pub fn add_reference(&mut self, reference: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(Script::VT_REFERENCE, reference);
+  pub fn add_reference(&mut self, reference: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(Script::VT_REFERENCE, reference);
   }
   #[inline]
   pub fn add_signed_args(&mut self, signed_args: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
@@ -1788,16 +2152,16 @@ impl<'a> CompactBlock<'a> {
     self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(CompactBlock::VT_SHORT_IDS, None)
   }
   #[inline]
-  pub fn prefilled_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<PrefilledTransaction<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<PrefilledTransaction<'a>>>>>(CompactBlock::VT_PREFILLED_TRANSACTIONS, None)
+  pub fn prefilled_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<IndexTransaction<'a>>>> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<IndexTransaction<'a>>>>>(CompactBlock::VT_PREFILLED_TRANSACTIONS, None)
   }
   #[inline]
   pub fn uncles(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<UncleBlock<'a>>>> {
     self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<UncleBlock<'a>>>>>(CompactBlock::VT_UNCLES, None)
   }
   #[inline]
-  pub fn proposal_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(CompactBlock::VT_PROPOSAL_TRANSACTIONS, None)
+  pub fn proposal_transactions(&self) -> Option<&'a [ProposalShortId]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<ProposalShortId>>>(CompactBlock::VT_PROPOSAL_TRANSACTIONS, None).map(|v| v.safe_slice() )
   }
 }
 
@@ -1805,9 +2169,9 @@ pub struct CompactBlockArgs<'a> {
     pub header: Option<flatbuffers::WIPOffset<Header<'a >>>,
     pub nonce: u64,
     pub short_ids: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
-    pub prefilled_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<PrefilledTransaction<'a >>>>>,
+    pub prefilled_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<IndexTransaction<'a >>>>>,
     pub uncles: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<UncleBlock<'a >>>>>,
-    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
+    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , ProposalShortId>>>,
 }
 impl<'a> Default for CompactBlockArgs<'a> {
     #[inline]
@@ -1840,7 +2204,7 @@ impl<'a: 'b, 'b> CompactBlockBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(CompactBlock::VT_SHORT_IDS, short_ids);
   }
   #[inline]
-  pub fn add_prefilled_transactions(&mut self, prefilled_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<PrefilledTransaction<'b >>>>) {
+  pub fn add_prefilled_transactions(&mut self, prefilled_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<IndexTransaction<'b >>>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(CompactBlock::VT_PREFILLED_TRANSACTIONS, prefilled_transactions);
   }
   #[inline]
@@ -1848,7 +2212,7 @@ impl<'a: 'b, 'b> CompactBlockBuilder<'a, 'b> {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(CompactBlock::VT_UNCLES, uncles);
   }
   #[inline]
-  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , ProposalShortId>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(CompactBlock::VT_PROPOSAL_TRANSACTIONS, proposal_transactions);
   }
   #[inline]
@@ -1866,15 +2230,15 @@ impl<'a: 'b, 'b> CompactBlockBuilder<'a, 'b> {
   }
 }
 
-pub enum PrefilledTransactionOffset {}
+pub enum IndexTransactionOffset {}
 #[derive(Copy, Clone, Debug, PartialEq)]
 
-pub struct PrefilledTransaction<'a> {
+pub struct IndexTransaction<'a> {
   pub _tab: flatbuffers::Table<'a>,
 }
 
-impl<'a> flatbuffers::Follow<'a> for PrefilledTransaction<'a> {
-    type Inner = PrefilledTransaction<'a>;
+impl<'a> flatbuffers::Follow<'a> for IndexTransaction<'a> {
+    type Inner = IndexTransaction<'a>;
     #[inline]
     fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
         Self {
@@ -1883,18 +2247,18 @@ impl<'a> flatbuffers::Follow<'a> for PrefilledTransaction<'a> {
     }
 }
 
-impl<'a> PrefilledTransaction<'a> {
+impl<'a> IndexTransaction<'a> {
     #[inline]
     pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
-        PrefilledTransaction {
+        IndexTransaction {
             _tab: table,
         }
     }
     #[allow(unused_mut)]
     pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
         _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
-        args: &'args PrefilledTransactionArgs<'args>) -> flatbuffers::WIPOffset<PrefilledTransaction<'bldr>> {
-      let mut builder = PrefilledTransactionBuilder::new(_fbb);
+        args: &'args IndexTransactionArgs<'args>) -> flatbuffers::WIPOffset<IndexTransaction<'bldr>> {
+      let mut builder = IndexTransactionBuilder::new(_fbb);
       if let Some(x) = args.transaction { builder.add_transaction(x); }
       builder.add_index(args.index);
       builder.finish()
@@ -1905,50 +2269,50 @@ impl<'a> PrefilledTransaction<'a> {
 
   #[inline]
   pub fn index(&self) -> u32 {
-    self._tab.get::<u32>(PrefilledTransaction::VT_INDEX, Some(0)).unwrap()
+    self._tab.get::<u32>(IndexTransaction::VT_INDEX, Some(0)).unwrap()
   }
   #[inline]
   pub fn transaction(&self) -> Option<Transaction<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Transaction<'a>>>(PrefilledTransaction::VT_TRANSACTION, None)
+    self._tab.get::<flatbuffers::ForwardsUOffset<Transaction<'a>>>(IndexTransaction::VT_TRANSACTION, None)
   }
 }
 
-pub struct PrefilledTransactionArgs<'a> {
+pub struct IndexTransactionArgs<'a> {
     pub index: u32,
     pub transaction: Option<flatbuffers::WIPOffset<Transaction<'a >>>,
 }
-impl<'a> Default for PrefilledTransactionArgs<'a> {
+impl<'a> Default for IndexTransactionArgs<'a> {
     #[inline]
     fn default() -> Self {
-        PrefilledTransactionArgs {
+        IndexTransactionArgs {
             index: 0,
             transaction: None,
         }
     }
 }
-pub struct PrefilledTransactionBuilder<'a: 'b, 'b> {
+pub struct IndexTransactionBuilder<'a: 'b, 'b> {
   fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
   start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
 }
-impl<'a: 'b, 'b> PrefilledTransactionBuilder<'a, 'b> {
+impl<'a: 'b, 'b> IndexTransactionBuilder<'a, 'b> {
   #[inline]
   pub fn add_index(&mut self, index: u32) {
-    self.fbb_.push_slot::<u32>(PrefilledTransaction::VT_INDEX, index, 0);
+    self.fbb_.push_slot::<u32>(IndexTransaction::VT_INDEX, index, 0);
   }
   #[inline]
   pub fn add_transaction(&mut self, transaction: flatbuffers::WIPOffset<Transaction<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Transaction>>(PrefilledTransaction::VT_TRANSACTION, transaction);
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Transaction>>(IndexTransaction::VT_TRANSACTION, transaction);
   }
   #[inline]
-  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> PrefilledTransactionBuilder<'a, 'b> {
+  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> IndexTransactionBuilder<'a, 'b> {
     let start = _fbb.start_table();
-    PrefilledTransactionBuilder {
+    IndexTransactionBuilder {
       fbb_: _fbb,
       start_: start,
     }
   }
   #[inline]
-  pub fn finish(self) -> flatbuffers::WIPOffset<PrefilledTransaction<'a>> {
+  pub fn finish(self) -> flatbuffers::WIPOffset<IndexTransaction<'a>> {
     let o = self.fbb_.end_table(self.start_);
     flatbuffers::WIPOffset::new(o.value())
   }
@@ -1992,8 +2356,8 @@ impl<'a> GetBlockTransactions<'a> {
     pub const VT_INDEXES: flatbuffers::VOffsetT = 6;
 
   #[inline]
-  pub fn hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(GetBlockTransactions::VT_HASH, None)
+  pub fn hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(GetBlockTransactions::VT_HASH, None)
   }
   #[inline]
   pub fn indexes(&self) -> Option<flatbuffers::Vector<'a, u32>> {
@@ -2002,7 +2366,7 @@ impl<'a> GetBlockTransactions<'a> {
 }
 
 pub struct GetBlockTransactionsArgs<'a> {
-    pub hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub hash: Option<&'a  H256>,
     pub indexes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a ,  u32>>>,
 }
 impl<'a> Default for GetBlockTransactionsArgs<'a> {
@@ -2020,8 +2384,8 @@ pub struct GetBlockTransactionsBuilder<'a: 'b, 'b> {
 }
 impl<'a: 'b, 'b> GetBlockTransactionsBuilder<'a, 'b> {
   #[inline]
-  pub fn add_hash(&mut self, hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(GetBlockTransactions::VT_HASH, hash);
+  pub fn add_hash(&mut self, hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(GetBlockTransactions::VT_HASH, hash);
   }
   #[inline]
   pub fn add_indexes(&mut self, indexes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , u32>>) {
@@ -2080,8 +2444,8 @@ impl<'a> BlockTransactions<'a> {
     pub const VT_TRANSACTIONS: flatbuffers::VOffsetT = 6;
 
   #[inline]
-  pub fn hash(&self) -> Option<Bytes<'a>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<Bytes<'a>>>(BlockTransactions::VT_HASH, None)
+  pub fn hash(&self) -> Option<&'a H256> {
+    self._tab.get::<H256>(BlockTransactions::VT_HASH, None)
   }
   #[inline]
   pub fn transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Transaction<'a>>>> {
@@ -2090,7 +2454,7 @@ impl<'a> BlockTransactions<'a> {
 }
 
 pub struct BlockTransactionsArgs<'a> {
-    pub hash: Option<flatbuffers::WIPOffset<Bytes<'a >>>,
+    pub hash: Option<&'a  H256>,
     pub transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Transaction<'a >>>>>,
 }
 impl<'a> Default for BlockTransactionsArgs<'a> {
@@ -2108,8 +2472,8 @@ pub struct BlockTransactionsBuilder<'a: 'b, 'b> {
 }
 impl<'a: 'b, 'b> BlockTransactionsBuilder<'a, 'b> {
   #[inline]
-  pub fn add_hash(&mut self, hash: flatbuffers::WIPOffset<Bytes<'b >>) {
-    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Bytes>>(BlockTransactions::VT_HASH, hash);
+  pub fn add_hash(&mut self, hash: &'b  H256) {
+    self.fbb_.push_slot_always::<&H256>(BlockTransactions::VT_HASH, hash);
   }
   #[inline]
   pub fn add_transactions(&mut self, transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Transaction<'b >>>>) {
@@ -2172,14 +2536,14 @@ impl<'a> GetBlockProposal<'a> {
     self._tab.get::<u64>(GetBlockProposal::VT_BLOCK_NUMBER, Some(0)).unwrap()
   }
   #[inline]
-  pub fn proposal_transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>> {
-    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<Bytes<'a>>>>>(GetBlockProposal::VT_PROPOSAL_TRANSACTIONS, None)
+  pub fn proposal_transactions(&self) -> Option<&'a [ProposalShortId]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<ProposalShortId>>>(GetBlockProposal::VT_PROPOSAL_TRANSACTIONS, None).map(|v| v.safe_slice() )
   }
 }
 
 pub struct GetBlockProposalArgs<'a> {
     pub block_number: u64,
-    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<Bytes<'a >>>>>,
+    pub proposal_transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , ProposalShortId>>>,
 }
 impl<'a> Default for GetBlockProposalArgs<'a> {
     #[inline]
@@ -2200,7 +2564,7 @@ impl<'a: 'b, 'b> GetBlockProposalBuilder<'a, 'b> {
     self.fbb_.push_slot::<u64>(GetBlockProposal::VT_BLOCK_NUMBER, block_number, 0);
   }
   #[inline]
-  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<Bytes<'b >>>>) {
+  pub fn add_proposal_transactions(&mut self, proposal_transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , ProposalShortId>>) {
     self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(GetBlockProposal::VT_PROPOSAL_TRANSACTIONS, proposal_transactions);
   }
   #[inline]
@@ -2294,6 +2658,345 @@ impl<'a: 'b, 'b> BlockProposalBuilder<'a, 'b> {
   }
 }
 
+pub enum SetFilterOffset {}
+#[derive(Copy, Clone, Debug, PartialEq)]
+
+pub struct SetFilter<'a> {
+  pub _tab: flatbuffers::Table<'a>,
+}
+
+impl<'a> flatbuffers::Follow<'a> for SetFilter<'a> {
+    type Inner = SetFilter<'a>;
+    #[inline]
+    fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+        Self {
+            _tab: flatbuffers::Table { buf: buf, loc: loc },
+        }
+    }
+}
+
+impl<'a> SetFilter<'a> {
+    #[inline]
+    pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
+        SetFilter {
+            _tab: table,
+        }
+    }
+    #[allow(unused_mut)]
+    pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
+        _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
+        args: &'args SetFilterArgs<'args>) -> flatbuffers::WIPOffset<SetFilter<'bldr>> {
+      let mut builder = SetFilterBuilder::new(_fbb);
+      builder.add_hash_seed(args.hash_seed);
+      if let Some(x) = args.filter { builder.add_filter(x); }
+      builder.add_num_hashes(args.num_hashes);
+      builder.finish()
+    }
+
+    pub const VT_FILTER: flatbuffers::VOffsetT = 4;
+    pub const VT_NUM_HASHES: flatbuffers::VOffsetT = 6;
+    pub const VT_HASH_SEED: flatbuffers::VOffsetT = 8;
+
+  #[inline]
+  pub fn filter(&self) -> Option<&'a [u8]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(SetFilter::VT_FILTER, None).map(|v| v.safe_slice())
+  }
+  #[inline]
+  pub fn num_hashes(&self) -> u8 {
+    self._tab.get::<u8>(SetFilter::VT_NUM_HASHES, Some(0)).unwrap()
+  }
+  #[inline]
+  pub fn hash_seed(&self) -> u32 {
+    self._tab.get::<u32>(SetFilter::VT_HASH_SEED, Some(0)).unwrap()
+  }
+}
+
+pub struct SetFilterArgs<'a> {
+    pub filter: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a ,  u8>>>,
+    pub num_hashes: u8,
+    pub hash_seed: u32,
+}
+impl<'a> Default for SetFilterArgs<'a> {
+    #[inline]
+    fn default() -> Self {
+        SetFilterArgs {
+            filter: None,
+            num_hashes: 0,
+            hash_seed: 0,
+        }
+    }
+}
+pub struct SetFilterBuilder<'a: 'b, 'b> {
+  fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
+  start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
+}
+impl<'a: 'b, 'b> SetFilterBuilder<'a, 'b> {
+  #[inline]
+  pub fn add_filter(&mut self, filter: flatbuffers::WIPOffset<flatbuffers::Vector<'b , u8>>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(SetFilter::VT_FILTER, filter);
+  }
+  #[inline]
+  pub fn add_num_hashes(&mut self, num_hashes: u8) {
+    self.fbb_.push_slot::<u8>(SetFilter::VT_NUM_HASHES, num_hashes, 0);
+  }
+  #[inline]
+  pub fn add_hash_seed(&mut self, hash_seed: u32) {
+    self.fbb_.push_slot::<u32>(SetFilter::VT_HASH_SEED, hash_seed, 0);
+  }
+  #[inline]
+  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> SetFilterBuilder<'a, 'b> {
+    let start = _fbb.start_table();
+    SetFilterBuilder {
+      fbb_: _fbb,
+      start_: start,
+    }
+  }
+  #[inline]
+  pub fn finish(self) -> flatbuffers::WIPOffset<SetFilter<'a>> {
+    let o = self.fbb_.end_table(self.start_);
+    flatbuffers::WIPOffset::new(o.value())
+  }
+}
+
+pub enum AddFilterOffset {}
+#[derive(Copy, Clone, Debug, PartialEq)]
+
+pub struct AddFilter<'a> {
+  pub _tab: flatbuffers::Table<'a>,
+}
+
+impl<'a> flatbuffers::Follow<'a> for AddFilter<'a> {
+    type Inner = AddFilter<'a>;
+    #[inline]
+    fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+        Self {
+            _tab: flatbuffers::Table { buf: buf, loc: loc },
+        }
+    }
+}
+
+impl<'a> AddFilter<'a> {
+    #[inline]
+    pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
+        AddFilter {
+            _tab: table,
+        }
+    }
+    #[allow(unused_mut)]
+    pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
+        _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
+        args: &'args AddFilterArgs<'args>) -> flatbuffers::WIPOffset<AddFilter<'bldr>> {
+      let mut builder = AddFilterBuilder::new(_fbb);
+      if let Some(x) = args.filter { builder.add_filter(x); }
+      builder.finish()
+    }
+
+    pub const VT_FILTER: flatbuffers::VOffsetT = 4;
+
+  #[inline]
+  pub fn filter(&self) -> Option<&'a [u8]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<'a, u8>>>(AddFilter::VT_FILTER, None).map(|v| v.safe_slice())
+  }
+}
+
+pub struct AddFilterArgs<'a> {
+    pub filter: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a ,  u8>>>,
+}
+impl<'a> Default for AddFilterArgs<'a> {
+    #[inline]
+    fn default() -> Self {
+        AddFilterArgs {
+            filter: None,
+        }
+    }
+}
+pub struct AddFilterBuilder<'a: 'b, 'b> {
+  fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
+  start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
+}
+impl<'a: 'b, 'b> AddFilterBuilder<'a, 'b> {
+  #[inline]
+  pub fn add_filter(&mut self, filter: flatbuffers::WIPOffset<flatbuffers::Vector<'b , u8>>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(AddFilter::VT_FILTER, filter);
+  }
+  #[inline]
+  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> AddFilterBuilder<'a, 'b> {
+    let start = _fbb.start_table();
+    AddFilterBuilder {
+      fbb_: _fbb,
+      start_: start,
+    }
+  }
+  #[inline]
+  pub fn finish(self) -> flatbuffers::WIPOffset<AddFilter<'a>> {
+    let o = self.fbb_.end_table(self.start_);
+    flatbuffers::WIPOffset::new(o.value())
+  }
+}
+
+pub enum ClearFilterOffset {}
+#[derive(Copy, Clone, Debug, PartialEq)]
+
+pub struct ClearFilter<'a> {
+  pub _tab: flatbuffers::Table<'a>,
+}
+
+impl<'a> flatbuffers::Follow<'a> for ClearFilter<'a> {
+    type Inner = ClearFilter<'a>;
+    #[inline]
+    fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+        Self {
+            _tab: flatbuffers::Table { buf: buf, loc: loc },
+        }
+    }
+}
+
+impl<'a> ClearFilter<'a> {
+    #[inline]
+    pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
+        ClearFilter {
+            _tab: table,
+        }
+    }
+    #[allow(unused_mut)]
+    pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
+        _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
+        _args: &'args ClearFilterArgs) -> flatbuffers::WIPOffset<ClearFilter<'bldr>> {
+      let mut builder = ClearFilterBuilder::new(_fbb);
+      builder.finish()
+    }
+
+}
+
+pub struct ClearFilterArgs {
+}
+impl<'a> Default for ClearFilterArgs {
+    #[inline]
+    fn default() -> Self {
+        ClearFilterArgs {
+        }
+    }
+}
+pub struct ClearFilterBuilder<'a: 'b, 'b> {
+  fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
+  start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
+}
+impl<'a: 'b, 'b> ClearFilterBuilder<'a, 'b> {
+  #[inline]
+  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> ClearFilterBuilder<'a, 'b> {
+    let start = _fbb.start_table();
+    ClearFilterBuilder {
+      fbb_: _fbb,
+      start_: start,
+    }
+  }
+  #[inline]
+  pub fn finish(self) -> flatbuffers::WIPOffset<ClearFilter<'a>> {
+    let o = self.fbb_.end_table(self.start_);
+    flatbuffers::WIPOffset::new(o.value())
+  }
+}
+
+pub enum FilteredBlockOffset {}
+#[derive(Copy, Clone, Debug, PartialEq)]
+
+pub struct FilteredBlock<'a> {
+  pub _tab: flatbuffers::Table<'a>,
+}
+
+impl<'a> flatbuffers::Follow<'a> for FilteredBlock<'a> {
+    type Inner = FilteredBlock<'a>;
+    #[inline]
+    fn follow(buf: &'a [u8], loc: usize) -> Self::Inner {
+        Self {
+            _tab: flatbuffers::Table { buf: buf, loc: loc },
+        }
+    }
+}
+
+impl<'a> FilteredBlock<'a> {
+    #[inline]
+    pub fn init_from_table(table: flatbuffers::Table<'a>) -> Self {
+        FilteredBlock {
+            _tab: table,
+        }
+    }
+    #[allow(unused_mut)]
+    pub fn create<'bldr: 'args, 'args: 'mut_bldr, 'mut_bldr>(
+        _fbb: &'mut_bldr mut flatbuffers::FlatBufferBuilder<'bldr>,
+        args: &'args FilteredBlockArgs<'args>) -> flatbuffers::WIPOffset<FilteredBlock<'bldr>> {
+      let mut builder = FilteredBlockBuilder::new(_fbb);
+      if let Some(x) = args.hashes { builder.add_hashes(x); }
+      if let Some(x) = args.transactions { builder.add_transactions(x); }
+      if let Some(x) = args.header { builder.add_header(x); }
+      builder.finish()
+    }
+
+    pub const VT_HEADER: flatbuffers::VOffsetT = 4;
+    pub const VT_TRANSACTIONS: flatbuffers::VOffsetT = 6;
+    pub const VT_HASHES: flatbuffers::VOffsetT = 8;
+
+  #[inline]
+  pub fn header(&self) -> Option<Header<'a>> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<Header<'a>>>(FilteredBlock::VT_HEADER, None)
+  }
+  #[inline]
+  pub fn transactions(&self) -> Option<flatbuffers::Vector<flatbuffers::ForwardsUOffset<IndexTransaction<'a>>>> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<flatbuffers::ForwardsUOffset<IndexTransaction<'a>>>>>(FilteredBlock::VT_TRANSACTIONS, None)
+  }
+  #[inline]
+  pub fn hashes(&self) -> Option<&'a [H256]> {
+    self._tab.get::<flatbuffers::ForwardsUOffset<flatbuffers::Vector<H256>>>(FilteredBlock::VT_HASHES, None).map(|v| v.safe_slice() )
+  }
+}
+
+pub struct FilteredBlockArgs<'a> {
+    pub header: Option<flatbuffers::WIPOffset<Header<'a >>>,
+    pub transactions: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , flatbuffers::ForwardsUOffset<IndexTransaction<'a >>>>>,
+    pub hashes: Option<flatbuffers::WIPOffset<flatbuffers::Vector<'a , H256>>>,
+}
+impl<'a> Default for FilteredBlockArgs<'a> {
+    #[inline]
+    fn default() -> Self {
+        FilteredBlockArgs {
+            header: None,
+            transactions: None,
+            hashes: None,
+        }
+    }
+}
+pub struct FilteredBlockBuilder<'a: 'b, 'b> {
+  fbb_: &'b mut flatbuffers::FlatBufferBuilder<'a>,
+  start_: flatbuffers::WIPOffset<flatbuffers::TableUnfinishedWIPOffset>,
+}
+impl<'a: 'b, 'b> FilteredBlockBuilder<'a, 'b> {
+  #[inline]
+  pub fn add_header(&mut self, header: flatbuffers::WIPOffset<Header<'b >>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<Header>>(FilteredBlock::VT_HEADER, header);
+  }
+  #[inline]
+  pub fn add_transactions(&mut self, transactions: flatbuffers::WIPOffset<flatbuffers::Vector<'b , flatbuffers::ForwardsUOffset<IndexTransaction<'b >>>>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(FilteredBlock::VT_TRANSACTIONS, transactions);
+  }
+  #[inline]
+  pub fn add_hashes(&mut self, hashes: flatbuffers::WIPOffset<flatbuffers::Vector<'b , H256>>) {
+    self.fbb_.push_slot_always::<flatbuffers::WIPOffset<_>>(FilteredBlock::VT_HASHES, hashes);
+  }
+  #[inline]
+  pub fn new(_fbb: &'b mut flatbuffers::FlatBufferBuilder<'a>) -> FilteredBlockBuilder<'a, 'b> {
+    let start = _fbb.start_table();
+    FilteredBlockBuilder {
+      fbb_: _fbb,
+      start_: start,
+    }
+  }
+  #[inline]
+  pub fn finish(self) -> flatbuffers::WIPOffset<FilteredBlock<'a>> {
+    let o = self.fbb_.end_table(self.start_);
+    flatbuffers::WIPOffset::new(o.value())
+  }
+}
+
 #[inline]
 pub fn get_root_as_sync_message<'a>(buf: &'a [u8]) -> SyncMessage<'a> {
   flatbuffers::get_root::<SyncMessage<'a>>(buf)
diff --git a/rpc/Cargo.toml b/rpc/Cargo.toml
index f6860f3459..3df4d4e404 100644
--- a/rpc/Cargo.toml
+++ b/rpc/Cargo.toml
@@ -1,12 +1,13 @@
 [package]
 name = "ckb-rpc"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
 
 [dependencies]
 numext-fixed-hash = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] }
+numext-fixed-uint = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] }
 ckb-core = { path = "../core" }
 ckb-network = { path = "../network" }
 ckb-shared = { path = "../shared" }
@@ -27,7 +28,9 @@ serde_json = "1.0"
 log = "0.4"
 flatbuffers = "0.5.0"
 num_cpus = "1.0"
+faster-hex = "0.3"
 
 [dev-dependencies]
 ckb-db = { path = "../db" }
 ckb-verification = { path = "../verification" }
+proptest = "0.8"
diff --git a/rpc/doc.md b/rpc/doc.md
index 4718d63782..9af49d6e07 100644
--- a/rpc/doc.md
+++ b/rpc/doc.md
@@ -9,64 +9,62 @@ Returns the information about a block by hash.
 ## Examples
 
 ```shell
-curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_block","params": ["0x7643567cc0b8637505cce071ae764bc17a1d4e37579769c9a863d25841e48a07"]}' -H 'content-type:application/json' 'http://localhost:8114'
+curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_block","params": ["0x087c25e23e42f5d1e00e6984241b3711742d5e0eaf75d79a427276473e1de3f9"]}' -H 'content-type:application/json' 'http://localhost:8114'
 ```
 
 ```json
 {
     "jsonrpc": "2.0",
     "result": {
-        "hash": "0x7643567cc0b8637505cce071ae764bc17a1d4e37579769c9a863d25841e48a07",
-        "header": {
-            "raw": {
-                "cellbase_id": "0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929",
-                "difficulty": "0x100",
-                "number": 1,
-                "parent_hash": "0x9b0bd5be9498a0b873d08e242fff306eec04fac7c59ce479b49ca92a8f649982",
-                "timestamp": 1544599720510,
-                "txs_commit": "0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929",
-                "txs_proposal": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                "uncles_count": 0,
-                "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                "version": 0
-            },
-            "seal": {
-                "nonce": 10545468520399447721,
-                "proof": [163, 13, 0, 0, 12, 17, 0, 0, 98, 28, 0, 0, 240, 60, 0, 0, 200, 62, 0, 0, 12, 76, 0, 0, 6, 93, 0, 0, 247, 93, 0, 0, 107, 97, 0, 0, 230, 100, 0, 0, 16, 103, 0, 0, 244, 107, 0, 0],
-            }
-        },
-        "transactions": [
+        "commit_transactions": [
             {
-                "hash": "0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929",
-                "transaction": {
-                    "deps": [],
-                    "inputs": [
-                        {
-                            "previous_output": {
-                                "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                                "index": 4294967295
-                            },
-                            "unlock": {
-                                "args": [],
-                                "binary": [1, 0, 0, 0, 0, 0, 0, 0],
-                                "reference": null,
-                                "signed_args": [],
-                                "version": 0
-                            }
-                        }
-                    ],
-                    "outputs": [
-                        {
-                            "capacity": 50000,
-                            "contract": null,
-                            "data": [],
-                            "lock": "0x321c1ca2887fb8eddaaa7e917399f71e63e03a1c83ff75ed12099a01115ea2ff"
+                "deps": [],
+                "hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
+                "inputs": [
+                    {
+                        "previous_output": {
+                            "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                            "index": 4294967295
+                        },
+                        "unlock": {
+                            "args": [],
+                            "binary": "0x0100000000000000",
+                            "reference": null,
+                            "signed_args": [],
+                            "version": 0
                         }
-                    ],
-                    "version": 0
-                }
+                    }
+                ],
+                "outputs": [
+                    {
+                        "capacity": 5000000,
+                        "data": "0x",
+                        "lock": "0x0da2fe99fe549e082d4ed483c2e968a89ea8d11aabf5d79e5cbf06522de6e674",
+                        "type": null
+                    }
+                ],
+                "version": 0
             }
-        ]
+        ],
+        "header": {
+            "cellbase_id": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
+            "difficulty": "0x100",
+            "hash": "0x087c25e23e42f5d1e00e6984241b3711742d5e0eaf75d79a427276473e1de3f9",
+            "number": 1,
+            "parent_hash": "0x9b0bd5be9498a0b873d08e242fff306eec04fac7c59ce479b49ca92a8f649982",
+            "seal": {
+                "nonce": 16394887283531791882,
+                "proof": "0xbd010000810200008a1300002e240000a9350000c4350000ea420000ca4d00005d5d0000766800004b6b000075730000"
+            },
+            "timestamp": 1545992487397,
+            "txs_commit": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
+            "txs_proposal": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "uncles_count": 0,
+            "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+            "version": 0
+        },
+        "proposal_transactions": [],
+        "uncles": []
     },
     "id": 2
 }
@@ -83,41 +81,39 @@ Returns the information about a transaction requested by transaction hash.
 ## Examples
 
 ```shell
-curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_transaction","params": ["0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929"]}' -H 'content-type:application/json' 'http://localhost:8114'
+curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_transaction","params": ["0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324"]}' -H 'content-type:application/json' 'http://localhost:8114'
 ```
 
 ```json
 {
     "jsonrpc": "2.0",
     "result": {
-        "hash": "0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929",
-        "transaction": {
-            "deps": [],
-            "inputs": [
-                {
-                    "previous_output": {
-                        "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-                        "index": 4294967295
-                    },
-                    "unlock": {
-                        "args": [],
-                        "binary": [1, 0, 0, 0, 0, 0, 0, 0],
-                        "reference": null,
-                        "signed_args": [],
-                        "version": 0
-                    }
-                }
-            ],
-            "outputs": [
-                {
-                    "capacity": 50000,
-                    "contract": null,
-                    "data": [],
-                    "lock": "0x321c1ca2887fb8eddaaa7e917399f71e63e03a1c83ff75ed12099a01115ea2ff"
+        "deps": [],
+        "hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324",
+        "inputs": [
+            {
+                "previous_output": {
+                    "hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+                    "index": 4294967295
+                },
+                "unlock": {
+                    "args": [],
+                    "binary": "0x0100000000000000",
+                    "reference": null,
+                    "signed_args": [],
+                    "version": 0
                 }
-            ],
-            "version": 0
-        }
+            }
+        ],
+        "outputs": [
+            {
+                "capacity": 5000000,
+                "data": "0x",
+                "lock": "0x0da2fe99fe549e082d4ed483c2e968a89ea8d11aabf5d79e5cbf06522de6e674",
+                "type": null
+            }
+        ],
+        "version": 0
     },
     "id": 2
 }
@@ -160,22 +156,21 @@ curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_tip_header","params": []}' -H
 {
     "jsonrpc": "2.0",
     "result": {
-        "raw": {
-            "cellbase_id": "0xfa531584947a905ca77ce4333bf49c9f20c97b4f464d2545584df946b3803a8b",
-            "difficulty": "0x100",
-            "number": 1246,
-            "parent_hash": "0xcacfcad12f3314138e929ac9833cb956fb42e4531ea5458c6a3c25fefeade315",
-            "timestamp": 1544600340130,
-            "txs_commit": "0xfa531584947a905ca77ce4333bf49c9f20c97b4f464d2545584df946b3803a8b",
-            "txs_proposal": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "uncles_count": 0,
-            "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
-            "version": 0
-        },
+        "cellbase_id": "0xa4ecd25e3b572dc078cf000bfa1d81f1b578eeb5245c166353682919d37ebf42",
+        "difficulty": "0x100",
+        "hash": "0x44483beaf890d4aac2b2df90a50d9236db4a810d08f0912c1981f4a1db8086fd",
+        "number": 37,
+        "parent_hash": "0x379e7f4e01c7264a27284571ff6c232229522fd462cb7ce2fd3d5252e3015d04",
         "seal": {
-            "nonce": 15789531258138942821,
-            "proof": [130, 6, 0, 0, 187, 6, 0, 0, 14, 8, 0, 0, 219, 18, 0, 0, 94, 39, 0, 0, 108, 70, 0, 0, 234, 71, 0, 0, 9, 75, 0, 0, 19, 91, 0, 0, 122, 96, 0, 0, 253, 98, 0, 0, 249, 121, 0, 0]
-        }
+            "nonce": 2288736367820038381,
+            "proof": "0x480a0000751200007f170000682f0000b1300000933d0000534a0000e34b0000f05c0000e5600000e87300005d750000"
+        },
+        "timestamp": 1545994242503,
+        "txs_commit": "0xa4ecd25e3b572dc078cf000bfa1d81f1b578eeb5245c166353682919d37ebf42",
+        "txs_proposal": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "uncles_count": 0,
+        "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000",
+        "version": 0
     },
     "id": 2
 }
@@ -247,7 +242,7 @@ curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_cells_by_type_hash","params":
 ```
 
 
-# get_current_cell
+# get_live_cell
 
 Returns the information about a cell by out_point.
 
@@ -258,7 +253,7 @@ Returns the information about a cell by out_point.
 ## Examples
 
 ```shell
-curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_current_cell","params": [{"hash": "0xbddb7c2559c2c3cdfc8f3cae2697ca75489521c352265cc9e60b4b2416ad5929", "index": 0}]}' -H 'content-type:application/json' 'http://localhost:8114'
+curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_live_cell","params": [{"hash": "0x3abd21e6e51674bb961bb4c5f3cee9faa5da30e64be10628dc1cef292cbae324", "index": 0}]}' -H 'content-type:application/json' 'http://localhost:8114'
 ```
 
 ```json
@@ -266,12 +261,12 @@ curl -d '{"id": 2, "jsonrpc": "2.0", "method":"get_current_cell","params": [{"ha
     "jsonrpc": "2.0",
     "result": {
         "cell": {
-            "capacity": 50000,
-            "contract": null,
-            "data": [],
-            "lock": "0x321c1ca2887fb8eddaaa7e917399f71e63e03a1c83ff75ed12099a01115ea2ff"
+            "capacity": 5000000,
+            "data": "0x",
+            "lock": "0x0da2fe99fe549e082d4ed483c2e968a89ea8d11aabf5d79e5cbf06522de6e674",
+            "type": null
         },
-        "status": "current"
+        "status": "live"
     },
     "id": 2
 }
diff --git a/rpc/src/config.rs b/rpc/src/config.rs
index a9503ddea4..f8d4c92bd8 100644
--- a/rpc/src/config.rs
+++ b/rpc/src/config.rs
@@ -1,31 +1,35 @@
 use serde_derive::Deserialize;
 
-const NET: &str = "Net";
-const CHAIN: &str = "Chain";
-const MINER: &str = "Miner";
-const POOL: &str = "Pool";
+#[derive(Clone, Debug, Copy, Eq, PartialEq, Deserialize)]
+pub enum Module {
+    Net,
+    Chain,
+    Miner,
+    Pool,
+}
 
 #[derive(Clone, Debug, PartialEq, Deserialize)]
 pub struct Config {
     pub listen_address: String,
     pub threads: Option<usize>,
-    pub modules: Vec<String>,
+    pub modules: Vec<Module>,
+    pub max_request_body_size: usize,
 }
 
 impl Config {
     pub(crate) fn net_enable(&self) -> bool {
-        self.modules.iter().any(|m| m == NET)
+        self.modules.contains(&Module::Net)
     }
 
     pub(crate) fn chain_enable(&self) -> bool {
-        self.modules.iter().any(|m| m == CHAIN)
+        self.modules.contains(&Module::Chain)
     }
 
     pub(crate) fn miner_enable(&self) -> bool {
-        self.modules.iter().any(|m| m == MINER)
+        self.modules.contains(&Module::Miner)
     }
 
     pub(crate) fn pool_enable(&self) -> bool {
-        self.modules.iter().any(|m| m == POOL)
+        self.modules.contains(&Module::Pool)
     }
 }
diff --git a/rpc/src/module/chain.rs b/rpc/src/module/chain.rs
index 33c7696408..13d50796ba 100644
--- a/rpc/src/module/chain.rs
+++ b/rpc/src/module/chain.rs
@@ -1,7 +1,6 @@
-use crate::types::{BlockWithHash, CellOutputWithOutPoint, CellWithStatus, TransactionWithHash};
+use crate::types::{Block, CellOutputWithOutPoint, CellWithStatus, Header, OutPoint, Transaction};
 use ckb_core::cell::CellProvider;
-use ckb_core::header::{BlockNumber, Header};
-use ckb_core::transaction::OutPoint;
+use ckb_core::BlockNumber;
 use ckb_shared::{
     index::ChainIndex,
     shared::{ChainProvider, Shared},
@@ -13,10 +12,10 @@ use numext_fixed_hash::H256;
 build_rpc_trait! {
     pub trait ChainRpc {
         #[rpc(name = "get_block")]
-        fn get_block(&self, _hash: H256) -> Result<Option<BlockWithHash>>;
+        fn get_block(&self, _hash: H256) -> Result<Option<Block>>;
 
         #[rpc(name = "get_transaction")]
-        fn get_transaction(&self, _hash: H256) -> Result<Option<TransactionWithHash>>;
+        fn get_transaction(&self, _hash: H256) -> Result<Option<Transaction>>;
 
         #[rpc(name = "get_block_hash")]
         fn get_block_hash(&self, _number: u64) -> Result<Option<H256>>;
@@ -32,8 +31,8 @@ build_rpc_trait! {
             _to: BlockNumber
         ) -> Result<Vec<CellOutputWithOutPoint>>;
 
-        #[rpc(name = "get_current_cell")]
-        fn get_current_cell(&self, _out_point: OutPoint) -> Result<CellWithStatus>;
+        #[rpc(name = "get_live_cell")]
+        fn get_live_cell(&self, _out_point: OutPoint) -> Result<CellWithStatus>;
 
         #[rpc(name = "get_tip_block_number")]
         fn get_tip_block_number(&self) -> Result<BlockNumber>;
@@ -45,12 +44,12 @@ pub(crate) struct ChainRpcImpl<CI> {
 }
 
 impl<CI: ChainIndex + 'static> ChainRpc for ChainRpcImpl<CI> {
-    fn get_block(&self, hash: H256) -> Result<Option<BlockWithHash>> {
-        Ok(self.shared.block(&hash).map(Into::into))
+    fn get_block(&self, hash: H256) -> Result<Option<Block>> {
+        Ok(self.shared.block(&hash).as_ref().map(Into::into))
     }
 
-    fn get_transaction(&self, hash: H256) -> Result<Option<TransactionWithHash>> {
-        Ok(self.shared.get_transaction(&hash).map(Into::into))
+    fn get_transaction(&self, hash: H256) -> Result<Option<Transaction>> {
+        Ok(self.shared.get_transaction(&hash).as_ref().map(Into::into))
     }
 
     fn get_block_hash(&self, number: BlockNumber) -> Result<Option<H256>> {
@@ -58,7 +57,7 @@ impl<CI: ChainIndex + 'static> ChainRpc for ChainRpcImpl<CI> {
     }
 
     fn get_tip_header(&self) -> Result<Header> {
-        Ok(self.shared.tip_header().read().inner().clone())
+        Ok(self.shared.tip_header().read().inner().into())
     }
 
     // TODO: we need to build a proper index instead of scanning every time
@@ -84,7 +83,10 @@ impl<CI: ChainIndex + 'static> ChainRpc for ChainRpcImpl<CI> {
                     for (i, output) in transaction.outputs().iter().enumerate() {
                         if output.lock == type_hash && (!transaction_meta.is_spent(i)) {
                             result.push(CellOutputWithOutPoint {
-                                out_point: OutPoint::new(transaction.hash().clone(), i as u32),
+                                out_point: OutPoint {
+                                    hash: transaction.hash().clone(),
+                                    index: i as u32,
+                                },
                                 capacity: output.capacity,
                                 lock: output.lock.clone(),
                             });
@@ -96,8 +98,8 @@ impl<CI: ChainIndex + 'static> ChainRpc for ChainRpcImpl<CI> {
         Ok(result)
     }
 
-    fn get_current_cell(&self, out_point: OutPoint) -> Result<CellWithStatus> {
-        Ok(self.shared.cell(&out_point).into())
+    fn get_live_cell(&self, out_point: OutPoint) -> Result<CellWithStatus> {
+        Ok(self.shared.cell(&(out_point.into())).into())
     }
 
     fn get_tip_block_number(&self) -> Result<BlockNumber> {
diff --git a/rpc/src/module/pool.rs b/rpc/src/module/pool.rs
index 473ffd80f6..d29197619f 100644
--- a/rpc/src/module/pool.rs
+++ b/rpc/src/module/pool.rs
@@ -1,4 +1,5 @@
-use ckb_core::transaction::Transaction;
+use crate::types::Transaction;
+use ckb_core::transaction::Transaction as CoreTransaction;
 use ckb_network::NetworkService;
 use ckb_pool::txs_pool::TransactionPoolController;
 use ckb_protocol::RelayMessage;
@@ -25,6 +26,7 @@ pub(crate) struct PoolRpcImpl {
 
 impl PoolRpc for PoolRpcImpl {
     fn send_transaction(&self, tx: Transaction) -> Result<H256> {
+        let tx: CoreTransaction = tx.into();
         let tx_hash = tx.hash().clone();
         let pool_result = self.tx_pool.add_transaction(tx.clone());
         debug!(target: "rpc", "send_transaction add to pool result: {:?}", pool_result);
diff --git a/rpc/src/server.rs b/rpc/src/server.rs
index fc881fd4d9..a81ec2a6a9 100644
--- a/rpc/src/server.rs
+++ b/rpc/src/server.rs
@@ -4,7 +4,6 @@ use crate::module::{
     NetworkRpc, NetworkRpcImpl, PoolRpc, PoolRpcImpl,
 };
 use ckb_chain::chain::ChainController;
-
 use ckb_miner::AgentController;
 use ckb_network::NetworkService;
 use ckb_pool::txs_pool::TransactionPoolController;
@@ -92,6 +91,7 @@ impl RpcServer {
                 AccessControlAllowOrigin::Any,
             ]))
             .threads(self.config.threads.unwrap_or_else(num_cpus::get))
+            .max_request_body_size(self.config.max_request_body_size)
             .start_http(&self.config.listen_address.parse().unwrap())
             .unwrap();
 
diff --git a/rpc/src/types.rs b/rpc/src/types.rs
index 8052d455cc..b6e7d8b914 100644
--- a/rpc/src/types.rs
+++ b/rpc/src/types.rs
@@ -1,72 +1,8 @@
-use ckb_core::block::Block;
-use ckb_core::cell::CellStatus;
-use ckb_core::header::Header;
-use ckb_core::transaction::{Capacity, CellOutput, OutPoint, Transaction};
-use numext_fixed_hash::H256;
-use serde_derive::Serialize;
-
-#[derive(Serialize)]
-pub struct TransactionWithHash {
-    pub hash: H256,
-    pub transaction: Transaction,
-}
-
-impl From<Transaction> for TransactionWithHash {
-    fn from(transaction: Transaction) -> Self {
-        Self {
-            hash: transaction.hash().clone(),
-            transaction,
-        }
-    }
-}
-
-#[derive(Serialize)]
-pub struct BlockWithHash {
-    pub hash: H256,
-    pub header: Header,
-    pub transactions: Vec<TransactionWithHash>,
-}
-
-impl From<Block> for BlockWithHash {
-    fn from(block: Block) -> Self {
-        Self {
-            header: block.header().clone(),
-            transactions: block
-                .commit_transactions()
-                .iter()
-                .map(|tx| tx.clone().into())
-                .collect(),
-            hash: block.header().hash().clone(),
-        }
-    }
-}
-
-// This is used as return value of get_cells_by_type_hash RPC:
-// it contains both OutPoint data used for referencing a cell, as well as
-// cell's own data such as lock and capacity
-#[derive(Serialize)]
-pub struct CellOutputWithOutPoint {
-    pub out_point: OutPoint,
-    pub capacity: Capacity,
-    pub lock: H256,
-}
-
-#[derive(Serialize)]
-pub struct CellWithStatus {
-    pub cell: Option<CellOutput>,
-    pub status: String,
-}
-
-impl From<CellStatus> for CellWithStatus {
-    fn from(status: CellStatus) -> Self {
-        let (cell, status) = match status {
-            CellStatus::Current(cell) => (Some(cell), "current"),
-            CellStatus::Old => (None, "old"),
-            CellStatus::Unknown => (None, "unknown"),
-        };
-        Self {
-            cell,
-            status: status.to_string(),
-        }
-    }
-}
+mod blockchain;
+mod bytes;
+mod proposal_short_id;
+mod response;
+
+pub use self::blockchain::{Block, Header, OutPoint, Transaction};
+pub use self::bytes::Bytes;
+pub use self::response::{CellOutputWithOutPoint, CellWithStatus};
diff --git a/rpc/src/types/blockchain.rs b/rpc/src/types/blockchain.rs
new file mode 100644
index 0000000000..5f838a4723
--- /dev/null
+++ b/rpc/src/types/blockchain.rs
@@ -0,0 +1,455 @@
+use crate::types::proposal_short_id::ProposalShortId;
+use crate::types::Bytes;
+use ckb_core::block::{Block as CoreBlock, BlockBuilder};
+use ckb_core::header::{Header as CoreHeader, HeaderBuilder, Seal as CoreSeal};
+use ckb_core::script::Script as CoreScript;
+use ckb_core::transaction::{
+    CellInput as CoreCellInput, CellOutput as CoreCellOutput, OutPoint as CoreOutPoint,
+    Transaction as CoreTransaction, TransactionBuilder,
+};
+use ckb_core::uncle::UncleBlock as CoreUncleBlock;
+use ckb_core::{BlockNumber, Capacity};
+use numext_fixed_hash::H256;
+use numext_fixed_uint::U256;
+use serde_derive::{Deserialize, Serialize};
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct Script {
+    pub(crate) version: u8,
+    pub(crate) args: Vec<Bytes>,
+    pub(crate) reference: Option<H256>,
+    pub(crate) binary: Option<Bytes>,
+    pub(crate) signed_args: Vec<Bytes>,
+}
+
+impl From<Script> for CoreScript {
+    fn from(json: Script) -> CoreScript {
+        let Script {
+            version,
+            args,
+            reference,
+            binary,
+            signed_args,
+        } = json;
+        CoreScript::new(
+            version,
+            args.into_iter().map(|arg| arg.into_vec()).collect(),
+            reference,
+            binary.map(|b| b.into_vec()),
+            signed_args.into_iter().map(|arg| arg.into_vec()).collect(),
+        )
+    }
+}
+
+impl From<CoreScript> for Script {
+    fn from(core: CoreScript) -> Script {
+        let (version, args, reference, binary, signed_args) = core.destruct();
+        Script {
+            version,
+            reference,
+            args: args.into_iter().map(Bytes::new).collect(),
+            binary: binary.map(Bytes::new),
+            signed_args: signed_args.into_iter().map(Bytes::new).collect(),
+        }
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct CellOutput {
+    pub(crate) capacity: Capacity,
+    pub(crate) data: Bytes,
+    pub(crate) lock: H256,
+    #[serde(rename = "type")]
+    pub(crate) type_: Option<Script>,
+}
+
+impl From<CoreCellOutput> for CellOutput {
+    fn from(core: CoreCellOutput) -> CellOutput {
+        let (capacity, data, lock, type_) = core.destruct();
+        CellOutput {
+            capacity,
+            data: Bytes::new(data),
+            lock,
+            type_: type_.map(Into::into),
+        }
+    }
+}
+
+impl From<CellOutput> for CoreCellOutput {
+    fn from(json: CellOutput) -> CoreCellOutput {
+        let CellOutput {
+            capacity,
+            data,
+            lock,
+            type_,
+        } = json;
+        CoreCellOutput::new(capacity, data.into_vec(), lock, type_.map(Into::into))
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct OutPoint {
+    pub(crate) hash: H256,
+    pub(crate) index: u32,
+}
+
+impl From<CoreOutPoint> for OutPoint {
+    fn from(core: CoreOutPoint) -> OutPoint {
+        let (hash, index) = core.destruct();
+        OutPoint { hash, index }
+    }
+}
+
+impl From<OutPoint> for CoreOutPoint {
+    fn from(json: OutPoint) -> CoreOutPoint {
+        let OutPoint { hash, index } = json;
+        CoreOutPoint::new(hash, index)
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct CellInput {
+    pub(crate) previous_output: OutPoint,
+    pub(crate) unlock: Script,
+}
+
+impl From<CoreCellInput> for CellInput {
+    fn from(core: CoreCellInput) -> CellInput {
+        let (previous_output, unlock) = core.destruct();
+        CellInput {
+            previous_output: previous_output.into(),
+            unlock: unlock.into(),
+        }
+    }
+}
+
+impl From<CellInput> for CoreCellInput {
+    fn from(json: CellInput) -> CoreCellInput {
+        let CellInput {
+            previous_output,
+            unlock,
+        } = json;
+        CoreCellInput::new(previous_output.into(), unlock.into())
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct Transaction {
+    pub(crate) version: u32,
+    pub(crate) deps: Vec<OutPoint>,
+    pub(crate) inputs: Vec<CellInput>,
+    pub(crate) outputs: Vec<CellOutput>,
+    #[serde(skip_deserializing)]
+    pub(crate) hash: H256,
+}
+
+impl<'a> From<&'a CoreTransaction> for Transaction {
+    fn from(core: &CoreTransaction) -> Transaction {
+        let hash = core.hash();
+
+        Transaction {
+            version: core.version(),
+            deps: core.deps().iter().cloned().map(Into::into).collect(),
+            inputs: core.inputs().iter().cloned().map(Into::into).collect(),
+            outputs: core.outputs().iter().cloned().map(Into::into).collect(),
+            hash,
+        }
+    }
+}
+
+impl From<Transaction> for CoreTransaction {
+    fn from(json: Transaction) -> CoreTransaction {
+        let Transaction {
+            version,
+            deps,
+            inputs,
+            outputs,
+            ..
+        } = json;
+
+        TransactionBuilder::default()
+            .version(version)
+            .deps(deps.into_iter().map(Into::into).collect())
+            .inputs(inputs.into_iter().map(Into::into).collect())
+            .outputs(outputs.into_iter().map(Into::into).collect())
+            .build()
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct Seal {
+    pub(crate) nonce: u64,
+    pub(crate) proof: Bytes,
+}
+
+impl From<CoreSeal> for Seal {
+    fn from(core: CoreSeal) -> Seal {
+        let (nonce, proof) = core.destruct();
+        Seal {
+            nonce,
+            proof: Bytes::new(proof),
+        }
+    }
+}
+
+impl From<Seal> for CoreSeal {
+    fn from(json: Seal) -> CoreSeal {
+        let Seal { nonce, proof } = json;
+        CoreSeal::new(nonce, proof.into_vec())
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct Header {
+    pub(crate) version: u32,
+    pub(crate) parent_hash: H256,
+    pub(crate) timestamp: u64,
+    pub(crate) number: BlockNumber,
+    pub(crate) txs_commit: H256,
+    pub(crate) txs_proposal: H256,
+    pub(crate) difficulty: U256,
+    pub(crate) cellbase_id: H256,
+    pub(crate) uncles_hash: H256,
+    pub(crate) uncles_count: u32,
+    pub(crate) seal: Seal,
+    #[serde(skip_deserializing)]
+    pub(crate) hash: H256,
+}
+
+impl<'a> From<&'a CoreHeader> for Header {
+    fn from(core: &CoreHeader) -> Header {
+        Header {
+            version: core.version(),
+            parent_hash: core.parent_hash().clone(),
+            timestamp: core.timestamp(),
+            number: core.number(),
+            txs_commit: core.txs_commit().clone(),
+            txs_proposal: core.txs_proposal().clone(),
+            difficulty: core.difficulty().clone(),
+            cellbase_id: core.cellbase_id().clone(),
+            uncles_hash: core.uncles_hash().clone(),
+            uncles_count: core.uncles_count(),
+            seal: core.seal().clone().into(),
+            hash: core.hash().clone(),
+        }
+    }
+}
+
+impl From<Header> for CoreHeader {
+    fn from(json: Header) -> CoreHeader {
+        let Header {
+            version,
+            parent_hash,
+            timestamp,
+            number,
+            txs_commit,
+            txs_proposal,
+            difficulty,
+            cellbase_id,
+            uncles_hash,
+            uncles_count,
+            seal,
+            ..
+        } = json;
+
+        HeaderBuilder::default()
+            .version(version)
+            .parent_hash(parent_hash)
+            .timestamp(timestamp)
+            .number(number)
+            .txs_commit(txs_commit)
+            .txs_proposal(txs_proposal)
+            .difficulty(difficulty)
+            .cellbase_id(cellbase_id)
+            .uncles_hash(uncles_hash)
+            .uncles_count(uncles_count)
+            .seal(seal.into())
+            .build()
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct UncleBlock {
+    pub(crate) header: Header,
+    pub(crate) cellbase: Transaction,
+    pub(crate) proposal_transactions: Vec<ProposalShortId>,
+}
+
+impl<'a> From<&'a CoreUncleBlock> for UncleBlock {
+    fn from(core: &CoreUncleBlock) -> UncleBlock {
+        UncleBlock {
+            header: core.header().into(),
+            cellbase: core.cellbase().into(),
+            proposal_transactions: core
+                .proposal_transactions()
+                .iter()
+                .cloned()
+                .map(Into::into)
+                .collect(),
+        }
+    }
+}
+
+impl From<UncleBlock> for CoreUncleBlock {
+    fn from(json: UncleBlock) -> CoreUncleBlock {
+        let UncleBlock {
+            header,
+            cellbase,
+            proposal_transactions,
+        } = json;
+        CoreUncleBlock::new(
+            header.into(),
+            cellbase.into(),
+            proposal_transactions.into_iter().map(Into::into).collect(),
+        )
+    }
+}
+
+#[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
+pub struct Block {
+    pub(crate) header: Header,
+    pub(crate) uncles: Vec<UncleBlock>,
+    pub(crate) commit_transactions: Vec<Transaction>,
+    pub(crate) proposal_transactions: Vec<ProposalShortId>,
+}
+
+impl<'a> From<&'a CoreBlock> for Block {
+    fn from(core: &CoreBlock) -> Block {
+        Block {
+            header: core.header().into(),
+            uncles: core.uncles().iter().map(Into::into).collect(),
+            commit_transactions: core.commit_transactions().iter().map(Into::into).collect(),
+            proposal_transactions: core
+                .proposal_transactions()
+                .iter()
+                .cloned()
+                .map(Into::into)
+                .collect(),
+        }
+    }
+}
+
+impl From<Block> for CoreBlock {
+    fn from(json: Block) -> CoreBlock {
+        let Block {
+            header,
+            uncles,
+            commit_transactions,
+            proposal_transactions,
+        } = json;
+
+        BlockBuilder::default()
+            .header(header.into())
+            .uncles(uncles.into_iter().map(Into::into).collect())
+            .commit_transactions(commit_transactions.into_iter().map(Into::into).collect())
+            .proposal_transactions(proposal_transactions.into_iter().map(Into::into).collect())
+            .build()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use ckb_core::transaction::ProposalShortId as CoreProposalShortId;
+    use proptest::{collection::size_range, prelude::any_with, proptest, proptest_helper};
+
+    fn mock_script(arg: Vec<u8>, binary: Vec<u8>, signed_arg: Vec<u8>) -> CoreScript {
+        CoreScript::new(
+            0,
+            vec![arg],
+            Some(H256::default()),
+            Some(binary),
+            vec![signed_arg],
+        )
+    }
+
+    fn mock_cell_output(
+        data: Vec<u8>,
+        arg: Vec<u8>,
+        binary: Vec<u8>,
+        signed_arg: Vec<u8>,
+    ) -> CoreCellOutput {
+        CoreCellOutput::new(
+            0,
+            data,
+            H256::default(),
+            Some(mock_script(arg, binary, signed_arg)),
+        )
+    }
+
+    fn mock_cell_input(arg: Vec<u8>, binary: Vec<u8>, signed_arg: Vec<u8>) -> CoreCellInput {
+        CoreCellInput::new(
+            CoreOutPoint::default(),
+            mock_script(arg, binary, signed_arg),
+        )
+    }
+
+    fn mock_full_tx(
+        data: Vec<u8>,
+        arg: Vec<u8>,
+        binary: Vec<u8>,
+        signed_arg: Vec<u8>,
+    ) -> CoreTransaction {
+        TransactionBuilder::default()
+            .deps(vec![CoreOutPoint::default()])
+            .inputs(vec![mock_cell_input(
+                arg.clone(),
+                binary.clone(),
+                signed_arg.clone(),
+            )])
+            .outputs(vec![mock_cell_output(data, arg, binary, signed_arg)])
+            .build()
+    }
+
+    fn mock_uncle(
+        data: Vec<u8>,
+        arg: Vec<u8>,
+        binary: Vec<u8>,
+        signed_arg: Vec<u8>,
+    ) -> CoreUncleBlock {
+        CoreUncleBlock::new(
+            HeaderBuilder::default().build(),
+            mock_full_tx(data, arg, binary, signed_arg),
+            vec![CoreProposalShortId::default()],
+        )
+    }
+
+    fn mock_full_block(
+        data: Vec<u8>,
+        arg: Vec<u8>,
+        binary: Vec<u8>,
+        signed_arg: Vec<u8>,
+    ) -> CoreBlock {
+        BlockBuilder::default()
+            .uncles(vec![mock_uncle(
+                data.clone(),
+                arg.clone(),
+                binary.clone(),
+                signed_arg.clone(),
+            )])
+            .commit_transactions(vec![mock_full_tx(data, arg, binary, signed_arg)])
+            .proposal_transactions(vec![CoreProposalShortId::default()])
+            .build()
+    }
+
+    fn _test_block_convert(data: Vec<u8>, arg: Vec<u8>, binary: Vec<u8>, signed_arg: Vec<u8>) {
+        let block = mock_full_block(data, arg, binary, signed_arg);
+        let json_block: Block = (&block).into();
+        let encoded = serde_json::to_string(&json_block).unwrap();
+        let decode: Block = serde_json::from_str(&encoded).unwrap();
+        let decode_block: CoreBlock = decode.into();
+        assert_eq!(decode_block, block);
+    }
+
+    proptest! {
+        #[test]
+        fn test_block_convert(
+            data in any_with::<Vec<u8>>(size_range(80).lift()),
+            arg in any_with::<Vec<u8>>(size_range(80).lift()),
+            binary in any_with::<Vec<u8>>(size_range(80).lift()),
+            signed_arg in any_with::<Vec<u8>>(size_range(80).lift())
+        ) {
+            _test_block_convert(data, arg, binary, signed_arg)
+        }
+    }
+}
diff --git a/rpc/src/types/bytes.rs b/rpc/src/types/bytes.rs
new file mode 100644
index 0000000000..406da52cdd
--- /dev/null
+++ b/rpc/src/types/bytes.rs
@@ -0,0 +1,75 @@
+use faster_hex::{hex_decode, hex_encode};
+use std::fmt;
+
+#[derive(Clone, Default, PartialEq, Eq, Hash, Debug)]
+pub struct Bytes(pub(crate) Vec<u8>);
+
+impl Bytes {
+    pub fn new(bytes: Vec<u8>) -> Bytes {
+        Bytes(bytes)
+    }
+
+    pub fn into_vec(self) -> Vec<u8> {
+        self.0
+    }
+
+    pub fn len(&self) -> usize {
+        self.0.len()
+    }
+}
+
+struct BytesVisitor;
+
+impl<'b> serde::de::Visitor<'b> for BytesVisitor {
+    type Value = Bytes;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "a 0x-prefixed hex string")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        if v.len() < 2 || &v[0..2] != "0x" || v.len() & 1 != 0 {
+            return Err(E::invalid_value(serde::de::Unexpected::Str(v), &self));
+        }
+        let bytes = &v.as_bytes()[2..];
+        if bytes.is_empty() {
+            return Ok(Bytes::new(vec![]));
+        }
+        let mut buffer = vec![0; bytes.len() / 2]; // we checked length
+        hex_decode(bytes, &mut buffer).map_err(|e| E::custom(format_args!("{:?}", e)))?;
+        Ok(Bytes::new(buffer))
+    }
+
+    fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        self.visit_str(&v)
+    }
+}
+
+impl serde::Serialize for Bytes {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut buffer = vec![0u8; self.len() * 2 + 2];
+        buffer[0] = b'0';
+        buffer[1] = b'x';
+        hex_encode(&self.0, &mut buffer[2..])
+            .map_err(|e| serde::ser::Error::custom(&format!("{}", e)))?;
+        serializer.serialize_str(unsafe { ::std::str::from_utf8_unchecked(&buffer) })
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for Bytes {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserializer.deserialize_str(BytesVisitor)
+    }
+}
diff --git a/rpc/src/types/proposal_short_id.rs b/rpc/src/types/proposal_short_id.rs
new file mode 100644
index 0000000000..92df03423d
--- /dev/null
+++ b/rpc/src/types/proposal_short_id.rs
@@ -0,0 +1,81 @@
+use ckb_core::transaction::ProposalShortId as CoreProposalShortId;
+use faster_hex::{hex_decode, hex_encode};
+use std::fmt;
+
+#[derive(Clone, Default, PartialEq, Eq, Hash, Debug)]
+pub struct ProposalShortId(pub(crate) [u8; 10]);
+
+impl ProposalShortId {
+    pub fn new(inner: [u8; 10]) -> ProposalShortId {
+        ProposalShortId(inner)
+    }
+
+    pub fn into_inner(self) -> [u8; 10] {
+        self.0
+    }
+}
+
+impl From<CoreProposalShortId> for ProposalShortId {
+    fn from(core: CoreProposalShortId) -> ProposalShortId {
+        ProposalShortId::new(core.into_inner())
+    }
+}
+
+impl From<ProposalShortId> for CoreProposalShortId {
+    fn from(json: ProposalShortId) -> CoreProposalShortId {
+        CoreProposalShortId::new(json.into_inner())
+    }
+}
+
+struct ProposalShortIdVisitor;
+
+impl<'b> serde::de::Visitor<'b> for ProposalShortIdVisitor {
+    type Value = ProposalShortId;
+
+    fn expecting(&self, formatter: &mut fmt::Formatter) -> fmt::Result {
+        write!(formatter, "a 0x-prefixed hex string")
+    }
+
+    fn visit_str<E>(self, v: &str) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        if v.len() < 2 || &v[0..2] != "0x" || v.len() != 22 {
+            return Err(E::invalid_value(serde::de::Unexpected::Str(v), &self));
+        }
+        let mut buffer = [0u8; 10]; // we checked length
+        hex_decode(&v.as_bytes()[2..], &mut buffer)
+            .map_err(|e| E::custom(format_args!("{:?}", e)))?;
+        Ok(ProposalShortId::new(buffer))
+    }
+
+    fn visit_string<E>(self, v: String) -> Result<Self::Value, E>
+    where
+        E: serde::de::Error,
+    {
+        self.visit_str(&v)
+    }
+}
+
+impl serde::Serialize for ProposalShortId {
+    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
+    where
+        S: serde::Serializer,
+    {
+        let mut buffer = [0u8; 22];
+        buffer[0] = b'0';
+        buffer[1] = b'x';
+        hex_encode(&self.0, &mut buffer[2..])
+            .map_err(|e| serde::ser::Error::custom(&format!("{}", e)))?;
+        serializer.serialize_str(unsafe { ::std::str::from_utf8_unchecked(&buffer) })
+    }
+}
+
+impl<'de> serde::Deserialize<'de> for ProposalShortId {
+    fn deserialize<D>(deserializer: D) -> Result<Self, D::Error>
+    where
+        D: serde::Deserializer<'de>,
+    {
+        deserializer.deserialize_str(ProposalShortIdVisitor)
+    }
+}
diff --git a/rpc/src/types/response.rs b/rpc/src/types/response.rs
new file mode 100644
index 0000000000..9ad44e4b4b
--- /dev/null
+++ b/rpc/src/types/response.rs
@@ -0,0 +1,35 @@
+use crate::types::blockchain::{CellOutput, OutPoint};
+use ckb_core::cell::CellStatus;
+use ckb_core::Capacity;
+use numext_fixed_hash::H256;
+use serde_derive::Serialize;
+
+// This is used as return value of get_cells_by_type_hash RPC:
+// it contains both OutPoint data used for referencing a cell, as well as
+// cell's own data such as lock and capacity
+#[derive(Serialize)]
+pub struct CellOutputWithOutPoint {
+    pub(crate) out_point: OutPoint,
+    pub(crate) capacity: Capacity,
+    pub(crate) lock: H256,
+}
+
+#[derive(Serialize)]
+pub struct CellWithStatus {
+    pub(crate) cell: Option<CellOutput>,
+    pub(crate) status: String,
+}
+
+impl From<CellStatus> for CellWithStatus {
+    fn from(status: CellStatus) -> Self {
+        let (cell, status) = match status {
+            CellStatus::Live(cell) => (Some(cell), "live"),
+            CellStatus::Dead => (None, "dead"),
+            CellStatus::Unknown => (None, "unknown"),
+        };
+        Self {
+            cell: cell.map(Into::into),
+            status: status.to_string(),
+        }
+    }
+}
diff --git a/rust-toolchain b/rust-toolchain
index 34aae156b1..6bae540243 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1 +1 @@
-1.31.0
+1.31.1
diff --git a/script/Cargo.toml b/script/Cargo.toml
index ad022549ea..ee96bb5dc7 100644
--- a/script/Cargo.toml
+++ b/script/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-script"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
@@ -11,8 +11,8 @@ byteorder = "1.2.2"
 crypto = {path = "../util/crypto"}
 ckb-core = { path = "../core" }
 hash = {path = "../util/hash"}
-ckb-vm = { git = "https://github.com/nervosnetwork/ckb-vm", rev = "1622ba0" }
-faster-hex = "0.1"
+ckb-vm = { git = "https://github.com/nervosnetwork/ckb-vm", rev = "dd90ed1" }
+faster-hex = "0.3"
 fnv = "1.0.3"
 flatbuffers = "0.5.0"
 log = "0.4"
diff --git a/script/src/cost_model.rs b/script/src/cost_model.rs
new file mode 100644
index 0000000000..b645e16fb3
--- /dev/null
+++ b/script/src/cost_model.rs
@@ -0,0 +1,79 @@
+use ckb_vm::{
+    instructions::{i, m, rvc},
+    Instruction,
+};
+
+pub fn instruction_cycles(i: &Instruction) -> u64 {
+    match i {
+        Instruction::I(i) => match i {
+            i::Instruction::I(i) => match i.inst() {
+                i::ItypeInstruction::JALR => 3,
+                i::ItypeInstruction::LD => 2,
+                i::ItypeInstruction::LW => 3,
+                i::ItypeInstruction::LH => 3,
+                i::ItypeInstruction::LB => 3,
+                i::ItypeInstruction::LWU => 3,
+                i::ItypeInstruction::LHU => 3,
+                i::ItypeInstruction::LBU => 3,
+                _ => 1,
+            },
+            i::Instruction::S(s) => match s.inst() {
+                // Here we choose to be explicit so as to avoid potential confusions.
+                i::StypeInstruction::SB => 3,
+                i::StypeInstruction::SH => 3,
+                i::StypeInstruction::SW => 3,
+                i::StypeInstruction::SD => 2,
+            },
+            i::Instruction::B(_) => 3,
+            // Cycles for Env instructions will be processed in the Env code.
+            i::Instruction::Env(_) => 0,
+            i::Instruction::JAL { .. } => 3,
+            _ => 1,
+        },
+        Instruction::RVC(i) => match i {
+            rvc::Instruction::Iu(i) => match i.inst() {
+                rvc::ItypeUInstruction::LW => 3,
+                rvc::ItypeUInstruction::LD => 2,
+                _ => 1,
+            },
+            rvc::Instruction::Su(s) => match s.inst() {
+                rvc::StypeUInstruction::SW => 3,
+                rvc::StypeUInstruction::SD => 2,
+                _ => 1,
+            },
+            rvc::Instruction::Uu(u) => match u.inst() {
+                rvc::UtypeUInstruction::LWSP => 3,
+                rvc::UtypeUInstruction::LDSP => 2,
+                _ => 1,
+            },
+            rvc::Instruction::CSS(c) => match c.inst() {
+                rvc::CSSformatInstruction::SWSP => 3,
+                rvc::CSSformatInstruction::SDSP => 2,
+                _ => 1,
+            },
+            rvc::Instruction::BEQZ { .. } => 3,
+            rvc::Instruction::BNEZ { .. } => 3,
+            rvc::Instruction::JAL { .. } => 3,
+            rvc::Instruction::J { .. } => 3,
+            rvc::Instruction::JR { .. } => 3,
+            rvc::Instruction::JALR { .. } => 3,
+            rvc::Instruction::EBREAK => 0,
+            _ => 1,
+        },
+        Instruction::M(m::Instruction(i)) => match i.inst() {
+            m::RtypeInstruction::MUL => 5,
+            m::RtypeInstruction::MULW => 5,
+            m::RtypeInstruction::MULH => 5,
+            m::RtypeInstruction::MULHU => 5,
+            m::RtypeInstruction::MULHSU => 5,
+            m::RtypeInstruction::DIV => 16,
+            m::RtypeInstruction::DIVW => 16,
+            m::RtypeInstruction::DIVU => 16,
+            m::RtypeInstruction::DIVUW => 16,
+            m::RtypeInstruction::REM => 16,
+            m::RtypeInstruction::REMW => 16,
+            m::RtypeInstruction::REMU => 16,
+            m::RtypeInstruction::REMUW => 16,
+        },
+    }
+}
diff --git a/script/src/lib.rs b/script/src/lib.rs
index 18f13b4837..2731ef1ea6 100644
--- a/script/src/lib.rs
+++ b/script/src/lib.rs
@@ -1,3 +1,4 @@
+mod cost_model;
 mod syscalls;
 mod verify;
 
@@ -12,4 +13,5 @@ pub enum ScriptError {
     ArgumentError,
     ValidationFailure(u8),
     VMError(VMInternalError),
+    ExceededMaximumCycles,
 }
diff --git a/script/src/syscalls/builder.rs b/script/src/syscalls/builder.rs
index b2e88a270f..e0a1206976 100644
--- a/script/src/syscalls/builder.rs
+++ b/script/src/syscalls/builder.rs
@@ -1,7 +1,7 @@
 use ckb_core::transaction::{CellInput, CellOutput, Transaction};
 use ckb_protocol::{
-    Bytes as FbsBytes, CellInput as FbsCellInput, CellInputBuilder, CellOutput as FbsCellOutput,
-    CellOutputBuilder, OutPoint as FbsOutPoint, Transaction as FbsTransaction, TransactionBuilder,
+    CellInput as FbsCellInput, CellInputBuilder, CellOutput as FbsCellOutput, CellOutputBuilder,
+    OutPoint as FbsOutPoint, Transaction as FbsTransaction, TransactionBuilder,
 };
 use flatbuffers::{FlatBufferBuilder, WIPOffset};
 
@@ -42,10 +42,10 @@ fn build_output<'b>(
     fbb: &mut FlatBufferBuilder<'b>,
     output: &CellOutput,
 ) -> WIPOffset<FbsCellOutput<'b>> {
-    let lock = FbsBytes::build(fbb, output.lock.as_bytes());
+    let lock = (&output.lock).into();
     let mut builder = CellOutputBuilder::new(fbb);
     builder.add_capacity(output.capacity);
-    builder.add_lock(lock);
+    builder.add_lock(&lock);
     builder.finish()
 }
 
@@ -53,9 +53,9 @@ fn build_input<'b>(
     fbb: &mut FlatBufferBuilder<'b>,
     input: &CellInput,
 ) -> WIPOffset<FbsCellInput<'b>> {
-    let hash = FbsBytes::build(fbb, input.previous_output.hash.as_bytes());
+    let hash = (&input.previous_output.hash).into();
     let mut builder = CellInputBuilder::new(fbb);
-    builder.add_hash(hash);
+    builder.add_hash(&hash);
     builder.add_index(input.previous_output.index);
     builder.finish()
 }
diff --git a/script/src/syscalls/debugger.rs b/script/src/syscalls/debugger.rs
index 5c5b6d5195..4bc2514f76 100644
--- a/script/src/syscalls/debugger.rs
+++ b/script/src/syscalls/debugger.rs
@@ -35,6 +35,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for Debugger<'a> {
             addr += 1;
         }
 
+        machine.add_cycles((buffer.len() as u64 + 1) * 10);
         let s = String::from_utf8(buffer).map_err(|_| VMError::ParseError)?;
         debug!(target: "script", "{} DEBUG OUTPUT: {}", self.prefix, s);
         Ok(true)
diff --git a/script/src/syscalls/fetch_script_hash.rs b/script/src/syscalls/fetch_script_hash.rs
index dc86bc8d9e..bfab1ab9eb 100644
--- a/script/src/syscalls/fetch_script_hash.rs
+++ b/script/src/syscalls/fetch_script_hash.rs
@@ -37,9 +37,9 @@ impl<'a> FetchScriptHash<'a> {
             (Source::INPUT, Category::CONTRACT) => {
                 self.input_cells.get(index).and_then(|input_cell| {
                     input_cell
-                        .contract
+                        .type_
                         .as_ref()
-                        .map(|contract| contract.type_hash())
+                        .map(|type_| type_.type_hash())
                 })
             }
             (Source::OUTPUT, Category::LOCK) => {
@@ -47,9 +47,9 @@ impl<'a> FetchScriptHash<'a> {
             }
             (Source::OUTPUT, Category::CONTRACT) => self.outputs.get(index).and_then(|output| {
                 output
-                    .contract
+                    .type_
                     .as_ref()
-                    .map(|contract| contract.type_hash())
+                    .map(|type_| type_.type_hash())
             }),
         }
     }
diff --git a/script/src/syscalls/load_cell.rs b/script/src/syscalls/load_cell.rs
index 5f5bd7fdc8..455d1147e9 100644
--- a/script/src/syscalls/load_cell.rs
+++ b/script/src/syscalls/load_cell.rs
@@ -47,6 +47,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadCell<'a> {
         if machine.registers()[A7].to_u64() != LOAD_CELL_SYSCALL_NUMBER {
             return Ok(false);
         }
+        machine.add_cycles(100);
 
         let addr = machine.registers()[A0].to_usize();
         let size_addr = machine.registers()[A1].to_usize();
@@ -84,6 +85,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadCell<'a> {
             .memory_mut()
             .store_bytes(addr, &data[offset..offset + real_size])?;
         machine.registers_mut()[A0] = R::from_u8(SUCCESS);
+        machine.add_cycles(data.len() as u64 * 100);
         Ok(true)
     }
 }
diff --git a/script/src/syscalls/load_cell_by_field.rs b/script/src/syscalls/load_cell_by_field.rs
index 0aa6f823cb..246d4064fb 100644
--- a/script/src/syscalls/load_cell_by_field.rs
+++ b/script/src/syscalls/load_cell_by_field.rs
@@ -49,6 +49,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadCellByField<'a> {
         if machine.registers()[A7].to_u64() != LOAD_CELL_BY_FIELD_SYSCALL_NUMBER {
             return Ok(false);
         }
+        machine.add_cycles(10);
 
         let index = machine.registers()[A3].to_usize();
         let source = Source::parse_from_u64(machine.registers()[A4].to_u64())?;
@@ -61,45 +62,51 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadCellByField<'a> {
         }
         let cell = cell.unwrap();
 
-        let return_code = match field {
+        let (return_code, data_length) = match field {
             CellField::Capacity => {
                 let mut buffer = vec![];
                 buffer.write_u64::<LittleEndian>(cell.capacity)?;
                 store_data(machine, &buffer)?;
-                SUCCESS
+                (SUCCESS, buffer.len())
             }
             CellField::Data => {
                 store_data(machine, &cell.data)?;
-                SUCCESS
+                (SUCCESS, cell.data.len())
             }
             CellField::DataHash => {
-                store_data(machine, &cell.data_hash().as_bytes())?;
-                SUCCESS
+                let hash = cell.data_hash();
+                let bytes = hash.as_bytes();
+                store_data(machine, &bytes)?;
+                (SUCCESS, bytes.len())
             }
             CellField::LockHash => {
-                store_data(machine, &cell.lock.as_bytes())?;
-                SUCCESS
+                let bytes = cell.lock.as_bytes();
+                store_data(machine, &bytes)?;
+                (SUCCESS, bytes.len())
             }
-            CellField::Contract => match cell.contract {
-                Some(ref contract) => {
+            CellField::Type => match cell.type_ {
+                Some(ref type_) => {
                     let mut builder = FlatBufferBuilder::new();
-                    let offset = FbsScript::build(&mut builder, &contract);
+                    let offset = FbsScript::build(&mut builder, &type_);
                     builder.finish(offset, None);
                     let data = builder.finished_data();
                     store_data(machine, data)?;
-                    SUCCESS
+                    (SUCCESS, data.len())
                 }
-                None => ITEM_MISSING,
+                None => (ITEM_MISSING, 0),
             },
-            CellField::ContractHash => match cell.contract {
-                Some(ref contract) => {
-                    store_data(machine, &contract.type_hash().as_bytes())?;
-                    SUCCESS
+            CellField::TypeHash => match cell.type_ {
+                Some(ref type_) => {
+                    let hash = type_.type_hash();
+                    let bytes = hash.as_bytes();
+                    store_data(machine, &bytes)?;
+                    (SUCCESS, bytes.len())
                 }
-                None => ITEM_MISSING,
+                None => (ITEM_MISSING, 0),
             },
         };
         machine.registers_mut()[A0] = R::from_u8(return_code);
+        machine.add_cycles(data_length as u64 * 10);
         Ok(true)
     }
 }
diff --git a/script/src/syscalls/load_input_by_field.rs b/script/src/syscalls/load_input_by_field.rs
index 061a4f991e..815f34f811 100644
--- a/script/src/syscalls/load_input_by_field.rs
+++ b/script/src/syscalls/load_input_by_field.rs
@@ -40,6 +40,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadInputByField<'a> {
         if machine.registers()[A7].to_u64() != LOAD_INPUT_BY_FIELD_SYSCALL_NUMBER {
             return Ok(false);
         }
+        machine.add_cycles(10);
 
         let index = machine.registers()[A3].to_usize();
         let source = Source::parse_from_u64(machine.registers()[A4].to_u64())?;
@@ -52,13 +53,14 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadInputByField<'a> {
         }
         let input = input.unwrap();
 
-        match field {
+        let data_length = match field {
             InputField::Unlock => {
                 let mut builder = FlatBufferBuilder::new();
                 let offset = FbsScript::build(&mut builder, &input.unlock);
                 builder.finish(offset, None);
                 let data = builder.finished_data();
                 store_data(machine, data)?;
+                data.len()
             }
             InputField::OutPoint => {
                 let mut builder = FlatBufferBuilder::new();
@@ -66,9 +68,11 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadInputByField<'a> {
                 builder.finish(offset, None);
                 let data = builder.finished_data();
                 store_data(machine, data)?;
+                data.len()
             }
         };
         machine.registers_mut()[A0] = R::from_u8(SUCCESS);
+        machine.add_cycles(data_length as u64 * 10);
         Ok(true)
     }
 }
diff --git a/script/src/syscalls/load_tx.rs b/script/src/syscalls/load_tx.rs
index 066195b8dd..6bf47f9b04 100644
--- a/script/src/syscalls/load_tx.rs
+++ b/script/src/syscalls/load_tx.rs
@@ -36,6 +36,7 @@ impl<'a, R: Register, M: Memory> Syscalls<R, M> for LoadTx<'a> {
             .memory_mut()
             .store_bytes(addr, &data[offset..offset + real_size])?;
         machine.registers_mut()[A0] = R::from_u8(SUCCESS);
+        machine.add_cycles((data.len() as u64 + 1) * 10);
         Ok(true)
     }
 }
diff --git a/script/src/syscalls/mod.rs b/script/src/syscalls/mod.rs
index bbf1f77b55..03f789f3a1 100644
--- a/script/src/syscalls/mod.rs
+++ b/script/src/syscalls/mod.rs
@@ -30,8 +30,8 @@ enum CellField {
     Data = 1,
     DataHash = 2,
     LockHash = 3,
-    Contract = 4,
-    ContractHash = 5,
+    Type = 4,
+    TypeHash = 5,
 }
 
 impl CellField {
@@ -41,8 +41,8 @@ impl CellField {
             1 => Ok(CellField::Data),
             2 => Ok(CellField::DataHash),
             3 => Ok(CellField::LockHash),
-            4 => Ok(CellField::Contract),
-            5 => Ok(CellField::ContractHash),
+            4 => Ok(CellField::Type),
+            5 => Ok(CellField::TypeHash),
             _ => Err(Error::ParseError),
         }
     }
@@ -594,7 +594,7 @@ mod tests {
         machine.registers_mut()[A2] = 0; // offset
         machine.registers_mut()[A3] = 0; //index
         machine.registers_mut()[A4] = Source::Output as u64; //source: 2 output
-        machine.registers_mut()[A5] = CellField::Contract as u64; //field: 4 contract
+        machine.registers_mut()[A5] = CellField::Type as u64; //field: 4 type
         machine.registers_mut()[A7] = LOAD_CELL_BY_FIELD_SYSCALL_NUMBER; // syscall number
 
         let output_cell = CellOutput::new(100, vec![], H256::default(), None);
diff --git a/script/src/verify.rs b/script/src/verify.rs
index 873bf5c367..ae6e9d8efd 100644
--- a/script/src/verify.rs
+++ b/script/src/verify.rs
@@ -1,10 +1,14 @@
-use crate::syscalls::{build_tx, Debugger, LoadCell, LoadCellByField, LoadInputByField, LoadTx};
-use crate::ScriptError;
+use crate::{
+    cost_model::instruction_cycles,
+    syscalls::{build_tx, Debugger, LoadCell, LoadCellByField, LoadInputByField, LoadTx},
+    ScriptError,
+};
 use ckb_core::cell::ResolvedTransaction;
 use ckb_core::script::Script;
 use ckb_core::transaction::{CellInput, CellOutput};
+use ckb_core::Cycle;
 use ckb_protocol::{FlatbuffersVectorIterator, Script as FbsScript};
-use ckb_vm::{DefaultMachine, SparseMemory};
+use ckb_vm::{CoreMachine, DefaultMachine, SparseMemory};
 use flatbuffers::{get_root, FlatBufferBuilder};
 use fnv::FnvHashMap;
 use log::info;
@@ -29,7 +33,7 @@ impl<'a> TransactionScriptsVerifier<'a> {
             .dep_cells
             .iter()
             .map(|cell| {
-                cell.get_current()
+                cell.get_live()
                     .expect("already verifies that all dep cells are valid")
             })
             .collect();
@@ -48,7 +52,7 @@ impl<'a> TransactionScriptsVerifier<'a> {
             .input_cells
             .iter()
             .map(|cell| {
-                cell.get_current()
+                cell.get_live()
                     .expect("already verifies that all input cells are valid")
             })
             .collect();
@@ -141,13 +145,17 @@ impl<'a> TransactionScriptsVerifier<'a> {
         prefix: &str,
         current_cell: &'a CellOutput,
         current_input: Option<&'a CellInput>,
-    ) -> Result<(), ScriptError> {
+        max_cycles: Cycle,
+    ) -> Result<Cycle, ScriptError> {
         let mut args = vec![b"verify".to_vec()];
         self.extract_script(script, &mut args)
             .and_then(|script_binary| {
                 args.extend_from_slice(&script.args.as_slice());
 
-                let mut machine = DefaultMachine::<u64, SparseMemory>::default();
+                let mut machine = DefaultMachine::<u64, SparseMemory>::new_with_cost_model(
+                    Box::new(instruction_cycles),
+                    max_cycles,
+                );
                 machine.add_syscall_module(Box::new(self.build_load_tx()));
                 machine.add_syscall_module(Box::new(self.build_load_cell(current_cell)));
                 machine.add_syscall_module(Box::new(self.build_load_cell_by_field(current_cell)));
@@ -158,7 +166,7 @@ impl<'a> TransactionScriptsVerifier<'a> {
                     .map_err(ScriptError::VMError)
                     .and_then(|code| {
                         if code == 0 {
-                            Ok(())
+                            Ok(machine.cycles())
                         } else {
                             Err(ScriptError::ValidationFailure(code))
                         }
@@ -166,24 +174,39 @@ impl<'a> TransactionScriptsVerifier<'a> {
             })
     }
 
-    pub fn verify(&self) -> Result<(), ScriptError> {
+    pub fn verify(&self, max_cycles: Cycle) -> Result<Cycle, ScriptError> {
+        let mut cycles = 0;
         for (i, input) in self.inputs.iter().enumerate() {
             let prefix = format!("Transaction {}, input {}", self.hash, i);
-            self.verify_script(&input.unlock, &prefix, self.input_cells[i], Some(input)).map_err(|e| {
+            let cycle = self.verify_script(&input.unlock, &prefix, self.input_cells[i], Some(input), max_cycles - cycles).map_err(|e| {
                 info!(target: "script", "Error validating input {} of transaction {}: {:?}", i, self.hash, e);
                 e
             })?;
+            let current_cycles = cycles
+                .checked_add(cycle)
+                .ok_or(ScriptError::ExceededMaximumCycles)?;
+            if current_cycles > max_cycles {
+                return Err(ScriptError::ExceededMaximumCycles);
+            }
+            cycles = current_cycles;
         }
         for (i, output) in self.outputs.iter().enumerate() {
-            if let Some(ref contract) = output.contract {
+            if let Some(ref type_) = output.type_ {
                 let prefix = format!("Transaction {}, output {}", self.hash, i);
-                self.verify_script(contract, &prefix, output, None).map_err(|e| {
+                let cycle = self.verify_script(type_, &prefix, output, None, max_cycles - cycles).map_err(|e| {
                     info!(target: "script", "Error validating output {} of transaction {}: {:?}", i, self.hash, e);
                     e
                 })?;
+                let current_cycles = cycles
+                    .checked_add(cycle)
+                    .ok_or(ScriptError::ExceededMaximumCycles)?;
+                if current_cycles > max_cycles {
+                    return Err(ScriptError::ExceededMaximumCycles);
+                }
+                cycles = current_cycles;
             }
         }
-        Ok(())
+        Ok(cycles)
     }
 }
 
@@ -195,7 +218,7 @@ mod tests {
     use ckb_core::transaction::{CellInput, CellOutput, OutPoint, TransactionBuilder};
     use ckb_core::Capacity;
     use crypto::secp::Generator;
-    use faster_hex::hex_to;
+    use faster_hex::hex_encode;
     use hash::sha3_256;
     use numext_fixed_hash::H256;
     use std::fs::File;
@@ -203,10 +226,7 @@ mod tests {
     use std::path::Path;
 
     fn open_cell_verify() -> File {
-        File::open(
-            Path::new(env!("CARGO_MANIFEST_DIR")).join("../nodes_template/spec/cells/verify"),
-        )
-        .unwrap()
+        File::open(Path::new(env!("CARGO_MANIFEST_DIR")).join("../script/testdata/verify")).unwrap()
     }
     fn open_cell_always_success() -> File {
         File::open(
@@ -236,12 +256,57 @@ mod tests {
 
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
+        args.insert(0, hex_signature);
+
+        let privkey = privkey.pubkey().unwrap().serialize();
+        let mut hex_privkey = vec![0; privkey.len() * 2];
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
+
+        let script = Script::new(0, args, None, Some(buffer), vec![hex_privkey]);
+        let input = CellInput::new(OutPoint::null(), script);
+
+        let transaction = TransactionBuilder::default().input(input.clone()).build();
+
+        let dummy_cell = CellOutput::new(100, vec![], H256::default(), None);
+
+        let rtx = ResolvedTransaction {
+            transaction,
+            dep_cells: vec![],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
+        };
+
+        let verifier = TransactionScriptsVerifier::new(&rtx);
+
+        assert!(verifier.verify(100000000).is_ok());
+    }
+
+    #[test]
+    fn check_signature_with_not_enough_cycles() {
+        let mut file = open_cell_verify();
+        let mut buffer = Vec::new();
+        file.read_to_end(&mut buffer).unwrap();
+
+        let gen = Generator::new();
+        let privkey = gen.random_privkey();
+        let mut args = vec![b"foo".to_vec(), b"bar".to_vec()];
+
+        let mut bytes = vec![];
+        for argument in &args {
+            bytes.write(argument).unwrap();
+        }
+        let hash1 = sha3_256(&bytes);
+        let hash2 = sha3_256(hash1);
+        let signature = privkey.sign_recoverable(&hash2.into()).unwrap();
+
+        let signature_der = signature.serialize_der();
+        let mut hex_signature = vec![0; signature_der.len() * 2];
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
 
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
 
         let script = Script::new(0, args, None, Some(buffer), vec![hex_privkey]);
         let input = CellInput::new(OutPoint::null(), script);
@@ -253,12 +318,12 @@ mod tests {
         let rtx = ResolvedTransaction {
             transaction,
             dep_cells: vec![],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_ok());
+        assert!(verifier.verify(100).is_err());
     }
 
     #[test]
@@ -281,14 +346,14 @@ mod tests {
 
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
         // This line makes the verification invalid
         args.push(b"extrastring".to_vec());
 
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
 
         let script = Script::new(0, args, None, Some(buffer), vec![hex_privkey]);
         let input = CellInput::new(OutPoint::null(), script);
@@ -300,12 +365,12 @@ mod tests {
         let rtx = ResolvedTransaction {
             transaction,
             dep_cells: vec![],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_err());
+        assert!(verifier.verify(100000000).is_err());
     }
 
     #[test]
@@ -333,14 +398,14 @@ mod tests {
         let signature = privkey.sign_recoverable(&hash2.into()).unwrap();
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
 
         let dep_out_point = OutPoint::new(H256::from_trimmed_hex_str("123").unwrap(), 8);
         let dep_cell = CellOutput::new(buffer.len() as Capacity, buffer, H256::zero(), None);
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
 
         let script = Script::new(0, args, Some(dep_cell.data_hash()), None, vec![hex_privkey]);
         let input = CellInput::new(OutPoint::null(), script);
@@ -354,13 +419,13 @@ mod tests {
 
         let rtx = ResolvedTransaction {
             transaction,
-            dep_cells: vec![CellStatus::Current(dep_cell.clone())],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            dep_cells: vec![CellStatus::Live(dep_cell.clone())],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_ok());
+        assert!(verifier.verify(100000000).is_ok());
     }
 
     #[test]
@@ -378,14 +443,14 @@ mod tests {
         let signature = privkey.sign_recoverable(&hash2.into()).unwrap();
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
 
         let dep_out_point = OutPoint::new(H256::from_trimmed_hex_str("123").unwrap(), 8);
 
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
         let script = Script::new(
             0,
             args,
@@ -406,12 +471,12 @@ mod tests {
         let rtx = ResolvedTransaction {
             transaction,
             dep_cells: vec![],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_err());
+        assert!(verifier.verify(100000000).is_err());
     }
 
     fn create_always_success_script() -> Script {
@@ -442,12 +507,12 @@ mod tests {
 
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
 
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
 
         let script = Script::new(0, args, None, Some(buffer), vec![hex_privkey]);
         let input = CellInput::new(OutPoint::null(), create_always_success_script());
@@ -463,12 +528,12 @@ mod tests {
         let rtx = ResolvedTransaction {
             transaction,
             dep_cells: vec![],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_ok());
+        assert!(verifier.verify(100000000).is_ok());
     }
 
     #[test]
@@ -491,14 +556,14 @@ mod tests {
 
         let signature_der = signature.serialize_der();
         let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex privkey");
+        hex_encode(&signature_der, &mut hex_signature).expect("hex privkey");
         args.insert(0, hex_signature);
         // This line makes the verification invalid
         args.push(b"extrastring".to_vec());
 
         let privkey = privkey.pubkey().unwrap().serialize();
         let mut hex_privkey = vec![0; privkey.len() * 2];
-        hex_to(&privkey, &mut hex_privkey).expect("hex privkey");
+        hex_encode(&privkey, &mut hex_privkey).expect("hex privkey");
 
         let script = Script::new(0, args, None, Some(buffer), vec![hex_privkey]);
         let input = CellInput::new(OutPoint::null(), create_always_success_script());
@@ -514,11 +579,11 @@ mod tests {
         let rtx = ResolvedTransaction {
             transaction,
             dep_cells: vec![],
-            input_cells: vec![CellStatus::Current(dummy_cell)],
+            input_cells: vec![CellStatus::Live(dummy_cell)],
         };
 
         let verifier = TransactionScriptsVerifier::new(&rtx);
 
-        assert!(verifier.verify().is_err());
+        assert!(verifier.verify(100000000).is_err());
     }
 }
diff --git a/nodes_template/spec/cells/verify b/script/testdata/verify
similarity index 100%
rename from nodes_template/spec/cells/verify
rename to script/testdata/verify
diff --git a/script/testdata/verify.c b/script/testdata/verify.c
new file mode 100644
index 0000000000..176ef8dd66
--- /dev/null
+++ b/script/testdata/verify.c
@@ -0,0 +1,135 @@
+#include <stdlib.h>
+#include "sha3.h"
+
+#define SHA3_BLOCK_SIZE 32
+
+#define CUSTOM_ABORT 1
+#define CUSTOM_PRINT_ERR 1
+
+#include "syscall.h"
+void custom_abort()
+{
+  syscall_errno(93, 10, 0, 0, 0, 0, 0);
+}
+
+int custom_print_err(const char * arg, ...)
+{
+  (void) arg;
+  return 0;
+}
+
+#include <secp256k1_static.h>
+/*
+ * We are including secp256k1 implementation directly so gcc can strip
+ * unused functions. For some unknown reasons, if we link in libsecp256k1.a
+ * directly, the final binary will include all functions rather than those used.
+ */
+#include <secp256k1.c>
+
+int char_to_int(char ch)
+{
+  if (ch >= '0' && ch <= '9') {
+    return ch - '0';
+  }
+  if (ch >= 'a' && ch <= 'f') {
+    return ch - 'a' + 10;
+  }
+  return -1;
+}
+
+int hex_to_bin(char* buf, size_t buf_len, const char* hex)
+{
+  int i = 0;
+
+  for (; i < buf_len && hex[i * 2] != '\0' && hex[i * 2 + 1] != '\0'; i++) {
+    int a = char_to_int(hex[i * 2]);
+    int b = char_to_int(hex[i * 2 + 1]);
+
+    if (a < 0 || b < 0) {
+      return -1;
+    }
+
+    buf[i] = ((a & 0xF) << 4) | (b & 0xF);
+  }
+
+  if (i == buf_len && hex[i * 2] != '\0') {
+    return -1;
+  }
+  return i;
+}
+
+#define CHECK_LEN(x) if ((x) <= 0) { return x; }
+
+/*
+ * Arguments are listed in the following order:
+ * 0. Program name, ignored here, only preserved for compatibility reason
+ * 1. Pubkey in hex format, a maximum of 130 bytes will be processed
+ * 2. Signature in hex format, a maximum of 512 bytes will be processed
+ * 3. Current script hash in hex format, which is 128 bytes. While this program
+ * cannot verify the hash directly, this ensures the script is include in
+ * signature calculation
+ * 4. Other additional parameters that might be included. Notice only ASCII
+ * characters are included, so binary should be passed as binary format.
+ *
+ * This program will run double sha256 on all arguments excluding pubkey and
+ * signature(also for simplicity, we are running sha256 on ASCII chars directly,
+ * not deserialized raw bytes), then it will use sha256 result calculated as the
+ * message to verify the signature. It returns 0 if the signature works, and
+ * a non-zero value otherwise.
+ *
+ * Note all hex values passed in as arguments must have lower case letters for
+ * deterministic behavior.
+ */
+int main(int argc, char* argv[])
+{
+  char buf[256];
+  int len;
+
+  if (argc < 4) {
+    return -1;
+  }
+
+  secp256k1_context context;
+  int ret = secp256k1_context_initialize(&context, SECP256K1_CONTEXT_VERIFY);
+  if (ret == 0) {
+    return 4;
+  }
+
+  len = hex_to_bin(buf, 65, argv[1]);
+  CHECK_LEN(len);
+  secp256k1_pubkey pubkey;
+
+  ret = secp256k1_ec_pubkey_parse(&context, &pubkey, buf, len);
+  if (ret == 0) {
+    return 1;
+  }
+
+  len = hex_to_bin(buf, 256, argv[2]);
+  CHECK_LEN(len);
+  secp256k1_ecdsa_signature signature;
+  secp256k1_ecdsa_signature_parse_der(&context, &signature, buf, len);
+  if (ret == 0) {
+    return 3;
+  }
+
+  sha3_ctx_t sha3_ctx;
+  unsigned char hash[SHA3_BLOCK_SIZE];
+  sha3_init(&sha3_ctx, SHA3_BLOCK_SIZE);
+  for (int i = 3; i < argc; i++) {
+    sha3_update(&sha3_ctx, argv[i], strlen(argv[i]));
+  }
+  sha3_final(hash, &sha3_ctx);
+
+  sha3_init(&sha3_ctx, SHA3_BLOCK_SIZE);
+  sha3_update(&sha3_ctx, hash, SHA3_BLOCK_SIZE);
+  sha3_final(hash, &sha3_ctx);
+
+  ret = secp256k1_ecdsa_verify(&context, &signature, hash, &pubkey);
+  if (ret == 1) {
+    ret = 0;
+  } else {
+    ret = 2;
+  }
+
+  return ret;
+}
diff --git a/shared/Cargo.toml b/shared/Cargo.toml
index 9ae0982a9d..787c9096e9 100644
--- a/shared/Cargo.toml
+++ b/shared/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-shared"
-version = "0.3.0"
+version = "0.4.0"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
 
@@ -22,3 +22,4 @@ fnv = "1.0.3"
 env_logger = "0.6"
 tempfile = "3.0"
 rand = "0.6"
+faketime = "0.2"
diff --git a/shared/src/block_median_time_context.rs b/shared/src/block_median_time_context.rs
new file mode 100644
index 0000000000..59660463b3
--- /dev/null
+++ b/shared/src/block_median_time_context.rs
@@ -0,0 +1,23 @@
+use numext_fixed_hash::H256;
+pub trait BlockMedianTimeContext {
+    fn block_count(&self) -> u32;
+    fn timestamp(&self, hash: &H256) -> Option<u64>;
+    fn parent_hash(&self, hash: &H256) -> Option<H256>;
+    fn block_median_time(&self, hash: &H256) -> Option<u64> {
+        let count = self.block_count() as usize;
+        let mut block_times = Vec::with_capacity(count);
+        let mut current_hash = hash.to_owned();
+        for _ in 0..count {
+            match self.timestamp(&current_hash) {
+                Some(timestamp) => block_times.push(timestamp),
+                None => break,
+            }
+            match self.parent_hash(&current_hash) {
+                Some(hash) => current_hash = hash,
+                None => break,
+            }
+        }
+        block_times.sort_by(|a, b| b.cmp(a));
+        block_times.get(block_times.len() / 2).cloned()
+    }
+}
diff --git a/shared/src/lib.rs b/shared/src/lib.rs
index e6e4df919e..0e958999ad 100644
--- a/shared/src/lib.rs
+++ b/shared/src/lib.rs
@@ -7,12 +7,15 @@
 //! - [Chain](chain::chain::Chain) represent a struct which
 //!   implement `ChainProvider`
 
+pub mod block_median_time_context;
 pub mod cachedb;
 pub mod error;
 mod flat_serializer;
 pub mod index;
 pub mod shared;
 pub mod store;
+#[cfg(test)]
+mod tests;
 
 use ckb_db::batch::Col;
 
diff --git a/shared/src/shared.rs b/shared/src/shared.rs
index fc78a9d8e9..3950476c02 100644
--- a/shared/src/shared.rs
+++ b/shared/src/shared.rs
@@ -1,3 +1,4 @@
+use crate::block_median_time_context::BlockMedianTimeContext;
 use crate::cachedb::CacheDB;
 use crate::error::SharedError;
 use crate::index::ChainIndex;
@@ -68,6 +69,7 @@ pub struct Shared<CI> {
     consensus: Consensus,
 }
 
+// https://github.com/rust-lang/rust/issues/40754
 impl<CI: ChainIndex> ::std::clone::Clone for Shared<CI> {
     fn clone(&self) -> Self {
         Shared {
@@ -137,9 +139,9 @@ impl<CI: ChainIndex> CellProvider for Shared<CI> {
                         .store
                         .get_transaction(&out_point.hash)
                         .expect("transaction must exist");
-                    CellStatus::Current(transaction.outputs()[index].clone())
+                    CellStatus::Live(transaction.outputs()[index].clone())
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             } else {
                 CellStatus::Unknown
@@ -158,9 +160,9 @@ impl<CI: ChainIndex> CellProvider for Shared<CI> {
                         .store
                         .get_transaction(&out_point.hash)
                         .expect("transaction must exist");
-                    CellStatus::Current(transaction.outputs()[index].clone())
+                    CellStatus::Live(transaction.outputs()[index].clone())
                 } else {
-                    CellStatus::Old
+                    CellStatus::Dead
                 }
             } else {
                 CellStatus::Unknown
@@ -427,6 +429,19 @@ impl<CI: ChainIndex> ChainProvider for Shared<CI> {
     }
 }
 
+impl<CI: ChainIndex> BlockMedianTimeContext for Shared<CI> {
+    fn block_count(&self) -> u32 {
+        self.consensus.median_time_block_count() as u32
+    }
+    fn timestamp(&self, hash: &H256) -> Option<u64> {
+        self.block_header(hash).map(|header| header.timestamp())
+    }
+    fn parent_hash(&self, hash: &H256) -> Option<H256> {
+        self.block_header(hash)
+            .map(|header| header.parent_hash().to_owned())
+    }
+}
+
 pub struct SharedBuilder<CI> {
     store: CI,
     consensus: Option<Consensus>,
diff --git a/shared/src/tests/mod.rs b/shared/src/tests/mod.rs
new file mode 100644
index 0000000000..33a50af6cf
--- /dev/null
+++ b/shared/src/tests/mod.rs
@@ -0,0 +1 @@
+mod shared;
diff --git a/shared/src/tests/shared.rs b/shared/src/tests/shared.rs
new file mode 100644
index 0000000000..ab5d52431f
--- /dev/null
+++ b/shared/src/tests/shared.rs
@@ -0,0 +1,60 @@
+use crate::{
+    block_median_time_context::BlockMedianTimeContext,
+    shared::{Shared, SharedBuilder},
+    store::{ChainKVStore, ChainStore},
+};
+use ckb_core::{block::BlockBuilder, header::HeaderBuilder};
+use ckb_db::{kvdb::KeyValueDB, memorydb::MemoryKeyValueDB};
+use numext_fixed_hash::H256;
+
+fn new_shared() -> Shared<ChainKVStore<MemoryKeyValueDB>> {
+    SharedBuilder::<ChainKVStore<MemoryKeyValueDB>>::new_memory().build()
+}
+
+fn insert_block_timestamps<T>(store: &ChainKVStore<T>, timestamps: &[u64]) -> Vec<H256>
+where
+    T: KeyValueDB + 'static,
+{
+    let mut blocks = Vec::with_capacity(timestamps.len());
+    let mut hashes = Vec::with_capacity(timestamps.len());
+    let mut parent_hash = H256::zero();
+    for timestamp in timestamps {
+        let header = HeaderBuilder::default()
+            .timestamp(*timestamp)
+            .parent_hash(parent_hash.clone())
+            .build();
+        parent_hash = header.hash();
+        hashes.push(parent_hash.clone());
+        blocks.push(BlockBuilder::default().header(header).build());
+    }
+    store
+        .save_with_batch(|batch| {
+            for b in blocks {
+                store.insert_block(batch, &b);
+            }
+            Ok(())
+        })
+        .expect("insert blocks");
+    hashes
+}
+
+#[test]
+fn test_block_median_time() {
+    let shared = new_shared();
+    assert!(shared.block_median_time(&H256::zero()).is_none());
+    let now = faketime::unix_time_as_millis();
+    let block_hashes = insert_block_timestamps(shared.store(), &vec![now]);
+    assert_eq!(
+        shared
+            .block_median_time(&block_hashes[0])
+            .expect("median time"),
+        now
+    );
+    let block_hashes = insert_block_timestamps(shared.store(), &(0..=22).collect::<Vec<_>>());
+    assert_eq!(
+        shared
+            .block_median_time(&block_hashes.last().expect("last"))
+            .expect("median time"),
+        17
+    );
+}
diff --git a/spec/Cargo.toml b/spec/Cargo.toml
index c9c297d161..d9ffe3fd91 100644
--- a/spec/Cargo.toml
+++ b/spec/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-chain-spec"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/spec/src/consensus.rs b/spec/src/consensus.rs
index 090d0cc4db..d301a23f74 100644
--- a/spec/src/consensus.rs
+++ b/spec/src/consensus.rs
@@ -1,7 +1,7 @@
 use ckb_core::block::{Block, BlockBuilder};
 use ckb_core::header::HeaderBuilder;
 use ckb_core::transaction::Capacity;
-use ckb_core::BlockNumber;
+use ckb_core::{BlockNumber, Cycle};
 use ckb_pow::{Pow, PowEngine};
 use numext_fixed_uint::U256;
 use std::sync::Arc;
@@ -12,12 +12,16 @@ pub const MAX_UNCLE_AGE: usize = 6;
 pub const TRANSACTION_PROPAGATION_TIME: BlockNumber = 1;
 pub const TRANSACTION_PROPAGATION_TIMEOUT: BlockNumber = 10;
 pub const CELLBASE_MATURITY: usize = 100;
+// TODO: should adjust this value based on CKB average block time
+pub const MEDIAN_TIME_BLOCK_COUNT: usize = 11;
 
 //TODO：find best ORPHAN_RATE_TARGET
 pub const ORPHAN_RATE_TARGET: f32 = 0.1;
 pub const POW_TIME_SPAN: u64 = 12 * 60 * 60 * 1000; // 12 hours
 pub const POW_SPACING: u64 = 15 * 1000; //15s
 
+pub const MAX_BLOCK_CYCLES: Cycle = 100_000_000;
+
 #[derive(Clone, PartialEq, Debug)]
 pub struct Consensus {
     pub id: String,
@@ -36,6 +40,10 @@ pub struct Consensus {
     // it must have at least `cellbase_maturity` confirmations;
     // else reject this transaction.
     pub cellbase_maturity: usize,
+    // This parameter indicates the count of past blocks used in the median time calculation
+    pub median_time_block_count: usize,
+    // Maximum cycles that all the scripts in all the commit transactions can take
+    pub max_block_cycles: Cycle,
 }
 
 // genesis difficulty should not be zero
@@ -58,6 +66,8 @@ impl Default for Consensus {
             pow: Pow::Dummy,
             verification: true,
             cellbase_maturity: CELLBASE_MATURITY,
+            median_time_block_count: MEDIAN_TIME_BLOCK_COUNT,
+            max_block_cycles: MAX_BLOCK_CYCLES,
         }
     }
 }
@@ -88,6 +98,11 @@ impl Consensus {
         self
     }
 
+    pub fn set_max_block_cycles(mut self, max_block_cycles: Cycle) -> Self {
+        self.max_block_cycles = max_block_cycles;
+        self
+    }
+
     pub fn genesis_block(&self) -> &Block {
         &self.genesis_block
     }
@@ -123,4 +138,12 @@ impl Consensus {
     pub fn cellbase_maturity(&self) -> usize {
         self.cellbase_maturity
     }
+
+    pub fn median_time_block_count(&self) -> usize {
+        self.median_time_block_count
+    }
+
+    pub fn max_block_cycles(&self) -> Cycle {
+        self.max_block_cycles
+    }
 }
diff --git a/spec/src/lib.rs b/spec/src/lib.rs
index 39c35bb346..99c04d9ac4 100644
--- a/spec/src/lib.rs
+++ b/spec/src/lib.rs
@@ -10,7 +10,7 @@ use ckb_core::block::BlockBuilder;
 use ckb_core::header::HeaderBuilder;
 use ckb_core::script::Script;
 use ckb_core::transaction::{CellOutput, Transaction, TransactionBuilder};
-use ckb_core::Capacity;
+use ckb_core::{Capacity, Cycle};
 use ckb_pow::{Pow, PowEngine};
 use ckb_protocol::Script as FbsScript;
 use flatbuffers::FlatBufferBuilder;
@@ -37,6 +37,7 @@ pub struct ChainSpec {
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
 pub struct Params {
     pub initial_block_reward: Capacity,
+    pub max_block_cycles: Cycle,
 }
 
 #[derive(Clone, PartialEq, Eq, Debug, Deserialize)]
@@ -125,6 +126,7 @@ impl ChainSpec {
             .set_id(self.name.clone())
             .set_genesis_block(genesis_block)
             .set_initial_block_reward(self.params.initial_block_reward)
+            .set_max_block_cycles(self.params.max_block_cycles)
             .set_pow(self.pow.clone());
 
         Ok(consensus)
diff --git a/src/cli/args.rs b/src/cli/args.rs
index 65382b9f4e..884adab481 100644
--- a/src/cli/args.rs
+++ b/src/cli/args.rs
@@ -75,38 +75,13 @@ fn import() -> App<'static, 'static> {
         )
 }
 
-fn arg_private_key() -> Arg<'static, 'static> {
-    Arg::with_name("private-key")
-        .short("p")
-        .long("private-key")
-        .value_name("H256")
-        .help("Specify the private key")
-        .takes_value(true)
-        .required(true)
-}
-
 fn cli() -> App<'static, 'static> {
     SubCommand::with_name("cli")
         .about("Running ckb cli")
         .setting(AppSettings::SubcommandRequiredElseHelp)
-        .subcommand(
-            SubCommand::with_name("sign")
-                .about("Sign transaction using sha3-secp256k1 defined in system cell")
-                .arg(arg_private_key())
-                .arg(
-                    Arg::with_name("unsigned-transaction")
-                        .short("u")
-                        .long("unsigned-transaction")
-                        .value_name("JSON")
-                        .help("Specify the unsigned transaction json string")
-                        .takes_value(true)
-                        .required(true),
-                ),
-        )
         .subcommand(
             SubCommand::with_name("type_hash")
-                .about("Generate script type hash using sha3-secp256k1 defined in system cell")
-                .arg(arg_private_key()),
+                .about("Generate lock script type hash using the first system cell, which by default is always_success"),
         )
         .subcommand(SubCommand::with_name("keygen").about("Generate new key"))
 }
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 2733475bbf..1a5b24f14e 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -8,4 +8,4 @@ pub use self::args::get_matches;
 pub use self::export::export;
 pub use self::import::import;
 pub use self::miner::miner;
-pub use self::run_impl::{keygen, run, sign, type_hash};
+pub use self::run_impl::{keygen, run, type_hash};
diff --git a/src/cli/run_impl.rs b/src/cli/run_impl.rs
index ae57b77532..9cad9ee227 100644
--- a/src/cli/run_impl.rs
+++ b/src/cli/run_impl.rs
@@ -2,7 +2,6 @@ use crate::helper::wait_for_exit;
 use crate::Setup;
 use ckb_chain::chain::{ChainBuilder, ChainController};
 use ckb_core::script::Script;
-use ckb_core::transaction::{CellInput, OutPoint, Transaction, TransactionBuilder};
 use ckb_db::diskdb::RocksDB;
 use ckb_miner::{Agent, AgentController};
 use ckb_network::CKBProtocol;
@@ -17,14 +16,10 @@ use ckb_shared::index::ChainIndex;
 use ckb_shared::shared::{ChainProvider, Shared, SharedBuilder};
 use ckb_shared::store::ChainKVStore;
 use ckb_sync::{Relayer, Synchronizer, RELAY_PROTOCOL_ID, SYNC_PROTOCOL_ID};
-use clap::{value_t, ArgMatches};
-use crypto::secp::{Generator, Privkey};
-use faster_hex::{hex_string, hex_to};
-use hash::sha3_256;
+use crypto::secp::Generator;
 use log::info;
 use numext_fixed_hash::H256;
 use serde_json;
-use std::io::Write;
 use std::sync::Arc;
 use std::thread;
 
@@ -66,6 +61,7 @@ pub fn run(setup: Setup) {
         chain_controller.clone(),
         shared.clone(),
         tx_pool_controller.clone(),
+        synchronizer.peers(),
     ));
 
     let network_config = NetworkConfig::from(setup.configs.network);
@@ -132,89 +128,16 @@ fn setup_rpc<CI: ChainIndex + 'static>(
     });
 }
 
-pub fn sign(setup: &Setup, matches: &ArgMatches) {
-    let consensus = setup.chain_spec.to_consensus().unwrap();
-    let system_cell_tx = &consensus.genesis_block().commit_transactions()[0];
-    let system_cell_data_hash = system_cell_tx.outputs()[0].data_hash();
-    let system_cell_tx_hash = system_cell_tx.hash();
-    let system_cell_out_point = OutPoint::new(system_cell_tx_hash.clone(), 0);
-
-    let privkey: Privkey = value_t!(matches.value_of("private-key"), H256)
-        .unwrap_or_else(|e| e.exit())
-        .into();
-    let pubkey = privkey.pubkey().unwrap();
-    let json =
-        value_t!(matches.value_of("unsigned-transaction"), String).unwrap_or_else(|e| e.exit());
-    let transaction: Transaction = serde_json::from_str(&json).unwrap();
-    let mut inputs = Vec::new();
-    for unsigned_input in transaction.inputs() {
-        let mut bytes = vec![];
-        for argument in &unsigned_input.unlock.args {
-            bytes.write_all(argument).unwrap();
-        }
-        let hash1 = sha3_256(&bytes);
-        let hash2 = sha3_256(hash1);
-        let signature = privkey.sign_recoverable(&hash2.into()).unwrap();
-        let signature_der = signature.serialize_der();
-        let mut hex_signature = vec![0; signature_der.len() * 2];
-        hex_to(&signature_der, &mut hex_signature).expect("hex signature");
-
-        let mut new_args = vec![hex_signature];
-        new_args.extend_from_slice(&unsigned_input.unlock.args);
-
-        let pubkey_ser = pubkey.serialize();
-        let mut hex_pubkey = vec![0; pubkey_ser.len() * 2];
-        hex_to(&pubkey_ser, &mut hex_pubkey).expect("hex pubkey");
-        let script = Script::new(
-            0,
-            new_args,
-            Some(system_cell_data_hash.clone()),
-            None,
-            vec![hex_pubkey],
-        );
-        let signed_input = CellInput::new(unsigned_input.previous_output.clone(), script);
-        inputs.push(signed_input);
-    }
-    // First, add verify system cell as a dep
-    // Then, sign each input
-    let result = TransactionBuilder::default()
-        .transaction(transaction)
-        .dep(system_cell_out_point)
-        .inputs_clear()
-        .inputs(inputs)
-        .build();
-
-    println!("{}", serde_json::to_string(&result).unwrap());
-}
-
-pub fn type_hash(setup: &Setup, matches: &ArgMatches) {
+pub fn type_hash(setup: &Setup) {
     let consensus = setup.chain_spec.to_consensus().unwrap();
     let system_cell_tx = &consensus.genesis_block().commit_transactions()[0];
     let system_cell_data_hash = system_cell_tx.outputs()[0].data_hash();
 
-    let privkey: Privkey = value_t!(matches.value_of("private-key"), H256)
-        .unwrap_or_else(|e| e.exit())
-        .into();
-    let pubkey = privkey.pubkey().unwrap();
-
-    let pubkey_ser = pubkey.serialize();
-    let mut hex_pubkey = vec![0; pubkey_ser.len() * 2];
-    hex_to(&pubkey_ser, &mut hex_pubkey).expect("hex pubkey");
-
-    let script = Script::new(
-        0,
-        Vec::new(),
-        Some(system_cell_data_hash),
-        None,
-        vec![hex_pubkey],
-    );
-    println!(
-        "{}",
-        hex_string(script.type_hash().as_bytes()).expect("hex string")
-    );
+    let script = Script::new(0, vec![], Some(system_cell_data_hash), None, vec![]);
+    println!("{:#x}", script.type_hash());
 }
 
 pub fn keygen() {
     let result: H256 = Generator::new().random_privkey().into();
-    println!("{:?}", result)
+    println!("{:#x}", result);
 }
diff --git a/src/main.rs b/src/main.rs
index 09f6c8f911..7102ee554b 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -28,8 +28,7 @@ fn main() {
 
     match matches.subcommand() {
         ("cli", Some(cli_matches)) => match cli_matches.subcommand() {
-            ("sign", Some(sign_matches)) => cli::sign(&setup, sign_matches),
-            ("type_hash", Some(type_hash_matches)) => cli::type_hash(&setup, type_hash_matches),
+            ("type_hash", _) => cli::type_hash(&setup),
             ("keygen", _) => cli::keygen(),
             _ => unreachable!(),
         },
diff --git a/src/setup.rs b/src/setup.rs
index 0e64895eb8..f5668f578a 100644
--- a/src/setup.rs
+++ b/src/setup.rs
@@ -170,7 +170,8 @@ pub mod test {
                 "uncles_hash": "0x0000000000000000000000000000000000000000000000000000000000000000"
             },
             "params": {
-                "initial_block_reward": 233
+                "initial_block_reward": 233,
+                "max_block_cycles": 100000000
             },
             "system_cells": [
                 {"path": "verify"},
diff --git a/sync/Cargo.toml b/sync/Cargo.toml
index 3b3ae9cb4d..2f4ff46c4d 100644
--- a/sync/Cargo.toml
+++ b/sync/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-sync"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
@@ -24,6 +24,7 @@ serde = "1.0"
 serde_derive = "1.0"
 flatbuffers = "0.5.0"
 ckb-chain-spec = { path = "../spec" }
+bloom-filters = "0.1.0"
 
 [dev-dependencies]
 ckb-notify = { path = "../notify" }
diff --git a/sync/src/lib.rs b/sync/src/lib.rs
index e982be5460..649e5f8d64 100644
--- a/sync/src/lib.rs
+++ b/sync/src/lib.rs
@@ -6,6 +6,7 @@
 mod config;
 mod relayer;
 mod synchronizer;
+mod types;
 
 #[cfg(test)]
 mod tests;
diff --git a/sync/src/relayer/block_transactions_process.rs b/sync/src/relayer/block_transactions_process.rs
index de4eb8dfa2..db3ed19f10 100644
--- a/sync/src/relayer/block_transactions_process.rs
+++ b/sync/src/relayer/block_transactions_process.rs
@@ -4,7 +4,6 @@ use ckb_network::CKBProtocolContext;
 use ckb_network::PeerIndex;
 use ckb_protocol::{BlockTransactions, FlatbuffersVectorIterator};
 use ckb_shared::index::ChainIndex;
-use numext_fixed_hash::H256;
 use std::sync::Arc;
 
 pub struct BlockTransactionsProcess<'a, CI: ChainIndex + 'a> {
@@ -33,7 +32,7 @@ where
     }
 
     pub fn execute(self) {
-        let hash = H256::from_slice(self.message.hash().and_then(|b| b.seq()).unwrap()).unwrap();
+        let hash = self.message.hash().unwrap().into();
         if let Some(compact_block) = self
             .relayer
             .state
diff --git a/sync/src/relayer/compact_block.rs b/sync/src/relayer/compact_block.rs
index 64b2cfcfdd..47d000045e 100644
--- a/sync/src/relayer/compact_block.rs
+++ b/sync/src/relayer/compact_block.rs
@@ -1,5 +1,5 @@
 use ckb_core::header::Header;
-use ckb_core::transaction::{ProposalShortId, Transaction};
+use ckb_core::transaction::{IndexTransaction, ProposalShortId};
 use ckb_core::uncle::UncleBlock;
 use ckb_protocol::{self, FlatbuffersVectorIterator};
 
@@ -11,16 +11,10 @@ pub struct CompactBlock {
     pub uncles: Vec<UncleBlock>,
     pub nonce: u64,
     pub short_ids: Vec<ShortTransactionID>,
-    pub prefilled_transactions: Vec<PrefilledTransaction>,
+    pub prefilled_transactions: Vec<IndexTransaction>,
     pub proposal_transactions: Vec<ProposalShortId>,
 }
 
-#[derive(Debug, PartialEq, Eq, Clone)]
-pub struct PrefilledTransaction {
-    pub index: usize,
-    pub transaction: Transaction,
-}
-
 impl<'a> From<ckb_protocol::CompactBlock<'a>> for CompactBlock {
     fn from(b: ckb_protocol::CompactBlock<'a>) -> Self {
         CompactBlock {
@@ -43,20 +37,12 @@ impl<'a> From<ckb_protocol::CompactBlock<'a>> for CompactBlock {
                 .map(Into::into)
                 .collect(),
 
-            proposal_transactions: FlatbuffersVectorIterator::new(
-                b.proposal_transactions().unwrap(),
-            )
-            .filter_map(|bytes| ProposalShortId::from_slice(bytes.seq().unwrap()))
-            .collect(),
-        }
-    }
-}
-
-impl<'a> From<ckb_protocol::PrefilledTransaction<'a>> for PrefilledTransaction {
-    fn from(pt: ckb_protocol::PrefilledTransaction<'a>) -> Self {
-        PrefilledTransaction {
-            index: pt.index() as usize,
-            transaction: pt.transaction().unwrap().into(),
+            proposal_transactions: b
+                .proposal_transactions()
+                .unwrap()
+                .iter()
+                .map(Into::into)
+                .collect(),
         }
     }
 }
diff --git a/sync/src/relayer/compact_block_process.rs b/sync/src/relayer/compact_block_process.rs
index 4e3d7e4959..5aaa4d2c7b 100644
--- a/sync/src/relayer/compact_block_process.rs
+++ b/sync/src/relayer/compact_block_process.rs
@@ -2,11 +2,13 @@ use super::compact_block::CompactBlock;
 use crate::relayer::Relayer;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{CompactBlock as FbsCompactBlock, RelayMessage};
+use ckb_shared::block_median_time_context::BlockMedianTimeContext;
 use ckb_shared::index::ChainIndex;
 use ckb_shared::shared::ChainProvider;
 use ckb_util::RwLockUpgradableReadGuard;
 use ckb_verification::{HeaderResolverWrapper, HeaderVerifier, Verifier};
 use flatbuffers::FlatBufferBuilder;
+use numext_fixed_hash::H256;
 use std::sync::Arc;
 
 pub struct CompactBlockProcess<'a, CI: ChainIndex + 'a> {
@@ -43,8 +45,12 @@ where
         {
             let resolver =
                 HeaderResolverWrapper::new(&compact_block.header, self.relayer.shared.clone());
-            let header_verifier =
-                HeaderVerifier::new(Arc::clone(&self.relayer.shared.consensus().pow_engine()));
+            let header_verifier = HeaderVerifier::new(
+                CompactBlockMedianTimeView {
+                    relayer: self.relayer,
+                },
+                Arc::clone(&self.relayer.shared.consensus().pow_engine()),
+            );
 
             if header_verifier.verify(&resolver).is_ok() {
                 self.relayer
@@ -79,3 +85,58 @@ where
         }
     }
 }
+
+struct CompactBlockMedianTimeView<'a, CI>
+where
+    CI: ChainIndex + 'static,
+{
+    relayer: &'a Relayer<CI>,
+}
+
+impl<'a, CI> ::std::clone::Clone for CompactBlockMedianTimeView<'a, CI>
+where
+    CI: ChainIndex + 'static,
+{
+    fn clone(&self) -> Self {
+        CompactBlockMedianTimeView {
+            relayer: self.relayer,
+        }
+    }
+}
+
+impl<'a, CI> BlockMedianTimeContext for CompactBlockMedianTimeView<'a, CI>
+where
+    CI: ChainIndex + 'static,
+{
+    fn block_count(&self) -> u32 {
+        self.relayer.shared.consensus().median_time_block_count() as u32
+    }
+    fn timestamp(&self, hash: &H256) -> Option<u64> {
+        self.relayer
+            .state
+            .pending_compact_blocks
+            .read()
+            .get(hash)
+            .map(|cb| cb.header.timestamp())
+            .or_else(|| {
+                self.relayer
+                    .shared
+                    .block_header(hash)
+                    .map(|header| header.timestamp())
+            })
+    }
+    fn parent_hash(&self, hash: &H256) -> Option<H256> {
+        self.relayer
+            .state
+            .pending_compact_blocks
+            .read()
+            .get(hash)
+            .map(|cb| cb.header.parent_hash().to_owned())
+            .or_else(|| {
+                self.relayer
+                    .shared
+                    .block_header(hash)
+                    .map(|header| header.parent_hash().to_owned())
+            })
+    }
+}
diff --git a/sync/src/relayer/get_block_proposal_process.rs b/sync/src/relayer/get_block_proposal_process.rs
index 47b37d0ef5..c0a7fdf334 100644
--- a/sync/src/relayer/get_block_proposal_process.rs
+++ b/sync/src/relayer/get_block_proposal_process.rs
@@ -1,7 +1,6 @@
 use crate::relayer::Relayer;
-use ckb_core::transaction::ProposalShortId;
 use ckb_network::{CKBProtocolContext, PeerIndex};
-use ckb_protocol::{FlatbuffersVectorIterator, GetBlockProposal, RelayMessage};
+use ckb_protocol::{GetBlockProposal, RelayMessage};
 use ckb_shared::index::ChainIndex;
 use flatbuffers::FlatBufferBuilder;
 
@@ -34,8 +33,11 @@ where
         let mut pending_proposals_request = self.relayer.state.pending_proposals_request.lock();
 
         let transactions = {
-            FlatbuffersVectorIterator::new(self.message.proposal_transactions().unwrap())
-                .filter_map(|bytes| ProposalShortId::from_slice(bytes.seq().unwrap()))
+            self.message
+                .proposal_transactions()
+                .unwrap()
+                .iter()
+                .map(Into::into)
                 .filter_map(|short_id| {
                     self.relayer.tx_pool.get_transaction(short_id).or({
                         pending_proposals_request
diff --git a/sync/src/relayer/get_block_transactions_process.rs b/sync/src/relayer/get_block_transactions_process.rs
index 930ef99ac4..1e2a96e732 100644
--- a/sync/src/relayer/get_block_transactions_process.rs
+++ b/sync/src/relayer/get_block_transactions_process.rs
@@ -4,7 +4,6 @@ use ckb_protocol::{GetBlockTransactions, RelayMessage};
 use ckb_shared::index::ChainIndex;
 use flatbuffers::FlatBufferBuilder;
 use log::debug;
-use numext_fixed_hash::H256;
 
 pub struct GetBlockTransactionsProcess<'a, CI: ChainIndex + 'a> {
     message: &'a GetBlockTransactions<'a>,
@@ -32,8 +31,7 @@ where
     }
 
     pub fn execute(self) {
-        let hash =
-            H256::from_slice(self.message.hash().and_then(|bytes| bytes.seq()).unwrap()).unwrap();
+        let hash = self.message.hash().unwrap().into();
         debug!(target: "relay", "get_block_transactions {:?}", hash);
 
         if let Some(block) = self.relayer.get_block(&hash) {
diff --git a/sync/src/relayer/mod.rs b/sync/src/relayer/mod.rs
index 2ff67720b1..55bf613409 100644
--- a/sync/src/relayer/mod.rs
+++ b/sync/src/relayer/mod.rs
@@ -15,6 +15,7 @@ use self::compact_block_process::CompactBlockProcess;
 use self::get_block_proposal_process::GetBlockProposalProcess;
 use self::get_block_transactions_process::GetBlockTransactionsProcess;
 use self::transaction_process::TransactionProcess;
+use crate::types::Peers;
 use ckb_chain::chain::ChainController;
 use ckb_core::block::{Block, BlockBuilder};
 use ckb_core::transaction::{ProposalShortId, Transaction};
@@ -34,22 +35,14 @@ use std::time::Duration;
 
 pub const TX_PROPOSAL_TOKEN: TimerToken = 0;
 
+#[derive(Clone)]
 pub struct Relayer<CI: ChainIndex> {
     chain: ChainController,
     shared: Shared<CI>,
     tx_pool: TransactionPoolController,
     state: Arc<RelayState>,
-}
-
-impl<CI: ChainIndex> ::std::clone::Clone for Relayer<CI> {
-    fn clone(&self) -> Self {
-        Relayer {
-            chain: self.chain.clone(),
-            shared: self.shared.clone(),
-            tx_pool: self.tx_pool.clone(),
-            state: Arc::clone(&self.state),
-        }
-    }
+    // TODO refactor shared Peers struct with Synchronizer
+    peers: Arc<Peers>,
 }
 
 impl<CI> Relayer<CI>
@@ -60,12 +53,14 @@ where
         chain: ChainController,
         shared: Shared<CI>,
         tx_pool: TransactionPoolController,
+        peers: Arc<Peers>,
     ) -> Self {
         Relayer {
             chain,
             shared,
             tx_pool,
             state: Arc::new(RelayState::default()),
+            peers,
         }
     }
 
@@ -247,6 +242,10 @@ where
     pub fn get_block(&self, hash: &H256) -> Option<Block> {
         self.shared.block(hash)
     }
+
+    pub fn peers(&self) -> Arc<Peers> {
+        Arc::clone(&self.peers)
+    }
 }
 
 impl<CI> CKBProtocolHandler for Relayer<CI>
diff --git a/sync/src/relayer/transaction_process.rs b/sync/src/relayer/transaction_process.rs
index c0f88e6453..64aad22140 100644
--- a/sync/src/relayer/transaction_process.rs
+++ b/sync/src/relayer/transaction_process.rs
@@ -38,7 +38,15 @@ where
             fbb.finish(message, None);
 
             for peer_id in self.nc.connected_peers() {
-                if peer_id != self.peer {
+                if peer_id != self.peer
+                    && self
+                        .relayer
+                        .peers()
+                        .transaction_filters
+                        .read()
+                        .get(&peer_id)
+                        .map_or(true, |filter| filter.contains(&tx))
+                {
                     let _ = self.nc.send(peer_id, fbb.finished_data().to_vec());
                 }
             }
diff --git a/sync/src/synchronizer/block_fetcher.rs b/sync/src/synchronizer/block_fetcher.rs
index f39ca6fe16..d2cb04a214 100644
--- a/sync/src/synchronizer/block_fetcher.rs
+++ b/sync/src/synchronizer/block_fetcher.rs
@@ -1,5 +1,5 @@
-use super::header_view::HeaderView;
 use crate::synchronizer::{BlockStatus, Synchronizer};
+use crate::types::HeaderView;
 use crate::{
     BLOCK_DOWNLOAD_TIMEOUT, BLOCK_DOWNLOAD_WINDOW, MAX_BLOCKS_IN_TRANSIT_PER_PEER,
     PER_FETCH_BLOCK_LIMIT,
@@ -24,12 +24,12 @@ impl<CI> BlockFetcher<CI>
 where
     CI: ChainIndex,
 {
-    pub fn new(synchronizer: &Synchronizer<CI>, peer: PeerIndex) -> Self {
+    pub fn new(synchronizer: Synchronizer<CI>, peer: PeerIndex) -> Self {
         let tip_header = synchronizer.shared.tip_header().read().clone();
         BlockFetcher {
             tip_header,
             peer,
-            synchronizer: synchronizer.clone(),
+            synchronizer,
         }
     }
     pub fn initial_and_check_inflight(&self) -> bool {
diff --git a/sync/src/synchronizer/filter_process.rs b/sync/src/synchronizer/filter_process.rs
new file mode 100644
index 0000000000..0e8b6cc1b5
--- /dev/null
+++ b/sync/src/synchronizer/filter_process.rs
@@ -0,0 +1,89 @@
+use crate::synchronizer::Synchronizer;
+use crate::types::TransactionFilter;
+use ckb_network::PeerIndex;
+use ckb_protocol::{AddFilter, SetFilter};
+use ckb_shared::index::ChainIndex;
+
+pub struct SetFilterProcess<'a, CI: ChainIndex + 'a> {
+    message: &'a SetFilter<'a>,
+    synchronizer: &'a Synchronizer<CI>,
+    peer: PeerIndex,
+}
+
+impl<'a, CI> SetFilterProcess<'a, CI>
+where
+    CI: ChainIndex + 'a,
+{
+    pub fn new(
+        message: &'a SetFilter,
+        synchronizer: &'a Synchronizer<CI>,
+        peer: PeerIndex,
+    ) -> Self {
+        Self {
+            peer,
+            message,
+            synchronizer,
+        }
+    }
+
+    pub fn execute(self) {
+        // TODO add filter size and num_hashes max value checking
+        let mut filters = self.synchronizer.peers.transaction_filters.write();
+        filters.entry(self.peer).or_insert_with(|| {
+            TransactionFilter::new(
+                self.message.filter().unwrap(),
+                self.message.num_hashes() as usize,
+                self.message.hash_seed() as usize,
+            )
+        });
+    }
+}
+
+pub struct AddFilterProcess<'a, CI: ChainIndex + 'a> {
+    message: &'a AddFilter<'a>,
+    synchronizer: &'a Synchronizer<CI>,
+    peer: PeerIndex,
+}
+
+impl<'a, CI> AddFilterProcess<'a, CI>
+where
+    CI: ChainIndex + 'a,
+{
+    pub fn new(
+        message: &'a AddFilter,
+        synchronizer: &'a Synchronizer<CI>,
+        peer: PeerIndex,
+    ) -> Self {
+        Self {
+            peer,
+            message,
+            synchronizer,
+        }
+    }
+
+    pub fn execute(self) {
+        let mut filters = self.synchronizer.peers.transaction_filters.write();
+        filters
+            .entry(self.peer)
+            .and_modify(|filter| filter.update(self.message.filter().unwrap()));
+    }
+}
+
+pub struct ClearFilterProcess<'a, CI: ChainIndex + 'a> {
+    synchronizer: &'a Synchronizer<CI>,
+    peer: PeerIndex,
+}
+
+impl<'a, CI> ClearFilterProcess<'a, CI>
+where
+    CI: ChainIndex + 'a,
+{
+    pub fn new(synchronizer: &'a Synchronizer<CI>, peer: PeerIndex) -> Self {
+        Self { peer, synchronizer }
+    }
+
+    pub fn execute(self) {
+        let mut filters = self.synchronizer.peers.transaction_filters.write();
+        filters.remove(&self.peer);
+    }
+}
diff --git a/sync/src/synchronizer/get_blocks_process.rs b/sync/src/synchronizer/get_blocks_process.rs
index 8013abc03a..9212fb9c14 100644
--- a/sync/src/synchronizer/get_blocks_process.rs
+++ b/sync/src/synchronizer/get_blocks_process.rs
@@ -1,10 +1,9 @@
 use crate::synchronizer::Synchronizer;
 use ckb_network::{CKBProtocolContext, PeerIndex};
-use ckb_protocol::{FlatbuffersVectorIterator, GetBlocks, SyncMessage};
+use ckb_protocol::{GetBlocks, SyncMessage};
 use ckb_shared::index::ChainIndex;
 use flatbuffers::FlatBufferBuilder;
 use log::debug;
-use numext_fixed_hash::H256;
 
 pub struct GetBlocksProcess<'a, CI: ChainIndex + 'a> {
     message: &'a GetBlocks<'a>,
@@ -32,15 +31,26 @@ where
     }
 
     pub fn execute(self) {
-        FlatbuffersVectorIterator::new(self.message.block_hashes().unwrap()).for_each(|bytes| {
-            let block_hash = H256::from_slice(bytes.seq().unwrap()).unwrap();
+        self.message.block_hashes().unwrap().iter().for_each(|fbs_h256| {
+            let block_hash = fbs_h256.into();
             debug!(target: "sync", "get_blocks {:?}", block_hash);
             if let Some(block) = self.synchronizer.get_block(&block_hash) {
                 debug!(target: "sync", "respond_block {} {:?}", block.header().number(), block.header().hash());
-                let fbb = &mut FlatBufferBuilder::new();
-                let message = SyncMessage::build_block(fbb, &block);
-                fbb.finish(message, None);
-                let _ = self.nc.send(self.peer, fbb.finished_data().to_vec());
+                if let Some(filter) = self.synchronizer.peers.transaction_filters.read().get(&self.peer) {
+                    let transactions_index = block.commit_transactions().iter().enumerate().filter(|(_index, tx)|
+                        filter.contains(tx)
+                    ).map(|ti| ti.0).collect::<Vec<_>>();
+
+                    let fbb = &mut FlatBufferBuilder::new();
+                    let message = SyncMessage::build_filtered_block(fbb, &block, &transactions_index);
+                    fbb.finish(message, None);
+                    let _ = self.nc.send(self.peer, fbb.finished_data().to_vec());
+                } else {
+                    let fbb = &mut FlatBufferBuilder::new();
+                    let message = SyncMessage::build_block(fbb, &block);
+                    fbb.finish(message, None);
+                    let _ = self.nc.send(self.peer, fbb.finished_data().to_vec());
+                }
             } else {
                 // TODO response not found
                 // TODO add timeout check in synchronizer
diff --git a/sync/src/synchronizer/get_headers_process.rs b/sync/src/synchronizer/get_headers_process.rs
index 5e7de4e967..5f0ec33b33 100644
--- a/sync/src/synchronizer/get_headers_process.rs
+++ b/sync/src/synchronizer/get_headers_process.rs
@@ -2,7 +2,7 @@ use crate::synchronizer::Synchronizer;
 use crate::MAX_LOCATOR_SIZE;
 use ckb_core::header::Header;
 use ckb_network::{CKBProtocolContext, PeerIndex, Severity};
-use ckb_protocol::{FlatbuffersVectorIterator, GetHeaders, SyncMessage};
+use ckb_protocol::{GetHeaders, SyncMessage};
 use ckb_shared::index::ChainIndex;
 use flatbuffers::FlatBufferBuilder;
 use log::{debug, info, warn};
@@ -48,9 +48,7 @@ where
             }
 
             let hash_stop = H256::zero(); // TODO PENDING self.message.hash_stop().unwrap().into();
-            let block_locator_hashes = FlatbuffersVectorIterator::new(locator)
-                .map(|bytes| H256::from_slice(bytes.seq().unwrap()).unwrap())
-                .collect::<Vec<_>>();
+            let block_locator_hashes = locator.iter().map(Into::into).collect::<Vec<_>>();
 
             if let Some(block_number) = self
                 .synchronizer
diff --git a/sync/src/synchronizer/header_view.rs b/sync/src/synchronizer/header_view.rs
deleted file mode 100644
index 95ac1e7a71..0000000000
--- a/sync/src/synchronizer/header_view.rs
+++ /dev/null
@@ -1,44 +0,0 @@
-use ckb_core::header::{BlockNumber, Header};
-use numext_fixed_hash::H256;
-use numext_fixed_uint::U256;
-
-#[derive(Clone, Debug, Default, PartialEq, Eq)]
-pub struct HeaderView {
-    inner: Header,
-    total_difficulty: U256,
-    total_uncles_count: u64,
-}
-
-impl HeaderView {
-    pub fn new(inner: Header, total_difficulty: U256, total_uncles_count: u64) -> Self {
-        HeaderView {
-            inner,
-            total_difficulty,
-            total_uncles_count,
-        }
-    }
-
-    pub fn number(&self) -> BlockNumber {
-        self.inner.number()
-    }
-
-    pub fn hash(&self) -> H256 {
-        self.inner.hash()
-    }
-
-    pub fn total_uncles_count(&self) -> u64 {
-        self.total_uncles_count
-    }
-
-    pub fn total_difficulty(&self) -> &U256 {
-        &self.total_difficulty
-    }
-
-    pub fn inner(&self) -> &Header {
-        &self.inner
-    }
-
-    pub fn into_inner(self) -> Header {
-        self.inner
-    }
-}
diff --git a/sync/src/synchronizer/headers_process.rs b/sync/src/synchronizer/headers_process.rs
index 74d44b0885..afeda79b7e 100644
--- a/sync/src/synchronizer/headers_process.rs
+++ b/sync/src/synchronizer/headers_process.rs
@@ -3,11 +3,13 @@ use crate::MAX_HEADERS_LEN;
 use ckb_core::header::Header;
 use ckb_network::{CKBProtocolContext, PeerIndex};
 use ckb_protocol::{FlatbuffersVectorIterator, Headers};
+use ckb_shared::block_median_time_context::BlockMedianTimeContext;
 use ckb_shared::index::ChainIndex;
 use ckb_shared::shared::ChainProvider;
 use ckb_verification::{Error as VerifyError, HeaderResolver, HeaderVerifier, Verifier};
 use log;
 use log::{debug, log_enabled};
+use numext_fixed_hash::H256;
 use numext_fixed_uint::U256;
 use std::sync::Arc;
 
@@ -38,6 +40,51 @@ impl<'a, CI: ChainIndex + 'a> VerifierResolver<'a, CI> {
     }
 }
 
+impl<'a, CI: ChainIndex> ::std::clone::Clone for VerifierResolver<'a, CI> {
+    fn clone(&self) -> Self {
+        VerifierResolver {
+            parent: self.parent,
+            header: self.header,
+            synchronizer: self.synchronizer,
+        }
+    }
+}
+
+impl<'a, CI: ChainIndex + 'a> BlockMedianTimeContext for VerifierResolver<'a, CI> {
+    fn block_count(&self) -> u32 {
+        self.synchronizer
+            .shared
+            .consensus()
+            .median_time_block_count() as u32
+    }
+    fn timestamp(&self, hash: &H256) -> Option<u64> {
+        self.synchronizer
+            .header_map
+            .read()
+            .get(hash)
+            .map(|h| h.inner().timestamp())
+            .or_else(|| {
+                self.synchronizer
+                    .shared
+                    .block_header(hash)
+                    .map(|header| header.timestamp())
+            })
+    }
+    fn parent_hash(&self, hash: &H256) -> Option<H256> {
+        self.synchronizer
+            .header_map
+            .read()
+            .get(hash)
+            .map(|h| h.inner().parent_hash().to_owned())
+            .or_else(|| {
+                self.synchronizer
+                    .shared
+                    .block_header(hash)
+                    .map(|header| header.parent_hash().to_owned())
+            })
+    }
+}
+
 impl<'a, CI: ChainIndex> HeaderResolver for VerifierResolver<'a, CI> {
     fn header(&self) -> &Header {
         self.header
@@ -150,9 +197,10 @@ where
     pub fn accept_first(&self, first: &Header) -> ValidationResult {
         let parent = self.synchronizer.get_header(&first.parent_hash());
         let resolver = VerifierResolver::new(parent.as_ref(), &first, &self.synchronizer);
-        let verifier = HeaderVerifier::new(Arc::clone(
-            &self.synchronizer.shared.consensus().pow_engine(),
-        ));
+        let verifier = HeaderVerifier::new(
+            resolver.clone(),
+            Arc::clone(&self.synchronizer.shared.consensus().pow_engine()),
+        );
         let acceptor =
             HeaderAcceptor::new(first, self.peer, &self.synchronizer, resolver, verifier);
         acceptor.accept()
@@ -196,9 +244,10 @@ where
         for window in headers.windows(2) {
             if let [parent, header] = &window {
                 let resolver = VerifierResolver::new(Some(&parent), &header, &self.synchronizer);
-                let verifier = HeaderVerifier::new(Arc::clone(
-                    &self.synchronizer.shared.consensus().pow_engine(),
-                ));
+                let verifier = HeaderVerifier::new(
+                    resolver.clone(),
+                    Arc::clone(&self.synchronizer.shared.consensus().pow_engine()),
+                );
                 let acceptor =
                     HeaderAcceptor::new(&header, self.peer, &self.synchronizer, resolver, verifier);
                 let result = acceptor.accept();
diff --git a/sync/src/synchronizer/mod.rs b/sync/src/synchronizer/mod.rs
index e864959f1c..31828e425f 100644
--- a/sync/src/synchronizer/mod.rs
+++ b/sync/src/synchronizer/mod.rs
@@ -1,21 +1,20 @@
 mod block_fetcher;
 mod block_pool;
 mod block_process;
+mod filter_process;
 mod get_blocks_process;
 mod get_headers_process;
-mod header_view;
 mod headers_process;
-mod peers;
 
 use self::block_fetcher::BlockFetcher;
 use self::block_pool::OrphanBlockPool;
 use self::block_process::BlockProcess;
+use self::filter_process::{AddFilterProcess, ClearFilterProcess, SetFilterProcess};
 use self::get_blocks_process::GetBlocksProcess;
 use self::get_headers_process::GetHeadersProcess;
-use self::header_view::HeaderView;
 use self::headers_process::HeadersProcess;
-use self::peers::Peers;
 use crate::config::Config;
+use crate::types::{HeaderView, Peers};
 use crate::{
     CHAIN_SYNC_TIMEOUT, EVICTION_HEADERS_RESPONSE_TIME, HEADERS_DOWNLOAD_TIMEOUT_BASE,
     HEADERS_DOWNLOAD_TIMEOUT_PER_HEADER, MAX_HEADERS_LEN,
@@ -83,6 +82,7 @@ pub struct Synchronizer<CI: ChainIndex> {
     pub outbound_peers_with_protect: Arc<AtomicUsize>,
 }
 
+// https://github.com/rust-lang/rust/issues/40754
 impl<CI: ChainIndex> ::std::clone::Clone for Synchronizer<CI> {
     fn clone(&self) -> Self {
         Synchronizer {
@@ -152,6 +152,16 @@ impl<CI: ChainIndex> Synchronizer<CI> {
             SyncPayload::Block => {
                 BlockProcess::new(&message.payload_as_block().unwrap(), self, peer, nc).execute()
             }
+            SyncPayload::SetFilter => {
+                SetFilterProcess::new(&message.payload_as_set_filter().unwrap(), self, peer)
+                    .execute()
+            }
+            SyncPayload::AddFilter => {
+                AddFilterProcess::new(&message.payload_as_add_filter().unwrap(), self, peer)
+                    .execute()
+            }
+            SyncPayload::ClearFilter => ClearFilterProcess::new(self, peer).execute(),
+            SyncPayload::FilteredBlock => {} // ignore, should not receive FilteredBlock in full node mode
             SyncPayload::NONE => {}
         }
     }
@@ -477,7 +487,7 @@ impl<CI: ChainIndex> Synchronizer<CI> {
     }
 
     pub fn get_blocks_to_fetch(&self, peer: PeerIndex) -> Option<Vec<H256>> {
-        BlockFetcher::new(&self, peer).fetch()
+        BlockFetcher::new(self.clone(), peer).fetch()
     }
 
     fn on_connected(&self, nc: &CKBProtocolContext, peer: PeerIndex) {
@@ -1154,10 +1164,11 @@ mod tests {
             headers
                 .iter()
                 .map(|h| format!(
-                    "{} hash({}) parent({})",
+                    "{} hash({}) timestamp({}) parent({})",
                     h.number(),
                     h.hash(),
-                    h.parent_hash()
+                    h.timestamp(),
+                    h.parent_hash(),
                 ))
                 .collect::<Vec<_>>()
         );
diff --git a/sync/src/tests/filter.rs b/sync/src/tests/filter.rs
new file mode 100644
index 0000000000..503998a29d
--- /dev/null
+++ b/sync/src/tests/filter.rs
@@ -0,0 +1,12 @@
+use crate::types::TransactionFilter;
+use ckb_core::transaction::{CellInput, CellOutput, OutPoint, Transaction, TransactionBuilder};
+use numext_fixed_hash::H256;
+
+#[test]
+fn transaction_filter() {
+    let mut filter = TransactionFilter::new(&vec![0; 8], 3, 1);
+    let tx = TransactionBuilder::default().build();
+    assert!(!filter.contains(&tx));
+    filter.insert(&tx.hash());
+    assert!(filter.contains(&tx));
+}
diff --git a/sync/src/tests/mod.rs b/sync/src/tests/mod.rs
index ed6ffc3079..580de9e9d7 100644
--- a/sync/src/tests/mod.rs
+++ b/sync/src/tests/mod.rs
@@ -8,6 +8,7 @@ use std::sync::Arc;
 use std::thread;
 use std::time::Duration;
 
+mod filter;
 #[cfg(not(disable_faketime))]
 mod relayer;
 #[cfg(not(disable_faketime))]
diff --git a/sync/src/tests/relayer.rs b/sync/src/tests/relayer.rs
index 96a2aca180..78b9f0c6da 100644
--- a/sync/src/tests/relayer.rs
+++ b/sync/src/tests/relayer.rs
@@ -355,7 +355,12 @@ fn setup_node(
             .expect("process block should be OK");
     }
 
-    let relayer = Relayer::new(chain_controller.clone(), shared.clone(), tx_pool_controller);
+    let relayer = Relayer::new(
+        chain_controller.clone(),
+        shared.clone(),
+        tx_pool_controller,
+        Arc::new(Default::default()),
+    );
 
     let mut node = TestNode::default();
     node.add_protocol(
diff --git a/sync/src/synchronizer/peers.rs b/sync/src/types.rs
similarity index 64%
rename from sync/src/synchronizer/peers.rs
rename to sync/src/types.rs
index 6083081027..6a99b1158d 100644
--- a/sync/src/synchronizer/peers.rs
+++ b/sync/src/types.rs
@@ -1,6 +1,9 @@
-use super::header_view::HeaderView;
+use bloom_filters::{
+    BloomFilter, ClassicBloomFilter, DefaultBuildHashKernels, UpdatableBloomFilter,
+};
 use ckb_core::block::Block;
-use ckb_core::header::Header;
+use ckb_core::header::{BlockNumber, Header};
+use ckb_core::transaction::Transaction;
 use ckb_network::PeerIndex;
 use ckb_shared::shared::TipHeader;
 use ckb_util::RwLock;
@@ -8,15 +11,8 @@ use faketime::unix_time_as_millis;
 use fnv::{FnvHashMap, FnvHashSet};
 use log::debug;
 use numext_fixed_hash::H256;
-
-// const BANSCORE: u32 = 100;
-
-#[derive(Clone, Copy, Debug, PartialEq, Default)]
-pub struct Negotiate {
-    pub prefer_headers: bool,
-    //     pub want_cmpct: bool,
-    //     pub have_witness: bool,
-}
+use numext_fixed_uint::U256;
+use std::hash::{BuildHasher, Hasher};
 
 // State used to enforce CHAIN_SYNC_TIMEOUT
 // Only in effect for outbound, non-manual connections, with
@@ -53,7 +49,6 @@ impl Default for ChainSyncState {
 
 #[derive(Clone, Default, Debug, PartialEq)]
 pub struct PeerState {
-    pub negotiate: Negotiate,
     pub sync_started: bool,
     pub last_block_announcement: Option<u64>, //ms
     pub headers_sync_timeout: Option<u64>,
@@ -61,13 +56,14 @@ pub struct PeerState {
     pub chain_sync: ChainSyncState,
 }
 
-#[derive(Debug, Default)]
+#[derive(Default)]
 pub struct Peers {
     pub state: RwLock<FnvHashMap<PeerIndex, PeerState>>,
     pub misbehavior: RwLock<FnvHashMap<PeerIndex, u32>>,
     pub blocks_inflight: RwLock<FnvHashMap<PeerIndex, BlocksInflight>>,
     pub best_known_headers: RwLock<FnvHashMap<PeerIndex, HeaderView>>,
     pub last_common_headers: RwLock<FnvHashMap<PeerIndex, Header>>,
+    pub transaction_filters: RwLock<FnvHashMap<PeerIndex, TransactionFilter>>,
 }
 
 #[derive(Debug, Clone)]
@@ -135,7 +131,6 @@ impl Peers {
                 let mut chain_sync = ChainSyncState::default();
                 chain_sync.protect = protect;
                 PeerState {
-                    negotiate: Negotiate::default(),
                     sync_started: false,
                     last_block_announcement: None,
                     headers_sync_timeout: Some(predicted_headers_sync_time),
@@ -193,3 +188,113 @@ impl Peers {
             .or_insert_with(|| header.clone());
     }
 }
+
+#[derive(Clone, Debug, Default, PartialEq, Eq)]
+pub struct HeaderView {
+    inner: Header,
+    total_difficulty: U256,
+    total_uncles_count: u64,
+}
+
+impl HeaderView {
+    pub fn new(inner: Header, total_difficulty: U256, total_uncles_count: u64) -> Self {
+        HeaderView {
+            inner,
+            total_difficulty,
+            total_uncles_count,
+        }
+    }
+
+    pub fn number(&self) -> BlockNumber {
+        self.inner.number()
+    }
+
+    pub fn hash(&self) -> H256 {
+        self.inner.hash()
+    }
+
+    pub fn total_uncles_count(&self) -> u64 {
+        self.total_uncles_count
+    }
+
+    pub fn total_difficulty(&self) -> &U256 {
+        &self.total_difficulty
+    }
+
+    pub fn inner(&self) -> &Header {
+        &self.inner
+    }
+
+    pub fn into_inner(self) -> Header {
+        self.inner
+    }
+}
+
+pub struct TransactionFilter {
+    filter: ClassicBloomFilter<DefaultBuildHashKernels<HighLowBytesBuildHasher>>,
+}
+
+impl TransactionFilter {
+    pub fn new(raw_data: &[u8], k: usize, hash_seed: usize) -> Self {
+        Self {
+            filter: ClassicBloomFilter::with_raw_data(
+                raw_data,
+                k,
+                DefaultBuildHashKernels::new(hash_seed, HighLowBytesBuildHasher),
+            ),
+        }
+    }
+
+    pub fn update(&mut self, raw_data: &[u8]) {
+        self.filter.update(raw_data)
+    }
+
+    pub fn insert(&mut self, hash: &H256) {
+        self.filter.insert(hash);
+    }
+
+    pub fn contains(&self, transaction: &Transaction) -> bool {
+        self.filter.contains(&transaction.hash())
+            || transaction.inputs().iter().any(|input| {
+                self.filter.contains(&input.previous_output.hash)
+                    || self.filter.contains(&input.unlock.type_hash())
+            })
+            || transaction
+                .outputs()
+                .iter()
+                .any(|output| self.filter.contains(&output.lock))
+    }
+}
+
+struct HighLowBytesBuildHasher;
+
+impl BuildHasher for HighLowBytesBuildHasher {
+    type Hasher = HighLowBytesHasher;
+
+    fn build_hasher(&self) -> Self::Hasher {
+        HighLowBytesHasher(0)
+    }
+}
+
+/// a hasher which only accepts H256 bytes and use high / low bytes as hash value
+struct HighLowBytesHasher(u64);
+
+impl Hasher for HighLowBytesHasher {
+    fn write(&mut self, bytes: &[u8]) {
+        if bytes.len() == 32 {
+            self.0 = (u64::from(bytes[0]) << 56)
+                + (u64::from(bytes[1]) << 48)
+                + (u64::from(bytes[2]) << 40)
+                + (u64::from(bytes[3]) << 32)
+                + (u64::from(bytes[28]) << 24)
+                + (u64::from(bytes[29]) << 16)
+                + (u64::from(bytes[30]) << 8)
+                + u64::from(bytes[31]);
+        }
+    }
+
+    fn finish(&self) -> u64 {
+        println!("finish {:?}", self.0);
+        self.0
+    }
+}
diff --git a/util/Cargo.toml b/util/Cargo.toml
index 8a62d59c13..84473956a0 100644
--- a/util/Cargo.toml
+++ b/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-util"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/avl/Cargo.toml b/util/avl/Cargo.toml
index 5538e15cf3..1157a317a4 100644
--- a/util/avl/Cargo.toml
+++ b/util/avl/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "avl-merkle"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/build-info/Cargo.toml b/util/build-info/Cargo.toml
index 675900f6a2..afdae7b6c9 100644
--- a/util/build-info/Cargo.toml
+++ b/util/build-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "build-info"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/crypto/Cargo.toml b/util/crypto/Cargo.toml
index 0fb0a3d388..79eecbdd1e 100644
--- a/util/crypto/Cargo.toml
+++ b/util/crypto/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "crypto"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
@@ -8,10 +8,10 @@ edition = "2018"
 [dependencies]
 secp256k1 = { git = "https://github.com/nervosnetwork/rust-secp256k1", optional = true, features = ["rand"] }
 lazy_static = "1.0"
-failure = "0.1.1"
+failure = "0.1.5"
 rand = "0.6"
 numext-fixed-hash = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] }
-faster-hex = "0.1"
+faster-hex = "0.3"
 crunchy =  { version = "0.2", optional= true }
 
 [features]
diff --git a/util/dir/Cargo.toml b/util/dir/Cargo.toml
index 6541f13e30..e55073b0f6 100644
--- a/util/dir/Cargo.toml
+++ b/util/dir/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "dir"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/hash/Cargo.toml b/util/hash/Cargo.toml
index 8a1d252559..bc6f73b1ae 100644
--- a/util/hash/Cargo.toml
+++ b/util/hash/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hash"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/instrument/Cargo.toml b/util/instrument/Cargo.toml
index f10a766131..9d5c87ea63 100644
--- a/util/instrument/Cargo.toml
+++ b/util/instrument/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-instrument"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/logger/Cargo.toml b/util/logger/Cargo.toml
index afa74b903f..b390e5a674 100644
--- a/util/logger/Cargo.toml
+++ b/util/logger/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "logger"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos <dev@nervos.org>"]
 edition = "2018"
diff --git a/util/merkle-root/Cargo.toml b/util/merkle-root/Cargo.toml
index 35e746aa1a..ebaa4829ab 100644
--- a/util/merkle-root/Cargo.toml
+++ b/util/merkle-root/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "merkle-root"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
@@ -8,3 +8,4 @@ edition = "2018"
 [dependencies]
 numext-fixed-hash = { version = "0.1", features = ["support_rand", "support_heapsize", "support_serde"] }
 hash = {path = "../hash"}
+merkle-tree = {path = "../merkle-tree"}
diff --git a/util/merkle-root/src/lib.rs b/util/merkle-root/src/lib.rs
index b65dd9e1b8..aa34faa2b1 100644
--- a/util/merkle-root/src/lib.rs
+++ b/util/merkle-root/src/lib.rs
@@ -1,85 +1,22 @@
 use hash::Sha3;
+use merkle_tree::{Merge, Tree};
 use numext_fixed_hash::H256;
 
-fn lowest_children_len(amount: usize) -> usize {
-    let mut n: usize = 1;
-    let mut r: usize = 0;
+pub struct H256Sha3;
 
-    while n <= amount {
-        r = amount - n;
-        n <<= 1;
-    }
-
-    r << 1
-}
-
-pub fn merkle_root(input: &[H256]) -> H256 {
-    let inlen = input.len();
-    // in case of empty slice, just return zero
-    if inlen == 0 {
-        return H256::zero();
-    }
-
-    let lwlen = lowest_children_len(inlen);
-    let mut i: usize = 0;
-    let mut nodes = Vec::with_capacity(inlen);
-
-    while i < lwlen {
-        nodes.push(merge(&input[i], &input[i + 1]));
-        i += 2;
-    }
+impl Merge for H256Sha3 {
+    type Item = H256;
 
-    for h in input.iter().skip(i) {
-        nodes.push(h.clone());
+    fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
+        let mut hash = [0u8; 32];
+        let mut sha3 = Sha3::new_sha3_256();
+        sha3.update(left.as_bytes());
+        sha3.update(right.as_bytes());
+        sha3.finalize(&mut hash);
+        hash.into()
     }
-
-    let nlen = nodes.len();
-    let mut d = 1;
-    while d < nlen {
-        let mut j = 0;
-        while j < nlen {
-            nodes[j] = merge(&nodes[j], &nodes[j + d]);
-            j += d + d;
-        }
-        d <<= 1;
-    }
-
-    nodes[0].clone()
-}
-
-fn merge(left: &H256, right: &H256) -> H256 {
-    let mut hash = [0u8; 32];
-    let mut sha3 = Sha3::new_sha3_256();
-    sha3.update(left.as_bytes());
-    sha3.update(right.as_bytes());
-    sha3.finalize(&mut hash);
-    hash.into()
 }
 
-#[cfg(test)]
-mod tests {
-    use super::merkle_root;
-    use numext_fixed_hash::H256;
-    use std::str::FromStr;
-
-    #[test]
-    fn merkle_root_test() {
-        assert_eq!(
-            merkle_root(&[
-                H256::from_str("8e827ab731f2416f6057b9c7f241b1841e345ffeabb4274e35995a45f4d42a1a")
-                    .unwrap(),
-                H256::from_str("768dfb4ca3311fa3bf4d696dde334e30edf3542e8ea114a4f9d18fb34365f1d1")
-                    .unwrap(),
-                H256::from_str("e68dfb4ca3311fa3bf4d696dde334e30edf3542e8ea114a4f9d18fb34365f1d1")
-                    .unwrap(),
-                H256::from_str("f68dfb4ca3311fa3bf4d696dde334e30edf3542e8ea114a4f9d18fb34365f1d1")
-                    .unwrap(),
-                H256::from_str("968dfb4ca3311fa3bf4d696dde334e30edf3542e8ea114a4f9d18fb34365f1d1")
-                    .unwrap(),
-            ]),
-            H256::from_str("34c5d6f2ec196e6836549e49b0ed73a1b19524acc6f1d0e5c951cfd9652da93c")
-                .unwrap()
-        );
-    }
-
+pub fn merkle_root(input: &[H256]) -> H256 {
+    Tree::<H256Sha3>::build_root(input).unwrap_or_else(H256::zero)
 }
diff --git a/util/merkle-tree/Cargo.toml b/util/merkle-tree/Cargo.toml
new file mode 100644
index 0000000000..0ceab49597
--- /dev/null
+++ b/util/merkle-tree/Cargo.toml
@@ -0,0 +1,9 @@
+[package]
+name = "merkle-tree"
+version = "0.4.0"
+license = "MIT"
+authors = ["Nervos Core Dev <dev@nervos.org>"]
+edition = "2018"
+
+[dev-dependencies]
+proptest = "0.8"
diff --git a/util/merkle-tree/src/hash.rs b/util/merkle-tree/src/hash.rs
new file mode 100644
index 0000000000..629e41bfd4
--- /dev/null
+++ b/util/merkle-tree/src/hash.rs
@@ -0,0 +1,6 @@
+/// A trait for creating parent node.
+pub trait Merge {
+    type Item;
+    /// Returns parent node of two nodes
+    fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item;
+}
diff --git a/util/merkle-tree/src/lib.rs b/util/merkle-tree/src/lib.rs
new file mode 100644
index 0000000000..233b67e51a
--- /dev/null
+++ b/util/merkle-tree/src/lib.rs
@@ -0,0 +1,7 @@
+mod hash;
+mod proof;
+mod tree;
+
+pub use crate::hash::Merge;
+pub use crate::proof::Proof;
+pub use crate::tree::Tree;
diff --git a/util/merkle-tree/src/proof.rs b/util/merkle-tree/src/proof.rs
new file mode 100644
index 0000000000..461120eb86
--- /dev/null
+++ b/util/merkle-tree/src/proof.rs
@@ -0,0 +1,255 @@
+use crate::hash::Merge;
+use crate::tree::Tree;
+use std::collections::VecDeque;
+
+/// Merkle Proof can provide a proof for existence of one or more items.
+/// Only sibling of the nodes along the path that form leaves to root,
+/// excluding the nodes already in the path, should be included in the proof.
+/// For example, if we want to show that [T0, T5] is in the list of 6 items,
+/// only nodes [T4, T1, B3] should be included in the proof.
+///
+/// `tree nodes`: [B0, B1, B2, B3, B4, T0, T1, T2, T3, T4, T5]
+/// `leaves`: [(0, T0), (5, T5)]
+/// `lemmas`: [T4, T1, B3]
+/// `leaves_count`: 6
+pub struct Proof<M>
+where
+    M: Merge,
+{
+    /// a partial leaves collection keeps the items sorted based on index
+    pub leaves: Vec<(usize, M::Item)>,
+    /// non-calculable nodes, stored in descending order
+    pub lemmas: Vec<M::Item>,
+    /// total leaves count
+    pub leaves_count: usize,
+}
+
+impl<M> Proof<M>
+where
+    M: Merge,
+    <M as Merge>::Item: Clone + Default,
+{
+    /// Returns the root of the proof, or None if it is empty or lemmas are invalid
+    pub fn root(&self) -> Option<M::Item> {
+        if self.leaves_count == 0 {
+            return None;
+        }
+
+        let mut queue = self
+            .leaves
+            .iter()
+            .rev()
+            .map(|(index, leaf)| (self.leaves_count + index - 1, leaf.clone()))
+            .collect::<VecDeque<_>>();
+
+        let mut lemmas_iter = self.lemmas.iter();
+
+        while let Some((index, node)) = queue.pop_front() {
+            if index == 0 {
+                // ensure that all lemmas and leaves are consumed
+                if lemmas_iter.next().is_none() && queue.is_empty() {
+                    return Some(node);
+                } else {
+                    return None;
+                }
+            }
+
+            if let Some(sibling) = match queue.front() {
+                Some((front, _)) if *front == index.sibling() => {
+                    queue.pop_front().map(|i| i.1.clone())
+                }
+                _ => lemmas_iter.next().cloned(),
+            } {
+                let parent_node = if index.is_left() {
+                    M::merge(&node, &sibling)
+                } else {
+                    M::merge(&sibling, &node)
+                };
+                queue.push_back((index.parent(), parent_node));
+            }
+        }
+
+        None
+    }
+}
+
+impl<M> Tree<M>
+where
+    M: Merge,
+    <M as Merge>::Item: Clone + Default,
+{
+    /// Returns the proof of the tree, or None if it is empty.
+    /// Assumes that the `leaf_indexes` is sorted.
+    pub fn get_proof(&self, leaf_indexes: &[usize]) -> Option<Proof<M>> {
+        let leaves_count = (self.nodes.len() >> 1) + 1;
+
+        if self.nodes.is_empty()
+            || leaf_indexes.is_empty()
+            || *leaf_indexes.last().unwrap() >= leaves_count
+        {
+            return None;
+        }
+
+        let leaves = leaf_indexes
+            .iter()
+            .map(|&index| (index, self.nodes[leaves_count + index - 1].clone()))
+            .collect::<Vec<_>>();
+
+        let mut lemmas = Vec::new();
+        let mut queue = leaf_indexes
+            .iter()
+            .rev()
+            .map(|index| leaves_count + index - 1)
+            .collect::<VecDeque<_>>();
+        while let Some(index) = queue.pop_front() {
+            if index == 0 {
+                break;
+            }
+            if Some(&index.sibling()) == queue.front() {
+                queue.pop_front();
+            } else {
+                lemmas.push(self.nodes[index.sibling()].clone());
+            }
+
+            queue.push_back(index.parent());
+        }
+
+        Some(Proof {
+            leaves,
+            lemmas,
+            leaves_count,
+        })
+    }
+}
+
+/// A helper trait for node index
+trait NodeIndex {
+    fn sibling(&self) -> usize;
+    fn parent(&self) -> usize;
+    fn is_left(&self) -> bool;
+}
+
+impl NodeIndex for usize {
+    #[inline]
+    fn sibling(&self) -> usize {
+        debug_assert!(*self > 0);
+        ((self + 1) ^ 1) - 1
+    }
+
+    #[inline]
+    fn parent(&self) -> usize {
+        debug_assert!(*self > 0);
+        (self - 1) >> 1
+    }
+
+    #[inline]
+    fn is_left(&self) -> bool {
+        self & 1 == 1
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use crate::tree::Tree;
+    use proptest::collection::vec;
+    use proptest::num::i32;
+    use proptest::prelude::*;
+    use proptest::sample::subsequence;
+    use proptest::{proptest, proptest_helper};
+    struct DummyHash;
+
+    impl Merge for DummyHash {
+        type Item = i32;
+
+        fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
+            right.wrapping_sub(*left)
+        }
+    }
+
+    #[test]
+    fn empty() {
+        let proof: Proof<DummyHash> = Proof {
+            leaves: vec![],
+            lemmas: vec![],
+            leaves_count: 0,
+        };
+
+        assert_eq!(None, proof.root());
+    }
+
+    #[test]
+    fn one() {
+        let proof: Proof<DummyHash> = Proof {
+            leaves: vec![(0, 1)],
+            lemmas: vec![],
+            leaves_count: 1,
+        };
+
+        assert_eq!(Some(1), proof.root());
+    }
+
+    #[test]
+    fn extra_lemma() {
+        let proof: Proof<DummyHash> = Proof {
+            leaves: vec![(0, 1)],
+            lemmas: vec![1],
+            leaves_count: 1,
+        };
+
+        assert_eq!(None, proof.root());
+    }
+
+    #[test]
+    fn missing_leaves() {
+        let proof: Proof<DummyHash> = Proof {
+            leaves: vec![(1, 1)],
+            lemmas: vec![],
+            leaves_count: 2,
+        };
+
+        assert_eq!(None, proof.root());
+    }
+
+    #[test]
+    // [ 1,  0,  1,  2,  2,  2,  3,  5,  7, 11, 13]
+    // [B0, B1, B2, B3, B4, T0, T1, T2, T3, T4, T5]
+    // [(0, 2), (5, 13)]
+    // [    T0,      T5]
+    // [11,  3,  2]
+    // [T4, T1, B3]
+    fn two_of_six() {
+        let proof: Proof<DummyHash> = Proof {
+            leaves: vec![(0, 2), (5, 13)],
+            lemmas: vec![11, 3, 2],
+            leaves_count: 6,
+        };
+
+        assert_eq!(Some(1), proof.root());
+    }
+
+    #[test]
+    fn build_proof() {
+        let leaves = vec![2, 3, 5, 7, 11, 13];
+        let tree = Tree::<DummyHash>::new(&leaves);
+        let proof = tree.get_proof(&[0, 5]).unwrap();
+        assert_eq!(vec![(0, 2), (5, 13)], proof.leaves);
+        assert_eq!(vec![11, 3, 2], proof.lemmas);
+        assert_eq!(Some(1), proof.root());
+    }
+
+    fn _tree_root_is_same_as_proof_root(leaves: &[i32], indexes: &[usize]) {
+        let tree = Tree::<DummyHash>::new(leaves);
+        let proof = tree.get_proof(indexes).unwrap();
+        assert_eq!(Tree::<DummyHash>::build_root(leaves), proof.root());
+    }
+
+    proptest! {
+        #[test]
+        fn tree_root_is_same_as_proof_root(input in vec(i32::ANY,  2..1000)
+            .prop_flat_map(|leaves| (Just(leaves.clone()), subsequence((0..leaves.len()).collect::<Vec<usize>>(), 1..leaves.len())))
+        ) {
+            _tree_root_is_same_as_proof_root(&input.0, &input.1);
+        }
+    }
+}
diff --git a/util/merkle-tree/src/tree.rs b/util/merkle-tree/src/tree.rs
new file mode 100644
index 0000000000..902c4fcbf6
--- /dev/null
+++ b/util/merkle-tree/src/tree.rs
@@ -0,0 +1,177 @@
+use crate::hash::Merge;
+use std::collections::VecDeque;
+
+/// Merkle tree is a tree in which every leaf node is labelled with the hash of a data block and
+/// every non-leaf node is labelled with the cryptographic hash of the labels of its child nodes.
+///
+/// [Article on Wikipedia](https://en.wikipedia.org/wiki/Merkle_tree)
+///
+/// This implementation use `Full and Complete Binary Tree` to store the data.
+///
+/// ```text
+///         with 6 leaves                       with 7 leaves
+///
+///               B0                                 B0
+///              /  \                               /  \
+///            /      \                           /      \
+///          /          \                       /          \
+///        /              \                   /              \
+///       B1              B2                 B1              B2
+///      /  \            /  \               /  \            /  \
+///     /    \          /    \             /    \          /    \
+///    /      \        /      \           /      \        /      \
+///   B3      B4      TO      T1         B3      B4      B5      T0
+///  /  \    /  \                       /  \    /  \    /  \
+/// T2  T3  T4  T5                     T1  T2  T3  T4  T5  T6
+/// ```
+///
+/// the two trees above can be represented as:
+/// [B0, B1, B2, B3, B4, T0, T1, T2, T3, T4, T5]
+/// [B0, B1, B2, B3, B4, B5, T0, T1, T2, T3, T4, T5, T6]
+pub struct Tree<M>
+where
+    M: Merge,
+{
+    pub(crate) nodes: Vec<M::Item>,
+}
+
+impl<M> Tree<M>
+where
+    M: Merge,
+    <M as Merge>::Item: Clone + Default,
+{
+    /// Create a merkle tree with leaves
+    /// # Examples
+    /// ```
+    /// use merkle_tree::{Merge, Tree};
+    /// struct DummyHash;
+    ///
+    /// impl Merge for DummyHash {
+    ///     type Item = i32;
+    ///
+    ///     fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
+    ///         right.wrapping_sub(*left)
+    ///     }
+    /// }
+    ///
+    /// let leaves = vec![2, 3, 5, 7, 11, 13];
+    /// let tree = Tree::<DummyHash>::new(&leaves);
+    /// assert_eq!(vec![1, 0, 1, 2, 2, 2, 3, 5, 7, 11, 13], tree.nodes());
+    /// assert_eq!(Some(1), tree.root());
+    /// ```
+    pub fn new(leaves: &[M::Item]) -> Self {
+        let len = leaves.len();
+        if len > 0 {
+            let mut vec = vec![M::Item::default(); len - 1];
+            vec.extend(leaves.to_vec());
+
+            (0..len - 1)
+                .rev()
+                .for_each(|i| vec[i] = M::merge(&vec[(i << 1) + 1], &vec[(i << 1) + 2]));
+
+            Self { nodes: vec }
+        } else {
+            Self { nodes: vec![] }
+        }
+    }
+
+    /// Returns all nodes of the tree
+    pub fn nodes(&self) -> &[M::Item] {
+        &self.nodes
+    }
+
+    /// Returns the root of the tree, or None if it is empty.
+    pub fn root(&self) -> Option<M::Item> {
+        self.nodes.first().cloned()
+    }
+
+    /// Build merkle root directly without tree initialization
+    pub fn build_root(leaves: &[M::Item]) -> Option<M::Item> {
+        if leaves.is_empty() {
+            return None;
+        }
+
+        let mut queue = VecDeque::with_capacity((leaves.len() + 1) >> 1);
+
+        let mut iter = leaves.rchunks_exact(2);
+        while let Some([leaf1, leaf2]) = iter.next() {
+            queue.push_back(M::merge(leaf1, leaf2))
+        }
+        if let [leaf] = iter.remainder() {
+            queue.push_front(leaf.clone())
+        }
+
+        while queue.len() > 1 {
+            let right = queue.pop_front().unwrap();
+            let left = queue.pop_front().unwrap();
+            queue.push_back(M::merge(&left, &right));
+        }
+
+        queue.pop_front()
+    }
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+    use proptest::collection::vec;
+    use proptest::num::i32;
+    use proptest::{proptest, proptest_helper};
+
+    struct DummyHash;
+
+    impl Merge for DummyHash {
+        type Item = i32;
+
+        fn merge(left: &Self::Item, right: &Self::Item) -> Self::Item {
+            right.wrapping_sub(*left)
+        }
+    }
+
+    #[test]
+    fn build_empty() {
+        let leaves = vec![];
+        let tree = Tree::<DummyHash>::new(&leaves);
+        assert!(tree.nodes().is_empty());
+        assert!(tree.root().is_none());
+    }
+
+    #[test]
+    fn build_one() {
+        let leaves = vec![1];
+        let tree = Tree::<DummyHash>::new(&leaves);
+        assert_eq!(vec![1], tree.nodes());
+    }
+
+    #[test]
+    fn build_two() {
+        let leaves = vec![1, 2];
+        let tree = Tree::<DummyHash>::new(&leaves);
+        assert_eq!(vec![1, 1, 2], tree.nodes());
+    }
+
+    #[test]
+    fn build_five() {
+        let leaves = vec![2, 3, 5, 7, 11];
+        let tree = Tree::<DummyHash>::new(&leaves);
+        assert_eq!(vec![4, -2, 2, 4, 2, 3, 5, 7, 11], tree.nodes());
+    }
+
+    #[test]
+    fn build_root_directly() {
+        let leaves = vec![2, 3, 5, 7, 11];
+        assert_eq!(Some(4), Tree::<DummyHash>::build_root(&leaves));
+    }
+
+    fn _build_root_is_same_as_tree_root(leaves: &[i32]) {
+        let tree = Tree::<DummyHash>::new(leaves);
+        assert_eq!(Tree::<DummyHash>::build_root(leaves), tree.root());
+    }
+
+    proptest! {
+        #[test]
+        fn build_root_is_same_as_tree_root(ref leaves in vec(i32::ANY,  0..1000)) {
+            _build_root_is_same_as_tree_root(leaves);
+        }
+    }
+}
diff --git a/verification/Cargo.toml b/verification/Cargo.toml
index 734a095cd4..555ea00719 100644
--- a/verification/Cargo.toml
+++ b/verification/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "ckb-verification"
-version = "0.3.0"
+version = "0.4.0"
 license = "MIT"
 authors = ["Nervos Core Dev <dev@nervos.org>"]
 edition = "2018"
diff --git a/verification/src/block_verifier.rs b/verification/src/block_verifier.rs
index a7526a84a1..7ec448b04b 100644
--- a/verification/src/block_verifier.rs
+++ b/verification/src/block_verifier.rs
@@ -1,4 +1,3 @@
-use crate::error::TransactionError;
 use crate::error::{CellbaseError, CommitError, Error, UnclesError};
 use crate::header_verifier::HeaderResolver;
 use crate::{TransactionVerifier, Verifier};
@@ -6,6 +5,7 @@ use ckb_core::block::Block;
 use ckb_core::cell::{CellProvider, CellStatus};
 use ckb_core::header::Header;
 use ckb_core::transaction::{Capacity, CellInput, OutPoint};
+use ckb_core::Cycle;
 use ckb_shared::shared::ChainProvider;
 use fnv::{FnvHashMap, FnvHashSet};
 use merkle_root::merkle_root;
@@ -15,6 +15,7 @@ use rayon::iter::{IndexedParallelIterator, IntoParallelRefIterator, ParallelIter
 use std::collections::HashSet;
 
 //TODO: cellbase, witness
+#[derive(Clone)]
 pub struct BlockVerifier<P> {
     // Verify if the committed transactions is empty
     empty: EmptyVerifier,
@@ -32,20 +33,6 @@ pub struct BlockVerifier<P> {
     transactions: TransactionsVerifier<P>,
 }
 
-impl<P: ChainProvider + CellProvider + Clone> ::std::clone::Clone for BlockVerifier<P> {
-    fn clone(&self) -> Self {
-        BlockVerifier {
-            empty: self.empty.clone(),
-            duplicate: self.duplicate.clone(),
-            cellbase: self.cellbase.clone(),
-            merkle_root: self.merkle_root.clone(),
-            uncles: self.uncles.clone(),
-            commit: self.commit.clone(),
-            transactions: self.transactions.clone(),
-        }
-    }
-}
-
 impl<P> BlockVerifier<P>
 where
     P: ChainProvider + CellProvider + Clone + 'static,
@@ -247,18 +234,11 @@ impl<'a, CP: ChainProvider> HeaderResolver for HeaderResolverWrapper<'a, CP> {
 }
 
 // TODO redo uncle verifier, check uncle proposal duplicate
+#[derive(Clone)]
 pub struct UnclesVerifier<CP> {
     provider: CP,
 }
 
-impl<CP: ChainProvider + Clone> ::std::clone::Clone for UnclesVerifier<CP> {
-    fn clone(&self) -> Self {
-        UnclesVerifier {
-            provider: self.provider.clone(),
-        }
-    }
-}
-
 impl<CP: ChainProvider + Clone> UnclesVerifier<CP> {
     pub fn new(provider: CP) -> Self {
         UnclesVerifier { provider }
@@ -411,18 +391,11 @@ impl<CP: ChainProvider + Clone> UnclesVerifier<CP> {
     }
 }
 
+#[derive(Clone)]
 pub struct TransactionsVerifier<P> {
     provider: P,
 }
 
-impl<P: ChainProvider + CellProvider + Clone> ::std::clone::Clone for TransactionsVerifier<P> {
-    fn clone(&self) -> Self {
-        TransactionsVerifier {
-            provider: self.provider.clone(),
-        }
-    }
-}
-
 struct TransactionsVerifierWrapper<'a, P: CellProvider + 'a> {
     verifier: &'a TransactionsVerifier<P>,
     block: &'a Block,
@@ -440,15 +413,15 @@ impl<'a, P: CellProvider> CellProvider for TransactionsVerifierWrapper<'a, P> {
                 .outputs()
                 .get(o.index as usize)
             {
-                Some(x) => CellStatus::Current(x.clone()),
+                Some(x) => CellStatus::Live(x.clone()),
                 None => CellStatus::Unknown,
             }
         } else {
             let chain_cell_state = self.verifier.provider.cell_at(o, parent);
-            if chain_cell_state.is_current() {
-                CellStatus::Current(chain_cell_state.take_current().expect("state checked"))
-            } else if chain_cell_state.is_old() {
-                CellStatus::Old
+            if chain_cell_state.is_live() {
+                CellStatus::Live(chain_cell_state.take_live().expect("state checked"))
+            } else if chain_cell_state.is_dead() {
+                CellStatus::Dead
             } else {
                 CellStatus::Unknown
             }
@@ -474,26 +447,50 @@ impl<P: ChainProvider + CellProvider> TransactionsVerifier<P> {
         };
 
         let parent_hash = block.header().parent_hash();
+        let max_cycles = self.provider.consensus().max_block_cycles();
         // make verifiers orthogonal
         // skip first tx, assume the first is cellbase, other verifier will verify cellbase
-        let err: Vec<(usize, TransactionError)> = block
+        block
             .commit_transactions()
             .par_iter()
             .skip(1)
             .map(|x| wrapper.resolve_transaction_at(x, &parent_hash))
             .enumerate()
-            .filter_map(|(index, tx)| {
-                TransactionVerifier::new(&tx)
-                    .verify()
-                    .err()
-                    .map(|e| (index, e))
-            })
-            .collect();
-        if err.is_empty() {
-            Ok(())
-        } else {
-            Err(Error::Transactions(err))
-        }
+            .try_fold(
+                || 0,
+                |cycles: Cycle, (index, tx)| {
+                    TransactionVerifier::new(&tx)
+                        .verify(max_cycles)
+                        .map_err(|e| Error::Transactions((index, e)))
+                        .and_then(|current_cycles| {
+                            cycles
+                                .checked_add(current_cycles)
+                                .ok_or(Error::ExceededMaximumCycles)
+                                .and_then(|new_cycles| {
+                                    if new_cycles > max_cycles {
+                                        Err(Error::ExceededMaximumCycles)
+                                    } else {
+                                        Ok(new_cycles)
+                                    }
+                                })
+                        })
+                },
+            )
+            .try_reduce(
+                || 0,
+                |a, b| {
+                    a.checked_add(b)
+                        .ok_or(Error::ExceededMaximumCycles)
+                        .and_then(|cycles| {
+                            if cycles > max_cycles {
+                                Err(Error::ExceededMaximumCycles)
+                            } else {
+                                Ok(cycles)
+                            }
+                        })
+                },
+            )
+            .map(|_| ())
     }
 }
 
diff --git a/verification/src/error.rs b/verification/src/error.rs
index d2f3b67359..daf8635820 100644
--- a/verification/src/error.rs
+++ b/verification/src/error.rs
@@ -15,10 +15,10 @@ pub enum Error {
     Number(NumberError),
     /// The field difficulty in block header is invalid.
     Difficulty(DifficultyError),
-    /// Committed transactions verification error. It contains errors for all the transactions that
-    /// fail the verification. The errors are stored as a Vec of tuple, where the first item is the
+    /// Committed transactions verification error. It contains error for the first transaction that
+    /// fails the verification. The errors are stored as a tuple, where the first item is the
     /// transaction index in the block and the second item is the transaction verification error.
-    Transactions(Vec<(usize, TransactionError)>),
+    Transactions((usize, TransactionError)),
     /// This is a wrapper of error encountered when invoking chain API.
     Chain(SharedError),
     /// The committed transactions list is empty.
@@ -40,6 +40,9 @@ pub enum Error {
     /// This error is returned when the committed transactions does not meet the 2-phases
     /// propose-then-commit consensus rule.
     Commit(CommitError),
+    /// Cycles consumed by all scripts in all commit transactions of the block exceed
+    /// the maximum allowed cycles in consensus rules
+    ExceededMaximumCycles,
 }
 
 #[derive(Debug, PartialEq, Clone, Eq)]
@@ -95,8 +98,8 @@ pub enum PowError {
 
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
 pub enum TimestampError {
-    ZeroBlockTime { min: u64, found: u64 },
-    FutureBlockTime { max: u64, found: u64 },
+    BlockTimeTooOld { min: u64, found: u64 },
+    BlockTimeTooNew { max: u64, found: u64 },
 }
 
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
@@ -114,10 +117,12 @@ pub enum DifficultyError {
 #[derive(Debug, PartialEq, Clone, Copy, Eq)]
 pub enum TransactionError {
     NullInput,
-    OutofBound,
+    /// Occur output's bytes_len exceed capacity
+    CapacityOverflow,
     DuplicateInputs,
     Empty,
-    InvalidCapacity,
+    /// Sum of all outputs capacity exceed sum of all inputs in the transaction
+    OutputsSumOverflow,
     InvalidScript,
     ScriptFailure(ScriptError),
     InvalidSignature,
diff --git a/verification/src/header_verifier.rs b/verification/src/header_verifier.rs
index 2b3f0db96b..2b2c5214cc 100644
--- a/verification/src/header_verifier.rs
+++ b/verification/src/header_verifier.rs
@@ -3,6 +3,7 @@ use crate::error::{DifficultyError, Error, NumberError, PowError, TimestampError
 use crate::shared::ALLOWED_FUTURE_BLOCKTIME;
 use ckb_core::header::Header;
 use ckb_pow::PowEngine;
+use ckb_shared::block_median_time_context::BlockMedianTimeContext;
 use faketime::unix_time_as_millis;
 use numext_fixed_uint::U256;
 use std::marker::PhantomData;
@@ -16,21 +17,23 @@ pub trait HeaderResolver {
     fn calculate_difficulty(&self) -> Option<U256>;
 }
 
-pub struct HeaderVerifier<T> {
+pub struct HeaderVerifier<T, M> {
     pub pow: Arc<dyn PowEngine>,
+    block_median_time_context: M,
     _phantom: PhantomData<T>,
 }
 
-impl<T> HeaderVerifier<T> {
-    pub fn new(pow: Arc<dyn PowEngine>) -> Self {
+impl<T, M: BlockMedianTimeContext + Clone> HeaderVerifier<T, M> {
+    pub fn new(block_median_time_context: M, pow: Arc<dyn PowEngine>) -> Self {
         HeaderVerifier {
             pow,
+            block_median_time_context,
             _phantom: PhantomData,
         }
     }
 }
 
-impl<T: HeaderResolver> Verifier for HeaderVerifier<T> {
+impl<T: HeaderResolver, M: BlockMedianTimeContext + Clone> Verifier for HeaderVerifier<T, M> {
     type Target = T;
     fn verify(&self, target: &T) -> Result<(), Error> {
         let header = target.header();
@@ -41,38 +44,48 @@ impl<T: HeaderResolver> Verifier for HeaderVerifier<T> {
             .parent()
             .ok_or_else(|| Error::UnknownParent(header.parent_hash().clone()))?;
         NumberVerifier::new(parent, header).verify()?;
-        TimestampVerifier::new(parent, header).verify()?;
+        TimestampVerifier::new(self.block_median_time_context.clone(), header).verify()?;
         DifficultyVerifier::verify(target)?;
         Ok(())
     }
 }
 
-pub struct TimestampVerifier<'a> {
-    parent: &'a Header,
+pub struct TimestampVerifier<'a, M> {
     header: &'a Header,
+    block_median_time_context: M,
     now: u64,
 }
 
-impl<'a> TimestampVerifier<'a> {
-    pub fn new(parent: &'a Header, header: &'a Header) -> Self {
+impl<'a, M: BlockMedianTimeContext> TimestampVerifier<'a, M> {
+    pub fn new(block_median_time_context: M, header: &'a Header) -> Self {
         TimestampVerifier {
-            parent,
+            block_median_time_context,
             header,
             now: unix_time_as_millis(),
         }
     }
 
     pub fn verify(&self) -> Result<(), Error> {
-        let min = self.parent.timestamp() + 1;
-        if self.header.timestamp() < min {
-            return Err(Error::Timestamp(TimestampError::ZeroBlockTime {
+        // skip genesis block
+        if self.header.is_genesis() {
+            return Ok(());
+        }
+        let min = match self
+            .block_median_time_context
+            .block_median_time(self.header.parent_hash())
+        {
+            Some(time) => time,
+            None => return Err(Error::UnknownParent(self.header.parent_hash().clone())),
+        };
+        if self.header.timestamp() <= min {
+            return Err(Error::Timestamp(TimestampError::BlockTimeTooOld {
                 min,
                 found: self.header.timestamp(),
             }));
         }
         let max = self.now + ALLOWED_FUTURE_BLOCKTIME;
         if self.header.timestamp() > max {
-            return Err(Error::Timestamp(TimestampError::FutureBlockTime {
+            return Err(Error::Timestamp(TimestampError::BlockTimeTooNew {
                 max,
                 found: self.header.timestamp(),
             }));
diff --git a/verification/src/tests/transaction_verifier.rs b/verification/src/tests/transaction_verifier.rs
index 0a613f1b2f..233ad05ed1 100644
--- a/verification/src/tests/transaction_verifier.rs
+++ b/verification/src/tests/transaction_verifier.rs
@@ -36,7 +36,7 @@ pub fn test_capacity_outofbound() {
     let rtx = ResolvedTransaction {
         transaction,
         dep_cells: Vec::new(),
-        input_cells: vec![CellStatus::Current(CellOutput::new(
+        input_cells: vec![CellStatus::Live(CellOutput::new(
             50,
             Vec::new(),
             H256::zero(),
@@ -45,7 +45,10 @@ pub fn test_capacity_outofbound() {
     };
     let verifier = CapacityVerifier::new(&rtx);
 
-    assert_eq!(verifier.verify().err(), Some(TransactionError::OutofBound));
+    assert_eq!(
+        verifier.verify().err(),
+        Some(TransactionError::CapacityOverflow)
+    );
 }
 
 #[test]
@@ -61,15 +64,15 @@ pub fn test_capacity_invalid() {
         transaction,
         dep_cells: Vec::new(),
         input_cells: vec![
-            CellStatus::Current(CellOutput::new(49, Vec::new(), H256::zero(), None)),
-            CellStatus::Current(CellOutput::new(100, Vec::new(), H256::zero(), None)),
+            CellStatus::Live(CellOutput::new(49, Vec::new(), H256::zero(), None)),
+            CellStatus::Live(CellOutput::new(100, Vec::new(), H256::zero(), None)),
         ],
     };
     let verifier = CapacityVerifier::new(&rtx);
 
     assert_eq!(
         verifier.verify().err(),
-        Some(TransactionError::InvalidCapacity)
+        Some(TransactionError::OutputsSumOverflow)
     );
 }
 
diff --git a/verification/src/transaction_verifier.rs b/verification/src/transaction_verifier.rs
index b905649d44..8a52aff926 100644
--- a/verification/src/transaction_verifier.rs
+++ b/verification/src/transaction_verifier.rs
@@ -1,6 +1,7 @@
 use crate::error::TransactionError;
 use ckb_core::cell::ResolvedTransaction;
 use ckb_core::transaction::{Capacity, Transaction};
+use ckb_core::Cycle;
 use ckb_script::TransactionScriptsVerifier;
 use std::collections::HashSet;
 
@@ -25,15 +26,15 @@ impl<'a> TransactionVerifier<'a> {
         }
     }
 
-    pub fn verify(&self) -> Result<(), TransactionError> {
+    pub fn verify(&self, max_cycles: Cycle) -> Result<Cycle, TransactionError> {
         self.empty.verify()?;
         self.null.verify()?;
         self.capacity.verify()?;
         self.duplicate_inputs.verify()?;
         // InputVerifier should be executed before ScriptVerifier
         self.inputs.verify()?;
-        self.script.verify()?;
-        Ok(())
+        let cycles = self.script.verify(max_cycles)?;
+        Ok(cycles)
     }
 }
 
@@ -51,15 +52,15 @@ impl<'a> InputVerifier<'a> {
     pub fn verify(&self) -> Result<(), TransactionError> {
         let mut inputs = self.resolved_transaction.transaction.inputs().iter();
         for cs in &self.resolved_transaction.input_cells {
-            if cs.is_current() {
-                if let Some(ref input) = cs.get_current() {
+            if cs.is_live() {
+                if let Some(ref input) = cs.get_live() {
                     // TODO: remove this once VM mmap is in place so we can
                     // do P2SH within the VM.
                     if input.lock != inputs.next().unwrap().unlock.type_hash() {
                         return Err(TransactionError::InvalidScript);
                     }
                 }
-            } else if cs.is_old() {
+            } else if cs.is_dead() {
                 return Err(TransactionError::DoubleSpent);
             } else if cs.is_unknown() {
                 return Err(TransactionError::UnknownInput);
@@ -67,7 +68,7 @@ impl<'a> InputVerifier<'a> {
         }
 
         for cs in &self.resolved_transaction.dep_cells {
-            if cs.is_old() {
+            if cs.is_dead() {
                 return Err(TransactionError::DoubleSpent);
             } else if cs.is_unknown() {
                 return Err(TransactionError::UnknownInput);
@@ -88,9 +89,9 @@ impl<'a> ScriptVerifier<'a> {
         }
     }
 
-    pub fn verify(&self) -> Result<(), TransactionError> {
+    pub fn verify(&self, max_cycles: Cycle) -> Result<Cycle, TransactionError> {
         TransactionScriptsVerifier::new(&self.resolved_transaction)
-            .verify()
+            .verify(max_cycles)
             .map_err(TransactionError::ScriptFailure)
     }
 }
@@ -173,7 +174,7 @@ impl<'a> CapacityVerifier<'a> {
             .resolved_transaction
             .input_cells
             .iter()
-            .filter_map(|state| state.get_current())
+            .filter_map(|state| state.get_live())
             .fold(0, |acc, output| acc + output.capacity);
 
         let outputs_total = self
@@ -184,7 +185,7 @@ impl<'a> CapacityVerifier<'a> {
             .fold(0, |acc, output| acc + output.capacity);
 
         if inputs_total < outputs_total {
-            Err(TransactionError::InvalidCapacity)
+            Err(TransactionError::OutputsSumOverflow)
         } else if self
             .resolved_transaction
             .transaction
@@ -192,7 +193,7 @@ impl<'a> CapacityVerifier<'a> {
             .iter()
             .any(|output| output.bytes_len() as Capacity > output.capacity)
         {
-            Err(TransactionError::OutofBound)
+            Err(TransactionError::CapacityOverflow)
         } else {
             Ok(())
         }