chore: Accumulated backports to v4-next (#22474)

BEGIN_COMMIT_OVERRIDE
cherry-pick: fix: passing in user call info from wallet (#21937)
fix: passing in user call info from wallet (backport #21937) (#22459)
fix: prepopulated scopes in simulateviaentrypoint (#22464)
chore: backport #22464 (fix: prepopulated scopes in
simulateviaentrypoint) to v4-next (#22470)
docs: add macOS prerequisites and improve Node.js version guidance
(#22408)
END_COMMIT_OVERRIDE

Author: Thunkar

docs/developer_versioned_docs/version-v4.2.0-aztecnr-rc.2/getting_started_on_local_network.md

@@ -27,6 +27,11 @@ import { General, Fees } from '@site/src/components/Snippets/general_snippets';
 
 - <General.node_ver />
 
+### macOS-specific requirements
+
+- **Homebrew**: [Homebrew](https://brew.sh/) is required for installing dependencies on macOS.
+- **Bash**: macOS ships with an outdated version of Bash (v3.2) that is known to cause issues with the Aztec installer. Install a modern version with `brew install bash`. Even if you use zsh as your default shell, the installer explicitly invokes `bash`. If the installer still picks up the old version, add the Homebrew `bash` to your `$PATH` or [set it as your default shell](https://support.apple.com/en-gb/guide/terminal/trml113/mac).
+
 ## Install and run the local network
 
 ### Install the Aztec toolchain

docs/docs-developers/getting_started_on_local_network.md

@@ -27,6 +27,11 @@ import { General, Fees } from '@site/src/components/Snippets/general_snippets';
 
 - <General.node_ver />
 
+### macOS-specific requirements
+
+- **Homebrew**: [Homebrew](https://brew.sh/) is required for installing dependencies on macOS.
+- **Bash**: macOS ships with an outdated version of Bash (v3.2) that is known to cause issues with the Aztec installer. Install a modern version with `brew install bash`. Even if you use zsh as your default shell, the installer explicitly invokes `bash`. If the installer still picks up the old version, add the Homebrew `bash` to your `$PATH` or [set it as your default shell](https://support.apple.com/en-gb/guide/terminal/trml113/mac).
+
 ## Install and run the local network
 
 ### Install the Aztec toolchain

docs/docs-operate/operators/prerequisites.md

@@ -59,6 +59,16 @@ Install the Aztec toolchain using the official installer:
 VERSION=#release_version bash -i <(curl -sL https://install.aztec.network/#release_version)
 ```
 
+:::note macOS users
+macOS ships with an outdated version of Bash (v3.2) that is known to cause issues with the installer. Install a modern version with [Homebrew](https://brew.sh/):
+
+```bash
+brew install bash
+```
+
+Even if you use zsh as your default shell, the installer explicitly invokes `bash`. If the installer still picks up the old version, add the Homebrew `bash` to your `$PATH` or [set it as your default shell](https://support.apple.com/en-gb/guide/terminal/trml113/mac).
+:::
+
 ### L1 Ethereum Node Access
 
 All Aztec nodes require access to Ethereum L1 node endpoints:

docs/network_versioned_docs/version-v2.1.11-ignition/operators/prerequisites.md

@@ -65,6 +65,16 @@ Install the correct version for the current network:
 aztec-up 2.1.11
 ```
 
+:::note macOS users
+macOS ships with an outdated version of Bash (v3.2) that is known to cause issues with the installer. Install a modern version with [Homebrew](https://brew.sh/):
+
+```bash
+brew install bash
+```
+
+Even if you use zsh as your default shell, the installer explicitly invokes `bash`. If the installer still picks up the old version, add the Homebrew `bash` to your `$PATH` or [set it as your default shell](https://support.apple.com/en-gb/guide/terminal/trml113/mac).
+:::
+
 ### L1 Ethereum Node Access
 
 All Aztec nodes require access to Ethereum L1 node endpoints:

docs/src/components/Snippets/general_snippets.js

@@ -19,9 +19,11 @@ export const General = {
 
   node_ver: () => (
     <p>
-      Aztec libraries require Node.js version 24. You can use{" "}
-      <a href="https://github.com/nvm-sh/nvm">nvm</a> to help manage node
-      versions.
+      Aztec libraries require Node.js version 24. If you have an older version
+      installed, the installer will try to upgrade via{" "}
+      <a href="https://github.com/nvm-sh/nvm">nvm</a> if available. If nvm is
+      not installed, you will need to upgrade Node.js manually (e.g.{" "}
+      <code>nvm install 24</code> after installing nvm).
     </p>
   ),
 

noir-projects/noir-contracts/Nargo.toml

@@ -4,7 +4,8 @@ members = [
     "contracts/account/ecdsa_r_account_contract",
     "contracts/account/schnorr_account_contract",
     "contracts/account/schnorr_hardcoded_account_contract",
-    "contracts/account/simulated_account_contract",
+    "contracts/account/simulated_schnorr_account_contract",
+    "contracts/account/simulated_ecdsa_account_contract",
     "contracts/app/amm_contract",
     "contracts/app/app_subscription_contract",
     "contracts/app/auth_contract",

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

@@ -1,5 +1,5 @@
 [package]
-name = "simulated_account_contract"
+name = "simulated_ecdsa_account_contract"
 authors = [""]
 compiler_version = ">=0.25.0"
 type = "contract"

…nt/simulated_account_contract/Nargo.toml …ulated_ecdsa_account_contract/Nargo.tomlnoir-projects/noir-contracts/contracts/account/simulated_account_contract/Nargo.toml renamed to noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/Nargo.toml noir-projects/noir-contracts/contracts/account/simulated_account_contract/Nargo.toml renamed to noir-projects/noir-contracts/contracts/account/simulated_ecdsa_account_contract/Nargo.toml

@@ -0,0 +1,80 @@
+use aztec::macros::aztec;
+
+// Stub account contract for ECDSA accounts (both secp256k1 and secp256r1) used during simulation.
+// Matches the constructor signature of EcdsaKAccount / EcdsaRAccount so that deployment
+// simulations using this stub as an override do not fail on selector lookup.
+// See simulated_account_contract for the base stub without a constructor.
+#[aztec]
+pub contract SimulatedEcdsaAccount {
+    use aztec::{
+        authwit::{account::AccountActions, auth::IS_VALID_SELECTOR, entrypoint::app::AppPayload},
+        context::PrivateContext,
+        macros::functions::{allow_phase_change, external, view},
+        messages::encoding::MESSAGE_CIPHERTEXT_LEN,
+        oracle::{notes::set_sender_for_tags, random::random},
+    };
+
+    // Stub constructor matching the EcdsaKAccount / EcdsaRAccount constructor signature.
+    // Does NOT use #[initializer] so that the macro does not inject
+    // assert_initialization_matches_address_preimage_private, which would fail during kernelless
+    // simulation because the stub instance has a different initialization hash than the real account.
+    // Emits the same shape of side effects as the real constructor (one nullifier for
+    // SinglePrivateImmutable initialization, one note hash for the key note, and one private
+    // log tied to that note hash) so that gas estimation produces accurate results.
+    #[external("private")]
+    fn constructor(_signing_pub_key_x: [u8; 32], _signing_pub_key_y: [u8; 32]) {
+        // Safety: Random seeds are only used to produce dummy side effects that match the shape of
+        // the real EcdsaKAccount / EcdsaRAccount constructor. The values are never constrained or
+        // used for any security purpose.
+        let seed = unsafe { random() };
+
+        // Emit the initialization nullifier for the signing_public_key SinglePrivateImmutable.
+        self.context.push_nullifier(seed);
+
+        // Emit the note hash for the signing key note.
+        self.context.push_note_hash(seed + 1);
+
+        // Emit a private log tied to the note hash, matching the length of a real note delivery
+        // log (MESSAGE_CIPHERTEXT_LEN fields). The signing key note is a SinglePrivateImmutable
+        // and is therefore never nullified, so in practice the log will never be squashed. We
+        // pass the note hash counter anyway for correctness.
+        let dummy_log: [Field; MESSAGE_CIPHERTEXT_LEN] = [seed + 2; MESSAGE_CIPHERTEXT_LEN];
+        self.context.emit_raw_note_log_unsafe(
+            seed + 3,
+            dummy_log,
+            MESSAGE_CIPHERTEXT_LEN,
+            self.context.side_effect_counter,
+        );
+    }
+
+    // @dev: If you globally change the entrypoint signature don't forget to update account_entrypoint.ts
+    #[external("private")]
+    #[allow_phase_change]
+    fn entrypoint(app_payload: AppPayload, fee_payment_method: u8, cancellable: bool) {
+        // Safety: The sender for tags is only used to compute unconstrained shared secrets for
+        // emitting logs. It is not used in any constrained logic, so it is safe to set here.
+        unsafe { set_sender_for_tags(self.address) };
+
+        let actions = AccountActions::init(self.context, is_valid_impl);
+        actions.entrypoint(app_payload, fee_payment_method, cancellable);
+    }
+
+    #[external("private")]
+    #[view]
+    fn verify_private_authwit(inner_hash: Field) -> Field {
+        IS_VALID_SELECTOR
+    }
+
+    #[contract_library_method]
+    fn is_valid_impl(_context: &mut PrivateContext, _outer_hash: Field) -> bool {
+        true
+    }
+
+    #[external("utility")]
+    unconstrained fn sync_state() {
+        assert(
+            false,
+            "BUG ALERT: sync_state on a simulated account contract should never be triggered.",
+        );
+    }
+}

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

@@ -0,0 +1,8 @@
+[package]
+name = "simulated_schnorr_account_contract"
+authors = [""]
+compiler_version = ">=0.25.0"
+type = "contract"
+
+[dependencies]
+aztec = { path = "../../../../aztec-nr/aztec" }