diff --git a/noir-projects/aztec-nr/aztec/src/context/interface.nr b/noir-projects/aztec-nr/aztec/src/context/interface.nr index b86969c7b5b..fd21ae78706 100644 --- a/noir-projects/aztec-nr/aztec/src/context/interface.nr +++ b/noir-projects/aztec-nr/aztec/src/context/interface.nr @@ -1,8 +1,4 @@ -use dep::protocol_types::{ - abis::function_selector::FunctionSelector, - address::{AztecAddress, EthAddress}, - header::Header, -}; +use dep::protocol_types::{abis::function_selector::FunctionSelector, address::{AztecAddress, EthAddress}, header::Header}; trait ContextInterface { fn push_new_note_hash(&mut self, note_hash: Field); @@ -14,4 +10,4 @@ trait ContextInterface { fn version(self) -> Field; fn selector(self) -> FunctionSelector; fn get_header(self) -> Header; -} \ No newline at end of file +} diff --git a/noir-projects/aztec-nr/aztec/src/deploy.nr b/noir-projects/aztec-nr/aztec/src/deploy.nr index 68b31aba325..6e8ee87a4a8 100644 --- a/noir-projects/aztec-nr/aztec/src/deploy.nr +++ b/noir-projects/aztec-nr/aztec/src/deploy.nr @@ -1,21 +1,16 @@ -use crate::{ - context::PrivateContext, - oracle::get_contract_instance::get_contract_instance, -}; +use crate::{context::PrivateContext, oracle::get_contract_instance::get_contract_instance}; -use dep::protocol_types::{ - address::AztecAddress, - abis::function_selector::FunctionSelector, - constants::DEPLOYER_CONTRACT_ADDRESS, -}; +use dep::protocol_types::{address::AztecAddress, abis::function_selector::FunctionSelector, constants::DEPLOYER_CONTRACT_ADDRESS}; // Calls `deploy` on the deployer contract to deploy a new instance. pub fn deploy_contract(context: &mut PrivateContext, target: AztecAddress) { let instance = get_contract_instance(target); - + let mut universal_deploy = false; - if ! instance.deployer.is_zero() { - assert(instance.deployer == context.this_address(), "Deployer address does not match current address"); + if !instance.deployer.is_zero() { + assert( + instance.deployer == context.this_address(), "Deployer address does not match current address" + ); universal_deploy = true; } @@ -31,8 +26,8 @@ pub fn deploy_contract(context: &mut PrivateContext, target: AztecAddress) { serialized_args[5] = universal_deploy as Field; let _call_result = context.call_private_function( - AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS), - FunctionSelector::from_field(0x883355ab), - serialized_args + AztecAddress::from_field(DEPLOYER_CONTRACT_ADDRESS), + FunctionSelector::from_field(0x883355ab), + serialized_args ); -} \ No newline at end of file +} diff --git a/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr b/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr index a199c0606d1..b047870a218 100644 --- a/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr +++ b/noir-projects/aztec-nr/aztec/src/history/nullifier_inclusion.nr @@ -2,7 +2,8 @@ use dep::std::merkle::compute_merkle_root; use dep::protocol_types::header::Header; use crate::{ - context::{PrivateContext, ContextInterface}, oracle::get_nullifier_membership_witness::get_nullifier_membership_witness, + context::{PrivateContext, ContextInterface}, + oracle::get_nullifier_membership_witness::get_nullifier_membership_witness, note::{utils::compute_siloed_nullifier, note_interface::NoteInterface} }; @@ -25,7 +26,10 @@ fn _nullifier_inclusion(nullifier: Field, header: Header) { // was included in the nullifier tree. } -pub fn prove_nullifier_inclusion(nullifier: Field, context: TContext) where TContext: ContextInterface { +pub fn prove_nullifier_inclusion( + nullifier: Field, + context: TContext +) where TContext: ContextInterface { _nullifier_inclusion(nullifier, context.get_header()); } diff --git a/noir-projects/aztec-nr/aztec/src/initializer.nr b/noir-projects/aztec-nr/aztec/src/initializer.nr index b33c49274cf..70858cfe8ab 100644 --- a/noir-projects/aztec-nr/aztec/src/initializer.nr +++ b/noir-projects/aztec-nr/aztec/src/initializer.nr @@ -3,28 +3,31 @@ use crate::context::{PrivateContext, PublicContext, ContextInterface}; use crate::history::nullifier_inclusion::prove_nullifier_inclusion; pub fn mark_as_initialized(context: &mut PrivateContext) { - let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context); - context.push_new_nullifier(init_nullifier, 0); + let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context); + context.push_new_nullifier(init_nullifier, 0); } // TODO(@spalladino): Using the trait here fails with "No matching impl found for `&mut TContext: ContextInterface`" // on the `push_new_nullifier` call. Remove this method in favor of a single method that uses the trait (and update // the noir compiler macro accordingly) once we sort it out. pub fn mark_as_initialized_public(context: &mut PublicContext) { - let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context); - context.push_new_nullifier(init_nullifier, 0); + let init_nullifier = compute_unsiloed_contract_initialization_nullifier(*context); + context.push_new_nullifier(init_nullifier, 0); } pub fn assert_is_initialized(context: &mut TContext) where TContext: ContextInterface { - let init_nullifier = compute_contract_initialization_nullifier(*context); - prove_nullifier_inclusion(init_nullifier, *context); + let init_nullifier = compute_contract_initialization_nullifier(*context); + prove_nullifier_inclusion(init_nullifier, *context); } pub fn compute_contract_initialization_nullifier(context: TContext) -> Field where TContext: ContextInterface { - let address = context.this_address(); - silo_nullifier(address, compute_unsiloed_contract_initialization_nullifier(context)) + let address = context.this_address(); + silo_nullifier( + address, + compute_unsiloed_contract_initialization_nullifier(context) + ) } -pub fn compute_unsiloed_contract_initialization_nullifier(context: TContext) -> Field where TContext: ContextInterface{ - context.this_address().to_field() +pub fn compute_unsiloed_contract_initialization_nullifier(context: TContext) -> Field where TContext: ContextInterface { + context.this_address().to_field() } diff --git a/noir-projects/aztec-nr/aztec/src/prelude.nr b/noir-projects/aztec-nr/aztec/src/prelude.nr index b843647d933..4ff61133372 100644 --- a/noir-projects/aztec-nr/aztec/src/prelude.nr +++ b/noir-projects/aztec-nr/aztec/src/prelude.nr @@ -2,15 +2,15 @@ use dep::protocol_types::{address::{AztecAddress, EthAddress}, abis::function_selector::FunctionSelector}; use crate::{ state_vars::{ - map::Map, private_immutable::PrivateImmutable, private_mutable::PrivateMutable, - public_immutable::PublicImmutable, public_mutable::PublicMutable, private_set::PrivateSet, - shared_immutable::SharedImmutable - }, + map::Map, private_immutable::PrivateImmutable, private_mutable::PrivateMutable, + public_immutable::PublicImmutable, public_mutable::PublicMutable, private_set::PrivateSet, + shared_immutable::SharedImmutable +}, log::{emit_unencrypted_log, emit_encrypted_log}, context::PrivateContext, note::{ - note_header::NoteHeader, note_interface::NoteInterface, note_getter_options::NoteGetterOptions, - note_viewer_options::NoteViewerOptions, - utils::compute_note_hash_and_nullifier as utils_compute_note_hash_and_nullifier - } + note_header::NoteHeader, note_interface::NoteInterface, note_getter_options::NoteGetterOptions, + note_viewer_options::NoteViewerOptions, + utils::compute_note_hash_and_nullifier as utils_compute_note_hash_and_nullifier +} }; // docs:end:prelude diff --git a/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr b/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr index 187608f6ec8..a7e14c8d9fc 100644 --- a/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr +++ b/noir-projects/noir-contracts/contracts/claim_contract/src/interfaces.nr @@ -1,6 +1,6 @@ use dep::aztec::{ protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress}, - context::PrivateContext, + context::PrivateContext }; struct Token { diff --git a/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr b/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr index 12a9c69f1d0..06127fd9b10 100644 --- a/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/claim_contract/src/main.nr @@ -3,11 +3,8 @@ contract Claim { use dep::aztec::{ history::note_inclusion::prove_note_inclusion, - protocol_types::{ - abis::function_selector::FunctionSelector, - address::AztecAddress, - }, - state_vars::SharedImmutable, + protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress}, + state_vars::SharedImmutable }; use dep::value_note::value_note::ValueNote; use interfaces::Token; @@ -41,7 +38,9 @@ contract Claim { fn claim(proof_note: ValueNote) { // 1) Check that the note corresponds to the target contract let target_address = storage.target_contract.read_private(); - assert(target_address == proof_note.header.contract_address, "Note does not correspond to the target contract"); + assert( + target_address == proof_note.header.contract_address, "Note does not correspond to the target contract" + ); // 2) Prove that the note hash exists in the note hash tree prove_note_inclusion(proof_note, context); diff --git a/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr index 7b406dadb10..fa32c7ca920 100644 --- a/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr +++ b/noir-projects/noir-contracts/contracts/crowdfunding_contract/src/main.nr @@ -3,12 +3,8 @@ contract Crowdfunding { use dep::aztec::{ log::emit_unencrypted_log_from_private, - protocol_types::{ - abis::function_selector::FunctionSelector, - address::AztecAddress, - traits::Serialize - }, - state_vars::{PrivateSet, PublicImmutable, SharedImmutable}, + protocol_types::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::Serialize}, + state_vars::{PrivateSet, PublicImmutable, SharedImmutable} }; use dep::value_note::value_note::ValueNote; use interfaces::Token; @@ -99,7 +95,13 @@ contract Crowdfunding { // 2) Transfer the donation tokens from this contract to the operator let donation_token = Token::at(storage.donation_token.read_private()); - donation_token.transfer(&mut context, context.this_address(), operator_address, amount as Field, 0); + donation_token.transfer( + &mut context, + context.this_address(), + operator_address, + amount as Field, + 0 + ); // 3) Emit an unencrypted event so that anyone can audit how much the operator has withdrawn let event = WithdrawalProcessed { amount, who: operator_address }; diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr index 762762ef91c..0f38a84cde9 100644 --- a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr +++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root.nr @@ -6,10 +6,7 @@ use root_rollup_inputs::RootRollupInputs; use root_rollup_public_inputs::RootRollupPublicInputs; // TODO: Move all the following code to different files -use dep::types::{ - constants::{NUM_FIELDS_PER_SHA256, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP}, - utils::uint256::U256 -}; +use dep::types::{constants::{NUM_FIELDS_PER_SHA256, NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP}, utils::uint256::U256}; // See `test_message_input_flattened_length` on keeping this in sync, // why its here and how this constant was computed. diff --git a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr index b67e4dde9a5..623014f668c 100644 --- a/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr +++ b/noir-projects/noir-protocol-circuits/crates/rollup-lib/src/root/root_rollup_inputs.nr @@ -1,17 +1,13 @@ use crate::{ - abis::{ - previous_rollup_data::PreviousRollupData, - constant_rollup_data::ConstantRollupData, - }, - components, - root::{ - compute_messages_hash, - root_rollup_public_inputs::RootRollupPublicInputs, - } + abis::{previous_rollup_data::PreviousRollupData, constant_rollup_data::ConstantRollupData}, + components, root::{compute_messages_hash, root_rollup_public_inputs::RootRollupPublicInputs} }; use dep::types::{ abis::{append_only_tree_snapshot::AppendOnlyTreeSnapshot, nullifier_leaf_preimage::NullifierLeafPreimage}, - constants::{NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_HEIGHT, L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, ARCHIVE_HEIGHT}, + constants::{ + NUMBER_OF_L1_L2_MESSAGES_PER_ROLLUP, L1_TO_L2_MSG_SUBTREE_HEIGHT, + L1_TO_L2_MSG_SUBTREE_SIBLING_PATH_LENGTH, ARCHIVE_HEIGHT +}, header::Header, content_commitment::ContentCommitment, merkle_tree::{append_only_tree, calculate_subtree, calculate_empty_tree_root}, state_reference::StateReference @@ -96,4 +92,4 @@ impl RootRollupInputs { l1_to_l2_messages_hash: compute_messages_hash(self.new_l1_to_l2_messages) } } -} \ No newline at end of file +} diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr index 5c0b5a621e0..144bcec0532 100644 --- a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr +++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/lib.nr @@ -1 +1 @@ -mod module; \ No newline at end of file +mod module; diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr index 2746c97edf0..f4ad3bff5c9 100644 --- a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr +++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module.nr @@ -1 +1 @@ -mod foo; \ No newline at end of file +mod foo; diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr index e0c82fb1960..0376cd4cb87 100644 --- a/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr +++ b/noir/noir-repo/compiler/wasm/test/fixtures/deps/lib-c/src/module/foo.nr @@ -1,3 +1,3 @@ pub fn bar(param: Field) -> Field { - dep::std::hash::pedersen_hash([param]) + dep::std::hash::pedersen_hash([param]) } diff --git a/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr b/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr index b980af369cf..95824d09f4b 100644 --- a/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr +++ b/noir/noir-repo/compiler/wasm/test/fixtures/noir-contract/src/main.nr @@ -8,5 +8,4 @@ contract TestContract { open fn openFunction() -> pub Field { 42 } - } diff --git a/noir/noir-repo/test_programs/compile_failure/assert_msg_runtime/src/main.nr b/noir/noir-repo/test_programs/compile_failure/assert_msg_runtime/src/main.nr index bec3082550a..fa21442e816 100644 --- a/noir/noir-repo/test_programs/compile_failure/assert_msg_runtime/src/main.nr +++ b/noir/noir-repo/test_programs/compile_failure/assert_msg_runtime/src/main.nr @@ -4,4 +4,4 @@ fn main(x: Field, y: pub Field) { let z = x + y; assert(z != y, f"Expected z != y, but got both equal {z}"); assert_eq(x, y, f"Expected x == y, but x is {x} and y is {y}"); -} \ No newline at end of file +} diff --git a/noir/noir-repo/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr index 428b2006363..bd77551e304 100644 --- a/noir/noir-repo/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr +++ b/noir/noir-repo/test_programs/compile_failure/brillig_assert_msg_runtime/src/main.nr @@ -7,4 +7,4 @@ unconstrained fn conditional(x: Field) -> Field { assert_eq(z, 25, f"Expected 25 but got {z}"); assert(x == 10, f"Expected x to equal 10, but got {x}"); 1 -} \ No newline at end of file +} diff --git a/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr b/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr index cf3279cac0d..473ad8e8d6a 100644 --- a/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr +++ b/noir/noir-repo/test_programs/compile_failure/brillig_mut_ref_from_acir/src/main.nr @@ -5,4 +5,4 @@ unconstrained fn mut_ref_identity(value: &mut Field) -> Field { fn main(mut x: Field, y: pub Field) { let returned_x = mut_ref_identity(&mut x); assert(returned_x == x); -} \ No newline at end of file +} diff --git a/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr b/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr index ddcb5d54d78..1c6b6c217c4 100644 --- a/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr +++ b/noir/noir-repo/test_programs/compile_success_contract/contract_with_impl/src/main.nr @@ -2,6 +2,6 @@ contract Foo { struct T { x: [Field] } impl T { - fn t(self){} + fn t(self) {} } } diff --git a/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr b/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr index ed90ac8bd1d..4ef12cb890d 100644 --- a/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr +++ b/noir/noir-repo/test_programs/compile_success_contract/simple_contract/src/main.nr @@ -13,7 +13,7 @@ contract Foo { } // Regression for issue #3344 #[contract_library_method] - fn foo(x : u8) -> u8 { + fn foo(x: u8) -> u8 { x } } diff --git a/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr b/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr index af1fd7a32de..bfb1819132a 100644 --- a/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr +++ b/noir/noir-repo/test_programs/test_libraries/exporting_lib/src/lib.nr @@ -1,4 +1,3 @@ - struct MyStruct { inner: Field }