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.

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 110 commits into from
May 11, 2021
Merged
Show file tree
Hide file tree
Changes from 93 commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
cac8115
Set fields as optional
0xKiwi Oct 21, 2020
6e02757
Remove unneeded
0xKiwi Oct 21, 2020
126184e
Support protoc-gen-go-cast for v1
0xKiwi Nov 16, 2020
9a261ad
WIP
0xKiwi Nov 16, 2020
e4a6d48
Replace gengo with go-cast and update
0xKiwi Nov 17, 2020
086a841
Change to go-cast
0xKiwi Dec 8, 2020
0b3b15c
Change to optional and compile
0xKiwi Dec 8, 2020
6040da0
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Dec 8, 2020
49bce40
Add new PBs
0xKiwi Dec 8, 2020
9f0c3f3
Update version
0xKiwi Dec 9, 2020
617ed8d
Remove optional for now
0xKiwi Dec 9, 2020
97df2e1
Fixes
0xKiwi Dec 10, 2020
b999939
Revert "Remove optional for now"
0xKiwi Dec 10, 2020
6875acf
Generate ssz and protos (not optional)
0xKiwi Dec 10, 2020
2ce0a45
Add grpc and finish script for v1
0xKiwi Dec 13, 2020
daf15b5
Add v1lpha1
0xKiwi Dec 13, 2020
524847f
Script improvements
0xKiwi Dec 13, 2020
1508cae
Fixes
0xKiwi Dec 13, 2020
a9a3c8b
Add back import
0xKiwi Dec 13, 2020
43a387d
Fixes
0xKiwi Dec 14, 2020
5e51856
Improve script
0xKiwi Dec 15, 2020
da94845
Compile grpc
0xKiwi Dec 15, 2020
96c4376
Compile
0xKiwi Dec 15, 2020
54fc471
Fix ssz target
0xKiwi Dec 15, 2020
2790673
remove all gogoproto
0xKiwi Dec 15, 2020
1718178
Update gocast
0xKiwi Dec 15, 2020
01d649a
Fix go_proto target
0xKiwi Dec 16, 2020
8900d82
Fix target
0xKiwi Dec 16, 2020
780be9a
Fix ssz
0xKiwi Dec 16, 2020
19a519c
Rename to deposit data
0xKiwi Dec 16, 2020
5a53d2c
compile
0xKiwi Dec 16, 2020
05fb6e6
Fixes
0xKiwi Dec 17, 2020
60d8fe0
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Jan 12, 2021
1fde8f0
Remove optional and use standard proto
0xKiwi Jan 12, 2021
412aad9
Properly build with grpc plugin
0xKiwi Jan 14, 2021
9c7c38a
Update
0xKiwi Jan 14, 2021
d39125f
Final look through
0xKiwi Jan 15, 2021
139f613
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Jan 15, 2021
af47293
Fix
0xKiwi Jan 15, 2021
ed13050
Add gateway to v1
0xKiwi Jan 15, 2021
f9a17d4
readme
0xKiwi Jan 15, 2021
05c5a7f
Fix after review
0xKiwi Jan 18, 2021
7eedb11
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Jan 18, 2021
392411d
Fix DepositData
0xKiwi Jan 25, 2021
141380e
Regen pbs
0xKiwi Jan 25, 2021
6099ed9
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Jan 28, 2021
3262c5a
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Feb 2, 2021
73fc711
remove
0xKiwi Feb 2, 2021
6cb5bb6
Fix
0xKiwi Feb 2, 2021
6b6fb11
Move options.proto to separate package
0xKiwi Feb 3, 2021
5958926
Update
0xKiwi Feb 3, 2021
0373bef
Merge gateway into normal protos
0xKiwi Feb 5, 2021
3ce7f59
temp change compilers
0xKiwi Feb 8, 2021
c375e96
Merge gateway and protos
0xKiwi Feb 8, 2021
152c7cf
Fix target embed
0xKiwi Feb 8, 2021
d322313
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Feb 10, 2021
ec72374
Fix bazel
0xKiwi Feb 10, 2021
e17d9ae
Fix deps
0xKiwi Feb 10, 2021
864f126
Fix spacing
0xKiwi Feb 10, 2021
534f035
Fixes
0xKiwi Feb 10, 2021
6bf3559
Fix bazels
0xKiwi Feb 10, 2021
dd7debd
Fix script
0xKiwi Feb 10, 2021
68c71c0
Fixes
0xKiwi Feb 11, 2021
993b335
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Feb 12, 2021
d98fd3f
change to use glob
0xKiwi Feb 12, 2021
51e6697
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Feb 22, 2021
792ce3a
Add grpc-gateway fork
0xKiwi Mar 26, 2021
3d71672
FIX GRPCCCCCC
0xKiwi Mar 30, 2021
e157c14
FIX GRPC
0xKiwi Mar 30, 2021
e631247
Merge branch 'master' of github.com:prysmaticlabs/ethereumapis into g…
0xKiwi Mar 30, 2021
037a70a
Run script
0xKiwi Mar 30, 2021
921042d
Fix perms
0xKiwi Mar 30, 2021
ccf99b6
FIX SCRIPT
0xKiwi Mar 30, 2021
b69e962
Fix perms
0xKiwi Mar 30, 2021
c9387a0
Update commit
0xKiwi Mar 30, 2021
566f2b4
Properly cast arrays
0xKiwi Mar 31, 2021
4a445ae
Replace @com_github_golang_protobuf//descriptor:go_default_library wi…
prestonvanloon Mar 31, 2021
3be2c28
use wkt protos
prestonvanloon Mar 31, 2021
1ff7aff
use wkt protos more
prestonvanloon Mar 31, 2021
650c243
use wkt protos more 2
prestonvanloon Mar 31, 2021
05e7afb
use wkt protos more 3
prestonvanloon Mar 31, 2021
6de9413
fix dup dep
prestonvanloon Mar 31, 2021
8339a2d
fix dup dep 2
prestonvanloon Mar 31, 2021
44ee778
Compile
0xKiwi Mar 31, 2021
a6b938f
Rename to move forward
0xKiwi Apr 1, 2021
db0002b
Compile
0xKiwi Apr 1, 2021
8455b2d
Fix interface bug!!!
0xKiwi Apr 2, 2021
cbf53ad
Fix nested fields
0xKiwi Apr 2, 2021
e05f1bb
Update grpc-gateway
0xKiwi Apr 5, 2021
0ae91b1
Undo spec change
0xKiwi Apr 5, 2021
d94acba
Use newer go-cast
0xKiwi Apr 7, 2021
7d378db
Update ver
0xKiwi Apr 7, 2021
398a822
Make gateway targets private
0xKiwi Apr 15, 2021
2cb7d57
Add back readmes
0xKiwi Apr 17, 2021
816517a
Update grpc-gateway
0xKiwi Apr 29, 2021
5b3fa96
Properly set body in order to use outbound marshaler
0xKiwi Apr 29, 2021
ce8b3b3
Update with using parser
0xKiwi Apr 29, 2021
23d15c1
Update for sing optionalsptiona
0xKiwi May 4, 2021
73c02bd
Update endpoints path and structures
0xKiwi May 5, 2021
6a57fe4
Update to latest spec minus missing functoins
0xKiwi May 5, 2021
9631de8
Review fixes
0xKiwi May 5, 2021
083af7a
Fix optionals
0xKiwi May 5, 2021
b798ec6
Fix imports
0xKiwi May 5, 2021
a37e759
Revert "Fix imports"
0xKiwi May 6, 2021
d7a9e14
fix types
0xKiwi May 6, 2021
244f472
Fix types
0xKiwi May 6, 2021
4a164a1
Fix index
0xKiwi May 6, 2021
5d4bc03
Update go.mod
0xKiwi May 11, 2021
d495ef9
Update version
0xKiwi May 11, 2021
8501092
Merge branch 'gen-go-cast' of github.com:prysmaticlabs/ethereumapis i…
0xKiwi May 11, 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
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
3.2.0
3.7.0
22 changes: 11 additions & 11 deletions WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,39 +8,39 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")

http_archive(
name = "io_bazel_rules_go",
sha256 = "0c10738a488239750dbf35336be13252bad7c74348f867d30c3c3e0001906096",
sha256 = "7904dbecbaffd068651916dce77ff3437679f9d20e1a7956bff43826e7645fcc",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/rules_go/releases/download/v0.23.2/rules_go-v0.23.2.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.23.2/rules_go-v0.23.2.tar.gz",
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
"https://github.com/bazelbuild/rules_go/releases/download/v0.25.1/rules_go-v0.25.1.tar.gz",
],
)

http_archive(
name = "bazel_gazelle",
sha256 = "cdb02a887a7187ea4d5a27452311a75ed8637379a1287d8eeb952138ea485f7d",
sha256 = "222e49f034ca7a1d1231422cdb67066b885819885c356673cb1f72f748a3c9d4",
urls = [
"https://mirror.bazel.build/github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.1/bazel-gazelle-v0.21.1.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.21.1/bazel-gazelle-v0.21.1.tar.gz",
"https://storage.googleapis.com/bazel-mirror/github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
"https://github.com/bazelbuild/bazel-gazelle/releases/download/v0.22.3/bazel-gazelle-v0.22.3.tar.gz",
],
)

load("@io_bazel_rules_go//go:deps.bzl", "go_rules_dependencies", "go_register_toolchains")

go_rules_dependencies()

go_register_toolchains()
go_register_toolchains(version="1.15.5")
Copy link
Member

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


load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies")

gazelle_dependencies()

load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")

git_repository(
http_archive(
name = "com_google_protobuf",
commit = "4059c61f27eb1b06c4ee979546a238be792df0a4",
remote = "https://github.com/protocolbuffers/protobuf",
shallow_since = "1558721209 -0700",
sha256 = "65e020a42bdab44a66664d34421995829e9e79c60e5adaa08282fd14ca552f57",
strip_prefix = "protobuf-3.15.6",
urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.15.6.tar.gz"],
)

load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
Expand Down
65 changes: 65 additions & 0 deletions eth/ext/BUILD.bazel
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"],
)
148 changes: 148 additions & 0 deletions eth/ext/options.pb.go

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

32 changes: 32 additions & 0 deletions eth/ext/options.proto
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;
}
Loading