diff --git a/Cargo.lock b/Cargo.lock index 33360df..e734679 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -233,13 +233,22 @@ dependencies = [ "crossbeam-channel", ] +[[package]] +name = "ckb-channel" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4e72eb8d294fb3ca0ab01a0635e71e5746bc71049aaf8d18c3017dc9964831a" +dependencies = [ + "crossbeam-channel", +] + [[package]] name = "ckb-crypto" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7304d43ab21f4715bb77c955ccd9359bf851b868881a6e3499122b3266c82edf" dependencies = [ - "ckb-fixed-hash", + "ckb-fixed-hash 0.103.0", "faster-hex", "lazy_static", "rand 0.7.3", @@ -254,8 +263,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d2495561e01760b017595dd98c9a050c267301950de69212ff9819342dba0ab" dependencies = [ "byteorder", - "ckb-error", - "ckb-types", + "ckb-error 0.103.0", + "ckb-types 0.103.0", ] [[package]] @@ -265,7 +274,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "548dad083a5846996d38fb2680e4fd20737c23be4c6dbbc897bba63fc69427fd" dependencies = [ "anyhow", - "ckb-occupied-capacity", + "ckb-occupied-capacity 0.103.0", + "derive_more", + "thiserror", +] + +[[package]] +name = "ckb-error" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "21181e36301545cf0ed9704261eff9c3f867095f631a15ee4d823f295b898995" +dependencies = [ + "anyhow", + "ckb-occupied-capacity 0.110.0", "derive_more", "thiserror", ] @@ -276,8 +297,18 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "87e16c26d073b6ce9820154d8fb067d95dbfcb91faa693162341e90f26c3363f" dependencies = [ - "ckb-fixed-hash-core", - "ckb-fixed-hash-macros", + "ckb-fixed-hash-core 0.103.0", + "ckb-fixed-hash-macros 0.103.0", +] + +[[package]] +name = "ckb-fixed-hash" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e491c2d8455badf62d3c586f83e629027961f1564483b3d34ff2f67f0732b645" +dependencies = [ + "ckb-fixed-hash-core 0.110.0", + "ckb-fixed-hash-macros 0.110.0", ] [[package]] @@ -291,13 +322,36 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ckb-fixed-hash-core" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0cf3c1e6f7e3b0eb592db2bcb5e94e13a9f3bd84babc472e1286333b2e077bc" +dependencies = [ + "faster-hex", + "serde", + "thiserror", +] + [[package]] name = "ckb-fixed-hash-macros" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bcc8f5a4d66e01da9f8024aea5a49ee0c93f7a927e932b37c162c7afd38959f4" dependencies = [ - "ckb-fixed-hash-core", + "ckb-fixed-hash-core 0.103.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ckb-fixed-hash-macros" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2749f8c0174eca80330e98a30b3b222252d067ea9c4fd9e9bfbd2dfda8239ff3" +dependencies = [ + "ckb-fixed-hash-core 0.110.0", "proc-macro2", "quote", "syn", @@ -313,13 +367,23 @@ dependencies = [ "blake2b-rs", ] +[[package]] +name = "ckb-hash" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "29f0a4334428015f6b5c9edeea944917525a0a20bfd30dc5b33418ffa64633aa" +dependencies = [ + "blake2b-ref 0.2.1", + "blake2b-rs", +] + [[package]] name = "ckb-jsonrpc-types" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "305760c25e4b4bce5b11b1efe80ee7afe81cb63e39432725b01577fefe719ee1" dependencies = [ - "ckb-types", + "ckb-types 0.103.0", "faster-hex", "serde", "serde_json", @@ -339,14 +403,33 @@ dependencies = [ "rust-ini", ] +[[package]] +name = "ckb-merkle-mountain-range" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56ccb671c5921be8a84686e6212ca184cb1d7c51cadcdbfcbd1cc3f042f5dfb8" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "ckb-occupied-capacity" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c9aa5e0ccfc275af08d2423b8e7cbd98c980d2565950a4e3efc13182f0ae1bf" dependencies = [ - "ckb-occupied-capacity-core", - "ckb-occupied-capacity-macros", + "ckb-occupied-capacity-core 0.103.0", + "ckb-occupied-capacity-macros 0.103.0", +] + +[[package]] +name = "ckb-occupied-capacity" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2e6d8888e35b2c4f5ffe1297ef91e3b91c416ee20525317b8493c438ea22d79" +dependencies = [ + "ckb-occupied-capacity-core 0.110.0", + "ckb-occupied-capacity-macros 0.110.0", ] [[package]] @@ -358,13 +441,33 @@ dependencies = [ "serde", ] +[[package]] +name = "ckb-occupied-capacity-core" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b5e3394105c762a5299cf7ab555f9f4277601f4f21bbb03cba80c716aeaad35" +dependencies = [ + "serde", +] + [[package]] name = "ckb-occupied-capacity-macros" version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2ca47bd5b0c381284f3f858cc6fd9087adecc384b1535e869a231061a23a7b59" dependencies = [ - "ckb-occupied-capacity-core", + "ckb-occupied-capacity-core 0.103.0", + "quote", + "syn", +] + +[[package]] +name = "ckb-occupied-capacity-macros" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3ddc97c09e2f7916a1539ef1256aac28bd711d2c2cdcd0b18c486243ccdabe0" +dependencies = [ + "ckb-occupied-capacity-core 0.110.0", "quote", "syn", ] @@ -379,6 +482,16 @@ dependencies = [ "serde", ] +[[package]] +name = "ckb-rational" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1112a8c125232bc69396c41e97e94956cf4c23f62c4b2793031959c21476d51a" +dependencies = [ + "numext-fixed-uint", + "serde", +] + [[package]] name = "ckb-resource" version = "0.103.0" @@ -386,7 +499,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ae84e61d1b7cc37353ba92dc122e7d3c746a9499473a448927393372e8d7daa6" dependencies = [ "ckb-system-scripts", - "ckb-types", + "ckb-types 0.103.0", "includedir", "includedir_codegen", "phf", @@ -415,11 +528,11 @@ dependencies = [ "bytes", "ckb-crypto", "ckb-dao-utils", - "ckb-hash", + "ckb-hash 0.103.0", "ckb-jsonrpc-types", "ckb-resource", "ckb-traits", - "ckb-types", + "ckb-types 0.103.0", "futures", "jsonrpc-core", "log", @@ -454,7 +567,7 @@ version = "0.103.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48f70a7bb9f8f85486f6e1bcae329a2f7495c36b996bf3bacca523ec43af355f" dependencies = [ - "ckb-types", + "ckb-types 0.103.0", ] [[package]] @@ -466,12 +579,12 @@ dependencies = [ "bit-vec", "bitflags", "bytes", - "ckb-channel", - "ckb-error", - "ckb-fixed-hash", - "ckb-hash", - "ckb-occupied-capacity", - "ckb-rational", + "ckb-channel 0.103.0", + "ckb-error 0.103.0", + "ckb-fixed-hash 0.103.0", + "ckb-hash 0.103.0", + "ckb-occupied-capacity 0.103.0", + "ckb-rational 0.103.0", "derive_more", "merkle-cbt", "molecule", @@ -479,6 +592,29 @@ dependencies = [ "once_cell", ] +[[package]] +name = "ckb-types" +version = "0.110.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb4395d943b52b842fda34e1aab1fc59ca1daf80535ede706d5052fdac099ce6" +dependencies = [ + "bit-vec", + "bytes", + "ckb-channel 0.110.0", + "ckb-error 0.110.0", + "ckb-fixed-hash 0.110.0", + "ckb-hash 0.110.0", + "ckb-merkle-mountain-range", + "ckb-occupied-capacity 0.110.0", + "ckb-rational 0.110.0", + "derive_more", + "golomb-coded-set", + "merkle-cbt", + "molecule", + "numext-fixed-uint", + "once_cell", +] + [[package]] name = "clang-sys" version = "1.3.1" @@ -514,7 +650,7 @@ dependencies = [ "ckb-jsonrpc-types", "ckb-rocksdb", "ckb-sdk", - "ckb-types", + "ckb-types 0.110.0", "cota-smt", "crc", "diesel", @@ -546,7 +682,7 @@ source = "git+https://github.com/nervina-labs/cota-smt?tag=0.8.0#1baab696db5023c dependencies = [ "blake2b-ref 0.3.1", "cfg-if 1.0.0", - "ckb-types", + "ckb-types 0.103.0", "sparse-merkle-tree", ] @@ -903,6 +1039,15 @@ dependencies = [ "regex", ] +[[package]] +name = "golomb-coded-set" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c7076c0cd6257d84b785b0f22c36443dd47a5e86a1256d7ef82c8cb88ea9a7e" +dependencies = [ + "siphasher", +] + [[package]] name = "h2" version = "0.3.12" @@ -1148,7 +1293,7 @@ source = "git+https://github.com/nervina-labs/joyid-smt?tag=v0.8.0#f3e2f85a7a04a dependencies = [ "blake2b-ref 0.3.1", "cfg-if 1.0.0", - "ckb-types", + "ckb-types 0.103.0", "sparse-merkle-tree", ] diff --git a/Cargo.toml b/Cargo.toml index 16b1c0d..5ce2c5d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ molecule = "0.7.2" lazy_static = "1.4" rocksdb = { package = "ckb-rocksdb", version = "=0.18.3", features = ["snappy"] } sparse-merkle-tree = "0.6.1" -ckb-types = "=0.103.0" +ckb-types = "=0.110.0" ckb-jsonrpc-types = ">=0.103.0" reqwest = { version = "0.11", features = ["json"] } tokio = { version = "1", features = ["rt", "net"] }