Merge branch 'master' into mainnet

Author: peilun-conflux

.github/workflows/docs.yml

@@ -34,7 +34,7 @@ jobs:
           CMAKE_POLICY_VERSION_MINIMUM: 3.5
           RUSTDOCFLAGS: "--enable-index-page -Z unstable-options"
         run: |
-          rustup default nightly-2024-04-22 && cargo +nightly-2024-04-22 doc --no-deps
+          rustup default nightly-2025-02-01 && cargo +nightly-2025-02-01 doc --no-deps
 
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3

Cargo.lock

@@ -323,6 +323,7 @@ async-trait = "0.1"
 tower = "0.4"
 pin-project = "1.0"
 mio = "0.6"
+mio-extras = "2.0.6"
 reqwest = "0.12"
 
 # crypto & hash
@@ -356,6 +357,7 @@ log4rs = "1.3.0"
 env_logger = "0.11"
 lazy_static = "1.4"
 itertools = "0.14"
+lazycell = "1.3"
 once_cell = "1.21"
 byteorder = "1.5"
 strum = "0.26"

Cargo.toml

@@ -5,10 +5,10 @@ BASE_PATH=$(dirname "$(realpath "$0")")
 
 if [[ "$1" == "--install" ]]
 then
-    rustup toolchain add nightly-2024-02-04
-    rustup component add rustfmt --toolchain nightly-2024-02-04
+    rustup toolchain add nightly-2025-02-01
+    rustup component add rustfmt --toolchain nightly-2025-02-01
     rustup component add clippy
     shift
 else
-    "$BASE_PATH/dev-support/cargo_all.sh" +nightly-2024-02-04 fmt --all $@
+    "$BASE_PATH/dev-support/cargo_all.sh" +nightly-2025-02-01 fmt --all $@
 fi

cargo_fmt.sh

@@ -29,7 +29,6 @@ futures = { workspace = true, features = ["compat"] }
 hashbrown = { workspace = true }
 hibitset = { workspace = true }
 itertools = { workspace = true }
-io = { workspace = true }
 jsonrpc-core = { workspace = true }
 keccak-hash = { workspace = true }
 kvdb = { workspace = true }

crates/cfxcore/core/Cargo.toml

@@ -36,7 +36,6 @@ use cfx_parameters::light::{
 };
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use network::{
     node_table::NodeId, service::ProtocolVersion, NetworkContext,
     NetworkProtocolHandler,
@@ -57,6 +56,8 @@ use sync::{
 };
 use throttling::token_bucket::TokenBucketManager;
 
+type TimerToken = usize;
+
 const SYNC_TIMER: TimerToken = 0;
 const REQUEST_CLEANUP_TIMER: TimerToken = 1;
 const LOG_STATISTICS_TIMER: TimerToken = 2;

crates/cfxcore/core/src/light_protocol/handler/mod.rs

@@ -46,7 +46,6 @@ use cfx_parameters::light::{
 };
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use network::{
     node_table::NodeId, service::ProtocolVersion,
@@ -65,6 +64,8 @@ use std::{
 };
 use throttling::token_bucket::{ThrottleResult, TokenBucketManager};
 
+type TimerToken = usize;
+
 const CHECK_PEER_HEARTBEAT_TIMER: TimerToken = 0;
 
 #[derive(DeriveMallocSizeOf)]

crates/cfxcore/core/src/light_protocol/provider.rs

@@ -18,7 +18,6 @@ use diem_types::{
     epoch_change::EpochChangeProof,
     validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey},
 };
-use io::TimerToken;
 use network::{
     node_table::NodeId, service::ProtocolVersion, NetworkContext,
     NetworkProtocolHandler, NetworkService, UpdateNodeOperation,
@@ -47,6 +46,8 @@ use crate::{
 
 use super::{HSB_PROTOCOL_ID, HSB_PROTOCOL_VERSION};
 
+type TimerToken = usize;
+
 #[derive(Default)]
 pub struct PeerState {
     id: NodeId,

crates/cfxcore/core/src/pos/protocol/sync_protocol.rs

@@ -30,7 +30,6 @@ use cfx_internal_common::ChainIdParamsDeprecated;
 use cfx_parameters::{block::MAX_BLOCK_SIZE_IN_BYTES, sync::*};
 use cfx_types::H256;
 use diem_types::validator_config::{ConsensusPublicKey, ConsensusVRFPublicKey};
-use io::TimerToken;
 use malloc_size_of::{new_malloc_size_ops, MallocSizeOf};
 use malloc_size_of_derive::MallocSizeOf as DeriveMallocSizeOf;
 use metrics::{register_meter_with_group, Meter, MeterTimer};
@@ -64,6 +63,8 @@ lazy_static! {
         register_meter_with_group("timer", "sync:propagate_tx_timer");
 }
 
+type TimerToken = usize;
+
 const TX_TIMER: TimerToken = 0;
 const CHECK_REQUEST_TIMER: TimerToken = 1;
 const BLOCK_CACHE_GC_TIMER: TimerToken = 2;

crates/cfxcore/core/src/sync/synchronization_protocol_handler.rs

@@ -195,6 +195,7 @@ build_config! {
         (eoa_code_transition_height, (Option<u64>), Some(129680000))
         (cip151_transition_height, (Option<u64>), None)
         (cip645_transition_height, (Option<u64>), None)
+        (cip145_fix_transition_height, (Option<u64>), None)
         // For test only
         (align_evm_transition_height, (u64), u64::MAX)
 
@@ -1513,14 +1514,17 @@ impl Configuration {
         //
         set_conf!(
             self.raw_conf.eoa_code_transition_height.unwrap_or(default_transition_time);
-            params.transition_heights => { cip150, cip151, cip152, cip154, cip7702, cip645, eip2537, eip2935, eip7623 }
+            params.transition_heights => { cip150, cip151, cip152, cip154, cip7702, cip645, eip2537, eip2935, eip7623, cip145_fix }
         );
         if let Some(x) = self.raw_conf.cip151_transition_height {
             params.transition_heights.cip151 = x;
         }
         if let Some(x) = self.raw_conf.cip645_transition_height {
             params.transition_heights.cip645 = x;
         }
+        if let Some(x) = self.raw_conf.cip145_fix_transition_height {
+            params.transition_heights.cip145_fix = x;
+        }
         params.transition_heights.align_evm =
             self.raw_conf.align_evm_transition_height;
     }