Skip to content

chore: Accumulated backports to v4-next#21453

Open
AztecBot wants to merge 5 commits intov4-nextfrom
backport-to-v4-next-staging
Open

chore: Accumulated backports to v4-next#21453
AztecBot wants to merge 5 commits intov4-nextfrom
backport-to-v4-next-staging

Conversation

@AztecBot
Copy link
Collaborator

@AztecBot AztecBot commented Mar 12, 2026

BEGIN_COMMIT_OVERRIDE
fix(tx): reject txs with invalid setup when unprotecting (#21224)
END_COMMIT_OVERRIDE

When unprotecting txs, we were not running the check for allowed public setup functions, which was skipped in the reqresp entrypoint.

This commit now tracks whether public setup is allowed or not for a tx in the tx metadata, and uses it to drop the tx when it becomes unprotected.

An alternative approach would have been to store the entire public setup calls in the tx metadata, but this means a smaller memory footprint.
ludamad and others added 3 commits March 12, 2026 16:41
#21399)

## Summary
- Fixed inverted boolean comparison in `message_delivery.nr` line 208 that caused `ONCHAIN_CONSTRAINED` to run encryption unconstrained and vice versa.
- The check was comparing against `ONCHAIN_UNCONSTRAINED` instead of `ONCHAIN_CONSTRAINED`, flipping the condition passed to `remove_constraints_if`.

## Backport
This is a backport fix targeting `v4-next` via `merge-train/fairies`.

## Test plan
- [ ] Verify constrained encryption is actually constrained when using `ONCHAIN_CONSTRAINED` delivery mode
- [ ] Verify unconstrained encryption when using `ONCHAIN_UNCONSTRAINED` delivery mode

cc @nventuro for review

ClaudeBox log: https://claudebox.work/s/c8cf1c507575d776?run=3
…ackport #20919) (#21434)

## Summary
Backport of #20919 to v4-next.

Adds `ETHEREUM_HTTP_TIMEOUT_MS` env var to configure the timeout for
viem HTTP transports used in L1 RPC calls. Introduces
`makeL1HttpTransport` helper to centralize transport creation with
consistent timeout support.

## Conflict Resolution
Cherry-pick had a conflict in `blob-client/src/client/http.ts` because
`next` had refactored `getSlotNumber` to accept `parentBeaconBlockRoot`
as a parameter. Resolved by keeping the v4-next code structure and
applying only the transport change (`makeL1HttpTransport` with timeout
support).

## Commits
1. Cherry-pick with conflict markers (for reviewability)
2. Conflict resolution

ClaudeBox log: https://claudebox.work/s/02b67d20aae96377?run=2

---------

Co-authored-by: Santiago Palladino <[email protected]>
@AztecBot
Copy link
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/8527c576b4b902d2�8527c576b4b902d28;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_l1_reorgs.parallel.test.ts "updates L1 to L2 messages changed due to an L1 reorg" (65s) (code: 0) group:e2e-p2p-epoch-flakes

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants