Skip to content

chore: Accumulated backports to v4-next#22258

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

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

Conversation

@AztecBot
Copy link
Copy Markdown
Collaborator

@AztecBot AztecBot commented Apr 2, 2026

BEGIN_COMMIT_OVERRIDE
fix: pippenger edge case (#22256)
END_COMMIT_OVERRIDE

Fixing a rare edge case caused by a bug in radix sort recursive calls
@AztecBot
Copy link
Copy Markdown
Collaborator Author

AztecBot commented Apr 2, 2026

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/f2e3f4c6f23e9be1�f2e3f4c6f23e9be18;;�):  yarn-project/end-to-end/scripts/run_test.sh simple src/e2e_epochs/epochs_ha_sync.test.ts (61s) (code: 0) group:e2e-p2p-epoch-flakes

spypsy and others added 2 commits April 2, 2026 17:10
- .gitignore: removed ignition-fisherman.env entry (PR intent was to delete it)
- devnet-avm-prover.env, ignition-fisherman.env: deleted (already removed on next)
- mainnet.env: kept deleted (doesn't exist on v4-next)
- checkpoint_proposal_job.ts: merged both conditions (kept !== false from v4-next + added fishermanMode check from PR)
Copy link
Copy Markdown
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 April 2, 2026 20:09
@AztecBot
Copy link
Copy Markdown
Collaborator Author

AztecBot commented Apr 2, 2026

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

…ollution (backport #22183) (#22284)

## Summary

Backport of #22183
to v4-next.

**Code fix** (`checkpoint_proposal_job.ts`):
`syncProposedBlockToArchiver` now skips the archiver push when
`fishermanMode` is `true`, preventing spurious reorg cascades on
mainnet.

**Infrastructure split** (`main.tf`, `variables.tf`,
`deploy_network.sh`): Replaces `FISHERMAN_MODE` with
`FISHERMAN_REPLICAS` and adds a dedicated `fisherman` Helm release as a
separate StatefulSet.

## Conflicts resolved

- `spartan/.gitignore`: Removed `ignition-fisherman.env` entry (PR
intent was to delete it; `block-capacity.env` doesn't exist on v4-next)
- `spartan/environments/devnet-avm-prover.env`,
`ignition-fisherman.env`: Deleted (modify/delete — PR deletes, v4-next
had modifications)
- `spartan/environments/mainnet.env`: Kept deleted (doesn't exist on
v4-next)
- `checkpoint_proposal_job.ts`: Merged v4-next's `!== false` condition
with PR's `|| this.config.fishermanMode` addition

ClaudeBox log: https://claudebox.work/s/b82065b06bcc585b?run=1
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.

4 participants