Update utils module. Remove base64. Add OrderedDict parsing.

Author: freQniK

src/sentinel_sdk/modules/lease.py

@@ -5,10 +5,12 @@
 import sentinel_protobuf.sentinel.lease.v1.querier_pb2_grpc as sentinel_subscription_v2_querier_pb2_grpc
 import sentinel_protobuf.sentinel.subscription.v2.subscription_pb2 as subscription_pb2
 import sentinel_protobuf.sentinel.lease.v1.msg_pb2 as msg_pb2
+from sentinel_protobuf.sentinel.types.v1.price_pb2 import Price
+from sentinel_protobuf.sentinel.types.v1.renewal_pb2 import RenewalPricePolicy
 
 from sentinel_sdk.querier.querier import Querier
 from sentinel_sdk.transactor.transactor import Transactor
-from sentinel_sdk.types import PageRequest, TxParams, Price, RenewalPricePolicy
+from sentinel_sdk.types import PageRequest, TxParams
 
 class LeaseModule(Querier, Transactor):
     def __init__(self, channel: grpc.Channel, account, provider_account, client):
@@ -21,25 +23,25 @@ def __init__(self, channel: grpc.Channel, account, provider_account, client):
 
     def EndLease(self, subscription_id: int, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgEndLeaseRequest(
-            frm = self._account.address,
+            frm = self._provider_account.address,
             id = subscription_id,
         )
 
         return self.transaction([msg], tx_params)
 
-    def RenewLease(self, subscription_id: int, hours: int, max_price: Price = Price(), tx_params: TxParams = TxParams()):
+    def RenewLease(self, subscription_id: int, hours: int, max_price: Price = Price, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgRenewLeaseRequest(
-            frm = self._account.address,
+            frm = self._provider_account.address,
             id = subscription_id,
             hours = hours,
             max_price = max_price,
         )
 
         return self.transaction([msg], tx_params)
 
-    def StartLease(self, node: str, hours: int, max_price: Price = Price(), renewal: int = RenewalPricePolicy.RENEWAL_PRICE_POLICY_IF_LESSER_OR_EQUAL, tx_params: TxParams = TxParams()):
+    def StartLease(self, node: str, hours: int, max_price: Price, renewal: int = RenewalPricePolicy.RENEWAL_PRICE_POLICY_IF_LESSER_OR_EQUAL, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgStartLeaseRequest(
-            frm = self._account.address,
+            frm = self._provider_account.address,
             node_address = node,
             hours = hours,
             max_price = max_price,
@@ -50,7 +52,7 @@ def StartLease(self, node: str, hours: int, max_price: Price = Price(), renewal:
 
     def UpdateLease(self, subscription_id: int, renewal: int = RenewalPricePolicy.RENEWAL_PRICE_POLICY_IF_LESSER_OR_EQUAL, tx_params: TxParams = TxParams()):
         msg = msg_pb2.MsgUpdateLeaseRequest(
-            frm = self._account.address,
+            frm = self._provider_account.address,
             id = subscription_id,
             renewal_price_policy = renewal,
         )

src/sentinel_sdk/modules/node.py

@@ -15,10 +15,11 @@
 import sentinel_protobuf.sentinel.node.v3.querier_pb2_grpc as sentinel_node_v3_querier_pb2_grpc
 import sentinel_protobuf.sentinel.node.v2.msg_pb2 as msg_pb2
 import sentinel_protobuf.sentinel.node.v3.msg_pb2 as msg_pb2_3
+from sentinel_protobuf.sentinel.types.v1.price_pb2 import Price
 
 from sentinel_sdk.querier.querier import Querier
 from sentinel_sdk.transactor.transactor import Transactor
-from sentinel_sdk.types import PageRequest, TxParams, NodeType, Price
+from sentinel_sdk.types import PageRequest, TxParams, NodeType
 
 from .wireguard import WgKey
 
@@ -165,7 +166,7 @@ def SubscribeToNode(self, node_address: str, gigabytes: int = 0, hours: int = 0,
         return self.transaction([msg], tx_params)
     '''
 
-    def SubscribeToNode(self, node_address: str, gigabytes: int = 0, hours: int = 0, price: Price = Price(), tx_params: TxParams = TxParams()):
+    def SubscribeToNode(self, node_address: str, price: Price, gigabytes: int = 0, hours: int = 0, tx_params: TxParams = TxParams()):
         msg = msg_pb2_3.MsgStartSessionRequest(
             frm = self._account.address,
             gigabytes = gigabytes,

src/sentinel_sdk/modules/subscription.py

@@ -6,10 +6,11 @@
 import sentinel_protobuf.sentinel.subscription.v2.subscription_pb2 as subscription_pb2
 import sentinel_protobuf.sentinel.subscription.v2.msg_pb2 as msg_pb2
 import sentinel_protobuf.sentinel.subscription.v3.msg_pb2 as msg_pb2_3
+from sentinel_protobuf.sentinel.types.v1.renewal_pb2 import RenewalPricePolicy
 
 from sentinel_sdk.querier.querier import Querier
 from sentinel_sdk.transactor.transactor import Transactor
-from sentinel_sdk.types import PageRequest, TxParams, RenewalPricePolicy
+from sentinel_sdk.types import PageRequest, TxParams
 
 
 class SubscriptionModule(Querier, Transactor):

src/sentinel_sdk/types.py

@@ -18,31 +18,14 @@ def __str__(self):
 class NodeType(Enum):
     WIREGUARD = 1
     V2RAY = 2
-    OPENVPN = 3
-
-class RenewalPricePolicy(Enum):
-    RENEWAL_PRICE_POLICY_UNSPECIFIED = 0
-    RENEWAL_PRICE_POLICY_IF_LESSER = 1
-    RENEWAL_PRICE_POLICY_IF_LESSER_OR_EQUAL = 2
-    RENEWAL_PRICE_POLICY_IF_EQUAL = 3
-    RENEWAL_PRICE_POLICY_IF_NOT_EQUAL = 4
-    RENEWAL_PRICE_POLICY_IF_GREATER = 5
-    RENEWAL_PRICE_POLICY_IF_GREATER_OR_EQUAL = 6
-    RENEWAL_PRICE_POLICY_ALWAYS = 7
+    OPENVPN = 3 
 
 @dataclass
 class TxParams:
     denom: str = "udvpn"
     fee_amount: int = 31415
     gas: float = 0
     gas_multiplier: float = 1.5
-    
-@dataclass
-class Price:
-    denom: str = "udvpn"
-    base_value: str = "0"
-    quote_value: str  = "0"
-
 
 class PageRequest:
     """

src/sentinel_sdk/utils.py

@@ -1,14 +1,20 @@
 import json
 import base64
+from collections import OrderedDict
 
 # TODO: we want to move this method (?)
 # 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:
+    tx_response = ordered_dict_to_dict(tx_response)
     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"))
+                if attribute["key"] == attribute_key:
+                    return json.loads(attribute["value"])
     return None
+    
+
+def ordered_dict_to_dict(od):
+    return {k: (ordered_dict_to_dict(v) if isinstance(v, OrderedDict) else v) for k, v in od.items()}