diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 9353c68..3c8a211 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -8,7 +8,7 @@ env: CARGO_TERM_COLOR: always RUSTFLAGS: -D warnings RUST_BACKTRACE: full - RUST_TOOLCHAIN: 1.72.1 + RUST_TOOLCHAIN: 1.75.0 jobs: rustfmt: name: Checks / Format diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index 52de4ef..731313c 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -5,7 +5,7 @@ on: env: CARGO_TERM_COLOR: always RUSTFLAGS: -D warnings - RUST_TOOLCHAIN: 1.72.1 + RUST_TOOLCHAIN: 1.75.0 permissions: contents: write jobs: diff --git a/Cargo.lock b/Cargo.lock index 2f8c1e2..2c6b0a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -56,54 +56,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "anstream" -version = "0.6.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2ab91ebe16eb252986481c5b62f6098f3b698a45e34b5b98200cf20dd2484a44" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7079075b41f533b8c61d2a4d073c4676e1f8b249ff94a393b0595db304e0dd87" - -[[package]] -name = "anstyle-parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "317b9a89c1868f5ea6ff1d9539a69f45dffc21ce321ac1fd1160dfa48c8e2140" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b" -dependencies = [ - "windows-sys 0.48.0", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0699d10d2f4d628a98ee7b57b289abbc98ff3bad977cb3152709d4bf2330628" -dependencies = [ - "anstyle", - "windows-sys 0.48.0", -] - [[package]] name = "anyhow" version = "1.0.75" @@ -116,6 +68,12 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" +[[package]] +name = "arrayvec" +version = "0.7.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" + [[package]] name = "async-trait" version = "0.1.74" @@ -215,6 +173,22 @@ version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" +[[package]] +name = "bitcoin-io" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" + +[[package]] +name = "bitcoin_hashes" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] + [[package]] name = "bitflags" version = "1.3.2" @@ -263,9 +237,12 @@ dependencies = [ [[package]] name = "bs58" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "771fe0050b883fcc3ea2359b1a96bcfbc090b7116eae7c3c512c7a083fdf23d3" +checksum = "bf88ba1141d185c399bee5288d850d63b8369520c1eafc32a0430b5b6c287bf4" +dependencies = [ + "tinyvec", +] [[package]] name = "bstr" @@ -304,7 +281,7 @@ version = "12.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "142316461ed3a3dfcba10417317472da5bfd0461e4d276bf7c07b330766d9490" dependencies = [ - "digest 0.10.7", + "digest", "either", "futures", "hex", @@ -393,9 +370,9 @@ dependencies = [ [[package]] name = "ckb-app-config" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ac600d1535028bf3e08199740d71977d534c2cb591a95b4ca9ad57a4b33121c" +checksum = "40548e46388ba67feba3de2315e43d502208eac48db5e40d2f2f232a040a3911" dependencies = [ "ckb-build-info", "ckb-chain-spec", @@ -407,12 +384,10 @@ dependencies = [ "ckb-resource", "ckb-systemtime", "ckb-types", - "clap 4.4.7", "path-clean", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", - "serde_plain", "tentacle-multiaddr", "tentacle-secio", "toml", @@ -422,9 +397,9 @@ dependencies = [ [[package]] name = "ckb-async-runtime" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d542ce01edbb22af56a19e955a2e8c4738be33a0496f8bf80772f9aaa01113dc" +checksum = "22082650bed50d78cb4c8cbc6e32f08a41a8ced65a4eccd87ca048448f112af4" dependencies = [ "ckb-logger", "ckb-spawn", @@ -433,41 +408,49 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ab8cacb522a33a05949f54ff337711e4b6aedd491d0d41c9c0a92acb7f9ae19" +checksum = "886815a6282da9855a21f626299a378a75aae1563229d4f846a0d0009dbdabb1" [[package]] name = "ckb-chain" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "80e394a4f6a6a30a43538411084ca6119e2f706c871c0d983b95c9a2dac46c65" +checksum = "f804c4f68e53762e80d8f5a2f216e9ae50fcffe0854601de0c77a6b8e4529533" dependencies = [ "ckb-app-config", "ckb-chain-spec", "ckb-channel", - "ckb-dao", + "ckb-constant", + "ckb-db", + "ckb-db-schema", "ckb-error", "ckb-logger", "ckb-merkle-mountain-range", "ckb-metrics", + "ckb-network", "ckb-proposal-table", - "ckb-rust-unstable-port", "ckb-shared", "ckb-stop-handler", "ckb-store", "ckb-systemtime", + "ckb-tx-pool", "ckb-types", + "ckb-util", "ckb-verification", "ckb-verification-contextual", "ckb-verification-traits", + "crossbeam", + "dashmap 4.0.2", + "is_sorted", + "minstant", ] [[package]] name = "ckb-chain-spec" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "210df338c83691c2173136656c411c3fe09578a66377a05014956419bede76cf" +checksum = "084b4b3c2d0d5ca51e47812130615535cad47772005af3535f3d4e6a63e947ae" dependencies = [ "cacache", "ckb-constant", @@ -488,38 +471,38 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50d21e6d4ad47858609ced9d887e63e821ba6770f28e7be58e8d56213a0d0924" +checksum = "2c4c7f5530737f8a02329075581b29ab7003a72d6ee747d1b2ea9d2239faea7a" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-constant" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b42093e370876b71569292fc0aa9ae1078114ee678c4e4b4ae77a81b590fdba7" +checksum = "7e1424bf7490c14cdbd13697629ece8c1ba0ed02ff1c8a5b14a8713431ec6ff8" [[package]] name = "ckb-crypto" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35ed640e73c39b5e0fc8a39c6d013733761023424e2bc70dafd74d92ce6c36cb" +checksum = "ee335e672a67e4d951a65d5a3b03072f038dc1487e559133953912bcbe41d4d9" dependencies = [ "ckb-fixed-hash", "faster-hex", "lazy_static", - "rand 0.7.3", - "secp256k1", + "rand 0.8.5", + "secp256k1 0.29.1", "thiserror", ] [[package]] name = "ckb-dao" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10e8826ee4b38770649b0edeb96fa62b407f8c6bc68fe2134a17d160414be818" +checksum = "956a82fae564f5d207118f8a152f7c8daf1db4119ac4d3a18dfe5695bcd9b0e4" dependencies = [ "byteorder", "ckb-chain-spec", @@ -530,9 +513,9 @@ dependencies = [ [[package]] name = "ckb-dao-utils" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aaf9300f9b1ff36e576ca6ed374ec9704f6da6f61492ea48038ff0b9067c2779" +checksum = "766da195cb9a17f5a625de6924058ef1f12241317835cc83a09368018074366a" dependencies = [ "byteorder", "ckb-error", @@ -541,9 +524,9 @@ dependencies = [ [[package]] name = "ckb-db" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c72cb6e39b5d6e347305f0ccd2f54f161652142b5e4b07cca6720a24109233ae" +checksum = "122d50a56fdcf7a67fe5cbc81c38c5dd73231035d9544d8af3159ad45ee58b83" dependencies = [ "ckb-app-config", "ckb-db-schema", @@ -555,29 +538,32 @@ dependencies = [ [[package]] name = "ckb-db-migration" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16950d3ce397c95fcc97d8672a1220bc5426ef49445d729429646f856ea06562" +checksum = "cb71e6a0f37cf5803a9b17852d9d26b6099773b30b88fe7bfcfa52f5659487dc" dependencies = [ + "ckb-channel", "ckb-db", "ckb-db-schema", "ckb-error", "ckb-logger", + "ckb-stop-handler", "console", "indicatif", + "once_cell", ] [[package]] name = "ckb-db-schema" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3098242ceaa66d7a56e595b264c48e39d9f8b53f6b9bf291e0bfa6da96505727" +checksum = "fdd72210b5c7c811920abaf6406ee2cd7240f80c280725dafa34b4accc8be5aa" [[package]] name = "ckb-error" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9948a60c3fa47131ec9907cfb64c94e4fd9199ef9329ba0ba4d53b8e03adfbbe" +checksum = "109adb3c26e697861e3f57c1ca8cf2f2a399c46e64c97be2b05f751535ac1b75" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -587,9 +573,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0629983e05127c5bbf025cefdac36a91c3a0720acf1b2e2637ff1f0ac673a78c" +checksum = "71ea8f4896f945ecdb473cc8b747a47a9f282393a37a681bcbe0cdde94894bfc" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -597,10 +583,11 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c582d7d52e96ce65c2995a7f399c6dc3f314fec64dd15d47ec903896ac24a428" +checksum = "e1c265cd6b0ec00b8dc671b9344906a2428f9b756e4e789660c71f535252fe2d" dependencies = [ + "ckb_schemars", "faster-hex", "serde", "thiserror", @@ -608,9 +595,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3bae4184f70cbd2e36839d902f403f06ea6a009df67ac2f7d37942890459618c" +checksum = "976b10df5474be0ff33b22a84b44875e065679fc41155350c11e420124910ca1" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -620,9 +607,9 @@ dependencies = [ [[package]] name = "ckb-freezer" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e8d55f62b6cd472936c9c8669f7b8e278f177b2b60b4847a6a359a6b0b7efda" +checksum = "456338689e8ce677d4df8bd116c4025678418e5485703f61d9c60091fdfcd343" dependencies = [ "ckb-error", "ckb-logger", @@ -637,9 +624,9 @@ dependencies = [ [[package]] name = "ckb-gen-types" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c709b63557041d03db0bc09b56ddc95de455ea555d537d5599117163f095973c" +checksum = "1bc221d4b9d6d39215b1d62be855861b8b0c8d668ca29874903b0bf5d0b4d9fa" dependencies = [ "cfg-if 1.0.0", "ckb-error", @@ -652,9 +639,9 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b78504239eedf043013a4c1d5a3cf38a2917ef37643c3608ff4183aa2888f48f" +checksum = "99ba7c72f86f239b3e0154f51d6cd5d0d83bbaa8775fdc7b6bcac459ae24b6fd" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -662,11 +649,12 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97cf7e01a18fb980f3d993fafdf06999379b71ebca098196ed42824bab0b3d9d" +checksum = "3983584cc6e269125c3bf502fa6d84a4f6e47d5b4c1e3a4070db86382ed4ba15" dependencies = [ "ckb-types", + "ckb_schemars", "faster-hex", "serde", "serde_json", @@ -688,7 +676,7 @@ dependencies = [ [[package]] name = "ckb-light-client" -version = "0.3.8" +version = "0.4.0" dependencies = [ "anyhow", "ckb-app-config", @@ -712,9 +700,9 @@ dependencies = [ "ckb-tx-pool", "ckb-types", "ckb-verification", - "clap 2.34.0", + "clap", "ctrlc", - "dashmap", + "dashmap 5.5.3", "env_logger", "golomb-coded-set", "governor", @@ -739,18 +727,18 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3f5f89647d0d71aef57cafc580c8ca770b1e7afa85400c29de10c6d6a5d2adc" +checksum = "b19523bb7b582ccd98615a48c687e41ce1511e72d903520ea36100ef5c5ba9a3" dependencies = [ "log", ] [[package]] name = "ckb-logger-config" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31443967d4fb5c788469090bd6707fe2d5dca8b4d1973a01870e56a4cafc4e0d" +checksum = "2cb8844af4aa6e589a6c9364f890b6d311327952f090dd989c3978e5184e3e8a" dependencies = [ "serde", ] @@ -766,9 +754,9 @@ dependencies = [ [[package]] name = "ckb-metrics" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3aa3ad86899ace1baa04bd4709645222bcff819336e9e83b7391025147b88faa" +checksum = "f8d35e7f6853087789d5b9ecf5e6562fa0bd21e000ed9e8449cea98664736f62" dependencies = [ "once_cell", "prometheus", @@ -777,18 +765,18 @@ dependencies = [ [[package]] name = "ckb-metrics-config" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23dd4ee213b1ca959f5a9b9d798adce8c16b4923a5086368bda9c7a439069ea3" +checksum = "20a7dbc2fdc755890ad116a15dd0a3d42850b81d6b8cd797adddf25399270cd8" dependencies = [ "serde", ] [[package]] name = "ckb-migrate" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45d26eafe6eb4974a3eeeb588cd96483b1ff8ff6dc461feec2dab1ccaefe89a0" +checksum = "751ac9a525305c03160284cb51c4ab7e5be72e9b09f383ce5090ce3afe3ecfe2" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -806,9 +794,9 @@ dependencies = [ [[package]] name = "ckb-migration-template" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9449773c47905a44d8ee9da7363ccb90154c3ab019f88acf08232374ff4a0504" +checksum = "6cf8d7d27d099eb1a5ba52590feca5860c1a9c3d2975b6b36b2addd001207095" dependencies = [ "quote", "syn 1.0.109", @@ -816,9 +804,9 @@ dependencies = [ [[package]] name = "ckb-network" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1694d4d3b006370cb9ce36f18d16e52ef10d823883082396bd449f05943ad567" +checksum = "7a24b7d5dc597aa79f99b5baadea9cc994c77c4ab77bba02db66374a193a76a9" dependencies = [ "bitflags 1.3.2", "bloom-filters", @@ -833,11 +821,11 @@ dependencies = [ "ckb-util", "futures", "ipnetwork", - "rand 0.7.3", + "rand 0.8.5", "serde", "serde_json", "snap", - "socket2 0.4.10", + "socket2 0.5.5", "tentacle", "tokio", "tokio-util 0.7.10", @@ -845,9 +833,9 @@ dependencies = [ [[package]] name = "ckb-notify" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d97ca87ec9d59d901c91e1a8b87dbad902cb602959b33d8cbcf11d4b76b9785" +checksum = "04110de09936ac7184c08ca93c318750e7ceec5d1ed54484ae52eeefcf285dbf" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -859,9 +847,9 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfe678c0047869c71ae01369ada83ebb43567504c3c5e338a64dcd679b98ecad" +checksum = "a6b706bce252b627543ce3bac5240f4d2f1e5d73daca9e451c88db44c2ea94bb" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -869,18 +857,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "35dba70fddc9eda1906875b4c99b14d64910a429a58972658e8f65930f77f27b" +checksum = "510608e5c7c2f3bf025c6ae80ed7782a1cd12897e15dc930167c8dbd3165ece6" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a37efa3314fc8d1b6ead861743e7012126204449a7c6579f0e571a3456d0d34" +checksum = "b79a3fd71708b5068fb377497d6be6dbca53725f1a13d174335105c4bd39ffd5" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -889,9 +877,9 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c28156a3ea6941bad362f0de75a2358bc759f52d505b4cfae0db223e25646fdd" +checksum = "40266a0bbf46eb4d92fc7137c93b22b8518d7a5a8991d6b52931b1fc43cb9863" dependencies = [ "byteorder", "ckb-hash", @@ -903,9 +891,9 @@ dependencies = [ [[package]] name = "ckb-proposal-table" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9298f31a896660abec26e945a61da7ecaa955ec876b46bf6f7cc43bad6ca23" +checksum = "4687e2c2560a0aed9599251f1f491aaf79a16e9df620bb9ed9544b645ac58aaa" dependencies = [ "ckb-chain-spec", "ckb-logger", @@ -914,9 +902,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0d64ef7e9b0785e1b2acdc1a96072bbdefa6ac72bca36de91d9d9e65cd39bbd" +checksum = "91835c60dba878e54da2dfcfad62369638b88f910d9e8c7eb31f9c357a331ff7" dependencies = [ "numext-fixed-uint", "serde", @@ -924,9 +912,9 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea0c9ca6ccc86e4ed3f49c3dc05b1bd58f27205cb9ded891b86995a9edd06974" +checksum = "9ec19c5f0d6e96a0347492acdf992f6db7838f70b1c3ae4d32e9d3558f0557f0" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -939,9 +927,9 @@ dependencies = [ [[package]] name = "ckb-reward-calculator" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06c1fb6c093f2a948e576281ca2863568f2997fdbd3310bd02ff55ab6fe14738" +checksum = "bc1a37781c4b3a46ecb3fe052b4dd8aab6c564f06bbb26529034c6b95d25dd4d" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -962,20 +950,11 @@ dependencies = [ "tempfile", ] -[[package]] -name = "ckb-rust-unstable-port" -version = "0.113.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "379d13b61246c1d65549f24bdbafd7053020a27ed4427416d5228053a98f7c7a" -dependencies = [ - "is_sorted", -] - [[package]] name = "ckb-script" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec56fceeff7d1fb5229bf03af876360dabf7f9da7eab67a3ce5164c09b4a90d4" +checksum = "3c247ea3580c240a7eb82516258c8523c7c22219b6681016be83284ebb15cd22" dependencies = [ "byteorder", "ckb-chain-spec", @@ -987,15 +966,17 @@ dependencies = [ "ckb-vm", "faster-hex", "serde", + "tokio", ] [[package]] name = "ckb-shared" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46e8ea962fe3e301b83dcbf2c97fd7e86fe888532e2a9bc6d30933b15fe3db67" +checksum = "a39acaf28d4de371320abc6f9aab9aa943c63c189098ee380633e412e16640fd" dependencies = [ "arc-swap", + "bitflags 1.3.2", "ckb-app-config", "ckb-async-runtime", "ckb-chain-spec", @@ -1005,6 +986,7 @@ dependencies = [ "ckb-db-schema", "ckb-error", "ckb-logger", + "ckb-metrics", "ckb-migrate", "ckb-notify", "ckb-proposal-table", @@ -1014,16 +996,20 @@ dependencies = [ "ckb-systemtime", "ckb-tx-pool", "ckb-types", + "ckb-util", "ckb-verification", + "dashmap 4.0.2", "once_cell", + "sled", "tempfile", + "tokio", ] [[package]] name = "ckb-snapshot" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55b067bd0ce8e247d289e55932d797409343c568035b87095f9fac7b486d164" +checksum = "8ddf2646df0c62b4dfedbe5af2f4efa5b7a2efb5e8c1e6cbb4f80cc0dbb4ef40" dependencies = [ "arc-swap", "ckb-chain-spec", @@ -1039,15 +1025,15 @@ dependencies = [ [[package]] name = "ckb-spawn" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f527675b36a44964fdc2d103904a1b346f1a8bce6f694d6928d939a158585a" +checksum = "5f3a2c1cd01ae20ebc3111b9f3a1acf7b099671736506c4696d76fb274cb08e4" [[package]] name = "ckb-stop-handler" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55ee26f52dbd1e2ec26481b752956ded1945802193c3d236c4073311c7473b72" +checksum = "8a5d1de0da5963c8b0880e9f01ceea0731440fa2b0f7a8598677e155df314b8f" dependencies = [ "ckb-async-runtime", "ckb-channel", @@ -1060,9 +1046,9 @@ dependencies = [ [[package]] name = "ckb-store" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7c6fefb3d1f4fd780603dc17f39a8fc026585e3579fa5974db83b4819761a07" +checksum = "c90ba01018b6b81918ad642b929274fbb095f9b26b18761ad8859d946189afb9" dependencies = [ "ckb-app-config", "ckb-chain-spec", @@ -1092,24 +1078,24 @@ dependencies = [ [[package]] name = "ckb-systemtime" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4d15c7ffa5f310783c08818df2f6d6c9b4b28a63629c589ed4bbdcf241bc8d4" +checksum = "c0acbeae9e64b10d26ea477dc982caf643d4143f086cb5cf69f2d0f94e4fa2e4" [[package]] name = "ckb-traits" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4fe215ac785af5f9011aeae14f6f1b05d8cad7ca76a98fe97bf374650e07ccc" +checksum = "ab91cb32bd5655b5b4c6574d6f07dd919d93759dc9e07f9ee6a2a9823848c4dc" dependencies = [ "ckb-types", ] [[package]] name = "ckb-tx-pool" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a5c2d8116bd4820f5bdca55d5467026ad3182f6411a76b1024a573c2ab3535" +checksum = "c8d18c555ae97b8123970d2ac0f1015ecbab8b3e6c2b5fa8c25d9b108fd3f3bb" dependencies = [ "ckb-app-config", "ckb-async-runtime", @@ -1123,6 +1109,7 @@ dependencies = [ "ckb-metrics", "ckb-network", "ckb-reward-calculator", + "ckb-script", "ckb-snapshot", "ckb-stop-handler", "ckb-store", @@ -1134,6 +1121,7 @@ dependencies = [ "hyper", "lru", "multi_index_map", + "num_cpus", "rand 0.8.5", "rustc-hash", "serde_json", @@ -1144,9 +1132,9 @@ dependencies = [ [[package]] name = "ckb-types" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb8a1e28eeb4bc18dfc0e97306147d1c9399ffab6292185346a2af2983ed80f3" +checksum = "f02dc76ea18e9838ec996c0f1f8a822d65176d2c9f052b3855c1d0a2d0a4d885" dependencies = [ "bit-vec", "bytes", @@ -1170,9 +1158,9 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "189e48a7a52ca9f0e117984500f321402127441485eb55541654b2bece76dcc7" +checksum = "8a77a2894a6faeed344b08984bd557d095f00aa8d913856b3e688eaa82f866dc" dependencies = [ "linked-hash-map", "once_cell", @@ -1182,9 +1170,9 @@ dependencies = [ [[package]] name = "ckb-verification" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d90cfe8fd8f33e71c0b39f10b8a2d034b87cc12cd434283e8d11c64610b36531" +checksum = "b45211151ba0f3d949739f7e4b0bb3368064f6388022c977c2fb316373ccf5f3" dependencies = [ "ckb-chain-spec", "ckb-dao", @@ -1198,13 +1186,14 @@ dependencies = [ "ckb-verification-traits", "derive_more", "lru", + "tokio", ] [[package]] name = "ckb-verification-contextual" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5602f448b189f0547eba30e86e397bff4848422638c52a0ba681515c73d4157a" +checksum = "6af2e9fb8da5c096f4364aa23f8f1d6aa03ea646ac602f23a11e2440982b378d" dependencies = [ "ckb-async-runtime", "ckb-chain-spec", @@ -1226,9 +1215,9 @@ dependencies = [ [[package]] name = "ckb-verification-traits" -version = "0.113.0" +version = "0.119.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f051a81ebfb13e1ca485e63fabb53cb01cfaa610f5840f42dba2b22d932b37" +checksum = "468d29a43ebacfdecb5cd5a7b9f90a9dc6fb610380a4251208e567fdcce88c0d" dependencies = [ "bitflags 1.3.2", "ckb-error", @@ -1236,9 +1225,9 @@ dependencies = [ [[package]] name = "ckb-vm" -version = "0.24.6" +version = "0.24.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0cc004a826b9bc9319ffae0b8415690e1b5f1482266d55fbd43843aa40ddcd63" +checksum = "ddff96029d3298cb630e95f29d4b9a93384e938a0b75758684aa8794b53bdd1a" dependencies = [ "byteorder", "bytes", @@ -1254,13 +1243,37 @@ dependencies = [ [[package]] name = "ckb-vm-definitions" -version = "0.24.6" +version = "0.24.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4ced3ff9d79b53d93c106720f6c1f855694290e33581850e05c859500eee83f" +checksum = "c280bf1d589d23ab0358f58601c2187fc6be86a131644583ef72ea96a0a13ddd" dependencies = [ "paste", ] +[[package]] +name = "ckb_schemars" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f21f99fca82a4eb8708e406e99246987b087ecc1e1babeece1a0b1d5238b1750" +dependencies = [ + "ckb_schemars_derive", + "dyn-clone", + "serde", + "serde_json", +] + +[[package]] +name = "ckb_schemars_derive" +version = "0.8.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c813b4fadbdd9f33b1cf02a1ddfa9537d955c8d2fbe150d1fc1684dbf78e73" +dependencies = [ + "proc-macro2", + "quote", + "serde_derive_internals", + "syn 1.0.109", +] + [[package]] name = "clang-sys" version = "1.6.1" @@ -1281,41 +1294,13 @@ dependencies = [ "ansi_term", "atty", "bitflags 1.3.2", - "strsim 0.8.0", + "strsim", "textwrap", "unicode-width", "vec_map", "yaml-rust", ] -[[package]] -name = "clap" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac495e00dcec98c83465d5ad66c5c4fabd652fd6686e7c6269b117e729a6f17b" -dependencies = [ - "clap_builder", -] - -[[package]] -name = "clap_builder" -version = "4.4.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c77ed9a32a62e6ca27175d00d29d05ca32e396ea1eb5fb01d8256b669cec7663" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.10.0", - "terminal_size", -] - -[[package]] -name = "clap_lex" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" - [[package]] name = "cloudabi" version = "0.0.3" @@ -1325,12 +1310,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "colorchoice" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" - [[package]] name = "console" version = "0.15.7" @@ -1397,49 +1376,62 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1137cd7e7fc0fb5d3c5a8678be38ec56e819125d8d7907411fe24ccb943faca8" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-epoch", + "crossbeam-queue", + "crossbeam-utils", +] + [[package]] name = "crossbeam-channel" -version = "0.5.8" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ - "cfg-if 1.0.0", "crossbeam-utils", ] [[package]] name = "crossbeam-deque" -version = "0.8.3" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +checksum = "613f8cc01fe9cf1a3eb3d7f488fd2fa8388403e97039e2f73692932e291a770d" dependencies = [ - "cfg-if 1.0.0", "crossbeam-epoch", "crossbeam-utils", ] [[package]] name = "crossbeam-epoch" -version = "0.9.15" +version = "0.9.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +checksum = "5b82ac4a3c2ca9c3460964f020e1402edd5753411d7737aa39c3714ad1b5420e" dependencies = [ - "autocfg 1.1.0", - "cfg-if 1.0.0", "crossbeam-utils", - "memoffset", - "scopeguard", ] [[package]] -name = "crossbeam-utils" -version = "0.8.16" +name = "crossbeam-queue" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +checksum = "df0346b5d5e76ac2fe4e327c5fd1118d6be7c51dfb18f9b7922923f287471e35" dependencies = [ - "cfg-if 1.0.0", + "crossbeam-utils", ] +[[package]] +name = "crossbeam-utils" +version = "0.8.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" + [[package]] name = "crunchy" version = "0.2.2" @@ -1457,6 +1449,16 @@ dependencies = [ "typenum", ] +[[package]] +name = "ctor" +version = "0.1.26" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +dependencies = [ + "quote", + "syn 1.0.109", +] + [[package]] name = "ctrlc" version = "3.4.1" @@ -1475,17 +1477,40 @@ checksum = "b365fabc795046672053e29c954733ec3b05e4be654ab130fe8f1f94d7051f35" [[package]] name = "curve25519-dalek" -version = "3.2.0" +version = "4.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9fdf9972b2bd6af2d913799d9ebc165ea4d2e65878e329d9c6b372c4491b61" +checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be" dependencies = [ - "byteorder", - "digest 0.9.0", - "rand_core 0.5.1", + "cfg-if 1.0.0", + "cpufeatures", + "curve25519-dalek-derive", + "fiat-crypto", + "rustc_version", "subtle", "zeroize", ] +[[package]] +name = "curve25519-dalek-derive" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.48", +] + +[[package]] +name = "dashmap" +version = "4.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e77a43b28d0668df09411cb0bc9a8c2adc40f9a048afe863e05fd43251e8e39c" +dependencies = [ + "cfg-if 1.0.0", + "num_cpus", +] + [[package]] name = "dashmap" version = "5.5.3" @@ -1512,15 +1537,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "digest" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3dd60d1080a57a05ab032377049e0591415d2b31afd7028356dbf3cc6dcb066" -dependencies = [ - "generic-array", -] - [[package]] name = "digest" version = "0.10.7" @@ -1541,6 +1557,12 @@ dependencies = [ "const-random", ] +[[package]] +name = "dyn-clone" +version = "1.0.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d6ef0072f8a535281e4876be788938b528e9a1d43900b82c2569af7da799125" + [[package]] name = "eaglesong" version = "0.1.0" @@ -1605,6 +1627,12 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fiat-crypto" +version = "0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d" + [[package]] name = "flate2" version = "1.0.28" @@ -1756,6 +1784,15 @@ dependencies = [ "slab", ] +[[package]] +name = "fxhash" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c31b6d751ae2c7f11320402d34e41349dd1016f8d5d45e48c4312bc8625af50c" +dependencies = [ + "byteorder", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -1773,10 +1810,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" dependencies = [ "cfg-if 1.0.0", - "js-sys", "libc", "wasi 0.9.0+wasi-snapshot-preview1", - "wasm-bindgen", ] [[package]] @@ -1786,8 +1821,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -1853,7 +1890,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b" dependencies = [ "cfg-if 1.0.0", - "dashmap", + "dashmap 5.5.3", "futures", "futures-timer", "no-std-compat", @@ -1917,13 +1954,22 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-conservative" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5313b072ce3c597065a808dbf612c4c8e8590bdbf8b579508bf7a762c5eae6cd" +dependencies = [ + "arrayvec", +] + [[package]] name = "hmac" version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" dependencies = [ - "digest 0.10.7", + "digest", ] [[package]] @@ -2255,15 +2301,6 @@ dependencies = [ "libc", ] -[[package]] -name = "memoffset" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" -dependencies = [ - "autocfg 1.1.0", -] - [[package]] name = "merkle-cbt" version = "0.3.2" @@ -2311,6 +2348,16 @@ dependencies = [ "adler", ] +[[package]] +name = "minstant" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fb9b5c752f145ac5046bccc3c4f62892e3c950c1d1eab80c5949cd68a2078db" +dependencies = [ + "ctor", + "web-time", +] + [[package]] name = "mio" version = "0.8.9" @@ -2324,9 +2371,9 @@ dependencies = [ [[package]] name = "molecule" -version = "0.7.5" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd9767ab5e5f2ea40f71ff4c8bdb633c50509052e093c2fdd0e390a749dfa3" +checksum = "6efe1c7efcd0bdf4ca590e104bcb13087d9968956ae4ae98e92fb8c1da0f3730" dependencies = [ "bytes", "cfg-if 1.0.0", @@ -2516,6 +2563,15 @@ dependencies = [ "syn 2.0.48", ] +[[package]] +name = "openssl-src" +version = "300.4.0+3.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a709e02f2b4aca747929cca5ed248880847c650233cf8b8cdc48f40aaf4898a6" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" version = "0.9.93" @@ -2524,6 +2580,7 @@ checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] @@ -3098,17 +3155,17 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "ring" -version = "0.16.20" +version = "0.17.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3053cf52e236a3ed746dfc745aa9cacf1b791d846bdaf412f60a8d7d6e17c8fc" +checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d" dependencies = [ "cc", + "cfg-if 1.0.0", + "getrandom 0.2.10", "libc", - "once_cell", "spin", "untrusted", - "web-sys", - "winapi", + "windows-sys 0.52.0", ] [[package]] @@ -3198,18 +3255,29 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.29.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "9465315bc9d4566e1724f0fffcbcc446268cb522e60f9a27bcded6b19c108113" dependencies = [ "secp256k1-sys", ] +[[package]] +name = "secp256k1" +version = "0.30.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252" +dependencies = [ + "bitcoin_hashes", + "rand 0.8.5", + "secp256k1-sys", +] + [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9" dependencies = [ "cc", ] @@ -3241,22 +3309,24 @@ dependencies = [ ] [[package]] -name = "serde_json" -version = "1.0.107" +name = "serde_derive_internals" +version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +checksum = "85bf8229e7920a9f636479437026331ce11aa132b4dde37d121944a44d6e5f3c" dependencies = [ - "itoa", - "ryu", - "serde", + "proc-macro2", + "quote", + "syn 1.0.109", ] [[package]] -name = "serde_plain" -version = "0.3.0" +name = "serde_json" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625fb0da2b006092b426a94acc1611bec52f2ec27bb27b266a9f93c29ee38eda" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" dependencies = [ + "itoa", + "ryu", "serde", ] @@ -3268,7 +3338,7 @@ checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3279,7 +3349,7 @@ checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3290,7 +3360,7 @@ checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" dependencies = [ "cfg-if 1.0.0", "cpufeatures", - "digest 0.10.7", + "digest", ] [[package]] @@ -3323,6 +3393,22 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "sled" +version = "0.34.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f96b4737c2ce5987354855aed3797279def4ebf734436c6aa4552cf8e169935" +dependencies = [ + "crc32fast", + "crossbeam-epoch", + "crossbeam-utils", + "fs2", + "fxhash", + "libc", + "log", + "parking_lot 0.11.2", +] + [[package]] name = "smallvec" version = "1.11.1" @@ -3357,9 +3443,9 @@ dependencies = [ [[package]] name = "spin" -version = "0.5.2" +version = "0.9.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +checksum = "6980e8d7511241f8acf4aebddbb1ff938df5eebe98691418c4468d0b72a96a67" [[package]] name = "spinning_top" @@ -3377,7 +3463,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "da7a2b3c2bc9693bcb40870c4e9b5bf0d79f9cb46273321bf855ec513e919082" dependencies = [ "base64", - "digest 0.10.7", + "digest", "hex", "miette", "serde", @@ -3393,12 +3479,6 @@ version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "subtle" version = "2.5.0" @@ -3442,9 +3522,9 @@ dependencies = [ [[package]] name = "tentacle" -version = "0.4.2" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ffbbdb4f54a9605ceda168884efcf5fb24ef655103362af211e6cfe61eff832" +checksum = "d335523ec132a2bbefbaf403b52eba047fb50bc83bed2d0b1d22c119bae2fec1" dependencies = [ "async-trait", "bytes", @@ -3458,7 +3538,7 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "rand 0.8.5", - "socket2 0.4.10", + "socket2 0.5.5", "tentacle-multiaddr", "tentacle-secio", "thiserror", @@ -3472,9 +3552,9 @@ dependencies = [ [[package]] name = "tentacle-multiaddr" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "895b25a7de42f7bba27b011495a4a48ea7f0591c079f59c8fdb07936ca8aa3d1" +checksum = "8a9e71b28bf0bbf274b92f47cb2c5b42755d84a11e2246cf7bcb7b65c89483b9" dependencies = [ "bs58", "bytes", @@ -3485,24 +3565,24 @@ dependencies = [ [[package]] name = "tentacle-secio" -version = "0.5.7" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78a41abd9ae459d1f744f59670d8f4e9a25c4597b12b9060740fbd17bf9687fc" +checksum = "99df015b8649588f2958d4853eee221860f95d2721995857e9dde1462ceb3dc4" dependencies = [ "bs58", "bytes", "chacha20poly1305", "futures", + "getrandom 0.2.10", "hmac", "log", "molecule", "openssl", "openssl-sys", - "rand 0.7.3", "rand 0.8.5", - "rand_core 0.5.1", + "rand_core 0.6.4", "ring", - "secp256k1", + "secp256k1 0.30.0", "sha2", "tokio", "tokio-util 0.7.10", @@ -3519,16 +3599,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "terminal_size" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7" -dependencies = [ - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "textwrap" version = "0.11.0" @@ -3584,9 +3654,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.33.0" +version = "1.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" +checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" dependencies = [ "backtrace", "bytes", @@ -3603,9 +3673,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", @@ -3774,15 +3844,15 @@ dependencies = [ [[package]] name = "unsigned-varint" -version = "0.7.2" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105" +checksum = "eb066959b24b5196ae73cb057f45598450d2c5f71460e98c49b738086eff9c06" [[package]] name = "untrusted" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" [[package]] name = "url" @@ -3796,12 +3866,6 @@ dependencies = [ "serde", ] -[[package]] -name = "utf8parse" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" - [[package]] name = "vcpkg" version = "0.2.15" @@ -3927,6 +3991,16 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "which" version = "4.4.2" @@ -4013,6 +4087,15 @@ dependencies = [ "windows-targets 0.48.5", ] +[[package]] +name = "windows-sys" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" +dependencies = [ + "windows-targets 0.52.0", +] + [[package]] name = "windows-targets" version = "0.42.2" @@ -4186,12 +4269,13 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "x25519-dalek" -version = "1.1.1" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a0c105152107e3b96f6a00a65e86ce82d9b125230e1c4302940eca58ff71f4f" +checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277" dependencies = [ "curve25519-dalek", - "rand_core 0.5.1", + "rand_core 0.6.4", + "serde", "zeroize", ] diff --git a/Cargo.toml b/Cargo.toml index 7304c01..abaeff7 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-light-client" -version = "0.3.8" +version = "0.4.0" authors = ["Nervos Core Dev "] edition = "2021" license = "MIT" @@ -9,21 +9,21 @@ homepage = "https://github.com/nervosnetwork/ckb-light-client" repository = "https://github.com/nervosnetwork/ckb-light-client" [dependencies] -ckb-app-config = "0.113.0" -ckb-async-runtime = "0.113.0" -ckb-stop-handler = "0.113.0" -ckb-constant = "0.113.0" -ckb-types = "0.113.0" -ckb-network = "0.113.0" -ckb-jsonrpc-types = "0.113.0" -ckb-error = "0.113.0" -ckb-script = "0.113.0" -ckb-chain-spec = "0.113.0" -ckb-traits = "0.113.0" -ckb-resource = "0.113.0" -ckb-verification = "0.113.0" -ckb-systemtime = "0.113.0" -ckb-hash = "0.113.0" +ckb-app-config = "0.119.0" +ckb-async-runtime = "0.119.0" +ckb-stop-handler = "0.119.0" +ckb-constant = "0.119.0" +ckb-types = "0.119.0" +ckb-network = "0.119.0" +ckb-jsonrpc-types = "0.119.0" +ckb-error = "0.119.0" +ckb-script = "0.119.0" +ckb-chain-spec = "0.119.0" +ckb-traits = "0.119.0" +ckb-resource = "0.119.0" +ckb-verification = "0.119.0" +ckb-systemtime = "0.119.0" +ckb-hash = "0.119.0" ckb-merkle-mountain-range = "0.5.1" golomb-coded-set = "0.2.1" rocksdb = { package = "ckb-rocksdb", version ="=0.21.1", features = ["snappy"], default-features = false } @@ -47,11 +47,11 @@ jsonrpc-server-utils = "18.0" governor = "0.6.3" [dev-dependencies] -ckb-shared = "0.113.0" -ckb-chain = "0.113.0" -ckb-tx-pool = "0.113.0" -ckb-store = "0.113.0" -ckb-systemtime = { version = "0.113.0", features = ["enable_faketime"] } +ckb-shared = "0.119.0" +ckb-chain = "0.119.0" +ckb-tx-pool = "0.119.0" +ckb-store = "0.119.0" +ckb-systemtime = { version = "0.119.0", features = ["enable_faketime"] } tempfile = "3.0" rand = "0.6" serde_json = "1.0" diff --git a/rust-toolchain b/rust-toolchain index 22d6771..7c7053a 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.72.1 +1.75.0 diff --git a/src/protocols/filter/components/block_filters_process.rs b/src/protocols/filter/components/block_filters_process.rs index a2cbd94..7325690 100644 --- a/src/protocols/filter/components/block_filters_process.rs +++ b/src/protocols/filter/components/block_filters_process.rs @@ -148,7 +148,7 @@ impl<'a> BlockFiltersProcess<'a> { .filter .storage .get_check_points(cached_check_point_index, 1) - .get(0) + .first() .cloned() .expect("all check points before finalized should be existed"); (cached_check_point, cached_block_filter_hashes) diff --git a/src/storage.rs b/src/storage.rs index 13bd66f..0a62b25 100644 --- a/src/storage.rs +++ b/src/storage.rs @@ -591,7 +591,7 @@ impl Storage { let index = self.get_max_check_point_index(); let hash = self .get_check_points(index, 1) - .get(0) + .first() .cloned() .expect("db get last check point should be ok"); (index, hash) diff --git a/src/subcmds.rs b/src/subcmds.rs index 801890e..f30534e 100644 --- a/src/subcmds.rs +++ b/src/subcmds.rs @@ -117,7 +117,7 @@ impl RunConfig { ), ]; - let (mut handle, mut handle_stop_rx, _stop_handler) = new_global_runtime(); + let (mut handle, mut handle_stop_rx, _stop_handler) = new_global_runtime(None); let network_controller = NetworkService::new( Arc::clone(&network_state), diff --git a/src/tests/prelude.rs b/src/tests/prelude.rs index b16eabf..4efb9f4 100644 --- a/src/tests/prelude.rs +++ b/src/tests/prelude.rs @@ -1,7 +1,7 @@ use std::collections::{HashMap, HashSet, VecDeque}; use std::sync::Arc; -use ckb_chain::chain::ChainController; +use ckb_chain::ChainController; use ckb_chain_spec::consensus::Consensus; use ckb_merkle_mountain_range::leaf_index_to_pos; use ckb_shared::{Shared, Snapshot}; @@ -262,7 +262,7 @@ pub(crate) trait RunningChainExt: ChainExt { let block_number = block.number(); let is_ok = self .controller() - .process_block(Arc::new(block)) + .blocking_process_block(Arc::new(block)) .expect("process block"); assert!(is_ok, "failed to process block {}", block_number); while self diff --git a/src/tests/utils/chain.rs b/src/tests/utils/chain.rs index 03b42b7..74d6092 100644 --- a/src/tests/utils/chain.rs +++ b/src/tests/utils/chain.rs @@ -1,7 +1,7 @@ use std::sync::Arc; use ckb_app_config::{BlockAssemblerConfig, NetworkConfig}; -use ckb_chain::chain::{ChainController, ChainService}; +use ckb_chain::{start_chain_services, ChainController}; use ckb_chain_spec::{consensus::Consensus, ChainSpec}; use ckb_jsonrpc_types::JsonBytes; use ckb_network::{Flags, NetworkController, NetworkService, NetworkState}; @@ -108,8 +108,7 @@ impl MockChain { let network = dummy_network(&shared); pack.take_tx_pool_builder().start(network); - let chain_service = ChainService::new(shared.clone(), pack.take_proposal_table()); - let chain_controller = chain_service.start::<&str>(None); + let chain_controller = start_chain_services(pack.take_chain_services_builder()); MockRunningChain { storage,