fix: resolve cherry-pick conflicts from #23007

- yarn-project/end-to-end/src/fixtures/setup.ts:
  Insert pxeCreationOptions field at the equivalent position
  (end of SetupOptions, after walletMinFeePadding) since
  skipInitialSequencer doesn't exist on this branch.

- yarn-project/pxe/src/contract_function_simulator/oracle/private_execution_oracle.ts:
  Add 'hooks: this.hooks,' to the args passed when constructing
  the child PrivateExecutionOracle, between simulator and
  l2TipsStore (as in #23007). this.hooks resolves via inherited
  protected field on UtilityExecutionOracle.

Author: AztecBot

yarn-project/end-to-end/src/fixtures/setup.ts

@@ -203,6 +203,8 @@ export type SetupOptions = {
   l1ContractsArgs?: Partial<DeployAztecL1ContractsArgs>;
   /** Wallet minimum fee padding multiplier (defaults to 0.5, which is 50% padding). */
   walletMinFeePadding?: number;
+  /** Options forwarded to PXE creation (e.g. execution hooks). */
+  pxeCreationOptions?: PXECreationOptions;
 } & Partial<AztecNodeConfig>;
 
 /** Context for an end-to-end test as returned by the `setup` function */

yarn-project/end-to-end/src/fixtures/setup.ts.rej

@@ -581,6 +581,7 @@ export class PrivateExecutionOracle extends UtilityExecutionOracle implements IP
       log: this.logger,
       senderForTags: this.defaultSenderForTags,
       simulator: this.simulator,
+      hooks: this.hooks,
       l2TipsStore: this.l2TipsStore,
     });