M2 restaking

.gas-snapshot

@@ -1,4 +1,4 @@
-EigenPodRewards:testNoRestakingRewardsClaiming() (gas: 774523)
+EigenPodRewards:testNoRestakingRewardsClaiming() (gas: 777225)
 EnclaveVerifierTest:testAddLeafX509() (gas: 193061)
 EnclaveVerifierTest:testRaveEvidence1() (gas: 901153)
 EnclaveVerifierTest:testRaveEvidence2() (gas: 901196)
@@ -7,90 +7,93 @@ EnclaveVerifierTest:testRemoveLeafX509() (gas: 200998)
 EnclaveVerifierTest:testSetup() (gas: 89268)
 EnclaveVerifierTest:testVerifyingStaleEvidence() (gas: 739311)
 GuardianModuleTest:testAddGuardian(address) (runs: 256, μ: 133546, ~: 133546)
-GuardianModuleTest:testChangeThreshold() (gas: 35430)
+GuardianModuleTest:testChangeThreshold() (gas: 35408)
 GuardianModuleTest:testChangeThresholdReverts() (gas: 27725)
 GuardianModuleTest:testPostWithdrawalsRootReverts(address[],uint256[]) (runs: 256, μ: 84793, ~: 86424)
-GuardianModuleTest:testRave() (gas: 68986815)
+GuardianModuleTest:testRave() (gas: 69851395)
 GuardianModuleTest:testRemoveGuardian(address) (runs: 256, μ: 113417, ~: 113402)
-GuardianModuleTest:testRoateGuardianKeyWithInvalidRaveReverts() (gas: 843538)
-GuardianModuleTest:testRoateGuardianToInvalidPubKeyReverts() (gas: 14749)
 GuardianModuleTest:testRotateGuardianKeyFromNonGuardianReverts() (gas: 12201)
+GuardianModuleTest:testRotateGuardianKeyWithInvalidRaveReverts() (gas: 843560)
+GuardianModuleTest:testRotateGuardianToInvalidPubKeyReverts() (gas: 14683)
 GuardianModuleTest:testSplitFunds() (gas: 125793)
+GuardianModuleTest:testSplitFundsRounding() (gas: 130017)
 GuardianModuleTest:testValidateSkipProvisioningReverts() (gas: 29704)
 NoRestakingModuleTest:testClaimingMultipleProofs() (gas: 250743)
 NoRestakingModuleTest:testCollectRewards() (gas: 255017)
+NoRestakingModuleTest:testClaimingMultipleProofs() (gas: 250743)
+NoRestakingModuleTest:testCollectRewards() (gas: 255017)
 NoRestakingModuleTest:testDonation() (gas: 11855)
 NoRestakingModuleTest:testDoubleClaimInSameTransaction() (gas: 196261)
 NoRestakingModuleTest:testPostRewardsRoot(bytes32,uint256) (runs: 256, μ: 103892, ~: 103892)
 NoRestakingModuleTest:testPostRewardsRootReverts(address,bytes32,uint256) (runs: 256, μ: 42051, ~: 42585)
 NoRestakingModuleTest:testPostingRewardsForSameBlockReverts() (gas: 106293)
-NoRestakingModuleTest:testRewardsClaimingForAnotherUser(address) (runs: 256, μ: 264245, ~: 264245)
+NoRestakingModuleTest:testRewardsClaimingForAnotherUser(address) (runs: 256, μ: 264137, ~: 264245)
 NoRestakingModuleTest:testSetup() (gas: 16008)
-PufferModuleTest:testBeaconUpgrade() (gas: 377045)
-PufferModuleTest:testCollectNoRestakingRewards(bytes32) (runs: 256, μ: 1220636, ~: 1220714)
-PufferModuleTest:testCreatePufferModule(bytes32) (runs: 256, μ: 300775, ~: 300775)
-PufferModuleTest:testDonation(bytes32) (runs: 256, μ: 306954, ~: 306954)
-PufferModuleTest:testPostRewardsRoot(bytes32,uint256) (runs: 256, μ: 392581, ~: 392581)
-PufferModuleTest:testPostRewardsRootReverts(bytes32,address,bytes32,uint256) (runs: 256, μ: 325576, ~: 326265)
+PufferModuleTest:testBeaconUpgrade() (gas: 379702)
+PufferModuleTest:testCollectNoRestakingRewards(bytes32) (runs: 256, μ: 1223217, ~: 1223217)
+PufferModuleTest:testCreatePufferModule(bytes32) (runs: 256, μ: 303410, ~: 303410)
+PufferModuleTest:testDonation(bytes32) (runs: 256, μ: 309589, ~: 309589)
+PufferModuleTest:testPostRewardsRoot(bytes32,uint256) (runs: 256, μ: 395216, ~: 395216)
+PufferModuleTest:testPostRewardsRootReverts(bytes32,address,bytes32,uint256) (runs: 256, μ: 328211, ~: 328900)
 PufferPoolIntegrationTest:testMulticallStrategyDepositOnGoerli() (gas: 302738)
-PufferPoolTest:testBurn(address) (runs: 256, μ: 104773, ~: 104758)
-PufferPoolTest:testDeposit(address,uint256) (runs: 256, μ: 145139, ~: 145251)
-PufferPoolTest:testDepositAndRedeemRoundingError(address,uint256) (runs: 256, μ: 189780, ~: 189840)
-PufferPoolTest:testDepositAndRedeemRoundingErrorForDifferentExchangeRate(address,uint256) (runs: 256, μ: 323932, ~: 324052)
+PufferPoolTest:testBurn(address) (runs: 256, μ: 104774, ~: 104758)
+PufferPoolTest:testDeposit(address,uint256) (runs: 256, μ: 145087, ~: 145207)
+PufferPoolTest:testDepositAndRedeemRoundingError(address,uint256) (runs: 256, μ: 189766, ~: 189824)
+PufferPoolTest:testDepositAndRedeemRoundingErrorForDifferentExchangeRate(address,uint256) (runs: 256, μ: 323869, ~: 323986)
 PufferPoolTest:testDepositForOneWei() (gas: 89277)
-PufferPoolTest:testMintZero() (gas: 42797)
+PufferPoolTest:testMintZero() (gas: 20152)
 PufferPoolTest:testMultipleDeposits() (gas: 138195)
 PufferPoolTest:testRatioChange() (gas: 230870)
-PufferPoolTest:testRatioChangeSandwichAttack(uint256,uint256) (runs: 256, μ: 207801, ~: 207976)
+PufferPoolTest:testRatioChangeSandwichAttack(uint256,uint256) (runs: 256, μ: 207776, ~: 207954)
 PufferPoolTest:testRecoverERC20() (gas: 516930)
-PufferPoolTest:testSetup() (gas: 32697)
-PufferPoolTest:testStorageS() (gas: 19419)
-PufferProtocolInvariants:invariant_callSummary() (runs: 100, calls: 11000, reverts: 0)
-PufferProtocolInvariants:invariant_pufEthToETHRate() (runs: 100, calls: 11000, reverts: 2)
-PufferProtocolInvariants:invariant_pufferPoolETHCanOnlyGoUp() (runs: 100, calls: 11000, reverts: 0)
-PufferProtocolInvariants:invariant_pufferProtocolBond() (runs: 100, calls: 11000, reverts: 6)
-PufferProtocolTest:testBurstThreshold() (gas: 542492)
+PufferPoolTest:testSetup() (gas: 32675)
+PufferPoolTest:testStorageS() (gas: 19397)
+PufferProtocolInvariants:invariant_callSummary() (runs: 100, calls: 11000, reverts: 1)
+PufferProtocolInvariants:invariant_pufEthToETHRate() (runs: 100, calls: 11000, reverts: 0)
+PufferProtocolInvariants:invariant_pufferPoolETHCanOnlyGoUp() (runs: 100, calls: 11000, reverts: 9)
+PufferProtocolInvariants:invariant_pufferProtocolBond() (runs: 100, calls: 11000, reverts: 0)
+PufferProtocolTest:testBurstThreshold() (gas: 542477)
 PufferProtocolTest:testChangeModule() (gas: 30532)
 PufferProtocolTest:testChangeModuleToCustom() (gas: 51226)
-PufferProtocolTest:testClaimBackBond() (gas: 2304094)
-PufferProtocolTest:testClaimBackBondForSingleWithdrawal() (gas: 1181481)
-PufferProtocolTest:testCreateExistingModuleShouldFail() (gas: 33026)
-PufferProtocolTest:testCreatePufferModule() (gas: 295317)
+PufferProtocolTest:testClaimBackBond() (gas: 2306577)
+PufferProtocolTest:testClaimBackBondForSingleWithdrawal() (gas: 1181426)
+PufferProtocolTest:testCreateExistingModuleShouldFail() (gas: 33461)
+PufferProtocolTest:testCreatePufferModule() (gas: 298009)
 PufferProtocolTest:testEmptyQueue() (gas: 32549)
-PufferProtocolTest:testExtendCommitment() (gas: 527653)
+PufferProtocolTest:testExtendCommitment() (gas: 527638)
 PufferProtocolTest:testFeeCalculations() (gas: 134767)
 PufferProtocolTest:testFeeCalculationsEverythingToPufferPool() (gas: 145527)
 PufferProtocolTest:testFeeCalculationsEverythingToWithdrawalPool() (gas: 147361)
-PufferProtocolTest:testFuzzRegisterManyValidators(uint8) (runs: 256, μ: 27338545, ~: 15967697)
+PufferProtocolTest:testFuzzRegisterManyValidators(uint8) (runs: 256, μ: 26842065, ~: 14413412)
 PufferProtocolTest:testGetPayload() (gas: 143359)
-PufferProtocolTest:testModuleDOS() (gas: 3640955)
+PufferProtocolTest:testModuleDOS() (gas: 3640730)
 PufferProtocolTest:testPause() (gas: 135124)
 PufferProtocolTest:testProofOfReserve() (gas: 176869)
-PufferProtocolTest:testProvisionNode() (gas: 3836628)
+PufferProtocolTest:testProvisionNode() (gas: 3841718)
 PufferProtocolTest:testProvisioning() (gas: 61529)
-PufferProtocolTest:testRegisterInvalidPrivKeyShares() (gas: 77972)
-PufferProtocolTest:testRegisterInvalidPubKeyShares() (gas: 81127)
-PufferProtocolTest:testRegisterMoreValidatorsThanTheLimit() (gas: 782101)
-PufferProtocolTest:testRegisterMultipleValidatorKeysAndDequeue(bytes32,bytes32) (runs: 256, μ: 2043816, ~: 2043816)
-PufferProtocolTest:testRegisterToInvalidModule() (gas: 70415)
-PufferProtocolTest:testRegisterValidatorKeyWithPermit() (gas: 497593)
-PufferProtocolTest:testRegisterValidatorKeyWithPermitSignature() (gas: 506683)
-PufferProtocolTest:testRegisterValidatorKeyWithPermitSignatureRevertsInvalidSC() (gas: 224581)
-PufferProtocolTest:testRegisterValidatorWithHugeCommitment() (gas: 83643)
-PufferProtocolTest:testRegisterWithInvalidAmountPaid() (gas: 86133)
+PufferProtocolTest:testRegisterInvalidPrivKeyShares() (gas: 77957)
+PufferProtocolTest:testRegisterInvalidPubKeyShares() (gas: 81112)
+PufferProtocolTest:testRegisterMoreValidatorsThanTheLimit() (gas: 782165)
+PufferProtocolTest:testRegisterMultipleValidatorKeysAndDequeue(bytes32,bytes32) (runs: 256, μ: 2044673, ~: 2044673)
+PufferProtocolTest:testRegisterToInvalidModule() (gas: 70400)
+PufferProtocolTest:testRegisterValidatorKeyWithPermit() (gas: 497556)
+PufferProtocolTest:testRegisterValidatorKeyWithPermitSignature() (gas: 506646)
+PufferProtocolTest:testRegisterValidatorKeyWithPermitSignatureRevertsInvalidSC() (gas: 224544)
+PufferProtocolTest:testRegisterValidatorWithHugeCommitment() (gas: 83628)
+PufferProtocolTest:testRegisterWithInvalidAmountPaid() (gas: 86118)
 PufferProtocolTest:testRegisterWithInvalidBLSPubKey() (gas: 47089)
 PufferProtocolTest:testRegisterWithoutRAVE() (gas: 336964)
-PufferProtocolTest:testSetGuardiansFeeRateOverTheLimit() (gas: 28308)
-PufferProtocolTest:testSetProtocolFeeRate() (gas: 33505)
+PufferProtocolTest:testSetGuardiansFeeRateOverTheLimit() (gas: 28330)
+PufferProtocolTest:testSetProtocolFeeRate() (gas: 33527)
 PufferProtocolTest:testSetProtocolFeeRateOverTheLimit() (gas: 28343)
-PufferProtocolTest:testSetSmoothingCommitment() (gas: 86876)
-PufferProtocolTest:testSetSmoothingCommitment(bytes32) (runs: 256, μ: 86827, ~: 86804)
+PufferProtocolTest:testSetSmoothingCommitment() (gas: 86893)
+PufferProtocolTest:testSetSmoothingCommitment(bytes32) (runs: 256, μ: 86845, ~: 86821)
 PufferProtocolTest:testSetWithdrawalPoolRateMax() (gas: 36394)
 PufferProtocolTest:testSetup() (gas: 18955)
-PufferProtocolTest:testSkipProvisioning() (gas: 993068)
-PufferProtocolTest:testStopRegistration() (gas: 1059197)
-PufferProtocolTest:testUpgrade() (gas: 4700279)
-PufferProtocolTest:testValidatorLimitPerModule() (gas: 500107)
-WithdrawalPoolTest:testWithdrawETH() (gas: 183749)
-WithdrawalPoolTest:testWithdrawETHWithSignature() (gas: 195629)
+PufferProtocolTest:testSkipProvisioning() (gas: 993052)
+PufferProtocolTest:testStopRegistration() (gas: 1059107)
+PufferProtocolTest:testUpgrade() (gas: 4733802)
+PufferProtocolTest:testValidatorLimitPerModule() (gas: 500077)
+WithdrawalPoolTest:testWithdrawETH() (gas: 183727)
+WithdrawalPoolTest:testWithdrawETHWithSignature() (gas: 195607)
 WithdrawalPoolTest:testWithdrawSomebodyElsesPufETHReverts() (gas: 195887)

addresses/holesky.json

@@ -1,7 +1,7 @@
 {
-    "PufferProtocol": "0x4982C744Ef2694Af2970D3eB8a58744ed3cB1b1D",
-    "PufferPool": "0x90Daec4Cee7e7A4E5499e9E864a1eb89Bb19b8Ed",
-    "GuardianModule": "0x66eb09811E1e46D60eD1421884E9FD76cbE555cA",
-    "WithdrawalPool": "0x378b738c0Cd4e5B373f943b1c9951730E5a29E5b",
-    "NoRestakingModule": "0x0A58fE0Dd20ed9863c6ABCDF929BaE3f3331D69B"
+    "PufferProtocol": "0x773559Ee80eDE685FBBd5F0Ebd60608DF51b777D",
+    "PufferPool": "0xfE7e307d24cB0953b4b5A71E780d6f622525638c",
+    "GuardianModule": "0xd4c8730F555F9E9d969BC37280805104c1B039A1",
+    "WithdrawalPool": "0xDAb95f41709473d55EBF7c3b5873b96149A14353",
+    "NoRestakingModule": "0x49CE199bbA75926ab5C6fc16fEDD11d418cB2EDf"
 }

output/puffer.json

@@ -1,13 +1,14 @@
 {
   "": "",
-  "consensusVault": "0xA050383C1b02D5D31C47FFA6496458502B82a9A9",
-  "enclaveVerifier": "0xBdEb03B426f8d0BA39A37eA98A6C51706D0D6bDA",
-  "executionRewardsVault": "0x1bEda62FAADA89ef21e047011bcBa47C3684aFDE",
-  "guardianModule": "0x7B973E7C9734bA21e776dE8F8bb9B53CDEf2Ffa3",
-  "guardians": "0x01c2A98a2ef35CBf4af9d3b407d178627291f813",
-  "pufferPool": "0x181Da01Bbfb444a3c2D9eD66cC8C4B05ccE86430",
-  "pufferServiceManagerImplementation": "0x028ea09BDDc13E3E4788093f3C9E5F2113D7f5Be",
-  "safeImplementation": "0x17ff65CFC23Ff5fa35718fd3378Ec468B0313496",
-  "safeProxyFactory": "0x51f658C3c6B1a177fe5D7E2654A49f4342A78Cf0",
-  "withdrawalPool": "0xA55d1077254fE04aFB1Eb5df5Bed5648731C4331"
+  "PufferProtocol": "0x773559Ee80eDE685FBBd5F0Ebd60608DF51b777D",
+  "PufferProtocolImplementation": "0xE6D876EA7c4B41a2c86DFAFb2E162c686CC95Fb5",
+  "accessManager": "0x482CDc9277Ae7d4636c0EbA7342C8d440fE7E442",
+  "enclaveVerifier": "0xB3fAb5f8FDce34FeEf691ccCE6ed20E6b3a0B6fB",
+  "guardianModule": "0xd4c8730F555F9E9d969BC37280805104c1B039A1",
+  "moduleBeacon": "0x1BB06aA4c8C8627adb352Dd8C01E38c0482C1c6A",
+  "moduleFactory": "0x5cd853e676BC218Ec78e4CB904b7dF58db50b8e4",
+  "noRestakingModule": "0x49CE199bbA75926ab5C6fc16fEDD11d418cB2EDf",
+  "pauser": "0xeb1D5EE982DbEFf6E57e5Ca3CA45F35bBE229FFE",
+  "pufferPool": "0xfE7e307d24cB0953b4b5A71E780d6f622525638c",
+  "withdrawalPool": "0xDAb95f41709473d55EBF7c3b5873b96149A14353"
 }

script/DeployPuffer.s.sol

@@ -13,9 +13,11 @@ import { ERC1967Proxy } from "openzeppelin/proxy/ERC1967/ERC1967Proxy.sol";
 import { BaseScript } from "script/BaseScript.s.sol";
 import { stdJson } from "forge-std/StdJson.sol";
 import { EigenPodManagerMock } from "../test/mocks/EigenPodManagerMock.sol";
+import { DelegationManagerMock } from "../test/mocks/DelegationManagerMock.sol";
 import { BeaconMock } from "../test/mocks/BeaconMock.sol";
 import { IDelayedWithdrawalRouter } from "eigenlayer/interfaces/IDelayedWithdrawalRouter.sol";
 import { IEigenPodManager } from "eigenlayer/interfaces/IEigenPodManager.sol";
+import { IDelegationManager } from "eigenlayer/interfaces/IDelegationManager.sol";
 import { AccessManager } from "openzeppelin/access/manager/AccessManager.sol";
 import { UpgradeableBeacon } from "openzeppelin/proxy/beacon/UpgradeableBeacon.sol";
 import { GuardiansDeployment, PufferDeployment } from "./DeploymentStructs.sol";
@@ -49,6 +51,7 @@ contract DeployPuffer is BaseScript {
 
     address eigenPodManager;
     address delayedWithdrawalRouter;
+    address delegationManager;
 
     function run(GuardiansDeployment calldata guardiansDeployment) public broadcast returns (PufferDeployment memory) {
         string memory obj = "";
@@ -62,23 +65,29 @@ contract DeployPuffer is BaseScript {
             treasury = payable(vm.envAddress("TREASURY"));
             eigenPodManager = vm.envAddress("EIGENPOD_MANAGER");
             delayedWithdrawalRouter = vm.envAddress("DELAYED_WITHDRAWAL_ROUTER");
+            delegationManager = vm.envAddress("DELEGATION_MANAGER");
         } else if (isAnvil()) {
             // Local chain / tests
             treasury = payable(address(1337));
             eigenPodManager = address(new EigenPodManagerMock());
             delayedWithdrawalRouter = address(0);
+            delegationManager = address(new DelegationManagerMock());
         } else {
             // Testnets
             treasury = payable(vm.envOr("TREASURY", address(1337)));
             eigenPodManager = vm.envOr("EIGENPOD_MANAGER", address(new EigenPodManagerMock()));
             delayedWithdrawalRouter = vm.envOr("DELAYED_WITHDRAWAL_ROUTER", address(0));
+            delegationManager = vm.envOr("DELEGATION_MANAGER", address(new DelegationManagerMock()));
         }
 
         // UUPS proxy for PufferProtocol
         proxy = new ERC1967Proxy(address(new NoImplementation()), "");
         {
             PufferModule moduleImplementation = new PufferModule(
-                PufferProtocol(payable(proxy)), eigenPodManager, IDelayedWithdrawalRouter(delayedWithdrawalRouter)
+                PufferProtocol(payable(proxy)),
+                eigenPodManager,
+                IDelayedWithdrawalRouter(delayedWithdrawalRouter),
+                IDelegationManager(delegationManager)
             );
             vm.label(address(moduleImplementation), "PufferModuleImplementation");
 

script/ReadValidators.s.sol

@@ -0,0 +1,29 @@
+// SPDX-License-Identifier: GPL-3.0
+pragma solidity >=0.8.0 <0.9.0;
+
+import { BaseScript } from "script/BaseScript.s.sol";
+import { IPufferProtocol } from "puffer/interface/IPufferProtocol.sol";
+import { Validator } from "puffer/struct/Validator.sol";
+import { stdJson } from "forge-std/StdJson.sol";
+import { console } from "forge-std/console.sol";
+
+/**
+ * @dev Example on how to run the script
+ *      forge script script/ReadValidators.s.sol:ReadValidators --rpc-url=$HOLESKY_RPC_URL --broadcast --sig "run(bytes32)" -vvvv 0x4e4f5f52455354414b494e470000000000000000000000000000000000000000
+ */
+contract ReadValidators is BaseScript {
+    function run(bytes32 strategyName) external broadcast {
+        // Validator[] memory validators = IPufferProtocol(0x4982C744Ef2694Af2970D3eB8a58744ed3cB1b1D).getValidators(bytes32("NO_RESTAKING"));
+        // for (uint256 i = 0; i < validators.length; ++i) {
+        //     console.log(validators[i].node);
+        // }
+
+        for (uint256 i = 0; i < 20; ++i) {
+            console.log(i);
+            Validator memory validator =
+                IPufferProtocol(0x4982C744Ef2694Af2970D3eB8a58744ed3cB1b1D).getValidatorInfo(bytes32("NO_RESTAKING"), i);
+            console.log(validator.node);
+            console.logBytes(validator.pubKey);
+        }
+    }
+}

src/EnclaveVerifier.sol

@@ -39,7 +39,7 @@ contract EnclaveVerifier is IEnclaveVerifier, AccessManaged, RAVE {
     /**
      * @inheritdoc IEnclaveVerifier
      */
-    function getIntelRootCAPubKey() public pure returns (RSAPubKey memory) {
+    function getIntelRootCAPubKey() external pure returns (RSAPubKey memory) {
         return RSAPubKey({ modulus: _INTEL_RSA_MODULUS, exponent: _INTEL_EXPONENT });
     }
 
@@ -63,7 +63,6 @@ contract EnclaveVerifier is IEnclaveVerifier, AccessManaged, RAVE {
     function removeLeafX509(bytes32 hashedCert) external restricted {
         delete _validLeafX509s[hashedCert].modulus;
         delete _validLeafX509s[hashedCert].exponent;
-
         emit RemovedPubKey(hashedCert);
     }
 

src/LibBeaconchainContract.sol

@@ -30,7 +30,11 @@ library LibBeaconchainContract {
         return sha256(
             abi.encodePacked(
                 sha256(abi.encodePacked(pubKeyRoot, withdrawalCredentials)),
-                sha256(abi.encodePacked(hex"0040597307000000000000000000000000000000000000000000000000000000", signatureRoot))
+                sha256(
+                    abi.encodePacked(
+                        hex"0040597307000000000000000000000000000000000000000000000000000000", signatureRoot
+                    )
+                )
             )
         );
     }

src/NoRestakingModule.sol

@@ -34,7 +34,7 @@ contract NoRestakingModule is IPufferModule, AccessManaged, TokenRescuer {
     error InvalidBlockNumber(uint256 blockNumber);
 
     /**
-     * @notice Thrown if the rewards are already calimed for a `blockNumber`
+     * @notice Thrown if the rewards are already claimed for a `blockNumber`
      * @dev Signature "0x916ba7f3"
      */
     error AlreadyClaimed(uint256 blockNumber, bytes32 pubKeyHash);