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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to V4 馃殌 #12134

Merged
merged 10 commits into from Mar 17, 2023
Merged

Update to V4 馃殌 #12134

merged 10 commits into from Mar 17, 2023

Conversation

terencechain
Copy link
Member

@terencechain terencechain commented Mar 15, 2023

鈿狅笍 Please do not merge this until we have 2-3 approvals 鈿狅笍

Steps taken:

1.)
In Goland, search for all files with file mask *.bazel and change github.com/prysmaticlabs/prysm/v3 to github.com/prysmaticlabs/prysm/v4

2.)
Do the same for *.go and *.proto files

3.)
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 to v4

6.)
Update .deepsource.toml import_paths = ["github.com/prysmaticlabs/prysm/v3"] to v4

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 and go.sum

go get github.com/prysmaticlabs/grpc-gateway/v2@09284ba20446ebc03dd4cbd5a0c860259b8e5984

Use v2.3.1-0.20230315201114-09284ba20446 in go.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 ./...

@terencechain terencechain requested a review from a team as a code owner March 15, 2023 20:27
@prestonvanloon
Copy link
Member

Did you run ./hack/update-go-ssz.sh?

@terencechain
Copy link
Member Author

Did you run ./hack/update-go-ssz.sh?

Missed this. I ran it and updated the steps. Thank you

@prestonvanloon
Copy link
Member

Great work! Looks like some build failures though.

@terencechain terencechain self-assigned this Mar 16, 2023
@terencechain terencechain added V4 V4 release related items Blocked Blocked by research or external factors labels Mar 16, 2023
@terencechain terencechain added Ready For Review A pull request ready for code review Blocked Blocked by research or external factors and removed Blocked Blocked by research or external factors labels Mar 16, 2023
@terencechain
Copy link
Member Author

Please do not merge this until we have 2-3 approves

james-prysm
james-prysm previously approved these changes Mar 16, 2023
Copy link
Contributor

@james-prysm james-prysm left a 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.

@@ -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
Copy link
Member

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?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah. Nice catch

potuz
potuz previously approved these changes Mar 17, 2023
Copy link
Contributor

@potuz potuz left a 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.

prestonvanloon
prestonvanloon previously approved these changes Mar 17, 2023
Copy link
Member

@prestonvanloon prestonvanloon left a 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.

@terencechain terencechain dismissed stale reviews from prestonvanloon and potuz via 69443da March 17, 2023 16:32
@terencechain terencechain removed the Blocked Blocked by research or external factors label Mar 17, 2023
@prylabs-bulldozer prylabs-bulldozer bot merged commit d17996f into develop Mar 17, 2023
5 checks passed
@delete-merged-branch delete-merged-branch bot deleted the update-v4 branch March 17, 2023 18:53
@nisdas nisdas mentioned this pull request Mar 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Ready For Review A pull request ready for code review V4 V4 release related items
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants