fix: phase and fee fixes to AVM sim and tracegen (#16540)

Author: dbanks12

barretenberg/cpp/src/barretenberg/vm2/simulation/execution.cpp

@@ -1144,8 +1144,6 @@ ExecutionResult Execution::execute(std::unique_ptr<ContextInterface> enqueued_ca
 
         // State after the opcode.
         ex_event.after_context_event = context.serialize_context_event();
-        // TODO(dbanks12): fix phase. Should come from TX execution and be forwarded to nested calls.
-        ex_event.after_context_event.phase = TransactionPhase::APP_LOGIC;
         events.emit(std::move(ex_event));
 
         // If the context has halted, we need to exit the external call.

barretenberg/cpp/src/barretenberg/vm2/simulation/tx_execution.cpp

@@ -174,8 +174,7 @@ void TxExecution::simulate(const Tx& tx)
             tx_context.side_effect_states = result.side_effect_states;
             // Check what to do here for GAS
             emit_public_call_request(*tx.teardownEnqueuedCall,
-                                     // TODO(dbanks12): This should be TEARDOWN.
-                                     TransactionPhase::APP_LOGIC,
+                                     TransactionPhase::TEARDOWN,
                                      fee,
                                      result.success,
                                      start_gas,

barretenberg/cpp/src/barretenberg/vm2/tracegen/execution_trace.cpp

@@ -350,9 +350,10 @@ void ExecutionTraceBuilder::process(
                 { C::execution_context_id, ex_event.after_context_event.id },
                 { C::execution_parent_id, ex_event.after_context_event.parent_id },
                 { C::execution_pc, ex_event.before_context_event.pc },
-                { C::execution_is_static, ex_event.after_context_event.is_static },
                 { C::execution_msg_sender, ex_event.after_context_event.msg_sender },
                 { C::execution_contract_address, ex_event.after_context_event.contract_addr },
+                { C::execution_transaction_fee, ex_event.after_context_event.transaction_fee },
+                { C::execution_is_static, ex_event.after_context_event.is_static },
                 { C::execution_parent_calldata_addr, ex_event.after_context_event.parent_cd_addr },
                 { C::execution_parent_calldata_size, ex_event.after_context_event.parent_cd_size_addr },
                 { C::execution_last_child_returndata_addr, ex_event.after_context_event.last_child_rd_addr },

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit1.test.ts

@@ -12,7 +12,7 @@ import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
-const TIMEOUT = 100_000;
+const TIMEOUT = 30_000;
 
 describe.skip('AVM check-circuit – unhappy paths 1', () => {
   let avmTestContractInstance: ContractInstanceWithAddress;

yarn-project/bb-prover/src/avm_proving_tests/avm_check_circuit2.test.ts

@@ -5,9 +5,9 @@ import type { ContractInstanceWithAddress } from '@aztec/stdlib/contract';
 
 import { AvmProvingTester } from './avm_proving_tester.js';
 
-const TIMEOUT = 100_000;
+const TIMEOUT = 30_000;
 
-describe.skip('AVM check-circuit – unhappy paths 2', () => {
+describe('AVM check-circuit – unhappy paths 2', () => {
   const sender = AztecAddress.fromNumber(42);
   let avmTestContractInstance: ContractInstanceWithAddress;
   let tester: AvmProvingTester;
@@ -21,7 +21,7 @@ describe.skip('AVM check-circuit – unhappy paths 2', () => {
     );
   });
 
-  it(
+  it.skip(
     'an exceptional halt due to a nested call to non-existent contract is propagated to top-level',
     async () => {
       await tester.simProveVerifyAppLogic(
@@ -44,7 +44,7 @@ describe.skip('AVM check-circuit – unhappy paths 2', () => {
   //   TIMEOUT,
   // );
 
-  it('top-level exceptional halts due to a non-existent contract in app-logic and teardown', async () => {
+  it.skip('top-level exceptional halts due to a non-existent contract in app-logic and teardown', async () => {
     // don't insert contracts into trees, and make sure retrieval fails
     const tester = await AvmProvingTester.new(/*checkCircuitOnly=*/ true);
     await tester.simProveVerify(
@@ -62,7 +62,8 @@ describe.skip('AVM check-circuit – unhappy paths 2', () => {
     );
   });
 
-  it(
+  // TODO: unskip once internalcall constraints are fixed (DEFAULT_PROPAGATE_CALL_ID in particular)
+  it.skip(
     'enqueued calls in every phase, with enqueued calls that depend on each other',
     async () => {
       await tester.simProveVerify(
@@ -85,7 +86,7 @@ describe.skip('AVM check-circuit – unhappy paths 2', () => {
     },
     TIMEOUT,
   );
-  it(
+  it.skip(
     'Should prove and verify a TX that reverts in teardown',
     async () => {
       await tester.simProveVerify(