Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/notify-final-balance.go
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ func (t *notifyFinalBalance) createFinalBalanceProof(rp *rocketpool.RocketPool,

withdrawalProof, proofSlot, stateUsed, err := services.GetWithdrawalProofForSlot(t.c, slot, validatorIndex)
if err != nil {
fmt.Printf("An error occurred: %s\n", err)
return fmt.Errorf("error getting withdrawal proof for validator 0x%s (index: %d): %w", validatorPubkey.String(), validatorIndex, err)
}
t.log.Printlnf("The Beacon WithdrawalSlot for validator ID %d is: %d", validatorInfo.ValidatorId, withdrawalProof.WithdrawalSlot)

Expand Down
3 changes: 2 additions & 1 deletion rocketpool/watchtower/dissolve-invalid-credentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@ func (t *dissolveInvalidCredentials) dissolveInvalidCredentialValidators(state *
// Fetch the validator from the beacon state to compare credentials
validatorFromState, err := t.bc.GetValidatorStatus(types.ValidatorPubkey(validator.Pubkey), nil)
if err != nil {
t.log.Printlnf("Error fetching validator %s from beacon state: %s", validatorFromState.Index, err)
pubkey := types.BytesToValidatorPubkey(validator.Pubkey).String()
t.log.Printlnf("error getting the beacon state for validator 0x%s on megapool %s: %s", pubkey, validator.MegapoolAddress, err)
continue
}
if !validatorFromState.Exists {
Expand Down
4 changes: 2 additions & 2 deletions rocketpool/watchtower/submit-network-balances.go
Original file line number Diff line number Diff line change
Expand Up @@ -536,11 +536,11 @@ func (t *submitNetworkBalances) getMegapoolBalanceDetails(megapoolAddress common
// Convert the validator index to a uint64
validatorIndex, err := strconv.ParseUint(megapoolValidatorDetails.Index, 10, 64)
if err != nil {
fmt.Printf("An error occurred while converting the validator index to a uint64: %s\n", err)
return megapoolBalanceDetails, fmt.Errorf("error converting validator index %s to uint64: %w", megapoolValidatorDetails.Index, err)
}
_, _, _, withdrawal, _, err := services.FindWithdrawalBlockAndArrayPosition(searchWithdrawSlot, validatorIndex, t.bc)
if err != nil {
fmt.Printf("An error occurred while searching for the withdrawn balance: %s\n", err)
return megapoolBalanceDetails, fmt.Errorf("error finding withdrawal for validator %d: %w", validatorIndex, err)
}
// Track the withdrawn balance so we can discount it from the pending rewards on the contract
totalWithdrawnBalance.Add(totalWithdrawnBalance, eth.GweiToWei(float64(withdrawal.Amount)))
Expand Down
Loading