chore: update ckb to v0.100.0-rc5 (#430)

* chore: update ckb to v0.100.0-rc5

* fix: fix index thread is_started prediction bug

Cargo.toml

@@ -1,24 +1,24 @@
 [package]
 name = "ckb-cli"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 license = "MIT"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 description = "ckb command line interface"
 
 [dependencies]
-ckb-jsonrpc-types = "=0.100.0-rc2"
-ckb-hash = "=0.100.0-rc2"
-ckb-crypto = { version = "=0.100.0-rc2", features = ["secp"] }
-ckb-build-info = "=0.100.0-rc2"
-ckb-types = "=0.100.0-rc2"
-ckb-util = "=0.100.0-rc2"
-ckb-resource = "=0.100.0-rc2"
-ckb-dao-utils = "=0.100.0-rc2"
-ckb-chain-spec = "=0.100.0-rc2"
-ckb-sdk = { path = "ckb-sdk", version = "=0.100.0-rc2" }
-ckb-index = { path = "ckb-index", version = "=0.100.0-rc2" }
-plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=0.100.0-rc2" }
+ckb-jsonrpc-types = "=0.100.0-rc5"
+ckb-hash = "=0.100.0-rc5"
+ckb-crypto = { version = "=0.100.0-rc5", features = ["secp"] }
+ckb-build-info = "=0.100.0-rc5"
+ckb-types = "=0.100.0-rc5"
+ckb-util = "=0.100.0-rc5"
+ckb-resource = "=0.100.0-rc5"
+ckb-dao-utils = "=0.100.0-rc5"
+ckb-chain-spec = "=0.100.0-rc5"
+ckb-sdk = { path = "ckb-sdk", version = "=0.100.0-rc5" }
+ckb-index = { path = "ckb-index", version = "=0.100.0-rc5" }
+plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=0.100.0-rc5" }
 jsonrpc-core-client = "18"
 jsonrpc-core = "18"
 jsonrpc-derive = "18"
@@ -27,7 +27,7 @@ jsonrpc-server-utils = "18"
 secp256k1 = { version = "0.19", features = ["recovery"] }
 faster-hex = "0.6"
 env_logger = "0.6"
-crossbeam-channel = "0.3"
+crossbeam-channel = "0.5.1"
 clap = "=3.0.0-beta.1"
 clap_generate = "=3.0.0-beta.1"
 serde = { version = "1.0", features = ["derive"] }
@@ -61,7 +61,7 @@ tui = "0.6.0"
 termion = "1.5"
 
 [build-dependencies]
-ckb-build-info = "=0.100.0-rc2"
+ckb-build-info = "=0.100.0-rc5"
 
 [workspace]
 members = ["ckb-sdk", "ckb-index", "ckb-sdk-types", "plugin-protocol"]

Makefile

@@ -17,7 +17,7 @@ ci: fmt clippy test security-audit
 	git diff --exit-code Cargo.lock
 
 integration:
-	bash devtools/ci/integration.sh v0.100.0-rc2
+	bash devtools/ci/integration.sh v0.100.0-rc4
 
 prod: ## Build binary with release profile.
 	cargo build --release

ckb-index/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ckb-index"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -12,6 +12,6 @@ serde_derive = "1.0"
 bincode = "1.1.4"
 log = "0.4.6"
 failure = "0.1.5"
-ckb-types = "=0.100.0-rc2"
-ckb-sdk = { path = "../ckb-sdk", version = "=0.100.0-rc2" }
+ckb-types = "=0.100.0-rc5"
+ckb-sdk = { path = "../ckb-sdk", version = "=0.100.0-rc5" }
 rocksdb = { package = "ckb-rocksdb", version = "=0.15.1", features = ["snappy"] }

ckb-sdk-types/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ckb-sdk-types"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -10,11 +10,11 @@ description = "ckb-cli sdk common types"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 
-ckb-types = "=0.100.0-rc2"
-ckb-traits = "=0.100.0-rc2"
-ckb-jsonrpc-types = "=0.100.0-rc2"
-ckb-hash = "=0.100.0-rc2"
-ckb-error = "=0.100.0-rc2"
+ckb-types = "=0.100.0-rc5"
+ckb-traits = "=0.100.0-rc5"
+ckb-jsonrpc-types = "=0.100.0-rc5"
+ckb-hash = "=0.100.0-rc5"
+ckb-error = "=0.100.0-rc5"
 
 [dev-dependencies]
-ckb-crypto = { version = "=0.100.0-rc2", features = ["secp"] }
+ckb-crypto = { version = "=0.100.0-rc5", features = ["secp"] }

ckb-sdk/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ckb-sdk"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 authors = ["Linfeng Qian <[email protected]>", "Nervos Core Dev <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -31,12 +31,12 @@ bytes = "1"
 futures = "0.3"
 jsonrpc-core = "18"
 
-ckb-types = "=0.100.0-rc2"
-ckb-error = "=0.100.0-rc2"
-ckb-script = "=0.100.0-rc2"
-ckb-jsonrpc-types = "=0.100.0-rc2"
-ckb-chain-spec = "=0.100.0-rc2"
-ckb-hash = "=0.100.0-rc2"
-ckb-resource = "=0.100.0-rc2"
-ckb-crypto = { version = "=0.100.0-rc2", features = ["secp"] }
-ckb-sdk-types = { path = "../ckb-sdk-types", version="=0.100.0-rc2" }
+ckb-types = "=0.100.0-rc5"
+ckb-error = "=0.100.0-rc5"
+ckb-script = "=0.100.0-rc5"
+ckb-jsonrpc-types = "=0.100.0-rc5"
+ckb-chain-spec = "=0.100.0-rc5"
+ckb-hash = "=0.100.0-rc5"
+ckb-resource = "=0.100.0-rc5"
+ckb-crypto = { version = "=0.100.0-rc5", features = ["secp"] }
+ckb-sdk-types = { path = "../ckb-sdk-types", version="=0.100.0-rc5" }

ckb-sdk/src/rpc/types.rs

@@ -1028,7 +1028,7 @@ impl From<rpc_types::TxPoolInfo> for TxPoolInfo {
 
 /// Transaction verbose info
 #[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Hash, Debug)]
-pub struct TxVerbosity {
+pub struct TxPoolEntry {
     /// Consumed cycles.
     pub cycles: Uint64,
     /// The transaction serialized size in block.
@@ -1042,9 +1042,9 @@ pub struct TxVerbosity {
     /// Number of in-tx-pool ancestor transactions
     pub ancestors_count: Uint64,
 }
-impl From<rpc_types::TxVerbosity> for TxVerbosity {
-    fn from(json: rpc_types::TxVerbosity) -> TxVerbosity {
-        TxVerbosity {
+impl From<rpc_types::TxPoolEntry> for TxPoolEntry {
+    fn from(json: rpc_types::TxPoolEntry) -> TxPoolEntry {
+        TxPoolEntry {
             cycles: json.cycles.into(),
             size: json.size.into(),
             fee: json.fee.into(),
@@ -1056,15 +1056,15 @@ impl From<rpc_types::TxVerbosity> for TxVerbosity {
 }
 
 #[derive(Clone, Default, Serialize, Deserialize, PartialEq, Eq, Debug)]
-pub struct TxPoolVerbosity {
+pub struct TxPoolEntries {
     /// Pending tx verbose info
-    pub pending: HashMap<H256, TxVerbosity>,
+    pub pending: HashMap<H256, TxPoolEntry>,
     /// Proposed tx verbose info
-    pub proposed: HashMap<H256, TxVerbosity>,
+    pub proposed: HashMap<H256, TxPoolEntry>,
 }
-impl From<rpc_types::TxPoolVerbosity> for TxPoolVerbosity {
-    fn from(json: rpc_types::TxPoolVerbosity) -> TxPoolVerbosity {
-        TxPoolVerbosity {
+impl From<rpc_types::TxPoolEntries> for TxPoolEntries {
+    fn from(json: rpc_types::TxPoolEntries) -> TxPoolEntries {
+        TxPoolEntries {
             pending: json
                 .pending
                 .into_iter()
@@ -1081,17 +1081,17 @@ impl From<rpc_types::TxPoolVerbosity> for TxPoolVerbosity {
 
 /// All transactions in tx-pool.
 ///
-/// `RawTxPool` is equivalent to [`TxPoolIds`][] `|` [`TxPoolVerbosity`][].
+/// `RawTxPool` is equivalent to [`TxPoolIds`][] `|` [`TxPoolEntries`][].
 ///
 /// [`TxPoolIds`]: struct.TxPoolIds.html
-/// [`TxPoolVerbosity`]: struct.TxPoolVerbosity.html
+/// [`TxPoolEntries`]: struct.TxPoolEntries.html
 #[derive(Clone, Serialize, Deserialize, PartialEq, Eq, Debug)]
 #[serde(untagged)]
 pub enum RawTxPool {
     /// verbose = false
     Ids(TxPoolIds),
     /// verbose = true
-    Verbose(TxPoolVerbosity),
+    Verbose(TxPoolEntries),
 }
 
 impl From<rpc_types::RawTxPool> for RawTxPool {

ckb-sdk/src/transaction.rs

@@ -332,7 +332,7 @@ impl<'a> MockTransactionHelper<'a> {
             let tx_env = TxVerifyEnv::new_commit(&header);
             let hardfork_switch = HardForkSwitch::new_without_any_enabled()
                 .as_builder()
-                .rfc_0232(enable_epoch_number)
+                .rfc_0032(enable_epoch_number)
                 .build()
                 .unwrap();
             let consensus = ConsensusBuilder::default()

plugin-protocol/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ckb-cli-plugin-protocol"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 authors = ["Nervos Core Dev <[email protected]>"]
 edition = "2018"
 license = "MIT"
@@ -9,9 +9,9 @@ description = "ckb-cli plugin protocol"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-ckb-index = { path = "../ckb-index", version = "=0.100.0-rc2" }
-ckb-types = "=0.100.0-rc2"
-ckb-jsonrpc-types = "=0.100.0-rc2"
+ckb-index = { path = "../ckb-index", version = "=0.100.0-rc5" }
+ckb-types = "=0.100.0-rc5"
+ckb-jsonrpc-types = "=0.100.0-rc5"
 serde = { version = "1.0", features = ["derive"] }
 serde_derive = "1.0"
 serde_json = "1.0"

src/utils/index.rs

@@ -87,7 +87,7 @@ impl IndexThreadState {
         }
     }
     pub fn is_started(&self) -> bool {
-        matches!(self, IndexThreadState::WaitToStart)
+        !matches!(self, IndexThreadState::WaitToStart)
     }
     pub fn is_stopped(&self) -> bool {
         matches!(self, IndexThreadState::Stopped)

test/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "cli-test"
-version = "0.100.0-rc2"
+version = "0.100.0-rc5"
 authors = ["Linfeng Qian <[email protected]>"]
 edition = "2018"
 
@@ -13,12 +13,12 @@ log = "0.4"
 env_logger = "0.6"
 toml = "0.5.0"
 serde_yaml = "0.8.9"
-ckb-sdk = { path = "../ckb-sdk", version = "0.100.0-rc2" }
-ckb-types = "=0.100.0-rc2"
-ckb-app-config = "=0.100.0-rc2"
-ckb-chain-spec = "=0.100.0-rc2"
-ckb-crypto = { version = "=0.100.0-rc2", features = ["secp"] }
-ckb-hash = "=0.100.0-rc2"
+ckb-sdk = { path = "../ckb-sdk", version = "0.100.0-rc5" }
+ckb-types = "=0.100.0-rc5"
+ckb-app-config = "=0.100.0-rc5"
+ckb-chain-spec = "=0.100.0-rc5"
+ckb-crypto = { version = "=0.100.0-rc5", features = ["secp"] }
+ckb-hash = "=0.100.0-rc5"
 regex = "1.1.6"
 
 # Prevent this from interfering with workspaces