Skip to content

feat: merge-train/avm#22394

Merged
AztecBot merged 2 commits intonextfrom
merge-train/avm
Apr 8, 2026
Merged

feat: merge-train/avm#22394
AztecBot merged 2 commits intonextfrom
merge-train/avm

Conversation

@AztecBot
Copy link
Copy Markdown
Collaborator

@AztecBot AztecBot commented Apr 8, 2026

BEGIN_COMMIT_OVERRIDE
chore: fix broken comments found by claude (#22382)
END_COMMIT_OVERRIDE

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 added this pull request to the merge queue Apr 8, 2026
@AztecBot
Copy link
Copy Markdown
Collaborator Author

AztecBot commented Apr 8, 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 b68c855 Apr 8, 2026
24 checks passed
github-merge-queue bot pushed a commit that referenced this pull request Apr 8, 2026
…es and unstaking delay (#22419)

## Summary

Updates contract addresses and unstaking documentation to reflect the
current on-chain state.

### networks.md — Contract address corrections

- Updated **Reward Booster** mainnet address (`0x7101a...` →
`0x1cbb7...`)
- Updated **Tally Slashing Proposer** mainnet address (`0x7a318...` →
`0xa4a38...`)
- Fixed **Slasher** testnet address — was incorrectly showing
`0xf6D0D42...`, corrected to `0xCF750B7...`
- Added **Honk Verifier** mainnet address (`0x70aed...`) — was
previously N/A
- Added **Slash Payload Cloneable** mainnet address (`0xAA432...`) — was
previously N/A
- Fixed trailing pipe formatting on Slash Payload Cloneable row

### staking.md — Unstaking delay improvements

- Replaced preprocessor conditional (`#if(testnet)/#else/#endif`) with a
table showing delays for both networks
- Added **governance withdrawal delay** info (~38 days mainnet, ~1.6
days testnet) with formula explanation
- Clarified distinction between staking exit delay and governance
withdrawal delay

### Non-doc changes (from merge train)

This branch includes changes from `merge-train/avm` (#22394):
- `barretenberg/cpp/pil/vm2/` — comment fixes in data_copy.pil and
gas.pil
- `yarn-project/` — `resumeSync` flag for `rollbackTo` to fix offchain
payment flake (#22230)
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.

3 participants