refactor: remove PublicExecutor

noir-projects/noir-contracts/contracts/token_contract/src/test/refunds.nr

@@ -1,20 +1,30 @@
 use crate::{test::utils, Token};
 use aztec::oracle::random::random;
+use aztec::protocol_types::abis::gas::Gas;
+use aztec::protocol_types::abis::gas_fees::GasFees;
 
 use dep::authwit::cheatcodes as authwit_cheatcodes;
 use std::test::OracleMock;
 
 #[test]
 unconstrained fn setup_refund_success() {
+    // Gas used to compute transaction fee
+    // TXE oracle uses gas_used = Gas(1,1) when crafting TX
+    let txe_expected_gas_used = Gas::new(1, 1);
+    // TXE oracle uses default gas fees
+    let txe_gas_fees = GasFees::default();
+    let expected_tx_fee = txe_expected_gas_used.compute_fee(txe_gas_fees);
+
+    // Fund account with enough to cover tx fee plus some
+    let funded_amount = 1_000 + expected_tx_fee;
+
     let (env, token_contract_address, owner, recipient, mint_amount) =
-        utils::setup_and_mint_to_private(true);
+        utils::setup_and_mint_amount_to_private(true, funded_amount);
 
     // Renaming owner and recipient to match naming in Token
     let user = owner;
     let fee_payer = recipient;
 
-    let funded_amount = 1_000;
-
     // We use the same randomness for both the fee payer, the user and the nonce as we currently don't have
     // `OracleMock::mock_once()`
     let fee_payer_randomness = 123;
@@ -44,19 +54,19 @@ unconstrained fn setup_refund_success() {
         env,
         token_contract_address,
         fee_payer,
-        1,
+        expected_tx_fee,
         fee_payer_randomness,
     );
     utils::add_token_note(
         env,
         token_contract_address,
         user,
-        funded_amount - 1,
+        funded_amount - expected_tx_fee,
         user_randomness,
     );
 
-    utils::check_private_balance(token_contract_address, user, mint_amount - 1);
-    utils::check_private_balance(token_contract_address, fee_payer, 1)
+    utils::check_private_balance(token_contract_address, user, mint_amount - expected_tx_fee);
+    utils::check_private_balance(token_contract_address, fee_payer, expected_tx_fee)
 }
 
 // This test should be reworked when final support for partial notes is in

noir-projects/noir-contracts/contracts/token_contract/src/test/utils.nr

@@ -56,19 +56,25 @@ pub unconstrained fn setup_and_mint_to_public(
     (env, token_contract_address, owner, recipient, mint_amount)
 }
 
-pub unconstrained fn setup_and_mint_to_private(
+pub unconstrained fn setup_and_mint_amount_to_private(
     with_account_contracts: bool,
+    mint_amount: Field,
 ) -> (&mut TestEnvironment, AztecAddress, AztecAddress, AztecAddress, Field) {
     // Setup the tokens and mint public balance
     let (env, token_contract_address, owner, recipient) = setup(with_account_contracts);
 
     // Mint some tokens
-    let mint_amount = 10000;
     mint_to_private(env, token_contract_address, owner, mint_amount);
 
     (env, token_contract_address, owner, recipient, mint_amount)
 }
 
+pub unconstrained fn setup_and_mint_to_private(
+    with_account_contracts: bool,
+) -> (&mut TestEnvironment, AztecAddress, AztecAddress, AztecAddress, Field) {
+    setup_and_mint_amount_to_private(with_account_contracts, 10000)
+}
+
 pub unconstrained fn mint_to_private(
     env: &mut TestEnvironment,
     token_contract_address: AztecAddress,

yarn-project/aztec-node/src/aztec-node/server.ts

@@ -71,7 +71,7 @@ import {
 } from '@aztec/p2p';
 import { ProtocolContractAddress } from '@aztec/protocol-contracts';
 import { GlobalVariableBuilder, SequencerClient } from '@aztec/sequencer-client';
-import { PublicProcessorFactory, createSimulationProvider } from '@aztec/simulator';
+import { PublicProcessorFactory } from '@aztec/simulator';
 import { type TelemetryClient } from '@aztec/telemetry-client';
 import { NoopTelemetryClient } from '@aztec/telemetry-client/noop';
 import { createValidatorClient } from '@aztec/validator-client';
@@ -160,8 +160,6 @@ export class AztecNodeService implements AztecNode {
     // start both and wait for them to sync from the block source
     await Promise.all([p2pClient.start(), worldStateSynchronizer.start()]);
 
-    const simulationProvider = await createSimulationProvider(config, log);
-
     const validatorClient = createValidatorClient(config, p2pClient, telemetry);
 
     // now create the sequencer
@@ -175,7 +173,6 @@ export class AztecNodeService implements AztecNode {
           archiver,
           archiver,
           archiver,
-          simulationProvider,
           telemetry,
         );
 

yarn-project/bb-prover/src/avm_proving.test.ts

@@ -147,9 +147,8 @@ const proveAndVerifyAvmTestContract = async (
   const pxResult = trace.toPublicFunctionCallResult(
     environment,
     startGas,
-    /*endGasLeft=*/ Gas.from(context.machineState.gasLeft),
     /*bytecode=*/ simulator.getBytecode()!,
-    avmResult,
+    avmResult.finalize(),
     functionName,
   );
 

yarn-project/circuit-types/src/public_execution_request.ts

@@ -1,4 +1,4 @@
-import { CallContext, type PublicCallRequest, Vector } from '@aztec/circuits.js';
+import { CallContext, PublicCallRequest, Vector } from '@aztec/circuits.js';
 import { computeVarArgsHash } from '@aztec/circuits.js/hash';
 import { Fr } from '@aztec/foundation/fields';
 import { schemas } from '@aztec/foundation/schemas';
@@ -82,9 +82,19 @@ export class PublicExecutionRequest {
     );
   }
 
+  toCallRequest(): PublicCallRequest {
+    return new PublicCallRequest(
+      this.callContext.msgSender,
+      this.callContext.contractAddress,
+      this.callContext.functionSelector,
+      this.callContext.isStaticCall,
+      computeVarArgsHash(this.args),
+    );
+  }
+
   [inspect.custom]() {
     return `PublicExecutionRequest {
-      callContext: ${this.callContext}
+      callContext: ${inspect(this.callContext)}
       args: ${this.args}
     }`;
   }

yarn-project/circuit-types/src/stats/metrics.ts

@@ -37,12 +37,6 @@ export const Metrics = [
     description: 'Time to simulate an AVM program.',
     events: ['avm-simulation'],
   },
-  {
-    name: 'avm_simulation_bytecode_size_in_bytes',
-    groupBy: 'app-circuit-name',
-    description: 'Uncompressed bytecode size for an AVM program.',
-    events: ['avm-simulation'],
-  },
   {
     name: 'proof_construction_time_sha256_ms',
     groupBy: 'threads',

yarn-project/circuit-types/src/stats/stats.ts

@@ -123,8 +123,6 @@ export type AvmSimulationStats = {
   appCircuitName: string;
   /** Duration in ms. */
   duration: number;
-  /** Uncompressed bytecode size. */
-  bytecodeSize: number;
 };
 
 /** Stats for witness generation. */

yarn-project/circuit-types/src/tx/tx.ts

@@ -119,6 +119,35 @@ export class Tx extends Gossipable {
     );
   }
 
+  static empty() {
+    return new Tx(
+      PrivateKernelTailCircuitPublicInputs.emptyWithNullifier(),
+      ClientIvcProof.empty(),
+      EncryptedNoteTxL2Logs.empty(),
+      EncryptedTxL2Logs.empty(),
+      UnencryptedTxL2Logs.empty(),
+      ContractClassTxL2Logs.empty(),
+      [],
+      PublicExecutionRequest.empty(),
+    );
+  }
+
+  static newWithTxData(
+    data: PrivateKernelTailCircuitPublicInputs,
+    publicTeardownExecutionRequest?: PublicExecutionRequest,
+  ) {
+    return new Tx(
+      data,
+      ClientIvcProof.empty(),
+      EncryptedNoteTxL2Logs.empty(),
+      EncryptedTxL2Logs.empty(),
+      UnencryptedTxL2Logs.empty(),
+      ContractClassTxL2Logs.empty(),
+      [],
+      publicTeardownExecutionRequest ? publicTeardownExecutionRequest : PublicExecutionRequest.empty(),
+    );
+  }
+
   /**
    * Serializes the Tx object into a Buffer.
    * @returns Buffer representation of the Tx object.

yarn-project/circuits.js/src/structs/call_context.ts

@@ -5,6 +5,7 @@ import { schemas } from '@aztec/foundation/schemas';
 import { BufferReader, FieldReader, serializeToBuffer, serializeToFields } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
+import { inspect } from 'util';
 import { z } from 'zod';
 
 import { CALL_CONTEXT_LENGTH } from '../constants.gen.js';
@@ -125,4 +126,13 @@ export class CallContext {
       callContext.isStaticCall === this.isStaticCall
     );
   }
+
+  [inspect.custom]() {
+    return `CallContext {
+      msgSender: ${this.msgSender}
+      contractAddress: ${this.contractAddress}
+      functionSelector: ${this.functionSelector}
+      isStaticCall: ${this.isStaticCall}
+    }`;
+  }
 }

yarn-project/circuits.js/src/structs/kernel/tx_constant_data.ts

@@ -2,6 +2,9 @@ import { Fr } from '@aztec/foundation/fields';
 import { BufferReader, FieldReader, serializeToBuffer } from '@aztec/foundation/serialize';
 import { type FieldsOf } from '@aztec/foundation/types';
 
+import { Gas } from '../gas.js';
+import { GasFees } from '../gas_fees.js';
+import { GasSettings } from '../gas_settings.js';
 import { Header } from '../header.js';
 import { TxContext } from '../tx_context.js';
 
@@ -67,6 +70,12 @@ export class TxConstantData {
     return new TxConstantData(Header.empty(), TxContext.empty(), Fr.ZERO, Fr.ZERO);
   }
 
+  static newWithGasLimits(gasLimits: Gas) {
+    const gasSettings = new GasSettings(gasLimits, Gas.empty(), GasFees.empty());
+    const txContext = new TxContext(Fr.ZERO, Fr.ZERO, gasSettings);
+    return new TxConstantData(Header.empty(), txContext, Fr.ZERO, Fr.ZERO);
+  }
+
   getSize() {
     return (
       this.historicalHeader.getSize() +

yarn-project/ivc-integration/src/avm_integration.test.ts

@@ -238,9 +238,8 @@ const proveAvmTestContract = async (
   const pxResult = trace.toPublicFunctionCallResult(
     environment,
     startGas,
-    /*endGasLeft=*/ Gas.from(context.machineState.gasLeft),
     /*bytecode=*/ simulator.getBytecode()!,
-    avmResult,
+    avmResult.finalize(),
     functionName,
   );