From da0e2c7031b13c139bbae43b6ac545b0252042c8 Mon Sep 17 00:00:00 2001 From: bruno-valante <140794260+bruno-valante@users.noreply.github.com> Date: Sat, 14 Sep 2024 18:19:16 +0800 Subject: [PATCH] Fix issues found in auditions (#203) --- Cargo.lock | 223 ++++++++++++++++----------------- node/Cargo.toml | 2 +- node/log_entry_sync/Cargo.toml | 2 +- node/miner/src/mine.rs | 2 +- node/miner/src/pora.rs | 6 +- node/miner/src/recall_range.rs | 7 +- node/miner/src/submitter.rs | 12 +- node/miner/src/watcher.rs | 2 - node/network/Cargo.toml | 3 +- node/network/src/lib.rs | 2 - node/storage/Cargo.toml | 1 - 11 files changed, 123 insertions(+), 139 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9dca6e3..1eea34c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -601,6 +601,9 @@ name = "bitflags" version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" +dependencies = [ + "serde", +] [[package]] name = "bitmaps" @@ -690,9 +693,9 @@ dependencies = [ [[package]] name = "bstr" -version = "1.9.1" +version = "1.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706" +checksum = "40723b8fb387abc38f4f4a37c09073622e41dd12327033091ef8950659e6dc0c" dependencies = [ "memchr", "serde", @@ -718,9 +721,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" -version = "1.6.0" +version = "1.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9" +checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" dependencies = [ "serde", ] @@ -859,7 +862,7 @@ dependencies = [ "js-sys", "num-traits", "wasm-bindgen", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -1032,11 +1035,12 @@ dependencies = [ [[package]] name = "config" -version = "0.13.4" +version = "0.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23738e11972c7643e4ec947840fc463b6a571afcd3e735bdfce7d03c7a784aca" +checksum = "7328b20597b53c2454f0b1919720c25c7339051c02b72b7e05409e00b14132be" dependencies = [ "async-trait", + "convert_case", "json5", "lazy_static", "nom", @@ -1045,7 +1049,7 @@ dependencies = [ "rust-ini", "serde", "serde_json", - "toml 0.5.11", + "toml 0.8.14", "yaml-rust", ] @@ -1068,6 +1072,26 @@ version = "0.9.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2459377285ad874054d797f3ccebf984978aa39129f6eafde5cdc8315b612f8" +[[package]] +name = "const-random" +version = "0.1.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87e00182fe74b066627d63b85fd550ac2998d4b0bd86bfed477a0ae4c7c71359" +dependencies = [ + "const-random-macro", +] + +[[package]] +name = "const-random-macro" +version = "0.1.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" +dependencies = [ + "getrandom 0.2.15", + "once_cell", + "tiny-keccak", +] + [[package]] name = "constant_time_eq" version = "0.1.5" @@ -1082,6 +1106,15 @@ dependencies = [ "serde_json", ] +[[package]] +name = "convert_case" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ec182b0ca2f35d8fc196cf3404988fd8b8c739a4d270ff118a398feb0cbec1ca" +dependencies = [ + "unicode-segmentation", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -1611,9 +1644,12 @@ dependencies = [ [[package]] name = "dlv-list" -version = "0.3.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257" +checksum = "442039f5147480ba31067cb00ada1adae6892028e40e45fc5de7b7df6dcc1b5f" +dependencies = [ + "const-random", +] [[package]] name = "dns-lookup" @@ -2466,12 +2502,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "fuchsia-cprng" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" - [[package]] name = "funty" version = "1.1.0" @@ -2729,9 +2759,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "globset" -version = "0.4.14" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1" +checksum = "15f1ce686646e7f1e19bf7d5533fe443a45dbfb990e00629110797578b42fb19" dependencies = [ "aho-corasick", "bstr", @@ -2854,6 +2884,12 @@ dependencies = [ "ahash 0.7.8", ] +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" + [[package]] name = "hashbrown" version = "0.14.5" @@ -3767,7 +3803,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d" dependencies = [ "cfg-if", - "windows-targets 0.52.5", + "windows-targets 0.48.5", ] [[package]] @@ -4929,7 +4965,6 @@ dependencies = [ "lighthouse_metrics", "lru", "parking_lot 0.12.3", - "prometheus-client", "rand 0.8.5", "regex", "serde", @@ -5197,12 +5232,12 @@ dependencies = [ [[package]] name = "ordered-multimap" -version = "0.4.3" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccd746e37177e1711c20dd619a1620f34f5c8b569c53590a72dedd5344d8924a" +checksum = "4ed8acf08e98e744e5384c8bc63ceb0364e68a6854187221c18df61c4797690e" dependencies = [ "dlv-list", - "hashbrown 0.12.3", + "hashbrown 0.13.2", ] [[package]] @@ -5335,7 +5370,7 @@ dependencies = [ "libc", "redox_syscall 0.5.2", "smallvec", - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -6100,19 +6135,6 @@ dependencies = [ "nibble_vec", ] -[[package]] -name = "rand" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" -dependencies = [ - "fuchsia-cprng", - "libc", - "rand_core 0.3.1", - "rdrand", - "winapi", -] - [[package]] name = "rand" version = "0.7.3" @@ -6157,21 +6179,6 @@ dependencies = [ "rand_core 0.6.4", ] -[[package]] -name = "rand_core" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -dependencies = [ - "rand_core 0.4.2", -] - -[[package]] -name = "rand_core" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" - [[package]] name = "rand_core" version = "0.5.1" @@ -6228,15 +6235,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "rdrand" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -dependencies = [ - "rand_core 0.3.1", -] - [[package]] name = "redox_syscall" version = "0.2.16" @@ -6310,15 +6308,6 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" -[[package]] -name = "remove_dir_all" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" -dependencies = [ - "winapi", -] - [[package]] name = "reqwest" version = "0.11.27" @@ -6467,13 +6456,14 @@ dependencies = [ [[package]] name = "ron" -version = "0.7.1" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" dependencies = [ - "base64 0.13.1", - "bitflags 1.3.2", + "base64 0.21.7", + "bitflags 2.6.0", "serde", + "serde_derive", ] [[package]] @@ -6548,9 +6538,9 @@ dependencies = [ [[package]] name = "rust-ini" -version = "0.18.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6d5f2436026b4f6e79dc829837d467cc7e9a55ee40e750d716713540715a2df" +checksum = "7e2a3bcec1f113553ef1c88aae6c020a369d03d55b58de9869a0908930385091" dependencies = [ "cfg-if", "ordered-multimap", @@ -7241,7 +7231,6 @@ dependencies = [ "serde_json", "shared_types", "static_assertions", - "tempdir", "tiny-keccak", "tracing", "typenum", @@ -7468,26 +7457,17 @@ dependencies = [ "tracing", ] -[[package]] -name = "tempdir" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15f2b5fb00ccdf689e0149d1b1b3c03fead81c2b37735d812fa8bddbbf41b6d8" -dependencies = [ - "rand 0.4.6", - "remove_dir_all", -] - [[package]] name = "tempfile" -version = "3.10.1" +version = "3.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1" +checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" dependencies = [ "cfg-if", "fastrand 2.1.0", + "once_cell", "rustix 0.38.34", - "windows-sys 0.52.0", + "windows-sys 0.59.0", ] [[package]] @@ -8508,7 +8488,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", ] [[package]] @@ -8526,7 +8506,16 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.5", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", ] [[package]] @@ -8546,18 +8535,18 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.5", - "windows_aarch64_msvc 0.52.5", - "windows_i686_gnu 0.52.5", + "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.5", - "windows_x86_64_gnu 0.52.5", - "windows_x86_64_gnullvm 0.52.5", - "windows_x86_64_msvc 0.52.5", + "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]] @@ -8568,9 +8557,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" [[package]] name = "windows_aarch64_msvc" @@ -8586,9 +8575,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" [[package]] name = "windows_i686_gnu" @@ -8604,15 +8593,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" [[package]] name = "windows_i686_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" [[package]] name = "windows_i686_msvc" @@ -8628,9 +8617,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" [[package]] name = "windows_x86_64_gnu" @@ -8646,9 +8635,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" [[package]] name = "windows_x86_64_gnullvm" @@ -8658,9 +8647,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" [[package]] name = "windows_x86_64_msvc" @@ -8676,9 +8665,9 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.5" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" diff --git a/node/Cargo.toml b/node/Cargo.toml index db8b181..b0b5f18 100644 --- a/node/Cargo.toml +++ b/node/Cargo.toml @@ -35,7 +35,7 @@ chunk_pool = { path = "./chunk_pool" } itertools = "0.10.5" serde = { version = "1.0.137", features = ["derive"] } duration-str = "0.5.1" -config = "0.13.1" +config = "0.14" public-ip = "0.2" ethers = "2.0.14" metrics = { workspace = true } diff --git a/node/log_entry_sync/Cargo.toml b/node/log_entry_sync/Cargo.toml index 72651f8..c947194 100644 --- a/node/log_entry_sync/Cargo.toml +++ b/node/log_entry_sync/Cargo.toml @@ -11,7 +11,7 @@ append_merkle = { path = "../../common/append_merkle" } async-trait = "0.1.56" ethereum-types = "0.14" futures = "0.3.21" -jsonrpsee = { version = "0.14.0", features = ["full"] } +jsonrpsee = { version = "0.14", features = ["full"] } shared_types = { path = "../shared_types" } task_executor = { path = "../../common/task_executor" } tokio = "1.19.2" diff --git a/node/miner/src/mine.rs b/node/miner/src/mine.rs index 66da9a8..397a143 100644 --- a/node/miner/src/mine.rs +++ b/node/miner/src/mine.rs @@ -98,7 +98,7 @@ impl MineRangeConfig { let self_start_position = self.start_position?; let self_end_position = self.end_position?; - if self.start_position >= self.end_position { + if self_start_position >= self_end_position { return Some(false); } Some( diff --git a/node/miner/src/pora.rs b/node/miner/src/pora.rs index deef5c3..164d1b5 100644 --- a/node/miner/src/pora.rs +++ b/node/miner/src/pora.rs @@ -93,7 +93,7 @@ impl<'a> Miner<'a> { .enumerate() .zip(scratch_pad.iter().cycle()) .zip(availabilities.into_iter()) - .filter_map(|(data, avaliable)| avaliable.then_some(data)) + .filter_map(|(data, availiable)| availiable.then_some(data)) { inc_counter(&PAD_MIX_COUNT); // Rust can optimize this loop well. @@ -114,7 +114,7 @@ impl<'a> Miner<'a> { difficulty_scale_x64.as_u128() as f64 / u64::MAX as f64 ); inc_counter(&HIT_COUNT); - // Undo mix data when find a valid solition + // Undo mix data when find a valid solution for (x, y) in sealed_data.iter_mut().zip(scratch_pad.iter()) { *x ^= y; } @@ -171,7 +171,7 @@ impl<'a> Miner<'a> { ) -> U256 { let mut hasher = Blake2b512::new(); hasher.update([0u8; 24]); - hasher.update(seal_index.to_be_bytes()); + hasher.update((seal_index as u64).to_be_bytes()); hasher.update(pad_seed); hasher.update([0u8; 32]); diff --git a/node/miner/src/recall_range.rs b/node/miner/src/recall_range.rs index 56275a2..eaf0d1d 100644 --- a/node/miner/src/recall_range.rs +++ b/node/miner/src/recall_range.rs @@ -31,12 +31,13 @@ impl RecallRange { } pub fn load_position(&self, seed: [u8; 32]) -> Option { - let (_, origin_recall_offset) = U256::from_big_endian(&seed) - .div_mod(U256::from((self.mining_length as usize) / SECTORS_PER_LOAD)); + let origin_recall_offset = U256::from_big_endian(&seed) + .checked_rem(U256::from((self.mining_length as usize) / SECTORS_PER_LOAD))?; let origin_recall_offset = origin_recall_offset.as_u64(); let recall_offset = (origin_recall_offset & self.shard_mask) | self.shard_id; - Some(self.start_position + recall_offset * SECTORS_PER_LOAD as u64) + self.start_position + .checked_add(recall_offset * SECTORS_PER_LOAD as u64) } pub fn difficulty_scale_x64(&self, flow_length: u64) -> U256 { diff --git a/node/miner/src/submitter.rs b/node/miner/src/submitter.rs index d569a4a..014f42e 100644 --- a/node/miner/src/submitter.rs +++ b/node/miner/src/submitter.rs @@ -18,7 +18,7 @@ use crate::watcher::MineContextMessage; use zgs_spec::{BYTES_PER_SEAL, SECTORS_PER_SEAL}; -const SUBMISSION_RETIES: usize = 15; +const SUBMISSION_RETRIES: usize = 15; pub struct Submitter { mine_answer_receiver: mpsc::UnboundedReceiver, @@ -154,7 +154,7 @@ impl Submitter { let pending_transaction: PendingTransaction<'_, _> = submission_call .send() .await - .map_err(|e| format!("Fail to send mine answer transaction: {:?}", e))?; + .map_err(|e| format!("Fail to send PoRA submission transaction: {:?}", e))?; debug!( "Signed submission transaction hash: {:?}", @@ -162,13 +162,13 @@ impl Submitter { ); let receipt = pending_transaction - .retries(SUBMISSION_RETIES) + .retries(SUBMISSION_RETRIES) .interval(Duration::from_secs(2)) .await - .map_err(|e| format!("Fail to execute mine answer transaction: {:?}", e))? + .map_err(|e| format!("Fail to execute PoRA submission transaction: {:?}", e))? .ok_or(format!( - "Mine answer transaction dropped after {} retries", - SUBMISSION_RETIES + "PoRA submission transaction dropped after {} retries", + SUBMISSION_RETRIES ))?; info!("Submit PoRA success, receipt: {:?}", receipt); diff --git a/node/miner/src/watcher.rs b/node/miner/src/watcher.rs index 8f9ce90..c4db8cb 100644 --- a/node/miner/src/watcher.rs +++ b/node/miner/src/watcher.rs @@ -47,8 +47,6 @@ impl MineContextWatcher { provider: Arc, config: &MinerConfig, ) -> broadcast::Receiver { - let provider = provider; - let mine_contract = PoraMine::new(config.mine_address, provider.clone()); let flow_contract = ZgsFlow::new(config.flow_address, provider.clone()); diff --git a/node/network/Cargo.toml b/node/network/Cargo.toml index 08a8947..cc0e928 100644 --- a/node/network/Cargo.toml +++ b/node/network/Cargo.toml @@ -21,7 +21,6 @@ lazy_static = "1.4.0" lighthouse_metrics = { path = "../../common/lighthouse_metrics" } lru = "0.7.7" parking_lot = "0.12.1" -prometheus-client = "0.16.0" rand = "0.8.5" regex = "1.5.6" serde = { version = "1.0.137", features = ["derive"] } @@ -49,7 +48,7 @@ features = ["websocket", "identify", "mplex", "yamux", "noise", "gossipsub", "dn [dev-dependencies] exit-future = "0.2.0" -tempfile = "3.3.0" +tempfile = "3.12.0" tracing-test = "0.2.2" unused_port = { path = "../../common/unused_port" } void = "1.0.2" diff --git a/node/network/src/lib.rs b/node/network/src/lib.rs index 5cc8550..c6a21d8 100644 --- a/node/network/src/lib.rs +++ b/node/network/src/lib.rs @@ -74,8 +74,6 @@ impl<'de> Deserialize<'de> for PeerIdSerialized { pub use crate::types::{error, Enr, GossipTopic, NetworkGlobals, PubsubMessage}; -pub use prometheus_client; - pub use behaviour::{BehaviourEvent, Gossipsub, PeerRequestId, Request, Response}; pub use config::Config as NetworkConfig; pub use discovery::{CombinedKeyExt, EnrExt}; diff --git a/node/storage/Cargo.toml b/node/storage/Cargo.toml index 8388510..91a6862 100644 --- a/node/storage/Cargo.toml +++ b/node/storage/Cargo.toml @@ -31,7 +31,6 @@ parking_lot = "0.12.3" serde_json = "1.0.127" [dev-dependencies] -tempdir = "0.3.7" rand = "0.8.5" hex-literal = "0.3.4" criterion = "0.4"