-
Notifications
You must be signed in to change notification settings - Fork 46
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.
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
Switch eth/v1 and v1alpha1 to protoc-gen-go-cast #210
Merged
Merged
Changes from 107 commits
Commits
Show all changes
110 commits
Select commit
Hold shift + click to select a range
cac8115
Set fields as optional
0xKiwi 6e02757
Remove unneeded
0xKiwi 126184e
Support protoc-gen-go-cast for v1
0xKiwi 9a261ad
WIP
0xKiwi e4a6d48
Replace gengo with go-cast and update
0xKiwi 086a841
Change to go-cast
0xKiwi 0b3b15c
Change to optional and compile
0xKiwi 6040da0
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 49bce40
Add new PBs
0xKiwi 9f0c3f3
Update version
0xKiwi 617ed8d
Remove optional for now
0xKiwi 97df2e1
Fixes
0xKiwi b999939
Revert "Remove optional for now"
0xKiwi 6875acf
Generate ssz and protos (not optional)
0xKiwi 2ce0a45
Add grpc and finish script for v1
0xKiwi daf15b5
Add v1lpha1
0xKiwi 524847f
Script improvements
0xKiwi 1508cae
Fixes
0xKiwi a9a3c8b
Add back import
0xKiwi 43a387d
Fixes
0xKiwi 5e51856
Improve script
0xKiwi da94845
Compile grpc
0xKiwi 96c4376
Compile
0xKiwi 54fc471
Fix ssz target
0xKiwi 2790673
remove all gogoproto
0xKiwi 1718178
Update gocast
0xKiwi 01d649a
Fix go_proto target
0xKiwi 8900d82
Fix target
0xKiwi 780be9a
Fix ssz
0xKiwi 19a519c
Rename to deposit data
0xKiwi 5a53d2c
compile
0xKiwi 05fb6e6
Fixes
0xKiwi 60d8fe0
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 1fde8f0
Remove optional and use standard proto
0xKiwi 412aad9
Properly build with grpc plugin
0xKiwi 9c7c38a
Update
0xKiwi d39125f
Final look through
0xKiwi 139f613
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi af47293
Fix
0xKiwi ed13050
Add gateway to v1
0xKiwi f9a17d4
readme
0xKiwi 05c5a7f
Fix after review
0xKiwi 7eedb11
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 392411d
Fix DepositData
0xKiwi 141380e
Regen pbs
0xKiwi 6099ed9
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 3262c5a
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 73fc711
remove
0xKiwi 6cb5bb6
Fix
0xKiwi 6b6fb11
Move options.proto to separate package
0xKiwi 5958926
Update
0xKiwi 0373bef
Merge gateway into normal protos
0xKiwi 3ce7f59
temp change compilers
0xKiwi c375e96
Merge gateway and protos
0xKiwi 152c7cf
Fix target embed
0xKiwi d322313
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi ec72374
Fix bazel
0xKiwi e17d9ae
Fix deps
0xKiwi 864f126
Fix spacing
0xKiwi 534f035
Fixes
0xKiwi 6bf3559
Fix bazels
0xKiwi dd7debd
Fix script
0xKiwi 68c71c0
Fixes
0xKiwi 993b335
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi d98fd3f
change to use glob
0xKiwi 51e6697
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 792ce3a
Add grpc-gateway fork
0xKiwi 3d71672
FIX GRPCCCCCC
0xKiwi e157c14
FIX GRPC
0xKiwi e631247
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi 037a70a
Run script
0xKiwi 921042d
Fix perms
0xKiwi ccf99b6
FIX SCRIPT
0xKiwi b69e962
Fix perms
0xKiwi c9387a0
Update commit
0xKiwi 566f2b4
Properly cast arrays
0xKiwi 4a445ae
Replace @com_github_golang_protobuf//descriptor:go_default_library wi…
prestonvanloon 3be2c28
use wkt protos
prestonvanloon 1ff7aff
use wkt protos more
prestonvanloon 650c243
use wkt protos more 2
prestonvanloon 05e7afb
use wkt protos more 3
prestonvanloon 6de9413
fix dup dep
prestonvanloon 8339a2d
fix dup dep 2
prestonvanloon 44ee778
Compile
0xKiwi a6b938f
Rename to move forward
0xKiwi db0002b
Compile
0xKiwi 8455b2d
Fix interface bug!!!
0xKiwi cbf53ad
Fix nested fields
0xKiwi e05f1bb
Update grpc-gateway
0xKiwi 0ae91b1
Undo spec change
0xKiwi d94acba
Use newer go-cast
0xKiwi 7d378db
Update ver
0xKiwi 398a822
Make gateway targets private
0xKiwi 2cb7d57
Add back readmes
0xKiwi 816517a
Update grpc-gateway
0xKiwi 5b3fa96
Properly set body in order to use outbound marshaler
0xKiwi ce8b3b3
Update with using parser
0xKiwi 23d15c1
Update for sing optionalsptiona
0xKiwi 73c02bd
Update endpoints path and structures
0xKiwi 6a57fe4
Update to latest spec minus missing functoins
0xKiwi 9631de8
Review fixes
0xKiwi 083af7a
Fix optionals
0xKiwi b798ec6
Fix imports
0xKiwi a37e759
Revert "Fix imports"
0xKiwi d7a9e14
fix types
0xKiwi 244f472
Fix types
0xKiwi 4a164a1
Fix index
0xKiwi 5d4bc03
Update go.mod
0xKiwi d495ef9
Update version
0xKiwi 8501092
Merge branch 'gen-go-cast' of github.com:prysmaticlabs/ethereumapis i…
0xKiwi File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
3.2.0 | ||
3.7.0 |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,65 @@ | ||
############################################################################## | ||
# Common | ||
############################################################################## | ||
|
||
load("@rules_proto//proto:defs.bzl", "proto_library") | ||
load("@rules_java//java:defs.bzl", "java_proto_library") | ||
|
||
proto_library( | ||
name = "proto", | ||
srcs = [ | ||
"options.proto", | ||
], | ||
visibility = ["//visibility:public"], | ||
deps = [ | ||
"@com_google_protobuf//:descriptor_proto", | ||
"@com_google_protobuf//:empty_proto", | ||
], | ||
) | ||
|
||
############################################################################## | ||
# Go | ||
############################################################################## | ||
load("@io_bazel_rules_go//go:def.bzl", "go_library") | ||
load("@io_bazel_rules_go//proto:def.bzl", "go_proto_library") | ||
load("//tools:ssz.bzl", "SSZ_DEPS", "ssz_gen_marshal") | ||
|
||
go_proto_library( | ||
prestonvanloon marked this conversation as resolved.
Show resolved
Hide resolved
|
||
name = "go_proto", | ||
compilers = [ | ||
"@com_github_prysmaticlabs_protoc_gen_go_cast//:go_cast", | ||
], | ||
importpath = "github.com/prysmaticlabs/ethereumapis/eth/ext", | ||
proto = ":proto", | ||
visibility = ["//visibility:public"], | ||
deps = [ | ||
"@io_bazel_rules_go//proto/wkt:descriptor_go_proto", | ||
"@com_github_golang_protobuf//proto:go_default_library", | ||
"@org_golang_google_protobuf//types/descriptorpb:go_default_library", | ||
"@go_googleapis//google/api:annotations_go_proto", | ||
"@org_golang_google_protobuf//reflect/protoreflect:go_default_library", | ||
"@org_golang_google_protobuf//runtime/protoimpl:go_default_library", | ||
], | ||
) | ||
|
||
go_library( | ||
name = "go_default_library", | ||
embed = [":go_proto"], | ||
importpath = "github.com/prysmaticlabs/ethereumapis/eth/ext", | ||
visibility = ["//visibility:public"], | ||
deps = SSZ_DEPS + [ | ||
"@io_bazel_rules_go//proto/wkt:empty_go_proto", | ||
"@io_bazel_rules_go//proto/wkt:descriptor_go_proto", | ||
"@com_github_golang_protobuf//proto:go_default_library", | ||
"@org_golang_google_protobuf//reflect/protoreflect:go_default_library", | ||
"@org_golang_google_protobuf//runtime/protoimpl:go_default_library", | ||
], # keep | ||
) | ||
|
||
############################################################################## | ||
# Java | ||
############################################################################## | ||
java_proto_library( | ||
name = "java_proto", | ||
deps = [":proto"], | ||
) |
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
// Copyright 2020 Prysmatic Labs. | ||
// | ||
// Licensed under the Apache License, Version 2.0 (the "License"); | ||
// you may not use this file except in compliance with the License. | ||
// You may obtain a copy of the License at | ||
// | ||
// http://www.apache.org/licenses/LICENSE-2.0 | ||
// | ||
// Unless required by applicable law or agreed to in writing, software | ||
// distributed under the License is distributed on an "AS IS" BASIS, | ||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
// See the License for the specific language governing permissions and | ||
// limitations under the License. | ||
syntax = "proto3"; | ||
|
||
package ethereum.eth.ext; | ||
|
||
import "google/protobuf/descriptor.proto"; | ||
|
||
option csharp_namespace = "Ethereum.Eth.ext"; | ||
option go_package = "github.com/prysmaticlabs/ethereumapis/eth/ext"; | ||
option java_multiple_files = true; | ||
option java_outer_classname = "OptionsProto"; | ||
option java_package = "org.ethereum.eth.ext"; | ||
option php_namespace = "Ethereum\\Eth\\ext"; | ||
|
||
extend google.protobuf.FieldOptions { | ||
string cast_type = 50000; | ||
string ssz_size = 50001; | ||
string ssz_max = 50002; | ||
string spec_name = 50003; | ||
} |
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.
lets put this in parity with out current used go version in
prysm
1.16.4
. Will also need rules_go to again be updated above. Same for gazelle