Skip to content

Commit

Permalink
deps: update grpc to v1.59.0 and remove replace directive (cosmos#1288)
Browse files Browse the repository at this point in the history
<!--
Please read and fill out this form before submitting your PR.

Please make sure you have reviewed our contributors guide before
submitting your
first PR.
-->

## Overview

Resolves cosmos#1286.

<!-- 
Please provide an explanation of the PR, including the appropriate
context,
background, goal, and rationale. If there is an issue with this
information,
please provide a tl;dr and link the issue. 
-->

## Checklist

<!-- 
Please complete the checklist to ensure that the PR is ready to be
reviewed.

IMPORTANT:
PRs should be left in Draft until the below checklist is completed.
-->

- [x] New and updated code has appropriate documentation
- [x] New and updated code has new and/or updated testing
- [x] Required CI checks are passing
- [x] Visual proof for any user facing features like CLI or
documentation updates
- [x] Linked issues closed with keywords


<!-- This is an auto-generated comment: release notes by coderabbit.ai
-->
## Summary by CodeRabbit

# Refactor:
- Updated the way our system communicates securely with other services.
- Moved the import statement for "google.golang.org/grpc" below the
import statement for "github.com/ipfs/go-datastore".
- Added the import statement for
"google.golang.org/grpc/credentials/insecure".
- Replaced the "grpc.WithInsecure()" dial option with
"grpc.WithTransportCredentials(insecure.NewCredentials())".
- Replaced the "grpc.WithInsecure()" option with
"grpc.WithTransportCredentials(insecure.NewCredentials())" in the
"Start" function.

This change enhances the security of our data transmissions, providing a
safer environment for user data. Please note, this update is
under-the-hood and won't affect the user interface or experience.
<!-- end of auto-generated comment: release notes by coderabbit.ai -->
  • Loading branch information
tzdybal authored Oct 30, 2023
1 parent ff4b754 commit 66b4e9b
Show file tree
Hide file tree
Showing 3 changed files with 83 additions and 14 deletions.
6 changes: 3 additions & 3 deletions da/grpc/grpc.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import (
"encoding/json"
"strconv"

"google.golang.org/grpc"

ds "github.com/ipfs/go-datastore"
"google.golang.org/grpc"
"google.golang.org/grpc/credentials/insecure"

"github.com/rollkit/rollkit/da"
"github.com/rollkit/rollkit/third_party/log"
Expand Down Expand Up @@ -58,7 +58,7 @@ func (d *DataAvailabilityLayerClient) Start() error {
var err error
var opts []grpc.DialOption
// TODO(tzdybal): add more options
opts = append(opts, grpc.WithInsecure())
opts = append(opts, grpc.WithTransportCredentials(insecure.NewCredentials()))
d.conn, err = grpc.Dial(d.config.Host+":"+strconv.Itoa(d.config.Port), opts...)
if err != nil {
return err
Expand Down
11 changes: 4 additions & 7 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/tendermint/tendermint v0.35.9
go.uber.org/multierr v1.11.0
golang.org/x/net v0.17.0
google.golang.org/grpc v1.58.2
google.golang.org/grpc v1.59.0
google.golang.org/protobuf v1.31.0
)

Expand Down Expand Up @@ -70,7 +70,7 @@ require (
github.com/go-logr/stdr v1.2.2 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/godbus/dbus/v5 v5.1.0 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/glog v1.1.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/golang/mock v1.6.0 // indirect
github.com/golang/protobuf v1.5.3 // indirect
Expand All @@ -80,7 +80,7 @@ require (
github.com/google/go-cmp v0.5.9 // indirect
github.com/google/gopacket v1.1.19 // indirect
github.com/google/pprof v0.0.0-20230817174616-7a8ec2ada47b // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/google/uuid v1.3.1 // indirect
github.com/gopherjs/gopherjs v0.0.0-20190812055157-5d271430af9f // indirect
github.com/gtank/merlin v0.1.1 // indirect
github.com/hashicorp/errwrap v1.1.0 // indirect
Expand Down Expand Up @@ -187,7 +187,4 @@ require (
lukechampine.com/blake3 v1.2.1 // indirect
)

replace (
github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
google.golang.org/grpc => google.golang.org/grpc v1.33.2
)
replace github.com/gogo/protobuf => github.com/regen-network/protobuf v1.3.2-alpha.regen.4
Loading

0 comments on commit 66b4e9b

Please sign in to comment.