@@ -149,7 +149,12 @@ abstract contract CompoundingValidatorManager is Governable {
149
149
event DepositVerified (bytes32 indexed depositDataRoot , uint256 amountWei );
150
150
event DepositValidatorExiting (
151
151
bytes32 indexed depositDataRoot ,
152
- uint64 exitEpoch
152
+ uint256 amountWei ,
153
+ uint64 withdrawableEpoch
154
+ );
155
+ event DepositValidatorExited (
156
+ bytes32 indexed depositDataRoot ,
157
+ uint256 amountWei
153
158
);
154
159
event ValidatorWithdraw (bytes32 indexed pubKeyHash , uint256 amountWei );
155
160
event BalancesSnapped (
@@ -493,7 +498,7 @@ abstract contract CompoundingValidatorManager is Governable {
493
498
uint64 validatorIndex;
494
499
bytes32 pubKeyHash;
495
500
bytes pubKeyProof;
496
- bytes validatorExitEpochProof ;
501
+ bytes validatorWithdrawableEpochProof ;
497
502
bytes validatorPubKeyProof;
498
503
}
499
504
@@ -575,7 +580,7 @@ abstract contract CompoundingValidatorManager is Governable {
575
580
firstPendingDeposit.validatorIndex,
576
581
firstPendingDeposit.pubKeyHash,
577
582
FAR_FUTURE_EPOCH,
578
- firstPendingDeposit.validatorExitEpochProof ,
583
+ firstPendingDeposit.validatorWithdrawableEpochProof ,
579
584
firstPendingDeposit.pubKeyProof
580
585
);
581
586
}
@@ -597,6 +602,7 @@ abstract contract CompoundingValidatorManager is Governable {
597
602
598
603
emit DepositValidatorExiting (
599
604
depositDataRoot,
605
+ uint256 (deposit.amountGwei) * 1 gwei,
600
606
validatorData.withdrawableEpoch
601
607
);
602
608
@@ -919,7 +925,7 @@ abstract contract CompoundingValidatorManager is Governable {
919
925
firstPendingDeposit.validatorIndex,
920
926
firstPendingDeposit.pubKeyHash,
921
927
FAR_FUTURE_EPOCH,
922
- firstPendingDeposit.validatorExitEpochProof ,
928
+ firstPendingDeposit.validatorWithdrawableEpochProof ,
923
929
firstPendingDeposit.pubKeyProof
924
930
);
925
931
@@ -976,7 +982,7 @@ abstract contract CompoundingValidatorManager is Governable {
976
982
) {
977
983
_removeDeposit (depositDataRoot, depositData);
978
984
979
- emit DepositVerified (
985
+ emit DepositValidatorExited (
980
986
depositDataRoot,
981
987
uint256 (depositData.amountGwei) * 1 gwei
982
988
);
0 commit comments