From 2b421832a7d0e26e5fe08b218bca92974b466642 Mon Sep 17 00:00:00 2001 From: Kevin Wang Date: Fri, 7 Jul 2023 02:19:37 +0000 Subject: [PATCH] Update rocksdb to 0.21 --- Cargo.lock | 81 ++++++++++++++++++++++++++-- crates/phala-trie-storage/Cargo.toml | 4 +- standalone/pruntime/Cargo.lock | 45 +++++++++++++--- 3 files changed, 118 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b5a1bdf6fe..8a19a3d7de 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -359,6 +359,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "aliasable" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "250f629c0161ad8107cf89319e990051fae62832fd343083bea452d93e2205fd" + [[package]] name = "alloc-no-stdlib" version = "2.0.3" @@ -2188,6 +2194,16 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "ctor" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eed5fff0d93c7559121e9c72bf9c242295869396255071ff2cb1617147b608c5" +dependencies = [ + "quote 1.0.28", + "syn 2.0.22", +] + [[package]] name = "ctr" version = "0.6.0" @@ -4469,6 +4485,13 @@ dependencies = [ "version_check", ] +[[package]] +name = "immutable_env" +version = "0.1.0" +dependencies = [ + "ctor 0.2.3", +] + [[package]] name = "impl-codec" version = "0.6.0" @@ -5620,7 +5643,9 @@ dependencies = [ "glob", "libc", "libz-sys", + "lz4-sys", "tikv-jemalloc-sys", + "zstd-sys", ] [[package]] @@ -6654,6 +6679,30 @@ version = "6.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "21326818e99cfe6ce1e524c2a805c189a99b5ae555a35d19f9a284b427d86afa" +[[package]] +name = "ouroboros" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d813b7b31a82efae94bd30ffaac09aec85efc18db2d5ec3aead1a220ee954351" +dependencies = [ + "aliasable", + "ouroboros_macro", + "static_assertions", +] + +[[package]] +name = "ouroboros_macro" +version = "0.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a56f651b4dd45ae3ac3d260ced32eaf0620cddaae5f26c69b554a9016594726" +dependencies = [ + "heck 0.4.1", + "proc-macro-error", + "proc-macro2 1.0.63", + "quote 1.0.28", + "syn 2.0.22", +] + [[package]] name = "output_vt100" version = "0.1.3" @@ -8375,10 +8424,15 @@ dependencies = [ "hash256-std-hasher", "hex", "im", + "immutable_env", "impl-serde", "keccak-hasher", + "librocksdb-sys", "log", + "ouroboros", "parity-scale-codec", + "redb", + "rocksdb", "scale-info", "serde", "serde_cbor", @@ -8756,6 +8810,7 @@ dependencies = [ "pallet-contracts-primitives", "parity-scale-codec", "phala-crypto", + "phala-trie-storage", "pink", "pink-capi", "pink-extension-runtime", @@ -8984,7 +9039,7 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a25e9bcb20aa780fd0bb16b72403a9064d6b3f22f026946029acb941a50af755" dependencies = [ - "ctor", + "ctor 0.1.22", "diff", "output_vt100", "yansi", @@ -9333,6 +9388,16 @@ dependencies = [ "unicase", ] +[[package]] +name = "pyo3-build-config" +version = "0.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "554db24f0b3c180a9c0b1268f91287ab3f17c162e15b54caaae5a6b3773396b0" +dependencies = [ + "once_cell", + "target-lexicon", +] + [[package]] name = "quick-error" version = "1.2.3" @@ -9601,6 +9666,16 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "redb" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5b48b6e8001eaa7ac3793fbfc7444ade76fc51efa3629dee8c66629425d39595" +dependencies = [ + "libc", + "pyo3-build-config", +] + [[package]] name = "redox_syscall" version = "0.2.13" @@ -14409,7 +14484,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" dependencies = [ "cfg-if", "digest 0.10.6", - "rand 0.4.6", + "rand 0.8.5", "static_assertions", ] @@ -14655,7 +14730,7 @@ version = "1.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2209b78d1249f7e6f3293657c9779fe31ced465df091bbd433a1cf88e916ec55" dependencies = [ - "ctor", + "ctor 0.1.22", "version_check", ] diff --git a/crates/phala-trie-storage/Cargo.toml b/crates/phala-trie-storage/Cargo.toml index 8e1b71fc4e..b3f62f580a 100644 --- a/crates/phala-trie-storage/Cargo.toml +++ b/crates/phala-trie-storage/Cargo.toml @@ -18,8 +18,8 @@ serde = { version = "1.0", default-features = false, features = ["derive", "allo hash-db = "0.16.0" trie-db = "0.27.1" im = { version = "15", features = ["serde"] } -rocksdb = "0.20" -librocksdb-sys = "0.10.0" +rocksdb = "0.21" +librocksdb-sys = "0.11.0" log = "0.4" environmental = "1" immutable_env = { version = "0.1.0", path = "../immutable_env" } diff --git a/standalone/pruntime/Cargo.lock b/standalone/pruntime/Cargo.lock index 2a6e299192..577aed7cca 100644 --- a/standalone/pruntime/Cargo.lock +++ b/standalone/pruntime/Cargo.lock @@ -456,6 +456,27 @@ dependencies = [ "which", ] +[[package]] +name = "bindgen" +version = "0.65.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfdf7b466f9a4903edc73f95d6d2bcd5baf8ae620638762244d3f60143643cc5" +dependencies = [ + "bitflags 1.3.2", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "prettyplease 0.2.9", + "proc-macro2 1.0.56", + "quote 1.0.26", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.16", +] + [[package]] name = "bitcoin" version = "0.29.2" @@ -2977,11 +2998,11 @@ checksum = "292a948cd991e376cf75541fe5b97a1081d713c618b4f1b9500f8844e49eb565" [[package]] name = "librocksdb-sys" -version = "0.10.0+7.9.2" +version = "0.11.0+8.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fe4d5874f5ff2bc616e55e8c6086d478fcda13faf9495768a4aa1c22042d30b" +checksum = "d3386f101bcb4bd252d8e9d2fb41ec3b0862a15a62b478c355b2982efa469e3e" dependencies = [ - "bindgen", + "bindgen 0.65.1", "bzip2-sys", "cc", "glob", @@ -4970,7 +4991,7 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" name = "pink-capi" version = "0.1.0" dependencies = [ - "bindgen", + "bindgen 0.64.0", "parity-scale-codec", "pink-extension", "pink-macro", @@ -5095,6 +5116,16 @@ dependencies = [ "syn 1.0.99", ] +[[package]] +name = "prettyplease" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9825a04601d60621feed79c4e6b56d65db77cdca55cef43b46b0de1096d1c282" +dependencies = [ + "proc-macro2 1.0.56", + "syn 2.0.16", +] + [[package]] name = "primitive-types" version = "0.12.1" @@ -5257,7 +5288,7 @@ dependencies = [ "log", "multimap", "petgraph", - "prettyplease", + "prettyplease 0.1.21", "prost 0.11.8", "prost-types 0.11.8", "regex", @@ -5946,9 +5977,9 @@ dependencies = [ [[package]] name = "rocksdb" -version = "0.20.1" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "015439787fce1e75d55f279078d33ff14b4af5d93d995e8838ee4631301c8a99" +checksum = "bb6f170a4041d50a0ce04b0d2e14916d6ca863ea2e422689a5b694395d299ffe" dependencies = [ "libc", "librocksdb-sys",