fix: restore original hbar validation error

Signed-off-by: prajeeta pal <[email protected]>

Author: prajeeta15

CHANGELOG.md

@@ -82,7 +82,8 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Transformed `examples/tokens/custom_fee_fixed.py` to be an end-to-end example, that interacts with the Hedera network, rather than a static object demo.
 - Replaced `ResponseCode.get_name(receipt.status)` with the `ResponseCode(receipt.status).name` across examples and integration tests for consistency. (#1136)
 - Moved helpful references to Additional Context section and added clickable links.
-- Transformed `examples\tokens\custom_royalty_fee.py` to be an end-to-end example, that interacts with the Hedera network, rather than a static object demo.
+- Transformed `examples\tokens\custom_royalty_fee.py` to be an end-to-end example, that interacts with the Hedera network, rather than a static object demgito.
+- Added support for Hbar objects in Hbar transfer helpers with normalization to tinybars.
 
 ### Fixed
 
@@ -666,4 +667,3 @@ contract_call_local_pb2.ContractLoginfo -> contract_types_pb2.ContractLoginfo
 ### Removed
 
 - N/A
-

generate_proto.py

@@ -51,11 +51,14 @@
 TRACE_LEVEL = 5
 logging.addLevelName(TRACE_LEVEL, "TRACE")
 
+
 def trace(msg, *args, **kwargs):
     logging.log(TRACE_LEVEL, msg, *args, **kwargs)
 
+
 logging.trace = trace
 
+
 @dataclass(frozen=True)
 class Config:
     hapi_version: str
@@ -64,6 +67,7 @@ class Config:
     mirror_out: Path
     pyi_out: bool = True
 
+
 def setup_logging(verbosity: int) -> None:
     level = logging.WARNING
     if verbosity == 1:
@@ -74,11 +78,14 @@ def setup_logging(verbosity: int) -> None:
         level = TRACE_LEVEL
     logging.basicConfig(level=level, format="%(levelname)s: %(message)s")
 
+
 def resolve_path(p: str) -> Path:
     q = Path(p)
     return q if q.is_absolute() else (SCRIPT_DIR / q)
 
 # -------------------- CLI --------------------
+
+
 def parse_args() -> argparse.Namespace:
     parser = argparse.ArgumentParser(
         description="Generate Python protobuf files from Hedera proto definitions."
@@ -117,6 +124,8 @@ def parse_args() -> argparse.Namespace:
     return parser.parse_args()
 
 # -------------------- Dependency check --------------------
+
+
 def ensure_grpc_tools() -> None:
     try:
         import grpc_tools  # noqa: F401
@@ -131,6 +140,7 @@ def ensure_grpc_tools() -> None:
 
 # -------------------- Download & extract --------------------
 
+
 def is_safe_tar_member(member: tarfile.TarInfo, base: Path) -> bool:
     name = member.name
     if not name or name.startswith("/"):
@@ -145,6 +155,7 @@ def is_safe_tar_member(member: tarfile.TarInfo, base: Path) -> bool:
         return False
     return True
 
+
 def safe_extract_tar_stream(response, dest: Path) -> None:
     """Stream-extract a GitHub tgz, stripping the top-level folder safely."""
     with tarfile.open(fileobj=response, mode="r|gz") as tar:
@@ -155,12 +166,15 @@ def safe_extract_tar_stream(response, dest: Path) -> None:
                 continue
             if not is_safe_tar_member(member, dest):
                 raise RuntimeError(f"Unsafe path in archive: {member.name}")
-            tar.extract(member, path=dest)  # nosec B202 - path validated by is_safe_tar_member
+            # nosec B202 - path validated by is_safe_tar_member
+            tar.extract(member, path=dest)
+
 
 def validate_url_and_version(url: str, hapi_version: str) -> None:
     parsed = urlparse(url)
     if parsed.scheme != "https" or parsed.netloc != "github.com":
-        raise RuntimeError(f"Refusing to fetch from non-https or unexpected host: {url}")
+        raise RuntimeError(
+            f"Refusing to fetch from non-https or unexpected host: {url}")
 
     if not re.fullmatch(r"v\d+\.\d+\.\d+", hapi_version):
         raise RuntimeError(f"Unexpected HAPI tag format: {hapi_version}")
@@ -179,7 +193,7 @@ def download_and_setup_protos(hapi_version: str, protos_dir: Path) -> None:
     validate_url_and_version(url, hapi_version)
 
     try:
-        with urllib.request.urlopen(url, timeout=30) as resp: # nosec B310
+        with urllib.request.urlopen(url, timeout=30) as resp:  # nosec B310
             safe_extract_tar_stream(resp, protos_dir)
     except URLError as e:
         raise RuntimeError(f"Failed to download protobuf files: {e}") from e
@@ -195,6 +209,7 @@ def download_and_setup_protos(hapi_version: str, protos_dir: Path) -> None:
 
 # -------------------- Filesystem helpers --------------------
 
+
 def clean_and_prepare_output_dirs(*dirs: Path) -> None:
     seen: set[Path] = set()
     for d in (p.resolve() for p in dirs):
@@ -207,18 +222,21 @@ def clean_and_prepare_output_dirs(*dirs: Path) -> None:
         logging.info("Creating output dir: %s", d)
         d.mkdir(parents=True, exist_ok=True)
 
+
 def ensure_subpackages(base: Path, subdirs: Iterable[Path]) -> None:
     for p in subdirs:
         (base / p).mkdir(parents=True, exist_ok=True)
 
+
 def create_init_files(*roots: Path) -> None:
     for root in roots:
         for p in [root, *root.rglob("*")]:
             if p.is_dir():
                 (p / "__init__.py").touch(exist_ok=True)
 
+
 def log_generated_files(output_dir: Path) -> None:
-    py_files  = sorted(output_dir.rglob("*.py"))
+    py_files = sorted(output_dir.rglob("*.py"))
     pyi_files = sorted(output_dir.rglob("*.pyi"))
 
     print(f"\n📂 Generated compiled proto files in {output_dir}:")
@@ -244,6 +262,8 @@ def log_generated_files(output_dir: Path) -> None:
             logging.trace("  - %s", rel)
 
 # -------------------- Protoc invocation --------------------
+
+
 def run_protoc(
     proto_paths: List[Path],
     out_py: Path,
@@ -265,7 +285,7 @@ def run_protoc(
     args += ["--python_out", str(out_py), "--grpc_python_out", str(out_grpc)]
     if pyi_out:
         args += ["--pyi_out", str(out_py)]
-    # as_posix forces a return of the paths as / as required for protoc    
+    # as_posix forces a return of the paths as / as required for protoc
     args += [f.as_posix() for f in files]
 
     logging.trace("protoc args: %s", " ".join(args))
@@ -276,6 +296,7 @@ def run_protoc(
 
 # -------------------- Import normalization for .proto --------------------
 
+
 def rewrite_import_line(line: str, src_root: Path) -> str:
     """
     Normalize an 'import "..."' line to a canonical path:
@@ -303,6 +324,7 @@ def rewrite_import_line(line: str, src_root: Path) -> str:
 
     return line
 
+
 def parse_import_line(line: str, src_root: Path) -> tuple[str, Path | None]:
     """Return (possibly rewritten) line and a dependency Path (or None)."""
     if "import " not in line or ".proto" not in line:
@@ -435,31 +457,49 @@ def compile_mirror(protos_root: Path, mirror_out: Path) -> None:
         shutil.rmtree(temp_root, ignore_errors=True)
 
 # -------------------- Post-generation Python import fixups --------------------
+
+
 def _iter_py_like(root: Path):
     for pat in ("*.py", "*.pyi"):
         yield from root.rglob(pat)
 
+
 # -------------------- Import-rewrite helpers (precompiled regexes) --------------------
 # Keep these at module scope so they don't count against function complexity and are compiled once.
-_RX_IMPORT_AS                = re.compile(r"^\s*import (\w+_pb2) as", re.MULTILINE)
-_RX_FROM_SERVICES_AS         = re.compile(r"^\s*from\s+services\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
-_RX_FROM_SERVICES            = re.compile(r"^\s*from\s+services\s+import\s+(\w+_pb2)\b", re.MULTILINE)
-_RX_FROM_SERVICES_SUBPKG     = re.compile(r"^\s*from\s+services\.((?:\w+\.)*\w+)\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
-_RX_IMPORT_SERVICES_AS       = re.compile(r"^\s*import\s+services\.((?:\w+\.)*)(\w+_pb2)\s+as", re.MULTILINE)
-_RX_IMPORT_SERVICES          = re.compile(r"^\s*import\s+services\.((?:\w+\.)*)(\w+_pb2)\b", re.MULTILINE)
-_RX_FROM_AUX_TSS             = re.compile(r"^\s*from\s+auxiliary\.tss", re.MULTILINE)
-_RX_FROM_AUX_HINTS           = re.compile(r"^\s*from\s+auxiliary\.hints", re.MULTILINE)
-_RX_FROM_AUX_HISTORY         = re.compile(r"^\s*from\s+auxiliary\.history", re.MULTILINE)
-_RX_FROM_EVENT               = re.compile(r"^\s*from\s+event\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
-_RX_FROM_PLATFORM_EVENT      = re.compile(r"^\s*from\s+platform\.event\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
-_RX_FROM_DOT_STATE           = re.compile(r"^\s*from\s+\.\s*state(\.[\w\.]+)?\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
-_RX_FROM_ABS_STATE           = re.compile(r"^\s*from\s+services\.state(\.[\w\.]+)?\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
-_RX_FROM_DOT_IMPORT_LOCAL    = re.compile(r"^\s*from\s+\.\s+import\s+(\w+_pb2)(\s+as\s+\w+)?\s*$", re.MULTILINE)
-
-_RX_MIRROR_IMPORT_AS         = re.compile(r"^\s*import (\w+_pb2) as", re.MULTILINE)
-_RX_FROM_MIRROR_AS           = re.compile(r"^\s*from\s+mirror\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
-_RX_FROM_SERVICES_AS_MIR     = re.compile(r"^\s*from\s+services\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
-_RX_FROM_DOT_AS_MIR          = re.compile(r"^\s*from\s+\.\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
+_RX_IMPORT_AS = re.compile(r"^\s*import (\w+_pb2) as", re.MULTILINE)
+_RX_FROM_SERVICES_AS = re.compile(
+    r"^\s*from\s+services\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
+_RX_FROM_SERVICES = re.compile(
+    r"^\s*from\s+services\s+import\s+(\w+_pb2)\b", re.MULTILINE)
+_RX_FROM_SERVICES_SUBPKG = re.compile(
+    r"^\s*from\s+services\.((?:\w+\.)*\w+)\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
+_RX_IMPORT_SERVICES_AS = re.compile(
+    r"^\s*import\s+services\.((?:\w+\.)*)(\w+_pb2)\s+as", re.MULTILINE)
+_RX_IMPORT_SERVICES = re.compile(
+    r"^\s*import\s+services\.((?:\w+\.)*)(\w+_pb2)\b", re.MULTILINE)
+_RX_FROM_AUX_TSS = re.compile(r"^\s*from\s+auxiliary\.tss", re.MULTILINE)
+_RX_FROM_AUX_HINTS = re.compile(r"^\s*from\s+auxiliary\.hints", re.MULTILINE)
+_RX_FROM_AUX_HISTORY = re.compile(
+    r"^\s*from\s+auxiliary\.history", re.MULTILINE)
+_RX_FROM_EVENT = re.compile(
+    r"^\s*from\s+event\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
+_RX_FROM_PLATFORM_EVENT = re.compile(
+    r"^\s*from\s+platform\.event\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
+_RX_FROM_DOT_STATE = re.compile(
+    r"^\s*from\s+\.\s*state(\.[\w\.]+)?\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
+_RX_FROM_ABS_STATE = re.compile(
+    r"^\s*from\s+services\.state(\.[\w\.]+)?\s+import\s+(\w+_pb2)(\s+as\b)?", re.MULTILINE)
+_RX_FROM_DOT_IMPORT_LOCAL = re.compile(
+    r"^\s*from\s+\.\s+import\s+(\w+_pb2)(\s+as\s+\w+)?\s*$", re.MULTILINE)
+
+_RX_MIRROR_IMPORT_AS = re.compile(r"^\s*import (\w+_pb2) as", re.MULTILINE)
+_RX_FROM_MIRROR_AS = re.compile(
+    r"^\s*from\s+mirror\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
+_RX_FROM_SERVICES_AS_MIR = re.compile(
+    r"^\s*from\s+services\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
+_RX_FROM_DOT_AS_MIR = re.compile(
+    r"^\s*from\s+\.\s+import\s+(\w+_pb2)\s+as", re.MULTILINE)
+
 
 def _walk_and_rewrite(root: Path, rewriter) -> tuple[int, int]:
     """Walk .py and .pyi under root, rewrite with `rewriter(text, path) -> new_text|None`."""
@@ -501,7 +541,8 @@ def rewriter(text: str, path: Path) -> str | None:
         s = _RX_FROM_AUX_HISTORY.sub(r"from .auxiliary.history", s)
 
         s = _RX_FROM_EVENT.sub(r"from ..platform.event import \1\2", s)
-        s = _RX_FROM_PLATFORM_EVENT.sub(r"from ..platform.event import \1\2", s)
+        s = _RX_FROM_PLATFORM_EVENT.sub(
+            r"from ..platform.event import \1\2", s)
 
         # State imports need dynamic dots
         def repl_dot_state(m: re.Match) -> str:
@@ -556,6 +597,7 @@ def repl_from_dot(m: re.Match) -> str:
         return None if s == text else s
     return rewriter
 
+
 def _rewrite_platform_event(text: str, _path: Path) -> str | None:
     s = text
     s2 = s
@@ -573,16 +615,18 @@ def _rewrite_platform_event(text: str, _path: Path) -> str | None:
                 r'from . import \1\2', s2)
     return None if s2 == s else s2
 
+
 def adjust_python_imports(services_dir: Path, mirror_dir: Path) -> None:
     logging.info("Adjusting imports in services under %s", services_dir)
     service_root_modules = {f.stem for f in services_dir.glob("*_pb2.py")}
     svc_changed, svc_total = _walk_and_rewrite(
-        services_dir, _rewrite_services_factory(services_dir, service_root_modules)
+        services_dir, _rewrite_services_factory(
+            services_dir, service_root_modules)
     )
     logging.info("Services: rewrote %d/%d files", svc_changed, svc_total)
 
     logging.info("Adjusting imports in mirror under %s", mirror_dir)
-    mirror_modules  = {f.stem for f in mirror_dir.rglob("*_pb2.py")}
+    mirror_modules = {f.stem for f in mirror_dir.rglob("*_pb2.py")}
     service_modules = {f.stem for f in services_dir.rglob("*_pb2.py")}
     mir_changed, mir_total = _walk_and_rewrite(
         mirror_dir, _rewrite_mirror_factory(mirror_modules, service_modules)
@@ -593,9 +637,13 @@ def adjust_python_imports(services_dir: Path, mirror_dir: Path) -> None:
     pe_dir = services_dir.parent / "platform" / "event"
     if pe_dir.exists():
         logging.info("Adjusting imports in platform/event under %s", pe_dir)
-        pe_changed, pe_total = _walk_and_rewrite(pe_dir, _rewrite_platform_event)
-        logging.info("Platform/event: rewrote %d/%d files", pe_changed, pe_total)
+        pe_changed, pe_total = _walk_and_rewrite(
+            pe_dir, _rewrite_platform_event)
+        logging.info("Platform/event: rewrote %d/%d files",
+                     pe_changed, pe_total)
 # -------------------- Main --------------------
+
+
 def main() -> None:
     args = parse_args()
     setup_logging(args.verbose)
@@ -631,13 +679,14 @@ def main() -> None:
     ensure_subpackages(cfg.mirror_out, [Path("mirror")])
 
     # Compile groups
-    compile_services_and_platform(cfg.protos_dir, cfg.services_out, cfg.pyi_out)
+    compile_services_and_platform(
+        cfg.protos_dir, cfg.services_out, cfg.pyi_out)
     compile_mirror(cfg.protos_dir, cfg.mirror_out)
     log_generated_files(cfg.mirror_out)
 
     # Fix imports and make packages importable
     adjust_python_imports(cfg.services_out / Path("services"),
-                      cfg.mirror_out / Path("mirror"))
+                          cfg.mirror_out / Path("mirror"))
     create_init_files(cfg.services_out, cfg.mirror_out)
 
     print("✅ All protobuf files have been generated and adjusted successfully!")