Merge branch 'main' into feat/tck-update-topic-2426

Author: achintya2k5

.github/workflows/pr-check-primary-codecov.yml

@@ -37,7 +37,7 @@ jobs:
           python-version: "3.11"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
 
       - name: Install dependencies
         run: |

.github/workflows/pr-check-primary-codeql.yml

@@ -42,7 +42,7 @@ jobs:
                   egress-policy: audit
 
             - name: Initialize CodeQL
-              uses: github/codeql-action/init@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+              uses: github/codeql-action/init@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
               with:
                   languages: ${{ matrix.language }}
                   build-mode: ${{ matrix.build-mode }}
@@ -57,7 +57,7 @@ jobs:
 
             - name: Install uv
               if: matrix.language == 'python'
-              uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+              uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
               with:
                   enable-cache: true
 
@@ -66,6 +66,6 @@ jobs:
               run: uv sync --frozen --all-groups --all-packages --all-extras
 
             - name: Perform CodeQL Analysis
-              uses: github/codeql-action/analyze@7188fc363630916deb702c7fdcf4e481b751f97a # v4.37.1
+              uses: github/codeql-action/analyze@e4fba868fa4b1b91e1fdab776edc8cfbe6e9fb81 # v4.37.3
               with:
                   category: "/language:${{matrix.language}}"

.github/workflows/pr-check-secondary-deps-test.yml

@@ -38,7 +38,7 @@ jobs:
           cache: "pip"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
 
       - name: Create virtual environment
         run: uv venv

.github/workflows/pr-check-secondary-examples.yml

@@ -58,7 +58,7 @@ jobs:
         working-directory: .github/scripts
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
 
       - name: Install dependencies
         run: uv sync --frozen --all-groups --all-packages --all-extras

.github/workflows/pr-check-secondary-tck-test.yml

@@ -42,7 +42,7 @@ jobs:
           python-version: "3.14"
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
         with:
           enable-cache: true
 

.github/workflows/pr-check-secondary-unit-integration-test.yml

@@ -54,7 +54,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
         with:
           enable-cache: true
 
@@ -117,7 +117,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
         with:
           enable-cache: true
 

.github/workflows/test-scripts.yml

@@ -32,7 +32,7 @@ jobs:
           persist-credentials: false
 
       - name: Install uv
-        uses: astral-sh/setup-uv@11f9893b081a58869d3b5fccaea48c9e9e46f990 # v8.3.2
+        uses: astral-sh/setup-uv@c771a70e6277c0a99b617c7a806ffedaca235ff9 # v9.0.0
 
       - name: Install dependencies
         run: uv sync --frozen --all-groups --all-packages --all-extras

src/hiero_sdk_python/nodes/node_create_transaction.py

@@ -7,7 +7,7 @@
 from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.address_book.endpoint import Endpoint
 from hiero_sdk_python.channels import _Channel
-from hiero_sdk_python.crypto.public_key import PublicKey
+from hiero_sdk_python.crypto.key import Key
 from hiero_sdk_python.executable import _Method
 from hiero_sdk_python.hapi.services.node_create_pb2 import NodeCreateTransactionBody
 from hiero_sdk_python.hapi.services.schedulable_transaction_body_pb2 import (
@@ -29,7 +29,7 @@ class NodeCreateParams:
         service_endpoints (list[Endpoint]): The service endpoints of the node.
         gossip_ca_certificate (bytes, optional): The gossip ca certificate of the node.
         grpc_certificate_hash (bytes, optional): The grpc certificate hash of the node.
-        admin_key (PublicKey, optional): The admin key of the node.
+        admin_key (Key, optional): The admin key of the node.
         decline_reward (bool, optional): The decline reward of the node.
         grpc_web_proxy_endpoint (Endpoint, optional): The grpc web proxy endpoint of the node.
     """
@@ -40,7 +40,7 @@ class NodeCreateParams:
     service_endpoints: list[Endpoint] = field(default_factory=list)
     gossip_ca_certificate: bytes | None = None
     grpc_certificate_hash: bytes | None = None
-    admin_key: PublicKey | None = None
+    admin_key: Key | None = None
     decline_reward: bool | None = None
     grpc_web_proxy_endpoint: Endpoint | None = None
     associated_registered_nodes: list[int] = field(default_factory=list)
@@ -73,7 +73,7 @@ def __init__(self, node_create_params: NodeCreateParams | None = None):
         self.service_endpoints: list[Endpoint] = node_create_params.service_endpoints
         self.gossip_ca_certificate: bytes | None = node_create_params.gossip_ca_certificate
         self.grpc_certificate_hash: bytes | None = node_create_params.grpc_certificate_hash
-        self.admin_key: PublicKey | None = node_create_params.admin_key
+        self.admin_key: Key | None = node_create_params.admin_key
         self.decline_reward: bool | None = node_create_params.decline_reward
         self.grpc_web_proxy_endpoint: Endpoint | None = node_create_params.grpc_web_proxy_endpoint
         self.associated_registered_nodes: list[int] = node_create_params.associated_registered_nodes
@@ -168,12 +168,12 @@ def set_grpc_certificate_hash(self, grpc_certificate_hash: bytes | None) -> Node
         self.grpc_certificate_hash = grpc_certificate_hash
         return self
 
-    def set_admin_key(self, admin_key: PublicKey | None) -> NodeCreateTransaction:
+    def set_admin_key(self, admin_key: Key | None) -> NodeCreateTransaction:
         """
         Sets the admin key for this node create transaction.
 
         Args:
-            admin_key (PublicKey):
+            admin_key (Key):
                 The admin key of the node.
 
         Returns:
@@ -255,7 +255,7 @@ def _build_proto_body(self) -> NodeCreateTransactionBody:
             service_endpoint=[endpoint._to_proto() for endpoint in self.service_endpoints or []],
             gossip_ca_certificate=self.gossip_ca_certificate,
             grpc_certificate_hash=self.grpc_certificate_hash,
-            admin_key=self.admin_key._to_proto() if self.admin_key else None,
+            admin_key=self.admin_key.to_proto_key() if self.admin_key else None,
             decline_reward=self.decline_reward,
             grpc_proxy_endpoint=(self.grpc_web_proxy_endpoint._to_proto() if self.grpc_web_proxy_endpoint else None),
             associated_registered_node=self.associated_registered_nodes,
@@ -317,7 +317,7 @@ def _from_protobuf(cls, transaction_body, body_bytes: bytes, sig_map):
             if pb.grpc_certificate_hash:
                 transaction.grpc_certificate_hash = pb.grpc_certificate_hash
             if pb.HasField("admin_key"):
-                transaction.admin_key = PublicKey._from_proto(pb.admin_key)
+                transaction.admin_key = Key.from_proto_key(pb.admin_key)
             if pb.decline_reward:
                 transaction.decline_reward = pb.decline_reward
             if pb.HasField("grpc_proxy_endpoint"):

src/hiero_sdk_python/nodes/node_update_transaction.py

@@ -10,7 +10,7 @@
 from hiero_sdk_python.account.account_id import AccountId
 from hiero_sdk_python.address_book.endpoint import Endpoint
 from hiero_sdk_python.channels import _Channel
-from hiero_sdk_python.crypto.public_key import PublicKey
+from hiero_sdk_python.crypto.key import Key
 from hiero_sdk_python.executable import _Method
 from hiero_sdk_python.hapi.services.node_update_pb2 import (
     AssociatedRegisteredNodeList,
@@ -36,7 +36,7 @@ class NodeUpdateParams:
         service_endpoints (list[Endpoint]): The service endpoints of the node.
         gossip_ca_certificate (bytes, None): The gossip ca certificate of the node.
         grpc_certificate_hash (bytes, None): The grpc certificate hash of the node.
-        admin_key (PublicKey, optional): The admin key of the node.
+        admin_key (Key, optional): The admin key of the node.
         decline_reward (bool, optional): The decline reward of the node.
         grpc_web_proxy_endpoint (Endpoint, optional): The grpc web proxy endpoint of the node.
     """
@@ -48,7 +48,7 @@ class NodeUpdateParams:
     service_endpoints: list[Endpoint] = field(default_factory=list)
     gossip_ca_certificate: bytes | None = None
     grpc_certificate_hash: bytes | None = None
-    admin_key: PublicKey | None = None
+    admin_key: Key | None = None
     decline_reward: bool | None = None
     grpc_web_proxy_endpoint: Endpoint | None = None
     associated_registered_nodes: list[int] | None = None
@@ -82,7 +82,7 @@ def __init__(self, node_update_params: NodeUpdateParams | None = None):
         self.service_endpoints: list[Endpoint] = node_update_params.service_endpoints
         self.gossip_ca_certificate: bytes | None = node_update_params.gossip_ca_certificate
         self.grpc_certificate_hash: bytes | None = node_update_params.grpc_certificate_hash
-        self.admin_key: PublicKey | None = node_update_params.admin_key
+        self.admin_key: Key | None = node_update_params.admin_key
         self.decline_reward: bool | None = node_update_params.decline_reward
         self.grpc_web_proxy_endpoint: Endpoint | None = node_update_params.grpc_web_proxy_endpoint
         self.associated_registered_nodes: list[int] | None = node_update_params.associated_registered_nodes
@@ -192,12 +192,12 @@ def set_grpc_certificate_hash(self, grpc_certificate_hash: bytes | None) -> Node
         self.grpc_certificate_hash = grpc_certificate_hash
         return self
 
-    def set_admin_key(self, admin_key: PublicKey | None) -> NodeUpdateTransaction:
+    def set_admin_key(self, admin_key: Key | None) -> NodeUpdateTransaction:
         """
         Sets the admin key for this node update transaction.
 
         Args:
-            admin_key (PublicKey):
+            admin_key (Key):
                 The admin key of the node.
 
         Returns:
@@ -306,7 +306,7 @@ def _build_proto_body(self) -> NodeUpdateTransactionBody:
             grpc_certificate_hash=(
                 BytesValue(value=self.grpc_certificate_hash) if self.grpc_certificate_hash is not None else None
             ),
-            admin_key=self._convert_to_proto(self.admin_key),
+            admin_key=self.admin_key.to_proto_key() if self.admin_key else None,
             decline_reward=(BoolValue(value=self.decline_reward) if self.decline_reward is not None else None),
             grpc_proxy_endpoint=self._convert_to_proto(self.grpc_web_proxy_endpoint),
         )
@@ -377,7 +377,7 @@ def _from_protobuf(cls, transaction_body, body_bytes: bytes, sig_map):
             if pb.HasField("grpc_certificate_hash"):
                 transaction.grpc_certificate_hash = pb.grpc_certificate_hash.value
             if pb.HasField("admin_key"):
-                transaction.admin_key = PublicKey._from_proto(pb.admin_key)
+                transaction.admin_key = Key.from_proto_key(pb.admin_key)
             if pb.HasField("decline_reward"):
                 transaction.decline_reward = pb.decline_reward.value
             if pb.HasField("grpc_proxy_endpoint"):

tests/unit/node_create_transaction_test.py

@@ -14,6 +14,7 @@
 from hiero_sdk_python.hapi.services.schedulable_transaction_body_pb2 import (
     SchedulableTransactionBody,
 )
+from hiero_sdk_python.hapi.services.transaction_pb2 import TransactionBody
 from hiero_sdk_python.nodes.node_create_transaction import (
     NodeCreateParams,
     NodeCreateTransaction,
@@ -330,3 +331,36 @@ def test_to_proto(mock_client):
 
     assert proto.signedTransactionBytes
     assert len(proto.signedTransactionBytes) > 0
+
+
+def test_node_create_transaction_build_with_private_key():
+    """NodeCreateTransaction should accept PrivateKey and serialize the PublicKey in the proto."""
+    private_key = PrivateKey.generate()
+    public_key = private_key.public_key()
+
+    tx = NodeCreateTransaction().set_admin_key(private_key)
+
+    body = tx._build_proto_body()
+
+    # In the proto we should have the public key not the private one
+    assert body.admin_key.ed25519 == public_key.to_bytes_raw()
+
+
+def test_node_create_transaction_from_protobuf_with_admin_key():
+    """NodeCreateTransaction should deserialize the admin_key from the proto correctly."""
+    private_key = PrivateKey.generate()
+
+    transaction = NodeCreateTransaction().set_admin_key(private_key)
+    body = transaction._build_proto_body()
+
+    transaction_body = TransactionBody()
+    transaction_body.nodeCreate.CopyFrom(body)
+
+    parsed_transaction = NodeCreateTransaction._from_protobuf(
+        transaction_body,
+        b"",
+        None,
+    )
+
+    assert parsed_transaction.admin_key is not None
+    assert parsed_transaction.admin_key.to_proto_key() == body.admin_key