Merge branch 'develop' into master

Cargo.toml

@@ -1,19 +1,20 @@
 [package]
 name = "ckb-cli"
-version = "0.35.0"
+version = "0.36.0"
 license = "MIT"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1", features = ["secp"] }
-ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
-ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
+ckb-jsonrpc-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-hash = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-crypto = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2", features = ["secp"] }
+ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-util = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-resource = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-dao-utils = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
+ckb-chain-spec = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
 ckb-sdk = { path = "ckb-sdk" }
 ckb-index = { path = "ckb-index" }
 plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol" }
@@ -56,7 +57,7 @@ tui = "0.6.0"
 termion = "1.5"
 
 [build-dependencies]
-ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
+ckb-build-info = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
 
 [workspace]
 members = ["ckb-sdk", "ckb-index", "ckb-sdk-types", "plugin-protocol"]

Makefile

@@ -1,10 +1,12 @@
+CLIPPY_OPTS := -A clippy::mutable_key_type
+
 fmt:
 	cargo fmt --all -- --check
 	cd test && cargo fmt --all -- --check
 
 clippy:
-	RUSTFLAGS='-F warnings' cargo clippy --all --tests
-	cd test && RUSTFLAGS='-F warnings' cargo clippy --all
+	RUSTFLAGS='-F warnings' cargo clippy --all --tests -- ${CLIPPY_OPTS}
+	cd test && RUSTFLAGS='-F warnings' cargo clippy --all -- ${CLIPPY_OPTS}
 
 test:
 	RUSTFLAGS='-F warnings' RUST_BACKTRACE=full cargo test --all
@@ -13,7 +15,7 @@ ci: fmt clippy test security-audit
 	git diff --exit-code Cargo.lock
 
 integration:
-	bash devtools/ci/integration.sh v0.35.0-rc1
+	bash devtools/ci/integration.sh v0.36.0-rc2
 
 prod: ## Build binary with release profile.
 	cargo build --release

ckb-index/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ckb-index"
-version = "0.35.0"
+version = "0.36.0"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -11,6 +11,6 @@ serde_derive = "1.0"
 bincode = "1.1.4"
 log = "0.4.6"
 failure = "0.1.5"
-ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.35.0-rc1" }
+ckb-types = { git = "https://github.com/nervosnetwork/ckb", tag = "v0.36.0-rc2" }
 ckb-sdk = { path = "../ckb-sdk" }
 rocksdb = { package = "ckb-rocksdb", version = "=0.13.0", features = ["snappy"] }