Merge pull request #9 from novifinancial/fix

upgrade to latest testnet, fix account role missing fields

Author: Xiao Li

libra

@@ -8,7 +8,7 @@ LIBRA=../libra
 
 # Add transaction builders
 (cd "$LIBRA" && cargo build -p transaction-builder-generator)
-"$LIBRA/target/debug/transaction-builder-generator"\
+"$LIBRA/target/debug/generate-transaction-builders"\
     --language python3\
     --module-name stdlib\
     --with-libra-types "$LIBRA/testsuite/generate-format/tests/staged/libra.yaml"\

python/codegen.sh

@@ -76,7 +76,7 @@ def run(self):
 setup(
     name="pylibra-beta",
     # change to 0.1.YYYYMMDDNN on release
-    version="0.5.master",
+    version="0.5.2020091001",
     description="",
     python_requires=">=3.7",
     packages=find_packages("src"),

python/setup.py

@@ -44,7 +44,7 @@ class GetAccountStateResp:
     balances: typing.List[typing.Dict]
     sent_events_key: str
     received_events_key: str
-    role: typing.Union[str, typing.Dict]
+    role: typing.Dict[str, typing.Any]
     is_frozen: bool
 
 
@@ -160,7 +160,7 @@ def metadata(self) -> bytes:
         return bytes.fromhex(self._transaction["script"]["metadata"]) if self.is_p2p else b""
 
     @property
-    def vm_status(self) -> int:
+    def vm_status(self) -> typing.Dict[str, typing.Any]:
         return self._result["vm_status"]
 
 
@@ -178,15 +178,11 @@ def __init__(self, address_hex: str, state: GetAccountStateResp):
         for balance_dict in self._state.balances:
             self._balances[balance_dict["currency"]] = balance_dict["amount"]
 
-        if type(self._state.role) == str:
-            # For strings returned like "empty", "unknown"
-            self._role = typing.cast(str, self._state.role)
-        else:
-            role_dict = typing.cast(typing.Dict, self._state.role)
-            if self._state.role["type"] == "parent_vasp":
-                self._role = ParentVASP(**(role_dict))
-            elif self._state.role["type"] == "child_vasp":
-                self._role = ChildVASP(**(role_dict))
+        role_dict = typing.cast(typing.Dict, self._state.role)
+        if self._state.role["type"] == "parent_vasp":
+            self._role = ParentVASP(**(role_dict))
+        elif self._state.role["type"] == "child_vasp":
+            self._role = ChildVASP(**(role_dict))
 
     @property
     def address(self) -> bytes:

python/src/pylibra/_jsonrpc_transport.py

@@ -55,7 +55,7 @@ def transactions_by_range(
 
     def transaction_by_acc_seq(
         self, addr_hex: str, seq: int, include_events: bool = False
-    ) -> typing.Tuple[typing.Optional[SignedTransaction], typing.List[typing.Union[Event, PaymentEvent]],]:
+    ) -> typing.Tuple[typing.Optional[SignedTransaction], typing.List[typing.Union[Event, PaymentEvent]]]:
         raise NotImplementedError()
 
     def get_events(self, key_hex: str, start: int, limit: int) -> typing.List[typing.Union[Event, PaymentEvent]]:

python/src/pylibra/_transport.py

@@ -15,6 +15,8 @@ class ParentVASP:
     expiration_time: int
     human_name: str
     num_children: int
+    base_url_rotation_events_key: str
+    compliance_key_rotation_events_key: str
 
 
 @dataclasses.dataclass
@@ -176,7 +178,7 @@ def metadata(self) -> bytes:
 
     @property
     @abstractmethod
-    def vm_status(self) -> int:
+    def vm_status(self) -> typing.Dict[str, typing.Any]:
         raise NotImplementedError()
 
 

python/src/pylibra/_types.py

@@ -209,6 +209,7 @@ def serialize(obj: typing.Any, obj_type) -> bytes:
             if not dataclasses.is_dataclass(obj_type):
                 raise ValueError("Unexpected type", obj_type)
 
+        # pyre-ignore
         if not isinstance(obj, obj_type):
             raise ValueError("Wrong Value for the type", obj, obj_type)