Skip to content

Commit 31fe861

Browse files
committed
Bump blockifier
1 parent 70b32aa commit 31fe861

File tree

18 files changed

+123
-71
lines changed

18 files changed

+123
-71
lines changed

Cargo.lock

Lines changed: 79 additions & 18 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ license-file = "LICENSE"
3535

3636
[workspace.dependencies]
3737
# TODO(#3770) Use blockifier directly
38-
blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0", features = ["testing", "tracing", "node_api"] }
38+
blockifier = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "v0.16.0-rc.1", features = ["testing", "tracing", "node_api"] }
3939
bigdecimal = "0.4.8"
4040
# TODO(#3770) Use starknet_api directly
41-
starknet_api = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "main-v0.14.0" }
41+
starknet_api = { git = "https://github.com/software-mansion-labs/sequencer.git", branch = "v0.16.0-rc.1" }
4242
cairo-native = "0.6.2"
4343
cairo-lang-casm = { version = "=2.12.3", features = ["serde"] }
4444
cairo-lang-sierra = "=2.12.3"
@@ -56,7 +56,7 @@ cairo-vm = "2.5.0"
5656
cairo-annotations = { version = "0.6.1", features = ["cairo-lang"] }
5757
dirs = "6.0.0"
5858
dialoguer = "0.11.0"
59-
starknet-types-core = { version = "0.2.2", features = ["hash", "prime-bigint"] }
59+
starknet-types-core = { version = "0.2.4", features = ["hash", "prime-bigint"] }
6060
anyhow = "1.0.100"
6161
assert_fs = "1.1.2"
6262
camino = { version = "1.2.1", features = ["serde1"] }

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cairo1_execution.rs

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ use cairo_vm::{
2727
use runtime::{ExtendedRuntime, StarknetRuntime};
2828

2929
// blockifier/src/execution/cairo1_execution.rs:48 (execute_entry_point_call)
30-
#[expect(clippy::result_large_err)]
3130
pub(crate) fn execute_entry_point_call_cairo1(
3231
call: ExecutableCallEntryPoint,
3332
compiled_class_v1: &CompiledClassV1,
@@ -145,7 +144,6 @@ pub(crate) fn execute_entry_point_call_cairo1(
145144
}
146145

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

162-
runner.run_from_entrypoint(
163-
entry_point.pc(),
164-
&args,
165-
verify_secure,
166-
Some(program_segment_size),
167-
hint_processor,
168-
)?;
160+
runner
161+
.run_from_entrypoint(
162+
entry_point.pc(),
163+
&args,
164+
verify_secure,
165+
Some(program_segment_size),
166+
hint_processor,
167+
)
168+
.map_err(Box::new)?;
169169

170170
// region: Modified blockifier code
171171
// Relocate trace to then collect it
172-
runner.relocate(true).map_err(CairoRunError::from)?;
172+
runner
173+
.relocate(true)
174+
.map_err(CairoRunError::from)
175+
.map_err(Box::new)?;
173176
// endregion
174177

175178
Ok(())

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/calls.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ use starknet_types_core::felt::Felt;
2020
use super::entry_point::{ExecuteCallEntryPointExtraOptions, execute_call_entry_point};
2121

2222
// blockifier/src/execution/syscalls/hint_processor.rs:541 (execute_inner_call)
23-
#[expect(clippy::result_large_err)]
2423
pub fn execute_inner_call(
2524
call: &mut CallEntryPoint,
2625
vm: &mut VirtualMachine,
@@ -80,7 +79,7 @@ pub fn execute_inner_call(
8079
}
8180

8281
// blockifier/src/execution/syscalls/hint_processor.rs:577 (execute_library_call)
83-
#[expect(clippy::too_many_arguments, clippy::result_large_err)]
82+
#[expect(clippy::too_many_arguments)]
8483
pub fn execute_library_call(
8584
syscall_handler: &mut SyscallHintProcessor<'_>,
8685
cheatnet_state: &mut CheatnetState,

crates/cheatnet/src/runtime_extensions/call_to_blockifier_runtime_extension/execution/cheated_syscalls.rs

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ use starknet_api::{
4747
};
4848
use std::sync::Arc;
4949

50-
#[expect(clippy::result_large_err)]
5150
pub fn get_execution_info_syscall(
5251
_request: EmptyRequest,
5352
vm: &mut VirtualMachine,
@@ -67,7 +66,6 @@ pub fn get_execution_info_syscall(
6766
}
6867

6968
// blockifier/src/execution/syscalls/mod.rs:222 (deploy_syscall)
70-
#[expect(clippy::result_large_err)]
7169
pub fn deploy_syscall(
7270
request: DeployRequest,
7371
vm: &mut VirtualMachine,
@@ -130,7 +128,6 @@ pub fn deploy_syscall(
130128
}
131129

132130
// blockifier/src/execution/execution_utils.rs:217 (execute_deployment)
133-
#[expect(clippy::result_large_err)]
134131
pub fn execute_deployment(
135132
state: &mut dyn State,
136133
cheatnet_state: &mut CheatnetState,
@@ -162,7 +159,6 @@ pub fn execute_deployment(
162159
}
163160

164161
// blockifier/src/execution/syscalls/mod.rs:407 (library_call)
165-
#[expect(clippy::result_large_err)]
166162
pub fn library_call_syscall(
167163
request: LibraryCallRequest,
168164
vm: &mut VirtualMachine,
@@ -196,7 +192,6 @@ pub fn library_call_syscall(
196192
}
197193

198194
// blockifier/src/execution/syscalls/mod.rs:157 (call_contract)
199-
#[expect(clippy::result_large_err)]
200195
pub fn call_contract_syscall(
201196
request: CallContractRequest,
202197
vm: &mut VirtualMachine,
@@ -389,7 +384,7 @@ fn meta_tx_v0(
389384
Ok(retdata_segment)
390385
}
391386

392-
#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
387+
#[expect(clippy::needless_pass_by_value)]
393388
pub fn get_block_hash_syscall(
394389
request: GetBlockHashRequest,
395390
_vm: &mut VirtualMachine,
@@ -409,7 +404,7 @@ pub fn get_block_hash_syscall(
409404
Ok(GetBlockHashResponse { block_hash })
410405
}
411406

412-
#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
407+
#[expect(clippy::needless_pass_by_value)]
413408
pub fn storage_read(
414409
request: StorageReadRequest,
415410
_vm: &mut VirtualMachine,
@@ -434,7 +429,7 @@ pub fn storage_read(
434429
Ok(StorageReadResponse { value })
435430
}
436431

437-
#[expect(clippy::needless_pass_by_value, clippy::result_large_err)]
432+
#[expect(clippy::needless_pass_by_value)]
438433
pub fn storage_write(
439434
request: StorageWriteRequest,
440435
_vm: &mut VirtualMachine,

0 commit comments

Comments
 (0)