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

[Cairo 1] Filter implicit arguments from return value #1775

Merged
merged 6 commits into from
May 28, 2024
Merged

[Cairo 1] Filter implicit arguments from return value #1775

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0456870
Filter implicit arguments from return value
fmoletta May 24, 2024
20834d8
Fix logic
fmoletta May 24, 2024
8578fed
Fix logic
fmoletta May 24, 2024
c117df5
Add CHANGELOG entry
fmoletta May 24, 2024
ddd3fba
Update cairo1-run/src/cairo_run.rs
fmoletta May 27, 2024
5660763
fmt
fmoletta May 28, 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
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

#### Upcoming Changes

* feat: Filter implicit arguments from return value in cairo1-run crate [#1775](https://github.com/lambdaclass/cairo-vm/pull/1775)

* feat(BREAKING): Serialize inputs into output segment in cairo1-run crate:
* Checks that only `Array<Felt252>` can be received by the program main function when running with with either `--proof_mode` or `--append_return_values`.
* Copies the input value to the output segment right after the output in the format `[array_len, arr[0], arr[1],.., arr[n]]`.
Expand Down
34 changes: 24 additions & 10 deletions cairo1-run/src/cairo_run.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,16 @@ pub fn cairo_run_program(
let initial_gas = 9999999999999_usize;

// Fetch return type data
let return_type_id = main_func.signature.ret_types.last();
let return_type_id = match main_func.signature.ret_types.last() {
// We need to check if the last return type is indeed the function's return value and not an implicit return value
return_type @ Some(concrete_ty)
if get_info(&sierra_program_registry, concrete_ty)
.is_some_and(|info| !is_implicit_generic_id(&info.long_id.generic_id)) =>
{
return_type
}
_ => None,
};

if (cairo_run_config.proof_mode || cairo_run_config.append_return_values)
&& !check_only_array_felt_input_type(
Expand Down Expand Up @@ -862,15 +871,7 @@ fn check_only_array_felt_input_type(
.filter(|ty| {
let info = get_info(sierra_program_registry, ty).unwrap();
let generic_ty = &info.long_id.generic_id;
!(generic_ty != &SegmentArenaType::ID
|| generic_ty == &GasBuiltinType::ID
|| generic_ty == &BitwiseType::ID
|| generic_ty == &EcOpType::ID
|| generic_ty == &PedersenType::ID
|| generic_ty == &PoseidonType::ID
|| generic_ty == &RangeCheckType::ID
|| generic_ty == &SegmentArenaType::ID
|| generic_ty == &SystemType::ID)
!is_implicit_generic_id(generic_ty)
})
.collect_vec();
if arg_types.is_empty() {
Expand All @@ -885,6 +886,19 @@ fn check_only_array_felt_input_type(
false
}
}

// Returns true if the generic id corresponds to an implicit argument (aka a builtin, gas, or system type)
fn is_implicit_generic_id(generic_ty: &GenericTypeId) -> bool {
generic_ty == &SegmentArenaType::ID
|| generic_ty == &GasBuiltinType::ID
|| generic_ty == &BitwiseType::ID
|| generic_ty == &EcOpType::ID
|| generic_ty == &PedersenType::ID
|| generic_ty == &PoseidonType::ID
|| generic_ty == &RangeCheckType::ID
|| generic_ty == &SegmentArenaType::ID
|| generic_ty == &SystemType::ID
}
// Checks that the return type is either an Array<Felt252> or a PanicResult<Array<Felt252>> type
fn check_only_array_felt_return_type(
return_type_id: Option<&ConcreteTypeId>,
Expand Down
Loading