chore(backport-to-V2): L1 backports by LHerskind · Pull Request #17365 · AztecProtocol/aztec-packages

LHerskind · 2025-09-29T12:54:46Z

Plenty contract PR's have been implemented since the cut of V2. I'm taking a look into them to figure out if we need all of them. And can make a potential monster cherry pick.

git --no-pager log --oneline v2..next -- "l1-contracts/"
44e3f64839 fix: tmnt 412
70f004dc2a fix: tmnt 405, 411, 413, 414, 418, 419, 421, 425
b02160bb06 fix: Fix the hash to point function randomness
5cd8f416a6 fix: gas boundary and removal of isOnCurve
a310dd929f chore: fix misc issues for clarity
46e3dd7517 chore: update gse deposit natspec (#17247)
7a12a96501 chore: add comment to addRollup
3887ea20a0 feat: queue flushing update
a3e23b9177 Checkpoint circuits.
545904b992 (origin/saleel/zkpassport-update) chore: add validity period check on zkpassport (#17054)
10e4df4b2e chore: update zkpassport version (#17044)
ffd05cab7d (tag: v3.0.0-nightly.20250915) chore: update coin issuer rate (#16985)
ac300f4b80 chore: Fix governance vote test (#17023)
e7136e64c9 chore: Fix governance vote test
4502f07400 fix: unbounded lock delay (#16951)
ba13aa662b (origin/gh-readonly-queue/next/pr-16971-0fcfb7625e38cd58b602a8b09b1f6b48cfbc693a) feat: Allow vetoer to disable slasher temporarily (#16971)
cf3afa8b64 (origin/palla/disable-slashing) feat: Allow vetoer to disable slasher
0fcfb7625e (origin/gh-readonly-queue/next/pr-16950-d6cff17e9a10e8305925d1cd1020c30a0e3eb6bf) fix: error prefix (#16950)
50b0c1d61f chore: reject gov deposit into gov (#16917)
1175713677 chore: update coin issuer rate
45e3bdb5e3 fix: unbounded lock delay
93976d6357 fix: error prefix
95c296fb05 chore: reject gov deposit into gov
b208c8e650 (origin/09-11-refactor_fixing_offchain_onchain_naming) refactor: fixing offchain/onchain naming
e87438b3d3 chore: minor misc solidity changes
a29ccaa48a fix: align timestamps for sample values
31331e249c (origin/gh-readonly-queue/next/pr-16934-7188c46c1b4a151b77c3ec5a4a8817a19b74927c) chore: Fix slash veto demo flake (#16934)
b59e1003e2 (origin/palla/try-fix-veto-demo-flake) chore: Try fix slash veto demo flake
2695b7b94e fix: never use cache in `verifyProposer`
9193dfb370 chore: add few extra checks
f85a17fb25 feat: local ejection threshold
97928dee93 (origin/gh-readonly-queue/next/pr-16753-5475f5b912ae31492bb93c783f08ca6f7d38b2c6) fix: proposer sign digest of attestations (#16753)
87038a3840 chore: silence unhelpful forge lints (#16809)
13055030b4 (origin/tf/silence-forge-lints) chore: silence unhelpful forge lints
2f71e44c57 fix: proposer sign digest of attestations
f4b78b5fd9 Merge branch 'next' into merge-train/avm

I'll be cherry picking these with a few exceptions, namely:

a3e23b9177 Checkpoint circuits.
b208c8e650 (origin/09-11-refactor_fixing_offchain_onchain_naming) refactor: fixing offchain/onchain naming

as these are touching so so many files. a3e23b9 deals with the checkpoint building, which we don't really need for ignition. And the other is just spelling in the comments. And to be frank, I'm not feeling all that great about doing a 125 file commit backport just for spelling in the comments

LHerskind · 2025-09-29T12:55:07Z

chore(backport-to-V2): L1 backports #17365 👈 (View in Graphite)
v2

This stack of pull requests is managed by Graphite. Learn more about stacking.

spalladino · 2025-09-29T15:55:09Z

l1-contracts/src/core/libraries/rollup/ProposeLib.sol

 }

 struct InterimProposeValues {
+  ProposedHeader header;


Isn't moving the entire header into memory costly in terms of gas?

Ye, potentially. We are running into stack too deep without it. And if moving the compressed tips into it instead, the gas actually goes up, so I think we are benefitting a bit from some storage referencing since we are not updating it 😅

l1-contracts/test/merkle/helpers/MerkleLibHelper.sol

spalladino · 2025-09-29T16:18:41Z

yarn-project/cli/src/config/chain_l2_config.ts


  ejectionThreshold: 100_000n * 10n ** 18n,
  activationThreshold: 200_000n * 10n ** 18n,
+  localEjectionThreshold: 196n * 10n ** 18n,


Is this correct? Shouldn't it be 196_000n?

💀 you are right

Review was worth it 🥳

yarn-project/end-to-end/src/e2e_p2p/upgrade_governance_proposer.test.ts

spalladino · 2025-09-29T16:22:11Z

yarn-project/ethereum/src/contracts/rollup.ts

+  @memoize
+  getLocalEjectionThreshold() {
+    return this.rollup.read.getLocalEjectionThreshold();
+  }


We shouldn't memoize this value if it's updateable

Think we are already do so with a few values that can be updated, but are only expected to be so rarely, can fix but will address a few more then as well:

getProvingCostPerMana

getManaTarget

getManaLimit

getLocalEjectionThreshold

Or I guess at least for ignition the first 3 won't really change at all. So it is probably fine to let them sit

spalladino · 2025-09-29T16:23:45Z

yarn-project/ethereum/src/config.ts

-  bootstrapFlushSize: 32n, // will effectively be bounded by maxQueueFlushSize
-  normalFlushSizeMin: 32n,
+  bootstrapFlushSize: 48n,
+  normalFlushSizeMin: 1n,


Do we want to set the flush size to 48 as in StagingIgnition in #17364? Not saying we should, just asking.

Do you mean the normal flush size min or the bootstrap flush size? Bootstrap is already 48 here and that matches #17364, so I would think that is fine?

yarn-project/ethereum/src/deploy_l1_contracts.ts

spalladino · 2025-09-29T16:26:49Z

yarn-project/ethereum/src/deploy_l1_contracts.ts

+      }
+
+      // Note that we are flushing at most `chunkSize` at each call
+      await deployer.l1TxUtils.sendAndMonitorTransaction(


Nit: this would faster if we didn't wait for each tx to be mined before sending the next one. But it's just an optimization, and I don't think it's really an issue, is it?

Don't think its an issue, at least the speedup still much faster than before, but ye should be room to go faster.

spalladino · 2025-09-29T16:31:50Z

yarn-project/sequencer-client/src/sequencer/sequencer.ts

+        ? await this.validatorClient.signAttestationsAndSigners(
+            attestationsAndSigners,
+            proposerAddress ?? publisher.getSenderAddress(),
+          )


I'm not sure if the fallback on the sender address is correct. Shouldn't we just use an empty signature if there is no proposer defined for this iteration?

Should be able to just give it an empty ye.

spalladino · 2025-09-29T16:33:07Z

yarn-project/stdlib/src/block/proposal/attestations_and_signers.ts

+  toString() {
+    throw new Error('Not implemented');
+  }


Aren't we risking breaking a logging or serialization by throwing on toString?

Will fix it 👍

just-mitch

governance changes look good 👍

Foundry has been screaming at me whenever I bootstrap the l1-contracts with what looks like a lot of low-value lints. I've shied away from making any code changes as I don't think it would be particularly helpful so this PR mostly boils down to silencing lints coming from dependencies and disabling lints which just are just code style-guide items. One semi-meaningful thing which I've disabled is a lint calling out an opportunities to optimize keccak hashing so I've opened an issue to track this here: #16808 `forge lint` now outputs the below. This looks like we can add `/// forge-lint: disable-next-item(erc20-unchecked-transfer)` to these cases as we control the token being used in these situations - but I'll leave that up to the tmnts. ``` warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/RewardLib.sol:90:5 | 90 | rollupStore.config.feeAsset.transfer(_sequencer, amount); | -------------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/StakingLib.sol:184:5 | 184 | store.stakingAsset.transfer(exit.recipientOrWithdrawer, exit.amount); | -------------------------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/StakingLib.sol:285:5 | 285 | store.stakingAsset.transferFrom(msg.sender, address(this), amount); | ------------------------------------------------------------------ | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/StakingLib.sol:357:9 | 357 | store.stakingAsset.transfer(args.withdrawer, amount); | ---------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/RewardLib.sol:122:5 | 122 | rollupStore.config.feeAsset.transfer(_prover, accumulatedRewards); | ----------------------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/governance/GSE.sol:339:5 | 339 | ASSET.transferFrom(msg.sender, address(this), ACTIVATION_THRESHOLD); | ------------------------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/governance/GSE.sol:472:5 | 472 | ASSET.transferFrom(msg.sender, address(this), amount); | ----------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/src/core/libraries/rollup/RewardLib.sol:218:9 | 218 | rollupStore.config.feeAsset.transfer(BURN_ADDRESS, t.totalBurn); | --------------------------------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer warning[erc20-unchecked-transfer]: ERC20 'transfer' and 'transferFrom' calls should check the return value --> /mnt/user-data/tom/aztec-packages/l1-contracts/test/portals/TokenPortal.sol:149:5 | 149 | underlying.transfer(_recipient, _amount); | ---------------------------------------- | = help: https://book.getfoundry.sh/reference/forge/forge-lint#erc20-unchecked-transfer ```

Allows the vetoer to disable slashing altogether temporarily. This allows the vetoer to stop all slashes if a bug is detected that continuously triggers slashes that are not valid, so the vetoer does not need to continuously vetoed every individual slash until the issue is solved.

Please read [contributing guidelines](CONTRIBUTING.md) and remove this line. For audit-related pull requests, please use the [audit PR template](?expand=1&template=audit.md).

Updated the `hashToPoint` function. Accompanying update is made in AztecProtocol/explorations#8

# v2.0.3..v2.1.0-rc.1 Notes ## Significant L1 Changes ### 1. **Rollup Contract Interface Changes** - **`propose()` function signature changed**: Now requires an additional `_attestationsAndSignersSignature` parameter - **`validateHeaderWithAttestations()` function signature changed**: Also requires the new signature parameter - This affects any code that directly calls these functions on the rollup contract ### 2. **New Required Configuration Parameters** Several new configuration parameters are now required for deployment: - `localEjectionThreshold`: Stricter ejection threshold local to specific rollup (default: 196,000 tokens) - `slashingDisableDuration`: How long slashing can be disabled in seconds (default: 5 days) ### 3. **GSE Contract Changes** - **New function**: `setProofOfPossessionGasLimit()` \- allows governance to adjust gas limits for BLS proof validation - **Gas-limited proof validation**: Proof of possession validation now has configurable gas limits (default: 200,000 gas) ### 4. **Validator Queue Management Changes** - **`flushEntryQueue()` behavior changed**: Now has an overload accepting a `_toAdd` parameter to limit validator additions - **New validator flush accounting**: System now tracks available validator flushes per epoch Significant Non-Breaking Changes -------------------------------- ### 1. **Enhanced Slashing Controls** - **Temporary slashing disable**: Vetoers can now temporarily disable slashing for the configured duration - **New function**: `setSlashingEnabled(bool)` for controlling slashing state ### 2. **Improved Validator Selection** - **Configurable lag period**: Validator sampling now uses configurable epoch lag instead of fixed 2-epoch delay - **Better bootstrapping**: Enhanced validator set bootstrapping with improved flush size calculations ### 3. **Updated Default Values** - **Coin issuer rate**: Updated to `25,000,000,000 tokens / year` (approximately 793 tokens per second) - **Local ejection threshold**: Set to 196,000 tokens (stricter than global 50,000 threshold) ## Significant Node Changes ### Fixes - Rollback world state on failed block sync – Prevents bad state persistence by rolling back uncommitted data if block sync fails. [(#17158)](github.com//pull/17158) - Early rejection of duplicate nullifiers – Detects and rejects transactions with duplicate nullifiers before inclusion. [(#17157)](github.com//pull/17157) - Watcher pruning fix – Watcher now re-executes only blocks from the relevant pruned epoch, avoiding cross-epoch slashing issues. [(#17145)](github.com//pull/17145) - Improved proposal validation – Fully validates proposal headers (including archive root derivation) and blocks attempts to reuse existing block numbers. [(#17144)](github.com//pull/17144) - L1 to L2 message sync reliability – Waits for rollup to reach the inbox block before marking L1→L2 messages as synced; adds helpers to track message readiness. [(#17132)](github.com//pull/17132) - Slashing round recovery – Executes pending slashing rounds skipped during the first executable round; adds slashExecuteRoundsLookBack to control re-check depth. [(#17125)](github.com//pull/17125) - Broker restart on rollup change – Ensures broker restarts when rollup chain changes to stay synchronized. [(#17120)](github.com//pull/17120) - Remote signer readiness check – Verifies that a remote signer is available before use. [(#17119)](github.com//pull/17119) - Orchestrator and agent retry improvements – Makes connections to the broker more robust under transient failures. [(#17117)](github.com//pull/17117) - Telemetry cleanup – Fixes incorrect or spammy telemetry warnings. [(#17155)](github.com//pull/17155) ### Features - Network configuration support – Introduces centralized configuration for network parameters. [(#17113)](github.com//pull/17113) ## Full Changelog You can generate this yourself with `./scripts/commits v2.0.3..v2.1.0-rc.1 1000 -m -g`. #### Fixes - fix: use archiveAt(0) instead of getBlock to get genesis archive tree - backport v2 ([#17447](#17447)) — spypsy, 5 days ago - fix: add keystoreDirectory option to sequencer ([#17265](#17265)) — spypsy, 13 days ago - fix: testnet archival node - v2 ([#17142](#17142)) — Aztec Bot, 3 weeks ago #### Chores - chore: bump minor version — Mitch, 4 days ago — [dbc243f](dbc243f) - chore: backport dependabot deps ([#17463](#17463)) — Aztec Bot, 5 days ago - chore: Backport slack alerts ([#17460](#17460)) — PhilWindle, 5 days ago - chore(backport-to-v2): chore: New salt for staging-ignition (#17453) ([#17453](#17453)) — Aztec Bot, 5 days ago - chore(backport-to-v2): fix: improve libp2p connection limits for network discovery (#17425) ([#17425](#17425)) — Aztec Bot, 5 days ago - chore(backport-to-v2): feat: add flushing rewarder (#17335) ([#17335](#17335)) — Aztec Bot, 6 days ago - chore(backport-to-v2): feat: add date gated relayer (#17323) ([#17323](#17323)) — Aztec Bot, 6 days ago - chore(backport-to-v2): feat: support using existing ERC20 token for fee and staking (#17413) ([#17413](#17413)) — Aztec Bot, 6 days ago - chore: Delete contract addresses from chain l2 config ([#17430](#17430)) — PhilWindle, 6 days ago - chore: More updated staging public config ([#17364](#17364)) — PhilWindle, 7 days ago - chore(backport-to-V2): L1 backports ([#17365](#17365)) — Lasse Herskind, 7 days ago - chore: Ensure DB map sizes are configured for networks ([#17383](#17383)) — PhilWindle, 7 days ago - chore: Backport of fixes into v2 ([#17206](#17206)) — PhilWindle, 8 days ago - chore: update zkpassport version ([#17339](#17339)) — saleel, 8 days ago - chore: Backport of workflow fix ([#17333](#17333)) — PhilWindle, 11 days ago - chore: Streamline staging deployments ([#17328](#17328)) — PhilWindle, 11 days ago - chore(backport-to-v2): fix: avm gracefully handles shifts (shl) with huge bit sizes (#17171) ([#17171](#17171)) — Aztec Bot, 12 days ago - chore(backport-to-v2): chore: remove unconstrained generics from trait impls (#17075) ([#17075](#17075)) — Aztec Bot, 12 days ago - chore: Backport deployment refactor ([#17280](#17280)) — PhilWindle, 12 days ago - chore(backport-to-v2): fix(docs): Update Counter contract tutorial imports and remove unnecessary sections (#17241) ([#17241](#17241)) — Aztec Bot, 13 days ago - chore: remove ACCEPT_DISABLED_AVM_VK_TREE_ROOT ([#17238](#17238)) — Alex Gherghisan, 13 days ago - chore: remove bad rollup-version default ([#17223](#17223)) — Alex Gherghisan, 2 weeks ago - chore(docs): node docs to v2 ([#17205](#17205)) — esau, 2 weeks ago - chore(backport-to-v2): chore(avm)!: Fix a misleading log in recursive verifier related to public input (#17184) ([#17184](#17184)) — Aztec Bot, 2 weeks ago - chore: Backport of ignition fix attempt 2 ([#17201](#17201)) — PhilWindle, 2 weeks ago - chore: turn on testnet compat test ([#17195](#17195)) — Alex Gherghisan, 2 weeks ago - chore: Backport fix to staging-ignition to v2 ([#17159](#17159)) — PhilWindle, 3 weeks ago - chore: kubectl ([#17140](#17140)) — Alex Gherghisan, 3 weeks ago #### Other - backport dependabots p2 ([#17488](#17488)) — mralj, 4 days ago --------- Co-authored-by: AztecBot <tech@aztecprotocol.com>

LHerskind changed the title ~~fix: proposer sign digest of attestations~~ chore(backport-to-V2): L1 backports Sep 29, 2025

LHerskind marked this pull request as ready for review September 29, 2025 13:02

LHerskind requested review from Maddiaa0 and just-mitch as code owners September 29, 2025 13:02

spalladino reviewed Sep 29, 2025

View reviewed changes

LHerskind force-pushed the lh/v2-backporting branch from cf70a62 to c257d92 Compare September 30, 2025 10:22

spalladino approved these changes Sep 30, 2025

View reviewed changes

just-mitch approved these changes Sep 30, 2025

View reviewed changes

LHerskind and others added 21 commits September 30, 2025 14:11

fix: proposer sign digest of attestations

d9637e2

feat: local ejection threshold

c43e8fa

chore: add few extra checks

fd5c89f

fix: never use cache in verifyProposer

b7f8edb

chore: Try fix slash veto demo flake

89cb04c

fix: align timestamps for sample values

d5c34c9

chore: minor misc solidity changes

f2b2603

chore: reject gov deposit into gov

3487a58

fix: error prefix

50296c1

fix: unbounded lock delay

9e80e2d

chore: update coin issuer rate

8926109

chore: Fix governance vote test

857538a

chore: update zkpassport version (#17044)

67f95f6

chore: add validity period check on zkpassport (#17054)

bf79669

feat: queue flushing update

2e18d12

chore: add comment to addRollup

c6353d4

chore: update gse deposit natspec (#17247)

7bfabdd

Please read [contributing guidelines](CONTRIBUTING.md) and remove this line. For audit-related pull requests, please use the [audit PR template](?expand=1&template=audit.md).

chore: fix misc issues for clarity

f215a2b

fix: gas boundary and removal of isOnCurve

c738fc6

LHerskind added 6 commits September 30, 2025 14:11

fix: Fix the hash to point function randomness

dbb75aa

Updated the `hashToPoint` function. Accompanying update is made in AztecProtocol/explorations#8

fix: tmnt 405, 411, 413, 414, 418, 419, 421, 425

10d148c

fix: tmnt 412

c27ef29

chore: adding missing chain_l2_config

eafef4f

chore: address palla comments

fa79454

fix: update hash to point

b020f76

LHerskind force-pushed the lh/v2-backporting branch from 58c781f to fc8b532 Compare September 30, 2025 14:11

LHerskind added 2 commits September 30, 2025 15:11

chore: allow zero address in gov constructor to open floodgates

2d75452

chore: rewind time of chain_l2_config

ee1c6d2

LHerskind force-pushed the lh/v2-backporting branch from 49267ab to ee1c6d2 Compare September 30, 2025 15:19

PhilWindle merged commit 06b2acb into v2 Sep 30, 2025
7 of 8 checks passed

PhilWindle deleted the lh/v2-backporting branch September 30, 2025 16:47

AztecBot mentioned this pull request Sep 30, 2025

chore(v2): release 2.1.1 #17145

Merged

AztecBot mentioned this pull request Nov 5, 2025

chore(v2): release 2.1.2 #18226

Merged

Conversation

LHerskind commented Sep 29, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

LHerskind commented Sep 29, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

just-mitch left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

LHerskind commented Sep 29, 2025 •

edited

Loading