refactor: custom err when non-valid podOwner registers with avs (#414)

* improve ux * abi+binding
primev · Sep 27, 2024 · 00df501 · 00df501
1 parent 4200e9b
commit 00df501
Show file tree

Hide file tree

Showing 5 changed files with 27 additions and 1 deletion.
diff --git a/contracts-abi/abi/MevCommitAVS.abi b/contracts-abi/abi/MevCommitAVS.abi
@@ -1563,6 +1563,17 @@
     "name": "NoEigenStrategyDeposits",
     "inputs": []
   },
+  {
+    "type": "error",
+    "name": "NoPodExists",
+    "inputs": [
+      {
+        "name": "podOwner",
+        "type": "address",
+        "internalType": "address"
+      }
+    ]
+  },
   {
     "type": "error",
     "name": "NotInitializing",

diff --git a/contracts-abi/clients/MevCommitAVS/MevCommitAVS.go b/contracts-abi/clients/MevCommitAVS/MevCommitAVS.go
diff --git a/contracts/contracts/interfaces/IMevCommitAVS.sol b/contracts/contracts/interfaces/IMevCommitAVS.sol
@@ -131,6 +131,7 @@ interface IMevCommitAVS {
     error UnfreezeTransferFailed();
     error RefundFailed();
     error OperatorDeregAlreadyRequested();
+    error NoPodExists(address podOwner);
     error ValidatorNotActiveWithEigenCore(bytes valPubKey);
     error ValidatorDeregAlreadyRequested();
     error FrozenValidatorCannotDeregister();

diff --git a/contracts/contracts/validator-registry/avs/MevCommitAVS.sol b/contracts/contracts/validator-registry/avs/MevCommitAVS.sol
@@ -425,6 +425,7 @@ contract MevCommitAVS is IMevCommitAVS, MevCommitAVSStorage,
         address operator = _delegationManager.delegatedTo(podOwner);
         require(operatorRegistrations[operator].exists, IMevCommitAVS.OperatorNotRegistered(operator));
         require(!operatorRegistrations[operator].deregRequestOccurrence.exists, IMevCommitAVS.OperatorDeregAlreadyRequested());
+        require(_eigenPodManager.hasPod(podOwner), IMevCommitAVS.NoPodExists(podOwner));
         IEigenPod pod = _eigenPodManager.getPod(podOwner);
         uint256 len = valPubKeys.length;
         for (uint256 i = 0; i < len; ++i) {

diff --git a/contracts/test/validator-registry/avs/MevCommitAVSTest.sol b/contracts/test/validator-registry/avs/MevCommitAVSTest.sol
@@ -316,6 +316,19 @@ contract MevCommitAVSTest is Test {
         assertFalse(regInfo0.deregRequestOccurrence.exists);
         assertFalse(regInfo1.deregRequestOccurrence.exists);
 
+        address[] memory invalidPodOwners = new address[](1);
+        invalidPodOwners[0] = address(0x1423432432423432);
+        vm.prank(invalidPodOwners[0]);
+        delegationManagerMock.delegateTo(operator, sig, bytes32("salt"));
+        vm.expectRevert(abi.encodeWithSelector(IMevCommitAVS.NoPodExists.selector, invalidPodOwners[0]));
+        vm.prank(invalidPodOwners[0]);
+        mevCommitAVS.registerValidatorsByPodOwners(arrayValPubkeys, invalidPodOwners);
+
+        eigenPodManagerMock.setMockPod(invalidPodOwners[0], new EigenPodMock());
+        vm.expectRevert(abi.encodeWithSelector(IMevCommitAVS.ValidatorNotActiveWithEigenCore.selector, sampleValPubkey1));
+        vm.prank(invalidPodOwners[0]);
+        mevCommitAVS.registerValidatorsByPodOwners(arrayValPubkeys, invalidPodOwners);
+
         vm.expectEmit(true, true, true, true);
         emit ValidatorRegistered(sampleValPubkey1, podOwner);
         vm.expectEmit(true, true, true, true);