Merge branch 'upstream/main' into update-file-handler

Signed-off-by: anchit-goel <anchitgoel5@gmail.com>

Author: anchit-goel

pyproject.toml

@@ -19,7 +19,7 @@ dependencies = [
     "cryptography>=50.0.0,<51",
     "requests>=2.31.0,<3",
     "pycryptodome>=3.18.0,<4",
-    "eth-abi>=5.1.0,<6",
+    "eth-abi>=5.1.0,<7",
     "python-dotenv>=1.2.1,<3",
 ]
 classifiers = [

src/hiero_sdk_python/file/file_info_query.py

@@ -60,18 +60,16 @@ def _make_request(self) -> query_pb2.Query:
             Query: The protobuf query message.
 
         Raises:
-            ValueError: If the file ID is not set.
-            Exception: If any other error occurs during request construction.
+            Exception: If any error occurs during request construction.
         """
         try:
-            if not self.file_id:
-                raise ValueError("File ID must be set before making the request.")
-
             query_header = self._make_request_header()
 
             file_info_query = file_get_info_pb2.FileGetInfoQuery()
             file_info_query.header.CopyFrom(query_header)
-            file_info_query.fileID.CopyFrom(self.file_id._to_proto())
+
+            if self.file_id is not None:
+                file_info_query.fileID.CopyFrom(self.file_id._to_proto())
 
             query = query_pb2.Query()
             query.fileGetInfo.CopyFrom(file_info_query)

src/hiero_sdk_python/file/file_update_transaction.py

@@ -161,15 +161,9 @@ def _build_proto_body(self):
 
         Returns:
             FileUpdateTransactionBody: The protobuf body for this transaction.
-
-        Raises:
-            ValueError: If file_id is not set.
         """
-        if self.file_id is None:
-            raise ValueError("Missing required FileID")
-
         return FileUpdateTransactionBody(
-            fileID=self.file_id._to_proto(),
+            fileID=self.file_id._to_proto() if self.file_id is not None else None,
             keys=(KeyListProto(keys=[key._to_proto() for key in self.keys]) if self.keys else None),
             contents=self.contents if self.contents is not None else b"",
             expirationTime=(self.expiration_time._to_protobuf() if self.expiration_time else None),

tck/handlers/file.py

@@ -3,22 +3,30 @@
 from hiero_sdk_python.file.file_contents_query import FileContentsQuery
 from hiero_sdk_python.file.file_create_transaction import FileCreateTransaction
 from hiero_sdk_python.file.file_id import FileId
+from hiero_sdk_python.file.file_info import FileInfo
+from hiero_sdk_python.file.file_info_query import FileInfoQuery
 from hiero_sdk_python.file.file_update_transaction import FileUpdateTransaction
 from hiero_sdk_python.hbar import Hbar
 from hiero_sdk_python.response_code import ResponseCode
 from hiero_sdk_python.timestamp import Timestamp
 from hiero_sdk_python.transaction.transaction_receipt import TransactionReceipt
 from tck.errors import JsonRpcError
 from tck.handlers.registry import rpc_method
-from tck.param.file import CreateFileParams, GetFileContentsParams, UpdateFileParams
+from tck.param.file import (
+    CreateFileParams,
+    GetFileContentsParams,
+    GetFileInfoParams,
+    UpdateFileParams,
+)
 from tck.response.file import (
     CreateFileResponse,
     GetFileContentsResponse,
+    GetFileInfoResponse,
     UpdateFileResponse,
 )
 from tck.util.client_utils import get_client
 from tck.util.constants import DEFAULT_GRPC_TIMEOUT
-from tck.util.key_utils import get_key_from_string
+from tck.util.key_utils import get_key_from_string, key_to_string
 from tck.util.param_utils import to_int
 
 
@@ -84,21 +92,13 @@ def get_file_contents(params: GetFileContentsParams) -> GetFileContentsResponse:
 
 
 def _build_update_file_transaction(params: UpdateFileParams) -> FileUpdateTransaction:
-    """Build a FileUpdateTransaction from parsed params.
-
-    Each setter is called only when the corresponding field is not None so that
-    omitted fields are left unchanged on-network. contents is pre-normalized so
-    that the exact empty string ("") from JSON-RPC params maps to None, therefore
-    set_contents is never invoked when the caller intends "leave unchanged".
-    """
+    """Build a FileUpdateTransaction from parsed params."""
     transaction = FileUpdateTransaction().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
 
     if params.fileId is not None:
-        # ValueError from FileId.from_string propagates as an SDK/internal error.
         transaction.set_file_id(FileId.from_string(params.fileId))
 
     if params.keys is not None:
-        # Threshold-key rejection is enforced by the network, not client-side.
         transaction.set_keys([get_key_from_string(k) for k in params.keys])
 
     if params.contents is not None:
@@ -130,3 +130,31 @@ def update_file(params: UpdateFileParams) -> UpdateFileResponse:
     receipt: TransactionReceipt = response.get_receipt(client, validate_status=True)
 
     return UpdateFileResponse(status=ResponseCode(receipt.status).name)
+
+
+def _build_file_info_response(info: FileInfo) -> GetFileInfoResponse:
+    """Build a GetFileResponse from a FileInfo object."""
+
+    keys = [key_to_string(k) for k in info.keys] if info.keys else []
+
+    return GetFileInfoResponse(
+        fileId=str(info.file_id) if info.file_id is not None else None,
+        size=str(info.size) if info.size is not None else None,
+        expirationTime=str(info.expiration_time.seconds) if info.expiration_time is not None else None,
+        isDeleted=info.is_deleted,
+        keys=keys,
+        memo=info.file_memo,
+        ledgerId=info.ledger_id.hex() if info.ledger_id is not None else None,
+    )
+
+
+@rpc_method("getFileInfo")
+def get_file_info(params: GetFileInfoParams) -> GetFileInfoResponse:
+    client = get_client(params.sessionId)
+    query = FileInfoQuery().set_grpc_deadline(DEFAULT_GRPC_TIMEOUT)
+
+    if params.fileId is not None:
+        query.set_file_id(FileId.from_string(params.fileId))
+
+    info = query.execute(client)
+    return _build_file_info_response(info)

tck/param/file.py

@@ -87,18 +87,26 @@ def parse_json_params(cls, params: dict) -> UpdateFileParams:
                 if not isinstance(key, str) or not key.strip():
                     raise ValueError("keys must be a list of non-empty strings")
 
-        contents_raw = params.get("contents")
-
         return cls(
             fileId=params.get("fileId"),
             keys=keys,
-            # Per the spec, only the exact empty string ("") means "leave unchanged" (mapped to None).
-            # Other values (including whitespace) are preserved verbatim.
-            contents=None if contents_raw == "" else contents_raw,
+            contents=params.get("contents"),
             # expirationTime is kept as a raw string; int/Timestamp conversion
             # happens in the handler layer.
             expirationTime=params.get("expirationTime"),
             memo=params.get("memo"),
             sessionId=parse_session_id(params),
             commonTransactionParams=parse_common_transaction_params(params),
         )
+
+
+@dataclass
+class GetFileInfoParams(BaseParams):
+    """Parameters for getting file information."""
+
+    fileId: str | None = None
+
+    @classmethod
+    def parse_json_params(cls, params: dict) -> GetFileInfoParams:
+        """Parse JSON-RPC params into a GetFileInfoParams instance."""
+        return cls(fileId=params.get("fileId"), sessionId=parse_session_id(params))

tck/response/file.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from dataclasses import dataclass
+from dataclasses import dataclass, field
 
 from tck.response.base import StatusOnlyResponse
 
@@ -23,3 +23,14 @@ class GetFileContentsResponse:
     """Response payload for getFileContents."""
 
     contents: str | None = None
+
+
+@dataclass
+class GetFileInfoResponse:
+    fileId: str | None = None
+    size: str | None = None
+    expirationTime: str | None = None
+    isDeleted: bool | None = None
+    keys: list[str] = field(default_factory=list)
+    memo: str | None = None
+    ledgerId: str | None = None

tests/unit/file_info_query_test.py

@@ -33,12 +33,11 @@ def test_constructor():
     assert query.file_id == file_id
 
 
-def test_execute_fails_with_missing_file_id(mock_client):
-    """Test request creation with missing File ID."""
+def test_make_request_with_missing_file_id():
+    """Test File ID is omitted from proto when not set."""
     query = FileInfoQuery()
-
-    with pytest.raises(ValueError, match="File ID must be set before making the request."):
-        query.execute(mock_client)
+    proto = query._make_request()
+    assert not proto.fileGetInfo.HasField("fileID")
 
 
 def test_get_method():

tests/unit/file_update_transaction_test.py

@@ -243,12 +243,15 @@ def test_build_scheduled_body(mock_account_ids, file_id):
     assert schedulable_body.fileUpdate.memo == StringValue(value=file_memo)
 
 
-def test_missing_file_id():
-    """Test that building a transaction without setting file_id raises a ValueError."""
+def test_missing_file_id(mock_account_ids):
+    """Test that building a transaction without setting file_id omits fileID in proto body."""
+    operator_id, _, node_account_id, _, _ = mock_account_ids
     file_tx = FileUpdateTransaction()
+    file_tx.operator_account_id = operator_id
+    file_tx.set_node_account_ids([node_account_id])
 
-    with pytest.raises(ValueError, match="Missing required FileID"):
-        file_tx.build_transaction_body()
+    transaction_body = file_tx.build_transaction_body()
+    assert not transaction_body.fileUpdate.HasField("fileID")
 
 
 def test_sign_transaction(mock_client, file_id):