Skip to content

Commit

Permalink
chore(contracts): revert avs key separation (#1075)
Browse files Browse the repository at this point in the history 
Reverts #1054

We do not need those changes. Key separation will 
be handled separately, by moving registration to OmniStake

task: none
  • Loading branch information
@kevinhalliday
kevinhalliday authored May 21, 2024
1 parent 2bd2735 commit 1d535e1
Show file tree
Hide file tree
Showing 11 changed files with 128 additions and 496 deletions.
107 changes: 51 additions & 56 deletions contracts/.gas-snapshot
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,70 +6,65 @@ FeeOracleV1_Test:test_setManager() (gas: 51736)
FeeOracleV1_Test:test_setProtocolFee() (gas: 33039)
FeeOracleV1_Test:test_setToNativeRate() (gas: 43576)
OmniAVS_admin_Test:test_avsDirectory_succeeds() (gas: 15019)
OmniAVS_admin_Test:test_ejectOwner_byOwner_succeeds() (gas: 575409)
OmniAVS_admin_Test:test_ejectOwner_notOwner_reverts() (gas: 197834)
OmniAVS_admin_Test:test_getOperatorRestakedStrategies_noStrategies_succeeds() (gas: 683530)
OmniAVS_admin_Test:test_getOperatorRestakedStrategies_notOperator_succeeds() (gas: 198165)
OmniAVS_admin_Test:test_getOperatorRestakedStrategies_succeeds() (gas: 747431)
OmniAVS_admin_Test:test_getRestakeableStrategies_noStrategies_succeeds() (gas: 27488)
OmniAVS_admin_Test:test_getRestakeableStrategies_succeeds() (gas: 89269)
OmniAVS_admin_Test:test_pause_byOwner_succeeds() (gas: 44841)
OmniAVS_admin_Test:test_registerOperator_whenPaused_reverts() (gas: 228252)
OmniAVS_admin_Test:test_setEthStakeInbox_notOwner_reverts() (gas: 17977)
OmniAVS_admin_Test:test_setEthStakeInbox_succeeds() (gas: 27983)
OmniAVS_admin_Test:test_setEthStakeInbox_zeroAddress_reverts() (gas: 20524)
OmniAVS_admin_Test:test_setMaxOperatorCount_notOwner_reverts() (gas: 17924)
OmniAVS_admin_Test:test_setMaxOperatorCount_succeeds() (gas: 29324)
OmniAVS_admin_Test:test_ejectOwner_byOwner_succeeds() (gas: 430904)
OmniAVS_admin_Test:test_ejectOwner_notOwner_reverts() (gas: 107965)
OmniAVS_admin_Test:test_getOPeratorRestakedStrategies_notOperator_succeeds() (gas: 108351)
OmniAVS_admin_Test:test_getOperatorRestakedStrategies_noStrategies_succeeds() (gas: 513975)
OmniAVS_admin_Test:test_getOperatorRestakedStrategies_succeeds() (gas: 577871)
OmniAVS_admin_Test:test_getRestakeableStrategies_noStrategies_succeeds() (gas: 27453)
OmniAVS_admin_Test:test_getRestakeableStrategies_succeeds() (gas: 89247)
OmniAVS_admin_Test:test_pause_byOwner_succeeds() (gas: 44863)
OmniAVS_admin_Test:test_registerOperator_whenPaused_reverts() (gas: 138161)
OmniAVS_admin_Test:test_setEthStakeInbox_notOwner_reverts() (gas: 18021)
OmniAVS_admin_Test:test_setEthStakeInbox_succeeds() (gas: 28049)
OmniAVS_admin_Test:test_setEthStakeInbox_zeroAddress_reverts() (gas: 20568)
OmniAVS_admin_Test:test_setMaxOperatorCount_notOwner_reverts() (gas: 17968)
OmniAVS_admin_Test:test_setMaxOperatorCount_succeeds() (gas: 29456)
OmniAVS_admin_Test:test_setMetadataURI_notOwner_reverts() (gas: 18700)
OmniAVS_admin_Test:test_setMetadataURI_succeeds() (gas: 38538)
OmniAVS_admin_Test:test_setMinOperatorStake_notOwner_reverts() (gas: 18006)
OmniAVS_admin_Test:test_setMinOperatorStake_notOwner_reverts() (gas: 18072)
OmniAVS_admin_Test:test_setMinOperatorStake_succeeds() (gas: 30026)
OmniAVS_admin_Test:test_setOmniChainId_notOwner_reverts() (gas: 17973)
OmniAVS_admin_Test:test_setOmniChainId_succeeds() (gas: 27834)
OmniAVS_admin_Test:test_setPortal_notOwner_reverts() (gas: 17912)
OmniAVS_admin_Test:test_setPortal_succeeds() (gas: 27920)
OmniAVS_admin_Test:test_setPortal_zeroAddress_reverts() (gas: 20448)
OmniAVS_admin_Test:test_setStrategyParams_duplicateStrategy_reverts() (gas: 38127)
OmniAVS_admin_Test:test_setStrategyParams_notOwner_reverts() (gas: 18351)
OmniAVS_admin_Test:test_setStrategyParams_succeds() (gas: 74851)
OmniAVS_admin_Test:test_setStrategyParams_twice_succeeds() (gas: 56003)
OmniAVS_admin_Test:test_setStrategyParams_zeroAddress_reverts() (gas: 36848)
OmniAVS_admin_Test:test_setStrategyParams_zeroMul_reverts() (gas: 37116)
OmniAVS_admin_Test:test_setXCallGasLimits_notOwner_reverts() (gas: 18157)
OmniAVS_admin_Test:test_setXCallGasLimits_succeeds() (gas: 33504)
OmniAVS_admin_Test:test_syncWithOmni_whenPaused_reverts() (gas: 45242)
OmniAVS_admin_Test:test_unpause_byOwner_succeeds() (gas: 35649)
OmniAVS_allowlist_Test:test_addToAllowlist_notOwner_reverts() (gas: 197789)
OmniAVS_allowlist_Test:test_addToAllowlist_succeeds() (gas: 225166)
OmniAVS_allowlist_Test:test_disableAllowlist_alreadyDisabled_reverts() (gas: 31644)
OmniAVS_allowlist_Test:test_disableAllowlist_notOwner_reverts() (gas: 17801)
OmniAVS_allowlist_Test:test_disableAllowlist_succeeds() (gas: 28912)
OmniAVS_allowlist_Test:test_enableAllowlist_alreadyEnabled_reverts() (gas: 25699)
OmniAVS_allowlist_Test:test_enableAllowlist_notOwner_reverts() (gas: 17845)
OmniAVS_allowlist_Test:test_enableAllowlist_succeeds() (gas: 29411)
OmniAVS_allowlist_Test:test_registerOperator_allowlistDisabled_succeeds() (gas: 686392)
OmniAVS_allowlist_Test:test_registerOperator_nowAllowed_reverts() (gas: 206766)
OmniAVS_allowlist_Test:test_registerOperator_succeeds() (gas: 704810)
OmniAVS_allowlist_Test:test_removeFromAllowlist_notOwner_reverts() (gas: 197759)
OmniAVS_allowlist_Test:test_removeFromAllowlist_succeeds() (gas: 420243)
OmniAVS_canRegister_Test:test_canRegister_allowed() (gas: 417890)
OmniAVS_canRegister_Test:test_canRegister_allowlistDisabled() (gas: 397819)
OmniAVS_canRegister_Test:test_canRegister_alreadyRegistered() (gas: 689393)
OmniAVS_canRegister_Test:test_canRegister_maxOperatorsReached() (gas: 351776)
OmniAVS_canRegister_Test:test_canRegister_minStakeNotMet() (gas: 418372)
OmniAVS_canRegister_Test:test_canRegister_notAllowed() (gas: 312646)
OmniAVS_canRegister_Test:test_canRegister_notOperator() (gas: 209798)
OmniAVS_initialize_Test:test_initialize_defaultParams_succeeds() (gas: 4078613)
OmniAVS_registration_Test:test_registerOperator_activeValKey_reverts() (gas: 1043345)
OmniAVS_registration_Test:test_registerOperator_expiredSig_reverts() (gas: 441910)
OmniAVS_registration_Test:test_registerOperator_invalidDigestHash_reverts() (gas: 448834)
OmniAVS_registration_Test:test_registerOperator_invalidPubkey_reverts() (gas: 447106)
OmniAVS_registration_Test:test_registerOperator_invalidSignature_reverts() (gas: 631600)
OmniAVS_registration_Test:test_registerOperator_registerTwice_succeeds() (gas: 898975)
OmniAVS_registration_Test:test_registerOperator_spentSalt_reverts() (gas: 566947)
OmniAVS_registration_Test:test_registerOperator_succeeds() (gas: 723501)
OmniAVS_syncWithOmni_Test:test_depositBeaconEth_succeeds() (gas: 819127)
OmniAVS_syncWithOmni_Test:test_unsupportedStrategyDeposit_succeeds() (gas: 1631277)
OmniAVS_admin_Test:test_setStrategyParams_duplicateStrategy_reverts() (gas: 38149)
OmniAVS_admin_Test:test_setStrategyParams_notOwner_reverts() (gas: 18373)
OmniAVS_admin_Test:test_setStrategyParams_succeds() (gas: 74917)
OmniAVS_admin_Test:test_setStrategyParams_twice_succeeds() (gas: 56091)
OmniAVS_admin_Test:test_setStrategyParams_zeroAddress_reverts() (gas: 36870)
OmniAVS_admin_Test:test_setStrategyParams_zeroMul_reverts() (gas: 37138)
OmniAVS_admin_Test:test_setXCallGasLimits_notOwner_reverts() (gas: 18090)
OmniAVS_admin_Test:test_setXCallGasLimits_succeeds() (gas: 33393)
OmniAVS_admin_Test:test_syncWithOmni_whenPaused_reverts() (gas: 45264)
OmniAVS_admin_Test:test_unpause_byOwner_succeeds() (gas: 35667)
OmniAVS_allowlist_Test:test_addToAllowlist_notOwner_reverts() (gas: 108019)
OmniAVS_allowlist_Test:test_addToAllowlist_succeeds() (gas: 135395)
OmniAVS_allowlist_Test:test_disableAllowlist_alreadyDisabled_reverts() (gas: 31776)
OmniAVS_allowlist_Test:test_disableAllowlist_notOwner_reverts() (gas: 17845)
OmniAVS_allowlist_Test:test_disableAllowlist_succeeds() (gas: 29000)
OmniAVS_allowlist_Test:test_enableAllowlist_alreadyEnabled_reverts() (gas: 25676)
OmniAVS_allowlist_Test:test_enableAllowlist_notOwner_reverts() (gas: 17778)
OmniAVS_allowlist_Test:test_enableAllowlist_succeeds() (gas: 29432)
OmniAVS_allowlist_Test:test_registerOperator_allowlistDisabled_succeeds() (gas: 516871)
OmniAVS_allowlist_Test:test_registerOperator_invalidPubkey_reverts() (gas: 312409)
OmniAVS_allowlist_Test:test_registerOperator_nowAllowed_reverts() (gas: 117050)
OmniAVS_allowlist_Test:test_registerOperator_succeeds() (gas: 535223)
OmniAVS_allowlist_Test:test_registerOperator_succeeds() (gas: 554055)
OmniAVS_allowlist_Test:test_registerOperator_wrongPubkey_reverts() (gas: 402056)
OmniAVS_allowlist_Test:test_removeFromAllowlist_notOwner_reverts() (gas: 107989)
OmniAVS_allowlist_Test:test_removeFromAllowlist_succeeds() (gas: 240700)
OmniAVS_canRegister_Test:test_canRegister_allowed() (gas: 328138)
OmniAVS_canRegister_Test:test_canRegister_allowlistDisabled() (gas: 308111)
OmniAVS_canRegister_Test:test_canRegister_alreadyRegistered() (gas: 519760)
OmniAVS_canRegister_Test:test_canRegister_maxOperatorsReached() (gas: 262015)
OmniAVS_canRegister_Test:test_canRegister_minStakeNotMet() (gas: 328620)
OmniAVS_canRegister_Test:test_canRegister_notAllowed() (gas: 222863)
OmniAVS_canRegister_Test:test_canRegister_notOperator() (gas: 119994)
OmniAVS_initialize_Test:test_initialize_defaultParams_succeeds() (gas: 3588147)
OmniAVS_syncWithOmni_Test:test_depositBeaconEth_succeeds() (gas: 630918)
OmniAVS_syncWithOmni_Test:test_unsupportedStrategyDeposit_succeeds() (gas: 1532940)
OmniPortal_admin_Test:test_pause() (gas: 64853901)
OmniPortal_admin_Test:test_setFeeOracle() (gas: 34843)
OmniPortal_adversarial:test_xcallToPortal_adminFunc_fails() (gas: 82603)
Expand Down
38 changes: 11 additions & 27 deletions contracts/src/interfaces/IOmniAVS.sol
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,8 @@ interface IOmniAVS {
/**
* @notice Emitted when an operator is added to the OmniAVS.
* @param operator The address of the operator
* @param valPubKey The operator's 64 byte uncompressed secp256k1 validator public key
*/
event OperatorAdded(address indexed operator, bytes valPubKey);
event OperatorAdded(address indexed operator);

/**
* @notice Emitted when an operator is removed from the OmniAVS.
Expand All @@ -25,14 +24,14 @@ interface IOmniAVS {

/**
* @notice Struct representing an OmniAVS operator
* @custom:field operator The operator's ethereum address
* @custom:field validatorPubKey The operator's 64 byte uncompressed secp256k1 validator public key
* @custom:field delegated The total amount delegated, not including operator stake
* @custom:field staked The total amount staked by the operator, not including delegations
* @custom:field addr The operator's ethereum address
* @custom:field pubkey The operator's 64 byte uncompressed secp256k1 public key
* @custom:field delegated The total amount delegated, not including operator stake
* @custom:field staked The total amount staked by the operator, not including delegations
*/
struct Operator {
address operator;
bytes validatorPubKey;
address addr;
bytes pubkey;
uint96 delegated;
uint96 staked;
}
Expand Down Expand Up @@ -69,30 +68,15 @@ interface IOmniAVS {

/**
* @notice Register an operator with the AVS. Forwards call to EigenLayer' AVSDirectory.
* @param validatorPubKey The operator's 64 byte uncompressed secp256k1 validator public key.
* @param validatorSignature The operator's validator pubkey registration signature, with salt and expiry.
* Signature must match `validatorPubKey`
* @param operatorSignature The operator's AVS registration signature, with salt and expiry.
* Signed must match `msg.sender`
* @param pubkey 64 byte uncompressed secp256k1 public key (no 0x04 prefix)
* Pubkey must match operator's address (msg.sender)
* @param operatorSignature The signature, salt, and expiry of the operator's signature.
*/
function registerOperator(
bytes calldata validatorPubKey,
ISignatureUtils.SignatureWithSaltAndExpiry calldata validatorSignature,
bytes calldata pubkey,
ISignatureUtils.SignatureWithSaltAndExpiry memory operatorSignature
) external;

/**
* @notice Returns the digest hash to be signed by an opeator's validator key on registration.
* @param operator The operator's ethereum address
* @param valPubKey The operator's 64 byte uncompressed secp256k1 validator public key
* @param salt A salt unique to this registration
* @param expiry The timestamp at which this registration expires
*/
function validatorRegistrationDigestHash(address operator, bytes calldata valPubKey, bytes32 salt, uint256 expiry)
external
view
returns (bytes32);

/**
* @notice Check if an operator can register to the AVS.
* Returns true, with no reason, if the operator can register to the AVS.
Expand Down
Loading

0 comments on commit 1d535e1

Please sign in to comment.