Skip to content

feat: merge-train/fairies-v5#24609

Merged
AztecBot merged 5 commits into
v5-nextfrom
merge-train/fairies-v5
Jul 8, 2026
Merged

feat: merge-train/fairies-v5#24609
AztecBot merged 5 commits into
v5-nextfrom
merge-train/fairies-v5

Conversation

@AztecBot

@AztecBot AztecBot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator

BEGIN_COMMIT_OVERRIDE
fix: tweak depositToAztec gas config (#24607)
feat!: make inbox secrets be multiple fields (#24599)
feat(e2e): interactive handshake e2e (#24590)
END_COMMIT_OVERRIDE

While trying to deploy the latest nightly standard contracts to testnet
I experienced gas estimation issues.

According to Claude these issues are due to variability in Merkle tree
insertions: there's around 40% of gas cost spread between the happiest
case (no tree "climbing" needed) and the worst case (10 level climb).

If eth_estimateGas occurs during the happiest case, and actual TX
execution during the worst case, the default 20% buffer we use in
Aztec.js turns out not to be sufficient.


Closes F-794
With this, an L1->L2 message's `secret` need no longer be a single field
but instead an array of fields. I moved the message nullifier
computation from PXE into nr so that contracts can have different
nullification schemes (e.g. those that don't depend exclusively on the
contents of `secret`).

Because the fee juice contract uses this oracle, I introduced an adaptor
for it.
@nventuro nventuro requested review from a team and nventuro as code owners July 8, 2026 15:49

@ludamad ludamad left a comment

Copy link
Copy Markdown
Collaborator

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 July 8, 2026 21:23
@AztecBot

AztecBot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

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

@AztecBot AztecBot added this pull request to the merge queue Jul 8, 2026
Any commits made after this event will not be merged.
@AztecBot

AztecBot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

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/95f390dc09fabd84�95f390dc09fabd848;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/single-node/proving/multi_proof.test.ts (74s) (code: 0) group:e2e-p2p-epoch-flakes

@AztecBot

AztecBot commented Jul 8, 2026

Copy link
Copy Markdown
Collaborator Author

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

Merged via the queue into v5-next with commit 153d036 Jul 8, 2026
14 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.

5 participants