From 7e7f895423f5fe66fa3e459401a3866aa713fea9 Mon Sep 17 00:00:00 2001 From: juanbono Date: Mon, 30 Oct 2023 16:35:01 -0300 Subject: [PATCH 1/3] replace println by tracing::debug --- src/syscalls/native_syscall_handler.rs | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/src/syscalls/native_syscall_handler.rs b/src/syscalls/native_syscall_handler.rs index 68aaa8b12..5dddb3aad 100644 --- a/src/syscalls/native_syscall_handler.rs +++ b/src/syscalls/native_syscall_handler.rs @@ -28,6 +28,7 @@ use crate::{ EntryPointType, }; + #[derive(Debug)] pub struct NativeSyscallHandler<'a, S> where @@ -55,7 +56,7 @@ impl<'a, S: StateReader> NativeSyscallHandler<'a, S> { if *gas < required_gas { let out_of_gas_felt = Felt252::from_bytes_be("Out of gas".as_bytes()); - println!("out of gas!: {:?} < {:?}", *gas, required_gas); // TODO: remove once all other prints are removed + tracing::debug!("out of gas!: {:?} < {:?}", *gas, required_gas); return Err(vec![out_of_gas_felt.clone()]); } @@ -74,7 +75,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> block_number: u64, gas: &mut u128, ) -> SyscallResult { - println!("Called `get_block_hash({block_number})` from MLIR."); + tracing::debug!("Called `get_block_hash({block_number})` from MLIR."); self.handle_syscall_request(gas, "get_block_hash")?; @@ -85,7 +86,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> &mut self, gas: &mut u128, ) -> SyscallResult { - println!("Called `get_execution_info()` from MLIR."); + tracing::debug!("Called `get_execution_info()` from MLIR."); self.handle_syscall_request(gas, "get_execution_info")?; @@ -122,6 +123,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> deploy_from_zero: bool, gas: &mut u128, ) -> SyscallResult<(cairo_vm::felt::Felt252, Vec)> { + tracing::debug!("Called `deploy({class_hash}, {calldata:?})` from MLIR."); self.handle_syscall_request(gas, "deploy")?; let deployer_address = if deploy_from_zero { @@ -177,7 +179,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> class_hash: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult<()> { - println!("Called `replace_class({class_hash})` from MLIR."); + tracing::debug!("Called `replace_class({class_hash})` from MLIR."); self.handle_syscall_request(gas, "replace_class")?; Ok(()) @@ -190,7 +192,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> calldata: &[cairo_vm::felt::Felt252], gas: &mut u128, ) -> SyscallResult> { - println!( + tracing::debug!( "Called `library_call({class_hash}, {function_selector}, {calldata:?})` from MLIR." ); @@ -206,7 +208,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> calldata: &[cairo_vm::felt::Felt252], gas: &mut u128, ) -> SyscallResult> { - println!( + tracing::debug!( "Called `call_contract({address}, {entrypoint_selector}, {calldata:?})` from MLIR." ); @@ -261,7 +263,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> address: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult { - println!("Called `storage_read({address_domain}, {address})` from MLIR."); + tracing::debug!("Called `storage_read({address_domain}, {address})` from MLIR."); self.handle_syscall_request(gas, "storage_read")?; @@ -271,7 +273,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> Err(_) => Ok(Felt252::zero()), }; - println!(" = {value:?}` from MLIR."); + tracing::debug!(" = {value:?}` from MLIR."); value } @@ -283,7 +285,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> value: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult<()> { - println!("Called `storage_write({address_domain}, {address}, {value})` from MLIR."); + tracing::debug!("Called `storage_write({address_domain}, {address}, {value})` from MLIR."); self.handle_syscall_request(gas, "storage_write")?; @@ -299,7 +301,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> gas: &mut u128, ) -> SyscallResult<()> { let order = self.tx_execution_context.n_emitted_events; - println!("Called `emit_event(KEYS: {keys:?}, DATA: {data:?})` from MLIR."); + tracing::debug!("Called `emit_event(KEYS: {keys:?}, DATA: {data:?})` from MLIR."); self.handle_syscall_request(gas, "emit_event")?; @@ -315,7 +317,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> payload: &[cairo_vm::felt::Felt252], gas: &mut u128, ) -> SyscallResult<()> { - println!("Called `send_message_to_l1({to_address}, {payload:?})` from MLIR."); + tracing::debug!("Called `send_message_to_l1({to_address}, {payload:?})` from MLIR."); self.handle_syscall_request(gas, "send_message_to_l1")?; @@ -337,7 +339,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> input: &[u64], gas: &mut u128, ) -> SyscallResult { - println!("Called `keccak({input:?})` from MLIR."); + tracing::debug!("Called `keccak({input:?})` from MLIR."); self.handle_syscall_request(gas, "keccak")?; From 9e381ed0c72913ac2bfbfffdc8b3f84f1422f734 Mon Sep 17 00:00:00 2001 From: juanbono Date: Mon, 30 Oct 2023 16:52:40 -0300 Subject: [PATCH 2/3] replace MLIR with Cairo Native --- src/syscalls/native_syscall_handler.rs | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/syscalls/native_syscall_handler.rs b/src/syscalls/native_syscall_handler.rs index 5dddb3aad..92814229b 100644 --- a/src/syscalls/native_syscall_handler.rs +++ b/src/syscalls/native_syscall_handler.rs @@ -75,7 +75,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> block_number: u64, gas: &mut u128, ) -> SyscallResult { - tracing::debug!("Called `get_block_hash({block_number})` from MLIR."); + tracing::debug!("Called `get_block_hash({block_number})` from Cairo Native"); self.handle_syscall_request(gas, "get_block_hash")?; @@ -86,7 +86,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> &mut self, gas: &mut u128, ) -> SyscallResult { - tracing::debug!("Called `get_execution_info()` from MLIR."); + tracing::debug!("Called `get_execution_info()` from Cairo Native"); self.handle_syscall_request(gas, "get_execution_info")?; @@ -123,7 +123,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> deploy_from_zero: bool, gas: &mut u128, ) -> SyscallResult<(cairo_vm::felt::Felt252, Vec)> { - tracing::debug!("Called `deploy({class_hash}, {calldata:?})` from MLIR."); + tracing::debug!("Called `deploy({class_hash}, {calldata:?})` from Cairo Native"); self.handle_syscall_request(gas, "deploy")?; let deployer_address = if deploy_from_zero { @@ -179,7 +179,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> class_hash: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult<()> { - tracing::debug!("Called `replace_class({class_hash})` from MLIR."); + tracing::debug!("Called `replace_class({class_hash})` from Cairo Native"); self.handle_syscall_request(gas, "replace_class")?; Ok(()) @@ -193,7 +193,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> gas: &mut u128, ) -> SyscallResult> { tracing::debug!( - "Called `library_call({class_hash}, {function_selector}, {calldata:?})` from MLIR." + "Called `library_call({class_hash}, {function_selector}, {calldata:?})` from Cairo Native" ); self.handle_syscall_request(gas, "library_call")?; @@ -209,7 +209,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> gas: &mut u128, ) -> SyscallResult> { tracing::debug!( - "Called `call_contract({address}, {entrypoint_selector}, {calldata:?})` from MLIR." + "Called `call_contract({address}, {entrypoint_selector}, {calldata:?})` from Cairo Native" ); self.handle_syscall_request(gas, "call_contract")?; @@ -263,7 +263,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> address: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult { - tracing::debug!("Called `storage_read({address_domain}, {address})` from MLIR."); + tracing::debug!("Called `storage_read({address_domain}, {address})` from Cairo Native"); self.handle_syscall_request(gas, "storage_read")?; @@ -273,7 +273,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> Err(_) => Ok(Felt252::zero()), }; - tracing::debug!(" = {value:?}` from MLIR."); + tracing::debug!(" = {value:?}` from Cairo Native"); value } @@ -285,7 +285,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> value: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult<()> { - tracing::debug!("Called `storage_write({address_domain}, {address}, {value})` from MLIR."); + tracing::debug!("Called `storage_write({address_domain}, {address}, {value})` from Cairo Native"); self.handle_syscall_request(gas, "storage_write")?; @@ -301,7 +301,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> gas: &mut u128, ) -> SyscallResult<()> { let order = self.tx_execution_context.n_emitted_events; - tracing::debug!("Called `emit_event(KEYS: {keys:?}, DATA: {data:?})` from MLIR."); + tracing::debug!("Called `emit_event(KEYS: {keys:?}, DATA: {data:?})` from Cairo Native"); self.handle_syscall_request(gas, "emit_event")?; @@ -317,7 +317,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> payload: &[cairo_vm::felt::Felt252], gas: &mut u128, ) -> SyscallResult<()> { - tracing::debug!("Called `send_message_to_l1({to_address}, {payload:?})` from MLIR."); + tracing::debug!("Called `send_message_to_l1({to_address}, {payload:?})` from Cairo Native"); self.handle_syscall_request(gas, "send_message_to_l1")?; @@ -339,7 +339,7 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> input: &[u64], gas: &mut u128, ) -> SyscallResult { - tracing::debug!("Called `keccak({input:?})` from MLIR."); + tracing::debug!("Called `keccak({input:?})` from Cairo Native"); self.handle_syscall_request(gas, "keccak")?; From 026a1a9bf6e6c0ac66be3f509d79f87b9123a6ef Mon Sep 17 00:00:00 2001 From: juanbono Date: Mon, 30 Oct 2023 18:01:27 -0300 Subject: [PATCH 3/3] fmt --- src/syscalls/native_syscall_handler.rs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/syscalls/native_syscall_handler.rs b/src/syscalls/native_syscall_handler.rs index 92814229b..9532f6c05 100644 --- a/src/syscalls/native_syscall_handler.rs +++ b/src/syscalls/native_syscall_handler.rs @@ -28,7 +28,6 @@ use crate::{ EntryPointType, }; - #[derive(Debug)] pub struct NativeSyscallHandler<'a, S> where @@ -285,7 +284,9 @@ impl<'a, S: StateReader> StarkNetSyscallHandler for NativeSyscallHandler<'a, S> value: cairo_vm::felt::Felt252, gas: &mut u128, ) -> SyscallResult<()> { - tracing::debug!("Called `storage_write({address_domain}, {address}, {value})` from Cairo Native"); + tracing::debug!( + "Called `storage_write({address_domain}, {address}, {value})` from Cairo Native" + ); self.handle_syscall_request(gas, "storage_write")?;