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

Import Keystores Standard API Implementation #9924

Merged
merged 30 commits into from
Nov 24, 2021
Merged

Import Keystores Standard API Implementation #9924

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
986c3b4
begin
rauljordan Nov 10, 2021
8b99236
rem deleted code
rauljordan Nov 10, 2021
c353ce5
delete keystores all tests
rauljordan Nov 10, 2021
940b1a5
surface errors to user
rauljordan Nov 16, 2021
b6988f4
add in changes
rauljordan Nov 16, 2021
d300d56
del
rauljordan Nov 16, 2021
e3e340a
tests
rauljordan Nov 16, 2021
526ad96
slice
rauljordan Nov 16, 2021
7269d8c
begin import process
rauljordan Nov 17, 2021
a168ec9
add import keystores logic
rauljordan Nov 19, 2021
2ddc6be
unit tests for import
rauljordan Nov 19, 2021
cf2d734
tests for all import keystores keymanager issues
rauljordan Nov 19, 2021
4be5ff1
change proto
rauljordan Nov 22, 2021
4fea849
pbs
rauljordan Nov 22, 2021
3f7c768
renaming works
rauljordan Nov 22, 2021
84b8bbf
use proper request
rauljordan Nov 22, 2021
57e2094
pb
rauljordan Nov 22, 2021
59d0744
comment
rauljordan Nov 22, 2021
e5616bb
gaz
rauljordan Nov 22, 2021
ff950a2
fix up cli cmd
rauljordan Nov 22, 2021
f780606
Merge branch 'import-keystores' of github.com:prysmaticlabs/prysm int…
rauljordan Nov 22, 2021
2e8b3ad
test
rauljordan Nov 22, 2021
f610e9f
add gw
rauljordan Nov 22, 2021
66c4976
precond
rauljordan Nov 22, 2021
473701b
tests
rauljordan Nov 22, 2021
8c6f6d2
Merge branch 'develop' into import-keystores
rauljordan Nov 22, 2021
8c9fbf8
Merge branch 'develop' into import-keystores
rauljordan Nov 22, 2021
3d29cef
Merge branch 'develop' into import-keystores
rauljordan Nov 23, 2021
a89776d
radek comments
rauljordan Nov 24, 2021
0eeec5e
Merge branch 'develop' into import-keystores
rauljordan Nov 24, 2021
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
16 changes: 8 additions & 8 deletions proto/eth/service/key_management.pb.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions proto/eth/service/key_management.pb.gw.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions proto/eth/service/key_management.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,8 @@ service KeyManagement {
};
}

// ImportKeystores generated by the Eth2.0 deposit CLI tooling. All keystores MUST be encrypted with
// the same password. Users SHOULD send slashing_protection data associated with the imported
// ImportKeystores generated by the Eth2.0 deposit CLI tooling.
// Users SHOULD send slashing_protection data associated with the imported
// pubkeys. MUST follow the format defined in EIP-3076: Slashing Protection Interchange Format.
//
// HTTP response status codes:
Expand Down Expand Up @@ -81,7 +81,7 @@ service KeyManagement {
// - 401: Unauthorized
// - 403: Forbidden from accessing the resource
// - 500: Validator internal error
rpc DeleteKeystores(ImportKeystoresRequest) returns (DeleteKeystoresResponse) {
rpc DeleteKeystores(DeleteKeystoresRequest) returns (DeleteKeystoresResponse) {
option (google.api.http) = {
delete: "/internal/eth/v1/keystores",
body: "*"
Expand Down
Loading