feat(forks): use ethereum_test_addresses

Author: marioevz

src/ethereum_test_forks/forks/forks.py

@@ -9,6 +9,7 @@
 
 from semver import Version
 
+from ethereum_test_addresses import Precompile, SystemContract
 from ethereum_test_base_types import Address
 from ethereum_test_vm import EVMCodeType, Opcodes
 
@@ -385,9 +386,12 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
         """
         At Homestead, EC-recover, SHA256, RIPEMD160, and Identity pre-compiles are introduced
         """
-        return list(Address(i) for i in range(1, 5)) + super(Homestead, cls).precompiles(
-            block_number, timestamp
-        )
+        return [
+            Precompile.EC_RECOVER,
+            Precompile.SHA256,
+            Precompile.RIPEMD_160,
+            Precompile.IDENTITY,
+        ] + super(Homestead, cls).precompiles(block_number, timestamp)
 
     @classmethod
     def call_opcodes(
@@ -430,9 +434,12 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
         multiplication on elliptic curve alt_bn128, and optimal ate pairing check on
         elliptic curve alt_bn128 are introduced
         """
-        return list(Address(i) for i in range(5, 9)) + super(Byzantium, cls).precompiles(
-            block_number, timestamp
-        )
+        return [
+            Precompile.BIG_INT_MOD_EXP,
+            Precompile.ALT_BN_128_ADD,
+            Precompile.ALT_BN_128_MUL,
+            Precompile.ALT_BN_128_PAIRING,
+        ] + super(Byzantium, cls).precompiles(block_number, timestamp)
 
     @classmethod
     def call_opcodes(
@@ -513,7 +520,7 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
         """
         At Istanbul, pre-compile for blake2 compression is introduced
         """
-        return [Address(9)] + super(Istanbul, cls).precompiles(block_number, timestamp)
+        return [Precompile.BLAKE2_F] + super(Istanbul, cls).precompiles(block_number, timestamp)
 
     @classmethod
     def valid_opcodes(
@@ -730,14 +737,16 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
         """
         At Cancun, pre-compile for kzg point evaluation is introduced
         """
-        return [Address(0xA)] + super(Cancun, cls).precompiles(block_number, timestamp)
+        return [Precompile.KZG_POINT_EVALUATION] + super(Cancun, cls).precompiles(
+            block_number, timestamp
+        )
 
     @classmethod
     def system_contracts(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]:
         """
         Cancun introduces the system contract for EIP-4788
         """
-        return [Address(0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02)]
+        return [SystemContract.BEACON_ROOT_HISTORY_CONTRACT]
 
     @classmethod
     def pre_allocation_blockchain(cls) -> Mapping:
@@ -746,7 +755,7 @@ def pre_allocation_blockchain(cls) -> Mapping:
         type tests
         """
         new_allocation = {
-            0x000F3DF6D732807EF1319FB7B8BB8522D0BEAC02: {
+            SystemContract.BEACON_ROOT_HISTORY_CONTRACT: {
                 "nonce": 1,
                 "code": "0x3373fffffffffffffffffffffffffffffffffffffffe14604d57602036146024575f5f"
                 "fd5b5f35801560495762001fff810690815414603c575f5ffd5b62001fff01545f5260205ff35b5f"
@@ -794,12 +803,6 @@ def valid_opcodes(
         ] + super(Cancun, cls).valid_opcodes()
 
 
-BLOCK_HISTORY_CONTRACT = Address(0x0AAE40965E6800CD9B1F4B05FF21581047E3F91E)
-BEACON_DEPOSIT_CONTRACT = Address(0x00000000219AB540356CBB839CBE05303D7705FA)
-WITHDRAWAL_REQUESTS_CONTRACT = Address(0x0000B595F2A73542E60B811C3EB8A231CA3CAAAA)
-CONSOLIDATION_REQUESTS_CONTRACT = Address(0x000B0CBBCB4A622B212A4C8BF81A3614CEAABBBB)
-
-
 class Prague(Cancun):
     """
     Prague fork
@@ -835,20 +838,28 @@ def precompiles(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]
         MAP_FP_TO_G1 = 0x12
         MAP_FP2_TO_G2 = 0x13
         """
-        return list(Address(i) for i in range(0xB, 0x13 + 1)) + super(Prague, cls).precompiles(
-            block_number, timestamp
-        )
+        return [
+            Precompile.BLS_12_381_G1_ADD,
+            Precompile.BLS_12_381_G1_MUL,
+            Precompile.BLS_12_381_G1_MULTIEXP,
+            Precompile.BLS_12_381_G2_ADD,
+            Precompile.BLS_12_381_G2_MUL,
+            Precompile.BLS_12_381_G2_MULTIEXP,
+            Precompile.BLS_12_381_PAIRING,
+            Precompile.BLS_12_381_MAP_FP_TO_G1,
+            Precompile.BLS_12_381_MAP_FP2_TO_G2,
+        ] + super(Prague, cls).precompiles(block_number, timestamp)
 
     @classmethod
     def system_contracts(cls, block_number: int = 0, timestamp: int = 0) -> List[Address]:
         """
         Prague introduces the system contracts for EIP-6110, EIP-7002, EIP-7251 and EIP-2935
         """
         return [
-            BEACON_DEPOSIT_CONTRACT,
-            WITHDRAWAL_REQUESTS_CONTRACT,
-            CONSOLIDATION_REQUESTS_CONTRACT,
-            BLOCK_HISTORY_CONTRACT,
+            SystemContract.BEACON_DEPOSIT_CONTRACT,
+            SystemContract.WITHDRAWAL_REQUESTS_CONTRACT,
+            SystemContract.CONSOLIDATION_REQUESTS_CONTRACT,
+            SystemContract.BLOCK_HISTORY_CONTRACT,
         ] + super(Prague, cls).system_contracts(block_number, timestamp)
 
     @classmethod
@@ -870,7 +881,7 @@ def pre_allocation_blockchain(cls) -> Mapping:
         with open(CURRENT_FOLDER / "contracts" / "deposit_contract.bin", mode="rb") as f:
             new_allocation.update(
                 {
-                    BEACON_DEPOSIT_CONTRACT: {
+                    SystemContract.BEACON_DEPOSIT_CONTRACT: {
                         "nonce": 1,
                         "code": f.read(),
                         "storage": storage,
@@ -882,7 +893,7 @@ def pre_allocation_blockchain(cls) -> Mapping:
         with open(CURRENT_FOLDER / "contracts" / "withdrawal_request.bin", mode="rb") as f:
             new_allocation.update(
                 {
-                    WITHDRAWAL_REQUESTS_CONTRACT: {
+                    SystemContract.WITHDRAWAL_REQUESTS_CONTRACT: {
                         "nonce": 1,
                         "code": f.read(),
                     },
@@ -893,7 +904,7 @@ def pre_allocation_blockchain(cls) -> Mapping:
         with open(CURRENT_FOLDER / "contracts" / "consolidation_request.bin", mode="rb") as f:
             new_allocation.update(
                 {
-                    CONSOLIDATION_REQUESTS_CONTRACT: {
+                    SystemContract.CONSOLIDATION_REQUESTS_CONTRACT: {
                         "nonce": 1,
                         "code": f.read(),
                     },
@@ -904,7 +915,7 @@ def pre_allocation_blockchain(cls) -> Mapping:
         with open(CURRENT_FOLDER / "contracts" / "history_contract.bin", mode="rb") as f:
             new_allocation.update(
                 {
-                    BLOCK_HISTORY_CONTRACT: {
+                    SystemContract.BLOCK_HISTORY_CONTRACT: {
                         "nonce": 1,
                         "code": f.read(),
                     }