Skip to content

feat: merge-train/fairies#21103

Merged
AztecBot merged 22 commits intonextfrom
merge-train/fairies
Mar 5, 2026
Merged

feat: merge-train/fairies#21103
AztecBot merged 22 commits intonextfrom
merge-train/fairies

Conversation

@AztecBot
Copy link
Collaborator

@AztecBot AztecBot commented Mar 4, 2026

BEGIN_COMMIT_OVERRIDE
chore: remove prefund env var in non local networks (#21095)
feat: aztec new supporting multiple contract crates (#21007)
feat!: Expose offchain effects when simulating/sending txs (#20563)
chore: exclude auto-generated dirs from VS Code search (#20881)
feat: improve oracle name prefixes (#21101)
fix(pxe): correct contract class log DA gas metering from +2 to +1 (#21102)
chore: remove stale aes comments (#21133)
chore: add warning on invalid recipients (#21134)
feat: mask ciphertext fields with Poseidon2-derived values (#21009)
END_COMMIT_OVERRIDE

@mverzilli mverzilli requested a review from a team as a code owner March 4, 2026 14:29
benesjan and others added 4 commits March 4, 2026 23:33
This adds the `aztec` namespace prefix to all oracles. We need this for
noir-lang/noir#10105, so that we can get
proper error messages on `nargo` that link to aztec docs.

It also shortens the current prefixes:
- `utility` → `utl`
- `private` → `prv`
- `avmOpcode` → `avm`
- `txe` unchanged

The prefixes only exist as the actual oracle name in the nr <> ts
communication layer, they are not present in the nr code nor ts code. I
actually removed the current prefixes from oracle handler fn (e.g.
`utilityGetBlockNumber` becomes `getBlockNumber`) to reduce verbosity
and repetitiveness, given that those functions already exist in
interfaces that scope the oracles that correspond to that execution
mode.

---------

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
spalladino and others added 7 commits March 4, 2026 16:06
…21102)

## Summary

- Fixes contract class log DA gas metering in the PXE contract function
simulator
- Changed `+ 2` to `+ 1` for the additional fields per contract class
log, matching the circuits (gas_meter.nr, tx_blob_data.nr,
sponge_blob.nr) and the TS blob encoder which all use `+ 1`
- Contract class logs only emit the contract address as an extra field
(unlike private logs which also emit a length field), so the old `+ 2`
was overcharging by 1 DA field (32 DA gas) per log

Fixes F-377

## Test plan

- Existing tests pass — this is a gas metering correction, not a logic
change
- Contract class log blob encoding is unchanged; only the gas estimation
in the PXE was wrong


🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com>
Copy link
Collaborator

@ludamad ludamad left a comment

Choose a reason for hiding this comment

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

🤖 Auto-approved

@AztecBot AztecBot enabled auto-merge March 5, 2026 01:32
@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 5, 2026

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

@ludamad ludamad disabled auto-merge March 5, 2026 15:38
@AztecBot AztecBot added this pull request to the merge queue Mar 5, 2026
@AztecBot
Copy link
Collaborator Author

AztecBot commented Mar 5, 2026

🤖 Auto-merge enabled after 4 hours of inactivity. This PR will be merged automatically once all checks pass.

Merged via the queue into next with commit db5b6b1 Mar 5, 2026
20 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants