refactor(blockifier): see if LC fix worked

starkware-libs · Nov 26, 2024 · e48c43b · e48c43b
1 parent abf5736
commit e48c43b
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 23 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -103,7 +103,7 @@ cairo-lang-sierra-to-casm = "2.9.0-dev.0"
 cairo-lang-starknet-classes = "2.9.0-dev.0"
 cairo-lang-utils = "2.9.0-dev.0"
 # Important: when updated, make sure to update the cairo-native submodule as well.
-cairo-native = "0.2.3"
+cairo-native = { git = "https://github.com/lambdaclass/cairo_native.git", rev = "ff8fa891fa0aa5c755030847cde4632937be7e17" }
 cairo-vm = "=1.0.1"
 camelpaste = "0.1.0"
 chrono = "0.4.26"

diff --git a/crates/blockifier/cairo_native b/crates/blockifier/cairo_native
diff --git a/crates/blockifier/src/execution/native/entry_point_execution.rs b/crates/blockifier/src/execution/native/entry_point_execution.rs
@@ -41,11 +41,11 @@ pub fn execute_entry_point_call(
 
     // Fund the initial budget since the native executor charges it before the run.
     // TODO(Yoni): revert once the VM is aligned with this.
-    let gas = syscall_handler.base.call.initial_gas + gas_costs.entry_point_initial_budget;
+    let gas = syscall_handler.base.call.initial_gas;
     let execution_result = contract_class.executor.run(
         entry_point.selector.0,
         &syscall_handler.base.call.calldata.0.clone(),
-        Some(gas),
+        gas,
         Some(builtin_costs),
         &mut syscall_handler,
     );
@@ -64,24 +64,24 @@ fn create_callinfo(
     call_result: ContractExecutionResult,
     syscall_handler: NativeSyscallHandler<'_>,
 ) -> Result<CallInfo, EntryPointExecutionError> {
-    let mut remaining_gas = call_result.remaining_gas;
+    let remaining_gas = call_result.remaining_gas;
 
     if remaining_gas > syscall_handler.base.call.initial_gas {
-        if remaining_gas - syscall_handler.base.call.initial_gas
-            <= syscall_handler.base.context.gas_costs().entry_point_initial_budget
-        {
-            // Revert the refund.
-            // TODO(Yoni): temporary hack - this is probably a bug. Investigate and fix native.
-            remaining_gas = syscall_handler.base.call.initial_gas;
-        } else {
-            return Err(PostExecutionError::MalformedReturnData {
-                error_message: format!(
-                    "Unexpected remaining gas. Used gas is greater than initial gas: {} > {}",
-                    remaining_gas, syscall_handler.base.call.initial_gas
-                ),
-            }
-            .into());
+        // if remaining_gas - syscall_handler.call.initial_gas
+        //     <= syscall_handler.context.gas_costs().entry_point_initial_budget
+        // {
+        //     // Revert the refund.
+        //     // TODO(Yoni): temporary hack - this is probably a bug. Investigate and fix native.
+        //     remaining_gas = syscall_handler.call.initial_gas;
+        // } else {
+        return Err(PostExecutionError::MalformedReturnData {
+            error_message: format!(
+                "Unexpected remaining gas. Used gas is greater than initial gas: {} > {}",
+                remaining_gas, syscall_handler.base.call.initial_gas
+            ),
         }
+        .into());
+        // }
     }
 
     let gas_consumed = syscall_handler.base.call.initial_gas - remaining_gas;
+78 −63		.github/workflows/bench-hyperfine.yml
+2 −2		.github/workflows/starknet-blocks.yml
+8 −4		benches/libfuncs.rs
+1 −1		benches/util.rs
+2 −2		env.sh
+3 −2		examples/easy_api.rs
+3 −2		examples/erc20.rs
+3 −2		examples/invoke.rs
+3 −2		examples/starknet.rs
+11 −8		src/arch.rs
+1 −1		src/bin/cairo-native-compile.rs
+2 −2		src/bin/cairo-native-run.rs
+2 −2		src/bin/utils/test.rs
+1 −1		src/cache/jit.rs
+2 −6		src/compiler.rs
+12 −15		src/context.rs
+2 −1		src/error.rs
+4 −4		src/executor.rs
+27 −26		src/executor/aot.rs
+34 −54		src/executor/contract.rs
+17 −11		src/executor/jit.rs
+96 −50		src/libfuncs.rs
+0 −87		src/libfuncs/ap_tracking.rs
+11 −6		src/libfuncs/bounded_int.rs
+9 −16		src/libfuncs/box.rs
+0 −33		src/libfuncs/branch_align.rs
+15 −55		src/libfuncs/circuit.rs
+28 −59		src/libfuncs/mem.rs
+15 −41		src/libfuncs/nullable.rs
+0 −29		src/libfuncs/snapshot_take.rs
+17 −115		src/libfuncs/starknet.rs
+0 −30		src/libfuncs/unconditional_jump.rs
+0 −30		src/libfuncs/unwrap_non_zero.rs
+16 −17		src/utils.rs
+33 −37		src/values.rs
+4 −3		tests/common.rs
+2 −1		tests/tests/starknet/keccak.rs
+1 −1		tests/tests/trampoline.rs