PRT- masking provider address when context deadline hits (#461)

* masking provider address when context deadline hits * fixing reading deadline error
lavanet · May 7, 2023 · efa9c59 · efa9c59
1 parent 7e1416a
commit efa9c59
Show file tree

Hide file tree

Showing 5 changed files with 36 additions and 4 deletions.
diff --git a/docs/static/openapi.yml b/docs/static/openapi.yml
@@ -31428,6 +31428,10 @@ paths:
                     title: >-
                       protobuf expected in YAML format: used "moretags" to
                       simplify parsing
+                  snapshot:
+                    type: string
+                    format: uint64
+                    title: snapshot id to uniquely identify snapshots
         default:
           description: An unexpected error response.
           schema:
@@ -31566,6 +31570,10 @@ paths:
                     title: >-
                       protobuf expected in YAML format: used "moretags" to
                       simplify parsing
+                  snapshot:
+                    type: string
+                    format: uint64
+                    title: snapshot id to uniquely identify snapshots
         default:
           description: An unexpected error response.
           schema:
@@ -56039,6 +56047,10 @@ definitions:
             type: string
             format: uint64
         title: 'protobuf expected in YAML format: used "moretags" to simplify parsing'
+      snapshot:
+        type: string
+        format: uint64
+        title: snapshot id to uniquely identify snapshots
   lavanet.lava.projects.ProjectKey:
     type: object
     properties:
@@ -56171,6 +56183,10 @@ definitions:
             title: >-
               protobuf expected in YAML format: used "moretags" to simplify
               parsing
+          snapshot:
+            type: string
+            format: uint64
+            title: snapshot id to uniquely identify snapshots
   lavanet.lava.projects.QueryInfoResponse:
     type: object
     properties:
@@ -56275,6 +56291,10 @@ definitions:
             title: >-
               protobuf expected in YAML format: used "moretags" to simplify
               parsing
+          snapshot:
+            type: string
+            format: uint64
+            title: snapshot id to uniquely identify snapshots
   lavanet.lava.projects.QueryParamsResponse:
     type: object
     properties:

diff --git a/protocol/chainlib/grpc.go b/protocol/chainlib/grpc.go
@@ -341,6 +341,10 @@ func (cp *GrpcChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{},
 	response := msgFactory.NewMessage(methodDescriptor.GetOutputType())
 	err = conn.Invoke(connectCtx, "/"+nodeMessage.Path, msg, response)
 	if err != nil {
+		if connectCtx.Err() == context.DeadlineExceeded {
+			// Not an rpc error, return provider error without disclosing the endpoint address
+			return nil, "", nil, utils.LavaFormatError("Provider Failed Sending Message", context.DeadlineExceeded)
+		}
 		return nil, "", nil, utils.LavaFormatError("Invoke Failed", err, utils.Attribute{Key: "GUID", Value: ctx}, utils.Attribute{Key: "Method", Value: nodeMessage.Path}, utils.Attribute{Key: "msg", Value: nodeMessage.Msg})
 	}
 

diff --git a/protocol/chainlib/jsonRPC.go b/protocol/chainlib/jsonRPC.go
@@ -417,6 +417,10 @@ func (cp *JrpcChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{},
 		connectCtx, cancel := cp.NodeUrl.LowerContextTimeout(ctx, relayTimeout)
 		defer cancel()
 		rpcMessage, err = rpc.CallContext(connectCtx, nodeMessage.ID, nodeMessage.Method, nodeMessage.Params)
+		if err != nil && connectCtx.Err() == context.DeadlineExceeded {
+			// Not an rpc error, return provider error without disclosing the endpoint address
+			return nil, "", nil, utils.LavaFormatError("Provider Failed Sending Message", context.DeadlineExceeded)
+		}
 	}
 
 	var replyMsg rpcInterfaceMessages.JsonrpcMessage

diff --git a/protocol/chainlib/rest.go b/protocol/chainlib/rest.go
@@ -372,6 +372,10 @@ func (rcp *RestChainProxy) SendNodeMsg(ctx context.Context, ch chan interface{},
 
 	res, err := httpClient.Do(req)
 	if err != nil {
+		if err != nil && connectCtx.Err() == context.DeadlineExceeded {
+			// Not an rpc error, return provider error without disclosing the endpoint address
+			return nil, "", nil, utils.LavaFormatError("Provider Failed Sending Message", context.DeadlineExceeded)
+		}
 		return nil, "", nil, err
 	}
 

diff --git a/protocol/chainlib/tendermintRPC.go b/protocol/chainlib/tendermintRPC.go
@@ -570,15 +570,15 @@ func (cp *tendermintRpcChainProxy) SendRPC(ctx context.Context, nodeMessage *rpc
 		defer cancel()
 		// perform the rpc call
 		rpcMessage, err = rpc.CallContext(connectCtx, nodeMessage.ID, nodeMessage.Method, nodeMessage.Params)
+		if err != nil && connectCtx.Err() == context.DeadlineExceeded {
+			// Not an rpc error, return provider error without disclosing the endpoint address
+			return nil, "", nil, utils.LavaFormatError("Provider Failed Sending Message", context.DeadlineExceeded)
+		}
 	}
 
 	var replyMsg *rpcInterfaceMessages.RPCResponse
 	// the error check here would only wrap errors not from the rpc
 	if err != nil {
-		if strings.Contains(err.Error(), context.DeadlineExceeded.Error()) {
-			// Not an rpc error, return provider error without disclosing the endpoint address
-			return nil, "", nil, utils.LavaFormatError("Failed Sending Message", context.DeadlineExceeded)
-		}
 		id, idErr := rpcInterfaceMessages.IdFromRawMessage(nodeMessage.ID)
 		if idErr != nil {
 			return nil, "", nil, utils.LavaFormatError("Failed parsing ID when getting rpc error", idErr)