Replace custom dev. version of mospy-wallet with the off. one from pypi. Delegate wait_transaction to wait_for_tx (from mospy). Rewritten utils.search_attribute after mospy update.

Author: Tkd-Alex

pyproject.toml

@@ -25,7 +25,7 @@ dependencies = [
     "sentinel-protobuf==0.3.3",
     "grpcio>=1.51.1",
     "bip-utils==2.9.0",
-    "mospy-wallet @ git+https://github.com/Tkd-Alex/mospy.git@development",
+    "mospy-wallet==0.5.4",
     "pywgkey"
 ]
 

src/sentinel_sdk/transactor/transactor.py

@@ -70,21 +70,16 @@ def transaction(
         # tx_response = {"hash": hash, "code": code, "log": log}
         return tx_response
 
-    def wait_transaction(
-        self, tx_hash: str, timeout: float = 120, pool_period: float = 10
-    ):
+    def wait_for_tx(self, tx_hash: str, timeout: float = 120, poll_period: float = 10):
         if self._account is None or self._client is None:
             raise ValueError("Transactor was not initialized due missing secret, unable to wait transaction")
 
-        start = time.time()
-        while 1:
-            try:
-                return self._client.get_tx(tx_hash)
-            except grpc.RpcError as rpc_error:
-                # https://github.com/grpc/grpc/tree/master/examples/python/errors
-                # Instance of 'RpcError' has no 'code' member, work on runtime
-                status_code = rpc_error.code()  # pylint: disable=no-member
-                if status_code == grpc.StatusCode.NOT_FOUND:
-                    if time.time() - start > timeout:
-                        return None
-                    time.sleep(pool_period)
+        return self._client.wait_for_tx(
+            tx_hash=tx_hash,
+            timeout=timeout,
+            poll_period=poll_period
+        )
+
+    # back-compatibility
+    def wait_transaction(self, tx_hash: str, timeout: float = 120, poll_period: float = 10):
+        return self.wait_for_tx(tx_hash=tx_hash, timeout=timeout, poll_period=poll_period)

src/sentinel_sdk/utils.py

@@ -1,11 +1,14 @@
 import json
-from typing import Any
+import base64
 
 # TODO: we want to move this method (?)
-def search_attribute(tx_response: Any, event_type: str, attribute_key: str) -> Any:
-    for event in (tx_response.tx_response or tx_response).events:
-        if event.type == event_type:
-            for attribute in event.attributes:
-                if attribute.key == attribute_key.encode():
-                    return json.loads(attribute.value)
+# In the latest version of mospy the response was converted as dict
+# from google.protobuf.json_format import MessageToDict
+# https://github.com/ctrl-Felix/mospy/blob/ea07705b6ec4c76cc355b7dc933fae7c09fd8429/src/mospy/clients/GRPCClient.py#L155
+def search_attribute(tx_response: dict, event_type: str, attribute_key: str) -> dict:
+    for event in tx_response.get("txResponse", tx_response).get("events", []):
+        if event["type"] == event_type:
+            for attribute in event["attributes"]:
+                if base64.b64decode(attribute["key"]) == attribute_key.encode():
+                    return json.loads(base64.b64decode(attribute["value"]).decode("utf-8"))
     return None

test/connect.sdk.py

@@ -11,20 +11,19 @@
 # GRPC_VERBOSITY=debug GRPC_TRACE=tcp,http python test/queryall.py
 
 # NEVER SHARE YOUR SECRET!
-secret = "abdc efgh 1234 5678"
+secret = input("your secret: ")
 
 sdk = SDKInstance(grpcaddr="grpc.sentinel.co", grpcport=9090, secret=secret)
 
 # The address can be founded in every modules because is inherited
 # For example: sdk.sessions._account.address
 print(sdk.nodes._account.address)
 
-node_address = "sentnode1234abcd"
+node_address = input("give a node address: ")
 node = sdk.nodes.QueryNode(node_address)
 node_status = json.loads(sdk.nodes.QueryNodeStatus(node))
 assert node.address == node_address == node_status["result"]["address"]
 
-
 try:
     # tx = sdk.transactor.subscribe_to_gigabytes(node_address=node_address, gigabytes=1)
     tx = sdk.nodes.SubscribeToNode(
@@ -40,9 +39,10 @@
     print(rpc_error.details())  # pylint: disable=no-member
     print(rpc_error.debug_error_string())  # pylint: disable=no-member
 
-# The wait_transaction can be founded in every modules because is inherited
-# For example: tx_response = sdk.sessions.wait_transaction(tx["hash"])
-tx_response = sdk.nodes.wait_transaction(tx["hash"])
+# The wait_for_tx can be founded in every modules because is inherited
+# For example: tx_response = sdk.sessions.wait_for_tx(tx["hash"])
+tx_response = sdk.nodes.wait_for_tx(tx["hash"])
+
 subscription_id = search_attribute(
     tx_response, "sentinel.node.v2.EventCreateSubscription", "id"
 )
@@ -81,7 +81,7 @@
 # TODO: Currently doesn't work, we should call self.__client.load_account_data, before each tx
 try:
     tx = sdk.transactor.transaction(messages, tx_params=TxParams())
-    tx_response = sdk.transactor.wait_transaction(tx["hash"])
+    tx_response = sdk.transactor.wait_for_tx(tx["hash"])
 except grpc.RpcError as rpc_error:
     # TODO: this should be handled on skd side
     print(rpc_error.code())  # pylint: disable=no-member
@@ -92,10 +92,10 @@
 for session in sessions:
     if session.status == Status.ACTIVE.value:
         tx = sdk.sessions.EndSession(session_id=session.id, rating=0)
-        print(sdk.sessions.wait_transaction(tx["hash"]))
+        print(sdk.sessions.wait_for_tx(tx["hash"]))
 
 tx = sdk.sessions.StartSession(subscription_id=int(subscription_id), address=node_address)
-tx_response = sdk.sessions.wait_transaction(tx["hash"])
+tx_response = sdk.sessions.wait_for_tx(tx["hash"])
 
 session_id = search_attribute(
     tx_response, "sentinel.session.v2.EventStart", "id"