progress

lambdaclass · Jan 26, 2024 · 70edcf2 · 70edcf2
1 parent 3adaefe
commit 70edcf2
Show file tree

Hide file tree

Showing 49 changed files with 1,914 additions and 220 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,6 +13,7 @@ metrics = []
 # Disclaimer: This feature enables state modifications being applied on reverted and failings txs, and also disables address availability check when deploying contracts.
 # Only use for benchmarking using the replay binary
 replay_benchmark = []
+cairo-native = ["dep:ipc-channel", "dep:tracing-appender", "dep:cairo-native", "dep:uuid"]
 
 [workspace]
 members = [
@@ -43,8 +44,10 @@ cairo-lang-runner = { workspace = true }
 cairo-lang-sierra = { workspace = true }
 cairo-lang-starknet = { workspace = true }
 cairo-lang-utils = { workspace = true }
-cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "5e003699e53003c03b848e3001f1d4ec0d7007ed", optional = true }
-
+cairo-native = { git = "https://github.com/lambdaclass/cairo_native", rev = "a2e6d118af9a54295ef1ca4d693b98e54ffc3b0f", features = ["with-serde"], optional = true }
+ipc-channel = { version = "0.18.0", features = ["memfd"], optional = true }
+tracing-appender = { version = "0.2.3", optional = true}
+uuid = { version = "1.6.1", features = ["serde", "v4"], optional = true }
 
 cairo-vm = { workspace = true }
 flate2 = "1.0.25"
@@ -70,6 +73,7 @@ starknet_api = { workspace = true }
 starknet-crypto = "0.6.1"
 thiserror = { workspace = true }
 tracing = "0.1.37"
+tracing-subscriber = "0.3.17"
 
 [dev-dependencies]
 assert_matches = "1.5.0"
@@ -88,6 +92,11 @@ path = "src/bin/native_bench.rs"
 name = "cairo_native"
 required-features = ["cairo-native"]
 
+[[bin]]
+path = "src/bin/native_executor.rs"
+name = "cairo_native_executor"
+required-features = ["cairo-native"]
+
 [[bench]]
 path = "bench/yas.rs"
 name = "yas"

diff --git a/bench/internals.rs b/bench/internals.rs
@@ -116,6 +116,8 @@ pub fn deploy_account(
                 block_context,
                 #[cfg(feature = "cairo-native")]
                 Some(program_cache.clone()),
+                #[cfg(feature = "cairo-native")]
+                None,
             )
         })
         .unwrap();
@@ -158,6 +160,8 @@ pub fn declare(
                 block_context,
                 #[cfg(feature = "cairo-native")]
                 Some(program_cache.clone()),
+                #[cfg(feature = "cairo-native")]
+                None,
             )
         })
         .unwrap();
@@ -207,6 +211,8 @@ pub fn deploy(
                 block_context,
                 #[cfg(feature = "cairo-native")]
                 Some(program_cache.clone()),
+                #[cfg(feature = "cairo-native")]
+                None,
             )
         })
         .unwrap();
@@ -254,6 +260,8 @@ pub fn invoke(
             block_context,
             #[cfg(feature = "cairo-native")]
             Some(program_cache.clone()),
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -282,6 +290,8 @@ pub fn invoke(
                 2_000_000,
                 #[cfg(feature = "cairo-native")]
                 Some(program_cache.clone()),
+                #[cfg(feature = "cairo-native")]
+                None,
             )
         })
         .unwrap();

diff --git a/bench/yas.rs b/bench/yas.rs
@@ -385,6 +385,8 @@ where
         &BlockContext::default(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -426,6 +428,8 @@ where
         &BlockContext::default(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -467,6 +471,8 @@ where
         &BlockContext::default(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -508,6 +514,8 @@ where
         &BlockContext::default(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -560,6 +568,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -607,6 +617,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -646,6 +658,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -701,6 +715,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -752,6 +768,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -801,6 +819,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -859,6 +879,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -919,6 +941,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.
@@ -967,6 +991,8 @@ where
         u64::MAX.into(),
         #[cfg(feature = "cairo-native")]
         Some(program_cache),
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     // Ensure the execution was successful.

diff --git a/cli/src/main.rs b/cli/src/main.rs
@@ -207,6 +207,8 @@ fn invoke_parser(
         0,
         #[cfg(feature = "cairo-native")]
         None,
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
     cached_state.apply_state_update(&StateDiff::from_cached_state(transactional_state.cache())?)?;
 
@@ -274,6 +276,8 @@ fn call_parser(
         block_context.invoke_tx_max_n_steps(),
         #[cfg(feature = "cairo-native")]
         None,
+        #[cfg(feature = "cairo-native")]
+        None,
     )?;
 
     let call_info = call_info.ok_or(TransactionError::CallInfoIsNone)?;

diff --git a/examples/contract_execution/src/main.rs b/examples/contract_execution/src/main.rs
@@ -138,6 +138,8 @@ fn test_contract(
             &block_context,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .expect("Account Deploy Failed")
         .call_info
@@ -179,6 +181,8 @@ fn test_contract(
             &block_context,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .expect("could not declare the contract class");
 
@@ -205,6 +209,8 @@ fn test_contract(
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .expect("could not deploy contract")
         .call_info
@@ -254,6 +260,8 @@ fn test_contract(
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 

diff --git a/examples/lru_cache/main.rs b/examples/lru_cache/main.rs
@@ -70,6 +70,8 @@ fn run_contract(
             &block_context,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -88,6 +90,8 @@ fn run_contract(
             &block_context,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -113,6 +117,8 @@ fn run_contract(
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 

diff --git a/fuzzer/src/main.rs b/fuzzer/src/main.rs
@@ -195,6 +195,8 @@ fn main() {
                     block_context.invoke_tx_max_n_steps(),
                     #[cfg(feature = "cairo-native")]
                     None,
+                    #[cfg(feature = "cairo-native")]
+                    None,
                 )
                 .unwrap();
             assert_eq!(call_info.unwrap(), expected_call_info);

diff --git a/rpc_state_reader/src/sir_state_reader.rs b/rpc_state_reader/src/sir_state_reader.rs
@@ -310,7 +310,7 @@ pub fn execute_tx_configurable_with_state(
     #[cfg(not(feature = "cairo-native"))]
     let sir_execution = tx.execute(state, &block_context, u128::MAX)?;
     #[cfg(feature = "cairo-native")]
-    let sir_execution = tx.execute(state, &block_context, u128::MAX, None)?;
+    let sir_execution = tx.execute(state, &block_context, u128::MAX, None, None)?;
 
     Ok(sir_execution)
 }

diff --git a/src/bin/deploy.rs b/src/bin/deploy.rs
@@ -61,6 +61,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
     }

diff --git a/src/bin/deploy_invoke.rs b/src/bin/deploy_invoke.rs
@@ -78,6 +78,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -112,6 +114,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -135,6 +139,8 @@ fn main() {
                 0,
                 #[cfg(feature = "cairo-native")]
                 None,
+                #[cfg(feature = "cairo-native")]
+                None,
             )
             .unwrap();
 

diff --git a/src/bin/fibonacci.rs b/src/bin/fibonacci.rs
@@ -132,6 +132,8 @@ fn main() {
                 block_context.invoke_tx_max_n_steps(),
                 #[cfg(feature = "cairo-native")]
                 None,
+                #[cfg(feature = "cairo-native")]
+                None,
             )
             .unwrap();
 

diff --git a/src/bin/invoke.rs b/src/bin/invoke.rs
@@ -94,6 +94,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -117,6 +119,8 @@ fn main() {
                 0,
                 #[cfg(feature = "cairo-native")]
                 None,
+                #[cfg(feature = "cairo-native")]
+                None,
             )
             .unwrap();
 

diff --git a/src/bin/invoke_with_cachedstate.rs b/src/bin/invoke_with_cachedstate.rs
@@ -71,6 +71,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();
 
@@ -91,6 +93,8 @@ fn main() {
             0,
             #[cfg(feature = "cairo-native")]
             None,
+            #[cfg(feature = "cairo-native")]
+            None,
         )
         .unwrap();