Remote Signer: Electra #14477
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -22,7 +22,7 @@ import ( | |
| "github.com/prysmaticlabs/prysm/v5/testing/require" | ||
| "github.com/prysmaticlabs/prysm/v5/validator/keymanager" | ||
| "github.com/prysmaticlabs/prysm/v5/validator/keymanager/remote-web3signer/internal" | ||
| "github.com/prysmaticlabs/prysm/v5/validator/keymanager/remote-web3signer/types/mock" | ||
| logTest "github.com/sirupsen/logrus/hooks/test" | ||
| "github.com/stretchr/testify/assert" | ||
| ) | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -14,10 +14,7 @@ var ( | |
| Name: "remote_web3signer_errored_responses_total", | ||
| Help: "Total number of errored responses when calling web3signer", | ||
| }) | ||
|
|
||
| aggregationSlotSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{ | ||
| Name: "remote_web3signer_aggregation_slot_requests_total", | ||
| Help: "Total number of aggregation slot requests", | ||
|
|
@@ -30,6 +27,11 @@ var ( | |
| Name: "remote_web3signer_attestation_sign_requests_total", | ||
| Help: "Total number of attestation sign requests", | ||
| }) | ||
| //TODO: deprecate these fork specific counters in prysm v6... | ||
| blockSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{ | ||
|
There was a problem hiding this comment. Should this one be included in the comment? There was a problem hiding this comment. it's phase 0 sign requests |
||
| Name: "remote_web3signer_block_sign_requests_total", | ||
| Help: "Total number of block sign requests", | ||
| }) | ||
| blockAltairSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{ | ||
| Name: "remote_web3signer_block_altair_sign_requests_total", | ||
| Help: "Total number of block altair sign requests", | ||
|
|
@@ -58,6 +60,13 @@ var ( | |
| Name: "remote_web3signer_blinded_block_deneb_sign_requests_total", | ||
| Help: "Total number of blinded block deneb sign requests", | ||
| }) | ||
| ///// | ||
|
There was a problem hiding this comment. yeah just to show that it's deprecated to there |
||
|
|
||
| remoteBlockSignRequestsTotal = promauto.NewCounterVec(prometheus.CounterOpts{ | ||
| Name: "remote_block_sign_requests_total", | ||
| Help: "Total number of block sign requests with fork and blinded block check", | ||
| }, []string{"fork", "isBlinded"}) | ||
|
|
||
| randaoRevealSignRequestsTotal = promauto.NewCounter(prometheus.CounterOpts{ | ||
| Name: "remote_web3signer_randao_reveal_sign_requests_total", | ||
| Help: "Total number of randao reveal sign requests", | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -7,7 +7,7 @@ go_library( | |
| "requests.go", | ||
| "web3signer_types.go", | ||
| ], | ||
| importpath = "github.com/prysmaticlabs/prysm/v5/validator/keymanager/remote-web3signer/types", | ||
| visibility = ["//visibility:public"], | ||
| deps = [ | ||
| "//consensus-types/blocks:go_default_library", | ||
|
|
@@ -35,7 +35,7 @@ go_test( | |
| "//proto/prysm/v1alpha1:go_default_library", | ||
| "//proto/prysm/v1alpha1/validator-client:go_default_library", | ||
| "//testing/require:go_default_library", | ||
| "//validator/keymanager/remote-web3signer/types/mock:go_default_library", | ||
| "@com_github_ethereum_go_ethereum//common/hexutil:go_default_library", | ||
| "@com_github_prysmaticlabs_go_bitfield//:go_default_library", | ||
| ], | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| package types | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
@@ -44,6 +44,22 @@ func MapAggregateAndProof(from *ethpb.AggregateAttestationAndProof) (*AggregateA | |
| }, nil | ||
| } | ||
|
|
||
| // MapAggregateAndProofElectra maps the eth2.AggregateAndProofElectra proto to the Web3Signer spec. | ||
| func MapAggregateAndProofElectra(from *ethpb.AggregateAttestationAndProofElectra) (*AggregateAndProofElectra, error) { | ||
| if from == nil { | ||
| return nil, fmt.Errorf("AggregateAttestationAndProof is nil") | ||
| } | ||
| aggregate, err := MapAttestationElectra(from.Aggregate) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &AggregateAndProofElectra{ | ||
| AggregatorIndex: fmt.Sprint(from.AggregatorIndex), | ||
| Aggregate: aggregate, | ||
| SelectionProof: from.SelectionProof, | ||
| }, nil | ||
| } | ||
|
|
||
| // MapAttestation maps the eth2.Attestation proto to the Web3Signer spec. | ||
| func MapAttestation(attestation *ethpb.Attestation) (*Attestation, error) { | ||
| if attestation == nil { | ||
|
|
@@ -63,6 +79,29 @@ func MapAttestation(attestation *ethpb.Attestation) (*Attestation, error) { | |
| }, nil | ||
| } | ||
|
|
||
| // MapAttestationElectra maps the eth2.Attestation proto to the Web3Signer spec. | ||
| func MapAttestationElectra(attestation *ethpb.AttestationElectra) (*AttestationElectra, error) { | ||
| if attestation == nil { | ||
| return nil, fmt.Errorf("attestation is nil") | ||
| } | ||
| if attestation.AggregationBits == nil { | ||
| return nil, fmt.Errorf("aggregation bits in attestation is nil") | ||
| } | ||
| if attestation.CommitteeBits == nil { | ||
| return nil, fmt.Errorf("committee bits in attestation is nil") | ||
| } | ||
| data, err := MapAttestationData(attestation.Data) | ||
| if err != nil { | ||
| return nil, err | ||
| } | ||
| return &AttestationElectra{ | ||
| AggregationBits: []byte(attestation.AggregationBits), | ||
| Data: data, | ||
| Signature: attestation.Signature, | ||
| CommitteeBits: attestation.CommitteeBits.Bytes(), | ||
| }, nil | ||
| } | ||
|
|
||
| // MapAttestationData maps the eth2.AttestationData proto to the Web3Signer spec. | ||
| func MapAttestationData(data *ethpb.AttestationData) (*AttestationData, error) { | ||
| if data == nil { | ||
|
|
||
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not covered by any test.