Merge branch 'main' into fix-add-repr-to-custom-fee-base

Signed-off-by: Prakhar Jain <[email protected]>

Author: PrakharJain1509

CHANGELOG.md

@@ -10,8 +10,6 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Unified balance and transfer logging format — both now consistently display values in hbars for clarity.
 
 ### Added
-
-- Add `__repr__` method to CustomFee base class for better debugging by displaying fee_collector_account_id and all_collectors_are_exempt.
 - Refactored `examples/topic_create.py` into modular functions for better readability and reuse.
 - Add Rebasing and Signing section to signing.md with instructions for maintaining commit verification during rebase operations (#556)
 - Add `examples/account_id.py` demonstrating AccountId class usage including creating standard AccountIds, parsing from strings, comparing instances, and creating AccountIds with public key aliases
@@ -25,6 +23,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - docs: Add Google-style docstrings to `AbstractTokenTransferTransaction` class and its methods in `abstract_token_transfer_transaction.py`.
 - docs: Add Google-style docstrings to `TokenRelationship` class and its methods in `token_relationship.py`.
 - feat: add initial testing guide structure
+- Added `checksum` filed for TopicId, FileId, ContractId, ScheduleId class
 
 ### Changed
 
@@ -49,6 +48,7 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 
 - Add type hints to `setup_client()` and `create_new_account()` functions in `examples/account_create.py` (#418)
 - Added explicit read and write permissions to test.yml
+- Type hinting for `Topic` related transactions.
 
 ### Removed
 - Remove deprecated camelCase alias support and `_DeprecatedAliasesMixin`; SDK now only exposes snake_case attributes for `NftId`, `TokenInfo`, and `TransactionReceipt`. (Issue #428)
@@ -80,6 +80,10 @@ This changelog is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.
 - Added checksum validation for TokenId
 - Refactor examples/token_cancel_airdrop
 - Refactor token creation examples for modularity and consistency
+- Updated `signing.md` to clarify commit signing requirements, including DCO, GPG, and branch-specific guidelines (#459)
+
+### Changed
+
 - Rearranged running_examples.md to be alphabetical
 - Refactor token_associate.py for better structure, add association verification query (#367)
 - Refactored `examples/account_create.py` to improve modularity and readability (#363)

docs/sdk_developers/signing.md

@@ -2,14 +2,14 @@
 
 To contribute to this repository, **both DCO sign-off and GPG signature verification** are required for your commits to be merged successfully.
 
-This guide walks you through how to correctly configure and sign your commits.
+This guide walks you through how to correctly configure and sign your commits, and how to ensure **all commits are properly signed**.
 
 ---
 
 ## 🛡️ Why Commit Signing?
 
-- **DCO (`Signed-off-by`)** ensures you agree to the developer certificate of origin.
-- **GPG Signature** proves the commit was authored by a trusted and verified identity.
+* **DCO (`Signed-off-by`)** ensures you agree to the developer certificate of origin.
+* **GPG Signature** proves the commit was authored by a trusted and verified identity.
 
 ---
 
@@ -25,22 +25,21 @@ gpg --full-generate-key
 
 Choose:
 
-Kind: RSA and RSA
-
-Key size: 4096
-
-Expiration: 0 (or choose as per your need)
-
-Name, Email: Must match your GitHub email
-
-Passphrase: Set a strong passphrase 
+* Kind: RSA and RSA
+* Key size: 4096
+* Expiration: 0 (or choose as per your need)
+* Name, Email: Must match your GitHub email
+* Passphrase: Set a strong passphrase
 
 To list your keys:
 
 ```bash
-gpg --list-secret-keys --keyid-format LONG 
+gpg --list-secret-keys --keyid-format LONG
 ```
-Copy the key ID (it looks like 34AA6DBC)
+
+Copy the key ID (looks like `34AA6DBC`).
+
+---
 
 ### 2. Add Your GPG Key to GitHub
 
@@ -49,35 +48,69 @@ Export your GPG public key:
 ```bash
 gpg --armor --export YOUR_KEY_ID
 ```
-Paste the output into GitHub here:
 
+Paste the output into GitHub:
+
+* [Add GPG key on Github](https://github.com/settings/gpg/new)
 
-- [Add GPG key on Github ](https://github.com/settings/gpg/new)
+---
 
-### 3. Tell Git to Use Your GPG Key
+### 3. Configure Git to Use Your GPG Key
 
 ```bash
 git config --global user.signingkey YOUR_KEY_ID
 git config --global commit.gpgsign true
 ```
 
-### 4. Make a Signed Commit
+---
+
+## ✨ Make Signed Commits
 
-Use both DCO sign-off and GPG signing:
+**All commits must be signed using both DCO and GPG.**
 
 ```bash
 git commit -S -s -m "chore: your commit message"
 ```
 
--S = GPG sign
--s = DCO sign-off
+* `-S` = GPG sign
+* `-s` = DCO sign-off
+
+> ⚠️ Ensure **every commit** in your branch follows this rule.
 
-### Fixing an Unsigned Commit
+---
+
+## 🛠️ Fixing Unsigned Commits
+
+If you accidentally forgot to sign commits, there are **two ways to fix them**:
+
+### 1. Soft Reverting Commits (Recommended for New Contributors)
+
+Soft revert the impacted commits while keeping changes locally:
+
+```bash
+git reset --soft HEAD~n
+```
+
+* `HEADn` = number of commits to go back
+* Example: To fix the last 3 commits: `git reset --soft HEAD`
 
-If you forgot to sign or DCO a commit:
+Then, recommit each commit with proper signing:
+
+```bash
+git commit -S -s -m "chore: your commit message"
+```
+
+Repeat for each impacted commit.
+
+---
+
+### 2. Retroactively Signing Commits
+
+Alternatively, you can **amend commits retroactively**:
 
 ```bash
 git commit --amend -S -s
+git rebase -i HEAD~n  # For multiple commits
 git push --force-with-lease
 ```
 ## Rebasing and Signing
@@ -91,16 +124,39 @@ When rebasing, you must use this command to ensure your commits remain verified:
 git rebase main -S
 ```
 
+> **Note:** `--force-with-lease` safely updates the remote branch without overwriting others’ changes.
+
+---
+
+## ✅ Verify Signed Status of Commits
+
+To check that your commits are signed correctly:
+
+```bash
+git log --show-signature
+```
+
+* Ensure each commit shows both **GPG verified** and **DCO signed-off**.
+* For a quick check of recent commits:
+
+```bash
+git log -n 5 --pretty=format:'%h %an %G? %s'
+```
+
+* `G?` column shows the signature status (`G` = good, `B` = bad, `U` = unsigned)
+
+---
+
 ## ✅ Final Checklist
 
-- [ ] Signed your commit with `-S`
-- [ ] Added DCO with `-s`
-- [ ] GPG key is added to GitHub
-- [ ] Verified badge appears in PR
+* [ ] All commits signed with `-S`
+* [ ] DCO added with `-s`
+* [ ] GPG key added to GitHub
+* [ ] Verified badge appears in PR
 
+---
 
 ### Still Need Help?
 
-If you run into issues:
-
-- Refer to [GitHub’s GPG Docs](https://docs.github.com/en/authentication/managing-commit-signature-verification)
+* Refer to [GitHub’s GPG Docs](https://docs.github.com/en/authentication/managing-commit-signature-verification)
+* Ask maintainers on the **Hiero Discord** if stuck

src/hiero_sdk_python/account/account_id.py

@@ -2,11 +2,21 @@
 AccountId class.
 """
 
-from typing import List
+import re
+from typing import TYPE_CHECKING
 
 from hiero_sdk_python.crypto.public_key import PublicKey
 from hiero_sdk_python.hapi.services import basic_types_pb2
+from hiero_sdk_python.utils.entity_id_helper import (
+    parse_from_string,
+    validate_checksum,
+    format_to_string_with_checksum
+)
 
+if TYPE_CHECKING:
+    from hiero_sdk_python.client.client import Client
+
+ALIAS_REGEX = re.compile(r"^(0|[1-9]\d*)\.(0|[1-9]\d*)\.((?:[0-9a-fA-F][0-9a-fA-F])+)$")
 
 class AccountId:
     """
@@ -37,17 +47,42 @@ def __init__(
         self.realm = realm
         self.num = num
         self.alias_key = alias_key
+        self.__checksum: str | None = None
 
     @classmethod
     def from_string(cls, account_id_str: str) -> "AccountId":
         """
         Creates an AccountId instance from a string in the format 'shard.realm.num'.
         """
-        parts: List[str] = account_id_str.strip().split(".")
-        if len(parts) != 3:
-            raise ValueError("Invalid account ID string format. Expected 'shard.realm.num'")
-        shard, realm, num = map(int, parts)
-        return cls(shard, realm, num)
+        if account_id_str is None or not isinstance(account_id_str, str):
+            raise ValueError(f"Invalid account ID string '{account_id_str}'. Expected format 'shard.realm.num'.")
+
+        try:
+            shard, realm, num, checksum = parse_from_string(account_id_str)
+
+            account_id: AccountId = cls(
+                shard=int(shard),
+                realm=int(realm),
+                num=int(num)
+            )
+            account_id.__checksum = checksum
+
+            return account_id
+        except Exception as e:
+            alias_match = ALIAS_REGEX.match(account_id_str)
+            
+            if alias_match:
+                shard, realm, alias = alias_match.groups()
+                return cls(
+                    shard=int(shard),
+                    realm=int(realm),
+                    num=0,
+                    alias_key=PublicKey.from_bytes(bytes.fromhex(alias))
+                )
+            
+            raise ValueError(
+                f"Invalid account ID string '{account_id_str}'. Expected format 'shard.realm.num'."
+            ) from e
 
     @classmethod
     def _from_proto(cls, account_id_proto: basic_types_pb2.AccountID) -> "AccountId":
@@ -89,6 +124,24 @@ def _to_proto(self) -> basic_types_pb2.AccountID:
 
         return account_id_proto
 
+    @property
+    def checksum(self) -> str | None:
+        """Checksum of the accountId"""
+        return self.__checksum
+
+    def validate_checksum(self, client: "Client") -> None:
+        """Validate the checksum for the accountId"""
+        if self.alias_key is not None:
+            raise ValueError("Cannot calculate checksum with an account ID that has a aliasKey")
+
+        validate_checksum(
+            self.shard,
+            self.realm,
+            self.num,
+            self.__checksum,
+            client,
+        )
+
     def __str__(self) -> str:
         """
         Returns the string representation of the AccountId in 'shard.realm.num' format.
@@ -97,6 +150,21 @@ def __str__(self) -> str:
             return f"{self.shard}.{self.realm}.{self.alias_key.to_string()}"
         return f"{self.shard}.{self.realm}.{self.num}"
 
+    def to_string_with_checksum(self, client: "Client") -> str:
+        """
+        Returns the string representation of the AccountId with checksum 
+        in 'shard.realm.num-checksum' format.
+        """
+        if self.alias_key is not None:
+            raise ValueError("Cannot calculate checksum with an account ID that has a aliasKey")
+
+        return format_to_string_with_checksum(
+            self.shard,
+            self.realm,
+            self.num,
+            client
+        )
+
     def __repr__(self):
         """
         Returns the repr representation of the AccountId.

src/hiero_sdk_python/consensus/topic_delete_transaction.py

@@ -7,11 +7,11 @@
 """
 
 from typing import Optional
+from hiero_sdk_python.consensus.topic_id import TopicId
 from hiero_sdk_python.transaction.transaction import Transaction
 from hiero_sdk_python.hapi.services import (
     consensus_delete_topic_pb2,
-    transaction_pb2,
-    basic_types_pb2
+    transaction_pb2
 )
 from hiero_sdk_python.hapi.services.schedulable_transaction_body_pb2 import (
     SchedulableTransactionBody,
@@ -27,12 +27,12 @@ class TopicDeleteTransaction(Transaction):
 
     """
 
-    def __init__(self, topic_id: Optional[basic_types_pb2.TopicID] = None) -> None:
+    def __init__(self, topic_id: Optional[TopicId] = None) -> None:
         super().__init__()
-        self.topic_id: Optional[basic_types_pb2.TopicID] = topic_id
+        self.topic_id: Optional[TopicId] = topic_id
         self.transaction_fee: int = 10_000_000
 
-    def set_topic_id(self, topic_id: basic_types_pb2.TopicID ) -> "TopicDeleteTransaction":
+    def set_topic_id(self, topic_id:TopicId ) -> "TopicDeleteTransaction":
         """
         Sets the topic ID for the transaction.