Merge branch 'm2-mainnet' into feat/remove-set-withdrawal-delay

.github/workflows/certora-prover.yml

@@ -6,7 +6,7 @@ on:
       - master
       - release-v*
       - formal-verification
-      - fix-ci-errors
+      - m2-mainnet
   pull_request: {}
   workflow_dispatch: {}
 

.gitignore

@@ -22,6 +22,7 @@ broadcast
 
 # Deployment tools
 /data
+.idea/
 
 # Certora Outputs
 .certora_internal/

src/contracts/core/DelegationManager.sol

@@ -142,6 +142,14 @@ contract DelegationManager is Initializable, OwnableUpgradeable, Pausable, Deleg
         emit OperatorMetadataURIUpdated(msg.sender, metadataURI);
     }
 
+    /**
+     * @notice Called by an avs to emit an `AVSMetadataURIUpdated` event indicating the information has updated.
+     * @param metadataURI The URI for metadata associated with an avs
+     */
+    function updateAVSMetadataURI(string calldata metadataURI) external {
+        emit AVSMetadataURIUpdated(msg.sender, metadataURI);
+    }
+
     /**
      * @notice Caller delegates their stake to an operator.
      * @param operator The account (`msg.sender`) is delegating its assets to for use in serving applications built on EigenLayer.

src/contracts/interfaces/IDelegationManager.sol

@@ -116,6 +116,12 @@ interface IDelegationManager is ISignatureUtils {
      */
     event OperatorMetadataURIUpdated(address indexed operator, string metadataURI);
 
+    /**
+     * @notice Emitted when @param avs indicates that they are updating their MetadataURI string
+     * @dev Note that these strings are *never stored in storage* and are instead purely emitted in events for off-chain indexing
+     */
+    event AVSMetadataURIUpdated(address indexed avs, string metadataURI);
+
     /// @notice Emitted whenever an operator's shares are increased for a given strategy. Note that shares is the delta in the operator's shares.
     event OperatorSharesIncreased(address indexed operator, address staker, IStrategy strategy, uint256 shares);
 
@@ -173,9 +179,17 @@ interface IDelegationManager is ISignatureUtils {
     /**
      * @notice Called by an operator to emit an `OperatorMetadataURIUpdated` event indicating the information has updated.
      * @param metadataURI The URI for metadata associated with an operator
+     * @dev Note that the `metadataURI` is *never stored * and is only emitted in the `OperatorMetadataURIUpdated` event
      */
     function updateOperatorMetadataURI(string calldata metadataURI) external;
 
+    /**
+     * @notice Called by an AVS to emit an `AVSMetadataURIUpdated` event indicating the information has updated.
+     * @param metadataURI The URI for metadata associated with an AVS
+     * @dev Note that the `metadataURI` is *never stored * and is only emitted in the `AVSMetadataURIUpdated` event
+     */
+    function updateAVSMetadataURI(string calldata metadataURI) external;
+
     /**
      * @notice Caller delegates their stake to an operator.
      * @param operator The account (`msg.sender`) is delegating its assets to for use in serving applications built on EigenLayer.

src/test/WithdrawalMigration.t.sol

@@ -29,7 +29,7 @@ contract WithdrawalMigrationTests is EigenLayerTestHelper, Utils {
     IERC20 cbETH = IERC20(_CBETH_ADDRESS);
 
     function setUp() public override {
-        vm.createSelectFork("https://eth.llamarpc.com", _M1_BLOCK_FORK);
+        vm.createSelectFork(cheats.envString("RPC_MAINNET"), _M1_BLOCK_FORK);
         beaconChainETHStrategy = m1StrategyManager.beaconChainETHStrategy();
         // Unpause strategyManager
         cheats.prank(_M1_UNPAUSER);

src/test/events/IDelegationManagerEvents.sol

@@ -20,6 +20,12 @@ interface IDelegationManagerEvents {
      */
     event OperatorMetadataURIUpdated(address indexed operator, string metadataURI);
 
+    /**
+     * @notice Emitted when @param avs indicates that they are updating their MetadataURI string
+     * @dev Note that these strings are *never stored in storage* and are instead purely emitted in events for off-chain indexing
+     */
+    event AVSMetadataURIUpdated(address indexed avs, string metadataURI);
+
     /// @notice Emitted whenever an operator's shares are increased for a given strategy
     event OperatorSharesIncreased(address indexed operator, address staker, IStrategy strategy, uint256 shares);
 

src/test/mocks/DelegationManagerMock.sol

@@ -28,6 +28,8 @@ contract DelegationManagerMock is IDelegationManager, Test {
 
     function updateOperatorMetadataURI(string calldata /*metadataURI*/) external pure {}
 
+    function updateAVSMetadataURI(string calldata /*metadataURI*/) external pure {}
+
     function delegateTo(address operator, SignatureWithExpiry memory /*approverSignatureAndExpiry*/, bytes32 /*approverSalt*/) external {
         delegatedTo[msg.sender] = operator;
     }

src/test/unit/DelegationUnit.t.sol

@@ -42,6 +42,7 @@ contract DelegationManagerUnitTests is EigenLayerUnitTestSetup, IDelegationManag
     // reused in various tests. in storage to help handle stack-too-deep errors
     address defaultStaker = cheats.addr(uint256(123_456_789));
     address defaultOperator = address(this);
+    address defaultAVS = address(this);
 
     uint256 initializedWithdrawalDelayBlocks = 50400;
 
@@ -241,7 +242,7 @@ contract DelegationManagerUnitTests is EigenLayerUnitTestSetup, IDelegationManag
         _registerOperator(operator, operatorDetails, emptyStringForMetadataURI);
     }
 
-    function _registerOperatorWith1271DelegationApprover(address operator) internal {
+    function _registerOperatorWith1271DelegationApprover(address operator) internal returns (ERC1271WalletMock) {
         address delegationSigner = cheats.addr(delegationSignerPrivateKey);
         /**
          * deploy a ERC1271WalletMock contract with the `delegationSigner` address as the owner,
@@ -255,6 +256,8 @@ contract DelegationManagerUnitTests is EigenLayerUnitTestSetup, IDelegationManag
             stakerOptOutWindowBlocks: 0
         });
         _registerOperator(operator, operatorDetails, emptyStringForMetadataURI);
+
+        return wallet;
     }
 
     function _registerOperator(
@@ -580,6 +583,15 @@ contract DelegationManagerUnitTests_RegisterModifyOperator is DelegationManagerU
         emit OperatorMetadataURIUpdated(defaultOperator, metadataURI);
         delegationManager.updateOperatorMetadataURI(metadataURI);
     }
+
+    // @notice Tests that an avs who calls `updateAVSMetadataURI` will correctly see an `AVSMetadataURIUpdated` event emitted with their input
+    function testFuzz_UpdateAVSMetadataURI(string memory metadataURI) public {
+        // call `updateAVSMetadataURI` and check for event
+        cheats.prank(defaultAVS);
+        cheats.expectEmit(true, true, true, true, address(delegationManager));
+        emit AVSMetadataURIUpdated(defaultAVS, metadataURI);
+        delegationManager.updateAVSMetadataURI(metadataURI);
+    }
 }
 
 contract DelegationManagerUnitTests_delegateTo is DelegationManagerUnitTests {
@@ -1399,8 +1411,8 @@ contract DelegationManagerUnitTests_delegateTo is DelegationManagerUnitTests {
 
         // register *this contract* as an operator
         // filter inputs, since this will fail when the staker is already registered as an operator
-        cheats.assume(staker != defaultOperator);
-        _registerOperatorWith1271DelegationApprover(defaultOperator);
+        ERC1271WalletMock wallet = _registerOperatorWith1271DelegationApprover(defaultOperator);
+        cheats.assume(staker != address(wallet) && staker != defaultOperator);
 
         // calculate the delegationSigner's signature
         ISignatureUtils.SignatureWithExpiry memory approverSignatureAndExpiry = _getApproverSignature(