Skip to content

Bump blockifier #3877

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

Bump blockifier #3877

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
121 changes: 101 additions & 20 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@ license-file = "LICENSE"

[workspace.dependencies]
# TODO(#3770) Use blockifier directly
blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0", features = ["testing", "tracing", "node_api"] }
blockifier = { version = "0.16.0-rc.1", features = ["testing", "tracing", "node_api"] }
bigdecimal = "0.4.8"
# TODO(#3770) Use starknet_api directly
starknet_api = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0" }
starknet_api = "0.16.0-rc.1"
cairo-native = "0.6.2"
cairo-lang-casm = { version = "2.12.3", features = ["serde"] }
cairo-lang-sierra = "2.12.3"
Expand Down
23 changes: 13 additions & 10 deletions ...src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cairo1_execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ use cairo_vm::{
use runtime::{ExtendedRuntime, StarknetRuntime};

// blockifier/src/execution/cairo1_execution.rs:48 (execute_entry_point_call)
#[expect(clippy::result_large_err)]
pub(crate) fn execute_entry_point_call_cairo1(
call: ExecutableCallEntryPoint,
compiled_class_v1: &CompiledClassV1,
Expand Down Expand Up @@ -145,7 +144,6 @@ pub(crate) fn execute_entry_point_call_cairo1(
}

// crates/blockifier/src/execution/cairo1_execution.rs:236 (run_entry_point)
#[expect(clippy::result_large_err)]
pub fn cheatable_run_entry_point(
runner: &mut CairoRunner,
hint_processor: &mut dyn HintProcessor,
Expand All @@ -159,17 +157,22 @@ pub fn cheatable_run_entry_point(
// endregion
let args: Vec<&CairoArg> = args.iter().collect();

runner.run_from_entrypoint(
entry_point.pc(),
&args,
verify_secure,
Some(program_segment_size),
hint_processor,
)?;
runner
.run_from_entrypoint(
entry_point.pc(),
&args,
verify_secure,
Some(program_segment_size),
hint_processor,
)
.map_err(Box::new)?;

// region: Modified blockifier code
// Relocate trace to then collect it
runner.relocate(true).map_err(CairoRunError::from)?;
runner
.relocate(true)
.map_err(CairoRunError::from)
.map_err(Box::new)?;
// endregion

Ok(())
Expand Down
3 changes: 1 addition & 2 deletions ...s/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/calls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ use starknet_types_core::felt::Felt;
use super::entry_point::{ExecuteCallEntryPointExtraOptions, execute_call_entry_point};

// blockifier/src/execution/syscalls/hint_processor.rs:541 (execute_inner_call)
#[expect(clippy::result_large_err)]
pub fn execute_inner_call(
call: &mut CallEntryPoint,
vm: &mut VirtualMachine,
Expand Down Expand Up @@ -80,7 +79,7 @@ pub fn execute_inner_call(
}

// blockifier/src/execution/syscalls/hint_processor.rs:577 (execute_library_call)
#[expect(clippy::too_many_arguments, clippy::result_large_err)]
#[expect(clippy::too_many_arguments)]
pub fn execute_library_call(
syscall_handler: &mut SyscallHintProcessor<'_>,
cheatnet_state: &mut CheatnetState,
Expand Down
11 changes: 3 additions & 8 deletions ...src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cheated_syscalls.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ use starknet_api::{
};
use std::sync::Arc;

#[expect(clippy::result_large_err)]
pub fn get_execution_info_syscall(
_request: EmptyRequest,
vm: &mut VirtualMachine,
Expand All @@ -67,7 +66,6 @@ pub fn get_execution_info_syscall(
}

// blockifier/src/execution/syscalls/mod.rs:222 (deploy_syscall)
#[expect(clippy::result_large_err)]
pub fn deploy_syscall(
request: DeployRequest,
vm: &mut VirtualMachine,
Expand Down Expand Up @@ -130,7 +128,6 @@ pub fn deploy_syscall(
}

// blockifier/src/execution/execution_utils.rs:217 (execute_deployment)
#[expect(clippy::result_large_err)]
pub fn execute_deployment(
state: &mut dyn State,
cheatnet_state: &mut CheatnetState,
Expand Down Expand Up @@ -162,7 +159,6 @@ pub fn execute_deployment(
}

// blockifier/src/execution/syscalls/mod.rs:407 (library_call)
#[expect(clippy::result_large_err)]
pub fn library_call_syscall(
request: LibraryCallRequest,
vm: &mut VirtualMachine,
Expand Down Expand Up @@ -196,7 +192,6 @@ pub fn library_call_syscall(
}

// blockifier/src/execution/syscalls/mod.rs:157 (call_contract)
#[expect(clippy::result_large_err)]
pub fn call_contract_syscall(
request: CallContractRequest,
vm: &mut VirtualMachine,
Expand Down Expand Up @@ -389,7 +384,7 @@ fn meta_tx_v0(
Ok(retdata_segment)
}

#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
#[expect(clippy::needless_pass_by_value)]
pub fn get_block_hash_syscall(
request: GetBlockHashRequest,
_vm: &mut VirtualMachine,
Expand All @@ -409,7 +404,7 @@ pub fn get_block_hash_syscall(
Ok(GetBlockHashResponse { block_hash })
}

#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
#[expect(clippy::needless_pass_by_value)]
pub fn storage_read(
request: StorageReadRequest,
_vm: &mut VirtualMachine,
Expand All @@ -434,7 +429,7 @@ pub fn storage_read(
Ok(StorageReadResponse { value })
}

#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
#[expect(clippy::needless_pass_by_value)]
pub fn storage_write(
request: StorageWriteRequest,
_vm: &mut VirtualMachine,
Expand Down
Loading
Loading