Merge pull request #614 from kjeom/update-compatibility-for-cancun

Update compatibility for cancun

web3py-ext/web3py_ext/transaction/basic/account_update_transaction.py

@@ -50,7 +50,7 @@
     LEGACY_TRANSACTION_VALID_VALUES,
     is_int_or_prefixed_hexstr,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/cancel_transaction.py

@@ -52,7 +52,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/chaindata_anchoring_transaction.py

@@ -52,7 +52,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/smart_contract_deploy_transaction.py

@@ -57,7 +57,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/smart_contract_execution_transaction.py

@@ -55,7 +55,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/value_transfer_transaction.py

@@ -50,7 +50,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/basic/value_transfer_with_memo_transaction.py

@@ -53,7 +53,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_account_update_transaction.py

@@ -52,7 +52,7 @@
     is_int_or_prefixed_hexstr,
     is_empty_or_checksum_address,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_cancel_transaction.py

@@ -50,7 +50,7 @@
     is_int_or_prefixed_hexstr,
     is_empty_or_checksum_address,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_chaindata_anchoring_transaction.py

@@ -51,7 +51,7 @@
     is_int_or_prefixed_hexstr,
     is_empty_or_checksum_address,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_smart_contract_deploy_transaction.py

@@ -58,7 +58,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_smart_contract_execution_transaction.py

@@ -56,7 +56,7 @@
     is_int_or_prefixed_hexstr,
 )
 
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_value_transfer_transaction.py

@@ -50,7 +50,7 @@
     is_int_or_prefixed_hexstr,
     is_empty_or_checksum_address,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/fee_delegation/fee_delegated_value_transfer_with_memo_transaction.py

@@ -53,7 +53,7 @@
     is_int_or_prefixed_hexstr,
     is_empty_or_checksum_address,
 )
-from eth_account._utils.typed_transactions import (
+from eth_account._utils.typed_transactions.typed_transaction import (
     _TypedTransactionImplementation
 )
 from eth_account._utils.signing import (

web3py-ext/web3py_ext/transaction/wrapper_typed_transaction.py

@@ -2,6 +2,7 @@
     Any,
     Callable,
     Dict,
+    List,
     Union,
 )
 from cytoolz import (
@@ -29,9 +30,7 @@
     TypedTransaction,
     AccessListTransaction,
     DynamicFeeTransaction,
-    HexBytes,
-    set_transaction_type_if_needed,
-    is_int_or_prefixed_hexstr,
+    BlobTransaction,
 )
 from eth_utils.curried import (
     hexstr_if_str,
@@ -84,7 +83,7 @@
     * EIP-2930's AccessListTransaction : is translated as Klaytn Extended EIP-2930
     * EIP-1559's DynamicFeeTransaction : is translated as Klaytn Extended EIP-1559
 """
-def from_dict(cls, dictionary: Dict[str, Any]) -> "TypedTransaction":
+def from_dict(cls, dictionary: Dict[str, Any], blobs: List[bytes] = None) -> "TypedTransaction":
     """
     Builds a TypedTransaction from a dictionary.
     Verifies the dictionary is well formed.
@@ -99,6 +98,8 @@ def from_dict(cls, dictionary: Dict[str, Any]) -> "TypedTransaction":
         transaction = AccessListTransaction
     elif transaction_type == DynamicFeeTransaction.transaction_type:
         transaction = DynamicFeeTransaction
+    elif transaction_type == BlobTransaction.transaction_type:
+        transaction = BlobTransaction
     elif transaction_type == ValueTransferTransaction.transaction_type:
         transaction = ValueTransferTransaction
     elif transaction_type == ValueTransferWithMemoTransaction.transaction_type:
@@ -148,6 +149,9 @@ def from_bytes(cls, encoded_transaction: HexBytes) -> "TypedTransaction":
     elif encoded_transaction[0] == DynamicFeeTransaction.transaction_type:
         transaction_type = DynamicFeeTransaction.transaction_type
         transaction = DynamicFeeTransaction.from_bytes(encoded_transaction)
+    elif encoded_transaction[0] == BlobTransaction.transaction_type:
+        transaction_type = BlobTransaction.transaction_type
+        transaction = BlobTransaction.from_bytes(encoded_transaction)
     elif encoded_transaction[0] == ValueTransferTransaction.transaction_type:
         transaction_type = ValueTransferTransaction.transaction_type
         transaction = ValueTransferTransaction.from_bytes(encoded_transaction)