add tx direct test variant

Author: pacrob

tests/frontier/opcodes/test_calldataload.py

@@ -33,45 +33,62 @@
         "34_bytes",
     ],
 )
+@pytest.mark.parametrize("calldata_source", ["contract", "tx"])
 def test_calldataload(
     state_test: StateTestFiller,
     calldata: bytes,
     calldata_offset: int,
     fork: Fork,
     pre: Alloc,
     expected_storage: Account,
+    calldata_source: str,
 ):
     """
     Test `CALLDATALOAD` opcode.
 
+    Tests two scenarios:
+    - calldata_source is "contract": CALLDATALOAD reads from calldata passed by another contract
+    - calldata_source is "tx": CALLDATALOAD reads directly from transaction calldata
+
     Based on https://github.com/ethereum/tests/blob/ae4791077e8fcf716136e70fe8392f1a1f1495fb/src/GeneralStateTestsFiller/VMTests/vmTests/calldatacopyFiller.yml
     """
-    address_a = pre.deploy_contract(
+    contract_address = pre.deploy_contract(
         Op.SSTORE(0, Op.CALLDATALOAD(offset=calldata_offset)) + Op.STOP,
     )
 
-    to = pre.deploy_contract(
-        Om.MSTORE(calldata, 0x0)
-        + Op.CALL(
-            gas=Op.SUB(Op.GAS(), 0x100),
-            address=address_a,
-            value=0x0,
-            args_offset=0x0,
-            args_size=len(calldata),
-            ret_offset=0x0,
-            ret_size=0x0,
+    if calldata_source == "contract":
+        to = pre.deploy_contract(
+            Om.MSTORE(calldata, 0x0)
+            + Op.CALL(
+                gas=Op.SUB(Op.GAS(), 0x100),
+                address=contract_address,
+                value=0x0,
+                args_offset=0x0,
+                args_size=len(calldata),
+                ret_offset=0x0,
+                ret_size=0x0,
+            )
+            + Op.STOP
+        )
+
+        tx = Transaction(
+            data=calldata,
+            gas_limit=100_000,
+            protected=fork >= Byzantium,
+            sender=pre.fund_eoa(),
+            to=to,
+        )
+
+    else:
+        tx = Transaction(
+            data=calldata,
+            gas_limit=100_000,
+            protected=fork >= Byzantium,
+            sender=pre.fund_eoa(),
+            to=contract_address,
         )
-        + Op.STOP
-    )
 
-    tx = Transaction(
-        data=calldata,
-        gas_limit=100_000,
-        protected=fork >= Byzantium,
-        sender=pre.fund_eoa(),
-        to=to,
-    )
     post = {
-        address_a: Account(storage={0x00: expected_storage}),
+        contract_address: Account(storage={0x00: expected_storage}),
     }
     state_test(pre=pre, post=post, tx=tx)