Use grpc codec v2 during grpc invokes

cosmos · Jan 8, 2025 · 86aa4f8 · 86aa4f8
1 parent fd7f246
commit 86aa4f8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/relayer/chains/cosmos/grpc_query.go b/relayer/chains/cosmos/grpc_query.go
@@ -21,13 +21,14 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
+	"google.golang.org/grpc/mem"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
 var _ gogogrpc.ClientConn = &CosmosProvider{}
 
-var protoCodec = encoding.GetCodec(proto.Name)
+var protoCodec = encoding.GetCodecV2(proto.Name)
 
 // Invoke implements the grpc ClientConn.Invoke method
 func (cc *CosmosProvider) Invoke(ctx context.Context, method string, req, reply interface{}, opts ...grpc.CallOption) (err error) {
@@ -65,7 +66,7 @@ func (cc *CosmosProvider) Invoke(ctx context.Context, method string, req, reply
 		return err
 	}
 
-	if err = protoCodec.Unmarshal(abciRes.Value, reply); err != nil {
+	if err = protoCodec.Unmarshal([]mem.Buffer{mem.NewBuffer(&abciRes.Value, nil)}, reply); err != nil {
 		return err
 	}
 
@@ -126,7 +127,7 @@ func (cc *CosmosProvider) RunGRPCQuery(ctx context.Context, method string, req i
 
 	abciReq := abci.RequestQuery{
 		Path:   method,
-		Data:   reqBz,
+		Data:   reqBz.Materialize(),
 		Height: height,
 		Prove:  prove,
 	}

diff --git a/relayer/chains/penumbra/grpc_query.go b/relayer/chains/penumbra/grpc_query.go
@@ -21,13 +21,14 @@ import (
 	"google.golang.org/grpc/codes"
 	"google.golang.org/grpc/encoding"
 	"google.golang.org/grpc/encoding/proto"
+	"google.golang.org/grpc/mem"
 	"google.golang.org/grpc/metadata"
 	"google.golang.org/grpc/status"
 )
 
 var _ gogogrpc.ClientConn = &PenumbraProvider{}
 
-var protoCodec = encoding.GetCodec(proto.Name)
+var protoCodec = encoding.GetCodecV2(proto.Name)
 
 // Invoke implements the grpc ClientConn.Invoke method
 func (cc *PenumbraProvider) Invoke(ctx context.Context, method string, req, reply interface{}, opts ...grpc.CallOption) (err error) {
@@ -65,7 +66,7 @@ func (cc *PenumbraProvider) Invoke(ctx context.Context, method string, req, repl
 		return err
 	}
 
-	if err = protoCodec.Unmarshal(abciRes.Value, reply); err != nil {
+	if err = protoCodec.Unmarshal([]mem.Buffer{mem.NewBuffer(&abciRes.Value, nil)}, reply); err != nil {
 		return err
 	}
 
@@ -126,7 +127,7 @@ func (cc *PenumbraProvider) RunGRPCQuery(ctx context.Context, method string, req
 
 	abciReq := abci.RequestQuery{
 		Path:   method,
-		Data:   reqBz,
+		Data:   reqBz.Materialize(),
 		Height: height,
 		Prove:  prove,
 	}