Patch time

Cargo.toml

@@ -131,6 +131,8 @@ members = [
     "zk-keygen",
     "zk-sdk",
     "zk-token-sdk",
+    # Patches to make this code run under the SP1 prover (time support)
+    "patches",
 ]
 
 exclude = ["programs/sbf", "svm/tests/example-programs"]
@@ -411,6 +413,7 @@ solana-zk-keygen = { path = "zk-keygen", version = "=2.0.5" }
 solana-zk-sdk = { path = "zk-sdk", version = "=2.0.5" }
 solana-zk-token-proof-program = { path = "programs/zk-token-proof", version = "=2.0.5" }
 solana-zk-token-sdk = { path = "zk-token-sdk", version = "=2.0.5" }
+solana-patches = { path = "patches", version = "=2.0.5" }
 solana_rbpf = "=0.8.4"
 spl-associated-token-account = "=4.0.0"
 spl-instruction-padding = "0.2"

accounts-db/Cargo.toml

@@ -42,6 +42,7 @@ solana-inline-spl = { workspace = true }
 solana-measure = { workspace = true }
 # solana-metrics = { workspace = true }
 solana-nohash-hasher = { workspace = true }
+solana-patches = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-sdk = { workspace = true }
 solana-stake-program = { workspace = true, optional = true }

accounts-db/src/accounts_db.rs

@@ -110,9 +110,9 @@ use {
             Arc, Condvar, Mutex,
         },
         thread::{sleep, Builder},
-        time::{Duration, Instant},
     },
     tempfile::TempDir,
+    solana_patches::time::{Duration, Instant},
 };
 
 const PAGE_SIZE: u64 = 4 * 1024;
@@ -5330,6 +5330,7 @@ impl AccountsDb {
 
         #[cfg(test)]
         {
+            use std::time::Duration;
             // Give some time for cache flushing to occur here for unit tests
             sleep(Duration::from_millis(self.load_delay));
         }
@@ -6597,6 +6598,7 @@ impl AccountsDb {
             let flush_stats = self.accounts_cache.slot_cache(slot).map(|slot_cache| {
                 #[cfg(test)]
                 {
+                    use std::time::Duration;
                     // Give some time for cache flushing to occur here for unit tests
                     sleep(Duration::from_millis(self.load_delay));
                 }
@@ -9245,7 +9247,7 @@ impl AccountsDb {
         {
             // 10 ms is long enough to allow some flushing to occur before insertion is resumed.
             // callers of this are typically run in parallel, so many threads will be sleeping at different starting intervals, waiting to resume insertion.
-            sleep(Duration::from_millis(10));
+            // sleep(Duration::from_millis(10));
         }
     }
 
@@ -9756,6 +9758,7 @@ pub mod tests {
             str::FromStr,
             sync::{atomic::AtomicBool, RwLock},
             thread::{self, Builder, JoinHandle},
+            time::Duration,
         },
         test_case::test_case,
     };

accounts-db/src/bucket_map_holder_stats.rs

@@ -228,7 +228,7 @@ impl BucketMapHolderStats {
         let mut thread_time_elapsed_ms = elapsed_ms * storage.threads as u64;
         if disk.is_some() {
             // if was_startup {
-                // these stats only apply at startup
+            // these stats only apply at startup
             //     datapoint_info!(
             //         "accounts_index_startup",
             //         (
@@ -546,7 +546,7 @@ impl BucketMapHolderStats {
             //         i64
             //     ),
             // );
-        // } else {
+            // } else {
             // datapoint_info!(
             //     if startup || was_startup {
             //         thread_time_elapsed_ms *= 2; // more threads are allocated during startup

measure/Cargo.toml

@@ -13,6 +13,7 @@ edition = { workspace = true }
 [dependencies]
 log = { workspace = true }
 solana-sdk = { workspace = true }
+solana-patches = { workspace = true }
 
 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]

measure/src/macros.rs

@@ -83,7 +83,7 @@ macro_rules! measure {
 #[macro_export]
 macro_rules! measure_us {
     ($val:expr) => {{
-        let start = std::time::Instant::now();
+        let start = solana_patches::time::Instant::now();
         let result = $val;
         (result, solana_sdk::timing::duration_as_us(&start.elapsed()))
     }};

measure/src/measure.rs

@@ -1,9 +1,7 @@
 use {
+    solana_patches::time::{Duration, Instant},
     solana_sdk::timing::{duration_as_ms, duration_as_ns, duration_as_s, duration_as_us},
-    std::{
-        fmt,
-        time::{Duration, Instant},
-    },
+    std::fmt,
 };
 
 #[derive(Debug)]
@@ -87,14 +85,14 @@ impl fmt::Display for Measure {
 mod tests {
     use {super::*, std::thread::sleep};
 
-    #[test]
-    fn test_measure() {
-        let test_duration = Duration::from_millis(100);
-        let mut measure = Measure::start("test");
-        sleep(test_duration);
-        measure.stop();
-        assert!(measure.as_duration() >= test_duration);
-    }
+    // #[test]
+    // fn test_measure() {
+    //     let test_duration = Duration::from_millis(100);
+    //     let mut measure = Measure::start("test");
+    //     sleep(test_duration);
+    //     measure.stop();
+    //     assert!(measure.as_duration() >= test_duration);
+    // }
 
     #[test]
     fn test_measure_as() {

patches/Cargo.toml

@@ -0,0 +1,16 @@
+[package]
+name = "solana-patches"
+description = "Patches to work around SP1 time and other util restrictions"
+documentation = ""
+version = { workspace = true }
+authors = { workspace = true }
+repository = { workspace = true }
+homepage = { workspace = true }
+license = { workspace = true }
+edition = { workspace = true }
+
+[dependencies]
+serde = { version = "1.0", features = ["derive"] }
+
+[lib]
+name = "solana_patches"

patches/src/lib.rs

@@ -0,0 +1 @@
+pub mod time;

patches/src/time.rs

@@ -0,0 +1,109 @@
+use std::ops::{Add, AddAssign, Div, Sub};
+
+#[derive(Clone, Copy, Default, Debug, PartialEq, Eq, PartialOrd, Ord)]
+pub struct Instant {}
+
+impl Instant {
+    pub fn now() -> Self {
+        Self::default()
+    }
+
+    pub fn elapsed(&self) -> Duration {
+        Duration::default()
+    }
+
+    pub fn duration_since(&self, _time: Instant) -> Duration {
+        Duration::default()
+    }
+}
+
+impl Sub for Instant {
+    type Output = Duration;
+
+    fn sub(self, _other: Self) -> Duration {
+        Duration::default()
+    }
+}
+
+#[derive(
+    Clone, Copy, Default, Debug, PartialEq, Eq, PartialOrd, Ord, serde::Serialize, serde::Deserialize,
+)]
+pub struct Duration {}
+
+impl Duration {
+    pub const fn new(_secs: u64, _nanos: u32) -> Duration {
+        Duration {}
+    }
+
+    pub const fn from_nanos(_nanos: u64) -> Duration {
+        Self::new(0, 0)
+    }
+
+    pub const fn from_micros(_micros: u64) -> Duration {
+        Self::new(0, 0)
+    }
+
+    pub const fn from_millis(_millis: u64) -> Duration {
+        Self::new(0, 0)
+    }
+
+    pub const fn from_secs(_secs: u64) -> Duration {
+        Self::new(0, 0)
+    }
+
+    pub const fn as_secs(&self) -> u64 {
+        0
+    }
+
+    pub const fn as_nanos(&self) -> u128 {
+        0
+    }
+
+    pub const fn as_micros(&self) -> u128 {
+        0
+    }
+
+    pub const fn subsec_nanos(&self) -> u32 {
+        0
+    }
+
+    pub const ZERO: Duration = Duration::from_nanos(0);
+    pub const MAX: Duration = Duration::new(u64::MAX, 1);
+}
+
+impl Add for Duration {
+    type Output = Self;
+    fn add(self, _other: Self) -> Self {
+        self
+    }
+}
+
+impl AddAssign for Duration {
+    fn add_assign(&mut self, _other: Self) {
+    }
+}
+
+impl Div<u32> for Duration {
+    type Output = Self;
+    fn div(self, _other: u32) -> Self {
+        self
+    }
+}
+
+#[derive(Default)]
+pub struct SystemTime {}
+
+impl SystemTime {
+    pub fn now() -> SystemTime {
+        Self::default()
+    }
+
+    pub fn duration_since(
+        &self,
+        _time: SystemTime,
+    ) -> Result<Duration, Box<dyn std::error::Error>> {
+        Ok(Duration::default())
+    }
+}
+
+pub const UNIX_EPOCH: SystemTime = SystemTime {};

runtime/Cargo.toml

@@ -60,6 +60,7 @@ solana-inline-spl = { workspace = true }
 solana-loader-v4-program = { workspace = true }
 solana-measure = { workspace = true }
 # solana-perf = { workspace = true }
+solana-patches = { workspace = true }
 solana-program-runtime = { workspace = true }
 solana-rayon-threadlimit = { workspace = true }
 solana-sdk = { workspace = true }

runtime/src/accounts_background_service.rs

@@ -22,6 +22,7 @@ use {
         accounts_db::CalcAccountsHashDataSource, accounts_hash::CalcAccountsHashConfig,
     },
     solana_measure::{measure::Measure, measure_us},
+    solana_patches::time::Instant,
     solana_sdk::clock::{BankId, Slot},
     stats::StatsManager,
     std::{
@@ -32,7 +33,6 @@ use {
             Arc, RwLock,
         },
         thread::{self, sleep, Builder, JoinHandle},
-        time::{Duration, Instant},
     },
 };
 
@@ -694,7 +694,7 @@ impl AccountsBackgroundService {
                         }
                     }
                     stats.record_and_maybe_submit(start_time.elapsed());
-                    sleep(Duration::from_millis(INTERVAL_MS));
+                    // sleep(Duration::from_millis(INTERVAL_MS));
                 }
                 info!("AccountsBackgroundService has stopped");
             })

runtime/src/accounts_background_service/stats.rs

@@ -2,7 +2,7 @@
 
 use {
     // solana_metrics::datapoint_info,
-    std::time::{Duration, Instant},
+    solana_patches::time::{Duration, Instant},
 };
 
 const SUBMIT_INTERVAL: Duration = Duration::from_secs(60);

runtime/src/bank_forks.rs

@@ -12,6 +12,7 @@ use {
     crossbeam_channel::SendError,
     log::*,
     solana_measure::measure::Measure,
+    solana_patches::time::Instant,
     solana_program_runtime::loaded_programs::{BlockRelation, ForkGraph},
     solana_sdk::{
         clock::{Epoch, Slot},
@@ -25,7 +26,6 @@ use {
             atomic::{AtomicBool, AtomicU64, Ordering},
             Arc, RwLock,
         },
-        time::Instant,
     },
     thiserror::Error,
 };

sdk/Cargo.toml

@@ -82,6 +82,7 @@ sha3 = { workspace = true, optional = true }
 siphasher = { workspace = true }
 solana-frozen-abi = { workspace = true, optional = true }
 solana-frozen-abi-macro = { workspace = true, optional = true }
+solana-patches = { workspace = true }
 solana-program = { workspace = true }
 solana-sdk-macro = { workspace = true }
 thiserror = { workspace = true }

sdk/src/genesis_config.rs

@@ -22,14 +22,14 @@ use {
     bincode::{deserialize, serialize},
     chrono::{TimeZone, Utc},
     memmap2::Mmap,
+    solana_patches::time::{SystemTime, UNIX_EPOCH},
     std::{
         collections::BTreeMap,
         fmt,
         fs::{File, OpenOptions},
         io::Write,
         path::{Path, PathBuf},
         str::FromStr,
-        time::{SystemTime, UNIX_EPOCH},
     },
 };