Merge pull request #2647 from ljedrz/feat/locktick_feature

vicsn · web-flow · commit 69f97fa4798d · 2025-03-20T15:53:49.000+01:00
[Feat] Introduce a lock accounting feature
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -134,6 +134,13 @@ cuda = [ "snarkvm-algorithms/cuda" ]
 save_r1cs_hashes = [ "snarkvm-circuit/save_r1cs_hashes" ]
 history = [ "snarkvm-synthesizer/history" ]
 parameters_no_std_out = [ "snarkvm-parameters/no_std_out" ]
+locktick = [
+  "dep:locktick",
+  "snarkvm-algorithms?/locktick",
+  "snarkvm-ledger?/locktick",
+  "snarkvm-parameters?/locktick",
+  "snarkvm-synthesizer?/locktick"
+]
 noconfig = [ ]
 rocks = [ "snarkvm-ledger/rocks", "snarkvm-synthesizer/rocks" ]
 test = [ "snarkvm-ledger/test" ]
@@ -233,6 +240,11 @@ optional = true
 version = "2.0"
 features = [ "rayon" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.num-format]
 version = "0.4.4"
 
diff --git a/algorithms/Cargo.toml b/algorithms/Cargo.toml
@@ -110,6 +110,11 @@ version = "0.11.0"
 version = "1.4"
 optional = true
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.parking_lot]
 version = "0.12"
 
@@ -200,6 +205,7 @@ cuda = [ "snarkvm-algorithms-cuda" ]
 profiler = [ "aleo-std/profiler" ]
 crypto_hash = [ ]
 fft = [ ]
+locktick = [ "dep:locktick", "snarkvm-parameters?/locktick" ]
 msm = [ ]
 test = [ ]
 polycommit = [ "crypto_hash", "fft", "msm", "rand_core" ]
diff --git a/ledger/Cargo.toml b/ledger/Cargo.toml
@@ -38,6 +38,12 @@ async = [
   "ledger-query/async",
   "synthesizer/async"
 ]
+locktick = [
+  "dep:locktick",
+  "ledger-puzzle/locktick",
+  "ledger-store/locktick",
+  "synthesizer/locktick"
+]
 metrics = [ "ledger-committee/metrics" ]
 rocks = [ "ledger-store/rocks" ]
 serial = [
@@ -122,6 +128,11 @@ version = "1.0.73"
 version = "2.0"
 features = [ "serde" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.lru]
 version = "0.12"
 
diff --git a/ledger/puzzle/Cargo.toml b/ledger/puzzle/Cargo.toml
@@ -32,6 +32,7 @@ required-features = [ "setup" ]
 [features]
 default = [ "indexmap/rayon", "rayon" ]
 cuda = [ "snarkvm-algorithms/cuda" ]
+locktick = [ "dep:locktick", "snarkvm-algorithms/locktick" ]
 serial = [ "console/serial", "snarkvm-algorithms/serial" ]
 setup = [ ]
 timer = [ "aleo-std/timer" ]
@@ -60,6 +61,11 @@ version = "1"
 version = "2.0"
 features = [ "serde", "rayon" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.lru]
 version = "0.12"
 
diff --git a/ledger/puzzle/epoch/Cargo.toml b/ledger/puzzle/epoch/Cargo.toml
@@ -26,6 +26,11 @@ edition = "2021"
 [features]
 default = [ "synthesis", "rayon" ]
 serial = [ "console/serial", "snarkvm-ledger-puzzle/serial" ]
+locktick = [
+  "dep:locktick",
+  "snarkvm-ledger-puzzle/locktick",
+  "snarkvm-synthesizer-process/locktick"
+]
 merkle = [ ]
 synthesis = [
   "aleo-std",
@@ -78,6 +83,11 @@ version = "2"
 version = "2.0"
 features = [ "serde", "rayon" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.lru]
 version = "0.12"
 optional = true
diff --git a/ledger/puzzle/epoch/src/synthesis/mod.rs b/ledger/puzzle/epoch/src/synthesis/mod.rs
@@ -25,7 +25,10 @@ use snarkvm_ledger_puzzle::PuzzleTrait;
 
 use anyhow::{Result, bail};
 use core::{marker::PhantomData, num::NonZeroUsize};
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::RwLock;
 use lru::LruCache;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::RwLock;
 use rand_chacha::ChaChaRng;
 use std::sync::Arc;
diff --git a/ledger/puzzle/src/lib.rs b/ledger/puzzle/src/lib.rs
@@ -52,7 +52,10 @@ use console::{
 use aleo_std::prelude::*;
 use core::num::NonZeroUsize;
 use indexmap::IndexMap;
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::RwLock;
 use lru::LruCache;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::RwLock;
 use rand::SeedableRng;
 use rand_chacha::ChaChaRng;
diff --git a/ledger/src/lib.rs b/ledger/src/lib.rs
@@ -70,7 +70,10 @@ use aleo_std::{
 use anyhow::Result;
 use core::ops::Range;
 use indexmap::IndexMap;
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::{Mutex, RwLock};
 use lru::LruCache;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::{Mutex, RwLock};
 use rand::{prelude::IteratorRandom, rngs::OsRng};
 use std::{borrow::Cow, sync::Arc};
diff --git a/ledger/store/Cargo.toml b/ledger/store/Cargo.toml
@@ -18,6 +18,7 @@ edition = "2021"
 
 [features]
 default = [ "indexmap/rayon", "rayon" ]
+locktick = [ "dep:locktick", "ledger-puzzle/locktick" ]
 rocks = [ "once_cell", "rocksdb", "smallvec", "tracing" ]
 serial = [
   "console/serial",
@@ -93,6 +94,11 @@ version = "1.3"
 version = "2.0"
 features = [ "serde" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.once_cell]
 version = "1.18"
 optional = true
diff --git a/ledger/store/src/block/mod.rs b/ledger/store/src/block/mod.rs
@@ -48,6 +48,9 @@ use synthesizer_program::{FinalizeOperation, Program};
 
 use aleo_std_storage::StorageMode;
 use anyhow::Result;
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::RwLock;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::RwLock;
 use std::{borrow::Cow, sync::Arc};
 
diff --git a/ledger/store/src/helpers/memory/internal/map.rs b/ledger/store/src/helpers/memory/internal/map.rs
@@ -20,6 +20,9 @@ use console::network::prelude::*;
 use indexmap::IndexMap;
 
 use core::{borrow::Borrow, hash::Hash};
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::{Mutex, RwLock};
+#[cfg(not(feature = "locktick"))]
 use parking_lot::{Mutex, RwLock};
 use std::{
     borrow::Cow,
diff --git a/ledger/store/src/helpers/memory/internal/nested_map.rs b/ledger/store/src/helpers/memory/internal/nested_map.rs
@@ -19,6 +19,9 @@ use crate::helpers::{NestedMap, NestedMapRead};
 use console::network::prelude::*;
 
 use core::hash::Hash;
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::{Mutex, RwLock};
+#[cfg(not(feature = "locktick"))]
 use parking_lot::{Mutex, RwLock};
 use std::{
     borrow::Cow,
diff --git a/ledger/store/src/helpers/rocksdb/internal/mod.rs b/ledger/store/src/helpers/rocksdb/internal/mod.rs
@@ -27,7 +27,10 @@ mod tests;
 
 use aleo_std_storage::StorageMode;
 use anyhow::{Result, bail, ensure};
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::Mutex;
 use once_cell::sync::OnceCell;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::Mutex;
 use serde::{Serialize, de::DeserializeOwned};
 use std::{
diff --git a/parameters/Cargo.toml b/parameters/Cargo.toml
@@ -26,6 +26,7 @@ edition = "2021"
 [features]
 large_params = [ ]
 default = [ "colored", "remote" ]
+locktick = [ "dep:locktick" ]
 no_std_out = [ ]
 remote = [ "curl" ]
 wasm = [ "encoding", "js-sys", "web-sys" ]
@@ -77,6 +78,11 @@ optional = true
 [dependencies.lazy_static]
 version = "1.4"
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.parking_lot]
 version = "0.12"
 
diff --git a/parameters/src/mainnet/powers.rs b/parameters/src/mainnet/powers.rs
@@ -29,6 +29,9 @@ use snarkvm_utilities::{
 };
 
 use anyhow::{Result, anyhow, bail, ensure};
+#[cfg(feature = "locktick")]
+use locktick::parking_lot::RwLock;
+#[cfg(not(feature = "locktick"))]
 use parking_lot::RwLock;
 use std::{collections::BTreeMap, ops::Range, sync::Arc};
 
diff --git a/synthesizer/Cargo.toml b/synthesizer/Cargo.toml
@@ -25,6 +25,13 @@ edition = "2021"
 
 [features]
 default = [ "process", "program", "rayon", "snark" ]
+locktick = [
+  "dep:locktick",
+  "ledger-puzzle/locktick",
+  "ledger-puzzle-epoch/locktick",
+  "ledger-store/locktick",
+  "synthesizer-process?/locktick"
+]
 process = [ "synthesizer-process" ]
 program = [ "synthesizer-program" ]
 snark = [ "synthesizer-snark" ]
@@ -156,6 +163,11 @@ features = [ "serde", "rayon" ]
 [dependencies.itertools]
 version = "0.11.0"
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.lru]
 version = "0.12"
 
diff --git a/synthesizer/process/Cargo.toml b/synthesizer/process/Cargo.toml
@@ -27,6 +27,7 @@ edition = "2021"
 default = [ "indexmap/rayon", "rayon" ]
 aleo-cli = [ ]
 async = [ "ledger-query/async" ]
+locktick = [ "dep:locktick", "ledger-store/locktick" ]
 rocks = [ "ledger-store/rocks" ]
 serial = [
   "console/serial",
@@ -109,6 +110,11 @@ version = "2"
 version = "2.0"
 features = [ "serde" ]
 
+[dependencies.locktick]
+version = "0.3"
+features = [ "parking_lot" ]
+optional = true
+
 [dependencies.once_cell]
 version = "1.18"
 
diff --git a/synthesizer/process/src/lib.rs b/synthesizer/process/src/lib.rs
diff --git a/synthesizer/process/src/stack/authorization/mod.rs b/synthesizer/process/src/stack/authorization/mod.rs
diff --git a/synthesizer/process/src/stack/mod.rs b/synthesizer/process/src/stack/mod.rs
diff --git a/synthesizer/process/src/tests/test_execute.rs b/synthesizer/process/src/tests/test_execute.rs
diff --git a/synthesizer/src/vm/mod.rs b/synthesizer/src/vm/mod.rs
