Skip to content

simulators/eth2/withdrawals: Better withdrawals calculations #690

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
fjl merged 2 commits into from
Jan 25, 2023
Merged

simulators/eth2/withdrawals: Better withdrawals calculations #690

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
bd72896
simulators/eth2/withdrawals: make errors not fatal
marioevz Jan 25, 2023
7085543
simulators/eth2/withdrawals: allow empty slots on withdrawals calcula…
marioevz Jan 25, 2023
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
3 changes: 2 additions & 1 deletion simulators/eth2/withdrawals/helper.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,8 @@ func (v *Validator) VerifyWithdrawnBalance(
return false, err
}
if blockState == nil {
return false, nil
// Probably a skipped slot
continue
}

execPayload, err := blockState.ExecutionPayload()
Expand Down
6 changes: 4 additions & 2 deletions simulators/eth2/withdrawals/scenarios.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,10 +205,12 @@ loop:
bc := n.BeaconClient
headBlockRoot, err := bc.BlockV2Root(ctx, eth2api.BlockHead)
if err != nil {
t.Fatalf("FAIL: Error getting head block: %v", err)
t.Logf("INFO: error getting head block: %v", err)
continue
}
if allAccountsWithdrawn, err := allValidators.Withdrawable().VerifyWithdrawnBalance(ctx, bc, ec, headBlockRoot); err != nil {
t.Fatalf("FAIL: %v", err)
t.Logf("INFO: error getting withdrawals balances: %v", err)
continue
} else if allAccountsWithdrawn {
t.Logf("INFO: All accounts have successfully withdrawn")
break loop
Expand Down