Add /eth/v2/beacon/blocks/{block_id}/attestations
#14478
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
saolyn
force-pushed
the
add-getBlockAttestationsV2
branch
from
b3c929e to
7ea8c9c
Compare
james-prysm
reviewed
Sep 25, 2024
saolyn
force-pushed
the
add-getBlockAttestationsV2
branch
from
e9031c3 to
3f00b67
Compare
james-prysm
reviewed
Sep 27, 2024
james-prysm
reviewed
Sep 27, 2024
james-prysm
reviewed
Sep 27, 2024
james-prysm
reviewed
Sep 27, 2024
saolyn
force-pushed
the
add-getBlockAttestationsV2
branch
from
75a27c3 to
a6480ab
Compare
james-prysm
reviewed
Oct 1, 2024
rkapka
requested changes
Oct 3, 2024
| Version string `json:"version"` | ||
| ExecutionOptimistic bool `json:"execution_optimistic"` | ||
| Finalized bool `json:"finalized"` | ||
| Data interface{} `json:"data"` // Accepts both `Attestation` and `AttestationElectra` types |
There was a problem hiding this comment.
Can we make this a json.RawMessage?
beacon-chain/rpc/endpoints.go
Outdated
| @@ -585,6 +585,15 @@ func (s *Service) beaconEndpoints( | |||
| handler: server.GetBlockAttestations, | |||
| methods: []string{http.MethodGet}, | |||
| }, | |||
| { | |||
| template: "/eth/v2/beacon/blocks/{block_id}/attestations", | |||
| name: namespace + ".GetBlockAttestations", | |||
There was a problem hiding this comment.
Suggested change
| name: namespace + ".GetBlockAttestations", | |
| name: namespace + ".GetBlockAttestationsV2", |
| @@ -515,7 +515,7 @@ func TestGetBlockAttestations(t *testing.T) { | |||
| Blocker: mockBlockFetcher, | |||
| } | |||
|
|
|||
| request := httptest.NewRequest(http.MethodGet, "http://foo.example/eth/v2/beacon/blocks/{block_id}/attestations", nil) | |||
| request := httptest.NewRequest(http.MethodGet, "http://foo.example/eth/v1/beacon/blocks/{block_id}/attestations", nil) | |||
There was a problem hiding this comment.
I think it would be cleaner to organize tests like this:
t.Run("v1")
t.Run("v2")
t.Run("pre-Electra")
t.Run("post-Electra")
Blocks can be created at the top, before test runs.
james-prysm
reviewed
Oct 9, 2024
| if v >= version.Electra { | ||
| for i, att := range consensusAtts { | ||
| a, ok := att.(*eth.AttestationElectra) | ||
| if ok { |
There was a problem hiding this comment.
similar feedback to another PR we can avoid the else statement by reversing this
rkapka
reviewed
Oct 10, 2024
| Version string `json:"version"` | ||
| ExecutionOptimistic bool `json:"execution_optimistic"` | ||
| Finalized bool `json:"finalized"` | ||
| Data []json.RawMessage `json:"data"` // Accepts both `Attestation` and `AttestationElectra` types |
There was a problem hiding this comment.
If you make this a single json.RawMessage, you can call json.Marshal just once on the entire slice.
rkapka
reviewed
Oct 10, 2024
rkapka
approved these changes
Oct 10, 2024
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What type of PR is this?
Other
What does this PR do? Why is it needed?
Beacon API Electra alignment, add missing endpoint for
/eth/v2/beacon/blocks/{block_id}/attestations.As described in the spec https://ethereum.github.io/beacon-APIs/?urls.primaryName=dev#/Beacon/getBlockAttestationsV2
Which issues(s) does this PR fix?
Part of #14476
Other notes for review
Acknowledgements