From 0f2f3a0af17a32b6b8345d8a5a65a2c412e963cf Mon Sep 17 00:00:00 2001 From: Eval EXEC Date: Thu, 25 Jul 2024 16:04:17 +0800 Subject: [PATCH] Bump ckb dependencies to v0.117.0 Signed-off-by: Eval EXEC --- Cargo.lock | 845 ++++++++++++++++++------------ Cargo.toml | 30 +- ckb-signer/Cargo.toml | 12 +- ckb-signer/src/keystore/mod.rs | 49 +- ckb-signer/src/keystore/signer.rs | 2 +- plugin-protocol/Cargo.toml | 4 +- src/plugin/builtin.rs | 2 +- src/plugin/manager.rs | 2 +- src/subcommands/account.rs | 2 +- src/subcommands/util.rs | 16 +- src/subcommands/wallet.rs | 2 +- src/utils/mock_tx_helper.rs | 2 +- src/utils/other.rs | 2 +- src/utils/rpc/types.rs | 16 + src/utils/signer.rs | 5 +- test/Cargo.toml | 8 +- 16 files changed, 585 insertions(+), 414 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bf452f8..2023660f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4,9 +4,9 @@ version = 3 [[package]] name = "addr2line" -version = "0.21.0" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" +checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678" dependencies = [ "gimli", ] @@ -36,7 +36,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be14c7498ea50828a38d0e24a765ed2effe92a705885b57d029cd67d45744072" dependencies = [ "cipher", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] @@ -46,7 +46,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ea2e11f5e94c2f7d386164cc2aa1f97823fed6f259e486940a71c174dd01b0ce" dependencies = [ "cipher", - "opaque-debug 0.3.0", + "opaque-debug 0.3.1", ] [[package]] @@ -55,16 +55,16 @@ version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "once_cell", "version_check", ] [[package]] name = "aho-corasick" -version = "1.1.2" +version = "1.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" +checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916" dependencies = [ "memchr", ] @@ -95,15 +95,15 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.80" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ad32ce52e4161730f7098c077cd2ed6229b5804ccf99e5366be1ab72a98b4e1" +checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da" [[package]] name = "arrayref" -version = "0.3.7" +version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545" +checksum = "9d151e35f61089500b617991b791fc8bfd237ae50cd5950803758a179b41e67a" [[package]] name = "arrayvec" @@ -111,6 +111,12 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b" +[[package]] +name = "arrayvec" +version = "0.7.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711" + [[package]] name = "atty" version = "0.2.14" @@ -128,20 +134,20 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "autocfg" -version = "1.1.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" [[package]] name = "backtrace" -version = "0.3.69" +version = "0.3.73" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" +checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a" dependencies = [ "addr2line", "cc", @@ -152,6 +158,16 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "base58ck" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c8d66485a3a2ea485c1913c4572ce0256067a5377ac8c75c4960e1cda98605f" +dependencies = [ + "bitcoin-internals", + "bitcoin_hashes", +] + [[package]] name = "base64" version = "0.9.3" @@ -182,9 +198,9 @@ checksum = "cf9ff0bbfd639f15c74af777d81383cf53efb7c93613f6cab67c6c11e05bbf8b" [[package]] name = "bech32" -version = "0.9.1" +version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d86b93f97252c47b41663388e6d155714a9d0c398b99f1005cbc5f978b29f445" +checksum = "d965446196e3b7decd44aa7ee49e31d630118f90ef12f97900f262eb915c951d" [[package]] name = "bit-vec" @@ -194,20 +210,51 @@ checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" [[package]] name = "bitcoin" -version = "0.29.2" +version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0694ea59225b0c5f3cb405ff3f670e4828358ed26aec49dc352f730f0cb1a8a3" +checksum = "ea507acc1cd80fc084ace38544bbcf7ced7c2aa65b653b102de0ce718df668f6" dependencies = [ - "bech32 0.9.1", + "base58ck", + "bech32 0.11.0", + "bitcoin-internals", + "bitcoin-io", + "bitcoin-units", "bitcoin_hashes", + "hex-conservative", + "hex_lit", "secp256k1", ] +[[package]] +name = "bitcoin-internals" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30bdbe14aa07b06e6cfeffc529a1f099e5fbe249524f8125358604df99a4bed2" + +[[package]] +name = "bitcoin-io" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "340e09e8399c7bd8912f495af6aa58bea0c9214773417ffaa8f6460f93aaee56" + +[[package]] +name = "bitcoin-units" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5285c8bcaa25876d07f37e3d30c303f2609179716e11d688f51e8f1fe70063e2" +dependencies = [ + "bitcoin-internals", +] + [[package]] name = "bitcoin_hashes" -version = "0.11.0" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4" +checksum = "bb18c03d0db0247e147a21a6faafd5a7eb851c743db062de72018b6b7e8e4d16" +dependencies = [ + "bitcoin-io", + "hex-conservative", +] [[package]] name = "bitflags" @@ -217,9 +264,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.4.2" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570934406eb16438a4e976b1b4500774099c13b8cb96eec99f620f05090ddf" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "blake2" @@ -256,7 +303,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "afa748e348ad3be8263be728124b24a24f268266f6f5d58af9d75f6a40b5c587" dependencies = [ "arrayref", - "arrayvec", + "arrayvec 0.5.2", "constant_time_eq", ] @@ -308,9 +355,9 @@ dependencies = [ [[package]] name = "bumpalo" -version = "3.15.3" +version = "3.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea184aa71bb362a1157c896979544cc23974e08fd265f29ea96b59f0b4a555b" +checksum = "79296716171880943b8470b5f8d03aa55eb2e645a4874bdbb28adb49162e012c" [[package]] name = "byte-tools" @@ -336,9 +383,9 @@ dependencies = [ [[package]] name = "bytes" -version = "1.5.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" +checksum = "a12916984aab3fa6e39d655a33e09c0071eb36d6ab3aea5c2d78551f1df6d952" dependencies = [ "serde", ] @@ -378,9 +425,9 @@ checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53" [[package]] name = "cc" -version = "1.0.88" +version = "1.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02f341c093d19155a6e41631ce5971aac4e9a868262212153124c15fa22d1cdc" +checksum = "2aba8f4e9906c7ce3c73463f62a7f0c65183ada1a2d47e397cc8810827f9694f" [[package]] name = "cfg-if" @@ -394,18 +441,24 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e" + [[package]] name = "chrono" -version = "0.4.34" +version = "0.4.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bc015644b92d5890fab7489e49d21f879d5c990186827d42ec511919404f38b" +checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401" dependencies = [ "android-tzdata", "iana-time-zone", "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -419,15 +472,15 @@ dependencies = [ [[package]] name = "ckb-build-info" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8589e3ca12ad382c4524d0829dd2595585f1aac164f84d042f7506700b818934" +checksum = "9b5fb6fdcd08f97e028afaa7ea6fad90f42c5b9fea30eb0a30f317345f3ad290" [[package]] name = "ckb-chain-spec" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e955d55380bbd2ca883b4426fb1483e61f06fe65c8b377d5d4bceeb03ecf07bb" +checksum = "22ffb29f6ab04123164b3595c7dc9b94c637483fe92d97395bfd8ef111c31b09" dependencies = [ "cacache", "ckb-constant", @@ -448,16 +501,16 @@ dependencies = [ [[package]] name = "ckb-channel" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "853f561e90ff59d858dc87c1ac385fae948984859c874fd8d3bd1bbab335889d" +checksum = "a2c229f77b57d68bdeafef6d7eea370ec7d03fa4493832cd9b4501cad6697c03" dependencies = [ "crossbeam-channel", ] [[package]] name = "ckb-cli" -version = "1.10.0" +version = "1.11.0" dependencies = [ "ansi_term", "anyhow", @@ -531,29 +584,29 @@ dependencies = [ [[package]] name = "ckb-constant" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5baf91b16a3b8360c85211dfdff3d2adc0a1f3ae571ea6b1637d55d6b227e312" +checksum = "bf660b69c25989be516a4c2c047555cb4584f33a565396a5f35fc46ef3f3e04d" [[package]] name = "ckb-crypto" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e2094270f5632808cbff1c37a37ffb9b3e79f7a99e78927fb228d8c343793eb" +checksum = "5b7617bdf7797b9717eebcdb8bc4cb9c9ccc12f965a35090b319ed73c2eda36d" dependencies = [ "ckb-fixed-hash", "faster-hex", "lazy_static", - "rand 0.7.3", + "rand 0.8.5", "secp256k1", "thiserror", ] [[package]] name = "ckb-dao-utils" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6eb3606c602a424098317bfde4b7d6427d4fe5dfe1a6d4ebc831ce0308508085" +checksum = "b7b4b523467ff9c7ccd06182779c2bbe4e580d4ac8e1dbb410a1120402163a94" dependencies = [ "byteorder", "ckb-error", @@ -562,9 +615,9 @@ dependencies = [ [[package]] name = "ckb-error" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01041f8a1d7eeaf85caca3547bb78d929d6a4d62774509d7eb438b6bc310ba30" +checksum = "48b42e9c95f10c2b81af526df9014578440dbc0100b56959283a12795961fde2" dependencies = [ "anyhow", "ckb-occupied-capacity", @@ -574,9 +627,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a7491f18717b84827923935cc5adb1bcdf9c924e377b478d089f4694e7c779b" +checksum = "88a9d9d694bf53671361c828343ea50c3c7cdb66aaafb8e4dfa209d0a137a779" dependencies = [ "ckb-fixed-hash-core", "ckb-fixed-hash-macros", @@ -584,9 +637,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-core" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9509f63fedb9b6e42cfd0db47d3dc5acb6b029da546d5d4451d08afc44c70cf8" +checksum = "104486d82104a99080bd9c462529789fc5b31d791a592b8ec455f2163bf5a3d0" dependencies = [ "ckb_schemars", "faster-hex", @@ -596,9 +649,9 @@ dependencies = [ [[package]] name = "ckb-fixed-hash-macros" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdd89533a5da746f50798752a46f5f084f110c849335be94baf506790ebee931" +checksum = "a5d40a5aa1ea857fcab168743d4969e2ae73db381b2637b6a74fab745baba030" dependencies = [ "ckb-fixed-hash-core", "proc-macro2", @@ -608,9 +661,9 @@ dependencies = [ [[package]] name = "ckb-gen-types" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a0f2d0f4224507a027d25d64824dd0dc8d367c8b5bead30289eaffe1381a7fb" +checksum = "0b72a8f82b47ddcc49c68a1fbaf4e6b105c85747b44cdb9bb2d2b37e55e85e5e" dependencies = [ "cfg-if 1.0.0", "ckb-error", @@ -623,9 +676,9 @@ dependencies = [ [[package]] name = "ckb-hash" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d5754bc49cf76a7e8829fe6a7cf1eea1284cbca9777b521f072c76d6ae28d303" +checksum = "5231fff400578e6a6d9c9758138a6cfb190d1acbd28f1b5d40e7fcb13f133e9a" dependencies = [ "blake2b-ref", "blake2b-rs", @@ -633,9 +686,9 @@ dependencies = [ [[package]] name = "ckb-jsonrpc-types" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef7e123043ca3701cf05ba4c3699b34f3b179609109a4c8c3afa68922f722be7" +checksum = "5176b756c8685d7ff9578d0e0e5f6714070c29f8ca924074188c1478ac57782f" dependencies = [ "ckb-types", "ckb_schemars", @@ -646,9 +699,9 @@ dependencies = [ [[package]] name = "ckb-logger" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59ebecd56c9acb453bdcb5c39e66b6b7f980bdf72b35515750bc295fa635287d" +checksum = "77f24db59d6f0994136a98371bc35f72ec912d40dd98921ec25968a3d549f656" dependencies = [ "log", ] @@ -664,9 +717,9 @@ dependencies = [ [[package]] name = "ckb-mock-tx-types" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1ddfee88ad65ff6fd828695a78ec49be60888c58e631feb66d130008ce130d0" +checksum = "8fd1f3410f697e2a9eb95cc77f21a0340ca2074ebc2641c89fd99e8e1c2a0002" dependencies = [ "ckb-jsonrpc-types", "ckb-traits", @@ -676,9 +729,9 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee4aa07af7cec38d15cfe4c1ce150514fba5a4e78996bbbd098982106bee7d8d" +checksum = "67df5d5ce8cef497295a1b31cf34536dcdfc16747de540e5c8bd76738f0da753" dependencies = [ "ckb-occupied-capacity-core", "ckb-occupied-capacity-macros", @@ -686,18 +739,18 @@ dependencies = [ [[package]] name = "ckb-occupied-capacity-core" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a63ed90996ba24ab26d5ac8ae22fd002a293f4a4e4526042e1adf84b1889e176" +checksum = "05ecbb7cd4e90f38e4726a1f0cd443463db9c29d348aa660368485cf9665d1ae" dependencies = [ "serde", ] [[package]] name = "ckb-occupied-capacity-macros" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a6aae3f1f8d194cd5bd4328c9c7281f0d7acc73976b2771576cdc06a9ed608f" +checksum = "b0f8b5144e5371c4f61aa2b9b6e668b6a7b5a6562c3c4b8874d414c14d48f9e7" dependencies = [ "ckb-occupied-capacity-core", "quote", @@ -706,9 +759,9 @@ dependencies = [ [[package]] name = "ckb-pow" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb981de6e56107cd3e1660a9105bb07891277b21604946f70bf5097dd03690f7" +checksum = "f0f7965a9f0c35ab68f71a008cd7186b4dea02bd8d17dc7263f927d005ee6a52" dependencies = [ "byteorder", "ckb-hash", @@ -720,9 +773,9 @@ dependencies = [ [[package]] name = "ckb-rational" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed570e816c80fffdfafb58c7c895df8c08c64ba56ce79d824e5ff976dd1a7381" +checksum = "ea12dfe40f80068b593a65d59484b7541444f10c629f78ceba20b1a0ef95f68d" dependencies = [ "numext-fixed-uint", "serde", @@ -730,9 +783,9 @@ dependencies = [ [[package]] name = "ckb-resource" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d482493fabf4ce3670277d7dbaa5811872379535031431dc6b19699722c7b846" +checksum = "bdded224077d7ead2d76d376786e63a46d93f8e3cc54db9edebf32c51ba0ae31" dependencies = [ "ckb-system-scripts", "ckb-types", @@ -745,9 +798,9 @@ dependencies = [ [[package]] name = "ckb-script" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2d6528e95a0f93d4a39e569b1ffffd60cbb0a9ae8f1c96dd465e2576ad510a9" +checksum = "0aa80e54fbaf4287121adb59b77b537d38b3a79c2a0a23613a464ab5830d76c9" dependencies = [ "byteorder", "ckb-chain-spec", @@ -763,14 +816,14 @@ dependencies = [ [[package]] name = "ckb-sdk" -version = "3.2.1" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "631e8f378ff8d0a1184ab4072c18e41b5b86a36c6d847b4f81bedbf325177682" +checksum = "454dacfa54b511d07d05bbe5062b21389bc57d33b93e0f6848a850db09d82499" dependencies = [ "anyhow", "bech32 0.8.1", "bitflags 1.3.2", - "bytes 1.5.0", + "bytes 1.6.1", "ckb-chain-spec", "ckb-crypto", "ckb-dao-utils", @@ -790,7 +843,7 @@ dependencies = [ "lazy_static", "log", "lru", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "reqwest", "secp256k1", "serde", @@ -800,7 +853,7 @@ dependencies = [ "sparse-merkle-tree", "thiserror", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", ] [[package]] @@ -841,21 +894,21 @@ dependencies = [ [[package]] name = "ckb-traits" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c528f704f3088ec2dd467d374920b64b2bbb9ed9c4e8e12931c069a99150d8bc" +checksum = "510e8db7af6ed58c322449c23c62b50ff717ea6f9803a22cea1e11b4763f7fb4" dependencies = [ "ckb-types", ] [[package]] name = "ckb-types" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b05cc1c6aab0c40b323b233617b67860f9d679fac431a34d1f1b0853d700e9d" +checksum = "764f9fa9be640bea12227d4b16db4ed595dd04e89a457d67db7c73cd632cdb8d" dependencies = [ "bit-vec", - "bytes 1.5.0", + "bytes 1.6.1", "ckb-channel", "ckb-constant", "ckb-error", @@ -876,13 +929,13 @@ dependencies = [ [[package]] name = "ckb-util" -version = "0.116.1" +version = "0.117.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c8a864a041d82fc6f791c608fa7cb941e3b415071d31b0186e8da2c06f64e5b" +checksum = "d2fa24bb50554532b42fddba5b83c5b0215a0aaacbe73a8724944fa70eebff6b" dependencies = [ "linked-hash-map", "once_cell", - "parking_lot 0.12.1", + "parking_lot 0.12.3", "regex", ] @@ -893,7 +946,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2c3d68dc7f891e5555c7ebc054722b28ab005e51c5076f54c20d36002dc8e83" dependencies = [ "byteorder", - "bytes 1.5.0", + "bytes 1.6.1", "cc", "ckb-vm-definitions", "derive_more", @@ -1050,27 +1103,27 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.4.0" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa" +checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3" dependencies = [ "cfg-if 1.0.0", ] [[package]] name = "crossbeam-channel" -version = "0.5.12" +version = "0.5.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95" +checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2" dependencies = [ "crossbeam-utils", ] [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80" [[package]] name = "crunchy" @@ -1109,11 +1162,11 @@ dependencies = [ [[package]] name = "ctrlc" -version = "3.4.2" +version = "3.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b" +checksum = "672465ae37dc1bc6380a6547a8883d5dd397b0f1faaad4f265726cc7042a5345" dependencies = [ - "nix 0.27.1", + "nix 0.28.0", "windows-sys 0.52.0", ] @@ -1130,17 +1183,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856" dependencies = [ "cfg-if 1.0.0", - "hashbrown 0.14.3", + "hashbrown 0.14.5", "lock_api", "once_cell", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] name = "data-encoding" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5" +checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2" [[package]] name = "derive-getters" @@ -1155,15 +1208,15 @@ dependencies = [ [[package]] name = "derive_more" -version = "0.99.17" +version = "0.99.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321" +checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce" dependencies = [ "convert_case", "proc-macro2", "quote", "rustc_version", - "syn 1.0.109", + "syn 2.0.72", ] [[package]] @@ -1213,7 +1266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ebda144c4fe02d1f7ea1a7d9641b6fc6b580adcfa024ae48797ecdeb6825b4d" dependencies = [ "libc", - "redox_users 0.4.4", + "redox_users 0.4.5", "winapi 0.3.9", ] @@ -1237,9 +1290,9 @@ checksum = "8d978bd5d343e8ab9b5c0fc8d93ff9c602fdc96616ffff9c05ac7a155419b824" [[package]] name = "either" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11157ac094ffbdde99aa67b23417ebdd801842852b500e395a45a9c0aac03e4a" +checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0" [[package]] name = "encode_unicode" @@ -1249,9 +1302,9 @@ checksum = "a357d28ed41a50f9c765dbfe56cbc04a64e53e5fc58ba79fbc34c10ef3df831f" [[package]] name = "encoding_rs" -version = "0.8.33" +version = "0.8.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +checksum = "b45de904aa0b010bce2ab45264d0631681847fa7b6f2eaa7dab7619943bc4f59" dependencies = [ "cfg-if 1.0.0", ] @@ -1295,9 +1348,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba" dependencies = [ "libc", "windows-sys 0.52.0", @@ -1317,15 +1370,15 @@ checksum = "51e2ce894d53b295cf97b05685aa077950ff3e8541af83217fc720a6437169f8" [[package]] name = "fastrand" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a" [[package]] name = "flate2" -version = "1.0.28" +version = "1.0.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae" dependencies = [ "crc32fast", "miniz_oxide", @@ -1440,7 +1493,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -1506,9 +1559,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.12" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" +checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7" dependencies = [ "cfg-if 1.0.0", "libc", @@ -1517,9 +1570,9 @@ dependencies = [ [[package]] name = "gimli" -version = "0.28.1" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253" +checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd" [[package]] name = "globset" @@ -1558,9 +1611,9 @@ dependencies = [ [[package]] name = "golomb-coded-set" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c7076c0cd6257d84b785b0f22c36443dd47a5e86a1256d7ef82c8cb88ea9a7e" +checksum = "812f314a99fb5b7f0f9d0a8388539578f83f3aca6a65f588b8dbeefb731e2f98" dependencies = [ "siphasher", ] @@ -1571,16 +1624,16 @@ version = "0.3.26" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81fe527a889e1532da5c525686d96d4c2e74cdd345badf8dfef9f6b39dd5f5e8" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap 2.2.5", + "indexmap 2.2.6", "slab", "tokio", - "tokio-util 0.7.10", + "tokio-util 0.7.11", "tracing", ] @@ -1595,9 +1648,9 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.14.3" +version = "0.14.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604" +checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" [[package]] name = "heapsize" @@ -1635,6 +1688,21 @@ 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 0.7.4", +] + +[[package]] +name = "hex_lit" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3011d1213f159867b13cfd6ac92d2cd5f1345762c63be3554e84092d85a50bbd" + [[package]] name = "hmac" version = "0.7.1" @@ -1647,11 +1715,11 @@ dependencies = [ [[package]] name = "http" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8947b1a6fad4393052c7ba1f4cd97bed3e953a95c79c92ad9b051a04611d9fbb" +checksum = "601cbb57e577e2f5ef5be8e7b83f0f63994f25aa94d673e54a92d5c516d101f1" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "fnv", "itoa", ] @@ -1662,16 +1730,16 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "http", "pin-project-lite", ] [[package]] name = "httparse" -version = "1.8.0" +version = "1.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" +checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9" [[package]] name = "httpdate" @@ -1690,11 +1758,11 @@ dependencies = [ [[package]] name = "hyper" -version = "0.14.28" +version = "0.14.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80" +checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "futures-channel", "futures-core", "futures-util", @@ -1718,7 +1786,7 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "hyper", "native-tls", "tokio", @@ -1736,7 +1804,7 @@ dependencies = [ "iana-time-zone-haiku", "js-sys", "wasm-bindgen", - "windows-core", + "windows-core 0.52.0", ] [[package]] @@ -1796,25 +1864,25 @@ version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "hashbrown 0.12.3", ] [[package]] name = "indexmap" -version = "2.2.5" +version = "2.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b0b929d511467233429c45a44ac1dcaa21ba0f5ba11e4879e6ed28ddb4f9df4" +checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26" dependencies = [ "equivalent", - "hashbrown 0.14.3", + "hashbrown 0.14.5", ] [[package]] name = "instant" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" +checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222" dependencies = [ "cfg-if 1.0.0", ] @@ -1865,15 +1933,15 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.10" +version = "1.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b" [[package]] name = "js-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "406cda4b368d531c842222cf9d2600a9a4acce8d29423695379c6868a143a9ee" +checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d" dependencies = [ "wasm-bindgen", ] @@ -1968,7 +2036,7 @@ version = "18.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fa4fdea130485b572c39a460d50888beb00afb3e35de23ccd7fad8ff19f0e0d4" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "futures 0.3.30", "globset", "jsonrpc-core", @@ -2001,25 +2069,24 @@ dependencies = [ [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.153" +version = "0.2.155" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd" +checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c" [[package]] name = "libredox" -version = "0.0.1" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85c833ca1e66078851dba29046874e38f08b2c883700aa29a03ddd3b23814ee8" +checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "libc", - "redox_syscall 0.4.1", ] [[package]] @@ -2033,25 +2100,25 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.13" +version = "0.4.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89" [[package]] name = "lock_api" -version = "0.4.11" +version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", "scopeguard", ] [[package]] name = "log" -version = "0.4.21" +version = "0.4.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c" +checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" [[package]] name = "lru" @@ -2070,9 +2137,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5" [[package]] name = "memchr" -version = "2.7.1" +version = "2.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149" +checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3" [[package]] name = "memmap2" @@ -2112,7 +2179,7 @@ checksum = "49e7bc1560b95a3c4a25d03de42fe76ca718ab92d1a22a55b9b4cf67b3ae635c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -2123,42 +2190,42 @@ checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "miniz_oxide" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7" +checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", ] [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[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 1.5.0", + "bytes 1.6.1", "cfg-if 1.0.0", "faster-hex", ] [[package]] name = "native-tls" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" +checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466" dependencies = [ - "lazy_static", "libc", "log", "openssl", @@ -2204,22 +2271,23 @@ dependencies = [ [[package]] name = "nix" -version = "0.27.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" +checksum = "ab2156c4fce2f8df6c499cc1c763e4394b7482525bf2a9701c9d79d215f519e4" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", + "cfg_aliases", "libc", ] [[package]] name = "num-traits" -version = "0.2.18" +version = "0.2.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a" +checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] @@ -2286,9 +2354,9 @@ checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef" [[package]] name = "object" -version = "0.32.2" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -2307,9 +2375,9 @@ checksum = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" [[package]] name = "opaque-debug" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" +checksum = "c08d65885ee38876c4f86fa503fb49d7b507c2b62552df7c70b2fce627e06381" [[package]] name = "openssl" @@ -2317,7 +2385,7 @@ version = "0.10.66" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "cfg-if 1.0.0", "foreign-types", "libc", @@ -2334,7 +2402,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -2345,9 +2413,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "300.2.3+3.2.1" +version = "300.3.1+3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cff92b6f71555b61bb9315f7c64da3ca43d87531622120fea0195fc761b4843" +checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91" dependencies = [ "cc", ] @@ -2416,12 +2484,12 @@ dependencies = [ [[package]] name = "parking_lot" -version = "0.12.1" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27" dependencies = [ "lock_api", - "parking_lot_core 0.9.9", + "parking_lot_core 0.9.10", ] [[package]] @@ -2440,22 +2508,22 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.9.9" +version = "0.9.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8" dependencies = [ "cfg-if 1.0.0", "libc", - "redox_syscall 0.4.1", + "redox_syscall 0.5.3", "smallvec", - "windows-targets 0.48.5", + "windows-targets 0.52.6", ] [[package]] name = "paste" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" [[package]] name = "pbkdf2" @@ -2519,9 +2587,9 @@ dependencies = [ [[package]] name = "pin-project-lite" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" +checksum = "bda66fc9667c18cb2758a2ac84d1167245054bcf85d5d1aaa6923f45801bdd02" [[package]] name = "pin-utils" @@ -2582,9 +2650,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.78" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2422ad645d89c99f8f3e6b88a9fdeca7fabeac836b1002371c4367c8f984aae" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -2597,9 +2665,9 @@ checksum = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" [[package]] name = "quote" -version = "1.0.35" +version = "1.0.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7" dependencies = [ "proc-macro2", ] @@ -2660,6 +2728,17 @@ dependencies = [ "rand_pcg 0.2.1", ] +[[package]] +name = "rand" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" +dependencies = [ + "libc", + "rand_chacha 0.3.1", + "rand_core 0.6.4", +] + [[package]] name = "rand_chacha" version = "0.1.1" @@ -2680,6 +2759,16 @@ dependencies = [ "rand_core 0.5.1", ] +[[package]] +name = "rand_chacha" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" +dependencies = [ + "ppv-lite86", + "rand_core 0.6.4", +] + [[package]] name = "rand_core" version = "0.3.1" @@ -2704,6 +2793,15 @@ dependencies = [ "getrandom 0.1.16", ] +[[package]] +name = "rand_core" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +dependencies = [ + "getrandom 0.2.15", +] + [[package]] name = "rand_hc" version = "0.1.0" @@ -2810,11 +2908,11 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.4.1" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +checksum = "2a908a6e00f1fdd0dfd9c0eb08ce85126f6d8bbda50017e74bc4a4b7d4a926a4" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", ] [[package]] @@ -2836,20 +2934,20 @@ dependencies = [ [[package]] name = "redox_users" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" +checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891" dependencies = [ - "getrandom 0.2.12", + "getrandom 0.2.15", "libredox", "thiserror", ] [[package]] name = "reflink-copy" -version = "0.1.14" +version = "0.1.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "767be24c0da52e7448d495b8d162506a9aa125426651d547d545d6c2b4b65b62" +checksum = "dc31414597d1cd7fdd2422798b7652a6329dda0fe0219e6335a13d5bcaa9aeb6" dependencies = [ "cfg-if 1.0.0", "rustix", @@ -2858,9 +2956,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.3" +version = "1.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b62dbe01f0b06f9d8dc7d49e05a0785f153b00b2c227856282f671e0318c9b15" +checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f" dependencies = [ "aho-corasick", "memchr", @@ -2870,9 +2968,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", @@ -2881,18 +2979,18 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "reqwest" -version = "0.11.24" +version = "0.11.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6920094eb85afde5e4a138be3f2de8bbdf28000f0029e72c45025a56b042251" +checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62" dependencies = [ "base64 0.21.7", - "bytes 1.5.0", + "bytes 1.6.1", "encoding_rs", "futures-core", "futures-util", @@ -2918,7 +3016,7 @@ dependencies = [ "tokio", "tokio-native-tls", "tower-service", - "url 2.5.0", + "url 2.5.2", "wasm-bindgen", "wasm-bindgen-futures", "web-sys", @@ -2950,9 +3048,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" +checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f" [[package]] name = "rustc_version" @@ -2965,11 +3063,11 @@ dependencies = [ [[package]] name = "rustix" -version = "0.38.31" +version = "0.38.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea3e1a662af26cd7a3ba09c0297a31af215563ecf42817c98df621387f4e949" +checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f" dependencies = [ - "bitflags 2.4.2", + "bitflags 2.6.0", "errno", "libc", "linux-raw-sys", @@ -3020,9 +3118,9 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1" +checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "safemem" @@ -3092,9 +3190,9 @@ dependencies = [ [[package]] name = "secp256k1" -version = "0.24.3" +version = "0.29.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62" +checksum = "0e0cc0f1cf93f4969faf3ea1c7d8a9faed25918d96affa959720823dfe86d4f3" dependencies = [ "bitcoin_hashes", "secp256k1-sys", @@ -3102,20 +3200,20 @@ dependencies = [ [[package]] name = "secp256k1-sys" -version = "0.6.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b" +checksum = "1433bd67156263443f14d603720b082dd3121779323fce20cba2aa07b874bc1b" dependencies = [ "cc", ] [[package]] name = "security-framework" -version = "2.9.2" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" +checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.6.0", "core-foundation", "core-foundation-sys", "libc", @@ -3124,9 +3222,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.9.1" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" +checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" dependencies = [ "core-foundation-sys", "libc", @@ -3134,28 +3232,28 @@ dependencies = [ [[package]] name = "semver" -version = "1.0.22" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" +checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" [[package]] name = "serde" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb1c873e1b9b056a4dc4c0c198b24c3ffa059243875552b2bd0933b1aee4ce2" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.197" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7eb0b34b42edc17f6b7cac84a52a1c5f0e1bb2227e997ca9011ea3dd34e8610b" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -3171,9 +3269,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.114" +version = "1.0.120" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f09b1bd632ef549eaa9f60a1f8de742bdbc698e6cee2095fc84dde5f549ae0" +checksum = "4e0d21c9a8cae1235ad58a00c11cb40d4b1e5c784f1ef2c537876ed6ffd8b7c5" dependencies = [ "itoa", "ryu", @@ -3302,20 +3400,20 @@ version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" dependencies = [ - "autocfg 1.1.0", + "autocfg 1.3.0", ] [[package]] name = "smallvec" -version = "1.13.1" +version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" +checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "socket2" -version = "0.5.6" +version = "0.5.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871" +checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c" dependencies = [ "libc", "windows-sys 0.52.0", @@ -3374,9 +3472,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.52" +version = "2.0.72" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b699d15b36d1f02c3e7c69f8ffef53de37aefae075d8488d4ba1a7788d574a07" +checksum = "dc4b9b9bf2add8093d3f2c0204471e951b2285580335de42f9d2534f3ae7a8af" dependencies = [ "proc-macro2", "quote", @@ -3454,22 +3552,22 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e45bcbe8ed29775f228095caf2cd67af7a4ccf756ebff23a306bf3e8b47b24b" +checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.57" +version = "1.0.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a953cb265bef375dae3de6663da4d3804eee9682ea80d8e2542529b73c531c81" +checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -3483,9 +3581,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.6.0" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" +checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938" dependencies = [ "tinyvec_macros", ] @@ -3498,30 +3596,29 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.36.0" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61285f6515fa018fb2d1e46eb21223fff441ee8db5d0f1435e8ab4f5cdb80931" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", - "bytes 1.5.0", + "bytes 1.6.1", "libc", "mio", - "num_cpus", "pin-project-lite", "socket2", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", ] [[package]] @@ -3536,9 +3633,9 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.14" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" +checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af" dependencies = [ "futures-core", "pin-project-lite", @@ -3551,7 +3648,7 @@ version = "0.6.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "36943ee01a6d67977dd3f84a5a1d2efeb4ada3a1ae771cadfaa535d9d9fc6507" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "futures-core", "futures-sink", "log", @@ -3561,16 +3658,15 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.7.10" +version = "0.7.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15" +checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1" dependencies = [ - "bytes 1.5.0", + "bytes 1.6.1", "futures-core", "futures-sink", "pin-project-lite", "tokio", - "tracing", ] [[package]] @@ -3673,9 +3769,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d" [[package]] name = "unsigned-varint" @@ -3696,9 +3792,9 @@ dependencies = [ [[package]] name = "url" -version = "2.5.0" +version = "2.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633" +checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c" dependencies = [ "form_urlencoded", "idna 0.5.0", @@ -3707,9 +3803,9 @@ dependencies = [ [[package]] name = "utf8parse" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "uuid" @@ -3740,9 +3836,9 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "walkdir" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b" dependencies = [ "same-file", "winapi-util", @@ -3771,9 +3867,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasm-bindgen" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e124130aee3fb58c5bdd6b639a0509486b0338acaaae0c84a5124b0f588b7f" +checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8" dependencies = [ "cfg-if 1.0.0", "wasm-bindgen-macro", @@ -3781,24 +3877,24 @@ dependencies = [ [[package]] name = "wasm-bindgen-backend" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9e7e1900c352b609c8488ad12639a311045f40a35491fb69ba8c12f758af70b" +checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da" dependencies = [ "bumpalo", "log", "once_cell", "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-futures" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "877b9c3f61ceea0e56331985743b13f3d25c406a7098d45180fb5f09bc19ed97" +checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0" dependencies = [ "cfg-if 1.0.0", "js-sys", @@ -3808,9 +3904,9 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b30af9e2d358182b5c7449424f017eba305ed32a7010509ede96cdc4696c46ed" +checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726" dependencies = [ "quote", "wasm-bindgen-macro-support", @@ -3818,28 +3914,28 @@ dependencies = [ [[package]] name = "wasm-bindgen-macro-support" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "642f325be6301eb8107a83d12a8ac6c1e1c54345a7ef1a9261962dfefda09e66" +checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.52", + "syn 2.0.72", "wasm-bindgen-backend", "wasm-bindgen-shared", ] [[package]] name = "wasm-bindgen-shared" -version = "0.2.91" +version = "0.2.92" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f186bd2dcf04330886ce82d6f33dd75a7bfcf69ecf5763b89fcde53b6ac9838" +checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96" [[package]] name = "web-sys" -version = "0.3.68" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96565907687f7aceb35bc5fc03770a8a0471d82e479f25832f54a0e3f4b28446" +checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef" dependencies = [ "js-sys", "wasm-bindgen", @@ -3875,11 +3971,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" +checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b" dependencies = [ - "winapi 0.3.9", + "windows-sys 0.52.0", ] [[package]] @@ -3890,12 +3986,12 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows" -version = "0.52.0" +version = "0.58.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" +checksum = "dd04d41d93c4992d421894c18c8b43496aa748dd4c081bac0dc93eb0489272b6" dependencies = [ - "windows-core", - "windows-targets 0.52.4", + "windows-core 0.58.0", + "windows-targets 0.52.6", ] [[package]] @@ -3904,7 +4000,61 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-core" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6ba6d44ec8c2591c134257ce647b7ea6b20335bf6379a27dac5f1641fcf59f99" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-result", + "windows-strings", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-implement" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-interface" +version = "0.58.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.72", +] + +[[package]] +name = "windows-result" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d1043d8214f791817bab27572aaa8af63732e11bf84aa21a45a78d6c317ae0e" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-strings" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4cd9b125c486025df0eabcb585e62173c6c9eddcec5d117d3b6e8c30e2ee4d10" +dependencies = [ + "windows-result", + "windows-targets 0.52.6", ] [[package]] @@ -3922,7 +4072,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.4", + "windows-targets 0.52.6", ] [[package]] @@ -3942,17 +4092,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd37b7e5ab9018759f893a1952c9420d060016fc19a472b4bb20d1bdd694d1b" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.4", - "windows_aarch64_msvc 0.52.4", - "windows_i686_gnu 0.52.4", - "windows_i686_msvc 0.52.4", - "windows_x86_64_gnu 0.52.4", - "windows_x86_64_gnullvm 0.52.4", - "windows_x86_64_msvc 0.52.4", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", ] [[package]] @@ -3963,9 +4114,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcf46cf4c365c6f2d1cc93ce535f2c8b244591df96ceee75d8e83deb70a9cac9" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -3975,9 +4126,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da9f259dd3bcf6990b55bffd094c4f7235817ba4ceebde8e6d11cd0c5633b675" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -3987,9 +4138,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b474d8268f99e0995f25b9f095bc7434632601028cf86590aea5c8a5cb7801d3" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -3999,9 +4156,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1515e9a29e5bed743cb4415a9ecf5dfca648ce85ee42e15873c3cd8610ff8e02" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -4011,9 +4168,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eee091590e89cc02ad514ffe3ead9eb6b660aedca2183455434b93546371a03" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -4023,9 +4180,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77ca79f2451b49fa9e2af39f0747fe999fcda4f5e241b2898624dca97a1f2177" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -4035,9 +4192,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.4" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winreg" @@ -4051,9 +4208,9 @@ dependencies = [ [[package]] name = "xxhash-rust" -version = "0.8.10" +version = "0.8.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927da81e25be1e1a2901d59b81b37dd2efd1fc9c9345a55007f09bf5a2d3ee03" +checksum = "63658493314859b4dfdf3fb8c1defd61587839def09582db50b8a4e93afca6bb" [[package]] name = "yaml-rust" diff --git a/Cargo.toml b/Cargo.toml index b0e1b12b..61174cd8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ckb-cli" -version = "1.10.0" +version = "1.11.0" license = "MIT" authors = [ "Linfeng Qian ", @@ -10,17 +10,17 @@ edition = "2021" description = "ckb command line interface" [dependencies] -ckb-jsonrpc-types = "=0.116.1" -ckb-hash = "=0.116.1" -ckb-crypto = { version = "=0.116.1", features = ["secp"] } -ckb-build-info = "=0.116.1" -ckb-types = "=0.116.1" -ckb-util = "=0.116.1" -ckb-error = "=0.116.1" -ckb-script = "=0.116.1" -ckb-chain-spec = "=0.116.1" -ckb-sdk = { version="3.2.1", features = ["native-tls-vendored"] } -ckb-mock-tx-types = { version = "=0.116.1" } +ckb-jsonrpc-types = "=0.117.0" +ckb-hash = "=0.117.0" +ckb-crypto = { version = "=0.117.0", features = ["secp"] } +ckb-build-info = "=0.117.0" +ckb-types = "=0.117.0" +ckb-util = "=0.117.0" +ckb-error = "=0.117.0" +ckb-script = "=0.117.0" +ckb-chain-spec = "=0.117.0" +ckb-sdk = { version = "3.3.0", features = ["native-tls-vendored"] } +ckb-mock-tx-types = "=0.117.0" ckb-signer = { path = "ckb-signer", version = "0.4.1" } plugin-protocol = { path = "plugin-protocol", package = "ckb-cli-plugin-protocol", version = "=1.3.1" } jsonrpc-core-client = "18" @@ -28,8 +28,8 @@ jsonrpc-core = "18" jsonrpc-derive = "18" jsonrpc-http-server = "18" jsonrpc-server-utils = "18" -secp256k1 = { version = "0.24", features = ["recovery"] } -bitcoin = "0.29" +secp256k1 = { version = "0.29.0", features = ["recovery"] } +bitcoin = "0.32" faster-hex = "0.6" env_logger = "0.6" crossbeam-channel = "0.5.8" @@ -76,7 +76,7 @@ termion = "1.5" rand = "0.7" [build-dependencies] -ckb-build-info = "=0.116.1" +ckb-build-info = "=0.117.0" [workspace] members = ["ckb-signer", "plugin-protocol"] diff --git a/ckb-signer/Cargo.toml b/ckb-signer/Cargo.toml index e087ec58..ee6354ea 100644 --- a/ckb-signer/Cargo.toml +++ b/ckb-signer/Cargo.toml @@ -11,20 +11,20 @@ repository = "https://github.com/nervosnetwork/ckb-cli" [dependencies] serde_json = "1.0" -secp256k1 = { version = "0.24", features = ["recovery"] } +secp256k1 = { version = "0.29.0", features = ["recovery"] } faster-hex = "0.6" aes-ctr = "0.6.0" scrypt = "0.2.0" rand = "0.7.3" tiny-keccak = "1.4" uuid = { version = "0.7.4", features = ["v4"] } -bitcoin = "0.29" +bitcoin = "0.32" chrono = "0.4" thiserror = "1.0.30" parking_lot = "0.11" anyhow = "1.0.63" -ckb-types = "=0.116.1" -ckb-hash = "=0.116.1" -ckb-crypto = { version = "=0.116.1", features = ["secp"] } -ckb-sdk = { version="3.2.1", features = ["native-tls-vendored"] } +ckb-types = "=0.117.0" +ckb-hash = "=0.117.0" +ckb-crypto = { version = "=0.117.0", features = ["secp"] } +ckb-sdk = { version = "3.3.0", features = ["native-tls-vendored"] } diff --git a/ckb-signer/src/keystore/mod.rs b/ckb-signer/src/keystore/mod.rs index 46f9f724..2174d8b8 100644 --- a/ckb-signer/src/keystore/mod.rs +++ b/ckb-signer/src/keystore/mod.rs @@ -14,19 +14,16 @@ use std::path::{Path, PathBuf}; use std::str::FromStr; use std::time::{Duration, Instant}; +use bitcoin::bip32::{ChainCode, ChildNumber, DerivationPath, Xpriv, Xpub}; use chrono::{Datelike, Timelike, Utc}; -use faster_hex::{hex_decode, hex_string}; -use rand::Rng; -use secp256k1::ecdsa::{RecoverableSignature, Signature}; -use uuid::Uuid; - -use bitcoin::util::bip32::{ - ChainCode, ChildNumber, DerivationPath, ExtendedPrivKey, ExtendedPubKey, -}; use ckb_crypto::secp::SECP256K1; use ckb_hash::blake2b_256; use ckb_sdk::util::{zeroize_privkey, zeroize_slice}; use ckb_types::{H160, H256}; +use faster_hex::{hex_decode, hex_string}; +use rand::Rng; +use secp256k1::ecdsa::{RecoverableSignature, Signature}; +use uuid::Uuid; pub use error::Error; pub use passphrase::{CipherParams, Crypto, KdfParams, ScryptParams, ScryptType}; @@ -264,7 +261,7 @@ impl KeyStore { let key = self.storage.get_key(hash160, filepath, password)?; Ok(key.master_privkey.sign_recoverable(message, path)) } - pub fn extended_pubkey

(&mut self, hash160: &H160, path: &P) -> Result + pub fn extended_pubkey

(&mut self, hash160: &H160, path: &P) -> Result where P: AsRef<[ChildNumber]>, { @@ -278,7 +275,7 @@ impl KeyStore { hash160: &H160, path: &P, password: &[u8], - ) -> Result + ) -> Result where P: AsRef<[ChildNumber]>, { @@ -555,7 +552,7 @@ impl DerivedKeySet { #[derive(Clone)] pub struct CkbRoot { pub path: &'static str, - extended_pubkey: ExtendedPubKey, + extended_pubkey: Xpub, } impl CkbRoot { @@ -599,13 +596,13 @@ impl CkbRoot { } let mut chain_code = [0u8; 32]; chain_code.copy_from_slice(&chain_code_bin[..]); - let extended_pubkey = ExtendedPubKey { - network: bitcoin::Network::Bitcoin, + let extended_pubkey = Xpub { + network: bitcoin::NetworkKind::Main, depth, parent_fingerprint, child_number, public_key, - chain_code: ChainCode::from(&chain_code[..]), + chain_code: ChainCode::from(&chain_code), }; // let pubkey @@ -673,7 +670,7 @@ impl CkbRoot { (path, hash160) } - pub fn derived_pubkey(&self, chain: KeyChain, index: u32) -> (DerivationPath, ExtendedPubKey) { + pub fn derived_pubkey(&self, chain: KeyChain, index: u32) -> (DerivationPath, Xpub) { let children = vec![ ChildNumber::from_normal_idx(chain as u32).expect("normal child"), ChildNumber::from_normal_idx(index).expect("normal child"), @@ -695,7 +692,7 @@ impl CkbRoot { chain: KeyChain, start: u32, length: u32, - ) -> Vec<(DerivationPath, ExtendedPubKey)> { + ) -> Vec<(DerivationPath, Xpub)> { // At least one pubkey (0..length) .map(|i| self.derived_pubkey(chain, i + start)) @@ -852,17 +849,17 @@ impl MasterPrivKey { bytes } - fn sub_privkey

(&self, path: &P) -> ExtendedPrivKey + fn sub_privkey

(&self, path: &P) -> Xpriv where P: AsRef<[ChildNumber]>, { - let sk = ExtendedPrivKey { - network: bitcoin::Network::Bitcoin, + let sk = Xpriv { + network: bitcoin::NetworkKind::Main, depth: 0, parent_fingerprint: Default::default(), child_number: ChildNumber::Normal { index: 0 }, private_key: self.secp_secret_key, - chain_code: ChainCode::from(&self.chain_code[..]), + chain_code: ChainCode::from(&self.chain_code), }; sk.derive_priv(&SECP256K1, path) .expect("Derive sub-privkey error") @@ -872,8 +869,8 @@ impl MasterPrivKey { where P: AsRef<[ChildNumber]>, { - let message = - secp256k1::Message::from_slice(message.as_bytes()).expect("Convert to message failed"); + let message = secp256k1::Message::from_digest_slice(message.as_bytes()) + .expect("Convert to message failed"); let sub_sk = self.sub_privkey(path); SECP256K1.sign_ecdsa(&message, &sub_sk.private_key) } @@ -882,18 +879,18 @@ impl MasterPrivKey { where P: AsRef<[ChildNumber]>, { - let message = - secp256k1::Message::from_slice(message.as_bytes()).expect("Convert to message failed"); + let message = secp256k1::Message::from_digest_slice(message.as_bytes()) + .expect("Convert to message failed"); let sub_sk = self.sub_privkey(path); SECP256K1.sign_ecdsa_recoverable(&message, &sub_sk.private_key) } - pub fn extended_pubkey

(&self, path: &P) -> ExtendedPubKey + pub fn extended_pubkey

(&self, path: &P) -> Xpub where P: AsRef<[ChildNumber]>, { let sub_sk = self.sub_privkey(path); - ExtendedPubKey::from_priv(&SECP256K1, &sub_sk) + Xpub::from_priv(&SECP256K1, &sub_sk) } pub fn ckb_root(&self) -> CkbRoot { diff --git a/ckb-signer/src/keystore/signer.rs b/ckb-signer/src/keystore/signer.rs index 9b10770f..c0b9aeb6 100644 --- a/ckb-signer/src/keystore/signer.rs +++ b/ckb-signer/src/keystore/signer.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use std::sync::Arc; use anyhow::anyhow; -use bitcoin::util::bip32::DerivationPath; +use bitcoin::bip32::DerivationPath; use parking_lot::Mutex; use ckb_sdk::traits::{Signer, SignerError}; diff --git a/plugin-protocol/Cargo.toml b/plugin-protocol/Cargo.toml index 8ac5d7d1..e310b8a5 100644 --- a/plugin-protocol/Cargo.toml +++ b/plugin-protocol/Cargo.toml @@ -9,8 +9,8 @@ description = "ckb-cli plugin protocol" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -ckb-types = "=0.116.1" -ckb-jsonrpc-types = "=0.116.1" +ckb-types = "=0.117.0" +ckb-jsonrpc-types = "=0.117.0" serde = { version = "1.0", features = ["derive"] } serde_derive = "1.0" serde_json = "1.0" diff --git a/src/plugin/builtin.rs b/src/plugin/builtin.rs index 6a4ec64a..52b4124d 100644 --- a/src/plugin/builtin.rs +++ b/src/plugin/builtin.rs @@ -2,7 +2,7 @@ use std::path::Path; use std::str::FromStr; use std::thread::{self, JoinHandle}; -use bitcoin::util::bip32::DerivationPath; +use bitcoin::bip32::DerivationPath; use crossbeam_channel::bounded; use ckb_sdk::util::serialize_signature; diff --git a/src/plugin/manager.rs b/src/plugin/manager.rs index 5b71f1dc..58032ce5 100644 --- a/src/plugin/manager.rs +++ b/src/plugin/manager.rs @@ -9,7 +9,7 @@ use std::sync::atomic::AtomicU64; use std::sync::Arc; use std::thread::{self, JoinHandle}; -use bitcoin::util::bip32::{ChildNumber, DerivationPath}; +use bitcoin::bip32::{ChildNumber, DerivationPath}; use crossbeam_channel::{bounded, select, Sender}; use ckb_jsonrpc_types::{BlockNumber, HeaderView, JsonBytes, Script}; diff --git a/src/subcommands/account.rs b/src/subcommands/account.rs index 7a4f6ce4..ace8e961 100644 --- a/src/subcommands/account.rs +++ b/src/subcommands/account.rs @@ -4,7 +4,7 @@ use std::io::Write; use std::os::unix::fs::OpenOptionsExt; use std::path::{Path, PathBuf}; -use bitcoin::util::bip32::DerivationPath; +use bitcoin::bip32::DerivationPath; use ckb_sdk::{Address, AddressPayload, NetworkType}; use ckb_signer::{Key, KeyStore, MasterPrivKey}; diff --git a/src/subcommands/util.rs b/src/subcommands/util.rs index 87c5b8df..a478a406 100644 --- a/src/subcommands/util.rs +++ b/src/subcommands/util.rs @@ -2,7 +2,7 @@ use std::fs; use std::io::Read; use std::path::PathBuf; -use bitcoin::util::bip32::{ChildNumber, DerivationPath}; +use bitcoin::bip32::{ChildNumber, DerivationPath}; use chrono::prelude::*; use clap::{App, Arg, ArgMatches}; use clap_generate::generators::{Bash, Elvish, Fish, PowerShell, Zsh}; @@ -559,7 +559,7 @@ message = "0x" } else { return Err(format!("Invalid signature length: {}", signature.len())); }; - let message = secp256k1::Message::from_slice(message.as_bytes()) + let message = secp256k1::Message::from_digest_slice(message.as_bytes()) .expect("Convert to message failed"); let verify_ok = SECP256K1 .verify_ecdsa(&message, &signature, &pubkey) @@ -683,7 +683,7 @@ message = "0x" let genesis_timestamp = NaiveDateTime::parse_from_str("2019-11-16 06:00:00", "%Y-%m-%d %H:%M:%S") - .map(|dt| dt.timestamp_millis() as u64) + .map(|dt| dt.and_utc().timestamp_millis() as u64) .unwrap(); let target_timestamp = to_timestamp(locktime)?; let elapsed = target_timestamp.saturating_sub(genesis_timestamp); @@ -694,8 +694,8 @@ message = "0x" if debug { eprintln!( "[DEBUG] genesis_time: {}, target_time: {}, elapsed_in_secs: {}, target_epoch: {}, lock_arg: {}, code_hash: {:#x}", - NaiveDateTime::from_timestamp_opt(genesis_timestamp as i64 / 1000, 0).expect("genesis time"), - NaiveDateTime::from_timestamp_opt(target_timestamp as i64 / 1000, 0).ok_or_else(|| "target timestamp out of range".to_string())?, + DateTime::from_timestamp(genesis_timestamp as i64 / 1000, 0).expect("genesis time"), + DateTime::from_timestamp(target_timestamp as i64 / 1000, 0).ok_or_else(|| "target timestamp out of range".to_string())?, elapsed / 1000, epoch_fraction, hex_string(multisig_addr.payload().args().as_ref()), @@ -876,14 +876,14 @@ fn sign_message>( ) -> Result, String> { match (from_privkey_opt, from_account_opt, recoverable) { (Some(privkey), _, false) => { - let message = secp256k1::Message::from_slice(message.as_bytes()).unwrap(); + let message = secp256k1::Message::from_digest_slice(message.as_bytes()).unwrap(); Ok(SECP256K1 .sign_ecdsa(&message, privkey) .serialize_compact() .to_vec()) } (Some(privkey), _, true) => { - let message = secp256k1::Message::from_slice(message.as_bytes()).unwrap(); + let message = secp256k1::Message::from_digest_slice(message.as_bytes()).unwrap(); Ok(serialize_signature(&SECP256K1.sign_ecdsa_recoverable(&message, privkey)).to_vec()) } (None, Some((plugin_mgr, account)), false) => plugin_mgr @@ -930,7 +930,7 @@ fn to_timestamp(input: &str) -> Result { let date = NaiveDate::parse_from_str(input, "%Y-%m-%d").map_err(|err| format!("{:?}", err))?; let date = NaiveDateTime::parse_from_str(&format!("{} 00:00:00", date), "%Y-%m-%d %H:%M:%S") .map_err(|err| format!("{:?}", err))?; - Ok(date.timestamp_millis() as u64) + Ok(date.and_utc().timestamp_millis() as u64) } #[cfg(test)] diff --git a/src/subcommands/wallet.rs b/src/subcommands/wallet.rs index 684d9113..358eab01 100644 --- a/src/subcommands/wallet.rs +++ b/src/subcommands/wallet.rs @@ -1,6 +1,6 @@ use std::{collections::HashMap, str::FromStr}; -use bitcoin::util::bip32::DerivationPath; +use bitcoin::bip32::DerivationPath; use clap::{App, Arg, ArgMatches}; use serde::{Deserialize, Serialize}; diff --git a/src/utils/mock_tx_helper.rs b/src/utils/mock_tx_helper.rs index d0afb9be..73f4de7c 100644 --- a/src/utils/mock_tx_helper.rs +++ b/src/utils/mock_tx_helper.rs @@ -454,7 +454,7 @@ mod test { if &lock_arg != target_lock_arg { return Err(String::from("lock arg not match")); } - let message = secp256k1::Message::from_slice(tx_hash_hash.as_bytes()) + let message = secp256k1::Message::from_digest_slice(tx_hash_hash.as_bytes()) .expect("Convert to secp256k1 message failed"); let signature = SECP256K1.sign_ecdsa_recoverable(&message, &privkey); let (recov_id, data) = signature.serialize_compact(); diff --git a/src/utils/other.rs b/src/utils/other.rs index 12e8ad9d..044da459 100644 --- a/src/utils/other.rs +++ b/src/utils/other.rs @@ -314,7 +314,7 @@ pub fn get_privkey_signer(privkey: PrivkeyWrapper) -> SignerFn { if message == &h256!("0x0") { Ok(Some([0u8; 65])) } else { - let message = secp256k1::Message::from_slice(message.as_bytes()) + let message = secp256k1::Message::from_digest_slice(message.as_bytes()) .expect("Convert to secp256k1 message failed"); let signature = SECP256K1.sign_ecdsa_recoverable(&message, &privkey); Ok(Some(serialize_signature(&signature))) diff --git a/src/utils/rpc/types.rs b/src/utils/rpc/types.rs index ecbd9c39..4ebd7f51 100644 --- a/src/utils/rpc/types.rs +++ b/src/utils/rpc/types.rs @@ -1530,6 +1530,18 @@ pub struct SyncState { pub orphan_blocks_count: Uint64, pub orphan_blocks_size: Uint64, pub inflight_blocks_count: Uint64, + /// Is ckb reached the assume_valid_target? If no assume_valid_target, this will be true. + pub assume_valid_target_reached: bool, + /// The assume_valid_target specified by ckb, if no assume_valid_target, this will be all zero. + pub assume_valid_target: Byte32, + /// Is ckb reached the min_chain_work? + pub min_chain_work_reached: bool, + /// This field acts as a security measure to ensure that a node only + /// synchronizes with other nodes that have a significant amount of + /// computational work invested in them, thereby preventing certain types + /// of attacks and ensuring network integrity. Only the mainnet uses a + /// hardcoded value for this field. + pub min_chain_work: Uint128, pub fast_time: Uint64, pub normal_time: Uint64, pub low_time: Uint64, @@ -1543,6 +1555,10 @@ impl From for SyncState { orphan_blocks_count: json.orphan_blocks_count.value(), orphan_blocks_size: json.orphan_blocks_size.value(), inflight_blocks_count: json.inflight_blocks_count.value(), + assume_valid_target_reached: json.assume_valid_target_reached, + assume_valid_target: json.assume_valid_target, + min_chain_work_reached: json.min_chain_work_reached, + min_chain_work: json.min_chain_work, fast_time: json.fast_time.value(), normal_time: json.normal_time.value(), low_time: json.low_time.value(), diff --git a/src/utils/signer.rs b/src/utils/signer.rs index deee3413..74d5e075 100644 --- a/src/utils/signer.rs +++ b/src/utils/signer.rs @@ -1,7 +1,7 @@ use std::collections::HashMap; use anyhow::anyhow; -use bitcoin::util::bip32::DerivationPath; +use bitcoin::bip32::DerivationPath; use ckb_hash::blake2b_256; use ckb_jsonrpc_types as json_types; @@ -42,7 +42,8 @@ impl Signer for PrivkeyWrapper { message.len() ))); } - let msg = secp256k1::Message::from_slice(message).expect("Convert to message failed"); + let msg = + secp256k1::Message::from_digest_slice(message).expect("Convert to message failed"); if recoverable { let sig = SECP256K1.sign_ecdsa_recoverable(&msg, &self.0); Ok(Bytes::from(serialize_signature(&sig).to_vec())) diff --git a/test/Cargo.toml b/test/Cargo.toml index db5f14c7..2dad4a0f 100644 --- a/test/Cargo.toml +++ b/test/Cargo.toml @@ -14,12 +14,12 @@ log = "0.4" env_logger = "0.6" toml = "0.5.0" serde_yaml = "0.8.9" -ckb-sdk = { version="3.2.1", features = ["native-tls-vendored"] } +ckb-sdk = { version = "3.3.0", features = ["native-tls-vendored"] } serde_json = "1.0" -ckb-types = "=0.116.1" -ckb-jsonrpc-types = "=0.116.1" +ckb-types = "=0.117.0" +ckb-jsonrpc-types = "=0.117.0" ckb-app-config = "=0.114.0" -ckb-chain-spec = "=0.116.1" +ckb-chain-spec = "=0.117.0" regex = "1.1.6" faster-hex = "0.6"