diff --git a/Cargo.lock b/Cargo.lock index 8e9e74be..96539d16 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,6 +295,15 @@ dependencies = [ "crossbeam-channel", ] +[[package]] +name = "ckb-channel" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f0da1f4e474de48b05e30ad603da4da3b410344b619c7cf35d444e406c0bb6e" +dependencies = [ + "crossbeam-channel", +] + [[package]] name = "ckb-dao-utils" version = "0.104.0" @@ -302,8 +311,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac8bee17950819b550031c81b4200e1e6eddc364c5aab16d5fc9407d2035c775" dependencies = [ "byteorder", - "ckb-error", - "ckb-types", + "ckb-error 0.104.0", + "ckb-types 0.104.0", ] [[package]] @@ -313,7 +322,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73dc4bb1f4c889f42edc9509005aa593ca1b88b6f43f9cfbd59c6d4897994783" dependencies = [ "anyhow", - "ckb-occupied-capacity", + "ckb-occupied-capacity 0.104.0", + "derive_more", + "thiserror", +] + +[[package]] +name = "ckb-error" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "51748ac5e08dce6c685cf4b43e27dcbcfc98e21442c4001c9f06509a04a400ed" +dependencies = [ + "anyhow", + "ckb-occupied-capacity 0.105.1", "derive_more", "thiserror", ] @@ -324,8 +345,18 @@ version = "0.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8183ed12fd0fff3abfb142d3dde7b501f211519e2b77972c64815e00d38c8ed3" dependencies = [ - "ckb-fixed-hash-core", - "ckb-fixed-hash-macros", + "ckb-fixed-hash-core 0.104.0", + "ckb-fixed-hash-macros 0.104.0", +] + +[[package]] +name = "ckb-fixed-hash" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b3d665013dbb8ff2df8e67c4add67db703ae3b642679f1a2962f76399703eee1" +dependencies = [ + "ckb-fixed-hash-core 0.105.1", + "ckb-fixed-hash-macros 0.105.1", ] [[package]] @@ -339,13 +370,36 @@ dependencies = [ "thiserror", ] +[[package]] +name = "ckb-fixed-hash-core" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd92b9d691bbfd11a900ee17ad1010a553ae0b5d3a120e0c8094afcd30f9b15e" +dependencies = [ + "faster-hex", + "serde", + "thiserror", +] + [[package]] name = "ckb-fixed-hash-macros" version = "0.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0f73281677e79cd8cbd873b86701209d560038549823e915cb3505d1b348f0a6" dependencies = [ - "ckb-fixed-hash-core", + "ckb-fixed-hash-core 0.104.0", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "ckb-fixed-hash-macros" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f24e42b82da4d891ac8b5b19de2807cae360c5377138a7cde377b60edc6ec953" +dependencies = [ + "ckb-fixed-hash-core 0.105.1", "proc-macro2", "quote", "syn", @@ -361,26 +415,55 @@ dependencies = [ "blake2b-rs", ] +[[package]] +name = "ckb-hash" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6b64eff869839aff45741515540e81a0447926d79262a439b5e9d0a5c98ac95" +dependencies = [ + "blake2b-ref", + "blake2b-rs", +] + [[package]] name = "ckb-jsonrpc-types" -version = "0.104.0" +version = "0.105.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "520d1cc13b7d5ea93a2b9a28362555410e6621e8141eb1289a0547e0c5ef6e46" +checksum = "82268ddea09f95324496d6def1b37d6bdc3a4841fecc185388e7a2bb6451687f" dependencies = [ - "ckb-types", + "ckb-types 0.105.1", "faster-hex", "serde", "serde_json", ] +[[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.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f0e4ccbc2b6af791b589a09db77518fb2b0fa79a72ba568e6a7dade7e935721" dependencies = [ - "ckb-occupied-capacity-core", - "ckb-occupied-capacity-macros", + "ckb-occupied-capacity-core 0.104.0", + "ckb-occupied-capacity-macros 0.104.0", +] + +[[package]] +name = "ckb-occupied-capacity" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a11e010c034a98b734074a79655c738c40501e9113426173132856a35c6e71c6" +dependencies = [ + "ckb-occupied-capacity-core 0.105.1", + "ckb-occupied-capacity-macros 0.105.1", ] [[package]] @@ -392,13 +475,33 @@ dependencies = [ "serde", ] +[[package]] +name = "ckb-occupied-capacity-core" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "03e48f0306a3fe072711e0342b71335898ac6d0a82b897ca3ae13e43770ce0e0" +dependencies = [ + "serde", +] + [[package]] name = "ckb-occupied-capacity-macros" version = "0.104.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfcfb1f9f3812fd5e306d88f0a3683cdf9e8350f5a79c3288e835b8355425635" dependencies = [ - "ckb-occupied-capacity-core", + "ckb-occupied-capacity-core 0.104.0", + "quote", + "syn", +] + +[[package]] +name = "ckb-occupied-capacity-macros" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "656db5615c791b8d7b31a38e024f98fb497be5e2cb120b38be48eb4d9d1d0f6d" +dependencies = [ + "ckb-occupied-capacity-core 0.105.1", "quote", "syn", ] @@ -413,6 +516,16 @@ dependencies = [ "serde", ] +[[package]] +name = "ckb-rational" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "444926bc5a9ad789b2b98e75f90330bcfe741bab517ca45d8f084449fe35efd8" +dependencies = [ + "numext-fixed-uint", + "serde", +] + [[package]] name = "ckb-types" version = "0.104.0" @@ -421,12 +534,34 @@ checksum = "e9ba3e13c93900267bc9670b3ea4379eab1a234c7cb470fcd6856640f165e2af" dependencies = [ "bit-vec", "bytes", - "ckb-channel", - "ckb-error", - "ckb-fixed-hash", - "ckb-hash", - "ckb-occupied-capacity", - "ckb-rational", + "ckb-channel 0.104.0", + "ckb-error 0.104.0", + "ckb-fixed-hash 0.104.0", + "ckb-hash 0.104.0", + "ckb-occupied-capacity 0.104.0", + "ckb-rational 0.104.0", + "derive_more", + "merkle-cbt", + "molecule", + "numext-fixed-uint", + "once_cell", +] + +[[package]] +name = "ckb-types" +version = "0.105.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f06812497491fa58cea1c93dda2de074e0c5d51cf7d70d93dd50c862c661494c" +dependencies = [ + "bit-vec", + "bytes", + "ckb-channel 0.105.1", + "ckb-error 0.105.1", + "ckb-fixed-hash 0.105.1", + "ckb-hash 0.105.1", + "ckb-merkle-mountain-range", + "ckb-occupied-capacity 0.105.1", + "ckb-rational 0.105.1", "derive_more", "merkle-cbt", "molecule", @@ -457,8 +592,8 @@ dependencies = [ "async-trait", "bech32", "blake2b-rs", - "ckb-hash", - "ckb-types", + "ckb-hash 0.104.0", + "ckb-types 0.104.0", "derive_more", "hex", "minstant", @@ -494,7 +629,7 @@ name = "core-ckb-client" version = "0.4.4" dependencies = [ "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "common", "core-storage", "core-synchronization", @@ -512,7 +647,7 @@ version = "0.4.4" dependencies = [ "ansi_term", "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "clap", "common", "common-logger", @@ -549,7 +684,7 @@ dependencies = [ "arc-swap 1.5.0", "ckb-dao-utils", "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "clap", "common", "core-ckb-client", @@ -584,7 +719,7 @@ version = "0.4.4" dependencies = [ "arc-swap 1.5.0", "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "common", "hex", "jsonrpsee-core", @@ -600,7 +735,7 @@ name = "core-service" version = "0.4.4" dependencies = [ "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "common", "core-ckb-client", "core-rpc", @@ -621,7 +756,7 @@ version = "0.4.4" dependencies = [ "arc-swap 1.5.0", "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "clap", "common", "core-rpc-types", @@ -648,7 +783,7 @@ name = "core-synchronization" version = "0.4.4" dependencies = [ "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "common", "core-rpc-types", "core-storage", @@ -858,7 +993,7 @@ dependencies = [ name = "db-sqlx" version = "0.1.0" dependencies = [ - "ckb-types", + "ckb-types 0.104.0", "common", "futures", "hex", @@ -2371,7 +2506,7 @@ name = "protocol" version = "0.4.4" dependencies = [ "ckb-jsonrpc-types", - "ckb-types", + "ckb-types 0.104.0", "common", "serde", ] diff --git a/core/ckb-client/Cargo.toml b/core/ckb-client/Cargo.toml index bdabb265..e9cf85c9 100644 --- a/core/ckb-client/Cargo.toml +++ b/core/ckb-client/Cargo.toml @@ -6,7 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" ckb-types = "0.104" jsonrpc-core = "18.0" log = "0.4" diff --git a/core/cli/Cargo.toml b/core/cli/Cargo.toml index 4db62259..2f7b46a0 100644 --- a/core/cli/Cargo.toml +++ b/core/cli/Cargo.toml @@ -9,7 +9,7 @@ edition = "2021" [dependencies] ansi_term = "0.12" ckb-types = "0.104" -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" clap = "2.34" log = "0.4" log4rs = "1.0" diff --git a/core/rpc/core/Cargo.toml b/core/rpc/core/Cargo.toml index 86c5a5e5..7142fdfd 100644 --- a/core/rpc/core/Cargo.toml +++ b/core/rpc/core/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] arc-swap = "1.4" clap = "2.34" -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" ckb-types = "0.104" ckb-dao-utils = "0.104" crossbeam-channel = "0.5" diff --git a/core/rpc/types/Cargo.toml b/core/rpc/types/Cargo.toml index a1a0dc80..a7481780 100644 --- a/core/rpc/types/Cargo.toml +++ b/core/rpc/types/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] arc-swap = "1.4" -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" ckb-types = "0.104" hex = "0.4" jsonrpsee-core = "0.15" diff --git a/core/service/Cargo.toml b/core/service/Cargo.toml index 172ef727..ddda2bdd 100644 --- a/core/service/Cargo.toml +++ b/core/service/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" ckb-types = "0.104" jsonrpsee-http-server = "0.15" lazy_static = "1.4" diff --git a/core/storage/Cargo.toml b/core/storage/Cargo.toml index 852ff5b6..b9dfd85e 100644 --- a/core/storage/Cargo.toml +++ b/core/storage/Cargo.toml @@ -8,7 +8,7 @@ edition = "2021" [dependencies] ckb-types = "0.104" -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" clap = "2.34" dashmap = "5.3" hex = "0.4" diff --git a/core/synchronization/Cargo.toml b/core/synchronization/Cargo.toml index bf9958a1..594e221e 100644 --- a/core/synchronization/Cargo.toml +++ b/core/synchronization/Cargo.toml @@ -27,7 +27,7 @@ core-storage = { path = "../storage" } db-sqlx = { path = "../../db/db-sqlx", package = "db-sqlx" } [dev-dependencies] -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" env_logger = "0.9" rand = "0.8" xsql-test = { path = "../../db/xsql-test" } diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index 289885d9..bdbd58cd 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -7,7 +7,7 @@ edition = "2021" [dependencies] ckb-types = "0.104" -ckb-jsonrpc-types = "0.104" +ckb-jsonrpc-types = "0.105" serde = { version = "1.0", features = ["derive"] } common = { path = "../common" }