Merge branch 'next' into merge-train/barretenberg

Author: AztecBot

barretenberg/cpp/src/barretenberg/vm2/testing/minimal_tx.testdata.bin

@@ -8,18 +8,19 @@ import { Fr } from '@aztec/aztec.js/fields';
 import { createLogger } from '@aztec/aztec.js/log';
 import { DeployAccountOptions } from '@aztec/aztec.js/wallet';
 import type { AztecNode } from '@aztec/aztec.js/node';
-import { type FeeOptions } from '@aztec/wallet-sdk/base-wallet';
+import {
+  type CompleteFeeOptionsConfig,
+  type FeeOptions,
+} from '@aztec/wallet-sdk/base-wallet';
 import { SPONSORED_FPC_SALT } from '@aztec/constants';
-import type { FieldsOf } from '@aztec/foundation/types';
 import { randomBytes } from '@aztec/foundation/crypto/random';
 import { getInitialTestAccountsData } from '@aztec/accounts/testing/lazy';
-import { GasSettings } from '@aztec/stdlib/gas';
 import { AccountFeePaymentMethodOptions } from '@aztec/entrypoints/account';
 import {
   EmbeddedWallet as EmbeddedWalletBase,
   type EmbeddedWalletOptions,
 } from '@aztec/wallets/embedded';
-import { NO_FROM, NoFrom } from '@aztec/aztec.js/account';
+import { NO_FROM } from '@aztec/aztec.js/account';
 
 const logger = createLogger('wallet');
 const LocalStorageKey = 'aztec-account';
@@ -38,49 +39,26 @@ export class EmbeddedWallet extends EmbeddedWalletBase {
   /**
    * Completes partial user-provided fee options with wallet defaults.
    * This wallet will use the sponsoredFPC payment method unless otherwise stated.
-   * @param from - The address where the transaction is being sent from
-   * @param feePayer - The address paying for fees (if any fee payment method is embedded in the execution payload)
-   * @param gasSettings - User-provided partial gas settings
-   * @returns - Complete fee options that can be used to create a transaction execution request
    */
   override async completeFeeOptions(
-    from: AztecAddress | NoFrom,
-    feePayer?: AztecAddress,
-    gasSettings?: Partial<FieldsOf<GasSettings>>
+    config: CompleteFeeOptionsConfig
   ): Promise<FeeOptions> {
-    const maxFeesPerGas =
-      gasSettings?.maxFeesPerGas ??
-      (await this.aztecNode.getCurrentMinFees()).mul(1 + this.minFeePadding);
-    let accountFeePaymentMethodOptions;
-    let walletFeePaymentMethod;
-    // If from is an address, we need to determine the appropriate fee payment method options for the
-    // account contract entrypoint to use
-    if (from !== NO_FROM) {
-      // The transaction does not include a fee payment method, so we
-      // use the sponsoredFPC
-      if (!feePayer) {
-        accountFeePaymentMethodOptions =
-          AccountFeePaymentMethodOptions.EXTERNAL;
-        const sponsoredFPCAddress = await this.#getSponsoredFPCAddress();
-
-        walletFeePaymentMethod = new SponsoredFeePaymentMethod(
-          sponsoredFPCAddress
-        );
-      } else {
-        // The transaction includes fee payment method, so we check if we are the fee payer for it
-        // (this can only happen if the embedded payment method is FeeJuiceWithClaim)
-        accountFeePaymentMethodOptions = from.equals(feePayer)
-          ? AccountFeePaymentMethodOptions.FEE_JUICE_WITH_CLAIM
-          : AccountFeePaymentMethodOptions.EXTERNAL;
-      }
+    const { from, feePayer } = config;
+    // Delegate to base for gas settings, then override with sponsored FPC if needed
+    const baseFeeOptions = await super.completeFeeOptions(config);
+    let { accountFeePaymentMethodOptions, walletFeePaymentMethod } =
+      baseFeeOptions;
+    // If from is and address and the transaction does not include a fee payment
+    // method, we use the sponsoredFPC
+    if (from !== NO_FROM && !feePayer) {
+      accountFeePaymentMethodOptions = AccountFeePaymentMethodOptions.EXTERNAL;
+      const sponsoredFPCAddress = await this.#getSponsoredFPCAddress();
+      walletFeePaymentMethod = new SponsoredFeePaymentMethod(
+        sponsoredFPCAddress
+      );
     }
-    const fullGasSettings: GasSettings = GasSettings.default({
-      ...gasSettings,
-      maxFeesPerGas,
-    });
-    this.log.debug(`Using L2 gas settings`, fullGasSettings);
     return {
-      gasSettings: fullGasSettings,
+      ...baseFeeOptions,
       walletFeePaymentMethod,
       accountFeePaymentMethodOptions,
     };

boxes/boxes/vanilla/app/embedded-wallet.ts

@@ -9,6 +9,24 @@ Aztec is in active development. Each version may introduce breaking changes that
 
 ## TBD
 
+### [Aztec.js] `GasSettings.default()` renamed to `GasSettings.fallback()`
+
+`GasSettings.default()` has been renamed to `GasSettings.fallback()` to clarify that these gas limits are not protocol defaults — the protocol has no concept of "default" gas settings. `fallback()` is a convenience for cases where gas estimation is not being used, but callers should prefer estimating gas via simulation for accurate limits.
+
+The old `DEFAULT_GAS_LIMIT` and `DEFAULT_TEARDOWN_GAS_LIMIT` constants have been removed. Gas limits are now derived from protocol-level maximums (`MAX_PROCESSABLE_L2_GAS`, `MAX_PROCESSABLE_DA_GAS_PER_CHECKPOINT`) rather than arbitrary fixed values.
+
+A new `GasSettings.forEstimation()` method provides intentionally high gas limits for use during simulation. These limits exceed protocol maximums so the simulation doesn't hit gas caps — you must pass `skipTxValidation: true` when simulating with them, then use the results to set accurate gas limits on the actual transaction. `EmbeddedWallet` does this by default.
+
+**Migration:**
+
+```diff
+- import { DEFAULT_GAS_LIMIT, DEFAULT_TEARDOWN_GAS_LIMIT } from '@aztec/constants';
+- const settings = GasSettings.default({ maxFeesPerGas });
++ const settings = GasSettings.fallback({ maxFeesPerGas });
+```
+
+**Impact**: Any code referencing `GasSettings.default()`, `DEFAULT_GAS_LIMIT`, or `DEFAULT_TEARDOWN_GAS_LIMIT` will fail to compile.
+
 ### [PXE] `simulateTx`, `executeUtility`, `profileTx`, and `proveTx` no longer accept `scopes: 'ALL_SCOPES'`
 
 The `AccessScopes` type (`'ALL_SCOPES' | AztecAddress[]`) has been removed. The `scopes` field in `SimulateTxOpts`,
@@ -162,6 +180,7 @@ The `CustomMessageHandler` function type now receives an additional `scope: Azte
 ```
 
 **Impact**: Contracts that implement a custom message handler must update the function signature.
+
 ### [aztec.js] `DeployMethod.send()` always returns `{ contract, receipt, instance }`
 
 The `returnReceipt` option in deploy wait options has been removed. `DeployMethod.send()` now always returns an object with `contract`, `receipt`, and `instance` at the top level, provided the user waits for the transaction to be included.

docs/docs-developers/docs/resources/migration_notes.md

@@ -2,7 +2,7 @@ use crate::protocol::{hash::poseidon2_hash_bytes, traits::{Deserialize, Empty, F
 
 #[derive(Eq, Serialize, Deserialize)]
 pub struct AuthorizationSelector {
-    // 1st 4-bytes (big-endian leftmost) of abi-encoding of an event.
+    // Low 32 bits of the poseidon2 hash of the function signature.
     inner: u32,
 }
 

noir-projects/aztec-nr/aztec/src/authwit/authorization_selector.nr

@@ -1,9 +1,6 @@
-use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::{Serialize, ToField}};
+use crate::protocol::{abis::function_selector::FunctionSelector, address::AztecAddress, traits::Serialize};
 use std::meta::derive;
 
-// 3 * 32 + 3
-global FUNCTION_CALL_SIZE_IN_BYTES: u32 = 99;
-
 // @dev: If you change the following struct you have to update:
 // - account_entrypoint.ts (specifically `getEntrypointAbi()`)
 // - default_multi_call_entrypoint.ts (specifically `getEntrypointAbi()`)
@@ -21,25 +18,3 @@ pub struct FunctionCall {
     pub hide_msg_sender: bool,
     pub is_static: bool,
 }
-
-impl FunctionCall {
-    pub fn to_be_bytes(self) -> [u8; FUNCTION_CALL_SIZE_IN_BYTES] {
-        let mut bytes: [u8; FUNCTION_CALL_SIZE_IN_BYTES] = [0; FUNCTION_CALL_SIZE_IN_BYTES];
-        let args_hash_bytes: [u8; 32] = self.args_hash.to_be_bytes();
-        for i in 0..32 {
-            bytes[i] = args_hash_bytes[i];
-        }
-        let function_selector_bytes: [u8; 32] = self.function_selector.to_field().to_be_bytes();
-        for i in 0..32 {
-            bytes[i + 32] = function_selector_bytes[i];
-        }
-        let target_address_bytes: [u8; 32] = self.target_address.to_field().to_be_bytes();
-        for i in 0..32 {
-            bytes[i + 64] = target_address_bytes[i];
-        }
-        bytes[96] = self.is_public as u8;
-        bytes[97] = self.hide_msg_sender as u8;
-        bytes[98] = self.is_static as u8;
-        bytes
-    }
-}

noir-projects/aztec-nr/aztec/src/authwit/entrypoint/function_call.nr

@@ -1,6 +1,5 @@
 //! Private, public and utility execution contexts.
 
-pub mod globals;
 pub mod inputs;
 
 mod returns_hash;

noir-projects/aztec-nr/aztec/src/context/globals/mod.nr

@@ -39,7 +39,7 @@ use crate::protocol::{
         MAX_PRIVATE_CALL_STACK_LENGTH_PER_CALL, MAX_PRIVATE_LOGS_PER_CALL, MAX_TX_LIFETIME,
         NULL_MSG_SENDER_CONTRACT_ADDRESS, PRIVATE_LOG_CIPHERTEXT_LEN,
     },
-    hash::poseidon2_hash,
+    hash::compute_contract_class_log_hash,
     messaging::l2_to_l1_message::L2ToL1Message,
     side_effect::{Counted, scoped::Scoped},
     traits::{Empty, Hash, ToField},
@@ -942,6 +942,13 @@ impl PrivateContext {
         self.private_logs.push(private_log.count(counter));
     }
 
+    /// Emits large data blobs.
+    ///
+    /// This reuses the Contract Class Log channel to emit blobs of up to [`CONTRACT_CLASS_LOG_SIZE_IN_FIELDS`].
+    ///
+    /// ## Privacy
+    ///
+    /// The address of the contract emitting these blobs is revelead.
     pub fn emit_contract_class_log<let N: u32>(&mut self, log: [Field; N]) {
         let contract_address = self.this_address();
         let counter = self.next_counter();
@@ -953,10 +960,10 @@ impl PrivateContext {
         // Safety: The below length is constrained in the base rollup, which will make sure that all the fields beyond
         // length are zero. However, it won't be able to check that we didn't add extra padding (trailing zeroes) or
         // that we cut trailing zeroes from the end.
-        let length = unsafe { trimmed_array_length_hint(log_to_emit) };
+        let length = unsafe { trimmed_array_length_hint(log) };
         // We hash the entire padded log to ensure a user cannot pass a shorter length and so emit incorrect shorter
         // bytecode.
-        let log_hash = poseidon2_hash(log_to_emit);
+        let log_hash = compute_contract_class_log_hash(log_to_emit);
         // Safety: the below only exists to broadcast the raw log, so we can provide it to the base rollup later to be
         // constrained.
         unsafe {

noir-projects/aztec-nr/aztec/src/context/globals/public_global_variables.nr

@@ -2,7 +2,7 @@ use crate::protocol::{hash::poseidon2_hash_bytes, traits::{Deserialize, Empty, F
 
 #[derive(Deserialize, Eq, Serialize)]
 pub struct EventSelector {
-    // 1st 4-bytes (big-endian leftmost) of abi-encoding of an event.
+    // Low 32 bits of the poseidon2 hash of the event signature.
     inner: u32,
 }