chore: merge v4-next into backport-to-v4-next-staging to resolve conflicts#21524
Draft
AztecBot wants to merge 5 commits intobackport-to-v4-next-stagingfrom
Draft
chore: merge v4-next into backport-to-v4-next-staging to resolve conflicts#21524AztecBot wants to merge 5 commits intobackport-to-v4-next-stagingfrom
AztecBot wants to merge 5 commits intobackport-to-v4-next-stagingfrom
Conversation
## Summary - Lower `SLASH_INACTIVITY_TARGET_PERCENTAGE` from 0.8 to 0.7 - Disable `SLASH_DUPLICATE_PROPOSAL_PENALTY` and `SLASH_DUPLICATE_ATTESTATION_PENALTY` (set to 0) - Increase `SLASH_GRACE_PERIOD_L2_SLOTS` from 1200 to 8400 - Reduce `perBlockAllocationMultiplier` from 2 to 1.2 ## Test plan - Verify generated config files are updated after running `yarn generate` in relevant packages - Deploy to devnet/testnet and confirm slasher behavior matches new parameters --------- Co-authored-by: Aztec Bot <[email protected]>
This PR was created because merging `v4` into `v4-next` resulted in conflicts. Please resolve the conflicts and merge this PR to keep `v4-next` up to date. This PR was auto-generated by the `pull-v4-into-v4-next` workflow.
Keep the explanatory comment about L2 gas priority from the backport branch.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
v4-nextintobackport-to-v4-next-stagingto resolve merge conflicts blocking PR chore: Accumulated backports to v4-next #21453deploy_method.test.ts: kept the explanatory comment about L2 gas priority from the backport branchContext
PR #21453 (Accumulated backports to v4-next) has
mergeable_state: dirtydue to a conflict indeploy_method.test.ts. The conflict is a 2-line comment added by the backport branch that doesn't exist onv4-next. This PR resolves that by mergingv4-nextinto the staging branch.The earlier CI failure on #21453 (commit 342643f) was a flaky
e2e_deploy_contract/deploy_method.test.tstest — the contract wasn't found as deployed when calling it in the same block. The latest commit (09ad878) passed CI successfully.ClaudeBox log: https://claudebox.work/s/8f525d9bde74f2ce?run=1