Merge pull request #8 from novifinancial/fallentree

Release 0.5.2020081401

Author: Yucong Sun

libra

@@ -38,15 +38,27 @@ def run(self):
 
 extra_link_args = []
 if platform.system() == "Darwin":
-    LIBRA_LIB_FILE = "%s/%s-%s.a" % (LIBRA_LIB_DIR, "liblibra_dev", "darwin-%s" % platform.machine(),)
+    LIBRA_LIB_FILE = "%s/%s-%s.a" % (
+        LIBRA_LIB_DIR,
+        "liblibra_dev",
+        "darwin-%s" % platform.machine(),
+    )
     extra_link_args.extend(["-framework", "Security"])
 elif platform.system() == "Linux":
-    LIBRA_LIB_FILE = "%s/%s-%s.a" % (LIBRA_LIB_DIR, "liblibra_dev", "linux-%s" % platform.machine(),)
+    LIBRA_LIB_FILE = "%s/%s-%s.a" % (
+        LIBRA_LIB_DIR,
+        "liblibra_dev",
+        "linux-%s" % platform.machine(),
+    )
     extra_link_args.append("-ldl")
     extra_link_args.append("-lm")
     extra_link_args.append("-pthread")
 elif platform.system() == "Windows":
-    LIBRA_LIB_FILE = "%s/%s-%s.a" % (LIBRA_LIB_DIR, "liblibra_dev", "windows-%s" % platform.machine(),)
+    LIBRA_LIB_FILE = "%s/%s-%s.a" % (
+        LIBRA_LIB_DIR,
+        "liblibra_dev",
+        "windows-%s" % platform.machine(),
+    )
 
 
 exts = [

python/lib/liblibra_dev-darwin-x86_64.a

@@ -10,7 +10,7 @@
 NETWORK_DEFAULT: str = NETWORK_TESTNET
 
 ENDPOINT_CONFIG: typing.Dict[str, typing.Dict[str, str]] = {
-    NETWORK_TESTNET: {"json-rpc": "https://client.testnet.libra.org/", "faucet": "http://faucet.testnet.libra.org"},
+    NETWORK_TESTNET: {"json-rpc": "https://testnet.libra.org/v1", "faucet": "http://testnet.libra.org/mint"},
     NETWORK_DEV: {
         "json-rpc": "http://client.dev.aws.hlw3truzy4ls.com/",
         "faucet": "http://faucet.dev.aws.hlw3truzy4ls.com",

python/lib/liblibra_dev-linux-x86_64.a

@@ -50,6 +50,7 @@ class GetAccountStateResp:
 
 @dataclasses.dataclass
 class GetMetadataResp:
+    chain_id: int
     version: int
     timestamp: int
 
@@ -182,10 +183,10 @@ def __init__(self, address_hex: str, state: GetAccountStateResp):
             self._role = typing.cast(str, self._state.role)
         else:
             role_dict = typing.cast(typing.Dict, self._state.role)
-            if "parent_vasp" in self._state.role:
-                self._role = ParentVASP(**(role_dict["parent_vasp"]))
-            elif "child_vasp" in self._state.role:
-                self._role = ChildVASP(**(role_dict["child_vasp"]))
+            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:
@@ -443,19 +444,34 @@ def __del__(self):
 
     def currentVersion(self) -> int:
         result = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_metadata", ["NULL"], GetMetadataResp,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_metadata",
+            ["NULL"],
+            GetMetadataResp,
         )
         return result.version
 
     def currentTimestampUsecs(self) -> int:
         result = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_metadata", ["NULL"], GetMetadataResp,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_metadata",
+            ["NULL"],
+            GetMetadataResp,
         )
         return result.timestamp
 
     def getAccount(self, address_hex: str) -> typing.Optional[AccountResource]:
         resp = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_account", [address_hex], GetAccountStateResp,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_account",
+            [address_hex],
+            GetAccountStateResp,
         )
         if resp is None:
             return None
@@ -466,7 +482,12 @@ def getAccount(self, address_hex: str) -> typing.Optional[AccountResource]:
 
     def sendTransaction(self, signed_transaction_bytes: bytes) -> None:
         resp = make_json_rpc_request(
-            self._url, self._session, self._timeout, "submit", [signed_transaction_bytes.hex()], SubmitResp,
+            self._url,
+            self._session,
+            self._timeout,
+            "submit",
+            [signed_transaction_bytes.hex()],
+            SubmitResp,
         )
         if resp is None:
             return None
@@ -479,7 +500,12 @@ def transactions_by_range(
         self, start_version: int, limit: int, include_events: bool = False
     ) -> typing.List[typing.Tuple[SignedTransaction, EventsType]]:
         resp_dict = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_transactions", [start_version, limit, include_events], None,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_transactions",
+            [start_version, limit, include_events],
+            None,
         )
 
         results = []
@@ -497,7 +523,12 @@ def transaction_by_acc_seq(
         self, addr_hex: str, seq: int, include_events: bool = False
     ) -> typing.Tuple[typing.Optional[SignedTransaction], EventsType]:
         resp_dict = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_account_transaction", [addr_hex, seq, include_events], None,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_account_transaction",
+            [addr_hex, seq, include_events],
+            None,
         )
 
         if resp_dict is None:
@@ -513,7 +544,12 @@ def transaction_by_acc_seq(
 
     def get_events(self, key_hex: str, start: int, limit: int) -> EventsType:
         resp_list = make_json_rpc_request(
-            self._url, self._session, self._timeout, "get_events", [key_hex, start, limit], None,
+            self._url,
+            self._session,
+            self._timeout,
+            "get_events",
+            [key_hex, start, limit],
+            None,
         )
         return as_events(resp_list)
 

python/lib/liblibra_dev-windows-x86_64.a

@@ -55,9 +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/setup.py

@@ -9,6 +9,7 @@
 
 @dataclasses.dataclass
 class ParentVASP:
+    type: str
     base_url: str
     compliance_key: bytes
     expiration_time: int
@@ -18,6 +19,7 @@ class ParentVASP:
 
 @dataclasses.dataclass
 class ChildVASP:
+    type: str
     parent_vasp_address: bytes
 
 

python/src/pylibra/_config.py

@@ -105,19 +105,46 @@ def not_implemented():
 }
 
 primitive_decode_map = {
-    st.bool: lambda content: (st.bool(int.from_bytes(content[:1], byteorder="little", signed=False)), content[1:],),
-    st.uint8: lambda content: (st.uint8(int.from_bytes(content[:1], byteorder="little", signed=False)), content[1:],),
-    st.uint16: lambda content: (st.uint16(int.from_bytes(content[:2], byteorder="little", signed=False)), content[2:],),
-    st.uint32: lambda content: (st.uint32(int.from_bytes(content[:4], byteorder="little", signed=False)), content[4:],),
-    st.uint64: lambda content: (st.uint64(int.from_bytes(content[:8], byteorder="little", signed=False)), content[8:],),
+    st.bool: lambda content: (
+        st.bool(int.from_bytes(content[:1], byteorder="little", signed=False)),
+        content[1:],
+    ),
+    st.uint8: lambda content: (
+        st.uint8(int.from_bytes(content[:1], byteorder="little", signed=False)),
+        content[1:],
+    ),
+    st.uint16: lambda content: (
+        st.uint16(int.from_bytes(content[:2], byteorder="little", signed=False)),
+        content[2:],
+    ),
+    st.uint32: lambda content: (
+        st.uint32(int.from_bytes(content[:4], byteorder="little", signed=False)),
+        content[4:],
+    ),
+    st.uint64: lambda content: (
+        st.uint64(int.from_bytes(content[:8], byteorder="little", signed=False)),
+        content[8:],
+    ),
     st.uint128: lambda content: (
         st.uint128(int.from_bytes(content[:16], byteorder="little", signed=False)),
         content[16:],
     ),
-    st.int8: lambda content: (st.int8(int.from_bytes(content[:1], byteorder="little", signed=True)), content[1:],),
-    st.int16: lambda content: (st.int16(int.from_bytes(content[:2], byteorder="little", signed=True)), content[2:],),
-    st.int32: lambda content: (st.int32(int.from_bytes(content[:4], byteorder="little", signed=True)), content[4:],),
-    st.int64: lambda content: (st.int64(int.from_bytes(content[:8], byteorder="little", signed=True)), content[8:],),
+    st.int8: lambda content: (
+        st.int8(int.from_bytes(content[:1], byteorder="little", signed=True)),
+        content[1:],
+    ),
+    st.int16: lambda content: (
+        st.int16(int.from_bytes(content[:2], byteorder="little", signed=True)),
+        content[2:],
+    ),
+    st.int32: lambda content: (
+        st.int32(int.from_bytes(content[:4], byteorder="little", signed=True)),
+        content[4:],
+    ),
+    st.int64: lambda content: (
+        st.int64(int.from_bytes(content[:8], byteorder="little", signed=True)),
+        content[8:],
+    ),
     st.int128: lambda content: (
         st.int128(int.from_bytes(content[:16], byteorder="little", signed=True)),
         content[16:],