From c5aa07767a69587adcf139fe9932d8ecd279051d Mon Sep 17 00:00:00 2001
From: pacrob <5199899+pacrob@users.noreply.github.com>
Date: Wed, 8 Jan 2025 14:08:53 -0700
Subject: [PATCH] restore pyproject.toml and uv.lock, start updates from review

---
 docs/CHANGELOG.md                           |  2 +-
 pyproject.toml                              |  1 -
 tests/frontier/opcodes/test_calldatacopy.py | 38 ++++++++-------------
 uv.lock                                     |  2 --
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/docs/CHANGELOG.md b/docs/CHANGELOG.md
index 1e0bd05abd8..bdf15e66991 100644
--- a/docs/CHANGELOG.md
+++ b/docs/CHANGELOG.md
@@ -19,7 +19,7 @@ Test fixtures for use by clients are available for each release on the [Github r
 - ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) set code of non-empty-storage account test ([#948](https://github.com/ethereum/execution-spec-tests/pull/948))
 - ✨ [EIP-7702](https://eips.ethereum.org/EIPS/eip-7702) Remove delegation behavior of EXTCODE* ([#984](https://github.com/ethereum/execution-spec-tests/pull/984))
 - ✨ [EIP-7623](https://eips.ethereum.org/EIPS/eip-7623) Increase calldata cost ([#1004](https://github.com/ethereum/execution-spec-tests/pull/1004))
-- ✨ Port calldatacopy test ([#1056](https://github.com/ethereum/execution-spec-tests/pull/1056)).
+- ✨ Port [calldatacopy test](https://github.com/ethereum/tests/blob/ae4791077e8fcf716136e70fe8392f1a1f1495fb/src/GeneralStateTestsFiller/VMTests/vmTests/calldatacopyFiller.yml) ([#1056](https://github.com/ethereum/execution-spec-tests/pull/1056)).
 
 ### 🛠️ Framework
 
diff --git a/pyproject.toml b/pyproject.toml
index 283ec3ace38..3fdb39aa7dc 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -50,7 +50,6 @@ dependencies = [
     # https://ethereum.github.io/execution-spec-tests/main/dev/interactive_usage/
     "questionary @ git+https://github.com/tmbo/questionary@ff22aeae1cd9c1c734f14329934e349bec7873bc",
     "prompt_toolkit>=3.0.48,<4", # ensure we have a new enough version for ipython
-    "ruff>=0.8.2",
 ]
 
 [project.urls]
diff --git a/tests/frontier/opcodes/test_calldatacopy.py b/tests/frontier/opcodes/test_calldatacopy.py
index 4e92b21e111..0048a905dfe 100644
--- a/tests/frontier/opcodes/test_calldatacopy.py
+++ b/tests/frontier/opcodes/test_calldatacopy.py
@@ -12,10 +12,7 @@
     [
         (
             (
-                Op.PUSH1[0x2]
-                + Op.PUSH1[0x1]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                Op.CALLDATACOPY(dest_offset=0, offset=1, size=2)
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
@@ -35,10 +32,7 @@
         ),
         (
             (
-                Op.PUSH1[0x1]
-                + Op.PUSH1[0x1]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                Op.CALLDATACOPY(dest_offset=0, offset=1, size=1)
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
@@ -58,10 +52,7 @@
         ),
         (
             (
-                Op.PUSH1[0x0]
-                + Op.PUSH1[0x1]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                Op.CALLDATACOPY(dest_offset=0, offset=1, size=0)
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
@@ -81,10 +72,7 @@
         ),
         (
             (
-                Op.PUSH1[0x0]
-                + Op.PUSH1[0x0]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                Op.CALLDATACOPY(dest_offset=0, offset=0, size=0)
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
@@ -104,10 +92,11 @@
         ),
         (
             (
-                Op.PUSH1[0xFF]
-                + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                +Op.CALLDATACOPY(
+                    dest_offset=0,
+                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,
+                    size=0xFF,
+                )
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
@@ -123,10 +112,11 @@
         ),
         (
             (
-                Op.PUSH1[0x9]
-                + Op.PUSH32[0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA]
-                + Op.PUSH1[0x0]
-                + Op.CALLDATACOPY
+                +Op.CALLDATACOPY(
+                    dest_offset=0,
+                    offset=0xFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFFA,
+                    size=0x9,
+                )
                 + Op.PUSH1[0x0]
                 + Op.MLOAD
                 + Op.PUSH1[0x0]
diff --git a/uv.lock b/uv.lock
index 73e62949850..e477df79374 100644
--- a/uv.lock
+++ b/uv.lock
@@ -515,7 +515,6 @@ dependencies = [
     { name = "requests" },
     { name = "requests-unixsocket2" },
     { name = "rich" },
-    { name = "ruff" },
     { name = "semver" },
     { name = "setuptools" },
     { name = "solc-select" },
@@ -593,7 +592,6 @@ requires-dist = [
     { name = "requests", specifier = ">=2.31.0,<3" },
     { name = "requests-unixsocket2", specifier = ">=0.4.0" },
     { name = "rich", specifier = ">=13.7.0,<14" },
-    { name = "ruff", specifier = ">=0.8.2" },
     { name = "ruff", marker = "extra == 'lint'", specifier = "==0.8.2" },
     { name = "semver", specifier = ">=3.0.1,<4" },
     { name = "setuptools" },