Merge remote-tracking branch 'upstream/master' into feat/stateDump1

Author: Pana

Cargo.lock

@@ -268,7 +268,7 @@ proc-macro-crate = "3"
 serde = { version = "1.0", features = [
     "derive",
     "alloc",
-    "rc"
+    "rc",
 ], default-features = false }
 serde_json = { version = "1.0", default-features = false, features = ["alloc"] }
 serde_derive = { version = "1.0", default-features = false }
@@ -326,8 +326,8 @@ async-trait = "0.1"
 tower = "0.4"
 pin-project = "1.0"
 mio = { version = "1.0.4", features = ["os-ext", "net", "os-poll"] }
-mio-timer = { git = "https://github.com/Pana/mio-timer", rev = "251170b" }
-mio-misc = { git = "https://github.com/Pana/mio-misc", rev = "27ad80f" }
+mio-timer = { git = "https://github.com/Conflux-Chain/mio-timer", rev = "91a02cc" }
+mio-misc = { git = "https://github.com/Conflux-Chain/mio-misc", rev = "27ad80f" }
 reqwest = "0.12"
 
 # crypto & hash
@@ -389,7 +389,7 @@ vergen = "8.3.2"
 target_info = "0.1"
 bit-set = "0.4"
 typenum = "1.17.0"
-typemap = { package = "typemap-ors", version = "1.0"}
+typemap = { package = "typemap-ors", version = "1.0" }
 impl-trait-for-tuples = "0.2"
 impl-tools = "0.10"
 derive_more = { version = "2.0.1", features = ["full"] }
@@ -405,7 +405,7 @@ memoffset = "0.9"
 either = "1.15"
 fallible-iterator = "0.3"
 fs_extra = "1.1.0"
-fs-swap = "0.2.4"
+fs-swap = { git = "https://github.com/Conflux-Chain/fs-swap", rev = "72fed3585f430b1485e133d02b291d1976c58b06" }
 regex = "1.3.1"
 cfg-if = "1"
 unroll = "0.1.5"
@@ -418,6 +418,7 @@ auto_impl = "1"
 dyn-clone = "1.0"
 enumn = "0.1"
 walkdir = "2.5"
+tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
 
 # num misc
 bigdecimal = "0.1"

Cargo.toml

@@ -85,24 +85,20 @@ mod impls {
             &self, key: StorageKeyWithSpace,
         ) -> Result<Option<Arc<[u8]>>> {
             let key_bytes = key.to_key_bytes();
-            let mut r;
+            let r;
             let accessed_entries_read_guard = self.accessed_entries.read();
             if let Some(v) = accessed_entries_read_guard.get(&key_bytes) {
                 r = v.current_value.clone();
             } else {
                 drop(accessed_entries_read_guard);
-                r = self.storage.get(key)?.map(Into::into);
                 let mut accessed_entries = self.accessed_entries.write();
                 let entry = accessed_entries.entry(key_bytes);
-                let was_vacant = if let Occupied(o) = &entry {
+                if let Occupied(o) = &entry {
                     r = o.get().current_value.clone();
-                    false
                 } else {
-                    true
-                };
-                if was_vacant {
+                    r = self.storage.get(key)?.map(Into::into);
                     entry.or_insert(EntryValue::new(r.clone()));
-                }
+                };
             };
             trace!("get_raw key={:?}, value={:?}", key, r);
             Ok(r)

crates/dbs/statedb/src/lib.rs

@@ -387,10 +387,7 @@ impl Connection {
             recv_buf: BytesMut::new(),
             send_queue: PrioritySendQueue::default(),
             sending_packet: None,
-            interest: Interest::READABLE, /* previously(mio0.6) use
-                                           * Ready::hup() |
-                                           * Ready::readable(), Ready::hub()
-                                           * is removed from 0.7 */
+            interest: Interest::READABLE,
             registered: AtomicBool::new(false),
             assembler: Box::new(PacketWithLenAssembler::default()),
         }

crates/network/src/connection.rs

@@ -1772,7 +1772,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
                     .register(
                         &mut *self.tcp_listener.lock(),
                         Token(TCP_ACCEPT),
-                        Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
+                        Interest::READABLE | Interest::WRITABLE,
                     )
                     .expect("Error registering stream");
             }
@@ -1781,7 +1781,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
                     .register(
                         &mut *self.udp_socket.lock(),
                         reg,
-                        Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
+                        Interest::READABLE | Interest::WRITABLE,
                     )
                     .expect("Error registering UDP socket");
             }
@@ -1828,7 +1828,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
                 .reregister(
                     &mut *self.tcp_listener.lock(),
                     Token(TCP_ACCEPT),
-                    Interest::READABLE | Interest::WRITABLE, // previously(mio0.6) Ready::all() is used here
+                    Interest::READABLE | Interest::WRITABLE,
                 )
                 .expect("Error reregistering stream"),
             UDP_MESSAGE => {
@@ -1841,11 +1841,7 @@ impl IoHandler<NetworkIoMessage> for NetworkServiceInner {
                     Interest::READABLE
                 };
                 poll_registry
-                    .reregister(
-                        &mut *udp_socket,
-                        reg,
-                        registration,
-                    )
+                    .reregister(&mut *udp_socket, reg, registration)
                     .expect("Error reregistering UDP socket");
             }
             _ => warn!("Unexpected stream update"),

crates/network/src/service.rs

@@ -92,15 +92,21 @@ impl EthApi {
                 None,
                 false,
             )?
-            .ok_or("Specified block header does not exist".into())
+            .ok_or(
+                format!("Specified block does not exist, height={}", height)
+                    .into(),
+            )
     }
 
     pub fn fetch_block_by_hash(
         &self, hash: &H256,
     ) -> Result<PhantomBlock, ProviderBlockError> {
         self.consensus_graph()
             .get_phantom_block_by_hash(hash, false)?
-            .ok_or("Specified block header does not exist".into())
+            .ok_or(
+                format!("Specified block does not exist, hash={:?}", hash)
+                    .into(),
+            )
     }
 
     fn convert_block_number_to_epoch_number(
@@ -837,13 +843,20 @@ impl EthApi {
             }
         }
 
-        let block = self
-            .fetch_block_by_height(end_block + 1)
-            .map_err(RpcError::invalid_params)?;
+        let last_hash = self
+            .consensus_graph()
+            .get_hash_from_epoch_number((end_block + 1).into())?;
+        let last_header = self
+            .consensus_graph()
+            .data_manager()
+            .block_header_by_hash(&last_hash)
+            .ok_or_else(|| {
+                format!("last block missing, height={}", end_block + 1)
+            })?;
 
         fee_history.finish(
             start_block,
-            block.pivot_header.base_price().as_ref(),
+            last_header.base_price().as_ref(),
             Space::Ethereum,
         );
 

crates/rpc/rpc-eth-impl/src/eth.rs

@@ -13,7 +13,7 @@ license-file.workspace = true
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-jsonrpsee = { workspace = true ,features = ["server","ws-client"]}
+jsonrpsee = { workspace = true, features = ["server", "ws-client"] }
 throttling = { workspace = true }
 futures-util = { workspace = true }
 log = { workspace = true }
@@ -24,6 +24,6 @@ lazy_static = { workspace = true }
 parking_lot = { workspace = true }
 metrics = { workspace = true }
 futures = { workspace = true }
-tracing-subscriber = {version = "=0.3.0",features = ["env-filter"]}
+tracing-subscriber = { workspace = true }
 anyhow = {workspace = true}
 tokio = { workspace = true }

crates/rpc/rpc-middlewares/Cargo.toml

@@ -1,7 +1,6 @@
 // Re-export the io::Result / Error types for convenience
 pub use std::io::{Error, ErrorKind, Read, Result, Write};
 
-// TODO: Delete this
 /// A helper trait to provide the map_non_block function on Results.
 pub trait MapNonBlock<T> {
     /// Maps a `Result<T>` to a `Result<Option<T>>` by converting