Skip to content

fix!: dsl inf#21865

Merged
ledwards2225 merged 5 commits into
merge-train/barretenbergfrom
lde/dsl-inf
Mar 24, 2026
Merged

fix!: dsl inf#21865
ledwards2225 merged 5 commits into
merge-train/barretenbergfrom
lde/dsl-inf

Conversation

@ledwards2225

@ledwards2225 ledwards2225 commented Mar 20, 2026

Copy link
Copy Markdown
Contributor

Explicitly connect the infinity flags for grumpkin points generated in acir to their counterparts in cycle group in the DSL module. Credit: @suyash67

@ledwards2225 ledwards2225 marked this pull request as ready for review March 20, 2026 19:43
@ledwards2225 ledwards2225 added the ci-full Run all master checks. label Mar 20, 2026
@ledwards2225 ledwards2225 requested a review from suyash67 March 20, 2026 20:53

@suyash67 suyash67 left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks, looks good.

@ledwards2225 ledwards2225 enabled auto-merge (squash) March 23, 2026 17:10
github-merge-queue Bot pushed a commit that referenced this pull request Mar 23, 2026
…1909)

## Summary

- Pin `typescript@^5.3.3` in docs examples validation to match
`yarn-project`. The unpinned `yarn add -D typescript` started pulling
TypeScript 6.0, which changed JSON import type inference and made
existing `@ts-expect-error` directives unused (TS2578 errors), breaking
`example_swap` type-checking.
- Use git state (`git show HEAD:...`) instead of filesystem state (`-s`)
for yarn.lock emptiness check. When `example_swap` fails, GNU parallel's
`--halt now,fail=1` kills other jobs mid-`yarn add` before cleanup traps
run, leaving lockfiles dirty on disk. On retry, the check found dirty
filesystem state and reported the misleading `token_bridge/yarn.lock is
not empty` error.

## Context

Multiple unrelated PRs (#21865, #21907, #21812) are failing with:
```
ERROR: token_bridge/yarn.lock is not empty. These files must be committed empty.
```

Root cause chain:
1. `yarn add -D typescript` (unpinned) pulls TS 6.0, released today
2. TS 6.0 improved JSON import type inference, making `@ts-expect-error`
directives unused → TS2578 errors in `example_swap`
3. `example_swap` fails → `--halt now,fail=1` kills `token_bridge`
mid-`yarn add` → cleanup trap never runs
4. Retry finds dirty `token_bridge/yarn.lock` on filesystem → misleading
error

## Test plan

- [ ] CI passes on this PR (docs examples validation succeeds)
- [ ] Verify `example_swap` and `token_bridge` type-check cleanly with
pinned TS 5.x

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@ledwards2225 ledwards2225 changed the base branch from merge-train/barretenberg to next March 23, 2026 21:15
@ledwards2225 ledwards2225 changed the base branch from next to merge-train/barretenberg March 23, 2026 21:16
Base automatically changed from merge-train/barretenberg to next March 24, 2026 00:19
@ledwards2225 ledwards2225 changed the base branch from next to merge-train/barretenberg March 24, 2026 03:30
@AztecBot

Copy link
Copy Markdown
Collaborator

Flakey Tests

🤖 says: This CI run detected 1 tests that failed, but were tolerated due to a .test_patterns.yml entry.

\033FLAKED\033 (8;;http://ci.aztec-labs.com/bf89d8cd83f86d04�bf89d8cd83f86d048;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_ha_sync.test.ts (68s) (code: 0) group:e2e-p2p-epoch-flakes

@ledwards2225 ledwards2225 merged commit c0a4818 into merge-train/barretenberg Mar 24, 2026
20 of 21 checks passed
@ledwards2225 ledwards2225 deleted the lde/dsl-inf branch March 24, 2026 04:12
github-merge-queue Bot pushed a commit that referenced this pull request Mar 24, 2026
BEGIN_COMMIT_OVERRIDE
fix!: dsl inf (#21865)
END_COMMIT_OVERRIDE
ledwards2225 added a commit that referenced this pull request Apr 10, 2026
| # | Finding | Resolution |
  |---|---------|------------|                                          
| 3, 12 | Msgpack NIL produces null `shared_ptr`, dereferenced in ACIR
parsers | **Patched.** NIL rejection in deserializer helpers, plus tests
|
| 6 | `result_infinite` unconstrained in EC gadgets; prover could forge
it | **Already fixed** in PR #21865 |
| 9 | `assert_valid_variables` debug-only, heap-allocated a vector per
call | **Patched.** Updated to use `initializer_list`/`span` to make
cheap enough, always-on, (check in `get_variable` too expensive) |
| 16 | Sparse witness map amplifies ~10 bytes into ~137 GB allocation |
**Accepted risk.** No cap works without potentially rejecting valid
inputs |
| 20 | UB shift-by-64 in `get_wnaf_bits`; hash tests Ultra-only |
**Patched.** Fixed UB, added Mega coverage to 4 test suites |
| 21 | Clang under-aligns NTTP objects, UB in `barrett_reduction` |
**Patched.** Root cause different than claimed in issue (see
`static_assert` guards), Pointer NTTP refactor resolves UB per UBsan |
critesjosh pushed a commit that referenced this pull request Apr 14, 2026
| # | Finding | Resolution |
  |---|---------|------------|                                          
| 3, 12 | Msgpack NIL produces null `shared_ptr`, dereferenced in ACIR
parsers | **Patched.** NIL rejection in deserializer helpers, plus tests
|
| 6 | `result_infinite` unconstrained in EC gadgets; prover could forge
it | **Already fixed** in PR #21865 |
| 9 | `assert_valid_variables` debug-only, heap-allocated a vector per
call | **Patched.** Updated to use `initializer_list`/`span` to make
cheap enough, always-on, (check in `get_variable` too expensive) |
| 16 | Sparse witness map amplifies ~10 bytes into ~137 GB allocation |
**Accepted risk.** No cap works without potentially rejecting valid
inputs |
| 20 | UB shift-by-64 in `get_wnaf_bits`; hash tests Ultra-only |
**Patched.** Fixed UB, added Mega coverage to 4 test suites |
| 21 | Clang under-aligns NTTP objects, UB in `barrett_reduction` |
**Patched.** Root cause different than claimed in issue (see
`static_assert` guards), Pointer NTTP refactor resolves UB per UBsan |
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

ci-full Run all master checks.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants