Skip to content
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

Jump to bottom

fix(cannon): Change duties function signature #360

Merged
merged 2 commits into from
Aug 13, 2024
Merged

fix(cannon): Change duties function signature #360

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
b483c46
fix(cannon): Change duties function signature
samcm Aug 12, 2024
37ed527
refactor: Remove commented out code in seeding.yaml
samcm Aug 12, 2024
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
60 changes: 30 additions & 30 deletions .github/cannon/seeding.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,35 +161,6 @@ networks:
AND blob_size = 131072
AND blob_empty_size = 56206"
expected: "1"
- name: BEACON_API_ETH_V1_BEACON_VALIDATORS
finalizedEpoch: 71005
assert:
query: "SELECT COUNT(*) FROM canonical_beacon_validators FINAL
WHERE
epoch = 71006
AND epoch_start_date_time = '2024-08-09 01:58:24'
AND `index` = 0
AND balance = '32005471610'
AND status = 'active_ongoing'
AND effective_balance = '32000000000'
AND slashed = false"
expected: "1"
- name: BEACON_API_ETH_V1_BEACON_VALIDATORS
finalizedEpoch: 71005
assert:
query: "SELECT COUNT(*) FROM canonical_beacon_validators_pubkeys FINAL
WHERE
`index` = 0
AND pubkey = '0x8c87f7a01e54215ac177fb706d78e9edf762f15f34ba81103094da450f1683ced257d4270fc030a9a803aaa060edf16a'"
expected: "1"
- name: BEACON_API_ETH_V1_BEACON_VALIDATORS
finalizedEpoch: 71005
assert:
query: "SELECT COUNT(*) FROM canonical_beacon_validators_withdrawal_credentials FINAL
WHERE
`index` = 0
AND withdrawal_credentials = '0x0100000000000000000000000e5dda855eb1de2a212cd1f62b2a3ee49d20c444'"
expected: "1"
- name: BEACON_API_ETH_V2_BEACON_BLOCK_EXECUTION_TRANSACTION
finalizedEpoch: 71010
assert:
Expand Down Expand Up @@ -248,4 +219,33 @@ networks:
AND epoch_start_date_time = '2024-08-09 03:08:48'
AND has(validators, 1119923)
"
expected: "1"
expected: "1"
# - name: BEACON_API_ETH_V1_BEACON_VALIDATORS
# finalizedEpoch: 71005
# assert:
# query: "SELECT COUNT(*) FROM canonical_beacon_validators FINAL
# WHERE
# epoch = 71006
# AND epoch_start_date_time = '2024-08-09 01:58:24'
# AND `index` = 0
# AND balance = '32005471610'
# AND status = 'active_ongoing'
# AND effective_balance = '32000000000'
# AND slashed = false"
# expected: "1"
# - name: BEACON_API_ETH_V1_BEACON_VALIDATORS
# finalizedEpoch: 71005
# assert:
# query: "SELECT COUNT(*) FROM canonical_beacon_validators_pubkeys FINAL
# WHERE
# `index` = 0
# AND pubkey = '0x8c87f7a01e54215ac177fb706d78e9edf762f15f34ba81103094da450f1683ced257d4270fc030a9a803aaa060edf16a'"
# expected: "1"
# - name: BEACON_API_ETH_V1_BEACON_VALIDATORS
# finalizedEpoch: 71005
# assert:
# query: "SELECT COUNT(*) FROM canonical_beacon_validators_withdrawal_credentials FINAL
# WHERE
# `index` = 0
# AND withdrawal_credentials = '0x0100000000000000000000000e5dda855eb1de2a212cd1f62b2a3ee49d20c444'"
# expected: "1"
6 changes: 3 additions & 3 deletions pkg/cannon/ethereum/services/duties.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ func (m *DutiesService) fireOnBeaconCommitteeSubscriptions(epoch phase0.Epoch, c
}
}

func (m *DutiesService) FetchBeaconCommittee(ctx context.Context, stateID string, epoch phase0.Epoch) ([]*v1.BeaconCommittee, error) {
func (m *DutiesService) FetchBeaconCommittee(ctx context.Context, epoch phase0.Epoch) ([]*v1.BeaconCommittee, error) {
if duties := m.beaconCommittees.Get(epoch); duties != nil {
return duties.Value(), nil
}
Expand All @@ -138,7 +138,7 @@ func (m *DutiesService) FetchBeaconCommittee(ctx context.Context, stateID string
}

func (m *DutiesService) GetValidatorIndex(epoch phase0.Epoch, slot phase0.Slot, committeeIndex phase0.CommitteeIndex, position uint64) (phase0.ValidatorIndex, error) {
if _, err := m.FetchBeaconCommittee(context.Background(), "head", epoch); err != nil {
if _, err := m.FetchBeaconCommittee(context.Background(), epoch); err != nil {
return 0, fmt.Errorf("error fetching beacon committee for epoch %d: %w", epoch, err)
}

Expand All @@ -165,7 +165,7 @@ func (m *DutiesService) GetValidatorIndex(epoch phase0.Epoch, slot phase0.Slot,
func (m *DutiesService) GetLastCommitteeIndex(ctx context.Context, slot phase0.Slot) (*phase0.CommitteeIndex, error) {
epoch := m.metadata.Wallclock().Epochs().FromSlot(uint64(slot))

_, err := m.FetchBeaconCommittee(ctx, "head", phase0.Epoch(epoch.Number()))
_, err := m.FetchBeaconCommittee(ctx, phase0.Epoch(epoch.Number()))
if err != nil {
return nil, fmt.Errorf("error fetching beacon committee for epoch %d: %w", epoch.Number(), err)
}
Expand Down
Loading