fix t8n tool errors

src/ethereum/arrow_glacier/fork.py

@@ -394,7 +394,7 @@ def check_transaction(
     base_fee_per_gas: Uint,
     gas_available: Uint,
     chain_id: U64,
-) -> Tuple[Address, U256]:
+) -> Tuple[Address, Uint]:
     """
     Check if the transaction is includable in the block.
 
@@ -426,6 +426,7 @@ def check_transaction(
 
     if isinstance(tx, FeeMarketTransaction):
         ensure(tx.max_fee_per_gas >= tx.max_priority_fee_per_gas, InvalidBlock)
+        ensure(tx.max_fee_per_gas >= base_fee_per_gas, InvalidBlock)
 
         priority_fee_per_gas = min(
             tx.max_priority_fee_per_gas,
@@ -730,7 +731,7 @@ def pay_rewards(
 
 def process_transaction(
     env: vm.Environment, tx: Transaction
-) -> Tuple[U256, Tuple[Log, ...], bool]:
+) -> Tuple[Uint, Tuple[Log, ...], bool]:
     """
     Execute a transaction against the provided environment.
 

src/ethereum/arrow_glacier/fork_types.py

@@ -52,8 +52,8 @@ class LegacyTransaction:
     """
 
     nonce: U256
-    gas_price: U256
-    gas: U256
+    gas_price: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes
@@ -71,8 +71,8 @@ class AccessListTransaction:
 
     chain_id: U64
     nonce: U256
-    gas_price: U256
-    gas: U256
+    gas_price: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes
@@ -91,9 +91,9 @@ class FeeMarketTransaction:
 
     chain_id: U64
     nonce: U256
-    max_priority_fee_per_gas: U256
-    max_fee_per_gas: U256
-    gas: U256
+    max_priority_fee_per_gas: Uint
+    max_fee_per_gas: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes

src/ethereum/arrow_glacier/utils/message.py

@@ -28,7 +28,7 @@ def prepare_message(
     target: Union[Bytes0, Address],
     value: U256,
     data: Bytes,
-    gas: U256,
+    gas: Uint,
     env: Environment,
     code_address: Optional[Address] = None,
     should_transfer_value: bool = True,

src/ethereum/arrow_glacier/vm/__init__.py

@@ -39,7 +39,7 @@ class Environment:
     number: Uint
     base_fee_per_gas: Uint
     gas_limit: Uint
-    gas_price: U256
+    gas_price: Uint
     time: U256
     difficulty: Uint
     state: State
@@ -55,7 +55,7 @@ class Message:
     caller: Address
     target: Union[Bytes0, Address]
     current_target: Address
-    gas: U256
+    gas: Uint
     value: U256
     data: Bytes
     code_address: Optional[Address]
@@ -75,7 +75,7 @@ class Evm:
     stack: List[U256]
     memory: bytearray
     code: Bytes
-    gas_left: U256
+    gas_left: Uint
     env: Environment
     valid_jump_destinations: Set[Uint]
     logs: Tuple[Log, ...]

src/ethereum/arrow_glacier/vm/instructions/environment.py

@@ -319,7 +319,7 @@ def gasprice(evm: Evm) -> None:
     charge_gas(evm, GAS_BASE)
 
     # OPERATION
-    push(evm.stack, evm.env.gas_price)
+    push(evm.stack, U256(evm.env.gas_price))
 
     # PROGRAM COUNTER
     evm.pc += 1

src/ethereum/arrow_glacier/vm/instructions/system.py

@@ -72,7 +72,7 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
-    evm.gas_left -= U256(create_message_gas)
+    evm.gas_left -= create_message_gas
 
     ensure(not evm.message.is_static, WriteInStaticContext)
     evm.return_data = b""
@@ -103,7 +103,7 @@ def generic_create(
     child_message = Message(
         caller=evm.message.current_target,
         target=Bytes0(),
-        gas=U256(create_message_gas),
+        gas=create_message_gas,
         value=endowment,
         data=b"",
         code=call_data,
@@ -272,7 +272,7 @@ def generic_call(
     child_message = Message(
         caller=caller,
         target=to,
-        gas=U256(gas),
+        gas=gas,
         value=value,
         data=call_data,
         code=code,

src/ethereum/arrow_glacier/vm/interpreter.py

@@ -66,7 +66,7 @@ class MessageCallOutput:
           6. `has_erred`: True if execution has caused an error.
     """
 
-    gas_left: U256
+    gas_left: Uint
     refund_counter: U256
     logs: Tuple[Log, ...]
     accounts_to_delete: Set[Address]
@@ -100,7 +100,7 @@ def process_message_call(
         )
         if is_collision:
             return MessageCallOutput(
-                U256(0), U256(0), tuple(), set(), set(), True
+                Uint(0), U256(0), tuple(), set(), set(), True
             )
         else:
             evm = process_create_message(message, env)
@@ -175,7 +175,7 @@ def process_create_message(message: Message, env: Environment) -> Evm:
             ensure(len(contract_code) <= MAX_CODE_SIZE, OutOfGasError)
         except ExceptionalHalt:
             rollback_transaction(env.state)
-            evm.gas_left = U256(0)
+            evm.gas_left = Uint(0)
             evm.output = b""
             evm.has_erred = True
         else:
@@ -281,7 +281,7 @@ def execute_code(message: Message, env: Environment) -> Evm:
             op_implementation[op](evm)
 
     except ExceptionalHalt:
-        evm.gas_left = U256(0)
+        evm.gas_left = Uint(0)
         evm.output = b""
         evm.has_erred = True
     except Revert as e:

src/ethereum/berlin/fork.py

@@ -628,7 +628,7 @@ def pay_rewards(
 
 def process_transaction(
     env: vm.Environment, tx: Transaction
-) -> Tuple[U256, Tuple[Log, ...], bool]:
+) -> Tuple[Uint, Tuple[Log, ...], bool]:
     """
     Execute a transaction against the provided environment.
 

src/ethereum/berlin/fork_types.py

@@ -53,8 +53,8 @@ class LegacyTransaction:
     """
 
     nonce: U256
-    gas_price: U256
-    gas: U256
+    gas_price: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes
@@ -72,8 +72,8 @@ class AccessListTransaction:
 
     chain_id: U64
     nonce: U256
-    gas_price: U256
-    gas: U256
+    gas_price: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes

src/ethereum/berlin/utils/message.py

@@ -28,7 +28,7 @@ def prepare_message(
     target: Union[Bytes0, Address],
     value: U256,
     data: Bytes,
-    gas: U256,
+    gas: Uint,
     env: Environment,
     code_address: Optional[Address] = None,
     should_transfer_value: bool = True,

src/ethereum/berlin/vm/__init__.py

@@ -38,7 +38,7 @@ class Environment:
     coinbase: Address
     number: Uint
     gas_limit: Uint
-    gas_price: U256
+    gas_price: Uint
     time: U256
     difficulty: Uint
     state: State
@@ -54,7 +54,7 @@ class Message:
     caller: Address
     target: Union[Bytes0, Address]
     current_target: Address
-    gas: U256
+    gas: Uint
     value: U256
     data: Bytes
     code_address: Optional[Address]
@@ -74,7 +74,7 @@ class Evm:
     stack: List[U256]
     memory: bytearray
     code: Bytes
-    gas_left: U256
+    gas_left: Uint
     env: Environment
     valid_jump_destinations: Set[Uint]
     logs: Tuple[Log, ...]

src/ethereum/berlin/vm/instructions/environment.py

@@ -319,7 +319,7 @@ def gasprice(evm: Evm) -> None:
     charge_gas(evm, GAS_BASE)
 
     # OPERATION
-    push(evm.stack, evm.env.gas_price)
+    push(evm.stack, U256(evm.env.gas_price))
 
     # PROGRAM COUNTER
     evm.pc += 1

src/ethereum/berlin/vm/instructions/system.py

@@ -72,7 +72,7 @@ def generic_create(
     evm.accessed_addresses.add(contract_address)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
-    evm.gas_left -= U256(create_message_gas)
+    evm.gas_left -= create_message_gas
 
     ensure(not evm.message.is_static, WriteInStaticContext)
     evm.return_data = b""
@@ -103,7 +103,7 @@ def generic_create(
     child_message = Message(
         caller=evm.message.current_target,
         target=Bytes0(),
-        gas=U256(create_message_gas),
+        gas=create_message_gas,
         value=endowment,
         data=b"",
         code=call_data,
@@ -272,7 +272,7 @@ def generic_call(
     child_message = Message(
         caller=caller,
         target=to,
-        gas=U256(gas),
+        gas=gas,
         value=value,
         data=call_data,
         code=code,

src/ethereum/berlin/vm/interpreter.py

@@ -65,7 +65,7 @@ class MessageCallOutput:
           6. `has_erred`: True if execution has caused an error.
     """
 
-    gas_left: U256
+    gas_left: Uint
     refund_counter: U256
     logs: Tuple[Log, ...]
     accounts_to_delete: Set[Address]
@@ -99,7 +99,7 @@ def process_message_call(
         )
         if is_collision:
             return MessageCallOutput(
-                U256(0), U256(0), tuple(), set(), set(), True
+                Uint(0), U256(0), tuple(), set(), set(), True
             )
         else:
             evm = process_create_message(message, env)
@@ -174,7 +174,7 @@ def process_create_message(message: Message, env: Environment) -> Evm:
             ensure(len(contract_code) <= MAX_CODE_SIZE, OutOfGasError)
         except ExceptionalHalt:
             rollback_transaction(env.state)
-            evm.gas_left = U256(0)
+            evm.gas_left = Uint(0)
             evm.output = b""
             evm.has_erred = True
         else:
@@ -280,7 +280,7 @@ def execute_code(message: Message, env: Environment) -> Evm:
             op_implementation[op](evm)
 
     except ExceptionalHalt:
-        evm.gas_left = U256(0)
+        evm.gas_left = Uint(0)
         evm.output = b""
         evm.has_erred = True
     except Revert as e:

src/ethereum/byzantium/fork.py

@@ -616,7 +616,7 @@ def pay_rewards(
 
 def process_transaction(
     env: vm.Environment, tx: Transaction
-) -> Tuple[U256, Tuple[Log, ...], bool]:
+) -> Tuple[Uint, Tuple[Log, ...], bool]:
     """
     Execute a transaction against the provided environment.
 

src/ethereum/byzantium/fork_types.py

@@ -48,8 +48,8 @@ class Transaction:
     """
 
     nonce: U256
-    gas_price: U256
-    gas: U256
+    gas_price: Uint
+    gas: Uint
     to: Union[Bytes0, Address]
     value: U256
     data: Bytes

src/ethereum/byzantium/utils/message.py

@@ -27,7 +27,7 @@ def prepare_message(
     target: Union[Bytes0, Address],
     value: U256,
     data: Bytes,
-    gas: U256,
+    gas: Uint,
     env: Environment,
     code_address: Optional[Address] = None,
     should_transfer_value: bool = True,

src/ethereum/byzantium/vm/__init__.py

@@ -38,7 +38,7 @@ class Environment:
     coinbase: Address
     number: Uint
     gas_limit: Uint
-    gas_price: U256
+    gas_price: Uint
     time: U256
     difficulty: Uint
     state: State
@@ -53,7 +53,7 @@ class Message:
     caller: Address
     target: Union[Bytes0, Address]
     current_target: Address
-    gas: U256
+    gas: Uint
     value: U256
     data: Bytes
     code_address: Optional[Address]
@@ -71,7 +71,7 @@ class Evm:
     stack: List[U256]
     memory: bytearray
     code: Bytes
-    gas_left: U256
+    gas_left: Uint
     env: Environment
     valid_jump_destinations: Set[Uint]
     logs: Tuple[Log, ...]

src/ethereum/byzantium/vm/instructions/environment.py

@@ -312,7 +312,7 @@ def gasprice(evm: Evm) -> None:
     charge_gas(evm, GAS_BASE)
 
     # OPERATION
-    push(evm.stack, evm.env.gas_price)
+    push(evm.stack, U256(evm.env.gas_price))
 
     # PROGRAM COUNTER
     evm.pc += 1

src/ethereum/byzantium/vm/instructions/system.py

@@ -74,7 +74,7 @@ def create(evm: Evm) -> None:
     charge_gas(evm, GAS_CREATE + extend_memory.cost)
 
     create_message_gas = max_message_call_gas(Uint(evm.gas_left))
-    evm.gas_left -= U256(create_message_gas)
+    evm.gas_left -= create_message_gas
 
     # OPERATION
     ensure(not evm.message.is_static, WriteInStaticContext)
@@ -109,7 +109,7 @@ def create(evm: Evm) -> None:
         child_message = Message(
             caller=evm.message.current_target,
             target=Bytes0(),
-            gas=U256(create_message_gas),
+            gas=create_message_gas,
             value=endowment,
             data=b"",
             code=call_data,
@@ -201,7 +201,7 @@ def generic_call(
     child_message = Message(
         caller=caller,
         target=to,
-        gas=U256(gas),
+        gas=gas,
         value=value,
         data=call_data,
         code=code,