Skip to content
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

Jump to bottom

wip: FixingBlock 174731 - ids.a Expected as Integer #431

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
+5,129 −6
Open

wip: FixingBlock 174731 - ids.a Expected as Integer #431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
20387c1
test: add a reproduction of the bug encountered
whichqua Nov 8, 2024
eb072f3
fix: add required parts to reproduce the specific part of the issue
whichqua Nov 8, 2024
1c33aae
Merge remote-tracking branch 'origin/main' into gm/fix-id-a-not-an-in…
whichqua Nov 13, 2024
e5c21dc
fix: use a ptr instead of relocatable with deprecated_tx_info
whichqua Nov 14, 2024
03b6108
lint: cargo fmt
whichqua Nov 14, 2024
2ad9327
fix: tests to use ptr instead of relocatable
whichqua Nov 14, 2024
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
1 change: 1 addition & 0 deletions crates/bin/prove_block/tests/prove_block.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ const DEFAULT_COMPILED_OS: &[u8] = include_bytes!("../../../../build/os_latest.j
#[case::timestamp_rounding_2(167815)]
#[case::missing_constant_max_high(164684)]
#[case::retdata_not_a_relocatable(160033)]
#[case::get_tx_info_using_ptr_over_relocatable(243766)]
#[ignore = "Requires a running Pathfinder node"]
#[tokio::test(flavor = "multi_thread")]
async fn test_prove_selected_blocks(#[case] block_number: u64) {
Expand Down
3 changes: 1 addition & 2 deletions crates/starknet-os/src/hints/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -626,8 +626,7 @@ pub async fn start_tx_async<PCS>(
where
PCS: PerContractStorage + 'static,
{
let deprecated_tx_info_ptr =
get_relocatable_from_var_name(vars::ids::DEPRECATED_TX_INFO, vm, ids_data, ap_tracking)?;
let deprecated_tx_info_ptr = get_ptr_from_var_name(vars::ids::DEPRECATED_TX_INFO, vm, ids_data, ap_tracking)?;
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image


let execution_helper = exec_scopes.get::<ExecutionHelperWrapper<PCS>>(vars::scopes::EXECUTION_HELPER)?;
execution_helper.start_tx(Some(deprecated_tx_info_ptr)).await;
Expand Down
11 changes: 8 additions & 3 deletions crates/starknet-os/src/hints/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,9 @@ pub mod tests {
vm.add_memory_segment();
vm.add_memory_segment();

let ids_data = ids_data![vars::ids::DEPRECATED_TX_INFO];
let mut ids_data = HashMap::new();
ids_data.insert(vars::ids::DEPRECATED_TX_INFO.to_owned(), HintReference::new(0, 0, false, false));

let ap_tracking = ApTracking::default();

let mut exec_scopes = ExecutionScopes::new();
Expand Down Expand Up @@ -191,7 +193,8 @@ pub mod tests {
vm.add_memory_segment();
vm.add_memory_segment();

let ids_data = ids_data![vars::ids::DEPRECATED_TX_INFO];
let mut ids_data = HashMap::new();
ids_data.insert(vars::ids::DEPRECATED_TX_INFO.to_owned(), HintReference::new(0, 0, false, false));
let ap_tracking = ApTracking::default();

let mut exec_scopes = ExecutionScopes::new();
Expand Down Expand Up @@ -231,7 +234,9 @@ pub mod tests {
vm.add_memory_segment();
vm.add_memory_segment();

let ids_data = ids_data![vars::ids::DEPRECATED_TX_INFO];
let mut ids_data = HashMap::new();
ids_data.insert(vars::ids::DEPRECATED_TX_INFO.to_owned(), HintReference::new(0, 0, false, false));

let ap_tracking = ApTracking::default();

let mut exec_scopes = ExecutionScopes::new();
Expand Down
Loading
Loading