Address comments

Author: cffls

README.md

@@ -63,7 +63,7 @@ It has two implementations: one is pure Python and the other is C, which is inst
 
 For some users, the C implementation may not work properly when deserializing cbor data. For example, the order of inputs of a transaction isn't guaranteed to be the same as the order of inputs in the original transaction (details could be found in [this issue](https://github.com/Python-Cardano/pycardano/issues/311)). This would result in a different transaction hash when the transaction is serialized again.
 
-To solve this problem, a fork of cbor2 is created at [cbor2pure](https://github.com/cffls/cbor2pure). This fork removes C extension and only uses pure python for cbor decoding. By default, for correctness, pycardano uses cbor2pure in decoding. However, if speed is preferred over accuracy, users can set `CBOR_C_EXETENSION=1` in their environment, and the default C extension would be used instead.
+To solve this problem, a fork of cbor2 is created at [cbor2pure](https://github.com/cffls/cbor2pure). This fork removes C extension and only uses pure python for cbor decoding. By default, for correctness, pycardano uses cbor2pure in decoding. However, if speed is preferred over accuracy, users can set `CBOR_C_EXTENSION=1` in their environment, and the default C extension would be used instead.
 
 ```bash
 ensure_pure_cbor2.sh

pycardano/__init__.py

@@ -1,12 +1,5 @@
 # flake8: noqa
 
-import os
-
-if os.getenv("CBOR_C_EXETENSION", "0") == "1":
-    import cbor2
-else:
-    import cbor2pure as cbor2  # type: ignore[no-redef]
-
 from .address import *
 from .backend import *
 from .certificate import *

pycardano/address.py

@@ -17,7 +17,7 @@
 from cbor2 import CBORTag
 from typing_extensions import override
 
-from pycardano import cbor2
+from pycardano.cbor2 import cbor2
 from pycardano.crypto.bech32 import decode, encode
 from pycardano.exception import (
     DecodingException,

pycardano/backend/blockfrost.py

@@ -8,14 +8,14 @@
 from blockfrost import ApiError, ApiUrls, BlockFrostApi
 from blockfrost.utils import Namespace
 
-from pycardano import cbor2
 from pycardano.address import Address
 from pycardano.backend.base import (
     ALONZO_COINS_PER_UTXO_WORD,
     ChainContext,
     GenesisParameters,
     ProtocolParameters,
 )
+from pycardano.cbor2 import cbor2
 from pycardano.exception import TransactionFailedException
 from pycardano.hash import SCRIPT_HASH_SIZE, DatumHash, ScriptHash
 from pycardano.nativescript import NativeScript

pycardano/backend/cardano_cli.py

@@ -16,14 +16,14 @@
 from cachetools import Cache, LRUCache, TTLCache, func
 from docker.errors import APIError
 
-from pycardano import cbor2
 from pycardano.address import Address
 from pycardano.backend.base import (
     ALONZO_COINS_PER_UTXO_WORD,
     ChainContext,
     GenesisParameters,
     ProtocolParameters,
 )
+from pycardano.cbor2 import cbor2
 from pycardano.exception import (
     CardanoCliError,
     PyCardanoException,

pycardano/cbor2.py

@@ -0,0 +1,16 @@
+"""
+Conditional cbor2 import module.
+
+This module provides a centralized location for importing cbor2,
+with support for both the C extension (cbor2) and pure Python (cbor2pure) versions.
+Set the environment variable CBOR_C_EXTENSION=1 to use the C extension.
+"""
+
+import os
+
+if os.getenv("CBOR_C_EXTENSION", "0") == "1":
+    import cbor2
+else:
+    import cbor2pure as cbor2  # type: ignore[no-redef]
+
+__all__ = ["cbor2"]

pycardano/plutus.py

@@ -15,7 +15,7 @@
 from nacl.hash import blake2b
 from typeguard import typechecked
 
-from pycardano import cbor2
+from pycardano.cbor2 import cbor2
 from pycardano.exception import DeserializeException, InvalidArgumentException
 from pycardano.hash import DATUM_HASH_SIZE, SCRIPT_HASH_SIZE, DatumHash, ScriptHash
 from pycardano.nativescript import NativeScript

pycardano/serialization.py

@@ -31,7 +31,7 @@
     get_type_hints,
 )
 
-from pycardano import cbor2
+from pycardano.cbor2 import cbor2
 from pycardano.logging import logger
 
 # Remove the semantic decoder for 258 (CBOR tag for set) as we care about the order of elements

pycardano/transaction.py

@@ -11,8 +11,8 @@
 from nacl.hash import blake2b
 from pprintpp import pformat
 
-from pycardano import cbor2
 from pycardano.address import Address
+from pycardano.cbor2 import cbor2
 from pycardano.certificate import Certificate
 from pycardano.exception import InvalidDataException
 from pycardano.governance import ProposalProcedure, VotingProcedures

pycardano/utils.py

@@ -9,8 +9,8 @@
 from nacl.encoding import RawEncoder
 from nacl.hash import blake2b
 
-from pycardano import cbor2
 from pycardano.backend.base import ChainContext
+from pycardano.cbor2 import cbor2
 from pycardano.hash import SCRIPT_DATA_HASH_SIZE, SCRIPT_HASH_SIZE, ScriptDataHash
 from pycardano.plutus import COST_MODELS, CostModels, Datum, RedeemerMap, Redeemers
 from pycardano.serialization import NonEmptyOrderedSet, default_encoder