Merge branch 'merge-train/spartan-v5' into phil/bench-integration-v5

Author: PhilWindle

.github/workflows/pull-request-title.yml

@@ -28,6 +28,7 @@ jobs:
           types: |
             fix
             feat
+            perf
             chore
             refactor
             docs

.test_patterns.yml

@@ -108,45 +108,41 @@ tests:
     skip: true
     owners:
       - *alex
-  - regex: "src/e2e_fees/private_payments"
+  - regex: "src/single-node/fees/private_payments"
     owners:
       - *phil
-  - regex: "src/e2e_token_contract/access_control"
+  - regex: "src/automine/token/access_control"
     error_regex: "HttpRequestError: HTTP request failed."
     owners:
       - *charlie
-  - regex: "src/e2e_lending_contract"
+  - regex: "src/automine/token/lending"
     error_regex: "✕ Depositing"
     owners:
       - *lasse
-  - regex: "src/e2e_lending_contract"
+  - regex: "src/automine/token/lending"
     error_regex: "✕ Repay"
     owners:
       - *lasse
-  - regex: "src/e2e_cross_chain_messaging/l1_to_l2"
+  - regex: "src/single-node/cross-chain/l1_to_l2"
     owners:
       - *palla
-  - regex: "src/e2e_cross_chain_messaging/token_bridge_private"
+  - regex: "src/single-node/cross-chain/token_bridge_private"
     error_regex: "✕ Claim secret is enough to consume the message"
     owners:
       - *lasse
-  - regex: "src/e2e_cross_chain_messaging/token_bridge_public"
+  - regex: "src/single-node/cross-chain/token_bridge_public"
     error_regex: "✕ Someone else can mint funds to me on my behalf"
     owners:
       - *lasse
-  - regex: "src/e2e_cross_chain_messaging/token_bridge_public"
+  - regex: "src/single-node/cross-chain/token_bridge_public"
     error_regex: "✕ Publicly deposit funds"
     owners:
       - *lasse
-  - regex: "src/e2e_cross_chain_messaging/token_bridge_failure_cases"
+  - regex: "src/single-node/cross-chain/token_bridge_failure_cases"
     error_regex: "✕ Can't claim funds"
     owners:
       - *lasse
-  - regex: "src/e2e_l1_publisher/e2e_l1_publisher.test.ts"
-    error_regex: "Anvil failed to stop in time|Cannot read properties of undefined"
-    owners:
-      - *palla
-  - regex: "src/e2e_bot.test.ts"
+  - regex: "src/single-node/bot/bot.test.ts"
     error_regex: "Tx dropped"
     owners:
       - *palla
@@ -185,10 +181,6 @@ tests:
     error_regex: "ContractFunctionExecutionError: The contract function"
     owners:
       - *mitch
-  - regex: "e2e_p2p/valid_epoch_pruned_slash.test.ts"
-    owners:
-      - *mitch
-      - *palla
   - regex: "archiver/src/archiver/archiver.test.ts"
     error_regex: "Received number of calls: 1"
     owners:
@@ -201,6 +193,10 @@ tests:
     owners:
       - *phil
       - *palla
+  - regex: "sequencer-client/src/publisher/l1_publisher.integration.test.ts"
+    error_regex: "Anvil failed to stop in time|Cannot read properties of undefined"
+    owners:
+      - *palla
 
   # Nightly GKE tests
   - regex: "spartan/bootstrap.sh"
@@ -225,7 +221,7 @@ tests:
     owners:
       - *adam
 
-  - regex: "yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_bot.test.ts"
+  - regex: "yarn-project/end-to-end/scripts/run_test.sh simple src/single-node/bot/bot.test.ts"
     error_regex: "Nonce provided for the transaction is lower than the current nonce of the account"
     owners:
       - *adam
@@ -290,7 +286,7 @@ tests:
   # Blanket flake patterns for unstable p2p, epoch, and l1 tx utils tests
   # This is a temporary measure while team bandwidth is constrained
   # Replaced many specific patterns - see https://github.com/AztecProtocol/aztec-packages/pull/17962 for historical context
-  - regex: "src/e2e_p2p/.*\\.test\\.ts"
+  - regex: "src/p2p/.*\\.test\\.ts"
     flake_group_id: e2e-p2p-epoch-flakes
     owners:
       - *phil
@@ -305,6 +301,11 @@ tests:
     owners:
       - *palla
 
+  - regex: "src/automine/.*\\.test\\.ts"
+    flake_group_id: e2e-p2p-epoch-flakes
+    owners:
+      - *palla
+
   - regex: "p2p/src/client/test/.*\\.test\\.ts"
     flake_group_id: e2e-p2p-epoch-flakes
     owners:
@@ -330,12 +331,16 @@ tests:
       - *leila
 
   # http://ci.aztec-labs.com/61d96be1402847b1
+  # The L1↔L2 bridging flow sends its L1 txs against an automining anvil that the
+  # local-network sequencer and cheat codes also drive; under load a tx can sit
+  # unmined past viem's confirmation timeout, surfacing as either the jest per-test
+  # timeout or a viem WaitForTransactionReceiptTimeoutError (http://ci.aztec-labs.com/1643e817d7242e0e).
   - regex: "src/composed/e2e_token_bridge_tutorial_test.test.ts"
-    error_regex: "Exceeded timeout of [0-9]+ ms for a test"
+    error_regex: "Exceeded timeout of [0-9]+ ms for a test|WaitForTransactionReceiptTimeoutError: Timed out while waiting for transaction"
     owners:
       - *palla
 
-  - regex: "e2e_block_building"
+  - regex: "src/single-node/block-building/block_building.test.ts"
     error_regex: "✕ processes txs until hitting timetable"
     owners:
       - *palla
@@ -368,7 +373,7 @@ tests:
     owners:
       - *lasse
 
-  - regex: "yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_fees/gas_estimation.test.ts"
+  - regex: "yarn-project/end-to-end/scripts/run_test.sh simple src/single-node/fees/gas_estimation.parallel.test.ts"
     error_regex: "timeout: sending signal TERM to command 'bash'"
     owners:
       - *alex
@@ -383,7 +388,7 @@ tests:
   # p2p checkpoint-attestation-validator's acceptance window, getting rejected
   # before the slasher's gossip callback fires. The slasher then never records
   # ATTESTED_TO_INVALID_CHECKPOINT_PROPOSAL and the test times out.
-  - regex: "src/e2e_slashing/attested_invalid_proposal.test.ts"
+  - regex: "src/multi-node/slashing/attested_invalid_proposal.parallel.test.ts"
     error_regex: "Timeout awaiting honest validator slash offenses for invalid proposal attestation"
     owners:
       - *palla
@@ -394,22 +399,17 @@ tests:
 
   # http://ci.aztec-labs.com/98d59d04f85223f8
   # Build-cache flake: module not found during Jest startup
-  - regex: "src/e2e_sequencer/gov_proposal.parallel.test.ts"
+  - regex: "src/single-node/sequencer/gov_proposal.parallel.test.ts"
     error_regex: "Cannot find module '@aztec/sequencer-client/config'"
     owners:
       - *palla
 
   # http://ci.aztec-labs.com/153f5dcbb0f3799c
-  - regex: "src/e2e_offchain_payment.test.ts"
+  - regex: "src/automine/effects/offchain_payment.parallel.test.ts"
     error_regex: "✕ reprocesses an offchain-delivered payment after an L1 reorg"
     owners:
       - *martin
 
-  - regex: "yarn-project/scripts/run_test.sh bb-prover/src/avm_proving_tests/avm_"
-    error_regex: "timeout: sending signal"
-    owners:
-      - *charlie
-
   - regex: "run_test.sh simple tx_stats_bench"
     error_regex: "✕ verifies transactions at 10 TPS"
     owners:

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

@@ -51,10 +51,10 @@ template <typename LookupSettings_> class IndexedLookupTraceBuilder : public Int
             }
 
             trace.set(LookupSettings::COUNTS, dst_row, trace.get(LookupSettings::COUNTS, dst_row) + 1);
-            // Set the fine grained inner selector if it's not already one.
-            if (LookupSettings::DST_SELECTOR != this->outer_dst_selector &&
-                trace.get(LookupSettings::DST_SELECTOR, dst_row) != 1) {
-                trace.set(LookupSettings::DST_SELECTOR, dst_row, 1);
+            if (LookupSettings::DST_SELECTOR != this->outer_dst_selector) {
+                // This step might write to the same cell from multiple threads, so we use atomic limbs to avoid UB.
+                // Since we are always writing a 1, the end result will be 1 even under concurrency.
+                trace.set(LookupSettings::DST_SELECTOR, dst_row, 1, /*use_atomic_limbs=*/true);
             }
         });
     }
@@ -198,10 +198,10 @@ template <typename LookupSettings> class LookupIntoDynamicTableSequential : publ
                 if (dst_selector == 1 && src_values == trace.get_multiple(LookupSettings::DST_COLUMNS, dst_row)) {
                     trace.set(LookupSettings::COUNTS, dst_row, trace.get(LookupSettings::COUNTS, dst_row) + 1);
 
-                    // Set the fine grained inner selector if it's not already one.
-                    if (LookupSettings::DST_SELECTOR != this->outer_dst_selector &&
-                        trace.get(LookupSettings::DST_SELECTOR, dst_row) != 1) {
-                        trace.set(LookupSettings::DST_SELECTOR, dst_row, 1);
+                    if (LookupSettings::DST_SELECTOR != this->outer_dst_selector) {
+                        // This step might write to the same cell from multiple threads, so we use atomic limbs to avoid
+                        // UB. Since we are always writing a 1, the end result will be 1 even under concurrency.
+                        trace.set(LookupSettings::DST_SELECTOR, dst_row, 1, /*use_atomic_limbs=*/true);
                     }
 
                     found = true;