test: keep avm_simulator in compat matrix, loosen assertion regex

Accept either 'not_true == true' (older nargo) or
'assert(not_true == true, "This assertion should fail!")' (post-#22911)
in the public-error enrichment test. Drops the avm_simulator exclusion
from compat_test_cmds added in the prior commit; only event_logs remains
excluded (legacy artifacts don't have deliver_squashed_and_surviving_notes).

Author: AztecBot

yarn-project/end-to-end/bootstrap.sh

@@ -262,9 +262,8 @@ function avm_check_circuit {
 # tests are known-flaky and provide no additional backwards-compat coverage). Also excludes
 # kernelless_simulation, which asserts on the exact number of nullifiers emitted and breaks whenever
 # contracts add/remove nullifier emissions across versions (unrelated to the compat contract surface).
-# event_logs and avm_simulator are excluded for the same reason: they exercise contract surface that
-# evolves alongside the test code (TestLog gains methods, AVM assertion-string format changes with
-# nargo) rather than the PXE oracle surface that backwards compatibility actually guarantees.
+# event_logs is excluded because the new tagging-cache reconciliation test (#23044) calls a
+# TestLog method (deliver_squashed_and_surviving_notes) that does not exist in legacy artifacts.
 function compat_test_cmds {
   local version=${1:?version is required}
   local run_test_script="yarn-project/end-to-end/scripts/run_test.sh"
@@ -274,7 +273,7 @@ function compat_test_cmds {
   local tests=(
     src/e2e_!(prover|block_building|epochs)/*.test.ts
     src/e2e_p2p/reqresp/*.test.ts
-    src/e2e_!(block_building|prover_*|kernelless_simulation|event_logs|avm_simulator).test.ts
+    src/e2e_!(block_building|prover_*|kernelless_simulation|event_logs).test.ts
   )
   for test in "${tests[@]}"; do
     local name=${test#*e2e_}

yarn-project/end-to-end/src/e2e_avm_simulator.test.ts

@@ -56,16 +56,19 @@ describe('e2e_avm_simulator', () => {
        * at function.name();
        * let call = quote { $name($args) (/home/aztec-dev/aztec-packages/noir-projects/aztec-nr/aztec/src/macros/dispatch.nr:59:20)
        * at AvmTest.0xc3515746
+       *
+       * Older nargo (pre-#22911) recorded the assertion span as the inner boolean expression only,
+       * so legacy contract artifacts under compat-e2e emit `'not_true == true'` instead of the full
+       * `'assert(not_true == true, "This assertion should fail!")'`. The regex below accepts either
+       * form so the test passes against both current-nargo artifacts and pinned legacy artifacts.
        */
       describe('Not nested', () => {
         it('PXE processes user code assertions and recovers message (properly enriched)', async () => {
           await expect(
             avmContract.methods.assertion_failure().simulate({ from: defaultAccountAddress }),
           ).rejects.toThrow(
             expect.objectContaining({
-              message: expect.stringMatching(
-                /Assertion failed: This assertion should fail! 'assert\(not_true == true, "This assertion should fail!"\)'/,
-              ),
+              message: expect.stringMatching(/Assertion failed: This assertion should fail!.*not_true == true/),
               stack: expect.stringMatching(/at inner_helper_with_failed_assertion[\s\S]*at AvmTest\..*/),
             }),
           );