Skip to content

Fix duplicate notifyExit #1321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0xfornax merged 2 commits into from
Oct 29, 2026
Merged

Fix duplicate notifyExit #1321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f42629
Skip locked validators in notify-validator-exit
thomaspanf Oct 28, 2026
0aa5714
Use %v instead of %w in log calls
thomaspanf Oct 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rocketpool/node/defend-challenge-exit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func (t *defendChallengeExit) defendChallenge(rp *rocketpool.RocketPool, mp mega
}
validatorProof, slotProof, err := services.GetValidatorProofFromState(t.bc, validatorPubkey, beaconState)
if err != nil {
t.log.Printlnf("[ERROR] There was an error during the proof creation process: %w", err)
t.log.Printlnf("[ERROR] There was an error during the proof creation process: %v", err)
return err
}
if exiting && validatorProof.Validator.WithdrawableEpoch >= FarFutureEpoch {
Expand Down
12 changes: 6 additions & 6 deletions rocketpool/node/notify-validator-exit.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ func (t *notifyValidatorExit) run(state *state.NetworkStateIndex) error {
continue
}

if validatorDetails.WithdrawableEpoch < FarFutureEpoch && !validatorInfo.ValidatorInfo.Exited && !validatorInfo.ValidatorInfo.Exiting {
if validatorDetails.WithdrawableEpoch < FarFutureEpoch && !validatorInfo.ValidatorInfo.Exited && !validatorInfo.ValidatorInfo.Exiting && !validatorInfo.ValidatorInfo.Locked {
validatorDetailsToProve[validatorInfo.ValidatorId] = validatorDetails
}
}
Expand All @@ -157,12 +157,12 @@ func (t *notifyValidatorExit) run(state *state.NetworkStateIndex) error {
// Check the exit is visible on the selected state before proof generation
validatorIndexStr, err := t.bc.GetValidatorIndex(pubkey)
if err != nil {
t.log.Printlnf("Error getting beacon index for validator id %d: %w", validatorId, err)
t.log.Printlnf("Error getting beacon index for validator id %d: %v", validatorId, err)
continue
}
validatorIndex, err := strconv.ParseUint(validatorIndexStr, 10, 64)
if err != nil {
t.log.Printlnf("Error parsing beacon index for validator id %d: %w", validatorId, err)
t.log.Printlnf("Error parsing beacon index for validator id %d: %v", validatorId, err)
continue
}
if validatorIndex >= uint64(len(proofValidators)) {
Expand All @@ -178,7 +178,7 @@ func (t *notifyValidatorExit) run(state *state.NetworkStateIndex) error {
err = t.createExitProof(t.rp, beaconState, slotTimestamp, mp, validatorId, pubkey)
// dont return if there was an error, just log it so we can continue with the next validator
if err != nil {
t.log.Printlnf("Error creating exit proof for validator %d: %w", validatorId, err)
t.log.Printlnf("Error creating exit proof for validator %d: %v", validatorId, err)
}
}
// Return
Expand All @@ -198,7 +198,7 @@ func (t *notifyValidatorExit) createExitProof(rp *rocketpool.RocketPool, beaconS

validatorProof, slotProof, err := services.GetValidatorProofFromState(t.bc, validatorPubkey, beaconState)
if err != nil {
t.log.Printlnf("[ERROR] There was an error during the proof creation process: %w", err)
t.log.Printlnf("[ERROR] There was an error during the proof creation process: %v", err)
return err
}

Expand All @@ -207,7 +207,7 @@ func (t *notifyValidatorExit) createExitProof(rp *rocketpool.RocketPool, beaconS
// Get the gas limit
gasLimits, err := services.EstimateMegapoolNotifyExitGas(rp, mp.GetAddress(), validatorId, slotTimestamp, validatorProof, slotProof, opts)
if err != nil {
t.log.Printlnf("Could not estimate the gas required to notify exit on megapool validator %d: %w", validatorId, err)
t.log.Printlnf("Could not estimate the gas required to notify exit on megapool validator %d: %v", validatorId, err)
return err
}
gas := big.NewInt(int64(gasLimits.Safe))
Expand Down
2 changes: 1 addition & 1 deletion rocketpool/node/prestake-megapool-validator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ func (t *prestakeMegapoolValidator) assignDeposit(callopts *bind.CallOpts) error
// Get the gas limit
gasLimits, err := deposit.EstimateAssignDepositsGas(t.rp, big.NewInt(1), opts)
if err != nil {
t.log.Printlnf("error estimating assignment %w", err)
t.log.Printlnf("error estimating assignment %v", err)
return err
}
gas := big.NewInt(int64(gasLimits.Safe))
Expand Down
Loading