feat!: staking escrow by LHerskind · Pull Request #14339 · AztecProtocol/aztec-packages

LHerskind · 2025-05-15T14:50:16Z

Fixes #13870 and the staking portion of #13871.

Starts the work for the staking escrow (not fully tested but more tests also needed along with the governance part of it, so in a decent spot).

Notable changes:

as a shared contract there is now the GSE that is escrowing funds staked, and support moving it along.
- it is another contract that must be called when adding a new rollup if it is to move along, since it is too dangerous to just move it along in the hopes that the rollup will work similar to the old one.
starts the work to have different values for deposit and staying staked, but atm they are set to the same value to not make this pr even bigger than it already is
- see refactor(GSE): make minimum stake and deposit differ #14304
deployments in ts are passing along a full "operator" or validator, e.g., the set of addresses instead of just a single address and using that for all.
updates the staking handler to by default follow the canonical.

LHerskind · 2025-05-15T14:50:31Z

feat!: remove proposer as separate address #14346
feat!: staking escrow #14339 👈 (View in Graphite)
next

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

just-mitch

Nice. Minor comments.

just-mitch · 2025-05-16T10:09:57Z

    vm.prank(SLASHER);
    staking.slash(ATTESTER, MINIMUM_STAKE / 2);

    assertEq(stakingAsset.balanceOf(address(staking)), MINIMUM_STAKE);


Would maybe be good to show that the gse has 0 balance here

just-mitch · 2025-05-16T10:16:46Z


    vm.prank(SLASHER);
-    staking.slash(ATTESTER, depositAmount / 2);
+    staking.slash(ATTESTER, MINIMUM_STAKE / 2);


good to show the LIVING status here I think

just-mitch · 2025-05-16T10:27:55Z

  rollupAddress: Hex,
  stakingAssetAddress: Hex,
-  validators: Hex[],
+  validators: Operator[],


unrelated to this PR, but we can probably remove the cheat_ from this function name

Will rename it to addMultipleValidators it is only used in here directly, so seems like a neat tiny fix.

just-mitch · 2025-05-16T10:33:20Z

  error Staking__NotWithdrawer(address, address); // 0x8e668e5d
  error Staking__NothingToExit(address); // 0xd2aac9b6
  error Staking__WithdrawalNotUnlockedYet(Timestamp, Timestamp); // 0x88e1826c
+  error Staking__WithdrawFailed(address);


Suggested change

error Staking__WithdrawFailed(address);

error Staking__WithdrawFailed(address); // 0x377422c1

At this point the number of errors here and there are kinda pain to update. Might add something to the bootstrap so we just spit a file out that have all the errors and event codes and such to make it simpler to keep up to date, pretty sure that some of the hexes here and there are broken

just-mitch · 2025-05-16T11:49:07Z

+    canonical.push(block.timestamp.toUint32(), uint224(uint160(_rollup)));
+  }
+
+  function deposit(address _attester, address _proposer, address _withdrawer, bool _onCanonical)


might explain how you can serve as an attester on multiple versions?

just-mitch · 2025-05-16T11:57:28Z

+
+    STAKING_ASSET.transfer(msg.sender, amountWithdrawn);
+
+    return (amountWithdrawn, removed);


All good, but the semantics/names are a little confusing when the amount reduces below the min balance, because the "amountWithdrawn" doesn't reflect the slashed amount.

The function is not doing any slashing, but just withdrawing, which can be used as part of slashing, but the rollup needs to deal with the logic itself. Have extended the natspec comment.

github-actions · 2025-05-20T11:20:08Z

Docs Preview

You can check your preview here.

Maddiaa0 · 2025-05-21T09:55:58Z

      }),
    });

+    // Hand over the registry to the governance


Suggested change

// Hand over the registry to the governance

// Hand over the GSE to the governance

Maddiaa0 · 2025-05-21T09:58:00Z

  await Promise.all(txHashes.map(txHash => extendedClient.waitForTransactionReceipt({ hash: txHash })));
 };

+export type Operator = {


Observational nit here would be that Operator carries multiple meanings in realtion to ATPs and elsewhere, this could maybe be RollupOperator or ValidatorTuple or something (no change required just a comment)

Might make sense to deal with as part of #14287.

Maddiaa0 · 2025-05-21T10:22:37Z

+      indices[i] = i;
+    }
+
+    return _getAddressFromIndecesAtTimestamp(_instance, indices, _timestamp);


Suggested change

return _getAddressFromIndecesAtTimestamp(_instance, indices, _timestamp);

return _getAddressFromIndicesAtTimestamp(_instance, indices, _timestamp);

same elsewhere

Maddiaa0 · 2025-05-21T10:23:33Z

+    override(IGSE)
+    returns (address[] memory)
+  {
+    // @todo Throw me in jail for this crime against humanity


I stand by the statement.

Maddiaa0 · 2025-05-21T10:26:17Z

+   *  @dev Must be the current canonical for `_onCanonical = true` to be valid.
+   */
+  function deposit(address _attester, address _proposer, address _withdrawer, bool _onCanonical)
+    external


i guess we now dont allow depositing more than the mimumim if you feel like it. It also is not clear how it can be topped up

Atm no topup, same as it was before.

Fixes #13870 and the staking portion of #13871. Starts the work for the staking escrow (not fully tested but more tests also needed along with the governance part of it, so in a decent spot). Notable changes: - as a shared contract there is now the GSE that is escrowing funds staked, and support moving it along. - it is another contract that must be called when adding a new rollup if it is to move along, since it is too dangerous to just move it along in the hopes that the rollup will work similar to the old one. - starts the work to have different values for deposit and staying staked, but atm they are set to the same value to not make this pr even bigger than it already is - see #14304 - deployments in ts are passing along a full "operator" or validator, e.g., the set of addresses instead of just a single address and using that for all. - updates the staking handler to by default follow the canonical.

LHerskind mentioned this pull request May 15, 2025

chore: delete staking cheater #14338

Merged

LHerskind marked this pull request as ready for review May 15, 2025 14:59

LHerskind requested review from Maddiaa0 and just-mitch as code owners May 15, 2025 14:59

LHerskind force-pushed the lh/13870 branch from 82e876e to 5eb68ac Compare May 15, 2025 17:26

LHerskind force-pushed the lh/nuke-cheaters branch from b4797f1 to 66a9c00 Compare May 15, 2025 17:26

LHerskind changed the title ~~chore: cleanup stakinglib usage slightly~~ feat!: staking escrow May 15, 2025

LHerskind mentioned this pull request May 15, 2025

feat!: remove proposer as separate address #14346

Merged

just-mitch reviewed May 16, 2025

View reviewed changes

just-mitch approved these changes May 16, 2025

View reviewed changes

LHerskind force-pushed the lh/nuke-cheaters branch from 66a9c00 to c58f22d Compare May 20, 2025 09:22

LHerskind force-pushed the lh/13870 branch from 5eb68ac to 2041499 Compare May 20, 2025 09:22

This was linked to issues May 20, 2025

feat(GSE): staking escrow #13870

Closed

feat(GSE/Rollup): Use GSE in rollup #13871

Closed

Base automatically changed from lh/nuke-cheaters to master May 20, 2025 10:04

LHerskind force-pushed the lh/13870 branch from 2041499 to 474f501 Compare May 20, 2025 11:01

LHerskind force-pushed the lh/13870 branch from 474f501 to 06c28fb Compare May 20, 2025 12:20

LHerskind changed the base branch from master to next May 20, 2025 14:05

LHerskind requested review from IlyasRidhuan, fcarreiro and jeanmon as code owners May 20, 2025 14:05

LHerskind changed the base branch from next to graphite-base/14339 May 20, 2025 14:11

LHerskind force-pushed the lh/13870 branch from 06c28fb to 3a788a8 Compare May 20, 2025 14:11

LHerskind changed the base branch from graphite-base/14339 to master May 20, 2025 14:11

LHerskind force-pushed the lh/13870 branch from 3a788a8 to e0f397e Compare May 20, 2025 16:08

LHerskind requested a review from charlielye as a code owner May 20, 2025 16:08

LHerskind changed the base branch from master to graphite-base/14339 May 20, 2025 17:11

LHerskind force-pushed the graphite-base/14339 branch from c7229db to c58ae65 Compare May 20, 2025 17:11

LHerskind force-pushed the lh/13870 branch from e0f397e to 06db2f1 Compare May 20, 2025 17:11

LHerskind changed the base branch from graphite-base/14339 to next May 20, 2025 17:11

Maddiaa0 reviewed May 21, 2025

View reviewed changes

Maddiaa0 approved these changes May 21, 2025

View reviewed changes

LHerskind added 11 commits May 21, 2025 11:24

chore: cleanup stakinglib usage slightly

5a0829d

feat: initial

99d8f5a

chore: updating tests

b05ed85

chore: add minimal test for "stake move"

3589f6b

chore: renaming things for clarity

ff0e98b

chore: update typescript side

2a02776

chore: address comments

1744e6e

chore: address deployment script issue

d7cbcde

chore: fix lint issues

c02bc64

chore: fix doc preview build

ee41021

chore: address maddia comments

889dfa3

LHerskind force-pushed the lh/13870 branch from 06db2f1 to 889dfa3 Compare May 21, 2025 11:31

LHerskind added this pull request to the merge queue May 21, 2025

github-merge-queue Bot removed this pull request from the merge queue due to failed status checks May 21, 2025

LHerskind added this pull request to the merge queue May 21, 2025

Merged via the queue into next with commit 7a96129 May 21, 2025
6 checks passed

LHerskind deleted the lh/13870 branch May 21, 2025 14:44

This was referenced May 22, 2025

chore(next): release 1.0.0 #14467

Closed

chore(next): release 0.88.0 #14495

Closed

	error Staking__WithdrawFailed(address);
	error Staking__WithdrawFailed(address); // 0x377422c1


		STAKING_ASSET.transfer(msg.sender, amountWithdrawn);

		return (amountWithdrawn, removed);

	// Hand over the registry to the governance
	// Hand over the GSE to the governance

	return _getAddressFromIndecesAtTimestamp(_instance, indices, _timestamp);
	return _getAddressFromIndicesAtTimestamp(_instance, indices, _timestamp);

Conversation

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

Uh oh!

Uh oh!

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

Uh oh!

Uh oh!

just-mitch left a comment

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!

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!

github-actions Bot commented May 20, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Docs Preview

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Maddiaa0 May 21, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

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!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

LHerskind commented May 15, 2025 •

edited

Loading

LHerskind commented May 15, 2025 •

edited

Loading

github-actions Bot commented May 20, 2025 •

edited

Loading

Maddiaa0 May 21, 2025 •

edited

Loading