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

BEGIN_COMMIT_OVERRIDE
feat(e2e): support running tests against legacy noir contract artifacts
(#22388)
chore: deflake p2p client test (#22385)
fix: pass additionalScopes to executeUtility (#22411)
fix(docs): backport PR #22419 — update networks page for Alpha phase,
fix contract addresses and unstaking delay (#22424)
chore: Reduce logging verbosity (#22423)
END_COMMIT_OVERRIDE

Author: AztecBot

docs/docs-developers/docs/foundational-topics/pxe/index.md

@@ -87,6 +87,25 @@ The keystore securely stores cryptographic keys for registered accounts, includi
 
 Oracles are pieces of data that are injected into a smart contract function from the client side. Learn more about [how oracles work](../../aztec-nr/framework-description/advanced/protocol_oracles.md).
 
+## Oracle versioning
+
+The set of oracles that the PXE exposes to private and utility functions is versioned, so that contracts can declare which oracles they expect to be available. Every contract compiled with `Aztec.nr` records the oracle version it was built against, and the PXE checks this version before executing any oracle call.
+
+The version uses two components, `major.minor`, with the following compatibility rules:
+
+- **`major`** must match exactly. A major bump is a breaking change — oracles were removed or their signatures changed — and a PXE on a different major cannot safely run the contract.
+- **`minor`** indicates additive changes (new oracles). The PXE uses a best-effort approach here: a contract compiled against a higher `minor` than the PXE supports is still allowed to run, and an error is only thrown if the contract actually invokes an oracle the PXE does not know about. In practice, a contract built with a newer Aztec.nr may not use any of the newly added oracles at all, in which case it runs fine on an older PXE.
+
+The canonical version constants live in the PXE (`ORACLE_VERSION_MAJOR` / `ORACLE_VERSION_MINOR` in `yarn-project/pxe/src/oracle_version.ts`) and in Aztec.nr (`noir-projects/aztec-nr/aztec/src/oracle/version.nr`). The two are kept in lockstep as part of each release.
+
+### Resolving a version mismatch
+
+If you see an error like _"Oracle '…' not found. … The contract was compiled with Aztec.nr oracle version X.Y, but this private execution environment only supports up to A.B"_, the contract uses one or more oracles from a newer Aztec.nr than your PXE supports.
+
+To fix it, upgrade the software that ships the PXE (sandbox, wallet, or whatever embeds `@aztec/pxe`) to a release whose Aztec.nr version is at least as new as the one the contract was compiled with.
+
+If the PXE reports a version that _should_ include every oracle the contract needs but an oracle is still missing, that is a contract bug rather than a version problem and you should likely report it to the app developer.
+
 ## For developers
 
 To learn how to develop on top of the PXE, refer to these guides:

docs/docs-participate/token/staking.md

@@ -56,15 +56,18 @@ Slashing is managed through governance voting based on evidence collected both o
 
 ## Unstaking
 
-When you want to withdraw your staked tokens, you must go through an unstaking process with a mandatory exit delay.
+When you want to withdraw your staked tokens, you must go through an unstaking process with mandatory delays.
 
-#if(testnet)
-The exit delay for testnet is **2 days**.
-#else
-The exit delay for mainnet is **4 days**.
-#endif
+### Exit Delays
 
-The exit delay exists to allow time for pending slashing conditions to be detected and to prevent validators from quickly exiting after misbehaving.
+| Delay Type | Alpha (Mainnet) | Testnet |
+|-----------|-----------------|---------|
+| **Staking Exit Delay** | 4 days | 2 days |
+| **Governance Withdrawal Delay** | ~38 days | ~1.6 days |
+
+The **staking exit delay** is the minimum time after initiating withdrawal before you can claim your tokens. It allows time for pending slashing conditions to be detected.
+
+If your tokens are deposited in the Governance Staking Escrow (GSE) for voting, the **governance withdrawal delay** also applies. This delay is calculated as `votingDelay/5 + votingDuration + executionDelay` to ensure voted-on proposals can be executed before voters exit. On mainnet this is approximately 38 days (0.6 + 7 + 30 days).
 
 ### How to Unstake
 

docs/docs/networks.md

@@ -43,17 +43,17 @@ Not sure which network to use? Jump to our [Network Selection Guide](#network-se
 | **Fee Asset Handler** | N/A | [`0x5602c39a6e9c5ace589f64f754927bcda4f4bfc9`](https://sepolia.etherscan.io/address/0x5602c39a6e9c5ace589f64f754927bcda4f4bfc9) |
 | **Coin Issuer** | [`0x02fadf157d551aa6d761b2a2237d03af68e41ca6`](https://etherscan.io/address/0x02fadf157d551aa6d761b2a2237d03af68e41ca6) | [`0xe05d0a62045b4237556c1ec423e59eea9a24eaee`](https://sepolia.etherscan.io/address/0xe05d0a62045b4237556c1ec423e59eea9a24eaee) |
 | **Reward Distributor** | [`0x3d6a1b00c830c5f278fc5dfb3f6ff0b74db6dfe0`](https://etherscan.io/address/0x3d6a1b00c830c5f278fc5dfb3f6ff0b74db6dfe0) | [`0x030d2780e70f085c31d490268d3900d4cea16606`](https://sepolia.etherscan.io/address/0x030d2780e70f085c31d490268d3900d4cea16606) |
-| **Reward Booster** | [`0x7101a6703491a4d808aeabe9f62bc1dc6a20bdf4`](https://etherscan.io/address/0x7101a6703491a4d808aeabe9f62bc1dc6a20bdf4) | [`0x49711056D1EaDcDD3F2eF676DC8EA3F924fB916c`](https://sepolia.etherscan.io/address/0x49711056D1EaDcDD3F2eF676DC8EA3F924fB916c) |
+| **Reward Booster** | [`0x1cbb707bd7b4fd2bced6d96d84372fb428e93d80`](https://etherscan.io/address/0x1cbb707bd7b4fd2bced6d96d84372fb428e93d80) | [`0x49711056D1EaDcDD3F2eF676DC8EA3F924fB916c`](https://sepolia.etherscan.io/address/0x49711056D1EaDcDD3F2eF676DC8EA3F924fB916c) |
 | **Governance Proposer** | [`0x06ef1dcf87e419c48b94a331b252819fadbd63ef`](https://etherscan.io/address/0x06ef1dcf87e419c48b94a331b252819fadbd63ef) | [`0x01c7d4ca153748d2377968fef22894cb162e9480`](https://sepolia.etherscan.io/address/0x01c7d4ca153748d2377968fef22894cb162e9480) |
 | **Governance** | [`0x1102471eb3378fee427121c9efcea452e4b6b75e`](https://etherscan.io/address/0x1102471eb3378fee427121c9efcea452e4b6b75e) | [`0xcaf7447721447b22cd0076ac7c63877c3afd329f`](https://sepolia.etherscan.io/address/0xcaf7447721447b22cd0076ac7c63877c3afd329f) |
 | **Governance Staking Escrow** | [`0xa92ecfd0e70c9cd5e5cd76c50af0f7da93567a4f`](https://etherscan.io/address/0xa92ecfd0e70c9cd5e5cd76c50af0f7da93567a4f) | [`0xb6a38a51a6c1de9012f9d8ea9745ef957212eaac`](https://sepolia.etherscan.io/address/0xb6a38a51a6c1de9012f9d8ea9745ef957212eaac) |
 | **Staking Registry** | [`0x042dF8f42790d6943F41C25C2132400fd727f452`](https://etherscan.io/address/0x042dF8f42790d6943F41C25C2132400fd727f452) | [`0xC6EcC1832c8BF6a41c927BEb4E9ec610FBeDd1C2`](https://sepolia.etherscan.io/address/0xC6EcC1832c8BF6a41c927BEb4E9ec610FBeDd1C2) |
 | **Slash Factory** | N/A | [`0x9CF4a0094c8696d5110dd0f0cF3FA5deA174BB17`](https://sepolia.etherscan.io/address/0x9CF4a0094c8696d5110dd0f0cF3FA5deA174BB17) |
-| **Slasher** | [`0x91a3745c685c220595b997e53311ebf660144889`](https://etherscan.io/address/0x91a3745c685c220595b997e53311ebf660144889) | [`0xf6D0D42aCE06829bECB78C74F49879528fC632c1`](https://sepolia.etherscan.io/address/0xf6D0D42aCE06829bECB78C74F49879528fC632c1) |
-| **Tally Slashing Proposer** | [`0x7a318c3daa9f21f8fc8238c65755eb0394fbf189`](https://etherscan.io/address/0x7a318c3daa9f21f8fc8238c65755eb0394fbf189) | [`0x158eCC4B24675dc399031c7D144786e3da2060A8`](https://sepolia.etherscan.io/address/0x158eCC4B24675dc399031c7D144786e3da2060A8) |
-| **Honk Verifier** | N/A | [`0x800FbC88054ba6c228B7d822F1DCAf4d627E8F97`](https://sepolia.etherscan.io/address/0x800FbC88054ba6c228B7d822F1DCAf4d627E8F97) |
+| **Slasher** | [`0x64E6e9Bb9f1E33D319578B9f8a9C719Ca6D46eBb`](https://etherscan.io/address/0x64E6e9Bb9f1E33D319578B9f8a9C719Ca6D46eBb) | [`0xCF750B724558098E5db67B651f03a31AE2b252f4`](https://sepolia.etherscan.io/address/0xCF750B724558098E5db67B651f03a31AE2b252f4) |
+| **Tally Slashing Proposer** | [`0xa4a38fD0108C00983E75616b638Ff3321FD26958`](https://etherscan.io/address/0xa4a38fD0108C00983E75616b638Ff3321FD26958) | [`0x158eCC4B24675dc399031c7D144786e3da2060A8`](https://sepolia.etherscan.io/address/0x158eCC4B24675dc399031c7D144786e3da2060A8) |
+| **Honk Verifier** | [`0x70aedda427f26480d240bc0f4308cedec8d31348`](https://etherscan.io/address/0x70aedda427f26480d240bc0f4308cedec8d31348) | [`0x800FbC88054ba6c228B7d822F1DCAf4d627E8F97`](https://sepolia.etherscan.io/address/0x800FbC88054ba6c228B7d822F1DCAf4d627E8F97) |
 | **Register New Rollup Version Payload** | N/A | [`0x11f7Ab2324CA94af929A388477a7959E0108C3d6`](https://sepolia.etherscan.io/address/0x11f7Ab2324CA94af929A388477a7959E0108C3d6) |
-| **Slash Payload Cloneable** | N/A | [`0xe66d9eeBfF5490E6bfA263cF08028dE7d265321F`](https://sepolia.etherscan.io/address/0xe66d9eeBfF5490E6bfA263cF08028dE7d265321F) |
+| **Slash Payload Cloneable** | [`0xAA43220b7eb7c8Ffe75bc9C483f3C07b0a55B445`](https://etherscan.io/address/0xAA43220b7eb7c8Ffe75bc9C483f3C07b0a55B445) | [`0xe66d9eeBfF5490E6bfA263cF08028dE7d265321F`](https://sepolia.etherscan.io/address/0xe66d9eeBfF5490E6bfA263cF08028dE7d265321F) |
 
 ### L2 Contract Addresses
 

docs/netlify.toml

@@ -802,7 +802,7 @@
 [[redirects]]
     # PXE: incompatible oracle version between contract and PXE
     from = "/errors/8"
-    to = "/developers/docs/foundational-topics/pxe"
+    to = "/developers/docs/foundational-topics/pxe#oracle-versioning"
 
 [[redirects]]
     # CLI: aztec dep version in Nargo.toml does not match the CLI version

noir-projects/aztec-nr/aztec/src/oracle/version.nr

@@ -1,10 +1,17 @@
-/// The ORACLE_VERSION constant is used to check that the oracle interface is in sync between PXE and Aztec.nr. We need
-/// to version the oracle interface to ensure that developers get a reasonable error message if they use incompatible
-/// versions of Aztec.nr and PXE. The TypeScript counterpart is in `oracle_version.ts`.
+/// The oracle version constants are used to check that the oracle interface is in sync between PXE and Aztec.nr.
+/// We version the oracle interface as `major.minor` where:
+///   - `major` = backward-breaking changes (must match exactly between PXE and Aztec.nr)
+///   - `minor` = oracle additions (non-breaking; PXE minor >= contract minor)
+///
+/// The TypeScript counterparts are in `oracle_version.ts`.
 ///
 /// @dev Whenever a contract function or Noir test is run, the `aztec_utl_assertCompatibleOracleVersion` oracle is
-/// called and if the oracle version is incompatible an error is thrown.
-pub global ORACLE_VERSION: Field = 22;
+/// called. If the major version is incompatible, an error is thrown immediately. The minor version is recorded by
+/// the PXE and used to provide helpful error messages if a contract calls an oracle that doesn't exist. We don't throw
+/// immediately if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency
+/// without actually using any of the new oracles then there is no reason to throw.
+pub global ORACLE_VERSION_MAJOR: Field = 22;
+pub global ORACLE_VERSION_MINOR: Field = 0;
 
 /// Asserts that the version of the oracle is compatible with the version expected by the contract.
 pub fn assert_compatible_oracle_version() {
@@ -16,23 +23,23 @@ pub fn assert_compatible_oracle_version() {
 }
 
 unconstrained fn assert_compatible_oracle_version_wrapper() {
-    assert_compatible_oracle_version_oracle(ORACLE_VERSION);
+    assert_compatible_oracle_version_oracle(ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR);
 }
 
-#[oracle(aztec_utl_assertCompatibleOracleVersion)]
-unconstrained fn assert_compatible_oracle_version_oracle(version: Field) {}
+#[oracle(aztec_utl_assertCompatibleOracleVersionV2)]
+unconstrained fn assert_compatible_oracle_version_oracle(major: Field, minor: Field) {}
 
 mod test {
-    use super::{assert_compatible_oracle_version_oracle, ORACLE_VERSION};
+    use super::{assert_compatible_oracle_version_oracle, ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR};
 
     #[test]
     unconstrained fn compatible_oracle_version() {
-        assert_compatible_oracle_version_oracle(ORACLE_VERSION);
+        assert_compatible_oracle_version_oracle(ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR);
     }
 
     #[test(should_fail_with = "Incompatible aztec cli version:")]
-    unconstrained fn incompatible_oracle_version() {
-        let arbitrary_incorrect_version = 318183437;
-        assert_compatible_oracle_version_oracle(arbitrary_incorrect_version);
+    unconstrained fn incompatible_oracle_version_major() {
+        let arbitrary_incorrect_major = 318183437;
+        assert_compatible_oracle_version_oracle(arbitrary_incorrect_major, ORACLE_VERSION_MINOR);
     }
 }

noir-projects/aztec-nr/aztec/src/test/helpers/test_environment/test/misc.nr

@@ -1,4 +1,7 @@
-use crate::{oracle::version::ORACLE_VERSION, test::helpers::test_environment::TestEnvironment};
+use crate::{
+    oracle::version::{ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR},
+    test::helpers::test_environment::TestEnvironment,
+};
 use std::test::OracleMock;
 
 #[test]
@@ -39,10 +42,10 @@ unconstrained fn private_public_and_utility_context_share_default_chain_id() {
 
 #[test]
 unconstrained fn oracle_version_is_checked_upon_env_creation() {
-    let mock = OracleMock::mock("aztec_utl_assertCompatibleOracleVersion");
+    let mock = OracleMock::mock("aztec_utl_assertCompatibleOracleVersionV2");
 
     let _env = TestEnvironment::new();
 
     assert_eq(mock.times_called(), 1);
-    assert_eq(mock.get_last_params::<Field>(), ORACLE_VERSION);
+    assert_eq(mock.get_last_params::<(Field, Field)>(), (ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR));
 }

noir-projects/noir-contracts/contracts/protocol/aztec_sublib/src/oracle/version.nr

@@ -1,10 +1,17 @@
-/// The ORACLE_VERSION constant is used to check that the oracle interface is in sync between PXE and Aztec.nr. We need
-/// to version the oracle interface to ensure that developers get a reasonable error message if they use incompatible
-/// versions of Aztec.nr and PXE. The TypeScript counterpart is in `oracle_version.ts`.
+/// The oracle version constants are used to check that the oracle interface is in sync between PXE and Aztec.nr.
+/// We version the oracle interface as `major.minor` where:
+///   - `major` = backward-breaking changes (must match exactly between PXE and Aztec.nr)
+///   - `minor` = oracle additions (non-breaking; PXE minor >= contract minor)
+///
+/// The TypeScript counterparts are in `oracle_version.ts`.
 ///
 /// @dev Whenever a contract function or Noir test is run, the `aztec_utl_assertCompatibleOracleVersion` oracle is
-/// called and if the oracle version is incompatible an error is thrown.
-pub global ORACLE_VERSION: Field = 21;
+/// called. If the major version is incompatible, an error is thrown immediately. The minor version is recorded by
+/// the PXE and used to provide helpful error messages if a contract calls an oracle that doesn't exist. We don't throw
+/// immediately if AZTEC_NR_MINOR > PXE_MINOR because if a contract is updated to use a newer Aztec.nr dependency
+/// without actually using any of the new oracles then there is no reason to throw.
+pub global ORACLE_VERSION_MAJOR: Field = 22;
+pub global ORACLE_VERSION_MINOR: Field = 0;
 
 /// Asserts that the version of the oracle is compatible with the version expected by the contract.
 pub fn assert_compatible_oracle_version() {
@@ -16,23 +23,23 @@ pub fn assert_compatible_oracle_version() {
 }
 
 unconstrained fn assert_compatible_oracle_version_wrapper() {
-    assert_compatible_oracle_version_oracle(ORACLE_VERSION);
+    assert_compatible_oracle_version_oracle(ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR);
 }
 
-#[oracle(aztec_utl_assertCompatibleOracleVersion)]
-unconstrained fn assert_compatible_oracle_version_oracle(version: Field) {}
+#[oracle(aztec_utl_assertCompatibleOracleVersionV2)]
+unconstrained fn assert_compatible_oracle_version_oracle(major: Field, minor: Field) {}
 
 mod test {
-    use super::{assert_compatible_oracle_version_oracle, ORACLE_VERSION};
+    use super::{assert_compatible_oracle_version_oracle, ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR};
 
     #[test]
     unconstrained fn compatible_oracle_version() {
-        assert_compatible_oracle_version_oracle(ORACLE_VERSION);
+        assert_compatible_oracle_version_oracle(ORACLE_VERSION_MAJOR, ORACLE_VERSION_MINOR);
     }
 
     #[test(should_fail_with = "Incompatible aztec cli version:")]
-    unconstrained fn incompatible_oracle_version() {
-        let arbitrary_incorrect_version = 318183437;
-        assert_compatible_oracle_version_oracle(arbitrary_incorrect_version);
+    unconstrained fn incompatible_oracle_version_major() {
+        let arbitrary_incorrect_major = 318183437;
+        assert_compatible_oracle_version_oracle(arbitrary_incorrect_major, ORACLE_VERSION_MINOR);
     }
 }

yarn-project/aztec.js/src/contract/contract_function_interaction.ts

@@ -130,8 +130,9 @@ export class ContractFunctionInteraction extends BaseContractInteraction {
     // docs:end:simulate
     if (this.functionDao.functionType == FunctionType.UTILITY) {
       const call = await this.getFunctionCall();
+      const scopes = [...(options.additionalScopes ?? [])];
       const utilityResult = await this.wallet.executeUtility(call, {
-        scopes: options.from === NO_FROM ? [] : [options.from],
+        scopes: options.from === NO_FROM ? scopes : [options.from, ...scopes],
         authWitnesses: options.authWitnesses,
       });
 

yarn-project/end-to-end/.gitignore

@@ -7,3 +7,4 @@ ultrahonk-bench-inputs
 web/main.js*
 consensys_web3signer_25.11.0
 scripts/ha/postgres_data/
+.legacy-contracts/

yarn-project/end-to-end/README.md

@@ -24,3 +24,30 @@ which will spawn the two processes.
 You can also run this by `docker-compose up` which will spawn 2 different containers for Anvil and the test runner.
 
 You can run a single test by running `yarn test:compose <test_name>`.
+
+## Running tests against legacy contract artifacts
+
+To verify that contracts deployed from a previous release still work against the current stack, set
+`CONTRACT_ARTIFACTS_VERSION` to a published version of `@aztec/noir-contracts.js` / `@aztec/noir-test-contracts.js`:
+
+```
+CONTRACT_ARTIFACTS_VERSION=4.1.3 yarn test:e2e src/e2e_amm.test.ts
+```
+
+Only the JSON artifact files (`.../artifacts/*.json`) are redirected. The TypeScript wrapper classes
+(e.g. `TokenContract`) continue to load from the current workspace and use the current `@aztec/aztec.js` — so this
+exercises whether a deployed contract's ABI / bytecode / notes still work through the *new* client, not whether the
+legacy wrapper code still imports cleanly.
+
+The first run downloads the pinned packages into `.legacy-contracts/<version>/node_modules/` (cached across runs). A
+startup banner and a per-redirect line are printed to stderr so you can confirm the legacy artifacts were actually
+loaded:
+
+```
+[legacy-contracts][jest] CONTRACT_ARTIFACTS_VERSION=4.1.3
+[legacy-contracts][jest] redirecting @aztec/noir-contracts.js/artifacts/*.json -> .legacy-contracts/4.1.3/...
+[legacy-contracts][jest] redirected token_contract-Token.json -> /abs/.../.legacy-contracts/4.1.3/.../token_contract-Token.json
+```
+
+When `CONTRACT_ARTIFACTS_VERSION` is unset the test run is byte-identical to the default behaviour. The cache is
+populated automatically on first use.