From 80c2f174298b8013301458de2e9ed9676f804b84 Mon Sep 17 00:00:00 2001 From: ilyalesokhin-starkware Date: Wed, 19 Jun 2024 14:36:37 +0300 Subject: [PATCH] Resolve types in get_implicit_precedence. (#5827) --- corelib/src/lib.cairo | 3 -- .../src/diagnostic_test_data/not_found | 2 +- .../src/items/extern_function.rs | 3 +- .../src/items/free_function.rs | 3 +- .../src/items/function_with_body.rs | 25 +++++---- crates/cairo-lang-semantic/src/items/imp.rs | 8 +-- crates/cairo-lang-semantic/src/items/trt.rs | 5 +- .../cairo-lang-starknet/src/plugin/consts.rs | 8 +-- .../plugin_test_data/components/component | 4 +- .../plugin_test_data/components/embeddable_as | 2 +- .../plugin_test_data/contracts/contract | 8 +-- .../plugin_test_data/contracts/diagnostics | 54 +++++++++---------- .../plugin_test_data/contracts/embedded_impl | 10 ++-- .../plugin_test_data/contracts/hello_starknet | 8 +-- .../plugin_test_data/contracts/interfaces | 8 +-- .../plugin_test_data/contracts/l1_handler | 4 +- .../plugin_test_data/contracts/mintable | 8 +-- .../contracts/multi_component | 8 +-- .../contracts/new_storage_interface | 12 ++--- .../plugin_test_data/contracts/ownable_erc20 | 4 +- .../plugin_test_data/contracts/raw_output | 4 +- .../contracts/upgradable_counter | 16 +++--- .../plugin_test_data/contracts/with_component | 6 +-- .../contracts/with_component_diagnostics | 6 +-- .../plugin_test_data/contracts/with_erc20 | 4 +- .../plugin_test_data/contracts/with_ownable | 12 ++--- 26 files changed, 119 insertions(+), 116 deletions(-) diff --git a/corelib/src/lib.cairo b/corelib/src/lib.cairo index dd799c7d5f6..a5d8d599602 100644 --- a/corelib/src/lib.cairo +++ b/corelib/src/lib.cairo @@ -103,9 +103,6 @@ pub mod boolean; pub mod circuit; -/// TODO(ilya): Remove the following once implicits lookup is fixed. -use circuit::{AddMod, MulMod, RangeCheck96}; - /// General purpose implicits. pub extern type RangeCheck; pub extern type SegmentArena; diff --git a/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found b/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found index ba851915323..3128780a6a1 100644 --- a/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found +++ b/crates/cairo-lang-semantic/src/diagnostic_test_data/not_found @@ -63,7 +63,7 @@ fn foo() {} //! > function_body //! > expected_diagnostics -error: Unknown type. +error: Type not found. --> lib.cairo:1:23 #[implicit_precedence(MissingBuiltin1, MissingBuiltin2)] ^*************^ diff --git a/crates/cairo-lang-semantic/src/items/extern_function.rs b/crates/cairo-lang-semantic/src/items/extern_function.rs index d4580f65099..900ebd71e19 100644 --- a/crates/cairo-lang-semantic/src/items/extern_function.rs +++ b/crates/cairo-lang-semantic/src/items/extern_function.rs @@ -186,7 +186,8 @@ pub fn priv_extern_function_declaration_data( } } - let (_, implicit_precedence_attr) = get_implicit_precedence(db, &mut diagnostics, &attributes); + let (_, implicit_precedence_attr) = + get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes); if let Some(attr) = implicit_precedence_attr { diagnostics .report(attr.stable_ptr.untyped(), ImplicitPrecedenceAttrForExternFunctionNotAllowed); diff --git a/crates/cairo-lang-semantic/src/items/free_function.rs b/crates/cairo-lang-semantic/src/items/free_function.rs index 0046617960d..4ba21eeede9 100644 --- a/crates/cairo-lang-semantic/src/items/free_function.rs +++ b/crates/cairo-lang-semantic/src/items/free_function.rs @@ -164,7 +164,8 @@ pub fn priv_free_function_declaration_data( forbid_inline_always_with_impl_generic_param(&mut diagnostics, &generic_params, &inline_config); - let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes); + let (implicit_precedence, _) = + get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes); // Check fully resolved. let inference = &mut resolver.inference(); diff --git a/crates/cairo-lang-semantic/src/items/function_with_body.rs b/crates/cairo-lang-semantic/src/items/function_with_body.rs index 68a7cdbd6a5..ba7c5552a80 100644 --- a/crates/cairo-lang-semantic/src/items/function_with_body.rs +++ b/crates/cairo-lang-semantic/src/items/function_with_body.rs @@ -5,18 +5,19 @@ use cairo_lang_diagnostics::{DiagnosticAdded, Diagnostics, Maybe, ToMaybe}; use cairo_lang_proc_macros::DebugWithDb; use cairo_lang_syntax::attribute::consts::{IMPLICIT_PRECEDENCE_ATTR, INLINE_ATTR}; use cairo_lang_syntax::attribute::structured::{Attribute, AttributeArg, AttributeArgVariant}; -use cairo_lang_syntax::node::{ast, TypedStablePtr, TypedSyntaxNode}; +use cairo_lang_syntax::node::{ast, TypedStablePtr}; use cairo_lang_utils::unordered_hash_map::UnorderedHashMap; -use cairo_lang_utils::Upcast; +use cairo_lang_utils::{try_extract_matches, Upcast}; use id_arena::Arena; use itertools::Itertools; use super::functions::InlineConfiguration; -use crate::corelib::try_get_core_ty_by_name; use crate::db::SemanticGroup; -use crate::diagnostic::{SemanticDiagnosticKind, SemanticDiagnostics, SemanticDiagnosticsBuilder}; +use crate::diagnostic::{ + NotFoundItemType, SemanticDiagnosticKind, SemanticDiagnostics, SemanticDiagnosticsBuilder, +}; use crate::items::functions::ImplicitPrecedence; -use crate::resolve::ResolverData; +use crate::resolve::{ResolvedConcreteItem, Resolver, ResolverData}; use crate::{semantic, ExprId, PatternId, SemanticDiagnostic, TypeId}; // === Declaration === @@ -314,12 +315,10 @@ pub fn get_inline_config( /// If there is no implicit precedence influencing attribute, then this function returns /// [ImplicitPrecedence::UNSPECIFIED]. pub fn get_implicit_precedence<'a>( - db: &dyn SemanticGroup, diagnostics: &mut SemanticDiagnostics, + resolver: &mut Resolver<'_>, attributes: &'a [Attribute], ) -> (ImplicitPrecedence, Option<&'a Attribute>) { - let syntax_db = db.upcast(); - let mut attributes = attributes.iter().rev().filter(|attr| attr.id == IMPLICIT_PRECEDENCE_ATTR); // Pick the last attribute if any. @@ -345,9 +344,13 @@ pub fn get_implicit_precedence<'a>( )); }; - let type_name = path.as_syntax_node().get_text_without_trivia(syntax_db); - try_get_core_ty_by_name(db, type_name.into(), vec![]) - .map_err(|kind| diagnostics.report(value, kind)) + resolver.resolve_concrete_path(diagnostics, path, NotFoundItemType::Type).and_then( + |resolved_item: crate::resolve::ResolvedConcreteItem| { + try_extract_matches!(resolved_item, ResolvedConcreteItem::Type).ok_or_else( + || diagnostics.report(value, SemanticDiagnosticKind::UnknownType), + ) + }, + ) } _ => Err(diagnostics diff --git a/crates/cairo-lang-semantic/src/items/imp.rs b/crates/cairo-lang-semantic/src/items/imp.rs index 113421dd84e..18bd9b300a8 100644 --- a/crates/cairo-lang-semantic/src/items/imp.rs +++ b/crates/cairo-lang-semantic/src/items/imp.rs @@ -2038,6 +2038,10 @@ pub fn priv_impl_function_declaration_data( &mut environment, ); + let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db); + let (implicit_precedence, _) = + get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes); + let inference = &mut resolver.inference(); // Check fully resolved. inference.finalize(&mut diagnostics, function_syntax.stable_ptr().untyped()); @@ -2054,14 +2058,10 @@ pub fn priv_impl_function_declaration_data( }, ); - let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db); - let inline_config = get_inline_config(db, &mut diagnostics, &attributes)?; forbid_inline_always_with_impl_generic_param(&mut diagnostics, &generic_params, &inline_config); - let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes); - let signature = inference.rewrite(signature).no_err(); let generic_params = inference.rewrite(generic_params).no_err(); diff --git a/crates/cairo-lang-semantic/src/items/trt.rs b/crates/cairo-lang-semantic/src/items/trt.rs index 21456a60a6a..496971ae758 100644 --- a/crates/cairo-lang-semantic/src/items/trt.rs +++ b/crates/cairo-lang-semantic/src/items/trt.rs @@ -1160,10 +1160,11 @@ pub fn priv_trait_function_declaration_data( ); let attributes = function_syntax.attributes(syntax_db).structurize(syntax_db); - let resolver_data = Arc::new(resolver.data); let inline_config = get_inline_config(db, &mut diagnostics, &attributes)?; - let (implicit_precedence, _) = get_implicit_precedence(db, &mut diagnostics, &attributes); + let (implicit_precedence, _) = + get_implicit_precedence(&mut diagnostics, &mut resolver, &attributes); + let resolver_data = Arc::new(resolver.data); Ok(FunctionDeclarationData { diagnostics: diagnostics.build(), diff --git a/crates/cairo-lang-starknet/src/plugin/consts.rs b/crates/cairo-lang-starknet/src/plugin/consts.rs index 24eae8e4542..99a18c887d6 100644 --- a/crates/cairo-lang-starknet/src/plugin/consts.rs +++ b/crates/cairo-lang-starknet/src/plugin/consts.rs @@ -65,12 +65,12 @@ pub(super) const IMPLICIT_PRECEDENCE: &[&str] = &[ "Pedersen", "RangeCheck", "Bitwise", - "EcOp", + "core::ec::EcOp", "Poseidon", "SegmentArena", - "RangeCheck96", - "AddMod", - "MulMod", + "core::circuit::RangeCheck96", + "core::circuit::AddMod", + "core::circuit::MulMod", "GasBuiltin", "System", ]; diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component index 223f84f6563..a8e31fc043a 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/component @@ -714,7 +714,7 @@ pub trait UnsafeNewContractStateTraitForMyImpl< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__MyImpl__get , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -737,7 +737,7 @@ fn __wrapper__MyImpl__get core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__MyImpl__set , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as index bae60db24e1..404618a0151 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/components/embeddable_as @@ -446,7 +446,7 @@ pub trait UnsafeNewContractStateTraitForMyImpl< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__MyImpl__do_nothing, +Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract index 2aa612918d4..a94cdf245d4 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/contract @@ -135,7 +135,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x2cd967636a47442d438bb2596f3c9848f0a831f916f4bb50d807e6eb90df576; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_something(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -162,7 +162,7 @@ fn __wrapper__get_something(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__set_something(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -188,7 +188,7 @@ fn __wrapper__set_something(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__l1_handler_func(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -217,7 +217,7 @@ fn __wrapper__l1_handler_func(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__test_serde(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/diagnostics index 753e5a6ea0d..6b0099c568c 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/diagnostics +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/diagnostics @@ -196,7 +196,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x3bd690d1a73da0d8c43f46ecc3a006978d8343a075e91a1c7a24529e7d244a; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__invalid_constructor_name(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -340,7 +340,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x547f368ac55821b57d7da42588a2985edb69dd87af9e9c16e740d6e14b2420; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo_v0(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -361,7 +361,7 @@ fn __wrapper__foo_v0(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -382,7 +382,7 @@ fn __wrapper__foo(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo_v1(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -537,7 +537,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x16fce813e4d7f676441c2cffa36b5101b7e75cb787a8aec7259094fdbacb80e; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -676,7 +676,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x2c31752790f50b7f25195fc7cc9dcc1234d7af736c5ed771c69ddc8bb9fd8d4; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -813,7 +813,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x2bcbd7e08add1bbb62c174729940be27dbe922f83afd842f02af5355af726a1; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -978,7 +978,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x37db5b411e79068f08f0832de46108b618c2f188115ac652f78be4f6dfcdeb4; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1134,7 +1134,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x291a42fae50c99636dc1d6bc0c4e28fdb0e21f47c26aa0d5e22c21d993823d8; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper____validate__(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1152,7 +1152,7 @@ fn __wrapper____validate__(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper____validate_declare__(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1170,7 +1170,7 @@ fn __wrapper____validate_declare__(mut data: Span::) -> Span:: core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper____validate_deploy__(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1188,7 +1188,7 @@ fn __wrapper____validate_deploy__(mut data: Span::) -> Span:: core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper____execute__(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2424,7 +2424,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0xb2b80f78cee80a1a53222a998e318822f6d9d701bdc8037948c5964158503c; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__Impl2__foo_external1(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2442,7 +2442,7 @@ fn __wrapper__Impl2__foo_external1(mut data: Span::) -> Span:: core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__Impl2__foo_l1_handler1(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2460,7 +2460,7 @@ fn __wrapper__Impl2__foo_l1_handler1(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2478,7 +2478,7 @@ fn __wrapper__Impl2__foo_constructor1(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2496,7 +2496,7 @@ fn __wrapper__Impl1__foo_external2(mut data: Span::) -> Span:: core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__Impl1__foo_l1_handler2(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2514,7 +2514,7 @@ fn __wrapper__Impl1__foo_l1_handler2(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -4417,7 +4417,7 @@ trait UnsafeNewContractStateTraitForEmbeddableImpl< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__EmbeddableImpl__foo1, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -4435,7 +4435,7 @@ fn __wrapper__EmbeddableImpl__foo1, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -4453,7 +4453,7 @@ fn __wrapper__EmbeddableImpl__foo2, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -5319,7 +5319,7 @@ pub trait UnsafeNewContractStateTraitForMyEmbeddableImpl< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__MyEmbeddableImpl__foo1 , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyEmbeddableImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -5338,7 +5338,7 @@ fn __wrapper__MyEmbeddableImpl__foo1 , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyEmbeddableImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -5357,7 +5357,7 @@ fn __wrapper__MyEmbeddableImpl__foo2 , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForMyEmbeddableImpl>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -6482,7 +6482,7 @@ pub trait UnsafeNewContractStateTraitForComp3< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__Comp3__foo3, impl Comp2: super::component2::HasComponent, @@ -6504,7 +6504,7 @@ fn __wrapper__Comp3__foo3, impl Comp2: super::component2::HasComponent, @@ -7285,7 +7285,7 @@ pub trait UnsafeNewContractStateTraitForComp3< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__Comp3__foo3, impl Comp2: super::component2::HasComponent, diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/embedded_impl b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/embedded_impl index 0109a35f40e..5790929fd4f 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/embedded_impl +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/embedded_impl @@ -255,7 +255,7 @@ trait UnsafeNewContractStateTraitForOutsideImpl< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OutsideImpl__ret_3, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -274,7 +274,7 @@ fn __wrapper__OutsideImpl__ret_3, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -849,7 +849,7 @@ trait UnsafeNewContractStateTraitForOutsideImplWithDestruct< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OutsideImplWithDestruct__ret_3,impl UnsafeNewContractState: UnsafeNewContractStateTraitForOutsideImplWithDestruct, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1004,7 +1004,7 @@ trait UnsafeNewContractStateTraitForOutsideImplWithPanicDestruct< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OutsideImplWithPanicDestruct__ret_5, impl UnsafeNewContractState: UnsafeNewContractStateTraitForOutsideImplWithPanicDestruct, impl TContractStateDrop: Drop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1755,7 +1755,7 @@ trait UnsafeNewContractStateTraitForOutsideImplWithDrop< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OutsideImplWithDrop__ret_8,impl UnsafeNewContractState: UnsafeNewContractStateTraitForOutsideImplWithDrop>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/hello_starknet b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/hello_starknet index f857b031f96..07453c104a9 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/hello_starknet +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/hello_starknet @@ -62,7 +62,7 @@ use starknet::storage::{ StorageLegacyMapMemberAccessTrait, StorageMemberAccessTrait, }; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -83,7 +83,7 @@ fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__get_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -531,7 +531,7 @@ use starknet::storage::{ StorageLegacyMapMemberAccessTrait, StorageMemberAccessTrait, }; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -552,7 +552,7 @@ fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__get_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/interfaces b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/interfaces index 043e8b64e0a..2b638098218 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/interfaces +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/interfaces @@ -805,7 +805,7 @@ pub trait UnsafeNewContractStateTraitForI1I1< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__I1I1__foo , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForI1I1>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -848,7 +848,7 @@ pub trait UnsafeNewContractStateTraitForI1I2< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__I1I2__foo , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForI1I2>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -891,7 +891,7 @@ pub trait UnsafeNewContractStateTraitForI2I< fn unsafe_new_contract_state() -> TContractState; } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__I2I__foo , impl TContractStateDrop: Drop, impl UnsafeNewContractState: UnsafeNewContractStateTraitForI2I>(mut data: Span::) -> Span:: { core::internal::require_implicit::(); @@ -971,7 +971,7 @@ impl ContractStateI2I of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__foo(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/l1_handler b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/l1_handler index 39cd53d2a88..0729978cbb6 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/l1_handler +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/l1_handler @@ -62,7 +62,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x32a1956d182625bfe7f9834635d01441624366b326c190ecbf557e699f94b76; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__good_l1_handler(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -87,7 +87,7 @@ fn __wrapper__good_l1_handler(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__good_l1_handler_ignored(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/mintable b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/mintable index 603945c2aee..27c579900b9 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/mintable +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/mintable @@ -104,7 +104,7 @@ impl ContractStateMint of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -145,7 +145,7 @@ fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -696,7 +696,7 @@ impl ContractStateMint of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -737,7 +737,7 @@ fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/multi_component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/multi_component index 5f5610e28b7..cae760f5a24 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/multi_component +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/multi_component @@ -117,7 +117,7 @@ impl ContractStateUpgradableImpl of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -158,7 +158,7 @@ fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -758,7 +758,7 @@ impl ContractStateUpgradableImpl of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -799,7 +799,7 @@ fn __wrapper__ImplCtor__constructor(mut data: Span::) -> Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/new_storage_interface b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/new_storage_interface index 84b9dac1d20..a8f32a3212e 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/new_storage_interface +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/new_storage_interface @@ -967,7 +967,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x33d804d2d34b3a3b1cad31ad6a6cb1e50a0d3e8e1bf3f344dbeafa8db462c05; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -988,7 +988,7 @@ fn __wrapper__HelloStarknetImpl__increase_balance(mut data: Span::) -> core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__get_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1007,7 +1007,7 @@ fn __wrapper__HelloStarknetImpl__get_balance(mut data: Span::) -> Span: core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__get_user_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1029,7 +1029,7 @@ fn __wrapper__HelloStarknetImpl__get_user_balance(mut data: Span::) -> core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__HelloStarknetImpl__get_user_balance_subbalance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1055,7 +1055,7 @@ fn __wrapper__HelloStarknetImpl__get_user_balance_subbalance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1074,7 +1074,7 @@ fn __wrapper__HelloStarknetImpl__get_balance_pair_balance1(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/ownable_erc20 b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/ownable_erc20 index 2371ada75d7..1490005e273 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/ownable_erc20 +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/ownable_erc20 @@ -79,7 +79,7 @@ impl ContractStateTransfer of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableERC20Impl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -318,7 +318,7 @@ impl ContractStateTransfer of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableERC20Impl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/raw_output b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/raw_output index 2c3806972a4..3377e113caf 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/raw_output +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/raw_output @@ -74,7 +74,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x2a1a1bba6d0c773fab786191dfb5454782701d3308f2d60e686ba861815e841; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__test_raw_output(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -88,7 +88,7 @@ fn __wrapper__test_raw_output(mut data: Span::) -> Span:: { test_raw_output(ref contract_state, ) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__test_raw_output_with_spaces(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/upgradable_counter b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/upgradable_counter index 10bcf403f42..00085452e00 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/upgradable_counter +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/upgradable_counter @@ -106,7 +106,7 @@ use starknet::storage::{ StorageLegacyMapMemberAccessTrait, StorageMemberAccessTrait, }; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -127,7 +127,7 @@ fn __wrapper__constructor(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__get_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -146,7 +146,7 @@ fn __wrapper__CounterContract__get_counter(mut data: Span::) -> Span::< core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__increase_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -167,7 +167,7 @@ fn __wrapper__CounterContract__increase_counter(mut data: Span::) -> Sp core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__decrease_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -847,7 +847,7 @@ use starknet::storage::{ StorageLegacyMapMemberAccessTrait, StorageMemberAccessTrait, }; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -868,7 +868,7 @@ fn __wrapper__constructor(mut data: Span::) -> Span:: { core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__get_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -887,7 +887,7 @@ fn __wrapper__CounterContract__get_counter(mut data: Span::) -> Span::< core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__increase_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -908,7 +908,7 @@ fn __wrapper__CounterContract__increase_counter(mut data: Span::) -> Sp core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CounterContract__decrease_counter(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component index 512812bba17..ee92ba8ba64 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component @@ -206,7 +206,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x13b620794e5b3dc7cc2033d0b9381b35d5d10d1f0a43fe1f5e1d495f793ebab; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_data(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -600,7 +600,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x20768e618c747c9e742de0446492553ae65eafb837da660ed6516e1ed6b52fc; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_sum(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -1032,7 +1032,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x20768e618c747c9e742de0446492553ae65eafb837da660ed6516e1ed6b52fc; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_sum(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component_diagnostics b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component_diagnostics index 685c0385e4e..37d475ae565 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component_diagnostics +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_component_diagnostics @@ -1999,7 +1999,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x8f9d2a9bd3a3fe28e42c16030ed25a2756a86a13d4297597e43683c3df9a02; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_data(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2309,7 +2309,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x150d2e1961908098174a1d0101315691e91ab91682760b04003683fab54f03e; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_data(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -2651,7 +2651,7 @@ use starknet::storage::{ #[cfg(target: 'test')] pub const TEST_CLASS_HASH: felt252 = 0x3aa40c01c626d72d07c8dbda3c92460e7f71827931a5429b93fc69603190369; -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__get_sum(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_erc20 b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_erc20 index 18c56b83bd7..e7cc43a841a 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_erc20 +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_erc20 @@ -64,7 +64,7 @@ impl ContractStateIERC20 of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CtorImpl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -245,7 +245,7 @@ impl ContractStateIERC20 of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__CtorImpl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); diff --git a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_ownable b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_ownable index 64de701641e..73b94322c54 100644 --- a/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_ownable +++ b/crates/cairo-lang-starknet/src/plugin/plugin_test_data/contracts/with_ownable @@ -87,7 +87,7 @@ impl ContractStateTransfer of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -112,7 +112,7 @@ fn __wrapper__OwnableBalanceImpl__constructor(mut data: Span::) -> Span core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__get_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -131,7 +131,7 @@ fn __wrapper__OwnableBalanceImpl__get_balance(mut data: Span::) -> Span core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__set_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -319,7 +319,7 @@ impl ContractStateTransfer of unsafe_new_contract_state() } } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__constructor(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -344,7 +344,7 @@ fn __wrapper__OwnableBalanceImpl__constructor(mut data: Span::) -> Span core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__get_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking(); @@ -363,7 +363,7 @@ fn __wrapper__OwnableBalanceImpl__get_balance(mut data: Span::) -> Span core::array::ArrayTrait::span(@arr) } -#[implicit_precedence(Pedersen, RangeCheck, Bitwise, EcOp, Poseidon, SegmentArena, RangeCheck96, AddMod, MulMod, GasBuiltin, System)] +#[implicit_precedence(Pedersen, RangeCheck, Bitwise, core::ec::EcOp, Poseidon, SegmentArena, core::circuit::RangeCheck96, core::circuit::AddMod, core::circuit::MulMod, GasBuiltin, System)] fn __wrapper__OwnableBalanceImpl__set_balance(mut data: Span::) -> Span:: { core::internal::require_implicit::(); core::internal::revoke_ap_tracking();