From 9227dfcfa50bd2dd25d50ce7de3b7dd0947a4e80 Mon Sep 17 00:00:00 2001 From: dromanov Date: Tue, 21 Jan 2025 20:10:06 +0300 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9A=B0=EF=B8=8F=20remove=20totalDifficul?= =?UTF-8?q?ty=20field?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 -- eth_tester/backends/mock/factory.py | 6 ------ eth_tester/backends/pyevm/serializers.py | 1 - eth_tester/normalization/outbound.py | 1 - eth_tester/utils/backend_testing.py | 1 - eth_tester/validation/outbound.py | 1 - tests/core/validation/test_outbound_validation.py | 5 ----- 7 files changed, 17 deletions(-) diff --git a/README.md b/README.md index 38d7af83..e847b388 100644 --- a/README.md +++ b/README.md @@ -378,7 +378,6 @@ cannot be found. 'state_root': '0x9ce568dcaa6f130d733b333304f2c26a19334ed328a7eb9bb31707306381ba65', 'coinbase': '0x0000000000000000000000000000000000000000', 'difficulty': 0, - 'total_difficulty': 0, 'mix_hash': '0x0000000000000000000000000000000000000000000000000000000000000000', 'size': 751, 'extra_data': '0x0000000000000000000000000000000000000000000000000000000000000000', @@ -414,7 +413,6 @@ cannot be found. 'state_root': '0x9ce568dcaa6f130d733b333304f2c26a19334ed328a7eb9bb31707306381ba65', 'coinbase': '0x0000000000000000000000000000000000000000', 'difficulty': 0, - 'total_difficulty': 0, 'mix_hash': '0x0000000000000000000000000000000000000000000000000000000000000000', 'size': 751, 'extra_data': '0x0000000000000000000000000000000000000000000000000000000000000000', diff --git a/eth_tester/backends/mock/factory.py b/eth_tester/backends/mock/factory.py index e555b9d6..b315d01e 100644 --- a/eth_tester/backends/mock/factory.py +++ b/eth_tester/backends/mock/factory.py @@ -267,7 +267,6 @@ def make_genesis_block(overrides=None): "coinbase": ZERO_ADDRESS, "difficulty": POST_MERGE_DIFFICULTY, "mix_hash": POST_MERGE_MIX_HASH, - "total_difficulty": 131072, "size": 0, "extra_data": ZERO_32BYTES, # gas limit at London fork block 12965000 on mainnet @@ -360,11 +359,6 @@ def make_block_from_parent(parent_block, overrides=None): else: yield "mix_hash", POST_MERGE_MIX_HASH - if "total_difficulty" in overrides: - yield "total_difficulty", overrides["total_difficulty"] - else: - yield "total_difficulty", parent_block["difficulty"] + difficulty - if "size" in overrides: yield "size", overrides["size"] else: diff --git a/eth_tester/backends/pyevm/serializers.py b/eth_tester/backends/pyevm/serializers.py index 0351c411..4d58b14c 100644 --- a/eth_tester/backends/pyevm/serializers.py +++ b/eth_tester/backends/pyevm/serializers.py @@ -72,7 +72,6 @@ def serialize_block(block, full_transaction, is_pending): "state_root": block.header.state_root, "coinbase": block.header.coinbase, "difficulty": block.header.difficulty, - "total_difficulty": block.header.difficulty, # TODO: actual total difficulty "mix_hash": block.header.mix_hash, "size": len(rlp.encode(block)), "extra_data": pad32(block.header.extra_data), diff --git a/eth_tester/normalization/outbound.py b/eth_tester/normalization/outbound.py index 96730616..ad5230e4 100644 --- a/eth_tester/normalization/outbound.py +++ b/eth_tester/normalization/outbound.py @@ -131,7 +131,6 @@ def _remove_fork_specific_fields_if_none(block): "coinbase": to_checksum_address, "difficulty": identity, "mix_hash": encode_hex, - "total_difficulty": identity, "size": identity, "extra_data": encode_hex, "gas_limit": identity, diff --git a/eth_tester/utils/backend_testing.py b/eth_tester/utils/backend_testing.py index fddc4cac..dcbbc4ea 100644 --- a/eth_tester/utils/backend_testing.py +++ b/eth_tester/utils/backend_testing.py @@ -88,7 +88,6 @@ "coinbase", "difficulty", "mix_hash", - "total_difficulty", "size", "extra_data", "gas_limit", diff --git a/eth_tester/validation/outbound.py b/eth_tester/validation/outbound.py index 3f47bdef..a5ebd273 100644 --- a/eth_tester/validation/outbound.py +++ b/eth_tester/validation/outbound.py @@ -263,7 +263,6 @@ def validate_status(value): "coinbase": validate_canonical_address, "difficulty": validate_positive_integer, "mix_hash": validate_32_byte_string, - "total_difficulty": validate_positive_integer, "size": validate_positive_integer, "extra_data": validate_32_byte_string, "gas_limit": validate_positive_integer, diff --git a/tests/core/validation/test_outbound_validation.py b/tests/core/validation/test_outbound_validation.py index ae8bb863..9fd7d5c5 100644 --- a/tests/core/validation/test_outbound_validation.py +++ b/tests/core/validation/test_outbound_validation.py @@ -387,7 +387,6 @@ def _make_block( coinbase=ZERO_ADDRESS, difficulty=0, mix_hash=ZERO_32BYTES, - total_difficulty=0, size=0, extra_data=ZERO_32BYTES, gas_limit=30029122, # gas limit at London fork block 12965000 on mainnet @@ -412,7 +411,6 @@ def _make_block( "coinbase": coinbase, "difficulty": difficulty, "mix_hash": mix_hash, - "total_difficulty": total_difficulty, "size": size, "extra_data": extra_data, "gas_limit": gas_limit, @@ -471,9 +469,6 @@ def _make_withdrawal( (_make_block(difficulty=True), False), (_make_block(mix_hash=HASH32_AS_TEXT), False), (_make_block(mix_hash=HASH31), False), - (_make_block(total_difficulty=-1), False), - (_make_block(total_difficulty=1.0), False), - (_make_block(total_difficulty=True), False), (_make_block(size=-1), False), (_make_block(size=1.0), False), (_make_block(size=True), False), From 849f6e50028b156001414b55df43ab502c9a7ea8 Mon Sep 17 00:00:00 2001 From: dromanov Date: Tue, 21 Jan 2025 20:43:23 +0300 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=93=9D=20add=20newsfragments?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- newsfragments/311.removal.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 newsfragments/311.removal.rst diff --git a/newsfragments/311.removal.rst b/newsfragments/311.removal.rst new file mode 100644 index 00000000..0e34e2bd --- /dev/null +++ b/newsfragments/311.removal.rst @@ -0,0 +1 @@ +remove ``totalDifficulty`` field