diff --git a/Cargo.lock b/Cargo.lock index 132d6bcbb6..81fef261df 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,19 +2,6 @@ # It is not intended for manual editing. version = 4 -[[package]] -name = "ahash" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011" -dependencies = [ - "cfg-if", - "getrandom 0.2.15", - "once_cell", - "version_check", - "zerocopy 0.7.34", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -631,7 +618,7 @@ dependencies = [ "page_size", "pkg-config", "smallvec", - "zerocopy 0.8.27", + "zerocopy", ] [[package]] @@ -790,7 +777,7 @@ checksum = "6ea2d84b969582b4b1864a92dc5d27cd2b77b622a8d79306834f1be5ba20d84b" dependencies = [ "cfg-if", "crunchy", - "zerocopy 0.8.27", + "zerocopy", ] [[package]] @@ -1072,7 +1059,6 @@ dependencies = [ name = "nomt" version = "1.0.3" dependencies = [ - "ahash", "anyhow", "bitvec", "blake3", @@ -1114,7 +1100,6 @@ dependencies = [ "blake3", "borsh", "digest", - "hex", "nomt-test-utils", "quickcheck", "ruint", @@ -2292,7 +2277,6 @@ name = "witness_verification" version = "0.1.0" dependencies = [ "anyhow", - "blake3", "commit-batch", "nomt-core", ] @@ -2306,33 +2290,13 @@ dependencies = [ "tap", ] -[[package]] -name = "zerocopy" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087" -dependencies = [ - "zerocopy-derive 0.7.34", -] - [[package]] name = "zerocopy" version = "0.8.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" dependencies = [ - "zerocopy-derive 0.8.27", -] - -[[package]] -name = "zerocopy-derive" -version = "0.7.34" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b" -dependencies = [ - "proc-macro2", - "quote", - "syn", + "zerocopy-derive", ] [[package]] diff --git a/benchtop/Cargo.lock b/benchtop/Cargo.lock index c2063b4224..9d192d4db2 100644 --- a/benchtop/Cargo.lock +++ b/benchtop/Cargo.lock @@ -85,16 +85,6 @@ version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f" -[[package]] -name = "alloy-rlp" -version = "0.3.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d58d9f5da7b40e9bfff0b7e7816700be4019db97d4b6359fe7f94a9e22e42ac" -dependencies = [ - "arrayvec", - "bytes", -] - [[package]] name = "android-tzdata" version = "0.1.1" @@ -180,8 +170,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f" dependencies = [ "ark-ec", - "ark-ff 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-std", ] [[package]] @@ -191,9 +181,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488" dependencies = [ "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-serialize", + "ark-std", ] [[package]] @@ -202,10 +192,10 @@ version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba" dependencies = [ - "ark-ff 0.4.2", + "ark-ff", "ark-poly", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", "itertools 0.10.5", @@ -213,74 +203,26 @@ dependencies = [ "zeroize", ] -[[package]] -name = "ark-ff" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3235cc41ee7a12aaaf2c575a2ad7b46713a8a50bda2fc3b003a04845c05dd6" -dependencies = [ - "ark-ff-asm 0.3.0", - "ark-ff-macros 0.3.0", - "ark-serialize 0.3.0", - "ark-std 0.3.0", - "derivative", - "num-bigint", - "num-traits", - "paste", - "rustc_version 0.3.3", - "zeroize", -] - [[package]] name = "ark-ff" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec847af850f44ad29048935519032c33da8aa03340876d351dfab5660d2966ba" dependencies = [ - "ark-ff-asm 0.4.2", - "ark-ff-macros 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff-asm", + "ark-ff-macros", + "ark-serialize", + "ark-std", "derivative", "digest 0.10.7", "itertools 0.10.5", "num-bigint", "num-traits", "paste", - "rustc_version 0.4.0", - "zeroize", -] - -[[package]] -name = "ark-ff" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a177aba0ed1e0fbb62aa9f6d0502e9b46dad8c2eab04c14258a1212d2557ea70" -dependencies = [ - "ark-ff-asm 0.5.0", - "ark-ff-macros 0.5.0", - "ark-serialize 0.5.0", - "ark-std 0.5.0", - "arrayvec", - "digest 0.10.7", - "educe", - "itertools 0.13.0", - "num-bigint", - "num-traits", - "paste", + "rustc_version", "zeroize", ] -[[package]] -name = "ark-ff-asm" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db02d390bf6643fb404d3d22d31aee1c4bc4459600aef9113833d17e786c6e44" -dependencies = [ - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-ff-asm" version = "0.4.2" @@ -291,28 +233,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-asm" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62945a2f7e6de02a31fe400aa489f0e0f5b2502e69f95f853adb82a96c7a6b60" -dependencies = [ - "quote", - "syn 2.0.117", -] - -[[package]] -name = "ark-ff-macros" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db2fd794a08ccb318058009eefdf15bcaaaaf6f8161eb3345f907222bac38b20" -dependencies = [ - "num-bigint", - "num-traits", - "quote", - "syn 1.0.109", -] - [[package]] name = "ark-ff-macros" version = "0.4.2" @@ -326,42 +246,19 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-ff-macros" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09be120733ee33f7693ceaa202ca41accd5653b779563608f1234f78ae07c4b3" -dependencies = [ - "num-bigint", - "num-traits", - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "ark-poly" version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf" dependencies = [ - "ark-ff 0.4.2", - "ark-serialize 0.4.2", - "ark-std 0.4.0", + "ark-ff", + "ark-serialize", + "ark-std", "derivative", "hashbrown 0.13.2", ] -[[package]] -name = "ark-serialize" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d6c2b318ee6e10f8c2853e73a83adc0ccb88995aa978d8a3408d492ab2ee671" -dependencies = [ - "ark-std 0.3.0", - "digest 0.9.0", -] - [[package]] name = "ark-serialize" version = "0.4.2" @@ -369,19 +266,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5" dependencies = [ "ark-serialize-derive", - "ark-std 0.4.0", - "digest 0.10.7", - "num-bigint", -] - -[[package]] -name = "ark-serialize" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7" -dependencies = [ - "ark-std 0.5.0", - "arrayvec", + "ark-std", "digest 0.10.7", "num-bigint", ] @@ -397,16 +282,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "ark-std" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1df2c09229cbc5a028b1d70e00fdb2acee28b1055dfb5ca73eea49c5a25c4e7c" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "ark-std" version = "0.4.0" @@ -417,16 +292,6 @@ dependencies = [ "rand 0.8.5", ] -[[package]] -name = "ark-std" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246a225cc6131e9ee4f24619af0f19d67761fff15d7ccc22e42b80846e69449a" -dependencies = [ - "num-traits", - "rand 0.8.5", -] - [[package]] name = "array-bytes" version = "6.2.2" @@ -456,17 +321,6 @@ dependencies = [ "syn 2.0.117", ] -[[package]] -name = "auto_impl" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "autocfg" version = "1.2.0" @@ -543,12 +397,11 @@ dependencies = [ "kvdb", "kvdb-rocksdb", "libc", - "lru 0.12.5", + "lru", "nomt", - "rand 0.8.5", + "rand 0.10.1", "rand_distr", "rayon", - "ruint", "serde", "sha2 0.10.8", "sov-db", @@ -557,7 +410,6 @@ dependencies = [ "sp-core 31.0.0", "sp-state-machine", "sp-trie 32.0.0", - "toml 0.8.12", "trie-db", ] @@ -1165,7 +1017,7 @@ dependencies = [ "digest 0.10.7", "fiat-crypto", "platforms", - "rustc_version 0.4.0", + "rustc_version", "subtle", "zeroize", ] @@ -1224,7 +1076,7 @@ dependencies = [ "convert_case", "proc-macro2", "quote", - "rustc_version 0.4.0", + "rustc_version", "syn 1.0.109", ] @@ -1305,18 +1157,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "educe" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7bc049e1bd8cdeb31b68bbd586a9464ecf9f3944af3958a7a9d0f8b9799417" -dependencies = [ - "enum-ordinalize", - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "either" version = "1.11.0" @@ -1343,26 +1183,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "enum-ordinalize" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a1091a7bb1f8f2c4b28f1fe2cef4980ca2d410a3d727d67ecc3178c9b0800f0" -dependencies = [ - "enum-ordinalize-derive", -] - -[[package]] -name = "enum-ordinalize-derive" -version = "4.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ca9601fb2d62598ee17836250842873a413586e5d7ed88b356e38ddbb0ec631" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.117", -] - [[package]] name = "environmental" version = "1.1.4" @@ -1411,28 +1231,6 @@ version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984" -[[package]] -name = "fastrlp" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139834ddba373bbdd213dffe02c8d110508dcf1726c2be27e8d1f7d7e1856418" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] - -[[package]] -name = "fastrlp" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce8dba4714ef14b8274c371879b175aa55b16b30f269663f19d576f380018dc4" -dependencies = [ - "arrayvec", - "auto_impl", - "bytes", -] - [[package]] name = "ff" version = "0.13.0" @@ -1763,8 +1561,6 @@ version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "allocator-api2", - "equivalent", "foldhash 0.1.3", ] @@ -2026,15 +1822,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.11" @@ -2283,15 +2070,6 @@ dependencies = [ "tracing-subscriber 0.3.18", ] -[[package]] -name = "lru" -version = "0.12.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "234cf4f4a04dc1f57e24b96cc0cd600cf2af460d4161ac5ecdd0af8e1f3b2a38" -dependencies = [ - "hashbrown 0.15.5", -] - [[package]] name = "lru" version = "0.18.0" @@ -2435,7 +2213,6 @@ dependencies = [ name = "nomt" version = "1.0.3" dependencies = [ - "ahash 0.8.11", "anyhow", "bitvec", "cfg-if", @@ -2447,7 +2224,7 @@ dependencies = [ "io-uring", "libc", "loom", - "lru 0.18.0", + "lru", "nomt-core", "parking_lot", "rand 0.10.1", @@ -2466,7 +2243,6 @@ dependencies = [ "blake3", "borsh 1.5.7", "digest 0.10.7", - "hex", "ruint", "serde", "sha2 0.10.8", @@ -2693,17 +2469,6 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" -[[package]] -name = "pest" -version = "2.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95" -dependencies = [ - "memchr", - "thiserror", - "ucd-trie", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -2820,7 +2585,7 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d6ea3c4595b96363c13943497db34af4460fb474a95c43f4446ad341b8c9785" dependencies = [ - "toml 0.5.11", + "toml", ] [[package]] @@ -3042,12 +2807,12 @@ checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_distr" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31" +checksum = "4d431c2703ccf129de4d45253c03f49ebb22b97d6ad79ee3ecfc7e3f4862c1d8" dependencies = [ "num-traits", - "rand 0.8.5", + "rand 0.10.1", ] [[package]] @@ -3180,16 +2945,6 @@ dependencies = [ "digest 0.10.7", ] -[[package]] -name = "rlp" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb919243f34364b6bd2fc10ef797edbfa75f33c252e7998527479c6d6b47e1ec" -dependencies = [ - "bytes", - "rustc-hex", -] - [[package]] name = "rocksdb" version = "0.21.0" @@ -3206,26 +2961,7 @@ version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0298da754d1395046b0afdc2f20ee76d29a8ae310cd30ffa84ed42acba9cb12a" dependencies = [ - "alloy-rlp", - "ark-ff 0.3.0", - "ark-ff 0.4.2", - "ark-ff 0.5.0", - "bytes", - "fastrlp 0.3.1", - "fastrlp 0.4.0", - "num-bigint", - "num-integer", - "num-traits", - "parity-scale-codec", - "primitive-types", - "proptest", - "rand 0.8.5", - "rand 0.9.4", - "rlp", "ruint-macro", - "serde_core", - "valuable", - "zeroize", ] [[package]] @@ -3252,22 +2988,13 @@ version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3e75f6a532d0fd9f7f13144f392b6ad56a32696bfcd9c78f797f16bbb6f072d6" -[[package]] -name = "rustc_version" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0dfe2087c51c460008730de8b57e6a320782fbfb312e1f4d520e6c6fae155ee" -dependencies = [ - "semver 0.11.0", -] - [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver 1.0.22", + "semver", ] [[package]] @@ -3455,30 +3182,12 @@ dependencies = [ "zeroize", ] -[[package]] -name = "semver" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6" -dependencies = [ - "semver-parser", -] - [[package]] name = "semver" version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca" -[[package]] -name = "semver-parser" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00b0bef5b7f9e0df16536d3961cfb6e84331c065b4066afb39768d0e319411f7" -dependencies = [ - "pest", -] - [[package]] name = "serde" version = "1.0.228" @@ -3540,15 +3249,6 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_spanned" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" -dependencies = [ - "serde", -] - [[package]] name = "serdect" version = "0.2.0" @@ -4343,26 +4043,11 @@ dependencies = [ "serde", ] -[[package]] -name = "toml" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" -dependencies = [ - "serde", - "serde_spanned", - "toml_datetime", - "toml_edit 0.22.12", -] - [[package]] name = "toml_datetime" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" -dependencies = [ - "serde", -] [[package]] name = "toml_edit" @@ -4372,7 +4057,7 @@ checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" dependencies = [ "indexmap 2.14.0", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] @@ -4383,7 +4068,7 @@ checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81" dependencies = [ "indexmap 2.14.0", "toml_datetime", - "winnow 0.5.40", + "winnow", ] [[package]] @@ -4394,20 +4079,7 @@ checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1" dependencies = [ "indexmap 2.14.0", "toml_datetime", - "winnow 0.5.40", -] - -[[package]] -name = "toml_edit" -version = "0.22.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef" -dependencies = [ - "indexmap 2.14.0", - "serde", - "serde_spanned", - "toml_datetime", - "winnow 0.6.7", + "winnow", ] [[package]] @@ -4560,12 +4232,6 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" -[[package]] -name = "ucd-trie" -version = "0.1.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9" - [[package]] name = "uint" version = "0.9.5" @@ -4655,8 +4321,8 @@ dependencies = [ "ark-bls12-377", "ark-bls12-381", "ark-ec", - "ark-ff 0.4.2", - "ark-serialize 0.4.2", + "ark-ff", + "ark-serialize", "ark-serialize-derive", "arrayref", "constcat", @@ -4798,7 +4464,7 @@ dependencies = [ "bitflags 2.11.1", "hashbrown 0.15.5", "indexmap 2.14.0", - "semver 1.0.22", + "semver", ] [[package]] @@ -5207,15 +4873,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.6.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14b9415ee827af173ebb3f15f9083df5a122eb93572ec28741fb153356ea2578" -dependencies = [ - "memchr", -] - [[package]] name = "wit-bindgen" version = "0.51.0" @@ -5302,7 +4959,7 @@ dependencies = [ "id-arena", "indexmap 2.14.0", "log", - "semver 1.0.22", + "semver", "serde", "serde_derive", "serde_json", diff --git a/benchtop/Cargo.toml b/benchtop/Cargo.toml index 5fba5a7047..b2f88619fc 100644 --- a/benchtop/Cargo.toml +++ b/benchtop/Cargo.toml @@ -11,18 +11,16 @@ license = "MIT/Apache-2.0" # benchmarking clap = { version = "4.4.8", features = ["derive"] } -anyhow = { version = "1.0.75" } +anyhow = { version = "1.0.102" } hdrhistogram = "7.5.4" fxhash = "0.2.1" -rand = "0.8.5" -rand_distr = "0.4.3" +rand = "0.10.1" +rand_distr = "0.6.0" sha2 = { version = "0.10.6" } -ruint = { version = "1.12.1" } -toml = "0.8.12" serde = "1.0.199" humantime = "2.1.0" rayon = "1.10" -lru = "0.12.5" +lru = "0.18.0" libc = "0.2.155" # sov-db diff --git a/benchtop/src/custom_workload.rs b/benchtop/src/custom_workload.rs index 22acf2bd04..90341edcb8 100644 --- a/benchtop/src/custom_workload.rs +++ b/benchtop/src/custom_workload.rs @@ -109,7 +109,7 @@ impl Workload for RwWorkload { let n_reads_fresh = fresh(n_reads); let n_writes_fresh = fresh(n_writes); - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for i in 0..n_reads { let _ = if i < n_reads_fresh { @@ -147,6 +147,6 @@ impl Workload for RwWorkload { fn rand_key(rng: &mut impl Rng) -> [u8; 32] { // keys must be uniformly distributed let mut key = [0; 32]; - rng.fill(&mut key[..16]); + rng.fill_bytes(&mut key[..16]); key } diff --git a/benchtop/src/transfer_workload.rs b/benchtop/src/transfer_workload.rs index 00ff5ee5e6..1f8639eed5 100644 --- a/benchtop/src/transfer_workload.rs +++ b/benchtop/src/transfer_workload.rs @@ -3,7 +3,7 @@ use crate::{ cli::StateItemDistribution, workload::{Distribution, Workload}, }; -use rand::Rng; +use rand::RngExt; #[derive(Clone)] pub struct TransferInit { @@ -113,7 +113,7 @@ impl Workload for TransferWorkload { (self.workload_size as f64 * (self.percentage_cold_transfer as f64 / 100.0)) as u64; let warm_sends = self.workload_size - cold_sends; - let mut rng = rand::thread_rng(); + let mut rng = rand::rng(); for i in 0..self.workload_size { let send_account = self.distribution.sample(&mut rng); let recv_account = if i < warm_sends { @@ -125,7 +125,7 @@ impl Workload for TransferWorkload { } else { // odds of two threads generating the same random account here are // incredibly low. - rng.gen_range(self.num_accounts..u64::max_value()) + rng.random_range(self.num_accounts..u64::max_value()) }; let send_balance = decode_balance( diff --git a/benchtop/src/workload.rs b/benchtop/src/workload.rs index c1285455b4..f5a10fe34d 100644 --- a/benchtop/src/workload.rs +++ b/benchtop/src/workload.rs @@ -15,7 +15,7 @@ use crate::{ }; use anyhow::Result; use lru::LruCache; -use rand::{distributions::Distribution as _, Rng}; +use rand::{distr::Distribution as _, Rng}; /// An interface for generating new sets of actions. pub trait Workload: Send { @@ -188,7 +188,7 @@ impl<'a> Transaction for LruCacheTransaction<'a> { } pub enum Distribution { - Uniform(rand::distributions::Uniform), + Uniform(rand::distr::Uniform), Pareto(rand_distr::Pareto, u64, u64), } @@ -196,7 +196,7 @@ impl Distribution { pub fn new(param: StateItemDistribution, low: u64, high: u64) -> Self { match param { StateItemDistribution::Uniform => { - Distribution::Uniform(rand::distributions::Uniform::new(low, high)) + Distribution::Uniform(rand::distr::Uniform::new(low, high).unwrap()) } StateItemDistribution::Pareto => Distribution::Pareto( // shape of log_4(5) = 1.16 gives an 80/20 relationship diff --git a/core/Cargo.toml b/core/Cargo.toml index 768aef324b..bdd848feb4 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -12,7 +12,6 @@ license.workspace = true [dependencies] bitvec.workspace = true -hex.workspace = true ruint.workspace = true arrayvec.workspace = true borsh = { workspace = true, optional = true } diff --git a/examples/witness_verification/Cargo.toml b/examples/witness_verification/Cargo.toml index e916365611..dfc62810db 100644 --- a/examples/witness_verification/Cargo.toml +++ b/examples/witness_verification/Cargo.toml @@ -13,4 +13,3 @@ license.workspace = true nomt-core = { path = "../../core" } commit-batch = { path = "../commit_batch" } anyhow = "1.0.81" -blake3 = "1.5.1" diff --git a/nomt/Cargo.toml b/nomt/Cargo.toml index 4d057b046a..b697394ff7 100644 --- a/nomt/Cargo.toml +++ b/nomt/Cargo.toml @@ -23,7 +23,6 @@ crossbeam.workspace = true crossbeam-channel.workspace = true slab.workspace = true rand.workspace = true -ahash.workspace = true imbl.workspace = true lru.workspace = true libc.workspace = true