Update to latest gRPC

This involves updating the generator script to install and use an
additional tool, as two generator are now used (one for protobuf
messages, and another for defining the gRPC services).

Author: jrick

go.mod

@@ -26,18 +26,18 @@ require (
 	github.com/decred/dcrd/wire v1.5.0
 	github.com/decred/go-socks v1.1.0
 	github.com/decred/slog v1.2.0
-	github.com/golang/protobuf v1.4.2
 	github.com/gorilla/websocket v1.4.2
 	github.com/jessevdk/go-flags v1.4.1-0.20200711081900-c17162fe8fd7
 	github.com/jrick/bitset v1.0.0
 	github.com/jrick/logrotate v1.0.0
 	github.com/jrick/wsrpc/v2 v2.3.4
 	go.etcd.io/bbolt v1.3.5
-	golang.org/x/crypto v0.0.0-20210711020723-a769d52b0f97
+	golang.org/x/crypto v0.0.0-20220315160706-3147a52a75dd
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1
-	google.golang.org/grpc v1.32.0
-	google.golang.org/protobuf v1.23.0
+	golang.org/x/term v0.0.0-20210927222741-03fcf44c2211
+	google.golang.org/grpc v1.45.0
+	google.golang.org/grpc/cmd/protoc-gen-go-grpc v1.2.0
+	google.golang.org/protobuf v1.27.1
 )
 
 require (
@@ -47,8 +47,9 @@ require (
 	github.com/decred/base58 v1.0.3 // indirect
 	github.com/decred/dcrd/database/v3 v3.0.0 // indirect
 	github.com/decred/dcrd/dcrec/edwards/v2 v2.0.2 // indirect
-	golang.org/x/net v0.0.0-20210226172049-e18ecbb05110 // indirect
-	golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1 // indirect
-	golang.org/x/text v0.3.3 // indirect
-	google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55 // indirect
+	github.com/golang/protobuf v1.5.2 // indirect
+	golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
+	golang.org/x/sys v0.0.0-20220315194320-039c03cc5b86 // indirect
+	golang.org/x/text v0.3.7 // indirect
+	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 )

go.sum

@@ -167,13 +167,16 @@ func decodeHashes(in [][]byte) ([]*chainhash.Hash, error) {
 
 // versionServer provides RPC clients with the ability to query the RPC server
 // version.
-type versionServer struct{}
+type versionServer struct {
+	pb.UnimplementedVersionServiceServer
+}
 
 // walletServer provides wallet services for RPC clients.
 type walletServer struct {
 	ready          uint32 // atomic
 	wallet         *wallet.Wallet
 	dialCSPPServer func(ctx context.Context, network, addr string) (net.Conn, error)
+	pb.UnimplementedWalletServiceServer
 }
 
 // loaderServer provides RPC clients with the ability to load and close wallets,
@@ -182,52 +185,62 @@ type loaderServer struct {
 	ready     uint32 // atomic
 	loader    *loader.Loader
 	activeNet *netparams.Params
+	pb.UnimplementedWalletLoaderServiceServer
 }
 
 // seedServer provides RPC clients with the ability to generate secure random
 // seeds encoded in both binary and human-readable formats, and decode any
 // human-readable input back to binary.
-type seedServer struct{}
+type seedServer struct {
+	pb.UnimplementedSeedServiceServer
+}
 
 // accountMixerServer provides RPC clients with the ability to start/stop the
 // account mixing privacy service.
 type accountMixerServer struct {
 	ready  uint32 // atomic
 	loader *loader.Loader
+	pb.UnimplementedAccountMixerServiceServer
 }
 
 // ticketbuyerServer provides RPC clients with the ability to start/stop the
 // automatic ticket buyer service.
 type ticketbuyerV2Server struct {
 	ready  uint32 // atomic
 	loader *loader.Loader
+	pb.UnimplementedTicketBuyerV2ServiceServer
 }
 
 type agendaServer struct {
 	ready     uint32 // atomic
 	activeNet *chaincfg.Params
+	pb.UnimplementedAgendaServiceServer
 }
 
 type votingServer struct {
 	ready  uint32 // atomic
 	wallet *wallet.Wallet
+	pb.UnimplementedVotingServiceServer
 }
 
 // messageVerificationServer provides RPC clients with the ability to verify
 // that a message was signed using the private key of a particular address.
 type messageVerificationServer struct {
 	chainParams *chaincfg.Params
+	pb.UnimplementedMessageVerificationServiceServer
 }
 
 type decodeMessageServer struct {
 	chainParams *chaincfg.Params
+	pb.UnimplementedDecodeMessageServiceServer
 }
 
 // networkServer provices RPC clients with the ability to perform network
 // related calls that are not necessarily used or backed by the wallet itself.
 type networkServer struct {
 	ready  uint32 // atomic
 	wallet *wallet.Wallet
+	pb.UnimplementedNetworkServiceServer
 }
 
 // Singleton implementations of each service.  Not all services are immediately

internal/rpc/rpcserver/server.go

@@ -1,17 +1,19 @@
 #!/bin/sh
 
-build_protoc_gen_go() {
+build_tools() {
     mkdir -p bin
     export GOBIN=$PWD/bin
-    GO111MODULE=on go install github.com/golang/protobuf/protoc-gen-go
+    go install google.golang.org/grpc/cmd/protoc-gen-go-grpc
+    go install google.golang.org/protobuf/cmd/protoc-gen-go
 }
 
 generate() {
-    protoc -I. api.proto --go_out=plugins=grpc:walletrpc --go_opt=paths=source_relative
+    protoc -I. api.proto --go_out=walletrpc --go-grpc_out=walletrpc \
+        --go_opt=paths=source_relative --go-grpc_opt=paths=source_relative
 
     # fix uid mapping on files created within the container
     [ -n "$UID" ] && chown -R $UID . 2>/dev/null
 }
 
-(cd tools && build_protoc_gen_go)
+(cd tools && build_tools)
 PATH=$PWD/tools/bin:$PATH generate

rpc/regen.sh

@@ -1,8 +1,8 @@
-//go:build ignore
-// +build ignore
+//go:build tools
 
 package tools
 
 import (
-	_ "github.com/golang/protobuf/protoc-gen-go"
+	_ "google.golang.org/grpc/cmd/protoc-gen-go-grpc"
+	_ "google.golang.org/protobuf/cmd/protoc-gen-go"
 )