Operator<>AVS Mapping Support #73

ypatil12 · 2023-11-27T15:56:53Z

This draft PR adds functionality to support off-chain indexing for avs and operator info. Specifically, the funcationality enables support for the 5 use cases defined here.

Summary of Changes:

Functionality in RegistryCoordinator to call DelegationManager when an operator registers or is deregistered
UpdateAVSMetadataURI function in RegistryCoordinator
To support indexing of strategies supported by AVSs and restated strategies of operators, we define two functions: getOperatorRestakedStrategies and getRestakeableStrategies. These functions utilize quorum bitmaps of the AVS (new functionality) and operator respectively.

wadealexc · 2023-11-27T16:52:22Z

Can you retarget the PR against m2-mainnet?

src/BLSRegistryCoordinatorWithIndices.sol

gpsanant · 2023-11-27T17:49:30Z

src/VoteWeigherBaseStorage.sol

@@ -39,6 +39,9 @@ abstract contract VoteWeigherBaseStorage is Initializable, IVoteWeigher {
    /// @notice The number of quorums that the VoteWeigher is considering.
    uint16 public quorumCount;

+    /// @notice Bitmap of quorums that are being used by the middleware.
+    uint192 public quorumBitmap;


would prefer to just use quorum count here?

gpsanant · 2023-11-27T17:50:10Z

src/StakeRegistry.sol

+        bytes memory quorumNumbers = BitmapUtils.bitmapToBytesArray(quorumBitmap);
+        IStrategy[] memory strategies = new IStrategy[](_getNumStrategiesInBitmap(quorumNumbers));
+        uint256 index = 0;
+        for(uint256 i = 0; i < quorumNumbers.length; i++){


use quourmCount across the board

gpsanant · 2023-11-27T17:51:35Z

src/StakeRegistry.sol

+        for(uint256 i = 0; i < quorumNumbers.length; i++){
+            StrategyAndWeightingMultiplier[] memory strategiesAndMultipliers = strategiesConsideredAndMultipliers[uint8(quorumNumbers[i])];
+            for(uint256 j = 0; j < strategiesAndMultipliers.length; j++){
+                strategies[index] = strategiesAndMultipliers[j].strategy;


this might end up having a lot of duplicates. lets try to avoid that

gpsanant · 2023-11-27T17:52:13Z

src/StakeRegistry.sol

+
+    /**
+     * @notice Return a list of all strategies and corresponding share amounts for which the operator has restaked
+     * @dev There may strategies for which the operator has restaked on the quorum but has no shares. In this case,


gpsanant · 2023-11-27T17:53:09Z

src/StakeRegistry.sol

+            }
+        }
+
+        return (strategies, shares);


i don't think it makes sense to return shares? let's just assume all stake of the strategy is staked until slashing is live

Yup, discussed with Bowen and we have a pipeline in the backend for getting operator shares so will remove

src/BLSRegistryCoordinatorWithIndices.sol

wadealexc · 2023-11-28T20:56:25Z

src/StakeRegistry.sol

+
+        quorumBitmap = uint192(quorumBitmap.plus(uint192(1) << quorumNumber));


Would prefer we add a helper for this, because it's easy to fuck up. I'm using this in another branch:

eigenlayer-middleware/src/libraries/BitmapUtils.sol

Lines 303 to 311 in a6baa25

/**

* @notice Returns a copy of `bitmap` with `bit` set.

* @dev IMPORTANT: we're dealing with stack values here, so this doesn't modify

* the original bitmap. Using this correctly requires an assignment statement:

* `bitmap = bitmap.setBit(bit);`

*/

function setBit(uint256 bitmap, uint8 bit) internal pure returns (uint256) {

return bitmap | (1 << bit);

}

wadealexc · 2023-11-28T20:58:30Z

src/StakeRegistry.sol

+
+        // If no strategies exist in quorum, turn bit off 
+        if (_strategyParams.length == 0) {
+            quorumBitmap = uint192(quorumBitmap.minus(uint192(1) << quorumNumber));


Would prefer a helper for this. Could use something similar to the setBit method I linked, but with a bool on/off switch?

Or just unsetBit 🤷

wadealexc

Can we remove the StakeRegistry changes in favor of exposing similar methods in the registry coordinator?

Specifically, I like how currently only one contract keeps track of the current set of initialized quorums, and I want to keep that logic there.

I think if you expose the for loops you're doing in both view StakeRegistry methods, the registry coordinator is a better place to keep this logic.

src/BLSRegistryCoordinatorWithIndices.sol

src/StakeRegistry.sol

ChaoticWalrus

PR seems very reasonable, but would like to get the other PR this relies on just a bit more finalized first.
The new 'view' functions being added to the StakeRegistry seem ~inefficient, but AFAICT these are designed to only ever be called off-chain, and thus seem OK as-is.

bowenli86 · 2023-12-06T22:59:22Z

IIUC, we don't need this PR anymore in middle repo right? @ypatil12

ChaoticWalrus · 2023-12-06T23:47:19Z

IIUC, we don't need this PR anymore in middle repo right? @ypatil12

We'd still need the parts that integrate with the new changes to the 'core' contracts, but we can delete the added functions in the StakeRegistry + associated interface from this PR.

bowenli86 · 2023-12-06T23:49:01Z

IIUC, we don't need this PR anymore in middle repo right? @ypatil12

We'd still need the parts that integrate with the new changes to the 'core' contracts, but we can delete the added functions in the StakeRegistry + associated interface from this PR.

ok, will work on a new pr for it

gpsanant · 2023-12-07T05:14:14Z

src/StakeRegistry.sol

@@ -19,7 +19,8 @@ import "src/StakeRegistryStorage.sol";
 * @author Layr Labs, Inc.
 */
 contract StakeRegistry is StakeRegistryStorage {
-
+    using BitmapUtils for *;


hm. why not just uint256

doesn't make a difference to the bytecode 🤷

ypatil12 · 2023-12-08T17:10:23Z

Closing this PR as functionality is out of scope.

bowenli86 · 2023-12-08T23:42:03Z

src/interfaces/IRegistryCoordinator.sol

+     * @notice Registers msg.sender as an operator with the middleware
+     * @param quorumNumbers are the bytes representing the quorum numbers that the operator is registering for
+     * @param registrationData is the data that is decoded to get the operator's registration information
+     * @param signatureWithSaltAndExpiry is the signature of the operator used by the avs to register the operator in the delegation manager
+     */
+    function registerOperatorWithCoordinator(bytes memory quorumNumbers, bytes calldata registrationData, SignatureWithSaltAndExpiry memory signatureWithSaltAndExpiry) external;
+
+    /**
+     * @notice Deregisters the msg.sender as an operator from the middleware
+     * @param quorumNumbers are the bytes representing the quorum numbers that the operator is registered for
+     * @param deregistrationData is the the data that is decoded to get the operator's deregistration information
+     */
+    function deregisterOperatorWithCoordinator(bytes calldata quorumNumbers, bytes calldata deregistrationData) external;


QQ: why these 2 api are not implemented? @ypatil12

Old methods that were not removed correctly on rebase

they're implemented, just renamed registerOperator and deregisterOperator

bowenli86 · 2023-12-10T20:32:43Z

see https://eigenlabs.slack.com/archives/C05PX94L3H9/p1702240195992199?thread_ts=1702146213.952949&cid=C05PX94L3H9

i really wanna do the middleware pr, but looking at my calendar - i'll be OOO on 14th, and hv a pile of backend work need to finish before then, realistically i won't be able to finish middleware pr then

will be great if @ypatil12 can continue the middleware pr

ypatil12 requested review from wadealexc and ChaoticWalrus November 27, 2023 15:57

ypatil12 force-pushed the feat/avs-operator-mapping-m2Mainnet branch from ff851d1 to 066c679 Compare November 27, 2023 15:58

gpsanant reviewed Nov 27, 2023

View reviewed changes

src/BLSRegistryCoordinatorWithIndices.sol Show resolved Hide resolved

gpsanant reviewed Nov 27, 2023

View reviewed changes

gpsanant self-requested a review November 27, 2023 17:53

ypatil12 changed the base branch from master to m2-mainnet November 27, 2023 18:05

ypatil12 force-pushed the feat/avs-operator-mapping-m2Mainnet branch 2 times, most recently from 1fd2a54 to 3e28473 Compare November 27, 2023 18:12

ypatil12 added 2 commits November 27, 2023 13:12

chore: update contracts submodule to avs operator mapping brnch

50a67a1

Feat: Add avs registration & operator/strategy accounting

b70b2be

ypatil12 force-pushed the feat/avs-operator-mapping-m2Mainnet branch from 3e28473 to b70b2be Compare November 27, 2023 18:27

ypatil12 added 2 commits November 27, 2023 13:36

refactor: update target to m2-mainnet branch

61117ae

fix: update stake registry to target m2-mainnet

5e695c1

wadealexc reviewed Nov 28, 2023

View reviewed changes

src/BLSRegistryCoordinatorWithIndices.sol Show resolved Hide resolved

wadealexc reviewed Nov 28, 2023

View reviewed changes

src/BLSRegistryCoordinatorWithIndices.sol Show resolved Hide resolved

wadealexc reviewed Nov 28, 2023

View reviewed changes

wadealexc requested changes Nov 28, 2023

View reviewed changes

ChaoticWalrus reviewed Nov 28, 2023

View reviewed changes

src/BLSRegistryCoordinatorWithIndices.sol Show resolved Hide resolved

ChaoticWalrus reviewed Nov 28, 2023

View reviewed changes

src/StakeRegistry.sol Show resolved Hide resolved

ChaoticWalrus reviewed Nov 28, 2023

View reviewed changes

note: add dev comments on duplicated strats

75ad54c

gpsanant reviewed Dec 7, 2023

View reviewed changes

ypatil12 closed this Dec 8, 2023

bowenli86 reviewed Dec 8, 2023

View reviewed changes

ypatil12 deleted the feat/avs-operator-mapping-m2Mainnet branch December 11, 2023 19:50

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Operator<>AVS Mapping Support #73

Operator<>AVS Mapping Support #73

ypatil12 commented Nov 27, 2023 •

edited

Loading

wadealexc commented Nov 27, 2023

gpsanant Nov 27, 2023

gpsanant Nov 27, 2023

gpsanant Nov 27, 2023

gpsanant Nov 27, 2023

gpsanant Nov 27, 2023

ypatil12 Nov 28, 2023

wadealexc Nov 28, 2023

wadealexc Nov 28, 2023

wadealexc Nov 28, 2023

wadealexc left a comment

ChaoticWalrus left a comment

bowenli86 commented Dec 6, 2023

ChaoticWalrus commented Dec 6, 2023

bowenli86 commented Dec 6, 2023

gpsanant Dec 7, 2023

wadealexc Dec 7, 2023

ypatil12 commented Dec 8, 2023

bowenli86 Dec 8, 2023 •

edited

Loading

ypatil12 Dec 11, 2023

wadealexc Dec 11, 2023

bowenli86 commented Dec 10, 2023


		quorumBitmap = uint192(quorumBitmap.plus(uint192(1) << quorumNumber));

	/**
	* @notice Returns a copy of `bitmap` with `bit` set.
	* @dev IMPORTANT: we're dealing with stack values here, so this doesn't modify
	* the original bitmap. Using this correctly requires an assignment statement:
	* `bitmap = bitmap.setBit(bit);`
	*/
	function setBit(uint256 bitmap, uint8 bit) internal pure returns (uint256) {
	return bitmap \| (1 << bit);
	}

Operator<>AVS Mapping Support #73

Operator<>AVS Mapping Support #73

Conversation

ypatil12 commented Nov 27, 2023 • edited Loading

wadealexc commented Nov 27, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

wadealexc left a comment

Choose a reason for hiding this comment

ChaoticWalrus left a comment

Choose a reason for hiding this comment

bowenli86 commented Dec 6, 2023

ChaoticWalrus commented Dec 6, 2023

bowenli86 commented Dec 6, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

ypatil12 commented Dec 8, 2023

bowenli86 Dec 8, 2023 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

bowenli86 commented Dec 10, 2023

ypatil12 commented Nov 27, 2023 •

edited

Loading

bowenli86 Dec 8, 2023 •

edited

Loading