feat: merge-train/fairies-v5#24134
Merged
Merged
Conversation
…Storage (#24112) Holds the active circuit recording in `AsyncLocalStorage` instead of shared instance fields, so nested and concurrent executions no longer corrupt each other's recording. **Problem:** `CircuitRecorder` kept mutable state (`recording`/`stackDepth`/`newCircuit`) on one per-PXE instance. Nested re-entrant executions (nested private calls via `aztec_prv_callPrivateFunction`, utility executions) shared that state, so a child could reset the parent's recording mid-flight and drop or misattribute oracle calls. The error path then dereferenced the absent recording and masked the real failure (e.g. `schnorr_initializerless: capsule load failed`). The first two commits guarded the crash; this fixes the cause and leaves the guards as redundant defense. **Fix:** - Per-execution recording lives in `AsyncLocalStorage` (mirrors `foundation/src/profiler/profiler.ts`) - `record(metadata, fn)` replaces `start`/`finish`/`finishWithError` and re-throws the original error unchanged. - No `CircuitSimulator` interface or consumer change. **Tests:** oracle-call attribution across nested private + utility re-entries (red before this change: parent `oracles` came back `undefined`), isolation of interleaved concurrent recordings, and original simulator error surfacing without masking.
Collaborator
Author
|
🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass. |
Collaborator
Author
Flakey Tests🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
BEGIN_COMMIT_OVERRIDE
fix(simulator): make circuit recorder concurrency-safe via AsyncLocalStorage (#24112)
refactor(pxe): restore satisfies-typed oracle registries (#24132)
END_COMMIT_OVERRIDE