Revert "chore: update rlp dependency to fork with legacy boolean encoding support"

This reverts commit 153dbe3.

Author: iosh

Cargo.lock

@@ -264,7 +264,7 @@ proc-macro-crate = "3"
 serde = { version = "1.0", features = [
     "derive",
     "alloc",
-    "rc",
+    "rc"
 ], default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_derive = { version = "1.0", default-features = false }
@@ -381,7 +381,7 @@ vergen = "8.3.2"
 target_info = "0.1"
 bit-set = "0.4"
 typenum = "1.17.0"
-typemap = { package = "typemap-ors", version = "1.0" }
+typemap = { package = "typemap-ors", version = "1.0"}
 impl-trait-for-tuples = "^0.2"
 impl-tools = "^0.10"
 derive_more = "0.99"
@@ -424,10 +424,7 @@ chrono = "0.4"
 duration-str = "0.17"
 
 # parity crates
-# The fork of the rlp crate adds a legacy v0.4.x boolean encoding to the v0.6.x
-rlp = { git = "https://github.com/Conflux-Chain/parity-common-rocksdb.git", rev = "b28832745c952c8bcac88348276b283c26de776a", package = "rlp", features = [
-    "legacy_bool_encoding",
-] }
+rlp = "0.6.1"
 rlp_derive = { package = "rlp-derive", version = "0.2.0" }
 panic_hook = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "09da4dfeecd754df2034d4e71a260277aaaf9783" }
 dir = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", rev = "09da4dfeecd754df2034d4e71a260277aaaf9783" }
@@ -458,4 +455,3 @@ rocksdb = { git = "https://github.com/Conflux-Chain/rust-rocksdb.git", rev = "7d
 
 [patch.crates-io]
 sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" }
-rlp = { git = "https://github.com/Conflux-Chain/parity-common-rocksdb.git", rev = "b28832745c952c8bcac88348276b283c26de776a", package = "rlp" }

Cargo.toml

@@ -42,23 +42,3 @@ pub fn u256_to_h256_be(value: U256) -> H256 {
 pub fn h256_to_u256_be(value: H256) -> U256 {
     U256::from_big_endian(value.as_bytes())
 }
-
-#[cfg(test)]
-mod tests {
-    use hex;
-    #[test]
-    fn test_legacy_bool_encode() {
-        // by now we need use the legacy bool encoding
-        // which is 0x00 for false and 0x01 for true
-        // the newer encoding is 0x80 for false and 0x01 for true
-
-        let false_bytes = hex::decode("00").unwrap();
-        let true_bytes = hex::decode("01").unwrap();
-
-        assert_eq!(rlp::encode(&false).as_ref(), false_bytes);
-        assert_eq!(rlp::encode(&true).as_ref(), true_bytes);
-
-        assert_eq!(rlp::decode::<bool>(&false_bytes), Ok(false));
-        assert_eq!(rlp::decode::<bool>(&true_bytes), Ok(true));
-    }
-}

crates/cfx_types/src/utils.rs

@@ -15,6 +15,3 @@ threadpool = "1.7"
 parking_lot = "0.12"
 log4rs = { version = "1.3.0", features = ["background_rotation", "gzip"] }
 log = "0.4"
-
-[patch.crates-io]
-rlp = { git = "https://github.com/Conflux-Chain/parity-common-rocksdb.git", rev = "b28832745c952c8bcac88348276b283c26de776a", package = "rlp" }

tools/consensus_bench/Cargo.lock

@@ -35,7 +35,4 @@ clap = { version = "4.5", features = ["derive"] }
 clap-verbosity-flag = "3"
 
 [features]
-default = ["cfx-executor/align_evm", "cfx-statedb/testonly_code"]
-
-[patch.crates-io]
-rlp = { git = "https://github.com/Conflux-Chain/parity-common-rocksdb.git", rev = "b28832745c952c8bcac88348276b283c26de776a", package = "rlp" }
+default = ["cfx-executor/align_evm", "cfx-statedb/testonly_code"]