-
Notifications
You must be signed in to change notification settings - Fork 102
Upgrade protobuf/gRPC toolchain and regenerate proto files #544
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
Merged
LarryRuane
merged 1 commit into
zcash:master
from
czarcas7ic:adam/upgrade-protobuf-grpc-toolchain
Feb 25, 2026
Merged
Changes from all commits
Commits
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 hidden or 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 hidden or 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 |
|---|---|---|
|
|
@@ -7,15 +7,16 @@ toolchain go1.24.1 | |
| require ( | ||
| github.com/BurntSushi/toml v0.3.1 | ||
| github.com/btcsuite/btcd v0.24.2 | ||
| github.com/golang/protobuf v1.5.3 | ||
| github.com/golang/protobuf v1.5.4 | ||
| github.com/grpc-ecosystem/go-grpc-middleware v1.4.0 | ||
| github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 | ||
| github.com/prometheus/client_golang v1.18.0 | ||
| github.com/sirupsen/logrus v1.9.3 | ||
| github.com/spf13/cobra v1.8.0 | ||
| github.com/spf13/viper v1.18.2 | ||
| google.golang.org/grpc v1.61.0 | ||
| google.golang.org/protobuf v1.33.0 | ||
| golang.org/x/exp v0.0.0-20230905200255-921286631fa9 | ||
| google.golang.org/grpc v1.78.0 | ||
|
Contributor
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This is the core of the fix |
||
| google.golang.org/protobuf v1.36.10 | ||
| gopkg.in/ini.v1 v1.67.0 | ||
| ) | ||
|
|
||
|
|
@@ -27,7 +28,7 @@ require ( | |
| github.com/btcsuite/btclog v0.0.0-20170628155309-84c8d2346e9f // indirect | ||
| github.com/btcsuite/go-socks v0.0.0-20170105172521-4720035b7bfd // indirect | ||
| github.com/btcsuite/websocket v0.0.0-20150119174127-31079b680792 // indirect | ||
| github.com/cespare/xxhash/v2 v2.2.0 // indirect | ||
| github.com/cespare/xxhash/v2 v2.3.0 // indirect | ||
| github.com/decred/dcrd/crypto/blake256 v1.0.0 // indirect | ||
| github.com/decred/dcrd/dcrec/secp256k1/v4 v4.0.1 // indirect | ||
| github.com/fsnotify/fsnotify v1.7.0 // indirect | ||
|
|
@@ -50,10 +51,9 @@ require ( | |
| go.uber.org/atomic v1.9.0 // indirect | ||
| go.uber.org/multierr v1.9.0 // indirect | ||
| golang.org/x/crypto v0.45.0 // indirect | ||
| golang.org/x/exp v0.0.0-20230905200255-921286631fa9 // indirect | ||
| golang.org/x/net v0.47.0 // indirect | ||
| golang.org/x/sys v0.38.0 // indirect | ||
| golang.org/x/text v0.31.0 // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20231120223509-83a465c0220f // indirect | ||
| google.golang.org/genproto/googleapis/rpc v0.0.0-20251029180050-ab9386a59fda // indirect | ||
| gopkg.in/yaml.v3 v3.0.1 // indirect | ||
| ) | ||
This file contains hidden or 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 hidden or 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,28 @@ | ||
| #!/usr/bin/env bash | ||
| # | ||
| # Regenerates all .pb.go files using the system protoc toolchain. | ||
|
|
||
| set -euo pipefail | ||
|
|
||
| cd "$(dirname "${BASH_SOURCE[0]}")/.." | ||
|
|
||
| echo "Regenerating proto files..." | ||
|
|
||
| PROTOS=( | ||
| service.proto | ||
| darkside.proto | ||
| compact_formats.proto | ||
| ) | ||
|
|
||
| (cd walletrpc && for proto in "${PROTOS[@]}"; do | ||
| echo " ${proto}" | ||
| protoc \ | ||
| --go_out=. --go_opt=paths=source_relative \ | ||
| --go-grpc_out=. --go-grpc_opt=paths=source_relative \ | ||
| "${proto}" | ||
| done) | ||
|
|
||
| go mod tidy | ||
|
|
||
| echo "" | ||
| echo "Proto regeneration complete." |
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.
make protodoes this now