Less broken things

All tests pass at the expense of cardboarded and duck-taped code. This needs some serious refactoring, perhaps more tests, then squashing all these WIP commits.

Author: fselmo

README.md

@@ -21,45 +21,69 @@ pip install eth-tester
 >>> from eth_tester import EthereumTester
 >>> t = EthereumTester()
 >>> t.get_accounts()
-('0x82A978B3f5962A5b0957d9ee9eEf472EE55B42F1',
- '0x7d577a597B2742b498Cb5Cf0C26cDCD726d39E6e',
- '0xDCEceAF3fc5C0a63d195d69b1A90011B7B19650D',
- '0x598443F1880Ef585B21f1d7585Bd0577402861E5',
- '0x13cBB8D99C6C4e0f2728C7d72606e78A29C4E224',
- '0x77dB2BEBBA79Db42a978F896968f4afCE746ea1F',
- '0x24143873e0E0815fdCBcfFDbe09C979CbF9Ad013',
- '0x10A1c1CB95c92EC31D3f22C66Eef1d9f3F258c6B',
- '0xe0FC04FA2d34a66B779fd5CEe748268032a146c0',
- '0x90F0B1EBbbA1C1936aFF7AAf20a7878FF9e04B6c')
->>> t.get_balance('0x82A978B3f5962A5b0957d9ee9eEf472EE55B42F1')
+('0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf',
+ '0x2B5AD5c4795c026514f8317c7a215E218DcCD6cF',
+ '0x6813Eb9362372EEF6200f3b1dbC3f819671cBA69',
+ '0x1efF47bc3a10a45D4B230B5d10E37751FE6AA718',
+ '0xe1AB8145F7E55DC933d51a18c793F901A3A0b276',
+ '0xE57bFE9F44b819898F47BF37E5AF72a0783e1141',
+ '0xd41c057fd1c78805AAC12B0A94a405c0461A6FBb',
+ '0xF1F6619B38A98d6De0800F1DefC0a6399eB6d30C',
+ '0xF7Edc8FA1eCc32967F827C9043FcAe6ba73afA5c',
+ '0x4CCeBa2d7D2B4fdcE4304d3e09a1fea9fbEb1528')
+
+>>> t.get_balance('0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf')
 1000000000000000000000000
->>> t.send_transaction({'from': '0x82A978B3f5962A5b0957d9ee9eEf472EE55B42F1', 'to': '0x7d577a597B2742b498Cb5Cf0C26cDCD726d39E6e', 'gas': 21000, 'value': 1})
-'0x140c1da1370a908e4c0f7c6e33bb97182011707c6a9aff954bef1084c8a48b25'
->>> t.get_transaction_by_hash('0x140c1da1370a908e4c0f7c6e33bb97182011707c6a9aff954bef1084c8a48b25')
-{'block_hash': '0x89c03ecb6bbf3ff533b04a663fa98d59c9d985de806d1a9dcafaad7c993ee6e8',
- 'block_number': 0,
- 'data': '0x',
- 'from': '0x82A978B3f5962A5b0957d9ee9eEf472EE55B42F1',
- 'gas': 21000,
- 'gas_price': 1,
- 'hash': '0x140c1da1370a908e4c0f7c6e33bb97182011707c6a9aff954bef1084c8a48b25',
+
+>>> t.send_transaction({
+...     'from': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf',
+...     'to': '0x2B5AD5c4795c026514f8317c7a215E218DcCD6cF',
+...     'gas': 30000,, 
+...     'value': 1,
+...     'max_fee_per_gas': 1000000000,
+...     'max_priority_fee_per_gas': 1000000000,
+...     'chain_id': 131277322940537,
+...     'access_list': (  # access_list is optional and takes address as bytes and storage keys as integers
+...         (
+...             b'+Z\xd5\xc4y\\\x02e\x14\xf81|z!^!\x8d\xcc\xd6\xcf',
+...             (0, 2)
+...         ),
+...     )
+... })
+'0xfd138a344f6bf33367b45e39c6af1c5032268a37cc7eb2736e08a876aa3edeb2'
+
+>>> t.get_transaction_by_hash('0xfd138a344f6bf33367b45e39c6af1c5032268a37cc7eb2736e08a876aa3edeb2')
+{'hash': '0xfd138a344f6bf33367b45e39c6af1c5032268a37cc7eb2736e08a876aa3edeb2',
  'nonce': 0,
- 'r': 114833774457827084417823702749930473879683934597320921824765632039428214735160,
- 's': 52192522150044217242428968890330558187037131043598164958282684822175843828481,
- 'to': '0x7d577a597B2742b498Cb5Cf0C26cDCD726d39E6e',
+ 'block_hash': '0x72bd3de88c7f11a496fe47de2b1efa51311f3b276420ecadb4dbb090ea61b217',
+ 'block_number': 1,
  'transaction_index': 0,
- 'v': 27,
- 'value': 1}
-
->>> t.get_transaction_receipt('0x140c1da1370a908e4c0f7c6e33bb97182011707c6a9aff954bef1084c8a48b25')
-{'block_hash': '0x89c03ecb6bbf3ff533b04a663fa98d59c9d985de806d1a9dcafaad7c993ee6e8',
- 'block_number': 0,
+ 'from': '0x7E5F4552091A69125d5DfCb7b8C2659029395Bdf',
+ 'to': '0x2B5AD5c4795c026514f8317c7a215E218DcCD6cF',
+ 'value': 1,
+ 'gas': 30000,
+ 'data': '0x',
+ 'r': 88767874425115037435552797857068981850542604805496334073531728907656577758826,
+ 's': 24696248707889349325417290631838009592163569252708852321923311080609868619225,
+ 'chain_id': 131277322940537,
+ 'max_fee_per_gas': 1000000000,
+ 'max_priority_fee_per_gas': 1000000000,
+ 'access_list': (('0x2B5AD5c4795c026514f8317c7a215E218DcCD6cF',
+   ('0x0000000000000000000000000000000000000000000000000000000000000000',
+    '0x0000000000000000000000000000000000000000000000000000000000000002')),),
+ 'y_parity': 0}
+
+
+>>> t.get_transaction_receipt('0x86acbf39865cd2fe86db7203742d2652bc1b58b10a3996befe1ee81738f1f58e')
+{'transaction_hash': '0xfd138a344f6bf33367b45e39c6af1c5032268a37cc7eb2736e08a876aa3edeb2',
+ 'transaction_index': 0,
+ 'block_number': 1,
+ 'block_hash': '0x72bd3de88c7f11a496fe47de2b1efa51311f3b276420ecadb4dbb090ea61b217',
+ 'cumulative_gas_used': 27200,
+ 'gas_used': 27200,
  'contract_address': None,
- 'cumulative_gas_used': 21000,
- 'gas_used': 21000,
  'logs': (),
- 'transaction_hash': '0x140c1da1370a908e4c0f7c6e33bb97182011707c6a9aff954bef1084c8a48b25',
- 'transaction_index': 0}
+ 'status': 1}
 ```
 
 
@@ -130,13 +154,13 @@ types.
 
 * Hexidecimal values **must** be text (not byte) strings.  The `0x` prefix is optional.
 * Any address which contains mixed-case alpha characters will be validated as a checksummed address as specified by [EIP-55](https://github.com/ethereum/EIPs/blob/master/EIPS/eip-55.md)
-* 32-byte hashes **must** be hexidecimal encoded.
+* 32-byte hashes **must** be hexadecimal encoded.
 * Numeric values **must** be in their integer representation.
 
 Similarly, ethereum tester ensures that return values conform to similar rules.
 
-* 32-byte hashes will be returned in their hexidecimal encoded representation.
-* Addresses will be returned in their hexidecimal representation and EIP55 checksummed.
+* 32-byte hashes will be returned in their hexadecimal encoded representation.
+* Addresses will be returned in their hexadecimal representation and EIP55 checksummed.
 * Numeric values will be returned as integers.
 
 
@@ -164,8 +188,8 @@ The `EthereumTester` object is the sole API entrypoint.  Instantiation of this
 object accepts the following parameters.
 
 - `backend`: The chain backend being used.  See the [chain backends](#backends)
-- `validator`: The validator to used.  See the [validators](#validation)
-- `normalizer`: The normalizer to used.  See the [normalizers](#normalization)
+- `validator`: The validator being used.  See the [validators](#validation)
+- `normalizer`: The normalizer being used.  See the [normalizers](#normalization)
 - `auto_mine_transactions`: If *truthy* transactions will be automatically mined at the time they are submitted.  See [`enable_auto_mine_transactions`](#api-enable_auto_mine_transactions) and [`disable_auto_mine_transactions`](#api-disable_auto_mine_transactions).
 - `fork_blocks`: configures which block numbers the various network hard fork rules will be activated.  See [fork-rules](#fork-rules)
 
@@ -181,7 +205,7 @@ object accepts the following parameters.
 ### Fork Rules
 <a id="fork-rules"></a>
 
-Ethereum tester uses the Byzantium rules, starting at block 0.
+Ethereum tester uses the London fork rules, starting at block 0.
 
 ### Time Travel
 <a id="time-travel"></a>
@@ -201,7 +225,7 @@ of the latest block.
 ### Mining
 
 Manually mining blocks can be done with the following API.  The `coinbase`
-parameter of these methods **must** be a hexidecimal encoded address.
+parameter of these methods **must** be a hexadecimal encoded address.
 
 <a id="api-mine_blocks"></a>
 
@@ -221,7 +245,7 @@ Mines a single new block, returning the mined block's hash.
 
 #### Auto-mining transactions
 
-By default all transactions are mined immediately.  This means that each transaction you send will result in a new block being mined, and that all blocks will only ever have at most a single transaction.  This behavior can be controlled with the following methods.
+By default, all transactions are mined immediately.  This means that each transaction you send will result in a new block being mined, and that all blocks will only ever have at most a single transaction.  This behavior can be controlled with the following methods.
 
 <a id="api-enable_auto_mine_transactions"></a>
 
@@ -239,7 +263,7 @@ Turns **off** auto-mining of transactions.
 ### Accounts
 
 The following API can be used to interact with account data.  The `account`
-parameter in these methods **must** be a hexidecimal encode address.
+parameter in these methods **must** be a hexadecimal encode address.
 
 <a id="api-get_accounts"></a>
  `EthereumTester.get_accounts()`
@@ -449,7 +473,7 @@ cannot be found.
  'transactions': (),
  'transactions_root': '0x56e81f171bcc55a6ff8345e692c0f86e5b48e01b996cadc001622fb5e363b421',
  'uncles': (),
- 'base_fee_per_gas': 1000000000}
+ 'base_fee_per_gas': 875000000}
 ```
 
 <a id="api-get_transaction_receipt"></a>
@@ -492,12 +516,12 @@ found for the given hash.
 A transaction is a formatted as a dictionary with the following keys and
 values.
 
-* `from`: The address of the account sending the transaction (hexidecimal string).
-* `to`: The address of the account the transaction is being sent to.  Empty string should be used to trigger contract creation (hexidecimal string).
+* `from`: The address of the account sending the transaction (hexadecimal string).
+* `to`: The address of the account the transaction is being sent to.  Empty string should be used to trigger contract creation (hexadecimal string).
 * `gas`: Sets the gas limit for transaction execution (integer).
 * `gas_price`: Sets the price per unit of gas in wei that will be paid for transaction execution (integer).
 * `value`: The amount of ether in wei that should be sent with the transaction (integer).
-* `data`: The data for the transaction (hexidecimal string).
+* `data`: The data for the transaction (hexadecimal string).
 
 
 #### Methods
@@ -884,9 +908,9 @@ The canonical format is intended for low level handling by backends.
 
 The normal format is intended for use by end users.
 
-* 32 byte hashes: `0x` prefixed hexidecimal encoded text strings (not byte strings)
-* Arbitrary length strings: `0x` prefixed hexidecimal encoded text strings (not byte strings)
-* Addresses: `0x` prefixed and EIP55 checksummed hexidecimal encoded text strings (not byte strings)
+* 32 byte hashes: `0x` prefixed hexadecimal encoded text strings (not byte strings)
+* Arbitrary length strings: `0x` prefixed hexadecimal encoded text strings (not byte strings)
+* Addresses: `0x` prefixed and EIP55 checksummed hexadecimal encoded text strings (not byte strings)
 * Integers: `int`
 * Array Types: `tuple`
 

eth_tester/backends/pyevm/main.py

@@ -8,7 +8,6 @@
 from eth_abi.exceptions import (
     DecodingError
 )
-from toolz import dissoc
 
 from eth_utils import (
     encode_hex,
@@ -451,6 +450,11 @@ def _normalize_transaction(self, transaction, block_number='latest'):
             yield 'value', 0
         if 'to' not in transaction:
             yield 'to', b''
+        if (
+            all(_ in transaction for _ in ('max_fee_per_gas', 'max_priority_fee_per_gas')) and
+            'access_list' not in transaction
+        ):
+            yield 'access_list', []
 
     def _get_normalized_and_unsigned_evm_transaction(self, transaction, block_number='latest'):
         normalized_transaction = self._normalize_transaction(transaction, block_number)
@@ -470,14 +474,10 @@ def _get_normalized_and_signed_evm_transaction(self, transaction, block_number='
 
     def _create_type_aware_unsigned_transaction(self, normalized_txn):
         if all(_ in normalized_txn for _ in ("access_list", "gas_price")):
-            # validated type='0x1' so can pop it back out since type is signed separate from txn
-            normalized_txn = dissoc(normalized_txn, 'type')
             return self.chain.get_transaction_builder().new_unsigned_access_list_transaction(
                 **normalized_txn
             )
         elif all(_ in normalized_txn for _ in ("max_fee_per_gas", "max_priority_fee_per_gas")):
-            # validated type='0x2' so can pop it back out since type is signed separate from txn
-            normalized_txn = dissoc(normalized_txn, 'type')
             return self.chain.get_transaction_builder().new_unsigned_dynamic_fee_transaction(
                 **normalized_txn
             )

eth_tester/backends/pyevm/serializers.py

@@ -1,6 +1,10 @@
 import rlp
-from toolz import dissoc, merge
 
+from toolz import (
+    merge,
+)
+
+from eth_tester.exceptions import ValidationError
 from eth_tester.utils.address import (
     generate_contract_address,
 )
@@ -48,6 +52,7 @@ def serialize_block(block, full_transaction, is_pending):
         "timestamp": block.header.timestamp,
         "transactions": transactions,
         "uncles": [uncle.hash for uncle in block.uncles],
+        "base_fee_per_gas": block.header.base_fee_per_gas,
     }
 
 
@@ -67,44 +72,57 @@ def serialize_transaction(block, transaction, transaction_index, is_pending):
         "value": transaction.value,
         "gas": transaction.gas,
         "data": transaction.data,
+        "r": transaction.r,
+        "s": transaction.s,
     }
-    if hasattr(transaction, 'gas_price'):
-        if hasattr(transaction, 'access_list'):
+    if _field_in_transaction(transaction, 'gas_price'):
+        if _field_in_transaction(transaction, 'access_list'):
             # access list transaction
-            serialized_transaction = merge(
-                common_transaction_params,
-                {
-                    'gas_price': transaction.gas_price,
-                    'access_list': transaction.access_list,
-                }
-            )
+            type_specific_params = {
+                'chain_id': transaction.chain_id,
+                'gas_price': transaction.gas_price,
+                'access_list': transaction.access_list or [],
+                'y_parity': transaction.y_parity,
+            }
         else:
             # legacy transaction
-            serialized_transaction = merge(
-                common_transaction_params,
-                {
-                    "gas_price": transaction.gas_price,
-                    "v": transaction.v,
-                    "r": transaction.r,
-                    "s": transaction.s,
-                }
-            )
-    elif (
-        hasattr(transaction, 'max_fee_per_gas') and
-        hasattr(transaction, 'max_priority_fee_per_gas')
-    ):
-        # dynamic fee transaction
-        serialized_transaction = merge(
-            common_transaction_params,
-            {
-                'max_fee_per_gas': transaction.max_fee_per_gas,
-                'max_priority_fee_per_gas': transaction.max_priority_fee_per_gas,
-                'access_list': transaction.access_list or None,
+            type_specific_params = {
+                'gas_price': transaction.gas_price,
+                'v': transaction.v
             }
-        )
+    elif (_field_in_transaction(transaction, _) for _ in (
+        'max_fee_per_gas' and 'max_priority_fee_per_gas'
+    )):
+        # dynamic fee transaction
+        type_specific_params = {
+            'chain_id': transaction.chain_id,
+            'max_fee_per_gas': transaction.max_fee_per_gas,
+            'max_priority_fee_per_gas': transaction.max_priority_fee_per_gas,
+            'access_list': transaction.access_list or [],
+            'y_parity': transaction.y_parity,
+        }
     else:
-        raise NotImplementedError('transaction type not recognized for serialization')
-    return serialized_transaction
+        raise ValidationError('Transaction serialization error')
+    return merge(common_transaction_params, type_specific_params)
+
+
+def _field_in_transaction(transaction, field):
+    """
+    There are many different classes of transactions, we have to be able to search for a
+    particular field depending on the type of transaction - from a dict, to *LegacyTransaction to
+    *TypedTransaction.
+    """
+    if not isinstance(transaction, dict):
+        try:
+            txn_dict = transaction.as_dict()
+            if not isinstance(txn_dict, dict):
+                txn_dict = txn_dict.dictionary
+        except AttributeError:
+            pass
+    try:
+        return field in txn_dict
+    except (NameError, TypeError):
+        return hasattr(transaction, field)
 
 
 def serialize_transaction_receipt(