Merge branch 'backport-to-v4-next-staging' into claudebox/notify-fairies-on-compat-fail

Author: benesjan

noir-projects/noir-contracts/contracts/account/ecdsa_k_account_contract/src/main.nr

@@ -7,10 +7,7 @@ pub contract EcdsaKAccount {
     use aztec::{
         authwit::{account::AccountActions, entrypoint::app::AppPayload},
         context::PrivateContext,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{auth_witness::get_auth_witness_as_bytes, notes::set_sender_for_tags},
         state_vars::SinglePrivateImmutable,
@@ -37,12 +34,11 @@ pub contract EcdsaKAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`)
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -75,12 +71,7 @@ pub contract EcdsaKAccount {
         // Note that noir expects the hash of the message/challenge as input to the ECDSA verification.
         let outer_hash_bytes: [u8; 32] = outer_hash.to_be_bytes();
         let hashed_message: [u8; 32] = sha256::digest(outer_hash_bytes);
-        std::ecdsa_secp256k1::verify_signature(
-            public_key.x,
-            public_key.y,
-            signature,
-            hashed_message,
-        )
+        std::ecdsa_secp256k1::verify_signature(public_key.x, public_key.y, signature, hashed_message)
     }
     // docs:end:is_valid_impl
 }

noir-projects/noir-contracts/contracts/account/ecdsa_r_account_contract/src/main.nr

@@ -1,15 +1,13 @@
-// Account contract that uses ECDSA signatures for authentication on random version of the p256 curve (to use with touchID).
+// Account contract that uses ECDSA signatures for authentication on random version of the p256 curve (to use with
+// touchID).
 use aztec::macros::aztec;
 
 #[aztec]
 pub contract EcdsaRAccount {
     use aztec::{
         authwit::{account::AccountActions, entrypoint::app::AppPayload},
         context::PrivateContext,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{auth_witness::get_auth_witness_as_bytes, notes::set_sender_for_tags},
         state_vars::SinglePrivateImmutable,
@@ -36,12 +34,11 @@ pub contract EcdsaRAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`)
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -73,11 +70,6 @@ pub contract EcdsaRAccount {
         // Note that noir expects the hash of the message/challenge as input to the ECDSA verification.
         let outer_hash_bytes: [u8; 32] = outer_hash.to_be_bytes();
         let hashed_message: [u8; 32] = sha256::digest(outer_hash_bytes);
-        std::ecdsa_secp256r1::verify_signature(
-            public_key.x,
-            public_key.y,
-            signature,
-            hashed_message,
-        )
+        std::ecdsa_secp256r1::verify_signature(public_key.x, public_key.y, signature, hashed_message)
     }
 }

noir-projects/noir-contracts/contracts/account/schnorr_account_contract/src/main.nr

@@ -14,15 +14,11 @@ pub contract SchnorrAccount {
         },
         context::PrivateContext,
         hash::compute_siloed_nullifier,
-        macros::{
-            functions::{allow_phase_change, external, initializer, noinitcheck, view},
-            storage::storage,
-        },
+        macros::{functions::{allow_phase_change, external, initializer, noinitcheck, view}, storage::storage},
         messages::message_delivery::MessageDelivery,
         oracle::{
             auth_witness::get_auth_witness_as_bytes,
-            get_nullifier_membership_witness::get_low_nullifier_membership_witness,
-            notes::set_sender_for_tags,
+            get_nullifier_membership_witness::get_low_nullifier_membership_witness, notes::set_sender_for_tags,
         },
         protocol::address::AztecAddress,
         state_vars::SinglePrivateImmutable,
@@ -49,12 +45,11 @@ pub contract SchnorrAccount {
         unsafe { set_sender_for_tags(self.address) };
         // The note message gets delivered to the note owner which is set by the SinglePrivateImmutable to be this
         // contract.
-        self.storage.signing_public_key.initialize(pub_key_note).deliver(
-            MessageDelivery.ONCHAIN_CONSTRAINED,
-        );
+        self.storage.signing_public_key.initialize(pub_key_note).deliver(MessageDelivery.ONCHAIN_CONSTRAINED);
     }
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file (specifically `getEntrypointAbi()`).
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts file
+    // (specifically `getEntrypointAbi()`).
     // using noinitcheck is an optimization, it reduces gates by omitting a check that the contract has been initialized
     #[external("private")]
     #[noinitcheck]
@@ -83,19 +78,16 @@ pub contract SchnorrAccount {
         // Hence it's safe.
         let signature: [u8; 64] = unsafe { get_auth_witness_as_bytes(outer_hash) };
 
-        let pub_key =
-            std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
+        let pub_key = std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
         // Verify signature of the payload bytes
         schnorr::verify_signature(pub_key, signature, outer_hash.to_be_bytes::<32>())
         // docs:end:is_valid_impl
     }
 
-    /**
-    * @notice Helper function to check validity of private authwitnesses
-    * @param consumer The address of the consumer of the message
-    * @param message_hash The message hash of the message to check the validity
-    * @return True if the message_hash can be consumed, false otherwise
-    */
+    /// @notice Helper function to check validity of private authwitnesses
+    /// @param consumer The address of the consumer of the message
+    /// @param message_hash The message hash of the message to check the validity
+    /// @return True if the message_hash can be consumed, false otherwise
     #[external("utility")]
     unconstrained fn lookup_validity(consumer: AztecAddress, inner_hash: Field) -> bool {
         let public_key = self.storage.signing_public_key.view_note();
@@ -108,10 +100,8 @@ pub contract SchnorrAccount {
         );
 
         let signature: [u8; 64] = get_auth_witness_as_bytes(message_hash);
-        let pub_key =
-            std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
-        let valid_in_private =
-            schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
+        let pub_key = std::embedded_curve_ops::EmbeddedCurvePoint { x: public_key.x, y: public_key.y };
+        let valid_in_private = schnorr::verify_signature(pub_key, signature, message_hash.to_be_bytes::<32>());
 
         // Compute the nullifier and check if it is spent
         // This will BLINDLY TRUST the oracle, but the oracle is us, and

noir-projects/noir-contracts/contracts/account/schnorr_hardcoded_account_contract/src/main.nr

@@ -16,7 +16,8 @@ pub contract SchnorrHardcodedAccount {
         y: 0x208d44b36eb6e73b254921134d002da1a90b41131024e3b1d721259182106205,
     };
 
-    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts (specifically `getEntrypointAbi()`)
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts (specifically
+    // `getEntrypointAbi()`)
     #[external("private")]
     #[allow_phase_change]
     fn entrypoint(app_payload: AppPayload, fee_payment_method: u8, cancellable: bool) {

noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/src/main.nr

@@ -70,9 +70,6 @@ pub contract SimulatedEcdsaAccount {
 
     #[external("utility")]
     unconstrained fn sync_state() {
-        assert(
-            false,
-            "BUG ALERT: sync_state on a simulated account contract should never be triggered.",
-        );
+        assert(false, "BUG ALERT: sync_state on a simulated account contract should never be triggered.");
     }
 }

noir-projects/noir-contracts/contracts/account/simulated_schnorr_account_contract/src/main.nr

@@ -70,9 +70,6 @@ pub contract SimulatedSchnorrAccount {
 
     #[external("utility")]
     unconstrained fn sync_state() {
-        assert(
-            false,
-            "BUG ALERT: sync_state on a simulated account contract should never be triggered.",
-        );
+        assert(false, "BUG ALERT: sync_state on a simulated account contract should never be triggered.");
     }
 }

noir-projects/noir-contracts/contracts/app/amm_contract/src/lib.nr

@@ -32,7 +32,8 @@ pub fn get_amount_in(amount_out: u128, balance_in: u128, balance_out: u128) -> u
     (numerator / denominator) + 1 as u128
 }
 
-/// Given the desired amounts and balances of token0 and token1 returns the optimal amount of token0 and token1 to be added to the pool.
+/// Given the desired amounts and balances of token0 and token1 returns the optimal amount of token0 and token1 to be
+/// added to the pool.
 pub fn get_amounts_to_add(
     amount0_max: u128,
     amount1_max: u128,
@@ -74,12 +75,7 @@ pub fn get_amounts_to_add(
 }
 
 /// Returns the amount of tokens to return to a liquidity provider when they remove liquidity from the pool.
-pub fn get_amounts_on_remove(
-    to_burn: u128,
-    total_supply: u128,
-    balance0: u128,
-    balance1: u128,
-) -> (u128, u128) {
+pub fn get_amounts_on_remove(to_burn: u128, total_supply: u128, balance0: u128, balance1: u128) -> (u128, u128) {
     // Since the liquidity token tracks ownership of the pool, the liquidity provider gets a proportional share of each
     // token.
     (to_burn * balance0 / total_supply, to_burn * balance1 / total_supply)