fbshipit-source-id: 9e91a7723a1581a202cd5f8c3e82d454ee482062

Author: fallentree

.gitignore

@@ -10,4 +10,3 @@ cmake-build-*
 # .gitignore file locally for IDE/Emacs/Vim generated files.
 **/target
 **/*.rs.bk
-

python/lib/data.h

@@ -1,10 +1,10 @@
 # Copyright (c) The Libra Core Contributors
 # SPDX-License-Identifier: Apache-2.0
 
-import sys
 import platform
+import sys
 
-from setuptools import setup, Extension, Command, find_packages
+from setuptools import Command, Extension, find_packages, setup
 
 
 class VendorCommand(Command):
@@ -29,7 +29,9 @@ def run(self):
 
 
 # Require pytest-runner only when running tests
-pytest_runner = ["pytest-runner"] if any(arg in sys.argv for arg in ("pytest", "test")) else []
+pytest_runner = (
+    ["pytest-runner"] if any(arg in sys.argv for arg in ("pytest", "test")) else []
+)
 grpcio_tools = ["grpcio-tools"] if any(arg in sys.argv for arg in ["vendor"]) else []
 
 LIBRA_INCLUDE_DIR = "lib"
@@ -38,15 +40,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 = [
@@ -57,7 +71,7 @@ def run(self):
         extra_objects=[LIBRA_LIB_FILE],
         depends=["src/pylibra/capi.pxd", LIBRA_HEADER, LIBRA_LIB_FILE],
         extra_link_args=extra_link_args,
-    ),
+    )
 ]
 
 

python/setup.py

@@ -3,13 +3,12 @@
 
 # pyre-strict
 
-# Must be at the top
 from ._config import *
-
+from ._jsonrpc_transport import *
 from ._mint import *
-from ._types import *
 from ._native import *
-from ._jsonrpc_transport import *
+from ._types import *
+
 
 __all__ = [
     # Constants

python/src/pylibra/__init__.py

@@ -4,13 +4,17 @@
 # pyre-strict
 import typing
 
+
 NETWORK_TESTNET: str = "testnet"
 NETWORK_DEV: str = "dev"
 
 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://client.testnet.libra.org/",
+        "faucet": "http://faucet.testnet.libra.org",
+    },
     NETWORK_DEV: {
         "json-rpc": "http://client.dev.aws.hlw3truzy4ls.com/",
         "faucet": "http://faucet.dev.aws.hlw3truzy4ls.com",

python/src/pylibra/_config.py

@@ -2,24 +2,32 @@
 # SPDX-License-Identifier: Apache-2.0
 
 import dataclasses
-import requests
 import typing
 
-from ._config import NETWORK_DEFAULT, ENDPOINT_CONFIG, DEFAULT_CONNECT_TIMEOUT_SECS, DEFAULT_TIMEOUT_SECS
+import requests
+
+from ._config import (
+    DEFAULT_CONNECT_TIMEOUT_SECS,
+    DEFAULT_TIMEOUT_SECS,
+    ENDPOINT_CONFIG,
+    NETWORK_DEFAULT,
+)
+from ._transport import BaseLibraNetwork, ClientError, SubmitTransactionError
 from ._types import (
-    SignedTransaction,
-    Event,
-    PaymentEvent,
-    ToLBRExchangeRateUpdateEvent,
     AccountResource,
+    ChildVASP,
     CurrencyInfo,
+    Event,
     ParentVASP,
-    ChildVASP,
+    PaymentEvent,
+    SignedTransaction,
+    ToLBRExchangeRateUpdateEvent,
 )
-from ._transport import BaseLibraNetwork, ClientError, SubmitTransactionError
 
 
-EventsType = typing.List[typing.Union[Event, PaymentEvent, ToLBRExchangeRateUpdateEvent]]
+EventsType = typing.List[
+    typing.Union[Event, PaymentEvent, ToLBRExchangeRateUpdateEvent]
+]
 
 
 @dataclasses.dataclass
@@ -150,7 +158,11 @@ def gas(self) -> int:
 
     @property
     def metadata(self) -> bytes:
-        return bytes.fromhex(self._transaction["script"]["metadata"]) if self.is_p2p else b""
+        return (
+            bytes.fromhex(self._transaction["script"]["metadata"])
+            if self.is_p2p
+            else b""
+        )
 
     @property
     def vm_status(self) -> int:
@@ -364,14 +376,11 @@ def make_json_rpc_request(
     timeout: typing.Tuple[float, float],
     method: str,
     params: typing.List[typing.Any],
-    result_class: typing.Optional[typing.Type[typing.Union[GetAccountStateResp, GetMetadataResp, SubmitResp]]],
+    result_class: typing.Optional[
+        typing.Type[typing.Union[GetAccountStateResp, GetMetadataResp, SubmitResp]]
+    ],
 ):
-    req = {
-        "jsonrpc": "2.0",
-        "id": 1,
-        "method": method,
-        "params": params,
-    }
+    req = {"jsonrpc": "2.0", "id": 1, "method": method, "params": params}
 
     try:
         resp = session.post(url, json=req, timeout=timeout)
@@ -402,7 +411,10 @@ def as_events(resp_list: typing.List[typing.Dict], include: bool = True) -> Even
 
     if include and resp_list:
         for e_dict in resp_list:
-            if e_dict["data"]["type"] == "sentpayment" or e_dict["data"]["type"] == "receivedpayment":
+            if (
+                e_dict["data"]["type"] == "sentpayment"
+                or e_dict["data"]["type"] == "receivedpayment"
+            ):
                 events.append(JSONPaymentEvent(e_dict))
             elif e_dict["data"]["type"] == "to_lbr_exchange_rate_update":
                 events.append(JSONToLBRExchangeRateUpdateEvent(e_dict))
@@ -442,19 +454,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
@@ -465,7 +492,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
@@ -478,7 +510,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 = []
@@ -496,7 +533,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:
@@ -512,11 +554,18 @@ 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)
 
     def get_currencies(self) -> typing.List[CurrencyInfo]:
-        resp_list = make_json_rpc_request(self._url, self._session, self._timeout, "get_currencies", [], None)
+        resp_list = make_json_rpc_request(
+            self._url, self._session, self._timeout, "get_currencies", [], None
+        )
         res = [CurrencyInfo(**x) for x in resp_list]
         return res

python/src/pylibra/_jsonrpc_transport.py

@@ -3,11 +3,17 @@
 
 # pyre-strict
 
-import requests
 import typing
+
+import requests
 from requests.exceptions import RequestException
 
-from ._config import NETWORK_DEFAULT, ENDPOINT_CONFIG, DEFAULT_CONNECT_TIMEOUT_SECS, DEFAULT_TIMEOUT_SECS
+from ._config import (
+    DEFAULT_CONNECT_TIMEOUT_SECS,
+    DEFAULT_TIMEOUT_SECS,
+    ENDPOINT_CONFIG,
+    NETWORK_DEFAULT,
+)
 
 
 class FaucetError(Exception):
@@ -26,7 +32,9 @@ def mint(
         amount: int,
         identifier: str = "LBR",
         session: typing.Optional[requests.Session] = None,
-        timeout: typing.Optional[typing.Union[float, typing.Tuple[float, float]]] = None,
+        timeout: typing.Optional[
+            typing.Union[float, typing.Tuple[float, float]]
+        ] = None,
     ) -> int:
         """Request faucet to send libra to destination address."""
         if len(authkey_hex) != 64:
@@ -39,8 +47,14 @@ def mint(
         try:
             r = _session.post(
                 self._baseurl,
-                params={"amount": amount, "auth_key": authkey_hex, "currency_code": identifier},
-                timeout=timeout if timeout else (DEFAULT_CONNECT_TIMEOUT_SECS, DEFAULT_TIMEOUT_SECS),
+                params={
+                    "amount": amount,
+                    "auth_key": authkey_hex,
+                    "currency_code": identifier,
+                },
+                timeout=timeout
+                if timeout
+                else (DEFAULT_CONNECT_TIMEOUT_SECS, DEFAULT_TIMEOUT_SECS),
             )
             r.raise_for_status()
             if r.text:

python/src/pylibra/_mint.py

@@ -3,9 +3,10 @@
 
 # pyre-strict
 
-from ._types import SignedTransaction, AccountKey
 import typing
 
+from ._types import AccountKey, SignedTransaction
+
 class TransactionUtils:
     @staticmethod
     def createSignedP2PTransaction(

python/src/pylibra/_native.pyi

@@ -3,12 +3,18 @@
 
 # pyre-strict
 
+import dataclasses
 import typing
 from abc import ABC
-import dataclasses
 
-from . import NETWORK_DEFAULT
-from . import AccountResource, SignedTransaction, Event, PaymentEvent, CurrencyInfo
+from . import (
+    NETWORK_DEFAULT,
+    AccountResource,
+    CurrencyInfo,
+    Event,
+    PaymentEvent,
+    SignedTransaction,
+)
 
 
 @dataclasses.dataclass
@@ -44,15 +50,22 @@ def sendTransaction(self, signed_transaction_bytes: bytes) -> None:
 
     def transactions_by_range(
         self, start_version: int, limit: int, include_events: bool = False
-    ) -> typing.List[typing.Tuple[SignedTransaction, typing.List[typing.Union[Event, PaymentEvent]]]]:
+    ) -> typing.List[
+        typing.Tuple[SignedTransaction, typing.List[typing.Union[Event, PaymentEvent]]]
+    ]:
         raise NotImplementedError()
 
     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]]:
+    def get_events(
+        self, key_hex: str, start: int, limit: int
+    ) -> typing.List[typing.Union[Event, PaymentEvent]]:
         raise NotImplementedError()
 
     def get_currencies(self) -> typing.List[CurrencyInfo]: