refactor: define HRP for crypto (#47)

Author: b00f

examples/example_jsonrpc_get_blockchain_info.py

@@ -4,9 +4,7 @@
 
 async def main() -> None:
     client_url = "https://testnet1.pactus.org/jsonrpc"
-    client = PactusOpenRPCClient(
-        headers={},
-        client_url=client_url)
+    client = PactusOpenRPCClient(headers={}, client_url=client_url, timeout=300)
 
     res = await client.pactus.blockchain.get_blockchain_info()
 

examples/example_jsonrpc_get_node_info.py

@@ -4,9 +4,7 @@
 
 async def main() -> None:
     client_url = "https://testnet1.pactus.org/jsonrpc"
-    client = PactusOpenRPCClient(
-        headers={},
-        client_url=client_url)
+    client = PactusOpenRPCClient(headers={}, client_url=client_url, timeout=300)
 
     res = await client.pactus.network.get_node_info()
 

examples/example_key_generation.py

@@ -1,6 +1,6 @@
 import argparse
 
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.crypto.address import AddressType
 from pactus.crypto.bls.private_key import PrivateKey as BLSPrivateKey
 from pactus.crypto.ed25519.private_key import PrivateKey as Ed25519PrivateKey
@@ -28,7 +28,7 @@ def main() -> None:
     args = parser.parse_args()
 
     if args.testnet:
-        CryptoConfig.use_testnet()
+        HRP.use_testnet()
 
     match AddressType(args.address_type):
         case AddressType.VALIDATOR:

examples/example_transfer_transaction_bls.py

@@ -1,12 +1,12 @@
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.crypto.address import Address
 from pactus.crypto.bls.private_key import PrivateKey
 from pactus.transaction.transaction import Transaction
 from pactus.amount import Amount
 
 
 def main() -> None:
-    CryptoConfig.use_testnet()
+    HRP.use_testnet()
 
     lock_time = 1_735_096
     memo = "This is a test transaction"

examples/example_transfer_transaction_ed25519.py

@@ -1,12 +1,12 @@
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.crypto.address import Address
 from pactus.crypto.ed25519.private_key import PrivateKey
 from pactus.transaction.transaction import Transaction
 from pactus.amount import Amount
 
 
 def main() -> None:
-    CryptoConfig.use_testnet()
+    HRP.use_testnet()
 
     lock_time = 1_735_096
     memo = "This is a test transaction"

pactus/crypto/__init__.py

@@ -1,3 +0,0 @@
-from .crypto import CryptoConfig
-
-__all__ = ["CryptoConfig"]

pactus/crypto/address.py

@@ -2,7 +2,7 @@
 
 from enum import Enum
 
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.utils import utils
 
 # Address format: hrp + `1` + type + data + checksum
@@ -34,7 +34,7 @@ def from_string(cls, text: str) -> Address:
             return bytes([0])
 
         hrp, typ, data = utils.decode_to_base256_with_type(text)
-        if hrp != CryptoConfig.ADDRESS_HRP:
+        if hrp != HRP.ADDRESS_HRP:
             msg = f"Invalid HRP: {hrp}"
             raise ValueError(msg)
 
@@ -57,7 +57,7 @@ def string(self) -> str:
             return TREASURY_ADDRESS_STRING
 
         return utils.encode_from_base256_with_type(
-            CryptoConfig.ADDRESS_HRP,
+            HRP.ADDRESS_HRP,
             self.data[0],
             self.data[1:],
         )

pactus/crypto/bls/private_key.py

@@ -3,7 +3,7 @@
 import secrets
 from math import ceil, log2
 
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.utils import utils
 
 from .bls12_381.bls_sig_g1 import sign
@@ -17,12 +17,12 @@
 
 
 class PrivateKey:
-    def __init__(self, scalar: any) -> None:
-        self.scalar = scalar
+    def __init__(self, scalar: int) -> None:
+        self.scalar = scalar % curve_order
 
     @classmethod
     def from_bytes(cls, buffer: bytes) -> PrivateKey:
-        return cls(int.from_bytes(buffer, "big") % curve_order)
+        return cls(int.from_bytes(buffer, "big"))
 
     @classmethod
     def key_gen(cls, ikm: bytes = [], key_info: bytes = b"") -> PrivateKey:
@@ -47,7 +47,7 @@ def random(cls) -> PrivateKey:
     def from_string(cls, text: str) -> PrivateKey:
         hrp, typ, data = utils.decode_to_base256_with_type(text)
 
-        if hrp != CryptoConfig.PRIVATE_KEY_HRP:
+        if hrp != HRP.PRIVATE_KEY_HRP:
             msg = f"Invalid hrp: {hrp}"
             raise ValueError(msg)
 
@@ -67,7 +67,7 @@ def raw_bytes(self) -> bytes:
 
     def string(self) -> str:
         return utils.encode_from_base256_with_type(
-            CryptoConfig.PRIVATE_KEY_HRP,
+            HRP.PRIVATE_KEY_HRP,
             SIGNATURE_TYPE_BLS,
             self.raw_bytes(),
         )

pactus/crypto/bls/public_key.py

@@ -4,8 +4,8 @@
 
 from ripemd.ripemd160 import ripemd160
 
-from pactus.crypto import CryptoConfig
 from pactus.crypto.address import Address, AddressType
+from pactus.crypto.hrp import HRP
 from pactus.utils import utils
 
 from .bls12_381.bls_sig_g1 import aggregate_pubs, verify
@@ -23,7 +23,7 @@ def __init__(self, point_g2: any) -> None:
     def from_string(cls, text: str) -> PublicKey:
         hrp, typ, data = utils.decode_to_base256_with_type(text)
 
-        if hrp != CryptoConfig.PUBLIC_KEY_HRP:
+        if hrp != HRP.PUBLIC_KEY_HRP:
             msg = f"Invalid hrp: {hrp}"
             raise ValueError(msg)
 
@@ -51,7 +51,7 @@ def raw_bytes(self) -> bytes:
 
     def string(self) -> str:
         return utils.encode_from_base256_with_type(
-            CryptoConfig.PUBLIC_KEY_HRP,
+            HRP.PUBLIC_KEY_HRP,
             SIGNATURE_TYPE_BLS,
             self.raw_bytes(),
         )

pactus/crypto/ed25519/private_key.py

@@ -2,7 +2,7 @@
 
 from cryptography.hazmat.primitives.asymmetric import ed25519
 
-from pactus.crypto import CryptoConfig
+from pactus.crypto.hrp import HRP
 from pactus.utils import utils
 
 from .public_key import PublicKey
@@ -29,7 +29,7 @@ def random(cls) -> PrivateKey:
     def from_string(cls, text: str) -> PrivateKey:
         hrp, typ, data = utils.decode_to_base256_with_type(text)
 
-        if hrp != CryptoConfig.PRIVATE_KEY_HRP:
+        if hrp != HRP.PRIVATE_KEY_HRP:
             msg = f"Invalid hrp: {hrp}"
             raise ValueError(msg)
 
@@ -49,7 +49,7 @@ def raw_bytes(self) -> bytes:
 
     def string(self) -> str:
         return utils.encode_from_base256_with_type(
-            CryptoConfig.PRIVATE_KEY_HRP,
+            HRP.PRIVATE_KEY_HRP,
             SIGNATURE_TYPE_ED25519,
             self.raw_bytes(),
         )