diff --git a/eest_tests/execution-spec-tests b/eest_tests/execution-spec-tests index 0fdd974b09..5220d21ba6 160000 --- a/eest_tests/execution-spec-tests +++ b/eest_tests/execution-spec-tests @@ -1 +1 @@ -Subproject commit 0fdd974b0968e443ef5878430ba5194c43149a4b +Subproject commit 5220d21ba64a9a4cbdc7e4025a7f1a032a957c78 diff --git a/pyproject.toml b/pyproject.toml index a188a57c84..e4c15af98c 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -26,7 +26,7 @@ dependencies = [ "ethereum-types>=0.2.4,<0.3", "ethereum-rlp>=0.1.4,<0.2", "cryptography>=45.0.1,<46", - "ethereum-execution-spec-tests @ git+https://github.com/ethereum/execution-spec-tests@0fdd974b0968e443ef5878430ba5194c43149a4b", + "ethereum-execution-spec-tests @ git+https://github.com/ethereum/execution-spec-tests@5220d21ba64a9a4cbdc7e4025a7f1a032a957c78", "ethereum-spec-evm-resolver @ git+https://github.com/petertdavies/ethereum-spec-evm-resolver", ] diff --git a/src/ethereum/cancun/vm/gas.py b/src/ethereum/cancun/vm/gas.py index d45b749551..eacff6f555 100644 --- a/src/ethereum/cancun/vm/gas.py +++ b/src/ethereum/cancun/vm/gas.py @@ -68,8 +68,8 @@ GAS_BLOBHASH_OPCODE = Uint(3) GAS_POINT_EVALUATION = Uint(50000) -TARGET_BLOB_GAS_PER_BLOCK = U64(393216) GAS_PER_BLOB = U64(2**17) +TARGET_BLOB_GAS_PER_BLOCK = U64(393216) MIN_BLOB_GASPRICE = Uint(1) BLOB_BASE_FEE_UPDATE_FRACTION = Uint(3338477) diff --git a/src/ethereum/osaka/vm/gas.py b/src/ethereum/osaka/vm/gas.py index b08b1e0a3a..deb037129d 100644 --- a/src/ethereum/osaka/vm/gas.py +++ b/src/ethereum/osaka/vm/gas.py @@ -69,11 +69,11 @@ GAS_BLOBHASH_OPCODE = Uint(3) GAS_POINT_EVALUATION = Uint(50000) -TARGET_BLOB_GAS_PER_BLOCK = U64(786432) +GAS_PER_BLOB = U64(2**17) +BLOB_SCHEDULE_TARGET = U64(6) +TARGET_BLOB_GAS_PER_BLOCK = GAS_PER_BLOB * BLOB_SCHEDULE_TARGET BLOB_BASE_COST = Uint(2**13) BLOB_SCHEDULE_MAX = U64(9) -BLOB_SCHEDULE_TARGET = U64(6) -GAS_PER_BLOB = U64(2**17) MIN_BLOB_GASPRICE = Uint(1) BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716) diff --git a/src/ethereum/prague/vm/gas.py b/src/ethereum/prague/vm/gas.py index d1526a551a..065c5b32d7 100644 --- a/src/ethereum/prague/vm/gas.py +++ b/src/ethereum/prague/vm/gas.py @@ -68,8 +68,8 @@ GAS_BLOBHASH_OPCODE = Uint(3) GAS_POINT_EVALUATION = Uint(50000) -TARGET_BLOB_GAS_PER_BLOCK = U64(786432) GAS_PER_BLOB = U64(2**17) +TARGET_BLOB_GAS_PER_BLOCK = U64(786432) MIN_BLOB_GASPRICE = Uint(1) BLOB_BASE_FEE_UPDATE_FRACTION = Uint(5007716)