From 434da7f0ab7beafff880367e1a7d2a7f802cce91 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Tue, 10 Oct 2023 14:52:32 +0800 Subject: [PATCH 01/22] Upgrade to rust 1.73.0. --- core/src/pos/types/src/account_config/constants/mod.rs | 2 +- core/storage/src/impls/merkle_patricia_trie/trie_proof.rs | 3 --- core/storage/src/impls/snapshot_sync/offer/mpt_slicer.rs | 2 -- rust-toolchain | 2 +- 4 files changed, 2 insertions(+), 7 deletions(-) diff --git a/core/src/pos/types/src/account_config/constants/mod.rs b/core/src/pos/types/src/account_config/constants/mod.rs index 61b5635cea..629a655f16 100644 --- a/core/src/pos/types/src/account_config/constants/mod.rs +++ b/core/src/pos/types/src/account_config/constants/mod.rs @@ -5,7 +5,7 @@ // Conflux is free software and distributed under GNU General Public License. // See http://www.gnu.org/licenses/ -pub mod account; +mod account; pub mod addresses; pub mod coins; pub mod diem; diff --git a/core/storage/src/impls/merkle_patricia_trie/trie_proof.rs b/core/storage/src/impls/merkle_patricia_trie/trie_proof.rs index 80ba39e617..af460f9d26 100644 --- a/core/storage/src/impls/merkle_patricia_trie/trie_proof.rs +++ b/core/storage/src/impls/merkle_patricia_trie/trie_proof.rs @@ -140,7 +140,6 @@ impl TrieProof { *proof_node_mut = maybe_node.clone(); true }); - drop(proof_node_mut); (proves, proof_node) } @@ -156,8 +155,6 @@ impl TrieProof { true }); - drop(proof_node_mut); - ( proves, proof_node.and_then(|node| node.value_as_slice().into_option()), diff --git a/core/storage/src/impls/snapshot_sync/offer/mpt_slicer.rs b/core/storage/src/impls/snapshot_sync/offer/mpt_slicer.rs index 7d9510a5db..17c188adfb 100644 --- a/core/storage/src/impls/snapshot_sync/offer/mpt_slicer.rs +++ b/core/storage/src/impls/snapshot_sync/offer/mpt_slicer.rs @@ -95,8 +95,6 @@ impl<'a> MptSlicer<'a> { // Unwrap is fine because the child is guaranteed to exist. .unwrap(); - drop(current_node); - self.cursor.push_node(child_node); return self.advance(rlp_size_limit); } diff --git a/rust-toolchain b/rust-toolchain index ee2f4ca913..5e3a425662 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -1.68.0 +1.73.0 From 6df37323e56f462d02b21a87c4122be4fd31b54b Mon Sep 17 00:00:00 2001 From: Joel Date: Thu, 12 Oct 2023 17:22:45 +0800 Subject: [PATCH 02/22] Copy mpt database in a new thread to improve performance --- .../storage_db/snapshot_db_manager_sqlite.rs | 108 ++++++++++++------ 1 file changed, 74 insertions(+), 34 deletions(-) diff --git a/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs b/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs index b845722613..646449cd3f 100644 --- a/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs +++ b/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs @@ -20,8 +20,9 @@ pub struct SnapshotDbManagerSqlite { mpt_open_snapshot_semaphore: Arc, era_epoch_count: u64, max_open_snapshots: u16, - lastest_mpt_snapshot_semaphore: Arc, + latest_mpt_snapshot_semaphore: Arc, latest_snapshot_id: RwLock<(EpochId, u64)>, + copying_mpt_snapshot: Arc>, } #[derive(Debug)] @@ -145,8 +146,9 @@ impl SnapshotDbManagerSqlite { )), era_epoch_count, max_open_snapshots, - lastest_mpt_snapshot_semaphore: Arc::new(Semaphore::new(1)), + latest_mpt_snapshot_semaphore: Arc::new(Semaphore::new(1)), latest_snapshot_id: RwLock::new((NULL_EPOCH, 0)), + copying_mpt_snapshot: Arc::new(Default::default()), }) } @@ -476,11 +478,11 @@ impl SnapshotDbManagerSqlite { && self.latest_snapshot_id.read().1 % self.era_epoch_count != 0 { let s = - self.lastest_mpt_snapshot_semaphore.try_acquire().map_err( + self.latest_mpt_snapshot_semaphore.try_acquire().map_err( |_err| "The MPT snapshot is already open for writing.", )?; - (Some(s), Some(self.lastest_mpt_snapshot_semaphore.clone())) + (Some(s), Some(self.latest_mpt_snapshot_semaphore.clone())) } else { (None, None) }; @@ -515,7 +517,7 @@ impl SnapshotDbManagerSqlite { { debug!("open mpt snapshot with write {:?}", snapshot_path); let latest_mpt_semaphore_permit: tokio::sync::SemaphorePermit = - executor::block_on(self.lastest_mpt_snapshot_semaphore.acquire()); + executor::block_on(self.latest_mpt_snapshot_semaphore.acquire()); if self .mpt_already_open_snapshots @@ -534,7 +536,7 @@ impl SnapshotDbManagerSqlite { snapshot_path.as_path(), &self.mpt_already_open_snapshots, &self.mpt_open_snapshot_semaphore, - Some(self.lastest_mpt_snapshot_semaphore.clone()), + Some(self.latest_mpt_snapshot_semaphore.clone()), ) } else { let file_exists = snapshot_path.exists(); @@ -544,7 +546,7 @@ impl SnapshotDbManagerSqlite { /* readonly = */ false, &self.mpt_already_open_snapshots, &self.mpt_open_snapshot_semaphore, - Some(self.lastest_mpt_snapshot_semaphore.clone()), + Some(self.latest_mpt_snapshot_semaphore.clone()), ) } else { bail!(ErrorKind::SnapshotNotFound); @@ -678,7 +680,7 @@ impl SnapshotDbManagerSqlite { /// Ok(false) when we are running on a system where cow copy isn't /// available. fn try_make_snapshot_cow_copy_impl( - &self, old_snapshot_path: &Path, new_snapshot_path: &Path, + old_snapshot_path: &Path, new_snapshot_path: &Path, force_cow: bool, ) -> Result { let mut command; if cfg!(target_os = "linux") { @@ -707,7 +709,7 @@ impl SnapshotDbManagerSqlite { } if !command_result?.status.success() { fs::remove_dir_all(new_snapshot_path)?; - if self.force_cow { + if force_cow { error!( "COW copy failed, check file system support. Command {:?}", command, @@ -726,11 +728,13 @@ impl SnapshotDbManagerSqlite { } fn try_copy_snapshot( - &self, old_snapshot_path: &Path, new_snapshot_path: &Path, + old_snapshot_path: &Path, new_snapshot_path: &Path, force_cow: bool, ) -> Result { - if self - .try_make_snapshot_cow_copy(old_snapshot_path, new_snapshot_path)? - { + if Self::try_make_snapshot_cow_copy( + old_snapshot_path, + new_snapshot_path, + force_cow, + )? { Ok(CopyType::Cow) } else { let mut options = CopyOptions::new(); @@ -751,17 +755,18 @@ impl SnapshotDbManagerSqlite { /// force_cow setting enabled; Ok(true) when cow copy succeeded; /// Ok(false) when cow copy isn't supported with force_cow setting disabled. fn try_make_snapshot_cow_copy( - &self, old_snapshot_path: &Path, new_snapshot_path: &Path, + old_snapshot_path: &Path, new_snapshot_path: &Path, force_cow: bool, ) -> Result { - let result = self.try_make_snapshot_cow_copy_impl( + let result = Self::try_make_snapshot_cow_copy_impl( old_snapshot_path, new_snapshot_path, + force_cow, ); if result.is_err() { Ok(false) } else if result.unwrap() == false { - if self.force_cow { + if force_cow { // FIXME: Check error string. error!( "Failed to create a new snapshot by COW. \ @@ -849,24 +854,51 @@ impl SnapshotDbManagerSqlite { let temp_mpt_path = self.get_merge_temp_mpt_snapshot_db_path(snapshot_epoch_id); let latest_mpt_path = self.get_latest_mpt_snapshot_db_path(); - self.try_copy_snapshot( - latest_mpt_path.as_path(), - temp_mpt_path.as_path(), - )?; let new_mpt_snapshot_db_path = self.get_mpt_snapshot_db_path(snapshot_epoch_id); - if new_mpt_snapshot_db_path.exists() { - if let Err(e) = - fs::remove_dir_all(&new_mpt_snapshot_db_path.as_path()) - { - error!( - "remove mpt snapshot err: path={:?} err={:?}", - new_mpt_snapshot_db_path.as_path(), - e - ); - } - } - Self::rename_snapshot_db(&temp_mpt_path, &new_mpt_snapshot_db_path)?; + + let force_cow = self.force_cow; + let copying_mpt_snapshot = Arc::clone(&self.copying_mpt_snapshot); + thread::Builder::new() + .name("Copy mpt snapshot".into()) + .spawn(move || { + let _open_lock = copying_mpt_snapshot.lock(); + + if let Err(e) = Self::try_copy_snapshot( + latest_mpt_path.as_path(), + temp_mpt_path.as_path(), + force_cow, + ) { + error!( + "Copy mpt snapshot failed. Try copy snapshot error. \n Error {:?}", + e + ); + return; + } + + if new_mpt_snapshot_db_path.exists() { + if let Err(e) = + fs::remove_dir_all(&new_mpt_snapshot_db_path.as_path()) + { + error!( + "remove mpt snapshot err: path={:?} err={:?}", + new_mpt_snapshot_db_path.as_path(), + e + ); + } + } + + if let Err(e) = Self::rename_snapshot_db( + &temp_mpt_path, + &new_mpt_snapshot_db_path, + ) { + error!( + "Copy mpt snapshot failed. Rename snapshot db error. \n Error {:?}", + e + ); + } + }) + .unwrap(); Ok(()) } @@ -956,11 +988,13 @@ impl SnapshotDbManagerTrait for SnapshotDbManagerSqlite { )?; snapshot_kv_db.dump_delta_mpt(&delta_mpt)?; + let _open_lock = self.copying_mpt_snapshot.lock(); snapshot_kv_db.direct_merge(None, &mut snapshot_mpt_db)? } else { - if let Ok(copy_type) = self.try_copy_snapshot( + if let Ok(copy_type) = Self::try_copy_snapshot( self.get_snapshot_db_path(old_snapshot_epoch_id).as_path(), temp_db_path.as_path(), + self.force_cow, ) { cow = match copy_type { CopyType::Cow => true, @@ -1006,6 +1040,7 @@ impl SnapshotDbManagerTrait for SnapshotDbManagerSqlite { } }; + let _open_lock = self.copying_mpt_snapshot.lock(); snapshot_kv_db .direct_merge(old_snapshot_db, &mut snapshot_mpt_db)? } else { @@ -1017,6 +1052,7 @@ impl SnapshotDbManagerTrait for SnapshotDbManagerSqlite { &snapshot_epoch_id, )?; snapshot_kv_db.dump_delta_mpt(&delta_mpt)?; + let _open_lock = self.copying_mpt_snapshot.lock(); self.copy_and_merge( &mut snapshot_kv_db, &mut snapshot_mpt_db, @@ -1269,7 +1305,11 @@ impl SnapshotDbManagerTrait for SnapshotDbManagerSqlite { let temp_mpt_path = self.get_merge_temp_mpt_snapshot_db_path(&snapshot_epoch_id); - self.try_copy_snapshot(source.as_path(), temp_mpt_path.as_path())?; + Self::try_copy_snapshot( + source.as_path(), + temp_mpt_path.as_path(), + self.force_cow, + )?; Self::rename_snapshot_db(&temp_mpt_path, &latest_mpt_snapshot_path) } else { debug!("mpt snapshot for epoch {} not exist", snapshot_epoch_id); From bbc2bbc00ec4ec5f45ec4d4ef0559769a27c5721 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Tue, 17 Oct 2023 19:48:20 +0800 Subject: [PATCH 03/22] Fix UB in Slab. --- core/storage/src/impls/delta_mpt/slab/mod.rs | 36 +++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/core/storage/src/impls/delta_mpt/slab/mod.rs b/core/storage/src/impls/delta_mpt/slab/mod.rs index 9b385fe15d..28d309938b 100644 --- a/core/storage/src/impls/delta_mpt/slab/mod.rs +++ b/core/storage/src/impls/delta_mpt/slab/mod.rs @@ -137,7 +137,7 @@ pub struct Slab = Entry> { // when allocating space for new element. We would like to keep the size of // initialized entry in AllocRelatedFields#size_initialized instead of // vector. - entries: Vec, + entries: Vec>, /// Fields which are modified when allocate / delete an entry. alloc_fields: Mutex, @@ -352,7 +352,7 @@ impl<'a, T: 'a, E: 'a + EntryTrait> Drop /// A mutable iterator over the values stored in the `Slab` pub struct IterMut<'a, T: 'a, E: 'a + EntryTrait> { - entries: slice::IterMut<'a, E>, + entries: slice::IterMut<'a, UnsafeCell>, curr: usize, value_type: PhantomData, } @@ -513,7 +513,7 @@ impl> Slab { // TODO(yz): resize_default is nightly only. fn resize_up(&mut self, capacity: usize, new_capacity: usize) { for _i in capacity..new_capacity { - self.entries.push(E::default()); + self.entries.push(Default::default()); } } @@ -658,10 +658,10 @@ impl> Slab { /// assert_eq!(slab.get(123), None); pub fn get(&self, key: usize) -> Option<&T> { self.entries.get(key).and_then(|entry| { - if entry.is_vacant() { + if entry.get_ref().is_vacant() { None } else { - Some(entry.get_occupied_ref()) + Some(entry.get_ref().get_occupied_ref()) } }) } @@ -687,10 +687,10 @@ impl> Slab { // the same time. pub fn get_mut(&mut self, key: usize) -> Option<&mut T> { self.entries.get_mut(key).and_then(|entry| { - if entry.is_vacant() { + if entry.get_ref().is_vacant() { None } else { - Some(entry.get_occupied_mut()) + Some(entry.get_mut().get_occupied_mut()) } }) } @@ -710,7 +710,7 @@ impl> Slab { /// assert_eq!(slab.get_unchecked(key), &2); /// } pub unsafe fn get_unchecked(&self, key: usize) -> &T { - self.entries.get_unchecked(key).get_occupied_ref() + self.entries.get_unchecked(key).get_ref().get_occupied_ref() } /// Return a mutable reference to the value associated with the given key @@ -733,7 +733,10 @@ impl> Slab { /// assert_eq!(slab[key], 13); /// ``` pub unsafe fn get_unchecked_mut(&mut self, key: usize) -> &mut T { - self.entries.get_unchecked_mut(key).get_occupied_mut() + self.entries + .get_unchecked_mut(key) + .get_mut() + .get_occupied_mut() } /// Insert a value in the slab, returning key assigned to the value. @@ -772,7 +775,8 @@ impl> Slab { alloc_fields.next = key + 1; alloc_fields.size_initialized = alloc_fields.next; } else { - alloc_fields.next = self.entries[key].get_next_vacant_index(); + alloc_fields.next = + self.entries[key].get_ref().get_next_vacant_index(); } Ok(key) } @@ -781,9 +785,7 @@ impl> Slab { /// Cast an entry to ref mut when creating value into the slot or freeing /// value from the slot. fn cast_entry_ref_mut(&self, key: usize) -> &mut E { - unsafe { - &mut *((self.entries.get_unchecked(key) as *const E) as *mut E) - } + unsafe { self.entries.get_unchecked(key).get_as_mut() } } fn insert_at(&self, key: usize, val: U) -> &mut T @@ -912,7 +914,9 @@ impl> Slab { impl> ops::Index for Slab { type Output = T; - fn index(&self, key: usize) -> &T { self.entries[key].get_occupied_ref() } + fn index(&self, key: usize) -> &T { + self.entries[key].get_ref().get_occupied_ref() + } } impl<'a, T, E: EntryTrait> IntoIterator for &'a mut Slab { @@ -1007,8 +1011,8 @@ impl<'a, T, E: EntryTrait> Iterator for IterMut<'a, T, E> { let curr = self.curr; self.curr += 1; - if !entry.is_vacant() { - return Some((curr, entry.get_occupied_mut())); + if !entry.get_ref().is_vacant() { + return Some((curr, entry.get_mut().get_occupied_mut())); } } From a8867f3675761d2a94dda4a4b30d7c4dcf4b2640 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Tue, 17 Oct 2023 19:49:19 +0800 Subject: [PATCH 04/22] Fix warnings. --- core/src/consensus/consensus_inner/confirmation_meter.rs | 2 +- core/src/sync/state/snapshot_chunk_sync.rs | 2 +- core/src/sync/synchronization_graph.rs | 2 +- core/src/sync/synchronization_protocol_handler.rs | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/consensus/consensus_inner/confirmation_meter.rs b/core/src/consensus/consensus_inner/confirmation_meter.rs index 838be99ae2..e9d1dd408a 100644 --- a/core/src/consensus/consensus_inner/confirmation_meter.rs +++ b/core/src/consensus/consensus_inner/confirmation_meter.rs @@ -286,7 +286,7 @@ impl ConfirmationMeter { epoch_num += 1; } - let mut finality = &mut self.inner.write().finality_manager; + let finality = &mut self.inner.write().finality_manager; debug!("Confirmation Risk: {:?}", risks); finality.lowest_epoch_num = epoch_num; finality.risks_less_than = risks; diff --git a/core/src/sync/state/snapshot_chunk_sync.rs b/core/src/sync/state/snapshot_chunk_sync.rs index bd4d4594fc..4784abea42 100644 --- a/core/src/sync/state/snapshot_chunk_sync.rs +++ b/core/src/sync/state/snapshot_chunk_sync.rs @@ -213,7 +213,7 @@ impl SnapshotChunkSync { request: &SnapshotManifestRequest, ) -> Result<(), Error> { - let mut inner = &mut *self.inner.write(); + let inner = &mut *self.inner.write(); // status mismatch if !matches!(inner.status, Status::DownloadingManifest(_)) { diff --git a/core/src/sync/synchronization_graph.rs b/core/src/sync/synchronization_graph.rs index b4892d0853..2cb8fc93df 100644 --- a/core/src/sync/synchronization_graph.rs +++ b/core/src/sync/synchronization_graph.rs @@ -1933,7 +1933,7 @@ impl SynchronizationGraph { /// in the new consensus graph already have bodies. pub fn complete_filling_block_bodies(&self) -> bool { { - let mut inner = &mut *self.inner.write(); + let inner = &mut *self.inner.write(); // Iterating over `hash_to_arena_indices` might be more efficient // than iterating over `arena`. diff --git a/core/src/sync/synchronization_protocol_handler.rs b/core/src/sync/synchronization_protocol_handler.rs index a5e8746622..baaac47b59 100644 --- a/core/src/sync/synchronization_protocol_handler.rs +++ b/core/src/sync/synchronization_protocol_handler.rs @@ -268,7 +268,7 @@ impl FutureBlockContainer { } pub fn insert(&self, header: BlockHeader, peer: NodeId) { - let mut inner = &mut *self.inner.write(); + let inner = &mut *self.inner.write(); let header_hash = header.hash(); if inner.hash_to_header_and_peer.contains_key(&header_hash) { return; From 5adde721f903cd9f391875be88a613fc887ef8dc Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Tue, 17 Oct 2023 19:57:15 +0800 Subject: [PATCH 05/22] Fix clippy errors. --- accounts/cfxstore/src/json/hash.rs | 2 +- accounts/cfxstore/src/secret_store.rs | 12 ++--- core/src/pos/config/src/network_id.rs | 50 +++++++++---------- core/src/pos/protocol/request_manager/mod.rs | 2 +- .../request_manager/request_handler.rs | 2 +- core/src/pos/types/src/term_state.rs | 2 +- core/src/sync/request_manager/mod.rs | 2 +- .../sync/request_manager/request_handler.rs | 2 +- .../transaction_pool_inner.rs | 2 +- network/src/service.rs | 2 +- util/heap-map/src/lib.rs | 2 +- util/metrics/src/histogram.rs | 7 ++- util/throttling/src/time_window_bucket.rs | 2 +- 13 files changed, 46 insertions(+), 43 deletions(-) diff --git a/accounts/cfxstore/src/json/hash.rs b/accounts/cfxstore/src/json/hash.rs index ba9cd94e97..bcf62d8ae1 100644 --- a/accounts/cfxstore/src/json/hash.rs +++ b/accounts/cfxstore/src/json/hash.rs @@ -136,7 +136,7 @@ impl_hash!(H256, 32); // FIXME: find a better hash type. impl PartialOrd for H160 { fn partial_cmp(&self, other: &Self) -> Option { - self.0.partial_cmp(&other.0) + Some(self.cmp(other)) } } diff --git a/accounts/cfxstore/src/secret_store.rs b/accounts/cfxstore/src/secret_store.rs index ebc9218dc7..5c281ba764 100644 --- a/accounts/cfxstore/src/secret_store.rs +++ b/accounts/cfxstore/src/secret_store.rs @@ -45,11 +45,7 @@ pub struct StoreAccountRef { impl PartialOrd for StoreAccountRef { fn partial_cmp(&self, other: &StoreAccountRef) -> Option { - Some( - self.address - .cmp(&other.address) - .then_with(|| self.vault.cmp(&other.vault)), - ) + Some(self.cmp(other)) } } @@ -59,7 +55,11 @@ impl PartialEq for StoreAccountRef { impl Eq for StoreAccountRef {} impl Ord for StoreAccountRef { - fn cmp(&self, other: &Self) -> Ordering { self.address.cmp(&other.address) } + fn cmp(&self, other: &Self) -> Ordering { + self.address + .cmp(&other.address) + .then_with(|| self.vault.cmp(&other.vault)) + } } impl Hash for StoreAccountRef { diff --git a/core/src/pos/config/src/network_id.rs b/core/src/pos/config/src/network_id.rs index 35f28c9f49..486faddebc 100644 --- a/core/src/pos/config/src/network_id.rs +++ b/core/src/pos/config/src/network_id.rs @@ -90,39 +90,39 @@ pub enum NetworkId { Private(String), } -impl Ord for NetworkId { - fn cmp(&self, other: &Self) -> Ordering { self.partial_cmp(other).unwrap() } +impl PartialOrd for NetworkId { + fn partial_cmp(&self, other: &Self) -> Option { + Some(self.cmp(other)) + } } -impl PartialOrd for NetworkId { +impl Ord for NetworkId { /// Generalized ordering for determining which network is the most /// important. The lower the ordering, the higher the importance (i.e., /// the validator network is less than all other networks because it has /// the highest priority). - fn partial_cmp(&self, other: &Self) -> Option { + fn cmp(&self, other: &Self) -> Ordering { // To simplify logic below, if it's the same it's equal - Some( - if self == other { - Ordering::Equal - } else { - // Everywhere below assumes that equal has already been covered - match self { - NetworkId::Validator => Ordering::Less, - NetworkId::Public => Ordering::Greater, - NetworkId::Private(_) => match other { - NetworkId::Validator => Ordering::Greater, - NetworkId::Public => Ordering::Less, - NetworkId::Private(_) => { - if self.is_vfn_network() { - Ordering::Less - } else { - Ordering::Greater - } + if self == other { + Ordering::Equal + } else { + // Everywhere below assumes that equal has already been covered + match self { + NetworkId::Validator => Ordering::Less, + NetworkId::Public => Ordering::Greater, + NetworkId::Private(_) => match other { + NetworkId::Validator => Ordering::Greater, + NetworkId::Public => Ordering::Less, + NetworkId::Private(_) => { + if self.is_vfn_network() { + Ordering::Less + } else { + Ordering::Greater } - }, - } - }, - ) + } + }, + } + } } } diff --git a/core/src/pos/protocol/request_manager/mod.rs b/core/src/pos/protocol/request_manager/mod.rs index af1950ce34..f58369f9d9 100644 --- a/core/src/pos/protocol/request_manager/mod.rs +++ b/core/src/pos/protocol/request_manager/mod.rs @@ -198,7 +198,7 @@ impl Ord for TimedWaitingRequest { } impl PartialOrd for TimedWaitingRequest { fn partial_cmp(&self, other: &Self) -> Option { - other.time_to_send.partial_cmp(&self.time_to_send) + Some(self.cmp(other)) } } impl Eq for TimedWaitingRequest {} diff --git a/core/src/pos/protocol/request_manager/request_handler.rs b/core/src/pos/protocol/request_manager/request_handler.rs index 5ac4dac16b..751c18e28a 100644 --- a/core/src/pos/protocol/request_manager/request_handler.rs +++ b/core/src/pos/protocol/request_manager/request_handler.rs @@ -480,7 +480,7 @@ impl Ord for TimedSyncRequests { impl PartialOrd for TimedSyncRequests { fn partial_cmp(&self, other: &Self) -> Option { - other.timeout_time.partial_cmp(&self.timeout_time) + Some(self.cmp(other)) } } diff --git a/core/src/pos/types/src/term_state.rs b/core/src/pos/types/src/term_state.rs index a019d9bcbd..7181093a84 100644 --- a/core/src/pos/types/src/term_state.rs +++ b/core/src/pos/types/src/term_state.rs @@ -1296,7 +1296,7 @@ impl Ord for NodeID { impl PartialOrd for NodeID { fn partial_cmp(&self, other: &Self) -> Option { - self.addr.partial_cmp(&other.addr) + Some(self.cmp(other)) } } diff --git a/core/src/sync/request_manager/mod.rs b/core/src/sync/request_manager/mod.rs index 2e3f531916..dbb25d0922 100644 --- a/core/src/sync/request_manager/mod.rs +++ b/core/src/sync/request_manager/mod.rs @@ -1087,7 +1087,7 @@ impl Ord for TimedWaitingRequest { } impl PartialOrd for TimedWaitingRequest { fn partial_cmp(&self, other: &Self) -> Option { - other.time_to_send.partial_cmp(&self.time_to_send) + Some(self.cmp(other)) } } impl Eq for TimedWaitingRequest {} diff --git a/core/src/sync/request_manager/request_handler.rs b/core/src/sync/request_manager/request_handler.rs index ae1c0318ea..3973d0c673 100644 --- a/core/src/sync/request_manager/request_handler.rs +++ b/core/src/sync/request_manager/request_handler.rs @@ -552,7 +552,7 @@ impl Ord for TimedSyncRequests { impl PartialOrd for TimedSyncRequests { fn partial_cmp(&self, other: &Self) -> Option { - other.timeout_time.partial_cmp(&self.timeout_time) + Some(self.cmp(other)) } } diff --git a/core/src/transaction_pool/transaction_pool_inner.rs b/core/src/transaction_pool/transaction_pool_inner.rs index 278f43e4fe..0a5f709d8e 100644 --- a/core/src/transaction_pool/transaction_pool_inner.rs +++ b/core/src/transaction_pool/transaction_pool_inner.rs @@ -218,7 +218,7 @@ impl Eq for PriceOrderedTransaction {} impl PartialOrd for PriceOrderedTransaction { fn partial_cmp(&self, other: &Self) -> Option { - self.0.gas_price().partial_cmp(other.0.gas_price()) + Some(self.cmp(other)) } } diff --git a/network/src/service.rs b/network/src/service.rs index 12428fb42d..d720b88566 100644 --- a/network/src/service.rs +++ b/network/src/service.rs @@ -1913,7 +1913,7 @@ impl Ord for DelayMessageContext { impl PartialOrd for DelayMessageContext { fn partial_cmp(&self, other: &Self) -> Option { - other.ts.partial_cmp(&self.ts) + Some(self.cmp(other)) } } diff --git a/util/heap-map/src/lib.rs b/util/heap-map/src/lib.rs index 18e711a802..845a18775b 100644 --- a/util/heap-map/src/lib.rs +++ b/util/heap-map/src/lib.rs @@ -30,7 +30,7 @@ impl Eq for Node {} impl PartialOrd for Node { fn partial_cmp(&self, other: &Self) -> Option { - self.value.partial_cmp(&other.value) + Some(self.cmp(other)) } } diff --git a/util/metrics/src/histogram.rs b/util/metrics/src/histogram.rs index 86ec22720d..b3078cc12f 100644 --- a/util/metrics/src/histogram.rs +++ b/util/metrics/src/histogram.rs @@ -366,13 +366,16 @@ impl Eq for ExpDecaySampleItem {} impl PartialOrd for ExpDecaySampleItem { fn partial_cmp(&self, other: &Self) -> Option { - other.k.partial_cmp(&self.k) + Some(self.cmp(other)) } } impl Ord for ExpDecaySampleItem { // for k, the smaller, the bigger fn cmp(&self, other: &Self) -> Ordering { - self.partial_cmp(other).expect("k should be comparable") + other + .k + .partial_cmp(&self.k) + .expect("k should be comparable") } } diff --git a/util/throttling/src/time_window_bucket.rs b/util/throttling/src/time_window_bucket.rs index 247c5907f0..3bf49b8b53 100644 --- a/util/throttling/src/time_window_bucket.rs +++ b/util/throttling/src/time_window_bucket.rs @@ -82,7 +82,7 @@ impl Eq for Item {} impl PartialOrd for Item { fn partial_cmp(&self, other: &Self) -> Option { - other.time.partial_cmp(&self.time) + Some(self.cmp(other)) } } From f9f78362769dce22c911721dd3f5b1f6d69a51c8 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Wed, 18 Oct 2023 17:23:51 +0800 Subject: [PATCH 06/22] Fix more warnings. --- core/src/pos/types/src/proptest_types.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/pos/types/src/proptest_types.rs b/core/src/pos/types/src/proptest_types.rs index 9345524d6d..9c7c6a4801 100644 --- a/core/src/pos/types/src/proptest_types.rs +++ b/core/src/pos/types/src/proptest_types.rs @@ -305,7 +305,7 @@ impl RawTransactionGen { pub fn materialize( self, sender_index: Index, universe: &mut AccountInfoUniverse, ) -> RawTransaction { - let mut sender_info = universe.get_account_info_mut(sender_index); + let sender_info = universe.get_account_info_mut(sender_index); sender_info.sequence_number += 1; From 860030c0d488e2a652cc050318d36b74b279a305 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Wed, 18 Oct 2023 18:45:18 +0800 Subject: [PATCH 07/22] Fix test warnings. --- core/storage/src/impls/storage_db/snapshot_mpt/tests.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/storage/src/impls/storage_db/snapshot_mpt/tests.rs b/core/storage/src/impls/storage_db/snapshot_mpt/tests.rs index 581a2aab15..a00a2d2033 100644 --- a/core/storage/src/impls/storage_db/snapshot_mpt/tests.rs +++ b/core/storage/src/impls/storage_db/snapshot_mpt/tests.rs @@ -105,7 +105,6 @@ impl<'a> MptIter<'a> { // Unwrap is fine because the child is guaranteed to exist. .unwrap(); - drop(current_node); down = true; self.cursor.push_node(child_node); break; @@ -162,7 +161,6 @@ where KvdbIterIterator< } mpt_kvs.push((key, value)); } - drop(kv_iter); let mut mpt = snapshot_db.open_snapshot_mpt_shared().unwrap(); let mut mpt_iter = MptIter::new(&mut mpt).unwrap(); From 0e01fabe3d0dacacf886e70f6d182d0367f518be Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Thu, 19 Oct 2023 06:13:09 +0800 Subject: [PATCH 08/22] Update bls-signatures dependency. --- Cargo.lock | 52 +- Cargo.toml | 2 - client/Cargo.toml | 2 +- core/Cargo.toml | 4 +- core/benchmark/storage/Cargo.lock | 2135 +++++++++++++++---------- core/src/pos/crypto/crypto/Cargo.toml | 6 +- 6 files changed, 1307 insertions(+), 894 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index c190565e82..fd13dd61ad 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -396,12 +396,12 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", - "radium 0.6.2", + "radium 0.7.0", "tap", "wyz", ] @@ -498,8 +498,8 @@ dependencies = [ [[package]] name = "bls-signatures" -version = "0.11.1" -source = "git+https://github.com/Conflux-Chain/bls-signatures.git?rev=e7d9119eb285607d5134d40efd89555c41d73160#e7d9119eb285607d5134d40efd89555c41d73160" +version = "0.15.0" +source = "git+https://github.com/Conflux-Chain/bls-signatures.git?rev=fb52187df92d27c365642cb7e7b2aaf60437cf9c#fb52187df92d27c365642cb7e7b2aaf60437cf9c" dependencies = [ "bls12_381", "blst", @@ -518,9 +518,9 @@ dependencies = [ [[package]] name = "bls12_381" -version = "0.6.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d28daeeded7949f1c7c72693377c98473b00be0aa0023760a84a300e4e7c74b" +checksum = "d7bc6d6292be3a19e6379786dac800f551e5865a5bb51ebbe3064ab80433f403" dependencies = [ "digest 0.9.0", "ff", @@ -532,9 +532,9 @@ dependencies = [ [[package]] name = "blst" -version = "0.3.6" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f073f59a150a1dca74aab43d794ae5a7578d52bb1e73121e559f3ee3e6a837e" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" dependencies = [ "cc", "glob", @@ -544,9 +544,9 @@ dependencies = [ [[package]] name = "blstrs" -version = "0.4.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495df7995831e0211c54e888c993d4c86054c45fda110b475f021de7aa74f62" +checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" dependencies = [ "blst", "byte-slice-cast 1.2.2", @@ -1799,7 +1799,7 @@ dependencies = [ "aes-gcm", "anyhow", "bcs", - "bitvec 0.22.3", + "bitvec 1.0.1", "bls-signatures", "byteorder", "bytes 1.4.0", @@ -2494,11 +2494,11 @@ dependencies = [ [[package]] name = "ff" -version = "0.11.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "131655483be284720a17d74ff97592b8e76576dc25563148601df2d7c9080924" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec 0.22.3", + "bitvec 1.0.1", "rand_core 0.6.4", "subtle", ] @@ -2622,8 +2622,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.2.0" -source = "git+https://github.com/ferrilab/funty.git?rev=7ef0d890fbcd8b3def1635ac1a877fc298488446#7ef0d890fbcd8b3def1635ac1a877fc298488446" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -2880,11 +2881,10 @@ dependencies = [ [[package]] name = "group" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "byteorder", "ff", "rand 0.8.5", "rand_core 0.6.4", @@ -4473,9 +4473,9 @@ dependencies = [ [[package]] name = "pairing" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ "group", ] @@ -5260,9 +5260,9 @@ checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -7512,9 +7512,9 @@ dependencies = [ [[package]] name = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] diff --git a/Cargo.toml b/Cargo.toml index eff1a27320..59df24b264 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -100,8 +100,6 @@ u64-mpt-db-key = ["client/u64_mpt_db_key"] [patch.crates-io] sqlite3-sys = { git = "https://github.com/Conflux-Chain/sqlite3-sys.git", rev = "1de8e5998f7c2d919336660b8ef4e8f52ac43844" } -funty = { git = "https://github.com/ferrilab/funty.git", rev = "7ef0d890fbcd8b3def1635ac1a877fc298488446" } -#fff = { git = "https://github.com/Conflux-Chain/ff.git", rev = "c0e8a5911a285526cc79fe14d500e1553d3c9174" } [profile.test] debug-assertions = true diff --git a/client/Cargo.toml b/client/Cargo.toml index 4eab27d2db..47d9cd7532 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -97,7 +97,7 @@ rpassword = "5.0.1" static_assertions = "1.1.0" parity-version = {path = "../util/version"} solidity-abi = {path="../util/solidity-abi"} -bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "e7d9119eb285607d5134d40efd89555c41d73160", default-features = false, features = ["multicore"]} +bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore"]} [dev-dependencies] criterion = "0.3" diff --git a/core/Cargo.toml b/core/Cargo.toml index 379b3aaf52..4164a22de3 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -93,9 +93,7 @@ unexpected = { git = "https://github.com/Conflux-Chain/conflux-parity-deps.git", strum = "0.20" strum_macros = "0.20" smart-default = "0.6.0" -#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures"} -#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures",default-features = false, features = ["blst", "multicore"]} -bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "e7d9119eb285607d5134d40efd89555c41d73160", default-features = false, features = ["multicore"]} +bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore"]} tiny-keccak = {version = "2.0", features = ["keccak"]} bcs = "0.1.2" async-trait = "0.1" diff --git a/core/benchmark/storage/Cargo.lock b/core/benchmark/storage/Cargo.lock index 0e2c5c2564..356e041442 100644 --- a/core/benchmark/storage/Cargo.lock +++ b/core/benchmark/storage/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "addr2line" -version = "0.17.0" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" +checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb" dependencies = [ "gimli", ] @@ -119,51 +119,54 @@ checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" [[package]] name = "aho-corasick" -version = "0.7.18" +version = "1.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0" dependencies = [ "memchr", ] [[package]] -name = "ansi_term" -version = "0.10.2" +name = "android-tzdata" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" +checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" [[package]] -name = "ansi_term" -version = "0.11.0" +name = "android_system_properties" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" +checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" dependencies = [ - "winapi 0.3.9", + "libc", ] [[package]] -name = "antidote" -version = "1.0.0" +name = "ansi_term" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "34fde25430d87a9388dadbe6e34d7f72a462c8b43ac8d309b42b0a8505d7e2a5" +checksum = "6b3568b48b7cefa6b8ce125f9bb4989e52fbcc29ebea88df04cc7c5f12f70455" [[package]] -name = "anyhow" -version = "1.0.50" +name = "ansi_term" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc78c299ae753905840c5d3ba036c51f61ce5a98a83f98d9c9d29dffd427f71" +checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +dependencies = [ + "winapi 0.3.9", +] [[package]] -name = "arc-swap" -version = "0.4.8" +name = "anyhow" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabe5a181f83789739c194cbe5a897dde195078fac08568d09221fd6137a7ba8" +checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" [[package]] name = "arc-swap" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d78ce20460b82d3fa150275ed9d55e21064fc7951177baacf86a145c4a4b1f" +checksum = "bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6" [[package]] name = "array-macro" @@ -197,13 +200,13 @@ dependencies = [ [[package]] name = "async-trait" -version = "0.1.51" +version = "0.1.74" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44318e776df68115a881de9a8fd1b9e53368d7a4a5ce4cc48517da3393233a5e" +checksum = "a66537f1bb974b254c98ed142ff995236e81b9d0fe4db0575f46612cb15eb0f9" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] @@ -219,8 +222,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf13118df3e3dce4b5ac930641343b91b656e4e72c8f8325838b01a4b1c9d45" dependencies = [ "http", - "log 0.4.17", - "url 2.2.2", + "log", + "url", ] [[package]] @@ -229,28 +232,31 @@ version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" dependencies = [ - "hermit-abi", + "hermit-abi 0.1.19", "libc", "winapi 0.3.9", ] [[package]] name = "autocfg" -version = "0.1.7" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +checksum = "0dde43e75fd43e8a1bf86103336bc699aa8d17ad1be60c76c0bdfd4828e19b78" +dependencies = [ + "autocfg 1.1.0", +] [[package]] name = "autocfg" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "backtrace" -version = "0.3.63" +version = "0.3.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "321629d8ba6513061f26707241fa9bc89524ff1cd7a915a97ef0c62c666ce1b6" +checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837" dependencies = [ "addr2line", "cc", @@ -264,19 +270,15 @@ dependencies = [ [[package]] name = "base64" -version = "0.9.3" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -dependencies = [ - "byteorder", - "safemem", -] +checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8" [[package]] name = "base64" -version = "0.13.0" +version = "0.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "904dfeac50f3cdaba28fc6f57fdcddb75f49ed61346676a78c4ffe55877802fd" +checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" [[package]] name = "base64ct" @@ -286,9 +288,9 @@ checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" [[package]] name = "bcs" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "510fd83e3eaf7263b06182f3550b4c0af2af42cb36ab8024969ff5ea7fcb2833" +checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" dependencies = [ "serde", "thiserror", @@ -296,21 +298,22 @@ dependencies = [ [[package]] name = "bindgen" -version = "0.57.0" +version = "0.64.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd4865004a46a0aafb2a0a5eb19d3c9fc46ee5f063a6cfc605c69ac9ecf5263d" +checksum = "c4243e6031260db77ede97ad86c27e501d646a27ab57b59a574f725d98ab1fb4" dependencies = [ - "bitflags", + "bitflags 1.3.2", "cexpr", "clang-sys", "lazy_static", "lazycell", "peeking_take_while", - "proc-macro2 1.0.32", - "quote 1.0.10", + "proc-macro2 1.0.69", + "quote 1.0.33", "regex", "rustc-hash", "shlex", + "syn 1.0.109", ] [[package]] @@ -334,6 +337,12 @@ version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +[[package]] +name = "bitflags" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" + [[package]] name = "bitvec" version = "0.17.4" @@ -346,12 +355,12 @@ dependencies = [ [[package]] name = "bitvec" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5237f00a8c86130a0cc317830e558b966dd7850d48a953d998c813f01a41b527" +checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c" dependencies = [ "funty", - "radium 0.6.2", + "radium 0.7.0", "tap", "wyz", ] @@ -365,6 +374,15 @@ dependencies = [ "generic-array", ] +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "block-modes" version = "0.7.0" @@ -404,8 +422,8 @@ dependencies = [ [[package]] name = "bls-signatures" -version = "0.11.1" -source = "git+https://github.com/Conflux-Chain/bls-signatures.git?rev=e7d9119eb285607d5134d40efd89555c41d73160#e7d9119eb285607d5134d40efd89555c41d73160" +version = "0.15.0" +source = "git+https://github.com/Conflux-Chain/bls-signatures.git?rev=fb52187df92d27c365642cb7e7b2aaf60437cf9c#fb52187df92d27c365642cb7e7b2aaf60437cf9c" dependencies = [ "blst", "blstrs", @@ -413,18 +431,18 @@ dependencies = [ "ff", "group", "pairing", - "rand_core 0.6.3", + "rand_core 0.6.4", "rayon", - "sha2", + "sha2 0.9.9", "subtle", "thiserror", ] [[package]] name = "blst" -version = "0.3.6" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f073f59a150a1dca74aab43d794ae5a7578d52bb1e73121e559f3ee3e6a837e" +checksum = "c94087b935a822949d3291a9989ad2b2051ea141eda0fd4e478a75f6aa3e604b" dependencies = [ "cc", "glob", @@ -434,16 +452,16 @@ dependencies = [ [[package]] name = "blstrs" -version = "0.4.1" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6495df7995831e0211c54e888c993d4c86054c45fda110b475f021de7aa74f62" +checksum = "7a8a8ed6fefbeef4a8c7b460e4110e12c5e22a5b7cf32621aae6ad650c4dcf29" dependencies = [ "blst", - "byte-slice-cast 1.2.0", + "byte-slice-cast 1.2.2", "ff", "group", "pairing", - "rand_core 0.6.3", + "rand_core 0.6.4", "serde", "subtle", ] @@ -464,10 +482,16 @@ dependencies = [ name = "bounded-executor" version = "0.1.0" dependencies = [ - "futures 0.3.18", - "tokio 1.14.0", + "futures 0.3.28", + "tokio 1.33.0", ] +[[package]] +name = "bumpalo" +version = "3.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f30e7476521f6f8af1a1c4c0b8cc94f0bee37d91763d0ca2665f299b6cd8aec" + [[package]] name = "byte-slice-cast" version = "0.3.5" @@ -476,9 +500,9 @@ checksum = "b0a5e3906bcbf133e33c1d4d95afc664ad37fbdb9f6568d8043e7ea8c27d93d3" [[package]] name = "byte-slice-cast" -version = "1.2.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d30c751592b77c499e7bce34d99d67c2c11bdc0574e9a488ddade14150a4698" +checksum = "c3ac9f8b63eca6fd385229b3675f6cc0dc5c8a5c8a54a59d4f52ffd670d87b0c" [[package]] name = "byte-unit" @@ -492,9 +516,9 @@ dependencies = [ [[package]] name = "byteorder" -version = "1.4.3" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" +checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "bytes" @@ -514,14 +538,14 @@ checksum = "0e4cec68f03f32e44924783795810fa50a7035d8c8ebe78580ad7e6c703fba38" [[package]] name = "bytes" -version = "1.1.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" +checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223" [[package]] name = "bzip2-sys" version = "0.1.11+1.0.8" -source = "git+https://github.com/alexcrichton/bzip2-rs.git#016e18155ef7c05983ea244cae1344c5b68defd8" +source = "git+https://github.com/alexcrichton/bzip2-rs.git#3032f3790742bffda521e54d14429f459e078eba" dependencies = [ "cc", "libc", @@ -552,18 +576,19 @@ dependencies = [ [[package]] name = "cc" -version = "1.0.72" +version = "1.0.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee" +checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" dependencies = [ "jobserver", + "libc", ] [[package]] name = "cexpr" -version = "0.4.0" +version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +checksum = "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766" dependencies = [ "nom", ] @@ -605,7 +630,7 @@ dependencies = [ "cfx-types", "derivative", "lazy_static", - "log 0.4.17", + "log", "malloc_size_of", "malloc_size_of_derive", "parking_lot 0.11.2", @@ -617,11 +642,20 @@ dependencies = [ "toml", ] +[[package]] +name = "cfx-math" +version = "0.1.0" +dependencies = [ + "cfx-types", + "num 0.2.1", +] + [[package]] name = "cfx-parameters" version = "1.0.0" dependencies = [ "cfx-types", + "hex-literal", "lazy_static", ] @@ -651,7 +685,7 @@ dependencies = [ "error-chain", "hashbrown 0.7.2", "lazy_static", - "log 0.4.17", + "log", "parking_lot 0.11.2", "primitives", "rlp 0.4.6", @@ -671,13 +705,13 @@ dependencies = [ "error-chain", "fallible-iterator", "fs_extra", - "futures 0.3.18", + "futures 0.3.28", "hashbrown 0.7.2", "keccak-hash 0.5.1", "kvdb 0.4.0", "kvdb-rocksdb", "lazy_static", - "log 0.4.17", + "log", "log4rs", "malloc_size_of", "malloc_size_of_derive", @@ -715,7 +749,7 @@ dependencies = [ name = "cfx-utils" version = "0.6.0" dependencies = [ - "log 0.4.17", + "log", "parking_lot 0.11.2", ] @@ -735,6 +769,7 @@ dependencies = [ "cfx-addr", "cfx-bytes", "cfx-internal-common", + "cfx-math", "cfx-parameters", "cfx-state", "cfx-statedb", @@ -765,7 +800,7 @@ dependencies = [ "fallible", "fallible-iterator", "fs_extra", - "futures 0.3.18", + "futures 0.3.28", "hashbrown 0.7.2", "heap-map", "hibitset", @@ -777,7 +812,7 @@ dependencies = [ "kvdb-rocksdb", "lazy_static", "link-cut-tree", - "log 0.4.17", + "log", "log4rs", "lru_time_cache", "malloc_size_of", @@ -803,7 +838,7 @@ dependencies = [ "priority-send-queue", "prometheus 0.7.0", "rand 0.7.3", - "rand 0.8.4", + "rand 0.8.5", "rand_chacha 0.2.2", "rand_xorshift 0.2.0", "random-crash", @@ -819,7 +854,7 @@ dependencies = [ "serde_json", "sha3-macro", "short-hex-str", - "siphasher 0.3.7", + "siphasher 0.3.11", "slab", "smart-default", "solidity-abi", @@ -839,7 +874,7 @@ dependencies = [ "throttling", "tiny-keccak 2.0.2", "tokio 0.2.25", - "tokio 1.14.0", + "tokio 1.33.0", "tokio-stream", "tokio-timer", "toml", @@ -853,7 +888,7 @@ dependencies = [ "cfx-types", "edit-distance", "lazy_static", - "log 0.4.17", + "log", "malloc_size_of", "malloc_size_of_derive", "parity-crypto 0.9.0", @@ -875,27 +910,28 @@ dependencies = [ "anyhow", "diem-infallible", "diem-metrics", - "futures 0.3.18", + "futures 0.3.28", ] [[package]] name = "chrono" -version = "0.4.19" +version = "0.4.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "670ad68c9088c2a963aaa298cb369688cf3f9465ce5e2d4ca10e6e0098a1ce73" +checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" dependencies = [ - "libc", - "num-integer", + "android-tzdata", + "iana-time-zone", + "js-sys", "num-traits", - "time", - "winapi 0.3.9", + "wasm-bindgen", + "windows-targets", ] [[package]] name = "chunked_transfer" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fff857943da45f546682664a79488be82e69e43c1a7a2307679ab9afb3a66d2e" +checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" [[package]] name = "cipher" @@ -917,24 +953,24 @@ dependencies = [ [[package]] name = "clang-sys" -version = "1.3.0" +version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa66045b9cb23c2e9c1520732030608b02ee07e5cfaa5a521ec15ded7fa24c90" +checksum = "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f" dependencies = [ "glob", "libc", - "libloading 0.7.2", + "libloading 0.7.4", ] [[package]] name = "clap" -version = "2.33.3" +version = "2.34.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" +checksum = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" dependencies = [ - "ansi_term 0.11.0", + "ansi_term 0.12.1", "atty", - "bitflags", + "bitflags 1.3.2", "strsim", "textwrap", "unicode-width", @@ -947,14 +983,14 @@ version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" dependencies = [ - "bitflags", + "bitflags 1.3.2", ] [[package]] name = "cmake" -version = "0.1.46" +version = "0.1.50" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7b858541263efe664aead4a5209a4ae5c5d2811167d4ed4ee0944503f8d2089" +checksum = "a31c789563b815f77f4250caee12365734369f942439b7defd71e18a48197130" dependencies = [ "cc", ] @@ -1001,9 +1037,9 @@ checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" [[package]] name = "core-foundation" -version = "0.9.2" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6888e10551bb93e424d8df1d07f1a8b4fceb0001a3a4b048bfc47554946f47b3" +checksum = "194a7a9e6de53fa55116934067c844d9d749312f75c6f6d0980e8c252f8c2146" dependencies = [ "core-foundation-sys", "libc", @@ -1011,15 +1047,15 @@ dependencies = [ [[package]] name = "core-foundation-sys" -version = "0.8.3" +version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5827cebf4670468b8772dd191856768aedcb1b0278a04f989f7766351917b9dc" +checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" [[package]] name = "cpufeatures" -version = "0.2.1" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "95059428f66df56b63431fdb4e1947ed2190586af5c5a8a8b71122bdf5a7f469" +checksum = "a17b76ff3a4162b0b27f354a0c87015ddad39d35f9c0c36607a3bdd175dde1f1" dependencies = [ "libc", ] @@ -1042,9 +1078,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.2.2" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3825b1e8580894917dc4468cb634a1b4e9745fddc854edad72d9c04644c0319f" +checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" dependencies = [ "cfg-if 1.0.0", ] @@ -1084,16 +1120,6 @@ dependencies = [ "maybe-uninit", ] -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", -] - [[package]] name = "crossbeam-deque" version = "0.5.2" @@ -1127,13 +1153,13 @@ dependencies = [ [[package]] name = "crossbeam-deque" -version = "0.8.1" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +checksum = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" dependencies = [ "cfg-if 1.0.0", - "crossbeam-epoch 0.9.5", - "crossbeam-utils 0.8.5", + "crossbeam-epoch 0.9.15", + "crossbeam-utils 0.8.16", ] [[package]] @@ -1175,7 +1201,7 @@ dependencies = [ "crossbeam-utils 0.6.6", "lazy_static", "memoffset 0.5.6", - "scopeguard 1.1.0", + "scopeguard 1.2.0", ] [[package]] @@ -1184,26 +1210,26 @@ version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cfg-if 0.1.10", "crossbeam-utils 0.7.2", "lazy_static", "maybe-uninit", "memoffset 0.5.6", - "scopeguard 1.1.0", + "scopeguard 1.2.0", ] [[package]] name = "crossbeam-epoch" -version = "0.9.5" +version = "0.9.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4ec02e091aa634e2c3ada4a392989e7c3116673ef0ac5b72232439094d73b7fd" +checksum = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" dependencies = [ + "autocfg 1.1.0", "cfg-if 1.0.0", - "crossbeam-utils 0.8.5", - "lazy_static", - "memoffset 0.6.4", - "scopeguard 1.1.0", + "crossbeam-utils 0.8.16", + "memoffset 0.9.0", + "scopeguard 1.2.0", ] [[package]] @@ -1239,19 +1265,18 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "cfg-if 0.1.10", "lazy_static", ] [[package]] name = "crossbeam-utils" -version = "0.8.5" +version = "0.8.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" +checksum = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" dependencies = [ "cfg-if 1.0.0", - "lazy_static", ] [[package]] @@ -1266,6 +1291,16 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "crypto-mac" version = "0.10.1" @@ -1302,9 +1337,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "44339b9ecede7f72a0d3b012bf9bb5a616dc8bfde23ce544e42da075c87198f0" dependencies = [ "byteorder", - "digest", + "digest 0.9.0", "fiat-crypto", - "rand_core 0.6.3", + "rand_core 0.6.4", "subtle", "zeroize", ] @@ -1322,7 +1357,7 @@ version = "0.1.0" dependencies = [ "kvdb 0.4.0", "kvdb-rocksdb", - "log 0.4.17", + "log", ] [[package]] @@ -1331,16 +1366,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fd733b5bf0bb5ca3c7cdea2135c91234c80b730e6e8a270851455a63b46c830" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "der" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28e98c534e9c8a0483aa01d6f6913bc063de254311bd267c9cf535e9b70e15b2" +checksum = "79b71cca7d95d7681a4b3b9cdf63c8dbc3730d0584c2c74e31416d64a90493f4" dependencies = [ "const-oid", ] @@ -1351,11 +1386,17 @@ version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcc3dd5e9e9c0b295d6e1e4d811fb6f157d5ffd784b8d202fc62eac8035a770b" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] +[[package]] +name = "destructure_traitobject" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c877555693c14d2f84191cfd3ad8582790fc52b5e2274b40b59cf5f5cea25c7" + [[package]] name = "diem-config" version = "0.1.0" @@ -1371,9 +1412,9 @@ dependencies = [ "diem-temppath", "diem-types", "get_if_addrs", - "log 0.4.17", + "log", "mirai-annotations", - "rand 0.8.4", + "rand 0.8.5", "serde", "serde_yaml", "short-hex-str", @@ -1388,13 +1429,13 @@ dependencies = [ "anyhow", "bcs", "bls-signatures", - "bytes 1.1.0", + "bytes 1.5.0", "cfx-types", "cfxkey", "curve25519-dalek-fiat", "diem-crypto-derive", "diem-logger", - "digest", + "digest 0.9.0", "ed25519-dalek-fiat", "hex", "hkdf", @@ -1404,12 +1445,12 @@ dependencies = [ "openssl", "parking_lot 0.11.2", "pkcs8", - "rand 0.8.4", + "rand 0.8.5", "rand_core 0.5.1", "serde", "serde-name", "serde_bytes", - "sha2", + "sha2 0.9.9", "static_assertions", "thiserror", "tiny-keccak 2.0.2", @@ -1421,9 +1462,9 @@ dependencies = [ name = "diem-crypto-derive" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -1470,9 +1511,9 @@ dependencies = [ name = "diem-log-derive" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -1500,12 +1541,12 @@ dependencies = [ "anyhow", "diem-logger", "diem-metrics-core", - "futures 0.3.18", - "hyper 0.14.15", + "futures 0.3.28", + "hyper", "once_cell", "prometheus 0.12.0", "serde_json", - "tokio 1.14.0", + "tokio 1.33.0", ] [[package]] @@ -1519,7 +1560,7 @@ dependencies = [ name = "diem-network-address-encryption" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bcs", "diem-global-constants", "diem-infallible", @@ -1561,7 +1602,7 @@ dependencies = [ name = "diem-secure-storage" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "bcs", "chrono", "diem-crypto", @@ -1573,7 +1614,7 @@ dependencies = [ "diem-types", "diem-vault-client", "enum_dispatch", - "rand 0.8.4", + "rand 0.8.5", "serde", "serde_json", "thiserror", @@ -1593,7 +1634,7 @@ name = "diem-temppath" version = "0.1.0" dependencies = [ "hex", - "rand 0.8.4", + "rand 0.8.5", ] [[package]] @@ -1612,19 +1653,19 @@ dependencies = [ "aes-gcm", "anyhow", "bcs", - "bytes 1.1.0", + "bytes 1.5.0", "cfx-types", "chrono", "diem-crypto", "diem-crypto-derive", "diem-logger", "hex", - "itertools 0.10.1", + "itertools 0.10.5", "mirai-annotations", "move-core-types", "once_cell", "pow-types", - "rand 0.8.4", + "rand 0.8.5", "serde", "serde_bytes", "serde_json", @@ -1637,7 +1678,7 @@ dependencies = [ name = "diem-vault-client" version = "0.1.0" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "chrono", "diem-crypto", "diem-types", @@ -1659,16 +1700,21 @@ dependencies = [ ] [[package]] -name = "dtoa" -version = "0.4.8" +name = "digest" +version = "0.10.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56899898ce76aaf4a0f24d914c97ea6ed976d42fec6ad33fcbb0a1103e07b2b0" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer 0.10.4", + "crypto-common", + "subtle", +] [[package]] name = "ed25519" -version = "1.3.0" +version = "1.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74e1069e39f1454367eb2de793ed062fac4c35c2934b76a81d90dd9abcd28816" +checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7" dependencies = [ "serde", "signature", @@ -1682,10 +1728,10 @@ checksum = "97c6ac152eba578c1c53d2cefe8ad02e239e3d6f971b0f1ef3cb54cd66037fa0" dependencies = [ "curve25519-dalek-fiat", "ed25519", - "rand 0.8.4", + "rand 0.8.5", "serde", "serde_bytes", - "sha2", + "sha2 0.9.9", "zeroize", ] @@ -1697,9 +1743,9 @@ checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" [[package]] name = "either" -version = "1.6.1" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" +checksum = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" [[package]] name = "elastic-array" @@ -1710,6 +1756,15 @@ dependencies = [ "heapsize", ] +[[package]] +name = "encoding_rs" +version = "0.8.33" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7268b386296a025e474d5140678f75d6de9493ae55a5d709eeb9dd08149945e1" +dependencies = [ + "cfg-if 1.0.0", +] + [[package]] name = "enum-map" version = "0.4.1" @@ -1727,21 +1782,21 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5c450cf304c9e18d45db562025a14fb1ca0f5c769b6f609309f81d4c31de455" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "enum_dispatch" -version = "0.3.7" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd53b3fde38a39a06b2e66dc282f3e86191e53bd04cc499929c15742beae3df8" +checksum = "8f33313078bb8d4d05a2733a94ac4c2d8a0df9a2b84424ebf4f33bfc224a890e" dependencies = [ "once_cell", - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] @@ -1752,20 +1807,36 @@ checksum = "44533bbbb3bb3c1fa17d9f2e4e38bbbaf8396ba82193c4cb1b6445d711445d36" dependencies = [ "atty", "humantime 1.3.0", - "log 0.4.17", + "log", "regex", "termcolor", ] +[[package]] +name = "equivalent" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" + [[package]] name = "erased-serde" -version = "0.3.16" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3de9ad4541d99dc22b59134e7ff8dc3d6c988c89ecd7324bf10a8362b07a2afa" +checksum = "6c138974f9d5e7fe373eb04df7cae98833802ae4b11c24ac7039a21d5af4b26c" dependencies = [ "serde", ] +[[package]] +name = "errno" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "error-chain" version = "0.12.4" @@ -1773,7 +1844,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2d2f06b9cac1506ece98fe3231e3cc9c4410ec3d5b1f24ae1c8946f0742cdefc" dependencies = [ "backtrace", - "version_check 0.9.3", + "version_check", ] [[package]] @@ -1831,7 +1902,7 @@ dependencies = [ "either", "ethereum-types 0.4.2", "keccak-hash 0.1.2", - "log 0.4.17", + "log", "memmap", "parking_lot 0.7.1", "primal", @@ -1898,7 +1969,7 @@ dependencies = [ "kvdb-memorydb", "lazy_static", "len-caching-lock", - "log 0.4.17", + "log", "lru-cache", "macros", "memory-cache 0.1.0 (git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0)", @@ -1941,7 +2012,7 @@ dependencies = [ "heapsize", "itertools 0.5.10", "kvdb 0.1.1", - "log 0.4.17", + "log", "parity-bytes", "parking_lot 0.7.1", "rayon", @@ -1996,7 +2067,7 @@ dependencies = [ "crossbeam-deque 0.6.3", "fnv", "futures 0.1.31", - "log 0.4.17", + "log", "num_cpus", "parking_lot 0.7.1", "slab", @@ -2022,7 +2093,7 @@ dependencies = [ "heapsize", "keccak-hash 0.1.2", "linked-hash-map", - "log 0.4.17", + "log", "parity-runtime", "parking_lot 0.7.1", "rlp 0.3.0", @@ -2089,7 +2160,7 @@ dependencies = [ "eth-secp256k1", "ethereum-types 0.4.2", "lazy_static", - "log 0.4.17", + "log", "memzero", "parity-crypto 0.3.0", "parity-wordlist", @@ -2111,7 +2182,7 @@ dependencies = [ "heapsize", "keccak-hash 0.1.2", "lazy_static", - "log 0.4.17", + "log", "memory-cache 0.1.0 (git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0)", "parity-bytes", "parking_lot 0.7.1", @@ -2137,8 +2208,8 @@ dependencies = [ "diem-types", "executor-types", "fail", - "futures 0.3.18", - "itertools 0.10.1", + "futures 0.3.28", + "itertools 0.10.5", "move-core-types", "once_cell", "pow-types", @@ -2171,7 +2242,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3be3c61c59fdc91f5dbc3ea31ee8623122ce80057058be560654c5d410d181a6" dependencies = [ "lazy_static", - "log 0.4.17", + "log", "rand 0.7.3", ] @@ -2191,9 +2262,9 @@ version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "aa4da3c766cd7a0db8242e326e9e4e081edd567072893ed320008189715366a4" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", "synstructure", ] @@ -2219,22 +2290,28 @@ dependencies = [ "plain_hasher", ] +[[package]] +name = "fastrand" +version = "2.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" + [[package]] name = "ff" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2958d04124b9f27f175eaeb9a9f383d026098aa837eadd8ba22c11f13a05b9e" +checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449" dependencies = [ - "bitvec 0.22.3", - "rand_core 0.6.3", + "bitvec 1.0.1", + "rand_core 0.6.4", "subtle", ] [[package]] name = "fiat-crypto" -version = "0.1.9" +version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "231a1fac5c14b525bdc7889c2ffc242905ef497af1cff28dd7c5a959fe56e1bd" +checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" [[package]] name = "fixed-hash" @@ -2275,13 +2352,11 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.22" +version = "1.0.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e6988e897c1c9c485f43b47a529cef42fde0547f9d8d41a7062518f1d8fc53f" +checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" dependencies = [ - "cfg-if 1.0.0", "crc32fast", - "libc", "miniz_oxide", ] @@ -2308,12 +2383,11 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b" [[package]] name = "form_urlencoded" -version = "1.0.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fc25a87fa4fd2094bffb06925852034d90a17f0d1e05197d4956d3555752191" +checksum = "a62bc1cf6f830c2ec14a513a9fb124d0a213a629668a4186f329db21fe045652" dependencies = [ - "matches", - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -2330,9 +2404,9 @@ dependencies = [ [[package]] name = "fs_extra" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2022715d62ab30faffd124d40b76f4134a550a87792276512b18d63272333394" +checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" [[package]] name = "fuchsia-cprng" @@ -2346,7 +2420,7 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" dependencies = [ - "bitflags", + "bitflags 1.3.2", "fuchsia-zircon-sys", ] @@ -2358,9 +2432,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" [[package]] name = "funty" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1847abb9cb65d566acd5942e94aea9c8f547ad02c98e1649326fc0e8910b8b1e" +checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c" [[package]] name = "futures" @@ -2370,9 +2444,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cd0210d8c325c245ff06fd95a3b13689a1a276ac8cfa8e8720cb840bfb84b9e" +checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" dependencies = [ "futures-channel", "futures-core", @@ -2385,9 +2459,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fc8cd39e3dbf865f7340dce6a2d401d24fd37c6fe6c4f0ee0de8bfca2252d27" +checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" dependencies = [ "futures-core", "futures-sink", @@ -2395,15 +2469,15 @@ dependencies = [ [[package]] name = "futures-core" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "629316e42fe7c2a0b9a65b47d159ceaa5453ab14e8f0a3c5eedbb8cd55b4a445" +checksum = "4bca583b7e26f571124fe5b7561d49cb2868d79116cfa0eefce955557c6fee8c" [[package]] name = "futures-executor" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b808bf53348a36cab739d7e04755909b9fcaaa69b7d7e588b37b6ec62704c97" +checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" dependencies = [ "futures-core", "futures-task", @@ -2412,19 +2486,19 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e481354db6b5c353246ccf6a728b0c5511d752c08da7260546fc0933869daa11" +checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" [[package]] name = "futures-macro" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a89f17b21645bc4ed773c69af9c9a0effd4a3f1a3876eadd453469f8854e7fdd" +checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] @@ -2433,26 +2507,26 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b460264b3593d68b16a7bc35f7bc226ddfebdf9a1c8db1ed95d5cc6b7168c826" dependencies = [ - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.13", ] [[package]] name = "futures-sink" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "996c6442437b62d21a32cd9906f9c41e7dc1e19a9579843fad948696769305af" +checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" [[package]] name = "futures-task" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dabf1872aaab32c886832f2276d2f5399887e2bd613698a02359e4ea83f8de12" +checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" [[package]] name = "futures-util" -version = "0.3.18" +version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d22213122356472061ac0f1ab2cee28d2bac8491410fd68c2af53d1cedb83e" +checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" dependencies = [ "futures 0.1.31", "futures-channel", @@ -2462,7 +2536,7 @@ dependencies = [ "futures-sink", "futures-task", "memchr", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.13", "pin-utils", "slab", ] @@ -2475,12 +2549,12 @@ checksum = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" [[package]] name = "generic-array" -version = "0.14.4" +version = "0.14.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "501466ecc8a30d1d3b7fc9229b122b2ce8ed6e9d9223f1138d4babb253e51817" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" dependencies = [ "typenum", - "version_check 0.9.3", + "version_check", ] [[package]] @@ -2518,13 +2592,13 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.3" +version = "0.2.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fcd999463524c52659517fe2cea98493cfe485d10565e7b0fb07dbba7ad2753" +checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", "libc", - "wasi 0.10.0+wasi-snapshot-preview1", + "wasi 0.11.0+wasi-snapshot-preview1", ] [[package]] @@ -2539,45 +2613,44 @@ dependencies = [ [[package]] name = "gimli" -version = "0.26.1" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" +checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "group" -version = "0.11.0" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5ac374b108929de78460075f3dc439fa66df9d8fc77e8f12caa5165fcf0c89" +checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63" dependencies = [ - "byteorder", "ff", - "rand 0.8.4", - "rand_core 0.6.3", + "rand 0.8.5", + "rand_core 0.6.4", "rand_xorshift 0.3.0", "subtle", ] [[package]] name = "h2" -version = "0.3.7" +version = "0.3.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fd819562fcebdac5afc5c113c3ec36f902840b70fd4fc458799c8ce4607ae55" +checksum = "91fc23aa11be92976ef4729127f1a74adf36d8436f7816b185d18df956790833" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", "futures-core", "futures-sink", "futures-util", "http", - "indexmap", + "indexmap 1.9.3", "slab", - "tokio 1.14.0", + "tokio 1.33.0", "tokio-util", "tracing", ] @@ -2601,14 +2674,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" dependencies = [ "ahash", - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] name = "hashbrown" -version = "0.11.2" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + +[[package]] +name = "hashbrown" +version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" +checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" [[package]] name = "heap-map" @@ -2645,12 +2724,24 @@ dependencies = [ "libc", ] +[[package]] +name = "hermit-abi" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d77f7ec81a6d05a3abb01ab6eb7590f6083d08449fe5a1c8b1e620283546ccb7" + [[package]] name = "hex" version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" +[[package]] +name = "hex-literal" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" + [[package]] name = "hibitset" version = "0.6.0" @@ -2667,7 +2758,7 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "51ab2f639c231793c5f6114bdb9bbe50a7dbbfcd7c7c6bd8475dec2d991e964f" dependencies = [ - "digest", + "digest 0.9.0", "hmac 0.10.1", ] @@ -2678,7 +2769,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c1441c6b1e930e2817404b5046f1f989899143a12bf92de603b69f4e0aee1e15" dependencies = [ "crypto-mac 0.10.1", - "digest", + "digest 0.9.0", ] [[package]] @@ -2688,22 +2779,31 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b" dependencies = [ "crypto-mac 0.11.1", - "digest", + "digest 0.9.0", +] + +[[package]] +name = "hmac" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c49c37c09c17a53d937dfbb742eb3a961d65a994e6bcdcf37e7399d0cc8ab5e" +dependencies = [ + "digest 0.10.7", ] [[package]] name = "hmac-sha256" -version = "0.1.7" +version = "1.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bcdc571e566521512579aab40bf807c5066e1765fb36857f16ed7595c13567c6" +checksum = "3688e69b38018fec1557254f64c8dc2cc8ec502890182f395dbb0aa997aa5735" [[package]] name = "home" -version = "0.5.3" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2456aef2e6b6a9784192ae780c0f15bc57df0e918585282325e8c8ac27737654" +checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -2719,37 +2819,37 @@ dependencies = [ [[package]] name = "http" -version = "0.2.5" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1323096b05d41827dadeaee54c9981958c0f94e670bc94ed80037d1a7b8b186b" +checksum = "bd6effc99afb63425aff9b05836f029929e345a6148a14b7ecd5ab67af944482" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "fnv", "itoa", ] [[package]] name = "http-body" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ff4f84919677303da5f147645dbea6b1881f368d03ac84e1dc09031ebd7b2c6" +checksum = "d5f38f16d184e36f2408a55281cd658ecbd3ca05cce6d6510a176eca393e26d1" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "http", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.13", ] [[package]] name = "httparse" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acd94fdbe1d4ff688b67b04eee2e17bd50995534a61539e45adfefb45e5e5503" +checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904" [[package]] name = "httpdate" -version = "1.0.2" +version = "1.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" +checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9" [[package]] name = "humantime" @@ -2768,30 +2868,11 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4" [[package]] name = "hyper" -version = "0.10.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0a0652d9a2609a968c14be1a9ea00bf4b1d64e2e1f53a1b51b6fff3a6e829273" -dependencies = [ - "base64 0.9.3", - "httparse", - "language-tags", - "log 0.3.9", - "mime", - "num_cpus", - "time", - "traitobject", - "typeable", - "unicase", - "url 1.7.2", -] - -[[package]] -name = "hyper" -version = "0.14.15" +version = "0.14.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "436ec0091e4f20e655156a30a0df3770fe2900aa301e548e08446ec794b6953c" +checksum = "ffb1cfd654a8219eaef89881fdb3bb3b1cdc5fa75ded05d6933b2b382e395468" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-channel", "futures-core", "futures-util", @@ -2801,43 +2882,56 @@ dependencies = [ "httparse", "httpdate", "itoa", - "pin-project-lite 0.2.7", - "socket2", - "tokio 1.14.0", + "pin-project-lite 0.2.13", + "socket2 0.4.9", + "tokio 1.33.0", "tower-service", "tracing", "want", ] [[package]] -name = "hyper-native-tls" -version = "0.3.0" +name = "hyper-tls" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d375598f442742b0e66208ee12501391f1c7ac0bafb90b4fe53018f81f06068" +checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905" dependencies = [ - "antidote", - "hyper 0.10.16", + "bytes 1.5.0", + "hyper", "native-tls", + "tokio 1.33.0", + "tokio-native-tls", ] [[package]] -name = "idna" -version = "0.1.5" +name = "iana-time-zone" +version = "0.1.58" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" +checksum = "8326b86b6cff230b97d0d312a6c40a60726df3332e721f72a1b035f451663b20" dependencies = [ - "matches", - "unicode-bidi", - "unicode-normalization", + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "wasm-bindgen", + "windows-core", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", ] [[package]] name = "idna" -version = "0.2.3" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8" +checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c" dependencies = [ - "matches", "unicode-bidi", "unicode-normalization", ] @@ -2850,7 +2944,7 @@ checksum = "c5bab3d4e7e5b7e564770440ee64b6ae9fd227434ea8f2845ed5b5859d7ca652" dependencies = [ "attohttpc", "rand 0.7.3", - "url 2.2.2", + "url", "xmltree", ] @@ -2887,31 +2981,41 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7ef5550a42e3740a0e71f909d4c861056a284060af885ae7aa6242820f920d9d" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "indexmap" -version = "1.7.0" +version = "1.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" +checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" dependencies = [ - "autocfg 1.0.1", - "hashbrown 0.11.2", + "autocfg 1.1.0", + "hashbrown 0.12.3", +] + +[[package]] +name = "indexmap" +version = "2.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897" +dependencies = [ + "equivalent", + "hashbrown 0.14.1", ] [[package]] name = "influx_db_client" -version = "0.3.6" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1af8df5705f0b30bcb504bafc9396d995a555c4d6bd6f9097729ad47b8a49a38" +checksum = "d2ef03268010ccf98c178eed83aa7377b7f6531f8ec8d43a256902c24cadac60" dependencies = [ - "hyper 0.10.16", - "hyper-native-tls", + "bytes 1.5.0", + "futures 0.3.28", + "reqwest", "serde", - "serde_derive", "serde_json", ] @@ -2932,7 +3036,7 @@ dependencies = [ "crossbeam-deque 0.7.4", "fnv", "lazy_static", - "log 0.4.17", + "log", "metrics", "mio 0.6.23", "num_cpus", @@ -2953,9 +3057,9 @@ dependencies = [ [[package]] name = "ipnet" -version = "2.3.1" +version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f2d64f2edebec4ce84ad108148e67e1064789bee435edc5b60ad398714a3a9" +checksum = "28b29a3cd74f0f4598934efe3aeba42bae0eb4680554128851ebbecb02af14e6" [[package]] name = "ipnetwork" @@ -2983,24 +3087,24 @@ dependencies = [ [[package]] name = "itertools" -version = "0.10.1" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf" +checksum = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" dependencies = [ "either", ] [[package]] name = "itoa" -version = "0.4.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b71991ff56294aa922b450139ee08b3bfc70982c6b2c7562771375cf73542dd4" +checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" [[package]] name = "jobserver" -version = "0.1.24" +version = "0.1.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af25a77299a7f711a01975c35a6a424eb6862092cc2d6c72c4ed6cbc56dfc1fa" +checksum = "8c37f63953c4c63420ed5fd3d6d398c719489b9f872b9fa683262f8edd363c7d" dependencies = [ "libc", ] @@ -3016,13 +3120,22 @@ dependencies = [ "heapsize", "keccak-hasher", "kvdb 0.1.1", - "log 0.4.17", + "log", "memory-db", "parity-bytes", "parking_lot 0.7.1", "rlp 0.3.0", ] +[[package]] +name = "js-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +dependencies = [ + "wasm-bindgen", +] + [[package]] name = "jsonrpc-core" version = "15.1.0" @@ -3030,7 +3143,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0745a6379e3edc893c84ec203589790774e4247420033e71a76d3ab4687991fa" dependencies = [ "futures 0.1.31", - "log 0.4.17", + "log", "serde", "serde_derive", "serde_json", @@ -3095,7 +3208,7 @@ checksum = "03080afe6f42cd996da9f568d6add5d7fb5ee2ea7fb7802d2d2cbd836958fd87" dependencies = [ "parity-bytes", "parity-util-mem", - "smallvec 1.7.0", + "smallvec 1.11.1", ] [[package]] @@ -3115,7 +3228,7 @@ dependencies = [ "cfx-types", "fs-swap", "kvdb 0.4.0", - "log 0.4.17", + "log", "malloc_size_of", "malloc_size_of_derive", "num_cpus", @@ -3125,12 +3238,6 @@ dependencies = [ "rocksdb", ] -[[package]] -name = "language-tags" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" - [[package]] name = "lazy_static" version = "1.4.0" @@ -3156,15 +3263,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.108" +version = "0.2.149" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119" +checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libflate" -version = "1.2.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05605ab2bce11bcfc0e9c635ff29ef8b2ea83f29be257ee7d730cac3ee373093" +checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" dependencies = [ "adler32", "crc32fast", @@ -3173,9 +3280,9 @@ dependencies = [ [[package]] name = "libflate_lz77" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39a734c0493409afcd49deee13c006a04e3586b9761a03543c6272c9c51f2f5a" +checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" dependencies = [ "rle-decode-fast", ] @@ -3192,9 +3299,9 @@ dependencies = [ [[package]] name = "libloading" -version = "0.7.2" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "afe203d669ec979b7128619bae5a63b7b42e9203c1b29146079ee05e2f604b52" +checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" dependencies = [ "cfg-if 1.0.0", "winapi 0.3.9", @@ -3203,7 +3310,7 @@ dependencies = [ [[package]] name = "librocksdb_sys" version = "0.1.0" -source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=1432683cb94609113d2ca9fcd6e2d7117b31e8a3#1432683cb94609113d2ca9fcd6e2d7117b31e8a3" +source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=a1ce5bd3322a7b732dfb300c2571dc4d99f1edae#a1ce5bd3322a7b732dfb300c2571dc4d99f1edae" dependencies = [ "bindgen", "bzip2-sys", @@ -3220,7 +3327,7 @@ dependencies = [ [[package]] name = "libtitan_sys" version = "0.0.1" -source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=1432683cb94609113d2ca9fcd6e2d7117b31e8a3#1432683cb94609113d2ca9fcd6e2d7117b31e8a3" +source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=a1ce5bd3322a7b732dfb300c2571dc4d99f1edae#a1ce5bd3322a7b732dfb300c2571dc4d99f1edae" dependencies = [ "bzip2-sys", "cc", @@ -3235,9 +3342,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.3" +version = "1.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de5435b8549c16d423ed0c03dbaafe57cf6c3344744f1242520d59c9d8ecec66" +checksum = "d97137b25e321a73eef1418d1d5d2eda4d77e12813f8e6dead84bc52c5870a7b" dependencies = [ "cc", "libc", @@ -3258,9 +3365,15 @@ dependencies = [ [[package]] name = "linked-hash-map" -version = "0.5.4" +version = "0.5.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0717cef1bc8b636c6e1c1bbdefc09e6322da8a9321966e8928ef80d20f7f770f" + +[[package]] +name = "linux-raw-sys" +version = "0.4.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fb9b38af92608140b86b693604b9ffcc5824240a484d1ecd4795bacb2fe88f3" +checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f" [[package]] name = "lock_api" @@ -3278,68 +3391,58 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" dependencies = [ - "scopeguard 1.1.0", + "scopeguard 1.2.0", ] [[package]] name = "lock_api" -version = "0.4.5" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712a4d093c9976e24e7dbca41db895dabcbac38eb5f4045393d17a95bdfb1109" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" dependencies = [ - "scopeguard 1.1.0", + "autocfg 1.1.0", + "scopeguard 1.2.0", ] [[package]] name = "log" -version = "0.3.9" +version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" +checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" dependencies = [ - "log 0.4.17", + "serde", ] [[package]] -name = "log" -version = "0.4.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e" -dependencies = [ - "cfg-if 1.0.0", - "serde", -] - -[[package]] -name = "log-mdc" -version = "0.1.0" +name = "log-mdc" +version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a94d21414c1f4a51209ad204c1776a3d0765002c76c6abcb602a6f09f1e881c7" [[package]] name = "log4rs" -version = "1.0.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1572a880d1115ff867396eee7ae2bc924554225e67a0d3c85c745b3e60ca211" +checksum = "d36ca1786d9e79b8193a68d480a0907b612f109537115c6ff655a3a1967533fd" dependencies = [ "anyhow", - "arc-swap 0.4.8", + "arc-swap", "chrono", "derivative", "flate2", "fnv", "humantime 2.1.0", "libc", - "log 0.4.17", + "log", "log-mdc", - "parking_lot 0.11.2", - "regex", + "parking_lot 0.12.1", "serde", "serde-value", "serde_json", "serde_yaml", "thiserror", "thread-id", - "typemap", + "typemap-ors", "winapi 0.3.9", ] @@ -3381,7 +3484,7 @@ dependencies = [ "hashbrown 0.7.2", "parking_lot 0.11.2", "slab", - "smallvec 1.7.0", + "smallvec 1.11.1", "winapi 0.3.9", ] @@ -3389,8 +3492,8 @@ dependencies = [ name = "malloc_size_of_derive" version = "0.1.1" dependencies = [ - "proc-macro2 1.0.32", - "syn 1.0.82", + "proc-macro2 1.0.69", + "syn 1.0.109", "synstructure", ] @@ -3400,12 +3503,6 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" -[[package]] -name = "matches" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3e378b66a060d48947b590737b30a1be76706c8dd7b8ba0f2fe3989c68a853f" - [[package]] name = "maybe-uninit" version = "2.0.0" @@ -3414,9 +3511,9 @@ checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" [[package]] name = "memchr" -version = "2.4.1" +version = "2.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" +checksum = "f665ee40bc4a3c5590afb1e9677db74a508659dfd71e126420da8274909a0167" [[package]] name = "memmap" @@ -3440,16 +3537,16 @@ version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "043175f069eda7b85febe4a74abbaeff828d9f8b448515d3151a14a3542811aa" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] name = "memoffset" -version = "0.6.4" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59accc507f1338036a0477ef61afdae33cde60840f4dfe481319ce3ad116ddf9" +checksum = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] @@ -3494,33 +3591,37 @@ source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd name = "metrics" version = "0.1.0" dependencies = [ + "futures 0.3.28", "influx_db_client", "lazy_static", - "log 0.4.17", + "log", "log4rs", "parking_lot 0.11.2", "rand 0.7.3", "time", "timer", + "tokio 1.33.0", ] [[package]] name = "mime" -version = "0.2.6" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba626b8a6de5da682e1caa06bdb42a335aee5a84db8e5046a3e8ab17ba0a3ae0" -dependencies = [ - "log 0.3.9", -] +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" + +[[package]] +name = "minimal-lexical" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "miniz_oxide" -version = "0.4.4" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" +checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", - "autocfg 1.0.1", ] [[package]] @@ -3535,7 +3636,7 @@ dependencies = [ "iovec", "kernel32-sys", "libc", - "log 0.4.17", + "log", "miow 0.2.2", "net2", "slab", @@ -3544,15 +3645,13 @@ dependencies = [ [[package]] name = "mio" -version = "0.7.14" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8067b404fe97c70829f082dec8bcf4f71225d7eaea1d8645349cb76fa06205cc" +checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", - "log 0.4.17", - "miow 0.3.7", - "ntapi", - "winapi 0.3.9", + "wasi 0.11.0+wasi-snapshot-preview1", + "windows-sys", ] [[package]] @@ -3561,7 +3660,7 @@ version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" dependencies = [ - "log 0.4.17", + "log", "mio 0.6.23", "miow 0.3.7", "winapi 0.3.9", @@ -3615,7 +3714,7 @@ dependencies = [ "hex", "mirai-annotations", "once_cell", - "rand 0.8.4", + "rand 0.8.5", "ref-cast", "serde", "serde_bytes", @@ -3629,13 +3728,13 @@ checksum = "34d4f00fcc2f4c9efa8cc971db0da9e28290e28e97af47585e48691ef10ff31f" [[package]] name = "native-tls" -version = "0.2.8" +version = "0.2.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48ba9f7719b5a0f42f338907614285fb5fd70e53858141f69898a1fb7203b24d" +checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e" dependencies = [ "lazy_static", "libc", - "log 0.4.17", + "log", "openssl", "openssl-probe", "openssl-sys", @@ -3656,9 +3755,9 @@ dependencies = [ [[package]] name = "net2" -version = "0.2.37" +version = "0.2.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "391630d12b68002ae1e25e8f974306474966550ad82dac6886fb8910c19568ae" +checksum = "b13b648036a2339d06de780866fbdfda0dde886de7b3af2ddeba8b14f4ee34ac" dependencies = [ "cfg-if 0.1.10", "libc", @@ -3686,7 +3785,7 @@ dependencies = [ "keccak-hash 0.5.1", "lazy_static", "libc", - "log 0.4.17", + "log", "malloc_size_of", "metrics", "mio 0.6.23", @@ -3714,21 +3813,12 @@ checksum = "72ef4a56884ca558e5ddb05a1d1e7e1bfd9a68d9ed024c21704cc98872dae1bb" [[package]] name = "nom" -version = "5.1.2" +version = "7.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" +checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" dependencies = [ "memchr", - "version_check 0.9.3", -] - -[[package]] -name = "ntapi" -version = "0.3.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f6bb902e437b6d86e03cce10a7e2af662292c5dfef23b65899ea3ac9354ad44" -dependencies = [ - "winapi 0.3.9", + "minimal-lexical", ] [[package]] @@ -3775,7 +3865,7 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -3786,7 +3876,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-traits", ] @@ -3796,28 +3886,28 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-traits", ] [[package]] name = "num-iter" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2021c8337a54d21aca0d59a92577a029af9431cb59b909b03252b9c164fad59" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-integer", "num-traits", ] @@ -3828,7 +3918,7 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", "num-bigint 0.2.6", "num-integer", "num-traits", @@ -3836,46 +3926,46 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" dependencies = [ - "autocfg 1.0.1", + "autocfg 1.1.0", ] [[package]] name = "num-variants" version = "0.1.0" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "num_cpus" -version = "1.13.0" +version = "1.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" dependencies = [ - "hermit-abi", + "hermit-abi 0.3.3", "libc", ] [[package]] name = "object" -version = "0.27.1" +version = "0.32.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67ac1d3f9a1d3616fd9a60c8d74296f22406a238b6a72f5cc1e6f314df4ffbf9" +checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0" dependencies = [ "memchr", ] [[package]] name = "once_cell" -version = "1.17.1" +version = "1.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7e5500299e16ebb147ae15a00a942af264cf3688f47923b8fc2cd5858f23ad3" +checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" [[package]] name = "opaque-debug" @@ -3885,31 +3975,42 @@ checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5" [[package]] name = "openssl" -version = "0.10.38" +version = "0.10.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c7ae222234c30df141154f159066c5093ff73b63204dcda7121eb082fc56a95" +checksum = "bac25ee399abb46215765b1cb35bc0212377e58a061560d8b29b024fd0430e7c" dependencies = [ - "bitflags", + "bitflags 2.4.1", "cfg-if 1.0.0", "foreign-types", "libc", "once_cell", + "openssl-macros", "openssl-sys", ] +[[package]] +name = "openssl-macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + [[package]] name = "openssl-probe" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-sys" -version = "0.9.71" +version = "0.9.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7df13d165e607909b363a4757a6f133f8a818a74e9d3a98d09c6128e15fa4c73" +checksum = "db4d56a4c0478783083cfafcc42493dd4a981d41669da64b4572a2a089b51b1d" dependencies = [ - "autocfg 1.0.1", "cc", "libc", "pkg-config", @@ -3918,9 +4019,9 @@ dependencies = [ [[package]] name = "ordered-float" -version = "2.8.0" +version = "2.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97c9d06878b3a851e8026ef94bf7fef9ba93062cd412601da4d9cf369b1cc62d" +checksum = "68f19d67e5a2795c94e73e0bb1cc1a7edeb2e28efd39e2e1c9b7a40c1108b11c" dependencies = [ "num-traits", ] @@ -3936,9 +4037,9 @@ dependencies = [ [[package]] name = "pairing" -version = "0.21.0" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2e415e349a3006dd7d9482cdab1c980a845bed1377777d768cb693a44540b42" +checksum = "81fec4625e73cf41ef4bb6846cafa6d44736525f442ba45e407c4a000a13996f" dependencies = [ "group", ] @@ -3970,12 +4071,12 @@ dependencies = [ "aes 0.6.0", "aes-ctr", "block-modes 0.7.0", - "digest", + "digest 0.9.0", "hmac 0.10.1", "pbkdf2 0.7.5", "ripemd160", "scrypt 0.5.0", - "sha2", + "sha2 0.9.9", "subtle", "tiny-keccak 2.0.2", "zeroize", @@ -4057,8 +4158,8 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f557c32c6d268a07c921471619c0295f5efad3a0e76d4f97a05c091a51d110b2" dependencies = [ - "proc-macro2 1.0.32", - "syn 1.0.82", + "proc-macro2 1.0.69", + "syn 1.0.109", "synstructure", ] @@ -4108,7 +4209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" dependencies = [ "lock_api 0.3.4", - "parking_lot_core 0.6.2", + "parking_lot_core 0.6.3", "rustc_version", ] @@ -4119,8 +4220,18 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7d17b78036a60663b797adeaee46f5c9dfebb86948d1255007a1d6be0271ff99" dependencies = [ "instant", - "lock_api 0.4.5", - "parking_lot_core 0.8.5", + "lock_api 0.4.11", + "parking_lot_core 0.8.6", +] + +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api 0.4.11", + "parking_lot_core 0.9.9", ] [[package]] @@ -4151,9 +4262,9 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.6.2" +version = "0.6.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" +checksum = "bda66b810a62be75176a80873726630147a5ca780cd33921e0b5709033e66b0a" dependencies = [ "cfg-if 0.1.10", "cloudabi", @@ -4166,18 +4277,31 @@ dependencies = [ [[package]] name = "parking_lot_core" -version = "0.8.5" +version = "0.8.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d76e8e1493bcac0d2766c42737f34458f1c8c50c0d23bcb24ea953affb273216" +checksum = "60a2cfe6f0ad2bfc16aefa463b497d5c7a5ecd44a23efa72aa342d90177356dc" dependencies = [ "cfg-if 1.0.0", "instant", "libc", - "redox_syscall 0.2.10", - "smallvec 1.7.0", + "redox_syscall 0.2.16", + "smallvec 1.11.1", "winapi 0.3.9", ] +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.4.1", + "smallvec 1.11.1", + "windows-targets", +] + [[package]] name = "password-hash" version = "0.1.4" @@ -4185,32 +4309,32 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "54986aa4bfc9b98c6a5f40184223658d187159d7b3c6af33f2b2aa25ae1db0fa" dependencies = [ "base64ct", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] name = "path-absolutize" -version = "3.0.13" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3de4b40bd9736640f14c438304c09538159802388febb02c8abaae0846c1f13" +checksum = "e4af381fe79fa195b4909485d99f73a80792331df0625188e707854f0b3383f5" dependencies = [ "path-dedot", ] [[package]] name = "path-dedot" -version = "3.0.17" +version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d611d5291372b3738a34ebf0d1f849e58b1dcc1101032f76a346eaa1f8ddbb5b" +checksum = "07ba0ad7e047712414213ff67533e6dd477af0a4e1d14fb52343e53d30ea9397" dependencies = [ "once_cell", ] [[package]] name = "path-slash" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3cacbb3c4ff353b534a67fb8d7524d00229da4cb1dc8c79f4db96e375ab5b619" +checksum = "498a099351efa4becc6a19c72aa9270598e8fd274ca47052e37455241c88b696" [[package]] name = "patricia-trie-ethereum" @@ -4245,7 +4369,7 @@ dependencies = [ "crypto-mac 0.10.1", "hmac 0.10.1", "password-hash", - "sha2", + "sha2 0.9.9", ] [[package]] @@ -4258,22 +4382,25 @@ dependencies = [ ] [[package]] -name = "peeking_take_while" -version = "0.1.2" +name = "pbkdf2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" +checksum = "271779f35b581956db91a3e55737327a03aa051e90b1c47aeb189508533adfd7" +dependencies = [ + "digest 0.10.7", +] [[package]] -name = "percent-encoding" -version = "1.0.1" +name = "peeking_take_while" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" [[package]] name = "percent-encoding" -version = "2.1.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d4fd5641d01c8f18a23da7b6fe29298ff4b55afcccdf78973b24cf3175fee32e" +checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" [[package]] name = "pin-project-lite" @@ -4283,9 +4410,9 @@ checksum = "257b64915a082f7811703966789728173279bdebb956b143dbcd23f6f970a777" [[package]] name = "pin-project-lite" -version = "0.2.7" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d31d11c69a6b52a174b42bdc0c30e5e11670f90788b2c471c31c1d17d449443" +checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58" [[package]] name = "pin-utils" @@ -4315,8 +4442,8 @@ dependencies = [ "der", "hmac 0.11.0", "pbkdf2 0.9.0", - "scrypt 0.8.0", - "sha2", + "scrypt 0.8.1", + "sha2 0.9.9", "spki", ] @@ -4328,16 +4455,16 @@ checksum = "ee3ef9b64d26bad0536099c816c6734379e45bbd5f14798def6809e5cc350447" dependencies = [ "der", "pkcs5", - "rand_core 0.6.3", + "rand_core 0.6.4", "spki", "zeroize", ] [[package]] name = "pkg-config" -version = "0.3.22" +version = "0.3.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12295df4f294471248581bc09bef3c38a5e46f1e36d6a37353621a0c6c357e1f" +checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964" [[package]] name = "plain_hasher" @@ -4365,7 +4492,7 @@ version = "0.1.0" dependencies = [ "accumulator", "anyhow", - "arc-swap 1.5.0", + "arc-swap", "bcs", "byteorder", "consensus-types", @@ -4377,7 +4504,7 @@ dependencies = [ "diem-metrics", "diem-types", "executor-types", - "itertools 0.10.1", + "itertools 0.10.5", "num-derive", "num-traits", "num-variants", @@ -4400,9 +4527,9 @@ dependencies = [ [[package]] name = "ppv-lite86" -version = "0.2.15" +version = "0.2.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed0cfbc8191465bed66e1718596ee0b0b35d5ee1f41c5df2189d0fe8bde535ba" +checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" [[package]] name = "primal" @@ -4475,14 +4602,15 @@ dependencies = [ "fixed-hash 0.5.2", "keccak-hash 0.5.1", "lazy_static", - "log 0.4.17", + "log", "malloc_size_of", + "once_cell", "rand 0.7.3", "rlp 0.4.6", "rlp_derive 0.1.0 (git+https://github.com/Conflux-Chain/conflux-parity-deps.git?rev=1597a9cab02343eb2322ca0ac58d39b64e3f42d1)", "serde", "serde_derive", - "siphasher 0.3.7", + "siphasher 0.3.11", "unexpected 0.1.0 (git+https://github.com/Conflux-Chain/conflux-parity-deps.git?rev=1597a9cab02343eb2322ca0ac58d39b64e3f42d1)", ] @@ -4492,12 +4620,12 @@ version = "0.1.0" [[package]] name = "proc-macro-crate" -version = "1.1.3" +version = "1.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a" +checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919" dependencies = [ - "thiserror", - "toml", + "once_cell", + "toml_edit", ] [[package]] @@ -4511,11 +4639,11 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.32" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" +checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da" dependencies = [ - "unicode-xid 0.2.2", + "unicode-ident", ] [[package]] @@ -4559,7 +4687,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "efb0dcbddbb600f47a7098d33762a00552c671992171637f5bb310b37fe1f0e4" dependencies = [ "byteorder", - "log 0.4.17", + "log", "parity-wasm", ] @@ -4569,7 +4697,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" dependencies = [ - "percent-encoding 2.1.0", + "percent-encoding", ] [[package]] @@ -4589,11 +4717,11 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.10" +version = "1.0.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" +checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" dependencies = [ - "proc-macro2 1.0.32", + "proc-macro2 1.0.69", ] [[package]] @@ -4604,9 +4732,9 @@ checksum = "def50a86306165861203e7f84ecffbbdfdea79f0e51039b33de1e952358c47ac" [[package]] name = "radium" -version = "0.6.2" +version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "643f8f41a8ebc4c5dc4515c82bb8abd397b527fc20fd681b7c011c2aee5d44fb" +checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" [[package]] name = "rand" @@ -4650,7 +4778,7 @@ version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "libc", "rand_chacha 0.1.1", "rand_core 0.4.2", @@ -4678,14 +4806,13 @@ dependencies = [ [[package]] name = "rand" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e7573632e6454cf6b99d7aac4ccca54be06da05aca2ef7423d22d27d4d4bcd8" +checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ "libc", "rand_chacha 0.3.1", - "rand_core 0.6.3", - "rand_hc 0.3.1", + "rand_core 0.6.4", ] [[package]] @@ -4694,7 +4821,7 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "rand_core 0.3.1", ] @@ -4715,7 +4842,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" dependencies = [ "ppv-lite86", - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4744,11 +4871,11 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.6.3" +version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" +checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.3", + "getrandom 0.2.10", ] [[package]] @@ -4769,15 +4896,6 @@ dependencies = [ "rand_core 0.5.1", ] -[[package]] -name = "rand_hc" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51e9f596de227fda2ea6c84607f5558e196eeaf43c986b724ba4fb8fdf497e7" -dependencies = [ - "rand_core 0.6.3", -] - [[package]] name = "rand_isaac" version = "0.1.1" @@ -4818,7 +4936,7 @@ version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" dependencies = [ - "autocfg 0.1.7", + "autocfg 0.1.8", "rand_core 0.4.2", ] @@ -4846,7 +4964,7 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d25bf25ec5ae4a3f1b92f929810509a2f53d7dca2f50b794ff57e3face536c8f" dependencies = [ - "rand_core 0.6.3", + "rand_core 0.6.4", ] [[package]] @@ -4854,34 +4972,29 @@ name = "random-crash" version = "1.0.0" dependencies = [ "lazy_static", - "log 0.4.17", + "log", "parking_lot 0.11.2", "rand 0.7.3", ] [[package]] name = "rayon" -version = "1.5.1" +version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c06aca804d41dbc8ba42dfd964f0d01334eceb64314b9ecf7c5fad5188a06d90" +checksum = "9c27db03db7734835b3f53954b534c91069375ce6ccaa2e065441e07d9b6cdb1" dependencies = [ - "autocfg 1.0.1", - "crossbeam-deque 0.8.1", "either", "rayon-core", ] [[package]] name = "rayon-core" -version = "1.9.1" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d78120e2c850279833f1dd3582f730c4ab53ed95aeaaaa862a2a5c71b1656d8e" +checksum = "5ce3fb6ad83f861aac485e76e1985cd109d9a3713802152be56c3b1f0e0658ed" dependencies = [ - "crossbeam-channel 0.5.1", - "crossbeam-deque 0.8.1", - "crossbeam-utils 0.8.5", - "lazy_static", - "num_cpus", + "crossbeam-deque 0.8.3", + "crossbeam-utils 0.8.16", ] [[package]] @@ -4901,44 +5014,74 @@ checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" [[package]] name = "redox_syscall" -version = "0.2.10" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8383f39639269cde97d255a32bdb68c047337295414940c68bdd30c2e13203ff" +checksum = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" dependencies = [ - "bitflags", + "bitflags 1.3.2", +] + +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", ] [[package]] name = "reexport-proc-macro" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b90ec417f693152463d468b6d06ccc45ae3833f0538ef9e1cc154cf09eb1f575" +checksum = "c6fd6195683d528242d8b017810909f8aaf91f111fdc4dbe8b10e4dd50e0c7f4" [[package]] name = "ref-cast" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "300f2a835d808734ee295d45007adacb9ebb29dd3ae2424acfa17930cae541da" +checksum = "acde58d073e9c79da00f2b5b84eed919c8326832648a5b109b3fce1bb1175280" dependencies = [ "ref-cast-impl", ] [[package]] name = "ref-cast-impl" -version = "1.0.6" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c38e3aecd2b21cb3959637b883bb3714bc7e43f0268b9a29d3743ee3e55cdd2" +checksum = "7f7473c2cfcf90008193dd0e3e16599455cb601a9fce322b5bb55de799664925" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] name = "regex" -version = "1.5.6" +version = "1.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d83f127d94bdbcda4c8cc2e50f6f84f4b611f69c902699ca385a39c3a75f9ff1" +checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", +] + +[[package]] +name = "regex-automata" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", @@ -4947,9 +5090,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.6.26" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64" +checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "remove_dir_all" @@ -4960,6 +5103,44 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "reqwest" +version = "0.11.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "046cd98826c46c2ac8ddecae268eb5c2e58628688a5fc7a2643704a73faba95b" +dependencies = [ + "base64 0.21.4", + "bytes 1.5.0", + "encoding_rs", + "futures-core", + "futures-util", + "h2", + "http", + "http-body", + "hyper", + "hyper-tls", + "ipnet", + "js-sys", + "log", + "mime", + "native-tls", + "once_cell", + "percent-encoding", + "pin-project-lite 0.2.13", + "serde", + "serde_json", + "serde_urlencoded", + "system-configuration", + "tokio 1.33.0", + "tokio-native-tls", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "winreg", +] + [[package]] name = "ring" version = "0.14.6" @@ -4980,8 +5161,8 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2eca4ecc81b7f313189bf73ce724400a07da2a6dac19588b03c8bd76a2dcc251" dependencies = [ - "block-buffer", - "digest", + "block-buffer 0.9.0", + "digest 0.9.0", "opaque-debug", ] @@ -5044,7 +5225,7 @@ dependencies = [ [[package]] name = "rocksdb" version = "0.3.0" -source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=1432683cb94609113d2ca9fcd6e2d7117b31e8a3#1432683cb94609113d2ca9fcd6e2d7117b31e8a3" +source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=a1ce5bd3322a7b732dfb300c2571dc4d99f1edae#a1ce5bd3322a7b732dfb300c2571dc4d99f1edae" dependencies = [ "libc", "librocksdb_sys", @@ -5065,9 +5246,9 @@ dependencies = [ [[package]] name = "rustc-demangle" -version = "0.1.21" +version = "0.1.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" +checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76" [[package]] name = "rustc-hash" @@ -5103,16 +5284,23 @@ dependencies = [ ] [[package]] -name = "ryu" -version = "1.0.6" +name = "rustix" +version = "0.38.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9613b5a66ab9ba26415184cfc41156594925a9cf3a2057e57f31ff145f6568" +checksum = "745ecfa778e66b2b63c88a61cb36e0eea109e803b0b86bf9879fbc77c70e86ed" +dependencies = [ + "bitflags 2.4.1", + "errno", + "libc", + "linux-raw-sys", + "windows-sys", +] [[package]] -name = "safemem" -version = "0.3.3" +name = "ryu" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" +checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" [[package]] name = "safety-rules" @@ -5132,10 +5320,10 @@ dependencies = [ "diem-temppath", "diem-types", "diem-vault-client", - "log 0.4.17", + "log", "once_cell", - "rand 0.8.4", - "rand_core 0.6.3", + "rand 0.8.5", + "rand_core 0.6.4", "serde", "thiserror", ] @@ -5151,21 +5339,20 @@ dependencies = [ [[package]] name = "salsa20" -version = "0.8.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecbd2eb639fd7cab5804a0837fe373cc2172d15437e804c054a9fb885cb923b0" +checksum = "0c0fbb5f676da676c260ba276a8f43a8dc67cf02d1438423aeb1c677a7212686" dependencies = [ "cipher 0.3.0", ] [[package]] name = "schannel" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f05ba609c234e60bee0d547fe94a4c7e9da733d1c962cf6e59efa4cd9c8bc75" +checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "lazy_static", - "winapi 0.3.9", + "windows-sys", ] [[package]] @@ -5188,19 +5375,19 @@ checksum = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" [[package]] name = "scopeguard" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" +checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "scratchpad" version = "0.1.0" dependencies = [ - "arc-swap 1.5.0", + "arc-swap", "diem-crypto", "diem-infallible", "diem-types", - "itertools 0.10.1", + "itertools 0.10.5", ] [[package]] @@ -5209,26 +5396,26 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da492dab03f925d977776a0b7233d7b934d6dc2b94faead48928e2e9bacedb9" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "hmac 0.10.1", "pbkdf2 0.6.0", "rand 0.7.3", "rand_core 0.5.1", "salsa20 0.7.2", - "sha2", + "sha2 0.9.9", "subtle", ] [[package]] name = "scrypt" -version = "0.8.0" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f2cc535b6997b0c755bf9344e71ca0e1be070d07ff792f1fcd31e7b90e07d5f" +checksum = "e73d6d7c6311ebdbd9184ad6c4447b2f36337e327bda107d3ba9e3c374f9d325" dependencies = [ - "hmac 0.11.0", - "pbkdf2 0.9.0", - "salsa20 0.8.1", - "sha2", + "hmac 0.12.1", + "pbkdf2 0.10.1", + "salsa20 0.9.0", + "sha2 0.10.8", ] [[package]] @@ -5246,11 +5433,11 @@ dependencies = [ [[package]] name = "security-framework" -version = "2.4.2" +version = "2.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525bc1abfda2e1998d152c45cf13e696f76d0a4972310b22fac1658b05df7c87" +checksum = "05b64fb303737d99b81884b2c63433e9ae28abebe5eb5045dcdd175dc2ecf4de" dependencies = [ - "bitflags", + "bitflags 1.3.2", "core-foundation", "core-foundation-sys", "libc", @@ -5259,9 +5446,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.4.2" +version = "2.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9dd14d83160b528b7bfd66439110573efcfbe281b17fc2ca9f39f550d619c7e" +checksum = "e932934257d3b408ed8f30db49d85ea163bfe74961f017f405b025af298f0c7a" dependencies = [ "core-foundation-sys", "libc", @@ -5284,9 +5471,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" [[package]] name = "serde" -version = "1.0.130" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f12d06de37cf59146fbdecab66aa99f9fe4f78722e3607577a5375d66bd0c913" +checksum = "8e422a44e74ad4001bdc8eede9a4570ab52f71190e9c076d14369f38b9200537" dependencies = [ "serde_derive", ] @@ -5313,30 +5500,42 @@ dependencies = [ [[package]] name = "serde_bytes" -version = "0.11.5" +version = "0.11.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16ae07dd2f88a366f15bd0632ba725227018c69a1c8550a927324f8eb8368bb9" +checksum = "ab33ec92f677585af6d88c65593ae2375adde54efdbf16d597f2cbc7a6d368ff" dependencies = [ "serde", ] [[package]] name = "serde_derive" -version = "1.0.130" +version = "1.0.189" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7bc1a1ab1961464eae040d96713baa5a724a8152c1222492465b54322ec508b" +checksum = "1e48d1f918009ce3145511378cf68d613e3b3d9137d67272562080d68a2b32d5" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] name = "serde_json" -version = "1.0.72" +version = "1.0.107" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "serde_urlencoded" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d0ffa0837f2dfa6fb90868c2b5468cad482e175f7dad97e7421951e663f2b527" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" dependencies = [ + "form_urlencoded", "itoa", "ryu", "serde", @@ -5344,44 +5543,55 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.8.21" +version = "0.8.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8c608a35705a5d3cdc9fbe403147647ff34b921f8e833e49306df898f9b20af" +checksum = "578a7433b776b56a35785ed5ce9a7e777ac0598aac5a6dd1b4b18a307c7fc71b" dependencies = [ - "dtoa", - "indexmap", + "indexmap 1.9.3", + "ryu", "serde", "yaml-rust", ] [[package]] name = "sha2" -version = "0.9.8" +version = "0.9.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b69f9a4c9740d74c5baa3fd2e547f9525fa8088a8a958e0ca2409a514e33f5fa" +checksum = "4d58a1e1bf39749807d89cf2d98ac2dfa0ff1cb3faa38fbb64dd88ac8013d800" dependencies = [ - "block-buffer", + "block-buffer 0.9.0", "cfg-if 1.0.0", "cpufeatures", - "digest", + "digest 0.9.0", "opaque-debug", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if 1.0.0", + "cpufeatures", + "digest 0.10.7", +] + [[package]] name = "sha3-macro" version = "0.1.0" dependencies = [ "keccak-hash 0.5.1", - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "shlex" -version = "0.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" +checksum = "a7cee0529a6d40f580e7a5e6c495c8fbfe21b7b52795ed4bb5e62cdf92bc6380" [[package]] name = "short-hex-str" @@ -5395,18 +5605,18 @@ dependencies = [ [[package]] name = "signal-hook-registry" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0" +checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1" dependencies = [ "libc", ] [[package]] name = "signature" -version = "1.4.0" +version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02658e48d89f2bec991f9a78e69cfa4c316f8d6a6c4ec12fae1aeb263d486788" +checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" [[package]] name = "siphasher" @@ -5416,15 +5626,18 @@ checksum = "833011ca526bd88f16778d32c699d325a9ad302fa06381cd66f7be63351d3f6d" [[package]] name = "siphasher" -version = "0.3.7" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "533494a8f9b724d33625ab53c6c4800f7cc445895924a8ef649222dcb76e938b" +checksum = "38b58827f4464d87d377d175e90bf58eb00fd8716ff0a62f80356b5e61555d0d" [[package]] name = "slab" -version = "0.4.5" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9def91fd1e018fe007022791f865d0ccc9b3a0d5001e01aabb8b40e46000afb5" +checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67" +dependencies = [ + "autocfg 1.1.0", +] [[package]] name = "smallvec" @@ -5437,9 +5650,9 @@ dependencies = [ [[package]] name = "smallvec" -version = "1.7.0" +version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309" +checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" [[package]] name = "smart-default" @@ -5447,9 +5660,9 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "133659a15339456eeeb07572eb02a91c91e9815e9cbc89566944d2c8d3efdbf6" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -5464,14 +5677,24 @@ dependencies = [ [[package]] name = "socket2" -version = "0.4.2" +version = "0.4.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dc90fe6c7be1a323296982db1836d1ea9e47b6839496dde9a541bc496df3516" +checksum = "64a4a911eed85daf18834cfaa86a79b7d266ff93ff5ba14005426219480ed662" dependencies = [ "libc", "winapi 0.3.9", ] +[[package]] +name = "socket2" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" +dependencies = [ + "libc", + "windows-sys", +] + [[package]] name = "solidity-abi" version = "0.1.0" @@ -5486,9 +5709,9 @@ name = "solidity-abi-derive" version = "0.1.0" dependencies = [ "proc-macro-crate", - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -5552,7 +5775,7 @@ name = "stats" version = "0.1.0" source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" dependencies = [ - "log 0.4.17", + "log", ] [[package]] @@ -5565,7 +5788,7 @@ dependencies = [ "diem-secure-net", "diem-state-view", "diem-types", - "itertools 0.10.1", + "itertools 0.10.5", "move-core-types", "parking_lot 0.11.2", "scratchpad", @@ -5595,7 +5818,7 @@ dependencies = [ "heapsize", "kvdb 0.4.0", "lazy_static", - "log 0.4.17", + "log", "parking_lot 0.11.2", "primitives", "rlp 0.3.0", @@ -5645,9 +5868,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee8bc6b87a5112aeeab1f4a9f7ab634fe6cbefc4850006df31267f4cfb9e3149" dependencies = [ "heck", - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -5667,7 +5890,7 @@ dependencies = [ "byteorder", "crunchy 0.2.2", "lazy_static", - "rand 0.8.4", + "rand 0.8.5", "rustc-hex 2.1.0", ] @@ -5690,13 +5913,24 @@ dependencies = [ [[package]] name = "syn" -version = "1.0.82" +version = "1.0.109" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "unicode-ident", +] + +[[package]] +name = "syn" +version = "2.0.38" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8daf5dd0bb60cbd4137b1b587d2fc0ae729bc07cf01cd70b36a1ed5ade3b9d59" +checksum = "e96b79aaa137db8f61e26363a0c9b47d8b4ec75da28b7d1d614c2303e232408b" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "unicode-xid 0.2.2", + "proc-macro2 1.0.69", + "quote 1.0.33", + "unicode-ident", ] [[package]] @@ -5705,10 +5939,31 @@ version = "0.12.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f36bdaa60a83aca3921b5259d5400cbf5e90fc51931376a9bd4a0eb79aa7210f" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", - "unicode-xid 0.2.2", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", + "unicode-xid 0.2.4", +] + +[[package]] +name = "system-configuration" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba3a3adc5c275d719af8cb4272ea1c4a6d668a777f37e115f6d11ddbc1c8e0e7" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "system-configuration-sys", +] + +[[package]] +name = "system-configuration-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75fb188eb626b924683e3b95e3a48e63551fcfb51949de2f06a9d91dbee93c9" +dependencies = [ + "core-foundation-sys", + "libc", ] [[package]] @@ -5729,23 +5984,22 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.2.0" +version = "3.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" +checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "libc", - "rand 0.8.4", - "redox_syscall 0.2.10", - "remove_dir_all", - "winapi 0.3.9", + "fastrand", + "redox_syscall 0.3.5", + "rustix", + "windows-sys", ] [[package]] name = "termcolor" -version = "1.1.2" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" +checksum = "6093bad37da69aab9d123a8091e4be0aa4a03e4d601ec641c327398315f62b64" dependencies = [ "winapi-util", ] @@ -5761,32 +6015,31 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.30" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "854babe52e4df1653706b98fcfc05843010039b406875930a70e4d9644e5c417" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.30" +version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aa32fd3f627f367fe16f893e2597ae3c05020f8bba2666a4e6ea73d377e5714b" +checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] name = "thread-id" -version = "3.3.0" +version = "4.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fbf4c9d56b320106cd64fd024dadfa0be7cb4706725fc44a7d7ce952d820c1" +checksum = "f0ec81c46e9eb50deaa257be2f148adf052d1fb7701cfd55ccfab2525280b70b" dependencies = [ "libc", - "redox_syscall 0.1.57", "winapi 0.3.9", ] @@ -5811,9 +6064,9 @@ dependencies = [ [[package]] name = "time" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255" +checksum = "1b797afad3f312d1c66a56d11d0316f916356d11bd158fbc6ca6389ff6bf805a" dependencies = [ "libc", "wasi 0.10.0+wasi-snapshot-preview1", @@ -5849,18 +6102,18 @@ dependencies = [ [[package]] name = "tinyvec" -version = "1.5.1" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c1c1d5a42b6245520c249549ec267180beaffcc0615401ac8e31853d4b6d8d2" +checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50" dependencies = [ "tinyvec_macros", ] [[package]] name = "tinyvec_macros" -version = "0.1.0" +version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" @@ -5912,22 +6165,21 @@ dependencies = [ [[package]] name = "tokio" -version = "1.14.0" +version = "1.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e992e41e0d2fb9f755b37446f20900f64446ef54874f40a60c78f021ac6144" +checksum = "4f38200e3ef7995e5ef13baec2f432a6da0aa9ac495b2c0e8f3b7eec2c92d653" dependencies = [ - "autocfg 1.0.1", - "bytes 1.1.0", + "backtrace", + "bytes 1.5.0", "libc", - "memchr", - "mio 0.7.14", + "mio 0.8.8", "num_cpus", - "once_cell", - "parking_lot 0.11.2", - "pin-project-lite 0.2.7", + "parking_lot 0.12.1", + "pin-project-lite 0.2.13", "signal-hook-registry", - "tokio-macros 1.6.0", - "winapi 0.3.9", + "socket2 0.5.4", + "tokio-macros 2.1.0", + "windows-sys", ] [[package]] @@ -5980,7 +6232,7 @@ checksum = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.17", + "log", ] [[package]] @@ -5989,20 +6241,30 @@ version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e44da00bfc73a25f814cd8d7e57a68a5c31b74b3152a0a1d1f590c97ed06265a" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] name = "tokio-macros" -version = "1.6.0" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c9efc1aba077437943f7515666aa2b882dfabfbfdf89c819ea75a8d6e9eaba5e" +checksum = "630bdcf245f78637c13ec01ffae6187cca34625e8c63150d424b59e55af2675e" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "tokio-native-tls" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbae76ab933c85776efabc971569dd6119c580d8f5d448769dec1764bf796ef2" +dependencies = [ + "native-tls", + "tokio 1.33.0", ] [[package]] @@ -6014,7 +6276,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.17", + "log", "mio 0.6.23", "num_cpus", "parking_lot 0.9.0", @@ -6026,13 +6288,13 @@ dependencies = [ [[package]] name = "tokio-stream" -version = "0.1.8" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50145484efff8818b5ccd256697f36863f587da82cf8b409c53adf1e840798e3" +checksum = "397c988d37662c7dda6d2208364a706264bf3d6138b11d436cbac0ad38832842" dependencies = [ "futures-core", - "pin-project-lite 0.2.7", - "tokio 1.14.0", + "pin-project-lite 0.2.13", + "tokio 1.33.0", ] [[package]] @@ -6070,7 +6332,7 @@ dependencies = [ "crossbeam-utils 0.7.2", "futures 0.1.31", "lazy_static", - "log 0.4.17", + "log", "num_cpus", "slab", "tokio-executor", @@ -6096,7 +6358,7 @@ checksum = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" dependencies = [ "bytes 0.4.12", "futures 0.1.31", - "log 0.4.17", + "log", "mio 0.6.23", "tokio-codec", "tokio-io", @@ -6113,7 +6375,7 @@ dependencies = [ "futures 0.1.31", "iovec", "libc", - "log 0.4.17", + "log", "mio 0.6.23", "mio-uds", "tokio-codec", @@ -6123,32 +6385,49 @@ dependencies = [ [[package]] name = "tokio-util" -version = "0.6.9" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e99e1983e5d376cd8eb4b66604d2e99e79f5bd988c3055891dcd8c9e2604cc0" +checksum = "1d68074620f57a0b21594d9735eb2e98ab38b17f80d3fcb189fca266771ca60d" dependencies = [ - "bytes 1.1.0", + "bytes 1.5.0", "futures-core", "futures-sink", - "log 0.4.17", - "pin-project-lite 0.2.7", - "tokio 1.14.0", + "pin-project-lite 0.2.13", + "tokio 1.33.0", + "tracing", ] [[package]] name = "toml" -version = "0.5.8" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a31142970826733df8241ef35dc040ef98c679ab14d7c3e54d827099b3acecaa" +checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" dependencies = [ "serde", ] +[[package]] +name = "toml_datetime" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" + +[[package]] +name = "toml_edit" +version = "0.19.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6" +checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52" [[package]] name = "trace-time" @@ -6156,35 +6435,28 @@ version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a1e75297b57b61495169dd40dd86e0ab52bfc7cdba570f59be5683709c9d480" dependencies = [ - "log 0.4.17", + "log", ] [[package]] name = "tracing" -version = "0.1.29" +version = "0.1.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "375a639232caf30edfc78e8d89b2d4c375515393e7af7e16f01cd96917fb2105" +checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ - "cfg-if 1.0.0", - "pin-project-lite 0.2.7", + "pin-project-lite 0.2.13", "tracing-core", ] [[package]] name = "tracing-core" -version = "0.1.21" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f4ed65637b8390770814083d20756f87bfa2c21bf2f110babdc5438351746e4" +checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ - "lazy_static", + "once_cell", ] -[[package]] -name = "traitobject" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efd1f82c56340fdf16f2a953d7bda4f8fdffba13d93b00844c25572110b26079" - [[package]] name = "transaction-pool" version = "1.13.3" @@ -6192,7 +6464,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e5866e5126b14358f1d7af4bf51a0be677a363799b90e655edcec8254edef1d2" dependencies = [ "error-chain", - "log 0.4.17", + "log", "smallvec 0.6.14", "trace-time", ] @@ -6205,7 +6477,7 @@ checksum = "3c7319e28ca295f27359d944a682f7f65b419158bf1590c92cadc0000258d788" dependencies = [ "elastic-array", "hash-db", - "log 0.4.17", + "log", "rand 0.6.5", ] @@ -6231,30 +6503,24 @@ dependencies = [ [[package]] name = "try-lock" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642" - -[[package]] -name = "typeable" -version = "0.1.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1410f6f91f21d1612654e7cc69193b0334f909dcf2c790c4826254fbb86f8887" +checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] -name = "typemap" -version = "0.3.3" +name = "typemap-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "653be63c80a3296da5551e1bfd2cca35227e13cdd08c6668903ae2f4f77aa1f6" +checksum = "a68c24b707f02dd18f1e4ccceb9d49f2058c2fb86384ef9972592904d7a28867" dependencies = [ - "unsafe-any", + "unsafe-any-ors", ] [[package]] name = "typenum" -version = "1.14.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b63708a265f51345575b27fe43f9500ad611579e764c79edbc2037b1121959ec" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" [[package]] name = "uint" @@ -6291,40 +6557,37 @@ version = "0.1.0" source = "git+https://github.com/Conflux-Chain/conflux-parity-deps.git?rev=1597a9cab02343eb2322ca0ac58d39b64e3f42d1#1597a9cab02343eb2322ca0ac58d39b64e3f42d1" [[package]] -name = "unicase" -version = "1.4.2" +name = "unicode-bidi" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" -dependencies = [ - "version_check 0.1.5", -] +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] -name = "unicode-bidi" -version = "0.3.7" +name = "unicode-ident" +version = "1.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a01404663e3db436ed2746d9fefef640d868edae3cceb81c3b8d5732fda678f" +checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b" [[package]] name = "unicode-normalization" -version = "0.1.19" +version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54590932941a9e9266f0832deed84ebe1bf2e4c9e4a3554d393d18f5e854bf9" +checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921" dependencies = [ "tinyvec", ] [[package]] name = "unicode-segmentation" -version = "1.8.0" +version = "1.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" +checksum = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" [[package]] name = "unicode-width" -version = "0.1.9" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-xid" @@ -6334,9 +6597,9 @@ checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" [[package]] name = "unicode-xid" -version = "0.2.2" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" +checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c" [[package]] name = "universal-hash" @@ -6349,12 +6612,12 @@ dependencies = [ ] [[package]] -name = "unsafe-any" -version = "0.4.2" +name = "unsafe-any-ors" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f30360d7979f5e9c6e6cea48af192ea8fab4afb3cf72597154b8f08935bc9c7f" +checksum = "e0a303d30665362d9680d7d91d78b23f5f899504d4f08b3c4cf08d055d87c0ad" dependencies = [ - "traitobject", + "destructure_traitobject", ] [[package]] @@ -6369,38 +6632,26 @@ version = "1.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b8b063c2d59218ae09f22b53c42eaad0d53516457905f5235ca4bc9e99daa71" dependencies = [ - "base64 0.13.0", + "base64 0.13.1", "chunked_transfer", - "log 0.4.17", + "log", "native-tls", "once_cell", "qstring", "serde", "serde_json", - "url 2.2.2", + "url", ] [[package]] name = "url" -version = "1.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" -dependencies = [ - "idna 0.1.5", - "matches", - "percent-encoding 1.0.1", -] - -[[package]] -name = "url" -version = "2.2.2" +version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a507c383b2d33b5fc35d1861e77e6b383d158b2da5e14fe51b83dfedf6fd578c" +checksum = "143b538f18257fac9cad154828a57c6bf5157e1aa604d4816b5995bf6de87ae5" dependencies = [ "form_urlencoded", - "idna 0.2.3", - "matches", - "percent-encoding 2.1.0", + "idna", + "percent-encoding", ] [[package]] @@ -6422,15 +6673,9 @@ checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" [[package]] name = "version_check" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" - -[[package]] -name = "version_check" -version = "0.9.3" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" +checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "vm" @@ -6441,7 +6686,7 @@ dependencies = [ "ethereum-types 0.4.2", "ethjson", "keccak-hash 0.1.2", - "log 0.4.17", + "log", "parity-bytes", "patricia-trie-ethereum", "rlp 0.3.0", @@ -6450,9 +6695,9 @@ dependencies = [ [[package]] name = "vrf" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d190db774aca311c9737f5309b6f1bf7906de5245bd8492e222c09ba44eda14f" +checksum = "eff9943db5840ba292776c3778fedf9b97e11166d8222eceb2cb330f1ea08945" dependencies = [ "failure", "hmac-sha256", @@ -6461,11 +6706,10 @@ dependencies = [ [[package]] name = "want" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ce8a968cb1cd110d136ff8b819a556d6fb6d919363c61534f6860c7eb172ba0" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" dependencies = [ - "log 0.4.17", "try-lock", ] @@ -6481,6 +6725,12 @@ version = "0.10.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f" +[[package]] +name = "wasi" +version = "0.11.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" + [[package]] name = "wasm" version = "0.1.0" @@ -6489,13 +6739,79 @@ dependencies = [ "byteorder", "ethereum-types 0.4.2", "libc", - "log 0.4.17", + "log", "parity-wasm", "pwasm-utils", "vm", "wasmi", ] +[[package]] +name = "wasm-bindgen" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen-macro", +] + +[[package]] +name = "wasm-bindgen-backend" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +dependencies = [ + "bumpalo", + "log", + "once_cell", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c02dbc21516f9f1f04f187958890d7e6026df8d16540b7ad9492bc34a67cea03" +dependencies = [ + "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +dependencies = [ + "quote 1.0.33", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", + "wasm-bindgen-backend", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.87" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" + [[package]] name = "wasmi" version = "0.3.0" @@ -6508,6 +6824,16 @@ dependencies = [ "parity-wasm", ] +[[package]] +name = "web-sys" +version = "0.3.64" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "winapi" version = "0.2.8" @@ -6538,9 +6864,9 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" [[package]] name = "winapi-util" -version = "0.1.5" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596" dependencies = [ "winapi 0.3.9", ] @@ -6551,6 +6877,100 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-sys" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" + +[[package]] +name = "winnow" +version = "0.5.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3b801d0e0a6726477cc207f60162da452f3a95adb368399bef20a946e06f65c" +dependencies = [ + "memchr", +] + +[[package]] +name = "winreg" +version = "0.50.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys", +] + [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -6563,9 +6983,9 @@ dependencies = [ [[package]] name = "wyz" -version = "0.4.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "129e027ad65ce1453680623c3fb5163cbf7107bfe1aa32257e7d0e63f9ced188" +checksum = "05f360fc0b24296329c78fda852a1e9ae82de9cf7b27dae4b7f62f118f77b9ed" dependencies = [ "tap", ] @@ -6577,15 +6997,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f3519d56987103ef084eba6ddfc3be45b7eaee08f2d60bc8495cdca30362a32" dependencies = [ "curve25519-dalek-fiat", - "rand_core 0.6.3", + "rand_core 0.6.4", "zeroize", ] [[package]] name = "xml-rs" -version = "0.8.4" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2d7d3948613f75c98fd9328cfdcc45acc4d360655289d0a7d4ec931392200a3" +checksum = "0fcb9cbac069e033553e8bb871be2fbdffcab578eb25bd0f7c508cedc6dcd75a" [[package]] name = "xmltree" @@ -6607,30 +7027,29 @@ dependencies = [ [[package]] name = "zeroize" -version = "1.4.3" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d68d9dcec5f9b43a30d38c49f91dfedfaac384cb8f085faca366c26207dd1619" +checksum = "2a0956f1ba7c7909bfb66c2e9e4124ab6f6482560f6628b5aaeba39207c9aad9" dependencies = [ "zeroize_derive", ] [[package]] name = "zeroize_derive" -version = "1.2.2" +version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65f1a51723ec88c66d5d1fe80c841f17f63587d6691901d66be9bec6c3b51f73" +checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ - "proc-macro2 1.0.32", - "quote 1.0.10", - "syn 1.0.82", - "synstructure", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] name = "zstd-sys" -version = "1.6.1+zstd.1.5.0" +version = "1.6.3+zstd.1.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615120c7a2431d16cf1cf979e7fc31ba7a5b5e5707b29c8a99e5dbf8a8392a33" +checksum = "fc49afa5c8d634e75761feda8c592051e7eeb4683ba827211eb0d731d3402ea8" dependencies = [ "cc", "libc", diff --git a/core/src/pos/crypto/crypto/Cargo.toml b/core/src/pos/crypto/crypto/Cargo.toml index 39abb23001..ec8d970513 100644 --- a/core/src/pos/crypto/crypto/Cargo.toml +++ b/core/src/pos/crypto/crypto/Cargo.toml @@ -36,9 +36,7 @@ diem-crypto-derive = { path = "../crypto-derive", version = "0.1.0" } bcs = "0.1.2" cfxkey = { path = "../../../../../accounts/cfxkey" } cfx-types = { path = "../../../../../cfx_types" } -bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "e7d9119eb285607d5134d40efd89555c41d73160", default-features = false, features = ["multicore"]} -#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures",default-features = false, features = ["blst", "multicore"]} -#bls-signatures = {path = "/Users/lipeilun/conflux/bls-signatures"} +bls-signatures = {git = "https://github.com/Conflux-Chain/bls-signatures.git", rev = "fb52187df92d27c365642cb7e7b2aaf60437cf9c", default-features = false, features = ["multicore"]} vrf = "0.2.2" lazy_static = "1.4" parking_lot = "0.11" @@ -48,7 +46,7 @@ pkcs8 = {version = "0.7.5", features = ["encryption", "std"]} [dev-dependencies] -bitvec = "0.22" +bitvec = "1.0.1" byteorder = "1.4.3" proptest = "1.0.0" proptest-derive = "0.3.0" From e218d2ad3a00c3690d9207545ce604913160a1aa Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Thu, 19 Oct 2023 07:03:56 +0800 Subject: [PATCH 09/22] Fix warnings in storage bench. --- core/benchmark/storage/src/main.rs | 34 +++++++----------------------- 1 file changed, 8 insertions(+), 26 deletions(-) diff --git a/core/benchmark/storage/src/main.rs b/core/benchmark/storage/src/main.rs index f5657d87b3..cd9f1734f5 100644 --- a/core/benchmark/storage/src/main.rs +++ b/core/benchmark/storage/src/main.rs @@ -986,7 +986,7 @@ pub struct EthTxExtractor { nonce_dir_path: String, counters: Arc>, - shared_self: Option>>, + shared_self: UnsafeCell>>>, tx_maker: Arc + Send + Sync>>, } @@ -999,7 +999,7 @@ impl Drop for EthTxExtractorStopper { fn drop(&mut self) { println!("stopping eth tx extractor."); - let mut tx_basic_verifiers = self.0.stop_from_ref(); + let mut tx_basic_verifiers = self.0.stop(); tx_basic_verifiers.drain(..); for i in 0..EthTxVerifier::::N_TX_VERIFIERS { @@ -1020,24 +1020,11 @@ impl Drop for EthTxExtractorStopper { impl EthTxExtractor { const N_TX_BASIC_VERIFIERS: usize = 8; - - pub fn stop_from_ref( - &self, - ) -> Vec>>>> - { - unsafe { - EthTxExtractor::stop( - &mut *(self as *const EthTxExtractor - as *mut EthTxExtractor), - ) - } - } - pub fn stop( &mut self, ) -> Vec>>>> { - self.shared_self.take(); + self.shared_self.get_mut().take(); mem::replace(&mut self.tx_basic_verifiers, vec![]) } @@ -1143,17 +1130,13 @@ impl EthTxExtractor { tx_maker.clone(), )?, nonce_dir_path: nonce_dir_path.clone(), - shared_self: None, + shared_self: UnsafeCell::new(None), tx_maker: tx_maker.clone(), })); let extractor_arc = result.as_ref().unwrap().clone(); // FIXME: remove unsafes. - unsafe { - &mut *(extractor_arc.as_ref() as *const EthTxExtractor - as *mut EthTxExtractor) - } - .shared_self = Some(extractor_arc.clone()); + unsafe{ *extractor_arc.shared_self.get() = Some(extractor_arc.clone()); } if start_block_number == 0 { let spec = EthSpec::load(File::open(path)?)?; @@ -1199,7 +1182,7 @@ impl EthTxExtractor { fn verify_tx_then_stream_out( &self, tx_verify_request: EthTxNonceVerifierRequest, ) { - let thread = (tx_verify_request.sender.low_u64() & 7) as usize; + let thread = (tx_verify_request.sender.low_u64_be() & 7) as usize; self.nonce_verifier.workers[thread] .lock() @@ -1286,7 +1269,7 @@ impl EthTxExtractor { chain_id, allow_empty_signature, - tx_extractor: self.shared_self.as_ref().unwrap().clone(), + tx_extractor: self.shared_self.get_mut().unwrap().clone(), }; self.tx_basic_verifiers[worker] .lock() @@ -1534,7 +1517,6 @@ fn tx_extract + Sync + Send + 'static>( let mut buffer_new = Vec::::with_capacity(BUFFER_SIZE); buffer_new.extend_from_slice(to_parse); - drop(to_parse); buffer = buffer_new; // Reset the buffer. if buffer.len() == buffer.capacity() { @@ -1997,7 +1979,6 @@ fn tx_replay(matches: ArgMatches) -> errors::Result<()> { let mut buffer_new = Vec::::with_capacity(BUFFER_SIZE); buffer_new.extend_from_slice(to_parse); - drop(to_parse); buffer = buffer_new; // Reset the buffer. if buffer.len() == buffer.capacity() { @@ -2228,3 +2209,4 @@ use std::{ time::Duration, vec::Vec, }; +use std::cell::UnsafeCell; From 0a4ac60d86ad5a19eda5667e79fcb46284662ef1 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Thu, 19 Oct 2023 12:36:26 +0800 Subject: [PATCH 10/22] Fix more. --- core/src/pos/crypto/crypto/src/unit_tests/hash_test.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/pos/crypto/crypto/src/unit_tests/hash_test.rs b/core/src/pos/crypto/crypto/src/unit_tests/hash_test.rs index 77edad0519..20073d9d24 100644 --- a/core/src/pos/crypto/crypto/src/unit_tests/hash_test.rs +++ b/core/src/pos/crypto/crypto/src/unit_tests/hash_test.rs @@ -182,7 +182,7 @@ fn test_common_prefix_bits_len() { proptest! { #[test] fn test_hashvalue_to_bits_roundtrip(hash in any::()) { - let bitvec: BitVec = hash.iter_bits().collect(); + let bitvec: BitVec = hash.iter_bits().collect(); let bytes: Vec = bitvec.into(); let hash2 = HashValue::from_slice(&bytes).unwrap(); prop_assert_eq!(hash, hash2); @@ -190,7 +190,7 @@ proptest! { #[test] fn test_hashvalue_to_bits_inverse_roundtrip(bits in vec(any::(), HashValue::LENGTH_IN_BITS)) { - let bitvec: BitVec = bits.iter().cloned().collect(); + let bitvec: BitVec = bits.iter().cloned().collect(); let bytes: Vec = bitvec.into(); let hash = HashValue::from_slice(&bytes).unwrap(); let bits2: Vec = hash.iter_bits().collect(); @@ -207,7 +207,7 @@ proptest! { #[test] fn test_hashvalue_to_rev_bits_roundtrip(hash in any::()) { - let bitvec: BitVec = hash.iter_bits().rev().collect(); + let bitvec: BitVec = hash.iter_bits().rev().collect(); let mut bytes: Vec = bitvec.into(); bytes.reverse(); let hash2 = HashValue::from_slice(&bytes).unwrap(); From cd3a9d6f3d2eee8fb7f6d0a58c0f30e906c37972 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Fri, 20 Oct 2023 13:47:14 +0800 Subject: [PATCH 11/22] Fix chrono version for compatibility. --- core/benchmark/storage/Cargo.lock | 15 +++++---------- core/src/pos/common/logger/Cargo.toml | 2 +- core/src/pos/secure/storage/Cargo.toml | 2 +- core/src/pos/secure/storage/vault/Cargo.toml | 2 +- core/src/pos/types/Cargo.toml | 2 +- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/core/benchmark/storage/Cargo.lock b/core/benchmark/storage/Cargo.lock index 356e041442..a325bf30af 100644 --- a/core/benchmark/storage/Cargo.lock +++ b/core/benchmark/storage/Cargo.lock @@ -126,12 +126,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "android-tzdata" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" - [[package]] name = "android_system_properties" version = "0.1.5" @@ -915,16 +909,17 @@ dependencies = [ [[package]] name = "chrono" -version = "0.4.31" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f2c685bad3eb3d45a01354cedb7d5faa66194d1d58ba6e267a8de788f79db38" +checksum = "4e3c5919066adf22df73762e50cffcde3a758f2a848b113b586d1f86728b673b" dependencies = [ - "android-tzdata", "iana-time-zone", "js-sys", + "num-integer", "num-traits", + "time", "wasm-bindgen", - "windows-targets", + "winapi 0.3.9", ] [[package]] diff --git a/core/src/pos/common/logger/Cargo.toml b/core/src/pos/common/logger/Cargo.toml index 07cc06685f..4396a9ff88 100644 --- a/core/src/pos/common/logger/Cargo.toml +++ b/core/src/pos/common/logger/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" # This is to avoid ever having a circular dependency with the diem-logger crate. [dependencies] backtrace = { version = "0.3", features = ["serde"] } -chrono = "0.4.19" +chrono = "=0.4.24" erased-serde = "0.3.13" hostname = "0.3.1" diem-log-derive = { path = "derive" } diff --git a/core/src/pos/secure/storage/Cargo.toml b/core/src/pos/secure/storage/Cargo.toml index 3b2db8e483..c9c587676b 100644 --- a/core/src/pos/secure/storage/Cargo.toml +++ b/core/src/pos/secure/storage/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] base64 = "0.13.0" -chrono = "0.4.19" +chrono = "=0.4.24" enum_dispatch = "0.3.5" rand = "0.8.3" serde = { version = "1.0.124", features = ["rc"], default-features = false } diff --git a/core/src/pos/secure/storage/vault/Cargo.toml b/core/src/pos/secure/storage/vault/Cargo.toml index 816b6ef872..c0a8d0fca5 100644 --- a/core/src/pos/secure/storage/vault/Cargo.toml +++ b/core/src/pos/secure/storage/vault/Cargo.toml @@ -11,7 +11,7 @@ edition = "2018" [dependencies] base64 = "0.13.0" -chrono = "0.4.19" +chrono = "=0.4.24" once_cell = "1.7.2" proptest = { version = "1.0.0", optional = true } native-tls = "0.2.7" diff --git a/core/src/pos/types/Cargo.toml b/core/src/pos/types/Cargo.toml index dd57b81482..e73d6bcbd4 100644 --- a/core/src/pos/types/Cargo.toml +++ b/core/src/pos/types/Cargo.toml @@ -13,7 +13,7 @@ edition = "2018" aes-gcm = "0.8.0" anyhow = "1.0.38" bytes = "1.0.1" -chrono = { version = "0.4.19", default-features = false, features = ["clock"] } +chrono = { version = "=0.4.24", default-features = false, features = ["clock"] } hex = "0.4.3" itertools = { version = "0.10.0", default-features = false } once_cell = "1.7.2" From 3a639b48aeafa0634d7a92c02e65ea0a41e93b86 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Fri, 20 Oct 2023 14:44:13 +0800 Subject: [PATCH 12/22] Use SyncUnsafeCell. --- core/benchmark/storage/Cargo.lock | 2846 +++++++++++++++++++++++++++- core/benchmark/storage/Cargo.toml | 1 + core/benchmark/storage/src/main.rs | 6 +- 3 files changed, 2751 insertions(+), 102 deletions(-) diff --git a/core/benchmark/storage/Cargo.lock b/core/benchmark/storage/Cargo.lock index a325bf30af..f92608f020 100644 --- a/core/benchmark/storage/Cargo.lock +++ b/core/benchmark/storage/Cargo.lock @@ -2,6 +2,75 @@ # It is not intended for manual editing. version = 3 +[[package]] +name = "ab_glyph" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1061f3ff92c2f65800df1f12fc7b4ff44ee14783104187dd04dfee6f11b0fd2" +dependencies = [ + "ab_glyph_rasterizer", + "owned_ttf_parser", +] + +[[package]] +name = "ab_glyph_rasterizer" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c71b1793ee61086797f5c80b6efa2b8ffa6d5dd703f118545808a7f2e27f7046" + +[[package]] +name = "accesskit" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76eb1adf08c5bcaa8490b9851fd53cca27fa9880076f178ea9d29f05196728a8" + +[[package]] +name = "accesskit_consumer" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04bb4d9e4772fe0d47df57d0d5dbe5d85dd05e2f37ae1ddb6b105e76be58fb00" +dependencies = [ + "accesskit", +] + +[[package]] +name = "accesskit_macos" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "134d0acf6acb667c89d3332999b1a5df4edbc8d6113910f392ebb73f2b03bb56" +dependencies = [ + "accesskit", + "accesskit_consumer", + "objc2", + "once_cell", +] + +[[package]] +name = "accesskit_windows" +version = "0.14.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9eac0a7f2d7cd7a93b938af401d3d8e8b7094217989a7c25c55a953023436e31" +dependencies = [ + "accesskit", + "accesskit_consumer", + "arrayvec 0.7.4", + "once_cell", + "paste", + "windows 0.48.0", +] + +[[package]] +name = "accesskit_winit" +version = "0.14.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "825d23acee1bd6d25cbaa3ca6ed6e73faf24122a774ec33d52c5c86c6ab423c0" +dependencies = [ + "accesskit", + "accesskit_macos", + "accesskit_windows", + "winit", +] + [[package]] name = "accumulator" version = "0.1.0" @@ -117,6 +186,18 @@ version = "0.3.8" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +[[package]] +name = "ahash" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f" +dependencies = [ + "cfg-if 1.0.0", + "getrandom 0.2.10", + "once_cell", + "version_check", +] + [[package]] name = "aho-corasick" version = "1.1.2" @@ -126,6 +207,64 @@ dependencies = [ "memchr", ] +[[package]] +name = "allocator-api2" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5" + +[[package]] +name = "alsa" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e2562ad8dcf0f789f65c6fdaad8a8a9708ed6b488e649da28c01656ad66b8b47" +dependencies = [ + "alsa-sys", + "bitflags 1.3.2", + "libc", + "nix 0.24.3", +] + +[[package]] +name = "alsa-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db8fee663d06c4e303404ef5f40488a53e062f89ba8bfed81f42325aafad1527" +dependencies = [ + "libc", + "pkg-config", +] + +[[package]] +name = "android-activity" +version = "0.4.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64529721f27c2314ced0890ce45e469574a73e5e6fdd6e9da1860eb29285f5e0" +dependencies = [ + "android-properties", + "bitflags 1.3.2", + "cc", + "jni-sys", + "libc", + "log", + "ndk", + "ndk-context", + "ndk-sys", + "num_enum 0.6.1", +] + +[[package]] +name = "android-properties" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fc7eb209b1518d6bb87b283c20095f5228ecda460da70b44f0802523dea6da04" + +[[package]] +name = "android_log-sys" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ecc8056bf6ab9892dcd53216c83d1597487d7dacac16c8df6b877d127df9937" + [[package]] name = "android_system_properties" version = "0.1.5" @@ -156,6 +295,15 @@ version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +[[package]] +name = "approx" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cab112f0a86d568ea0e627cc1d6be74a1e9cd55214684db5561995f6dad897c6" +dependencies = [ + "num-traits", +] + [[package]] name = "arc-swap" version = "1.6.0" @@ -183,6 +331,55 @@ 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 = "ash" +version = "0.37.3+1.3.251" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e9c3835d686b0a6084ab4234fcd1b07dbf6e4767dce60874b12356a25ecd4a" +dependencies = [ + "libloading 0.7.4", +] + +[[package]] +name = "async-channel" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81953c529336010edd6d8e358f886d9581267795c61b19475b71314bffa46d35" +dependencies = [ + "concurrent-queue", + "event-listener", + "futures-core", +] + +[[package]] +name = "async-executor" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b0c4a4f319e45986f347ee47fef8bf5e81c9abc3f6f58dc2391439f30df65f0" +dependencies = [ + "async-lock", + "async-task", + "concurrent-queue", + "fastrand 2.0.1", + "futures-lite", + "slab", +] + +[[package]] +name = "async-lock" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "287272293e9d8c41773cec55e365490fe034813a2f172f502d6ddcf75b2f582b" +dependencies = [ + "event-listener", +] + [[package]] name = "async-oneshot" version = "0.5.0" @@ -192,6 +389,12 @@ dependencies = [ "futures-micro", ] +[[package]] +name = "async-task" +version = "4.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4eb2cdb97421e01129ccb49169d8279ed21e829929144f4a22a6e54ac549ca1" + [[package]] name = "async-trait" version = "0.1.74" @@ -278,16 +481,743 @@ checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" name = "base64ct" version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" +checksum = "e6b4d9b1225d28d360ec6a231d65af1fd99a2a095154c8040689617290569c5c" + +[[package]] +name = "bcs" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" +dependencies = [ + "serde", + "thiserror", +] + +[[package]] +name = "bevy" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "91c6d3ec4f89e85294dc97334c5b271ddc301fdf67ac9bb994fe44d9273e6ed7" +dependencies = [ + "bevy_internal", +] + +[[package]] +name = "bevy_a11y" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "132c9e35a77c5395951f6d25fa2c52ee92296353426df4f961e60f3ff47e2e42" +dependencies = [ + "accesskit", + "bevy_app", + "bevy_derive", + "bevy_ecs", +] + +[[package]] +name = "bevy_animation" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f44eae3f1c35a87e38ad146f72317f19ce7616dad8bbdfb88ee752c1282d28c5" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_time", + "bevy_transform", + "bevy_utils", +] + +[[package]] +name = "bevy_app" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f557a7d59e1e16892d7544fc37316506ee598cb5310ef0365125a30783c11531" +dependencies = [ + "bevy_derive", + "bevy_ecs", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "downcast-rs", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "bevy_asset" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9714af523da4cdf58c42a317e5ed40349708ad954a18533991fd64c8ae0a6f68" +dependencies = [ + "anyhow", + "async-channel", + "bevy_app", + "bevy_diagnostic", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bevy_winit", + "crossbeam-channel 0.5.8", + "downcast-rs", + "fastrand 1.9.0", + "js-sys", + "notify", + "parking_lot 0.12.1", + "serde", + "thiserror", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "bevy_audio" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4de308bd63a2f7a0b77ffeb7cf00cc185ec01393c5db2091fe03964f97152749" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_transform", + "bevy_utils", + "oboe", + "parking_lot 0.12.1", + "rodio", +] + +[[package]] +name = "bevy_core" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d5272321be5fcf5ce2fb16023bc825bb10dfcb71611117296537181ce950f48" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "bytemuck", +] + +[[package]] +name = "bevy_core_pipeline" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "67382fa9c96ce4f4e5833ed7cedd9886844a8f3284b4a717bd4ac738dcdea0c3" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bitflags 2.4.1", + "radsort", + "serde", +] + +[[package]] +name = "bevy_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a44e4e2784a81430199e4157e02903a987a32127c773985506f020e7d501b62e" +dependencies = [ + "bevy_macro_utils", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "bevy_diagnostic" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6babb230dc383c98fdfc9603e3a7a2a49e1e2879dbe8291059ef37dca897932e" +dependencies = [ + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_time", + "bevy_utils", + "sysinfo", +] + +[[package]] +name = "bevy_ecs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "266144b36df7e834d5198049e037ecdf2a2310a76ce39ed937d1b0a6a2c4e8c6" +dependencies = [ + "async-channel", + "bevy_ecs_macros", + "bevy_ptr", + "bevy_reflect", + "bevy_tasks", + "bevy_utils", + "downcast-rs", + "event-listener", + "fixedbitset", + "rustc-hash", + "serde", + "thiserror", + "thread_local", +] + +[[package]] +name = "bevy_ecs_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7157a9c3be038d5008ee3f114feb6cf6b39c1d3d32ee21a7cacb8f81fccdfa80" +dependencies = [ + "bevy_macro_utils", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "bevy_encase_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0ac0f55ad6bca1be7b0f35bbd5fc95ed3d31e4e9db158fee8e5327f59006001" +dependencies = [ + "bevy_macro_utils", + "encase_derive_impl", +] + +[[package]] +name = "bevy_gilrs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "65f4d79c55829f8016014593a42453f61a564ffb06ef79460d25696ccdfac67b" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_log", + "bevy_time", + "bevy_utils", + "gilrs", + "thiserror", +] + +[[package]] +name = "bevy_gizmos" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e286a3e7276431963f4aa29165ea5429fa7dbbc6d5c5ba0c531e7dd44ecc88a2" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", +] + +[[package]] +name = "bevy_gltf" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f07494a733dca032e71a20f4b1f423de765da49cbff34406ae6cd813f9b50c41" +dependencies = [ + "anyhow", + "base64 0.13.1", + "bevy_animation", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_core_pipeline", + "bevy_ecs", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_tasks", + "bevy_transform", + "bevy_utils", + "gltf", + "percent-encoding", + "serde", + "serde_json", + "thiserror", +] + +[[package]] +name = "bevy_hierarchy" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "103f8f58416ac6799b8c7f0b418f1fac9eba44fa924df3b0e16b09256b897e3d" +dependencies = [ + "bevy_app", + "bevy_core", + "bevy_ecs", + "bevy_log", + "bevy_reflect", + "bevy_utils", + "smallvec 1.11.1", +] + +[[package]] +name = "bevy_input" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ffbd935401101ac8003f3c3aea70788c65ad03f7a32716a10608bedda7a648bc" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "thiserror", +] + +[[package]] +name = "bevy_internal" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e0e35a9b2bd29aa784b3cc416bcbf2a298f69f00ca51fd042ea39d9af7fad37e" +dependencies = [ + "bevy_a11y", + "bevy_animation", + "bevy_app", + "bevy_asset", + "bevy_audio", + "bevy_core", + "bevy_core_pipeline", + "bevy_derive", + "bevy_diagnostic", + "bevy_ecs", + "bevy_gilrs", + "bevy_gizmos", + "bevy_gltf", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_pbr", + "bevy_ptr", + "bevy_reflect", + "bevy_render", + "bevy_scene", + "bevy_sprite", + "bevy_tasks", + "bevy_text", + "bevy_time", + "bevy_transform", + "bevy_ui", + "bevy_utils", + "bevy_window", + "bevy_winit", +] + +[[package]] +name = "bevy_log" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07dcc615ff4f617b06c3f9522fca3c55d56f9644db293318f8ab68fcdea5d4fe" +dependencies = [ + "android_log-sys", + "bevy_app", + "bevy_ecs", + "bevy_utils", + "console_error_panic_hook", + "tracing-log", + "tracing-subscriber", + "tracing-wasm", +] + +[[package]] +name = "bevy_macro_utils" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23ddc18d489b4e57832d4958cde7cd2f349f0ad91e5892ac9e2f2ee16546b981" +dependencies = [ + "quote 1.0.33", + "rustc-hash", + "syn 2.0.38", + "toml_edit", +] + +[[package]] +name = "bevy_math" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78286a81fead796dc4b45ab14f4f02fe29a94423d3587bcfef872b2a8e0a474b" +dependencies = [ + "glam", + "serde", +] + +[[package]] +name = "bevy_mikktspace" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6cfc2a21ea47970a9b1f0f4735af3256a8f204815bd756110051d10f9d909497" +dependencies = [ + "glam", +] + +[[package]] +name = "bevy_pbr" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63ca796a619e61cd43a0a3b11fde54644f7f0732a1fba1eef5d406248c6eba85" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags 2.4.1", + "bytemuck", + "naga_oil", + "radsort", +] + +[[package]] +name = "bevy_ptr" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72c7586401a46f7d8e436028225c1df5288f2e0082d066b247a82466fea155c6" + +[[package]] +name = "bevy_reflect" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0778197a1eb3e095a71417c74b7152ede02975cdc95b5ea4ddc5251ed00a2eb5" +dependencies = [ + "bevy_math", + "bevy_ptr", + "bevy_reflect_derive", + "bevy_utils", + "downcast-rs", + "erased-serde", + "glam", + "once_cell", + "parking_lot 0.12.1", + "serde", + "smallvec 1.11.1", + "smol_str", + "thiserror", +] + +[[package]] +name = "bevy_reflect_derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "342a4b2d09db22c48607d23ad59a056aff1ee004549050a51d490d375ba29528" +dependencies = [ + "bevy_macro_utils", + "bit-set 0.5.3", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", + "uuid", +] + +[[package]] +name = "bevy_render" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39df4824b760928c27afc7b00fb649c7a63c9d76661ab014ff5c86537ee906cb" +dependencies = [ + "anyhow", + "async-channel", + "bevy_app", + "bevy_asset", + "bevy_core", + "bevy_derive", + "bevy_ecs", + "bevy_encase_derive", + "bevy_hierarchy", + "bevy_log", + "bevy_math", + "bevy_mikktspace", + "bevy_reflect", + "bevy_render_macros", + "bevy_tasks", + "bevy_time", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bitflags 2.4.1", + "bytemuck", + "codespan-reporting", + "downcast-rs", + "encase", + "futures-lite", + "hexasphere", + "image", + "js-sys", + "ktx2", + "naga", + "naga_oil", + "parking_lot 0.12.1", + "regex", + "ruzstd", + "serde", + "smallvec 1.11.1", + "thiserror", + "thread_local", + "wasm-bindgen", + "web-sys", + "wgpu", + "wgpu-hal", +] + +[[package]] +name = "bevy_render_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd08c740aac73363e32fb45af869b10cec65bcb76fe3e6cd0f8f7eebf4c36c9" +dependencies = [ + "bevy_macro_utils", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "bevy_scene" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd47e1263506153bef3a8be97fe2d856f206d315668c4f97510ca6cc181d9681" +dependencies = [ + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "ron", + "serde", + "thiserror", + "uuid", +] + +[[package]] +name = "bevy_sprite" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68a8ca824fad75c6ef74cfbbba0a4ce3ccc435fa23d6bf3f003f260548813397" +dependencies = [ + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_transform", + "bevy_utils", + "bitflags 2.4.1", + "bytemuck", + "fixedbitset", + "guillotiere", + "rectangle-pack", + "thiserror", +] + +[[package]] +name = "bevy_tasks" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c73bbb847c83990d3927005090df52f8ac49332e1643d2ad9aac3cd2974e66bf" +dependencies = [ + "async-channel", + "async-executor", + "async-task", + "concurrent-queue", + "futures-lite", + "wasm-bindgen-futures", +] + +[[package]] +name = "bevy_text" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "692288ab7b0a9f8b38058964c52789fc6bcb63703b23de51cce90ec41bfca355" +dependencies = [ + "ab_glyph", + "anyhow", + "bevy_app", + "bevy_asset", + "bevy_ecs", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_transform", + "bevy_utils", + "bevy_window", + "glyph_brush_layout", + "serde", + "thiserror", +] + +[[package]] +name = "bevy_time" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d58d6dbae9c8225d8c0e0f04d2c5dbb71d22adc01ecd5ab3cebc364139e4a6d" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_reflect", + "bevy_utils", + "crossbeam-channel 0.5.8", + "thiserror", +] + +[[package]] +name = "bevy_transform" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b9b0ac0149a57cd846cb357a35fc99286f9848e53d4481954608ac9552ed2d4" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_hierarchy", + "bevy_math", + "bevy_reflect", +] + +[[package]] +name = "bevy_ui" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59b6d295a755e5b79e869a09e087029d72974562a521ec7ccfba7141fa948a32" +dependencies = [ + "bevy_a11y", + "bevy_app", + "bevy_asset", + "bevy_core_pipeline", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_log", + "bevy_math", + "bevy_reflect", + "bevy_render", + "bevy_sprite", + "bevy_text", + "bevy_transform", + "bevy_utils", + "bevy_window", + "bytemuck", + "serde", + "smallvec 1.11.1", + "taffy", + "thiserror", +] + +[[package]] +name = "bevy_utils" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08d9484e32434ea84dc548cff246ce0c6f756c1336f5ea03f24ac120a48595c7" +dependencies = [ + "ahash 0.8.3", + "bevy_utils_proc_macros", + "getrandom 0.2.10", + "hashbrown 0.14.1", + "instant", + "petgraph", + "thiserror", + "tracing", + "uuid", +] + +[[package]] +name = "bevy_utils_proc_macros" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5391b242c36f556db01d5891444730c83aa9dd648b6a8fd2b755d22cb3bddb57" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "bevy_window" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd584c0da7c4ada6557b09f57f30fb7cff21ccedc641473fc391574b4c9b7944" +dependencies = [ + "bevy_app", + "bevy_ecs", + "bevy_input", + "bevy_math", + "bevy_reflect", + "bevy_utils", + "raw-window-handle", +] [[package]] -name = "bcs" -version = "0.1.6" +name = "bevy_winit" +version = "0.11.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85b6598a2f5d564fb7855dc6b06fd1c38cff5a72bd8b863a4d021938497b440a" +checksum = "bfdc044abdb95790c20053e6326760f0a2985f0dcd78613d397bf35f16039d53" dependencies = [ - "serde", - "thiserror", + "accesskit_winit", + "approx", + "bevy_a11y", + "bevy_app", + "bevy_derive", + "bevy_ecs", + "bevy_hierarchy", + "bevy_input", + "bevy_math", + "bevy_tasks", + "bevy_utils", + "bevy_window", + "crossbeam-channel 0.5.8", + "raw-window-handle", + "wasm-bindgen", + "web-sys", + "winit", ] [[package]] @@ -310,13 +1240,42 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "bindgen" +version = "0.68.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "726e4313eb6ec35d2730258ad4e15b547ee75d6afaa1361a922e78e59b7d8078" +dependencies = [ + "bitflags 2.4.1", + "cexpr", + "clang-sys", + "lazy_static", + "lazycell", + "peeking_take_while", + "proc-macro2 1.0.69", + "quote 1.0.33", + "regex", + "rustc-hash", + "shlex", + "syn 2.0.38", +] + [[package]] name = "bit-set" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d9bf6104718e80d7b26a68fdbacff3481cfc05df670821affc7e9cbc1884400c" dependencies = [ - "bit-vec", + "bit-vec 0.4.4", +] + +[[package]] +name = "bit-set" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0700ddab506f33b20a03b13996eccd309a48e5ff77d0d95926aa0210fb4e95f1" +dependencies = [ + "bit-vec 0.6.3", ] [[package]] @@ -325,6 +1284,12 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "02b4ff8b16e6076c3e14220b39fbc1fabb6737522281a388998046859400895f" +[[package]] +name = "bit-vec" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" + [[package]] name = "bitflags" version = "1.3.2" @@ -336,6 +1301,9 @@ name = "bitflags" version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07" +dependencies = [ + "serde", +] [[package]] name = "bitvec" @@ -359,6 +1327,12 @@ dependencies = [ "wyz", ] +[[package]] +name = "block" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d8c1fef690941d3e7788d328517591fecc684c084084702d6ff1641e993699a" + [[package]] name = "block-buffer" version = "0.9.0" @@ -403,6 +1377,25 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8d696c370c750c948ada61c69a0ee2cbbb9c50b1019ddb86d9317157a99c2cae" +[[package]] +name = "block-sys" +version = "0.1.0-beta.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0fa55741ee90902547802152aaf3f8e5248aab7e21468089560d4c8840561146" +dependencies = [ + "objc-sys", +] + +[[package]] +name = "block2" +version = "0.2.0-alpha.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8dd9e63c1744f755c2f60332b88de39d341e5e86239014ad839bd71c106dec42" +dependencies = [ + "block-sys", + "objc2-encode", +] + [[package]] name = "blooms-db" version = "0.1.0" @@ -508,6 +1501,26 @@ dependencies = [ "regex", ] +[[package]] +name = "bytemuck" +version = "1.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "374d28ec25809ee0e23827c2ab573d729e293f281dfe393500e7ad618baa61c6" +dependencies = [ + "bytemuck_derive", +] + +[[package]] +name = "bytemuck_derive" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "965ab7eb5f8f97d2a083c799f3a1b994fc397b2fe2da5d1da1626ce15a39f2b1" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + [[package]] name = "byteorder" version = "1.5.0" @@ -578,6 +1591,12 @@ dependencies = [ "libc", ] +[[package]] +name = "cesu8" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c" + [[package]] name = "cexpr" version = "0.6.0" @@ -599,6 +1618,12 @@ 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 = "cfx-addr" version = "0.1.0" @@ -755,7 +1780,7 @@ dependencies = [ "async-oneshot", "async-trait", "bcs", - "bit-set", + "bit-set 0.4.0", "bls-signatures", "bounded-executor", "byteorder", @@ -990,6 +2015,38 @@ dependencies = [ "cc", ] +[[package]] +name = "codespan-reporting" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" +dependencies = [ + "termcolor", + "unicode-width", +] + +[[package]] +name = "color_quant" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" + +[[package]] +name = "com-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bf43edc576402991846b093a7ca18a3477e0ef9c588cde84964b5d3e43016642" + +[[package]] +name = "combine" +version = "4.6.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35ed6e9d84f0b51a7f52daf1c7d71dd136fd7a3f41a8462b8cdb8c78d920fad4" +dependencies = [ + "bytes 1.5.0", + "memchr", +] + [[package]] name = "common-types" version = "0.1.0" @@ -1007,6 +2064,15 @@ dependencies = [ "unexpected 0.1.0 (git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0)", ] +[[package]] +name = "concurrent-queue" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f057a694a54f12365049b0958a1685bb52d567f5593b355fbf685838e873d400" +dependencies = [ + "crossbeam-utils 0.8.16", +] + [[package]] name = "consensus-types" version = "0.1.0" @@ -1024,12 +2090,43 @@ dependencies = [ "short-hex-str", ] +[[package]] +name = "console_error_panic_hook" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a06aeb73f470f66dcdbf7223caeebb85984942f22f1adb2a088cf9668146bbbc" +dependencies = [ + "cfg-if 1.0.0", + "wasm-bindgen", +] + [[package]] name = "const-oid" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d6f2aa4d0537bcc1c74df8755072bd31c1ef1a3a1b85a68e8404a8c353b7b8b" +[[package]] +name = "const_panic" +version = "0.2.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6051f239ecec86fde3410901ab7860d458d160371533842974fc61f96d15879b" + +[[package]] +name = "const_soft_float" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87ca1caa64ef4ed453e68bb3db612e51cf1b2f5b871337f0fcab1c8f87cc3dff" + +[[package]] +name = "constgebra" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "edd23e864550e6dafc1e41ac78ce4f1ccddc8672b40c403524a04ff3f0518420" +dependencies = [ + "const_soft_float", +] + [[package]] name = "core-foundation" version = "0.9.3" @@ -1046,6 +2143,75 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core-graphics" +version = "0.22.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2581bbab3b8ffc6fcbd550bf46c355135d16e9ff2a6ea032ad6b9bf1d7efe4fb" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "core-graphics-types", + "foreign-types", + "libc", +] + +[[package]] +name = "core-graphics-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2bb142d41022986c1d8ff29103a1411c8a3dfad3552f87a4f8dc50d61d4f4e33" +dependencies = [ + "bitflags 1.3.2", + "core-foundation", + "libc", +] + +[[package]] +name = "coreaudio-rs" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "321077172d79c662f64f5071a03120748d5bb652f5231570141be24cfcd2bace" +dependencies = [ + "bitflags 1.3.2", + "core-foundation-sys", + "coreaudio-sys", +] + +[[package]] +name = "coreaudio-sys" +version = "0.2.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8478e5bdad14dce236b9898ea002eabfa87cbe14f0aa538dbe3b6a4bec4332d" +dependencies = [ + "bindgen 0.68.1", +] + +[[package]] +name = "cpal" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d959d90e938c5493000514b446987c07aed46c668faaa7d34d6c7a67b1a578c" +dependencies = [ + "alsa", + "core-foundation-sys", + "coreaudio-rs", + "dasp_sample", + "jni 0.19.0", + "js-sys", + "libc", + "mach2", + "ndk", + "ndk-context", + "oboe", + "once_cell", + "parking_lot 0.12.1", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "windows 0.46.0", +] + [[package]] name = "cpufeatures" version = "0.2.9" @@ -1115,6 +2281,16 @@ dependencies = [ "maybe-uninit", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils 0.8.16", +] + [[package]] name = "crossbeam-deque" version = "0.5.2" @@ -1339,6 +2515,17 @@ dependencies = [ "zeroize", ] +[[package]] +name = "d3d12" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8f0de2f5a8e7bd4a9eec0e3c781992a4ce1724f68aec7d7a3715344de8b39da" +dependencies = [ + "bitflags 1.3.2", + "libloading 0.7.4", + "winapi 0.3.9", +] + [[package]] name = "dag" version = "0.1.0" @@ -1346,6 +2533,18 @@ dependencies = [ "hibitset", ] +[[package]] +name = "dasp_sample" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c87e182de0887fd5361989c677c4e8f5000cd9491d6d563161a8f3a5519fc7f" + +[[package]] +name = "data-encoding" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c2e66c9d817f1720209181c316d28635c050fa304f9c79e47a520882661b7308" + [[package]] name = "db" version = "0.1.0" @@ -1705,6 +2904,18 @@ dependencies = [ "subtle", ] +[[package]] +name = "dispatch" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd0c93bb4b0c6d9b77f4435b0ae98c24d17f1c45b2ff844c6151a07256ca923b" + +[[package]] +name = "downcast-rs" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" + [[package]] name = "ed25519" version = "1.5.3" @@ -1751,6 +2962,38 @@ dependencies = [ "heapsize", ] +[[package]] +name = "encase" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fce2eeef77fd4a293a54b62aa00ac9daebfbcda4bf8998c5a815635b004aa1c" +dependencies = [ + "const_panic", + "encase_derive", + "glam", + "thiserror", +] + +[[package]] +name = "encase_derive" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e520cde08cbf4f7cc097f61573ec06ce467019803de8ae82fb2823fa1554a0e" +dependencies = [ + "encase_derive_impl", +] + +[[package]] +name = "encase_derive_impl" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fe2568f851fd6144a45fa91cfed8fe5ca8fc0b56ba6797bfc1ed2771b90e37c" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + [[package]] name = "encoding_rs" version = "0.8.33" @@ -1829,7 +3072,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2167,12 +3410,27 @@ dependencies = [ "tiny-keccak 1.5.0", ] +[[package]] +name = "euclid" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "87f253bc5c813ca05792837a0ff4b3a580336b224512d48f7eda1d7dd9210787" +dependencies = [ + "num-traits", +] + +[[package]] +name = "event-listener" +version = "2.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0" + [[package]] name = "evm" version = "0.1.0" source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" dependencies = [ - "bit-set", + "bit-set 0.4.0", "ethereum-types 0.4.2", "heapsize", "keccak-hash 0.1.2", @@ -2285,12 +3543,30 @@ dependencies = [ "plain_hasher", ] +[[package]] +name = "fastrand" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e51093e27b0797c359783294ca4f0a911c270184cb10f85783b118614a1501be" +dependencies = [ + "instant", +] + [[package]] name = "fastrand" version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +[[package]] +name = "fdeflate" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d329bdeac514ee06249dabc27877490f17f5d371ec693360768b838e19f3ae10" +dependencies = [ + "simd-adler32", +] + [[package]] name = "ff" version = "0.13.0" @@ -2308,6 +3584,18 @@ version = "0.1.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e825f6987101665dea6ec934c09ec6d721de7bc1bf92248e1d5810c8cd636b77" +[[package]] +name = "filetime" +version = "0.2.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4029edd3e734da6fe05b6cd7bd2960760a616bd2ddd0d59a0124746d6272af0" +dependencies = [ + "cfg-if 1.0.0", + "libc", + "redox_syscall 0.3.5", + "windows-sys 0.48.0", +] + [[package]] name = "fixed-hash" version = "0.2.5" @@ -2345,6 +3633,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "fixedbitset" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80" + [[package]] name = "flate2" version = "1.0.28" @@ -2403,6 +3697,15 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42703706b716c37f96a77aea830392ad231f44c9e9a67872fa5548707e11b11c" +[[package]] +name = "fsevent-sys" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76ee7a02da4d231650c7cea31349b889be2f45ddb3ef3032d2ec8185f6313fd2" +dependencies = [ + "libc", +] + [[package]] name = "fuchsia-cprng" version = "0.1.1" @@ -2485,6 +3788,21 @@ version = "0.3.28" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +[[package]] +name = "futures-lite" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49a9d51ce47660b1e808d3c990b4709f2f415d928835a17dfd16991515c46bce" +dependencies = [ + "fastrand 1.9.0", + "futures-core", + "futures-io", + "memchr", + "parking", + "pin-project-lite 0.2.13", + "waker-fn", +] + [[package]] name = "futures-macro" version = "0.3.28" @@ -2592,8 +3910,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427" dependencies = [ "cfg-if 1.0.0", + "js-sys", "libc", "wasi 0.11.0+wasi-snapshot-preview1", + "wasm-bindgen", ] [[package]] @@ -2606,18 +3926,177 @@ dependencies = [ "polyval", ] +[[package]] +name = "gilrs" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62fd19844d0eb919aca41d3e4ea0e0b6bf60e1e827558b101c269015b8f5f27a" +dependencies = [ + "fnv", + "gilrs-core", + "log", + "uuid", + "vec_map", +] + +[[package]] +name = "gilrs-core" +version = "0.5.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ccc99e9b8d63ffcaa334c4babfa31f46e156618a11f63efb6e8e6bcb37b830d" +dependencies = [ + "core-foundation", + "io-kit-sys", + "js-sys", + "libc", + "libudev-sys", + "log", + "nix 0.26.4", + "uuid", + "vec_map", + "wasm-bindgen", + "web-sys", + "windows 0.51.1", +] + [[package]] name = "gimli" version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0" +[[package]] +name = "glam" +version = "0.24.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b5418c17512bdf42730f9032c74e1ae39afc408745ebb2acf72fbc4691c17945" +dependencies = [ + "bytemuck", + "serde", +] + [[package]] name = "glob" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" +[[package]] +name = "glow" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca0fe580e4b60a8ab24a868bc08e2f03cbcb20d3d676601fa909386713333728" +dependencies = [ + "js-sys", + "slotmap", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "gltf" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad2dcfb6dd7a66f9eb3d181a29dcfb22d146b0bcdc2e1ed1713cbf03939a88ea" +dependencies = [ + "byteorder", + "gltf-json", + "lazy_static", +] + +[[package]] +name = "gltf-derive" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2cbcea5dd47e7ad4e9ee6f040384fcd7204bbf671aa4f9e7ca7dfc9bfa1de20" +dependencies = [ + "inflections", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + +[[package]] +name = "gltf-json" +version = "1.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d5b810806b78dde4b71a95cc0e6fdcab34c4c617da3574df166f9987be97d03" +dependencies = [ + "gltf-derive", + "serde", + "serde_derive", + "serde_json", +] + +[[package]] +name = "glyph_brush_layout" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc32c2334f00ca5ac3695c5009ae35da21da8c62d255b5b96d56e2597a637a38" +dependencies = [ + "ab_glyph", + "approx", + "xi-unicode", +] + +[[package]] +name = "gpu-alloc" +version = "0.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "22beaafc29b38204457ea030f6fb7a84c9e4dd1b86e311ba0542533453d87f62" +dependencies = [ + "bitflags 1.3.2", + "gpu-alloc-types", +] + +[[package]] +name = "gpu-alloc-types" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "54804d0d6bc9d7f26db4eaec1ad10def69b599315f487d32c334a80d1efe67a5" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "gpu-allocator" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ce95f9e2e11c2c6fadfce42b5af60005db06576f231f5c92550fdded43c423e8" +dependencies = [ + "backtrace", + "log", + "thiserror", + "winapi 0.3.9", + "windows 0.44.0", +] + +[[package]] +name = "gpu-descriptor" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc11df1ace8e7e564511f53af41f3e42ddc95b56fd07b3f4445d2a6048bc682c" +dependencies = [ + "bitflags 2.4.1", + "gpu-descriptor-types", + "hashbrown 0.14.1", +] + +[[package]] +name = "gpu-descriptor-types" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6bf0b36e6f090b7e1d8a4b49c0cb81c1f8376f72198c65dd3ad9ff3556b8b78c" +dependencies = [ + "bitflags 2.4.1", +] + +[[package]] +name = "grid" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eec1c01eb1de97451ee0d60de7d81cf1e72aabefb021616027f3d1c3ec1c723c" + [[package]] name = "group" version = "0.13.0" @@ -2631,6 +4110,16 @@ dependencies = [ "subtle", ] +[[package]] +name = "guillotiere" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b62d5865c036cb1393e23c50693df631d3f5d7bcca4c04fe4cc0fd592e74a782" +dependencies = [ + "euclid", + "svg_fmt", +] + [[package]] name = "h2" version = "0.3.21" @@ -2668,7 +4157,7 @@ version = "0.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" dependencies = [ - "ahash", + "ahash 0.3.8", "autocfg 1.1.0", ] @@ -2683,6 +4172,26 @@ name = "hashbrown" version = "0.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12" +dependencies = [ + "ahash 0.8.3", + "allocator-api2", + "serde", +] + +[[package]] +name = "hassle-rs" +version = "0.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1397650ee315e8891a0df210707f0fc61771b0cc518c3023896064c5407cb3b0" +dependencies = [ + "bitflags 1.3.2", + "com-rs", + "libc", + "libloading 0.7.4", + "thiserror", + "widestring", + "winapi 0.3.9", +] [[package]] name = "heap-map" @@ -2737,6 +4246,22 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46" +[[package]] +name = "hexasphere" +version = "9.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7cb3df16a7bcb1b5bc092abd55e14f77ca70aea14445026e264586fc62889a10" +dependencies = [ + "constgebra", + "glam", +] + +[[package]] +name = "hexf-parse" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" + [[package]] name = "hibitset" version = "0.6.0" @@ -2798,7 +4323,7 @@ version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5444c27eef6923071f7ebcc33e3444508466a76f7a2b93da00ed6e19f30c1ddb" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -2943,6 +4468,20 @@ dependencies = [ "xmltree", ] +[[package]] +name = "image" +version = "0.24.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f3dfdbdd72063086ff443e297b61695500514b1e41095b6fb9a5ab48a70a711" +dependencies = [ + "bytemuck", + "byteorder", + "color_quant", + "num-rational 0.4.1", + "num-traits", + "png", +] + [[package]] name = "impl-codec" version = "0.4.2" @@ -3001,6 +4540,12 @@ dependencies = [ "hashbrown 0.14.1", ] +[[package]] +name = "inflections" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a257582fdcde896fd96463bf2d40eefea0580021c0712a0e2b028b60b47a837a" + [[package]] name = "influx_db_client" version = "0.5.1" @@ -3014,6 +4559,26 @@ dependencies = [ "serde_json", ] +[[package]] +name = "inotify" +version = "0.9.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f8069d3ec154eb856955c1c0fbffefbf5f3c40a104ec912d4797314c1801abff" +dependencies = [ + "bitflags 1.3.2", + "inotify-sys", + "libc", +] + +[[package]] +name = "inotify-sys" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e05c02b5e89bff3b946cedeca278abc628fe811e604f027c45a8aa3cf793d0eb" +dependencies = [ + "libc", +] + [[package]] name = "instant" version = "0.1.12" @@ -3021,6 +4586,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" dependencies = [ "cfg-if 1.0.0", + "js-sys", + "wasm-bindgen", + "web-sys", ] [[package]] @@ -3041,6 +4609,16 @@ dependencies = [ "timer", ] +[[package]] +name = "io-kit-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9b2d4429acc1deff0fbdece0325b4997bdb02b2c245ab7023fd5deca0f6348de" +dependencies = [ + "core-foundation-sys", + "mach2", +] + [[package]] name = "iovec" version = "0.1.4" @@ -3095,6 +4673,40 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +[[package]] +name = "jni" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni" +version = "0.20.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" +dependencies = [ + "cesu8", + "combine", + "jni-sys", + "log", + "thiserror", + "walkdir", +] + +[[package]] +name = "jni-sys" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" + [[package]] name = "jobserver" version = "0.1.27" @@ -3160,29 +4772,69 @@ version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f58a51ef3df9398cf2434bea8d4eb61fb748d0feb1571f87388579a120a4c8f" dependencies = [ - "primitive-types", - "tiny-keccak 2.0.2", + "primitive-types", + "tiny-keccak 2.0.2", +] + +[[package]] +name = "keccak-hasher" +version = "0.1.1" +source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" +dependencies = [ + "ethereum-types 0.4.2", + "hash-db", + "plain_hasher", + "tiny-keccak 1.5.0", +] + +[[package]] +name = "kernel32-sys" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +dependencies = [ + "winapi 0.2.8", + "winapi-build", +] + +[[package]] +name = "khronos-egl" +version = "4.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c2352bd1d0bceb871cb9d40f24360c8133c11d7486b68b5381c1dd1a32015e3" +dependencies = [ + "libc", + "libloading 0.7.4", + "pkg-config", +] + +[[package]] +name = "kqueue" +version = "1.0.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7447f1ca1b7b563588a205fe93dea8df60fd981423a768bc1c0ded35ed147d0c" +dependencies = [ + "kqueue-sys", + "libc", ] [[package]] -name = "keccak-hasher" -version = "0.1.1" -source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" +name = "kqueue-sys" +version = "1.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed9625ffda8729b85e45cf04090035ac368927b8cebc34898e7c120f52e4838b" dependencies = [ - "ethereum-types 0.4.2", - "hash-db", - "plain_hasher", - "tiny-keccak 1.5.0", + "bitflags 1.3.2", + "libc", ] [[package]] -name = "kernel32-sys" -version = "0.2.2" +name = "ktx2" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" +checksum = "87d65e08a9ec02e409d27a0139eaa6b9756b4d81fe7cde71f6941a83730ce838" dependencies = [ - "winapi 0.2.8", - "winapi-build", + "bitflags 1.3.2", ] [[package]] @@ -3256,6 +4908,17 @@ dependencies = [ "parking_lot 0.7.1", ] +[[package]] +name = "lewton" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "777b48df9aaab155475a83a7df3070395ea1ac6902f5cd062b8f2b028075c030" +dependencies = [ + "byteorder", + "ogg", + "tinyvec", +] + [[package]] name = "libc" version = "0.2.149" @@ -3302,12 +4965,22 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "libloading" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" +dependencies = [ + "cfg-if 1.0.0", + "windows-sys 0.48.0", +] + [[package]] name = "librocksdb_sys" version = "0.1.0" source = "git+https://github.com/Conflux-Chain/rust-rocksdb.git?rev=a1ce5bd3322a7b732dfb300c2571dc4d99f1edae#a1ce5bd3322a7b732dfb300c2571dc4d99f1edae" dependencies = [ - "bindgen", + "bindgen 0.64.0", "bzip2-sys", "cc", "cmake", @@ -3335,6 +5008,16 @@ dependencies = [ "zstd-sys", ] +[[package]] +name = "libudev-sys" +version = "0.1.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c8469b4a23b962c1396b9b451dda50ef5b283e8dd309d69033475fa9b334324" +dependencies = [ + "libc", + "pkg-config", +] + [[package]] name = "libz-sys" version = "1.1.12" @@ -3465,11 +5148,29 @@ dependencies = [ "libc", ] +[[package]] +name = "mach2" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d0d1830bcd151a6fc4aea1369af235b36c1528fe976b8ff678683c9995eade8" +dependencies = [ + "libc", +] + [[package]] name = "macros" version = "0.1.0" source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" +[[package]] +name = "malloc_buf" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62bb907fe88d54d8d9ce32a3cceab4218ed2f6b7d35617cafe9adf84e43919cb" +dependencies = [ + "libc", +] + [[package]] name = "malloc_size_of" version = "0.0.1" @@ -3498,6 +5199,15 @@ version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" +[[package]] +name = "matchers" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" +dependencies = [ + "regex-automata 0.1.10", +] + [[package]] name = "maybe-uninit" version = "2.0.0" @@ -3582,6 +5292,20 @@ name = "memzero" version = "0.1.0" source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" +[[package]] +name = "metal" +version = "0.24.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de11355d1f6781482d027a3b4d4de7825dcedb197bf573e0596d00008402d060" +dependencies = [ + "bitflags 1.3.2", + "block", + "core-graphics-types", + "foreign-types", + "log", + "objc", +] + [[package]] name = "metrics" version = "0.1.0" @@ -3617,6 +5341,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" dependencies = [ "adler", + "simd-adler32", ] [[package]] @@ -3645,8 +5370,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" dependencies = [ "libc", + "log", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -3715,6 +5441,47 @@ dependencies = [ "serde_bytes", ] +[[package]] +name = "naga" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbcc2e0513220fd2b598e6068608d4462db20322c0e77e47f6f488dfcfc279cb" +dependencies = [ + "bit-set 0.5.3", + "bitflags 1.3.2", + "codespan-reporting", + "hexf-parse", + "indexmap 1.9.3", + "log", + "num-traits", + "pp-rs", + "rustc-hash", + "spirv", + "termcolor", + "thiserror", + "unicode-xid 0.2.4", +] + +[[package]] +name = "naga_oil" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8be942a5c21c58b9b0bf4d9b99db3634ddb7a916f8e1d1d0b71820cc4150e56b" +dependencies = [ + "bit-set 0.5.3", + "codespan-reporting", + "data-encoding", + "indexmap 1.9.3", + "naga", + "once_cell", + "regex", + "regex-syntax 0.6.29", + "rustc-hash", + "thiserror", + "tracing", + "unicode-ident", +] + [[package]] name = "nan-preserving-float" version = "0.1.0" @@ -3748,6 +5515,35 @@ dependencies = [ "cc", ] +[[package]] +name = "ndk" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "451422b7e4718271c8b5b3aadf5adedba43dc76312454b387e98fae0fc951aa0" +dependencies = [ + "bitflags 1.3.2", + "jni-sys", + "ndk-sys", + "num_enum 0.5.11", + "raw-window-handle", + "thiserror", +] + +[[package]] +name = "ndk-context" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "27b02d87554356db9e9a873add8782d4ea6e3e58ea071a9adb9a2e8ddb884a8b" + +[[package]] +name = "ndk-sys" +version = "0.4.1+23.1.7779620" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3cf2aae958bd232cac5069850591667ad422d263686d75b52a065f9badeee5a3" +dependencies = [ + "jni-sys", +] + [[package]] name = "net2" version = "0.2.39" @@ -3800,6 +5596,28 @@ dependencies = [ "throttling", ] +[[package]] +name = "nix" +version = "0.24.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa52e972a9a719cecb6864fb88568781eb706bac2cd1d4f04a648542dbf78069" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", +] + +[[package]] +name = "nix" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +dependencies = [ + "bitflags 1.3.2", + "cfg-if 1.0.0", + "libc", +] + [[package]] name = "nodrop" version = "0.1.14" @@ -3816,6 +5634,44 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "notify" +version = "6.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6205bd8bb1e454ad2e27422015fb5e4f2bcc7e08fa8f27058670d208324a4d2d" +dependencies = [ + "bitflags 2.4.1", + "crossbeam-channel 0.5.8", + "filetime", + "fsevent-sys", + "inotify", + "kqueue", + "libc", + "log", + "mio 0.8.8", + "walkdir", + "windows-sys 0.48.0", +] + +[[package]] +name = "ntapi" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8a3895c6391c39d7fe7ebc444a87eb2991b2a0bc718fdabd071eec617fc68e4" +dependencies = [ + "winapi 0.3.9", +] + +[[package]] +name = "nu-ansi-term" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" +dependencies = [ + "overload", + "winapi 0.3.9", +] + [[package]] name = "num" version = "0.1.42" @@ -3838,7 +5694,7 @@ dependencies = [ "num-complex", "num-integer", "num-iter", - "num-rational", + "num-rational 0.2.4", "num-traits", ] @@ -3855,96 +5711,194 @@ dependencies = [ ] [[package]] -name = "num-bigint" -version = "0.2.6" +name = "num-bigint" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-complex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-derive" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "num-integer" +version = "0.1.45" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +dependencies = [ + "autocfg 1.1.0", + "num-traits", +] + +[[package]] +name = "num-iter" +version = "0.1.43" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +dependencies = [ + "autocfg 1.1.0", + "num-bigint 0.2.6", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-rational" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0" +dependencies = [ + "autocfg 1.1.0", + "num-integer", + "num-traits", +] + +[[package]] +name = "num-traits" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +dependencies = [ + "autocfg 1.1.0", +] + +[[package]] +name = "num-variants" +version = "0.1.0" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "num_cpus" +version = "1.16.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +dependencies = [ + "hermit-abi 0.3.3", + "libc", +] + +[[package]] +name = "num_enum" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9" dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", + "num_enum_derive 0.5.11", ] [[package]] -name = "num-complex" -version = "0.2.4" +name = "num_enum" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1" dependencies = [ - "autocfg 1.1.0", - "num-traits", + "num_enum_derive 0.6.1", ] [[package]] -name = "num-derive" -version = "0.3.3" +name = "num_enum_derive" +version = "0.5.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "876a53fff98e03a936a674b29568b0e605f06b29372c2489ff4de23f1949743d" +checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799" dependencies = [ + "proc-macro-crate", "proc-macro2 1.0.69", "quote 1.0.33", "syn 1.0.109", ] [[package]] -name = "num-integer" -version = "0.1.45" +name = "num_enum_derive" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" +checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6" dependencies = [ - "autocfg 1.1.0", - "num-traits", + "proc-macro-crate", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", ] [[package]] -name = "num-iter" -version = "0.1.43" +name = "objc" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" +checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ - "autocfg 1.1.0", - "num-integer", - "num-traits", + "malloc_buf", + "objc_exception", ] [[package]] -name = "num-rational" -version = "0.2.4" +name = "objc-sys" +version = "0.2.0-beta.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg 1.1.0", - "num-bigint 0.2.6", - "num-integer", - "num-traits", -] +checksum = "df3b9834c1e95694a05a828b59f55fa2afec6288359cda67146126b3f90a55d7" [[package]] -name = "num-traits" -version = "0.2.17" +name = "objc2" +version = "0.3.0-beta.3.patch-leaks.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c" +checksum = "7e01640f9f2cb1220bbe80325e179e532cb3379ebcd1bf2279d703c19fe3a468" dependencies = [ - "autocfg 1.1.0", + "block2", + "objc-sys", + "objc2-encode", ] [[package]] -name = "num-variants" -version = "0.1.0" +name = "objc2-encode" +version = "2.0.0-pre.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abfcac41015b00a120608fdaa6938c44cb983fee294351cc4bac7638b4e50512" dependencies = [ - "proc-macro2 1.0.69", - "quote 1.0.33", - "syn 1.0.109", + "objc-sys", ] [[package]] -name = "num_cpus" -version = "1.16.0" +name = "objc_exception" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" dependencies = [ - "hermit-abi 0.3.3", - "libc", + "cc", ] [[package]] @@ -3956,6 +5910,38 @@ dependencies = [ "memchr", ] +[[package]] +name = "oboe" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8868cc237ee02e2d9618539a23a8d228b9bb3fc2e7a5b11eed3831de77c395d0" +dependencies = [ + "jni 0.20.0", + "ndk", + "ndk-context", + "num-derive", + "num-traits", + "oboe-sys", +] + +[[package]] +name = "oboe-sys" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7f44155e7fb718d3cfddcf70690b2b51ac4412f347cd9e4fbe511abe9cd7b5f2" +dependencies = [ + "cc", +] + +[[package]] +name = "ogg" +version = "0.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6951b4e8bf21c8193da321bcce9c9dd2e13c858fe078bf9054a288b419ae5d6e" +dependencies = [ + "byteorder", +] + [[package]] name = "once_cell" version = "1.18.0" @@ -4012,6 +5998,15 @@ dependencies = [ "vcpkg", ] +[[package]] +name = "orbclient" +version = "0.3.46" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8378ac0dfbd4e7895f2d2c1f1345cab3836910baf3a300b000d04250f0c8428f" +dependencies = [ + "redox_syscall 0.3.5", +] + [[package]] name = "ordered-float" version = "2.10.1" @@ -4021,6 +6016,21 @@ dependencies = [ "num-traits", ] +[[package]] +name = "overload" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" + +[[package]] +name = "owned_ttf_parser" +version = "0.19.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "706de7e2214113d63a8238d1910463cfce781129a6f263d13fdb09ff64355ba4" +dependencies = [ + "ttf-parser", +] + [[package]] name = "owning_ref" version = "0.4.1" @@ -4177,6 +6187,12 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "parking" +version = "2.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae" + [[package]] name = "parking_lot" version = "0.6.4" @@ -4294,7 +6310,7 @@ dependencies = [ "libc", "redox_syscall 0.4.1", "smallvec 1.11.1", - "windows-targets", + "windows-targets 0.48.5", ] [[package]] @@ -4307,6 +6323,12 @@ dependencies = [ "rand_core 0.6.4", ] +[[package]] +name = "paste" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c" + [[package]] name = "path-absolutize" version = "3.1.1" @@ -4397,6 +6419,16 @@ version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2a4787296e9989611394c33f193f676704af1686e70b8f8033ab5ba9a35a94" +[[package]] +name = "petgraph" +version = "0.6.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9" +dependencies = [ + "fixedbitset", + "indexmap 2.0.2", +] + [[package]] name = "pin-project-lite" version = "0.1.12" @@ -4470,6 +6502,19 @@ dependencies = [ "crunchy 0.2.2", ] +[[package]] +name = "png" +version = "0.17.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dd75bf2d8dd3702b9707cdbc56a5b9ef42cec752eb8b3bafc01234558442aa64" +dependencies = [ + "bitflags 1.3.2", + "crc32fast", + "fdeflate", + "flate2", + "miniz_oxide", +] + [[package]] name = "polyval" version = "0.4.5" @@ -4520,6 +6565,15 @@ dependencies = [ "serde", ] +[[package]] +name = "pp-rs" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb458bb7f6e250e6eb79d5026badc10a3ebb8f9a15d1fff0f13d17c71f4d6dee" +dependencies = [ + "unicode-xid 0.2.4", +] + [[package]] name = "ppv-lite86" version = "0.2.17" @@ -4641,6 +6695,12 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "profiling" +version = "1.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f89dff0959d98c9758c88826cc002e2c3d0b9dfac4139711d1f30de442f1139b" + [[package]] name = "prometheus" version = "0.7.0" @@ -4731,6 +6791,12 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09" +[[package]] +name = "radsort" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "17fd96390ed3feda12e1dfe2645ed587e0bea749e319333f104a33ff62f77a0b" + [[package]] name = "rand" version = "0.3.23" @@ -4972,6 +7038,18 @@ dependencies = [ "rand 0.7.3", ] +[[package]] +name = "range-alloc" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c8a99fddc9f0ba0a85884b8d14e3592853e787d581ca1816c91349b10e4eeab" + +[[package]] +name = "raw-window-handle" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2ff9a1f06a88b01621b7ae906ef0211290d1c8a168a15542486a8f61c0833b9" + [[package]] name = "rayon" version = "1.8.0" @@ -5001,6 +7079,12 @@ dependencies = [ "rand_core 0.3.1", ] +[[package]] +name = "rectangle-pack" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a0d463f2884048e7153449a55166f91028d5b0ea53c79377099ce4e8cf0cf9bb" + [[package]] name = "redox_syscall" version = "0.1.57" @@ -5068,8 +7152,17 @@ checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343" dependencies = [ "aho-corasick", "memchr", - "regex-automata", - "regex-syntax", + "regex-automata 0.4.3", + "regex-syntax 0.8.2", +] + +[[package]] +name = "regex-automata" +version = "0.1.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" +dependencies = [ + "regex-syntax 0.6.29", ] [[package]] @@ -5080,9 +7173,15 @@ checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f" dependencies = [ "aho-corasick", "memchr", - "regex-syntax", + "regex-syntax 0.8.2", ] +[[package]] +name = "regex-syntax" +version = "0.6.29" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" + [[package]] name = "regex-syntax" version = "0.8.2" @@ -5098,6 +7197,12 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "renderdoc-sys" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "216080ab382b992234dda86873c18d4c48358f5cfcb70fd693d7f6f2131b628b" + [[package]] name = "reqwest" version = "0.11.22" @@ -5226,6 +7331,28 @@ dependencies = [ "librocksdb_sys", ] +[[package]] +name = "rodio" +version = "0.17.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "79a48a12b54a6db15f566f5edfcd498eafa07ed98defdb3660e28ab8b0231d35" +dependencies = [ + "cpal", + "lewton", +] + +[[package]] +name = "ron" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b91f7eff05f748767f183df4320a63d6936e9c6107d97c9e6bdd9784f4289c94" +dependencies = [ + "base64 0.21.4", + "bitflags 2.4.1", + "serde", + "serde_derive", +] + [[package]] name = "rust-crypto" version = "0.2.36" @@ -5288,7 +7415,18 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys", + "windows-sys 0.48.0", +] + +[[package]] +name = "ruzstd" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc" +dependencies = [ + "byteorder", + "thiserror-core", + "twox-hash", ] [[package]] @@ -5341,13 +7479,22 @@ dependencies = [ "cipher 0.3.0", ] +[[package]] +name = "same-file" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +dependencies = [ + "winapi-util", +] + [[package]] name = "schannel" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88" dependencies = [ - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5582,6 +7729,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "sharded-slab" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" +dependencies = [ + "lazy_static", +] + [[package]] name = "shlex" version = "1.2.0" @@ -5613,6 +7769,12 @@ version = "1.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c" +[[package]] +name = "simd-adler32" +version = "0.3.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d66dc143e6b11c1eddc06d5c423cfc97062865baf299914ab64caa38182078fe" + [[package]] name = "siphasher" version = "0.1.3" @@ -5634,6 +7796,15 @@ dependencies = [ "autocfg 1.1.0", ] +[[package]] +name = "slotmap" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e08e261d0e8f5c43123b7adf3e4ca1690d655377ac93a03b2c9d3e98de1342" +dependencies = [ + "version_check", +] + [[package]] name = "smallvec" version = "0.6.14" @@ -5648,6 +7819,9 @@ name = "smallvec" version = "1.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a" +dependencies = [ + "serde", +] [[package]] name = "smart-default" @@ -5660,6 +7834,15 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "smol_str" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "74212e6bbe9a4352329b2f68ba3130c15a3f26fe88ff22dbdc6cdd58fa85e99c" +dependencies = [ + "serde", +] + [[package]] name = "snappy-sys" version = "0.1.0" @@ -5687,7 +7870,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4031e820eb552adee9295814c0ced9e5cf38ddf1e8b7d566d6de8e2538ea989e" dependencies = [ "libc", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -5715,6 +7898,16 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" +[[package]] +name = "spirv" +version = "0.2.0+1.5.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "246bfa38fe3db3f1dfc8ca5a2cdeb7348c78be2112740cc0ec8ef18b6d94f830" +dependencies = [ + "bitflags 1.3.2", + "num-traits", +] + [[package]] name = "spki" version = "0.4.1" @@ -5796,6 +7989,7 @@ name = "storage_bench" version = "0.1.0" dependencies = [ "base64ct", + "bevy", "cfx-internal-common", "cfx-statedb", "cfx-storage", @@ -5895,6 +8089,12 @@ version = "2.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601" +[[package]] +name = "svg_fmt" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fb1df15f412ee2e9dfc1c504260fa695c1c3f10fe9f4a6ee2d2184d7d6450e2" + [[package]] name = "syn" version = "0.15.44" @@ -5940,6 +8140,20 @@ dependencies = [ "unicode-xid 0.2.4", ] +[[package]] +name = "sysinfo" +version = "0.29.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0a18d114d420ada3a891e6bc8e96a2023402203296a47cdd65083377dad18ba5" +dependencies = [ + "cfg-if 1.0.0", + "core-foundation-sys", + "libc", + "ntapi", + "once_cell", + "winapi 0.3.9", +] + [[package]] name = "system-configuration" version = "0.5.1" @@ -5961,6 +8175,18 @@ dependencies = [ "libc", ] +[[package]] +name = "taffy" +version = "0.3.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c488aa2bf4bb0cafed312e0876b79a591e3cfa47391f842b7198f9a56547561b" +dependencies = [ + "arrayvec 0.7.4", + "grid", + "num-traits", + "slotmap", +] + [[package]] name = "tap" version = "1.0.1" @@ -5984,10 +8210,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" dependencies = [ "cfg-if 1.0.0", - "fastrand", + "fastrand 2.0.1", "redox_syscall 0.3.5", "rustix", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6012,9 +8238,29 @@ dependencies = [ name = "thiserror" version = "1.0.49" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4" +dependencies = [ + "thiserror-impl", +] + +[[package]] +name = "thiserror-core" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497" +dependencies = [ + "thiserror-core-impl", +] + +[[package]] +name = "thiserror-core-impl" +version = "1.0.38" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac" dependencies = [ - "thiserror-impl", + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", ] [[package]] @@ -6038,6 +8284,16 @@ dependencies = [ "winapi 0.3.9", ] +[[package]] +name = "thread_local" +version = "1.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +dependencies = [ + "cfg-if 1.0.0", + "once_cell", +] + [[package]] name = "threadpool" version = "1.8.1" @@ -6174,7 +8430,7 @@ dependencies = [ "signal-hook-registry", "socket2 0.5.4", "tokio-macros 2.1.0", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6440,9 +8696,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ee2ef2af84856a50c1d430afce2fdded0a4ec7eda868db86409b4543df0797f9" dependencies = [ "pin-project-lite 0.2.13", + "tracing-attributes", "tracing-core", ] +[[package]] +name = "tracing-attributes" +version = "0.1.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 2.0.38", +] + [[package]] name = "tracing-core" version = "0.1.32" @@ -6450,6 +8718,47 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", + "valuable", +] + +[[package]] +name = "tracing-log" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922" +dependencies = [ + "lazy_static", + "log", + "tracing-core", +] + +[[package]] +name = "tracing-subscriber" +version = "0.3.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77" +dependencies = [ + "matchers", + "nu-ansi-term", + "once_cell", + "regex", + "sharded-slab", + "smallvec 1.11.1", + "thread_local", + "tracing", + "tracing-core", + "tracing-log", +] + +[[package]] +name = "tracing-wasm" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4575c663a174420fa2d78f4108ff68f65bf2fbb7dd89f33749b6e826b3626e07" +dependencies = [ + "tracing", + "tracing-subscriber", + "wasm-bindgen", ] [[package]] @@ -6502,6 +8811,22 @@ version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" +[[package]] +name = "ttf-parser" +version = "0.19.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "49d64318d8311fc2668e48b63969f4343e0a85c4a109aa8460d6672e364b8bd1" + +[[package]] +name = "twox-hash" +version = "1.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675" +dependencies = [ + "cfg-if 1.0.0", + "static_assertions", +] + [[package]] name = "typemap-ors" version = "1.0.0" @@ -6654,6 +8979,22 @@ name = "using_queue" version = "0.1.0" source = "git+https://github.com/paritytech/parity-ethereum?tag=v2.4.0#c7d8ee1dd7c5d0167b589616c77945abdc5c5928" +[[package]] +name = "uuid" +version = "1.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88ad59a7560b41a70d191093a945f0b87bc1deeda46fb237479708a1d6b6cdfc" +dependencies = [ + "getrandom 0.2.10", + "serde", +] + +[[package]] +name = "valuable" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" + [[package]] name = "vcpkg" version = "0.2.15" @@ -6699,6 +9040,22 @@ dependencies = [ "openssl", ] +[[package]] +name = "waker-fn" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690" + +[[package]] +name = "walkdir" +version = "2.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +dependencies = [ + "same-file", + "winapi-util", +] + [[package]] name = "want" version = "0.3.1" @@ -6819,6 +9176,17 @@ dependencies = [ "parity-wasm", ] +[[package]] +name = "wayland-scanner" +version = "0.29.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f4303d8fa22ab852f789e75a967f0a2cdc430a607751c0499bada3e451cbd53" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "xml-rs", +] + [[package]] name = "web-sys" version = "0.3.64" @@ -6829,6 +9197,112 @@ dependencies = [ "wasm-bindgen", ] +[[package]] +name = "wgpu" +version = "0.16.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "480c965c9306872eb6255fa55e4b4953be55a8b64d57e61d7ff840d3dcc051cd" +dependencies = [ + "arrayvec 0.7.4", + "cfg-if 1.0.0", + "js-sys", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "smallvec 1.11.1", + "static_assertions", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "wgpu-core", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-core" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f478237b4bf0d5b70a39898a66fa67ca3a007d79f2520485b8b0c3dfc46f8c2" +dependencies = [ + "arrayvec 0.7.4", + "bit-vec 0.6.3", + "bitflags 2.4.1", + "codespan-reporting", + "log", + "naga", + "parking_lot 0.12.1", + "profiling", + "raw-window-handle", + "rustc-hash", + "smallvec 1.11.1", + "thiserror", + "web-sys", + "wgpu-hal", + "wgpu-types", +] + +[[package]] +name = "wgpu-hal" +version = "0.16.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ecb3258078e936deee14fd4e0febe1cfe9bbb5ffef165cb60218d2ee5eb4448" +dependencies = [ + "android_system_properties", + "arrayvec 0.7.4", + "ash", + "bit-set 0.5.3", + "bitflags 2.4.1", + "block", + "core-graphics-types", + "d3d12", + "foreign-types", + "glow", + "gpu-alloc", + "gpu-allocator", + "gpu-descriptor", + "hassle-rs", + "js-sys", + "khronos-egl", + "libc", + "libloading 0.8.1", + "log", + "metal", + "naga", + "objc", + "parking_lot 0.12.1", + "profiling", + "range-alloc", + "raw-window-handle", + "renderdoc-sys", + "rustc-hash", + "smallvec 1.11.1", + "thiserror", + "wasm-bindgen", + "web-sys", + "wgpu-types", + "winapi 0.3.9", +] + +[[package]] +name = "wgpu-types" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0c153280bb108c2979eb5c7391cb18c56642dd3c072e55f52065e13e2a1252a" +dependencies = [ + "bitflags 2.4.1", + "js-sys", + "web-sys", +] + +[[package]] +name = "widestring" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "653f141f39ec16bba3c5abe400a0c60da7468261cc2cbf36805022876bc721a8" + [[package]] name = "winapi" version = "0.2.8" @@ -6872,13 +9346,83 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows" +version = "0.44.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e745dab35a0c4c77aa3ce42d595e13d2003d6902d6b08c9ef5fc326d08da12b" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.46.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cdacb41e6a96a052c6cb63a144f24900236121c6f63f4f8219fef5977ecb0c25" +dependencies = [ + "windows-targets 0.42.2", +] + +[[package]] +name = "windows" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-targets 0.48.5", +] + [[package]] name = "windows-core" version = "0.51.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-implement" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5e2ee588991b9e7e6c8338edf3333fbe4da35dc72092643958ebb43f0ab2c49c" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "windows-interface" +version = "0.48.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6fb8df20c9bcaa8ad6ab513f7b40104840c8867d5751126e4df3b08388d0cc7" +dependencies = [ + "proc-macro2 1.0.69", + "quote 1.0.33", + "syn 1.0.109", +] + +[[package]] +name = "windows-sys" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets 0.42.2", ] [[package]] @@ -6887,7 +9431,22 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows-targets" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071" +dependencies = [ + "windows_aarch64_gnullvm 0.42.2", + "windows_aarch64_msvc 0.42.2", + "windows_i686_gnu 0.42.2", + "windows_i686_msvc 0.42.2", + "windows_x86_64_gnu 0.42.2", + "windows_x86_64_gnullvm 0.42.2", + "windows_x86_64_msvc 0.42.2", ] [[package]] @@ -6896,57 +9455,129 @@ version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm", - "windows_aarch64_msvc", - "windows_i686_gnu", - "windows_i686_msvc", - "windows_x86_64_gnu", - "windows_x86_64_gnullvm", - "windows_x86_64_msvc", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" + [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +[[package]] +name = "windows_aarch64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" + [[package]] name = "windows_aarch64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +[[package]] +name = "windows_i686_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" + [[package]] name = "windows_i686_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +[[package]] +name = "windows_i686_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" + [[package]] name = "windows_i686_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +[[package]] +name = "windows_x86_64_gnu" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" + [[package]] name = "windows_x86_64_gnu" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" + [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +[[package]] +name = "windows_x86_64_msvc" +version = "0.42.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" + [[package]] name = "windows_x86_64_msvc" version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +[[package]] +name = "winit" +version = "0.28.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9596d90b45384f5281384ab204224876e8e8bf7d58366d9b795ad99aa9894b94" +dependencies = [ + "android-activity", + "bitflags 1.3.2", + "cfg_aliases", + "core-foundation", + "core-graphics", + "dispatch", + "instant", + "libc", + "log", + "mio 0.8.8", + "ndk", + "objc2", + "once_cell", + "orbclient", + "percent-encoding", + "raw-window-handle", + "redox_syscall 0.3.5", + "wasm-bindgen", + "wayland-scanner", + "web-sys", + "windows-sys 0.45.0", + "x11-dl", +] + [[package]] name = "winnow" version = "0.5.17" @@ -6963,7 +9594,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "524e57b2c537c0f9b1e69f1965311ec12182b4122e45035b1508cd24d2adadb1" dependencies = [ "cfg-if 1.0.0", - "windows-sys", + "windows-sys 0.48.0", ] [[package]] @@ -6985,6 +9616,17 @@ dependencies = [ "tap", ] +[[package]] +name = "x11-dl" +version = "2.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38735924fedd5314a6e548792904ed8c6de6636285cb9fec04d5b1db85c1516f" +dependencies = [ + "libc", + "once_cell", + "pkg-config", +] + [[package]] name = "x25519-dalek-fiat" version = "0.1.0" @@ -6996,6 +9638,12 @@ dependencies = [ "zeroize", ] +[[package]] +name = "xi-unicode" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a67300977d3dc3f8034dae89778f502b6ba20b269527b3223ba59c0cf393bb8a" + [[package]] name = "xml-rs" version = "0.8.19" diff --git a/core/benchmark/storage/Cargo.toml b/core/benchmark/storage/Cargo.toml index 4d482fb8e6..e57a95ed92 100644 --- a/core/benchmark/storage/Cargo.toml +++ b/core/benchmark/storage/Cargo.toml @@ -30,6 +30,7 @@ primitives = { path = "../../../primitives" } rlp = { version = "0.3.0", feature = ["ethereum"] } serde_json = "1.0" base64ct = "=1.1.1" +bevy = "0.11.3" [patch.'https://github.com/paritytech/parity-ethereum'] # The upstream ethkey uses the master branch of rust-secp256k1, diff --git a/core/benchmark/storage/src/main.rs b/core/benchmark/storage/src/main.rs index cd9f1734f5..24263e7153 100644 --- a/core/benchmark/storage/src/main.rs +++ b/core/benchmark/storage/src/main.rs @@ -986,7 +986,7 @@ pub struct EthTxExtractor { nonce_dir_path: String, counters: Arc>, - shared_self: UnsafeCell>>>, + shared_self: SyncUnsafeCell>>>, tx_maker: Arc + Send + Sync>>, } @@ -1130,7 +1130,7 @@ impl EthTxExtractor { tx_maker.clone(), )?, nonce_dir_path: nonce_dir_path.clone(), - shared_self: UnsafeCell::new(None), + shared_self: SyncUnsafeCell::new(None), tx_maker: tx_maker.clone(), })); @@ -2209,4 +2209,4 @@ use std::{ time::Duration, vec::Vec, }; -use std::cell::UnsafeCell; +use bevy::utils::syncunsafecell::SyncUnsafeCell; From 81e0ee457be4d6b9a3a8d42e2c33048b12221a75 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Tue, 24 Oct 2023 14:07:05 +0800 Subject: [PATCH 13/22] Fix. --- core/benchmark/storage/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/benchmark/storage/src/main.rs b/core/benchmark/storage/src/main.rs index 24263e7153..d30913e621 100644 --- a/core/benchmark/storage/src/main.rs +++ b/core/benchmark/storage/src/main.rs @@ -1182,7 +1182,7 @@ impl EthTxExtractor { fn verify_tx_then_stream_out( &self, tx_verify_request: EthTxNonceVerifierRequest, ) { - let thread = (tx_verify_request.sender.low_u64_be() & 7) as usize; + let thread = (tx_verify_request.sender.low_u64() & 7) as usize; self.nonce_verifier.workers[thread] .lock() From dc2fdd1d81d0aa5e139a9fc66965804151b94715 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Wed, 25 Oct 2023 14:04:38 +0800 Subject: [PATCH 14/22] Skip compiling deprecated storage bench. --- core/benchmark/storage/src/main.rs | 2 +- dev-support/test.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/benchmark/storage/src/main.rs b/core/benchmark/storage/src/main.rs index d30913e621..6f79029f20 100644 --- a/core/benchmark/storage/src/main.rs +++ b/core/benchmark/storage/src/main.rs @@ -1024,7 +1024,7 @@ impl EthTxExtractor { &mut self, ) -> Vec>>>> { - self.shared_self.get_mut().take(); + self.shared_self.get().take(); mem::replace(&mut self.tx_basic_verifiers, vec![]) } diff --git a/dev-support/test.sh b/dev-support/test.sh index 7d2e9618f5..4c3c05f677 100755 --- a/dev-support/test.sh +++ b/dev-support/test.sh @@ -20,8 +20,7 @@ function check_build { local result - result=`cargo build --release && cargo doc --document-private-items && cargo test --release --all --no-run && cargo bench --all --no-run \ - && ( cd core/benchmark/storage && RUSTFLAGS="" cargo build --release )` + result=`cargo build --release && cargo doc --document-private-items && cargo test --release --all --no-run && cargo bench --all --no-run` local exit_code=$? From cb385efb4f3511ca567ea2706a4c2e95a498c25d Mon Sep 17 00:00:00 2001 From: PanaW Date: Fri, 3 Nov 2023 10:25:29 +0800 Subject: [PATCH 15/22] update 2.3.1 rpc changelog --- changelogs/JSONRPC.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelogs/JSONRPC.md b/changelogs/JSONRPC.md index a8bc5b2ea4..f8221e6863 100644 --- a/changelogs/JSONRPC.md +++ b/changelogs/JSONRPC.md @@ -1,5 +1,9 @@ # JSON-RPC CHANGELOG +## v2.3.1 + +- Return `storagePointProp` in cfx_getParamsFromVote, which is introduced by [CIP-107](https://github.com/Conflux-Chain/CIPs/blob/master/CIPs/cip-107.md#the-voting-of-proportion). + ## v2.3.0 - Add `cfx_getCollateralInfo` to return chain collateral info. From 24d674b7acf08fb6e38ce0e1480120c6e114762d Mon Sep 17 00:00:00 2001 From: Chenxing Li Date: Thu, 16 Nov 2023 14:52:35 +0800 Subject: [PATCH 16/22] Fix random source in the sigma protocol --- core/src/spec/genesis.rs | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/core/src/spec/genesis.rs b/core/src/spec/genesis.rs index cdb77e4a29..6644b5e3a8 100644 --- a/core/src/spec/genesis.rs +++ b/core/src/spec/genesis.rs @@ -496,16 +496,13 @@ pub fn register_transaction( Serialize, }; use cfx_parameters::internal_contract_addresses::POS_REGISTER_CONTRACT_ADDRESS; - use rand_08::{rngs::StdRng, SeedableRng}; + use rand_08::rngs::OsRng; use solidity_abi::ABIEncodable; use tiny_keccak::{Hasher, Keccak}; let bls_pub_key = bls_priv_key.public_key(); - let (commit, answer) = sigma_protocol::prove( - bls_priv_key.raw_key(), - &mut StdRng::seed_from_u64(0), - legacy, - ); + let (commit, answer) = + sigma_protocol::prove(bls_priv_key.raw_key(), &mut OsRng, legacy); let mut encoded_commit = Vec::::new(); BlsPubKey::from(commit) From 4223bcfc173578180379dc9a51006d63158f26f6 Mon Sep 17 00:00:00 2001 From: Chenxing Li Date: Fri, 24 Nov 2023 15:59:58 +0800 Subject: [PATCH 17/22] Retry tests in `test_all.py` on failure --- .gitignore | 1 + dev-support/test.sh | 35 +++++++++++++++++++++++++---------- tests/test_all.py | 43 +++++++++++++++++++++++++++++++++++++------ 3 files changed, 63 insertions(+), 16 deletions(-) diff --git a/.gitignore b/.gitignore index 29549dd07f..ea5f25493b 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ target .gitmodules .phabricator* build/ +build_clippy/ **/blockchain_db/ **/sqlite_db/ **/net_config/ diff --git a/dev-support/test.sh b/dev-support/test.sh index 4c3c05f677..92749eb9b7 100755 --- a/dev-support/test.sh +++ b/dev-support/test.sh @@ -7,11 +7,17 @@ set -o pipefail ROOT_DIR="$( cd $SCRIPT_DIR/.. && pwd )" TEST_MAX_WORKERS="${1-6}" +TEST_MAX_RETRIES="${2-1}" export PYTHONUNBUFFERED=1 export CARGO_TARGET_DIR=$ROOT_DIR/build export RUSTFLAGS="-g -D warnings" +CHECK_BUILD=1 +CHECK_CLIPPY=2 +CHECK_UNIT_TEST=3 +CHECK_INT_TEST=4 + function check_build { local -n inner_result=$1 @@ -20,7 +26,9 @@ function check_build { local result - result=`cargo build --release && cargo doc --document-private-items && cargo test --release --all --no-run && cargo bench --all --no-run` + result=$( + cargo build --release && cargo doc --document-private-items && cargo test --release --all --no-run && cargo bench --all --no-run | tee /dev/stderr + ) local exit_code=$? @@ -43,7 +51,9 @@ function check_fmt_and_clippy { SAVED_CARGO_DIR=$CARGO_TARGET_DIR export RUSTFLAGS="-g" export CARGO_TARGET_DIR="$ROOT_DIR/build_clippy" - result=`./cargo_fmt.sh -- --check && cargo clippy --release --all -- -A warnings` + result=$( + ./cargo_fmt.sh -- --check && cargo clippy --release --all -- -A warnings | tee /dev/stderr + ) export RUSTFLAGS=$SAVED_RUSTFLAGS export CARGO_TARGET_DIR=$SAVED_CARGO_DIR local exit_code=$? @@ -60,7 +70,9 @@ function check_unit_tests { pushd $ROOT_DIR > /dev/null local result - result=`cargo test --release --all` + result=$( + cargo test --release --all | tee /dev/stderr + ) local exit_code=$? popd > /dev/null @@ -78,7 +90,7 @@ function check_integration_tests { result=$( # Make symbolic link for conflux binary to where integration test assumes its existence. rm -f target; ln -s build target - ./tests/test_all.py --max-workers $TEST_MAX_WORKERS| tee /dev/stderr + ./tests/test_all.py --max-workers $TEST_MAX_WORKERS --max-retries $TEST_MAX_RETRIES | tee /dev/stderr ) local exit_code=$? popd > /dev/null @@ -91,13 +103,16 @@ function check_integration_tests { function save_test_result { local -n inner_result=$1 + local stage_number=$2 local exit_code=${inner_result[0]} local result=${inner_result[1]} - - printf "%s\n" "$result" if [[ $exit_code -ne 0 ]]; then printf "%s\n" "$result" >> $ROOT_DIR/.phabricator-comment + if [[ $exit_code -eq 80 ]] && [[ $stage_number -eq $CHECK_INT_TEST ]]; then + ## If the test fails for "test case error in the integration test", return customized exit code + exit 80 + fi exit 1 fi } @@ -106,11 +121,11 @@ echo -n "" > $ROOT_DIR/.phabricator-comment mkdir -p $ROOT_DIR/build # Build -declare -a test_result; check_build test_result; save_test_result test_result +declare -a test_result; check_build test_result; save_test_result test_result $CHECK_BUILD # fmt and clippy tests -declare -a test_result; check_fmt_and_clippy test_result; save_test_result test_result +declare -a test_result; check_fmt_and_clippy test_result; save_test_result test_result $CHECK_CLIPPY # Unit tests -declare -a test_result; check_unit_tests test_result; save_test_result test_result +declare -a test_result; check_unit_tests test_result; save_test_result test_result $CHECK_UNIT_TEST # Integration test -declare -a test_result; check_integration_tests test_result; save_test_result test_result +declare -a test_result; check_integration_tests test_result; save_test_result test_result $CHECK_INT_TEST diff --git a/tests/test_all.py b/tests/test_all.py index 60995b7df2..eb32e2d940 100755 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -9,6 +9,9 @@ PORT_MAX = 65535 PORT_RANGE = 100 +# 64 to 113 is recommanded for user defined error code (https://tldp.org/LDP/abs/html/exitcodes.html). +# 64 to 77 has been reserved in /usr/include/sysexits.h (https://stackoverflow.com/questions/1101957/are-there-any-standard-exit-status-codes-in-linux) +TEST_FAILURE_ERROR_CODE = 80 def run_single_test(py, script, test_dir, index, port_min, port_max): try: @@ -66,8 +69,41 @@ def run(): default=PORT_MIN, type=int, ) + parser.add_argument( + "--max-retries", + dest="max_retries", + default=1, + type=int, + ) options = parser.parse_args() + all_failed = set() + + # Retry the tests in multiple times to eliminate random fails + for _ in range(options.max_retries): + failed = run_single_round(options) + + # If all test success, return the test + if len(failed) == 0: + return + + # If too many error happens, stop the test + if len(failed) > 5: + break + + # If some test failed in twice, stop the test + failed_twice = [c for c in failed if c in all_failed] + if len(failed_twice) == 0: + break + + all_failed.update(failed) + + print("The following test fails: ") + for c in all_failed: + print(c) + sys.exit(TEST_FAILURE_ERROR_CODE) + +def run_single_round(options): TEST_SCRIPTS = [] test_dir = os.path.dirname(os.path.realpath(__file__)) @@ -116,12 +152,7 @@ def run(): f.result() except subprocess.CalledProcessError as err: failed.add(script) - - if len(failed) > 0: - print("The following test fails: ") - for c in failed: - print(c) - sys.exit(1) + return failed if __name__ == '__main__': From 82df5167f0993f2e7e0a7038fbe663cf18f11ef6 Mon Sep 17 00:00:00 2001 From: Chenxing Li Date: Mon, 27 Nov 2023 14:57:33 +0800 Subject: [PATCH 18/22] Fix a little issue in the test script --- tests/test_all.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/test_all.py b/tests/test_all.py index eb32e2d940..5470eecbc0 100755 --- a/tests/test_all.py +++ b/tests/test_all.py @@ -83,6 +83,10 @@ def run(): for _ in range(options.max_retries): failed = run_single_round(options) + failed_twice = [c for c in failed if c in all_failed] + + all_failed.update(failed) + # If all test success, return the test if len(failed) == 0: return @@ -92,11 +96,9 @@ def run(): break # If some test failed in twice, stop the test - failed_twice = [c for c in failed if c in all_failed] if len(failed_twice) == 0: break - all_failed.update(failed) print("The following test fails: ") for c in all_failed: From a293ae4855cd9b5b8c2105ec05f37c50b94c0587 Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Mon, 27 Nov 2023 18:23:47 +0800 Subject: [PATCH 19/22] Reset the log level in the default log.yaml. --- run/log.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/run/log.yaml b/run/log.yaml index ca103ae6c9..70fcef393d 100644 --- a/run/log.yaml +++ b/run/log.yaml @@ -46,6 +46,6 @@ loggers: client: level: info cfx_storage: - level: trace + level: info cfx_statedb: level: info From 1e5985aa0157f2f40196f4a519d182a6be8846fc Mon Sep 17 00:00:00 2001 From: Joel Date: Fri, 1 Dec 2023 10:36:09 +0800 Subject: [PATCH 20/22] fix mpt path from null epoch --- .../storage_db/snapshot_db_manager_sqlite.rs | 2 +- .../mpt_snapshot_null_epoch_test.py | 88 +++++++++++++++++++ 2 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 tests/full_node_tests/mpt_snapshot_null_epoch_test.py diff --git a/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs b/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs index b845722613..f02c4878f7 100644 --- a/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs +++ b/core/storage/src/impls/storage_db/snapshot_db_manager_sqlite.rs @@ -942,7 +942,7 @@ impl SnapshotDbManagerTrait for SnapshotDbManagerSqlite { None } else { Some(self.open_mpt_snapshot_write( - self.get_mpt_snapshot_db_path(&snapshot_epoch_id), + self.get_latest_mpt_snapshot_db_path(), true, new_epoch_height, &snapshot_epoch_id, diff --git a/tests/full_node_tests/mpt_snapshot_null_epoch_test.py b/tests/full_node_tests/mpt_snapshot_null_epoch_test.py new file mode 100644 index 0000000000..a8d46e17a3 --- /dev/null +++ b/tests/full_node_tests/mpt_snapshot_null_epoch_test.py @@ -0,0 +1,88 @@ +#!/usr/bin/env python3 +import os +import sys +import random + + +sys.path.insert(1, os.path.dirname(sys.path[0])) + +from test_framework.test_framework import ConfluxTestFramework +from test_framework.util import sync_blocks, connect_sample_nodes, assert_equal +from conflux.rpc import RpcClient + + +class SyncCheckpointTests(ConfluxTestFramework): + def set_test_params(self): + self.num_nodes = 2 + self.conf_parameters = { + "dev_snapshot_epoch_count": "200", + "adaptive_weight_beta": "1", + "timer_chain_block_difficulty_ratio": "2", + "timer_chain_beta": "6", + "era_epoch_count": "1000", + "chunk_size_byte": "1000", + "anticone_penalty_ratio": "5", + # Make sure checkpoint synchronization is triggered during phase change. + "dev_allow_phase_change_without_peer": "false", + # Disable pos reference because pow blocks are generated too fast. + "pos_reference_enable_height": "10000", + "node_type": "\"archive\"", + "use_isolated_db_for_mpt_table": "true", + } + + def setup_network(self): + self.add_nodes(self.num_nodes) + for i in range(self.num_nodes): + self.start_node(i, phase_to_wait=None) + connect_sample_nodes(self.nodes, self.log, latency_max=1) + for i in range(self.num_nodes): + self.nodes[i].wait_for_recovery(["NormalSyncPhase"], 10) + + def _generate_txs(self, peer, num): + client = RpcClient(self.nodes[peer]) + txs = [] + for _ in range(num): + addr = client.rand_addr() + tx_gas = client.DEFAULT_TX_GAS + tx = client.new_tx( + receiver=addr, + nonce=self.genesis_nonce, + value=21000, + gas=tx_gas, + data=b"", + ) + self.genesis_nonce += 1 + txs.append(tx) + return txs + + def run_test(self): + num_blocks = 300 + + # Generate checkpoint + client1 = RpcClient(self.nodes[0]) + node_index = 1 + client2 = RpcClient(self.nodes[node_index]) + + self.genesis_nonce = client1.get_nonce(client1.GENESIS_ADDR) + + for _ in range(num_blocks): + txs = self._generate_txs(0, random.randint(1, 2)) + client1.generate_block_with_fake_txs(txs) + sync_blocks(self.nodes) + self.log.info("All nodes synced") + + self.log.info("epoch number %d", client1.epoch_number()) + assert_equal(client1.epoch_number(), client2.epoch_number()) + + checkpoint_block_hash = client1.block_by_epoch(hex(200))['hash'] + db_path = "sqlite_" + checkpoint_block_hash[2:] + rel_path = os.path.join("blockchain_data", "storage_db", "mpt_snapshot", db_path) + node0_full_path = os.path.join(client1.node.datadir, rel_path) + node1_full_path = os.path.join(client2.node.datadir, rel_path) + + assert(not os.path.exists(node0_full_path)) + assert(not os.path.exists(node1_full_path)) + + +if __name__ == "__main__": + SyncCheckpointTests().main() From c46e0426e6da33b187c61eb2d68da54d68e21201 Mon Sep 17 00:00:00 2001 From: Chenxing Li Date: Wed, 13 Dec 2023 21:14:14 +0800 Subject: [PATCH 21/22] Limit transaction pool size by space --- cfx_types/src/lib.rs | 43 +++++++ core/src/transaction_pool/mod.rs | 10 +- .../transaction_pool_inner.rs | 105 ++++++++++++++---- util/malloc_size_of/src/lib.rs | 8 +- 4 files changed, 136 insertions(+), 30 deletions(-) diff --git a/cfx_types/src/lib.rs b/cfx_types/src/lib.rs index e13f52ffe9..207fe2fd95 100644 --- a/cfx_types/src/lib.rs +++ b/cfx_types/src/lib.rs @@ -118,6 +118,49 @@ impl AddressWithSpace { pub fn assert_native(&self) { assert_eq!(self.space, Space::Native) } } +#[derive(Default, Clone)] +pub struct SpaceMap { + pub native: T, + pub evm: T, +} + +impl SpaceMap { + #[inline] + pub fn in_space(&self, space: Space) -> &T { + match space { + Space::Native => &self.native, + Space::Ethereum => &self.evm, + } + } + + #[inline] + pub fn in_space_mut(&mut self, space: Space) -> &mut T { + match space { + Space::Native => &mut self.native, + Space::Ethereum => &mut self.evm, + } + } + + pub fn iter(&self) -> impl Iterator { + vec![&self.native, &self.evm].into_iter() + } + + pub fn map_sum usize>(&self, f: F) -> usize { + f(&self.native) + f(&self.evm) + } + + pub const fn size(&self) -> usize { 2 } + + pub fn apply_all U>( + &mut self, mut f: F, + ) -> SpaceMap { + SpaceMap { + native: f(&mut self.native), + evm: f(&mut self.evm), + } + } +} + pub mod space_util { use super::{Address, AddressWithSpace, Space}; diff --git a/core/src/transaction_pool/mod.rs b/core/src/transaction_pool/mod.rs index b0c2443ec3..7198b66c9c 100644 --- a/core/src/transaction_pool/mod.rs +++ b/core/src/transaction_pool/mod.rs @@ -469,7 +469,7 @@ impl TransactionPool { } } - TX_POOL_DEFERRED_GAUGE.update(self.total_deferred()); + TX_POOL_DEFERRED_GAUGE.update(self.total_deferred(None)); TX_POOL_UNPACKED_GAUGE.update(self.total_unpacked()); TX_POOL_READY_GAUGE.update(self.total_ready_accounts()); @@ -580,7 +580,7 @@ impl TransactionPool { //RwLock is dropped here } - TX_POOL_DEFERRED_GAUGE.update(self.total_deferred()); + TX_POOL_DEFERRED_GAUGE.update(self.total_deferred(None)); TX_POOL_UNPACKED_GAUGE.update(self.total_unpacked()); TX_POOL_READY_GAUGE.update(self.total_ready_accounts()); @@ -751,9 +751,9 @@ impl TransactionPool { inner.clear() } - pub fn total_deferred(&self) -> usize { + pub fn total_deferred(&self, space: Option) -> usize { let inner = self.inner.read(); - inner.total_deferred() + inner.total_deferred(space) } pub fn total_ready_accounts(&self) -> usize { @@ -776,7 +776,7 @@ impl TransactionPool { let inner = self.inner.read(); ( inner.total_ready_accounts(), - inner.total_deferred(), + inner.total_deferred(None), inner.total_received(), inner.total_unpacked(), ) diff --git a/core/src/transaction_pool/transaction_pool_inner.rs b/core/src/transaction_pool/transaction_pool_inner.rs index 0a5f709d8e..1f511be1b8 100644 --- a/core/src/transaction_pool/transaction_pool_inner.rs +++ b/core/src/transaction_pool/transaction_pool_inner.rs @@ -11,8 +11,8 @@ use crate::{ use cfx_parameters::staking::DRIPS_PER_STORAGE_COLLATERAL_UNIT; use cfx_statedb::Result as StateDbResult; use cfx_types::{ - address_util::AddressUtil, Address, AddressWithSpace, Space, H256, U128, - U256, U512, + address_util::AddressUtil, Address, AddressWithSpace, Space, SpaceMap, + H256, U128, U256, U512, }; use heap_map::HeapMap; use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf; @@ -650,6 +650,49 @@ pub enum PendingReason { OutdatedStatus, } +#[derive(Default, DeriveMallocSizeOf)] +pub struct TransactionSet { + inner: HashMap>, + count: SpaceMap, +} + +impl TransactionSet { + fn get(&self, tx_hash: &H256) -> Option<&Arc> { + self.inner.get(tx_hash) + } + + fn values( + &self, + ) -> std::collections::hash_map::Values<'_, H256, Arc> + { + self.inner.values() + } + + fn insert( + &mut self, tx_hash: H256, tx: Arc, + ) -> Option> { + *self.count.in_space_mut(tx.space()) += 1; + let res = self.inner.insert(tx_hash, tx); + if let Some(ref tx) = res { + *self.count.in_space_mut(tx.space()) -= 1; + } + res + } + + fn remove(&mut self, tx_hash: &H256) -> Option> { + let res = self.inner.remove(tx_hash); + if let Some(ref tx) = res { + *self.count.in_space_mut(tx.space()) -= 1; + } + res + } + + fn clear(&mut self) { + self.inner.clear(); + self.count.apply_all(|x| *x = 0); + } +} + #[derive(DeriveMallocSizeOf)] pub struct TransactionPoolInner { capacity: usize, @@ -667,10 +710,10 @@ pub struct TransactionPoolInner { /// (set_tx_packed), after epoch execution, or during transaction /// insertion. ready_nonces_and_balances: HashMap, - garbage_collector: GarbageCollector, + garbage_collector: SpaceMap, /// Keeps all transactions in the transaction pool. /// It should contain the same transaction set as `deferred_pool`. - txs: HashMap>, + txs: TransactionSet, tx_sponsored_gas_map: HashMap, } @@ -691,8 +734,8 @@ impl TransactionPoolInner { total_gas_capacity, ), ready_nonces_and_balances: HashMap::new(), - garbage_collector: GarbageCollector::default(), - txs: HashMap::new(), + garbage_collector: SpaceMap::default(), + txs: TransactionSet::default(), tx_sponsored_gas_map: HashMap::new(), } } @@ -701,14 +744,19 @@ impl TransactionPoolInner { self.deferred_pool.clear(); self.ready_account_pool.clear(); self.ready_nonces_and_balances.clear(); - self.garbage_collector.clear(); + self.garbage_collector.apply_all(|x| x.clear()); self.txs.clear(); self.tx_sponsored_gas_map.clear(); self.total_received_count = 0; self.unpacked_transaction_count = 0; } - pub fn total_deferred(&self) -> usize { self.txs.len() } + pub fn total_deferred(&self, space: Option) -> usize { + match space { + Some(space) => *self.txs.count.in_space(space), + None => self.txs.count.map_sum(|x| *x), + } + } pub fn ready_transacton_hashes_in_evm_pool(&self) -> BTreeSet { self.ready_account_pool.get_transaction_hashes_in_evm_pool() @@ -738,8 +786,8 @@ impl TransactionPoolInner { bucket.get_tx_by_nonce(nonce).map(|tx| tx.transaction) } - pub fn is_full(&self) -> bool { - return self.total_deferred() >= self.capacity; + pub fn is_full(&self, space: Space) -> bool { + return self.total_deferred(Some(space)) >= self.capacity; } pub fn get_current_timestamp(&self) -> u64 { @@ -759,16 +807,19 @@ impl TransactionPoolInner { /// garbage collectable. And if there is a tie, the one who has minimum /// timestamp will be picked. pub fn collect_garbage(&mut self, new_tx: &SignedTransaction) { - let count_before_gc = self.total_deferred(); + let space = new_tx.space(); + let count_before_gc = self.total_deferred(Some(space)); let mut skipped_self_node = None; - while self.is_full() && !self.garbage_collector.is_empty() { + while self.is_full(space) + && !self.garbage_collector.in_space(space).is_empty() + { let current_timestamp = self.get_current_timestamp(); let (victim_address, victim) = - self.garbage_collector.top().unwrap(); + self.garbage_collector.in_space(space).top().unwrap(); // Accounts which are not in `deferred_pool` may be inserted // into `garbage_collector`, we can just ignore them. if !self.deferred_pool.contain_address(victim_address) { - self.garbage_collector.pop(); + self.garbage_collector.in_space_mut(space).pop(); continue; } @@ -779,8 +830,11 @@ impl TransactionPoolInner { if *victim_address == new_tx.sender() { // We do not GC a not-executed transaction from the same // sender, so save it and try another account. - let (victim_address, victim) = - self.garbage_collector.pop().unwrap(); + let (victim_address, victim) = self + .garbage_collector + .in_space_mut(space) + .pop() + .unwrap(); skipped_self_node = Some((victim_address, victim)); continue; } else if victim.has_ready_tx @@ -800,7 +854,7 @@ impl TransactionPoolInner { // victim is now chosen to be evicted. let (victim_address, victim) = - self.garbage_collector.pop().unwrap(); + self.garbage_collector.in_space_mut(space).pop().unwrap(); let (ready_nonce, _) = self .get_local_nonce_and_balance(&victim_address) @@ -863,7 +917,7 @@ impl TransactionPoolInner { } else { 0 }; - self.garbage_collector.insert( + self.garbage_collector.in_space_mut(space).insert( &victim_address, count, current_timestamp, @@ -880,7 +934,7 @@ impl TransactionPoolInner { // Insert back skipped nodes to keep `garbage_collector` // unchanged. if let Some((addr, node)) = skipped_self_node { - self.garbage_collector.insert( + self.garbage_collector.in_space_mut(space).insert( &addr, node.count, node.timestamp, @@ -888,14 +942,15 @@ impl TransactionPoolInner { node.first_tx_gas_price, ); } - GC_METER.mark(count_before_gc - self.total_deferred()); + GC_METER.mark(count_before_gc - self.total_deferred(Some(space))); } /// Collect garbage and return the remaining quota of the pool to insert new /// transactions. pub fn remaining_quota(&self) -> usize { - let len = self.total_deferred(); - self.capacity - len + self.garbage_collector.gc_size() + let len = self.total_deferred(None); + self.garbage_collector.size() * self.capacity - len + + self.garbage_collector.map_sum(|x| x.gc_size()) } pub fn capacity(&self) -> usize { self.capacity } @@ -915,7 +970,7 @@ impl TransactionPoolInner { &transaction.nonce(), ) { self.collect_garbage(transaction.as_ref()); - if self.is_full() { + if self.is_full(transaction.space()) { return InsertResult::Failed("Transaction Pool is full".into()); } } @@ -1136,6 +1191,7 @@ impl TransactionPoolInner { fn recalculate_readiness( &mut self, addr: &AddressWithSpace, nonce: U256, balance: U256, ) { + let space = addr.space; let ret = self .deferred_pool .recalculate_readiness_with_local_info(addr, nonce, balance); @@ -1145,9 +1201,10 @@ impl TransactionPoolInner { let count = self.deferred_pool.count_less(addr, &nonce); let timestamp = self .garbage_collector + .in_space(space) .get_timestamp(addr) .unwrap_or(self.get_current_timestamp()); - self.garbage_collector.insert( + self.garbage_collector.in_space_mut(space).insert( addr, count, timestamp, diff --git a/util/malloc_size_of/src/lib.rs b/util/malloc_size_of/src/lib.rs index 1152d9e50c..9221b5d82e 100644 --- a/util/malloc_size_of/src/lib.rs +++ b/util/malloc_size_of/src/lib.rs @@ -21,7 +21,7 @@ static GLOBAL: Jemalloc = Jemalloc; use cfg_if::cfg_if; use cfx_types::{ - AddressWithSpace, AllChainID, Space, H160, H256, H512, U256, U512, + AddressWithSpace, AllChainID, Space, SpaceMap, H160, H256, H512, U256, U512, }; use hashbrown::HashMap as FastHashMap; use parking_lot; @@ -125,6 +125,12 @@ impl MallocSizeOf for String { } } +impl MallocSizeOf for SpaceMap { + fn size_of(&self, ops: &mut MallocSizeOfOps) -> usize { + self.native.size_of(ops) + self.evm.size_of(ops) + } +} + impl MallocShallowSizeOf for Box { fn shallow_size_of(&self, ops: &mut MallocSizeOfOps) -> usize { unsafe { ops.malloc_size_of(&**self) } From 7c2af398e9364d5b80cd38bd27049c76d34381ec Mon Sep 17 00:00:00 2001 From: Peilun Li Date: Thu, 14 Dec 2023 13:31:50 +0800 Subject: [PATCH 22/22] Release v2.3.2. --- Cargo.toml | 2 +- client/Cargo.toml | 2 +- core/Cargo.toml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index dcdf20f0a6..9ca27cf288 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "conflux" -version = "2.3.1" +version = "2.3.2" edition = "2018" build = "build.rs" diff --git a/client/Cargo.toml b/client/Cargo.toml index 8dc5860531..ac90c13581 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "client" -version = "2.3.1" +version = "2.3.2" edition = "2018" [dependencies] diff --git a/core/Cargo.toml b/core/Cargo.toml index d9cb16938d..ed06b25bff 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -3,7 +3,7 @@ description = "Conflux core library" homepage = "https://www.confluxnetwork.org" license = "GPL-3.0" name = "cfxcore" -version = "2.3.1" +version = "2.3.2" edition = "2018" [dependencies]