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鈥檒l occasionally send you account related emails.
Already on GitHub? Sign in to your account
Update to V4
馃殌
#12134
Update to V4
馃殌
#12134
Conversation
Did you run |
Missed this. I ran it and updated the steps. Thank you |
Great work! Looks like some build failures though. |
Please do not merge this until we have 2-3 approves |
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.
james-prysm-v4 got similar results with blobs generated file as the extra file.
hack/update-mockgen.sh
Outdated
@@ -35,7 +35,7 @@ for ((i = 0; i < ${#proto_mocks_service[@]}; i++)); do | |||
interfaces=${proto_mocks_service[i]#* }; | |||
echo "generating $file for interfaces: $interfaces"; | |||
echo | |||
GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v3/proto/eth/service "$interfaces" | |||
GO11MODULE=on mockgen -package=mock -destination="$file" github.com/prysmaticlabs/prysm/v4/proto/eth/service "$interfaces" | |||
done | |||
|
|||
# github.com/prysmaticlabs/prysm/proto/v3/prysm/v1alpha1/validator-client |
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.
Want to fix this too?
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.
Ah. Nice catch
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.
I ran different changes with sed magic since I don't have goland. I get a different branch than Terence, but the difference seems to be innocuous. Check against the branch potuz-v4-vis
please.
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.
LGTM. I checked @potuz's branch diff too. looks fine, some difference in deps.bzl ordering and potuz's branch needs to run goimports or manually fix imports that were arranged incorrectly for pb.go.
Steps taken:
1.)
In Goland, search for all files with file mask
*.bazel
and changegithub.com/prysmaticlabs/prysm/v3
togithub.com/prysmaticlabs/prysm/v4
2.)
Do the same for
*.go
and*.proto
files3.)
Do the same for
update-mockgen.sh
4.)
Do the same for
hack/update-go-pbs.sh
5.)
Update
go.mod
module module github.com/prysmaticlabs/prysm/v3
tov4
6.)
Update
.deepsource.toml
import_paths = ["github.com/prysmaticlabs/prysm/v3"]
tov4
7.)
Our grpc gateway, which is a fork we maintain here was hardcoding v3 paths in a template generator. It was updated in a commit here: prysmaticlabs/grpc-gateway#11
Update
go.mod
andgo.sum
go get github.com/prysmaticlabs/grpc-gateway/v2@09284ba20446ebc03dd4cbd5a0c860259b8e5984
Use
v2.3.1-0.20230315201114-09284ba20446
ingo.mod
8.)
Run gazella
bazel run //:gazelle -- update-repos -from_file=go.mod -to_macro=deps.bzl%prysm_deps -prune=true
9.)
Run
go mod tidy
10.)
Run script
go get ./...
11.)
Run script
./hack/update-go-pbs.sh
12.)
Run script
./hack/update-go-ssz.sh
13.)
Pass
go build ./...