Add metropolis config

Cherry-pick 9024224
(was EIP90)

Conflicts:
	ethereum/config.py

Author: vub

ethereum/blocks.py

@@ -14,7 +14,7 @@
 from ethereum.pruning_trie import Trie
 from ethereum.securetrie import SecureTrie
 from ethereum import utils
-from ethereum.utils import address, int256, trie_root, hash32, to_string
+from ethereum.utils import address, int256, trie_root, hash32, to_string,
 from ethereum import processblock
 from ethereum.transactions import Transaction
 from ethereum import bloom
@@ -477,6 +477,7 @@ def __init__(self, header, transaction_list=[], uncles=[], env=None,
             self.transaction_count = 0
             self.gas_used = 0
             # replay
+            self.initialize(parent)
             for tx in transaction_list:
                 success, output = processblock.apply_transaction(self, tx)
             self.finalize()
@@ -1162,6 +1163,18 @@ def revert(self, mysnapshot):
         self._get_transactions_cache = []
         self.ether_delta = mysnapshot['ether_delta']
 
+    def initialize(self, parent):
+        if self.number == self.config["METROPOLIS_FORK_BLKNUM"]:
+            self.set_code(utils.normalize_address(self.config["METROPOLIS_STATEROOT_STORE"]), self.config["METROPOLIS_GETTER_CODE"])
+            self.set_code(utils.normalize_address(self.config["METROPOLIS_BLOCKHASH_STORE"]), self.config["METROPOLIS_GETTER_CODE"])
+        if self.number >= self.config["METROPOLIS_FORK_BLKNUM"]:
+            self.set_storage_data(utils.normalize_address(self.config["METROPOLIS_STATEROOT_STORE"]),
+                                  self.number % self.config["METROPOLIS_WRAPAROUND"],
+                                  parent.state_root)
+            self.set_storage_data(utils.normalize_address(self.config["METROPOLIS_BLOCKHASH_STORE"]),
+                                  self.number % self.config["METROPOLIS_WRAPAROUND"],
+                                  self.prevhash)
+
     def finalize(self):
         """Apply rewards and commit."""
         delta = int(self.config['BLOCK_REWARD'] + self.config['NEPHEW_REWARD'] * len(self.uncles))

ethereum/config.py

@@ -46,6 +46,13 @@
     # Homestead fork
     HOMESTEAD_FORK_BLKNUM=1150000,
     HOMESTEAD_DIFF_ADJUSTMENT_CUTOFF=10,
+    # Metropolis fork
+    METROPOLIS_FORK_BLKNUM=9999999,
+    METROPOLIS_ENTRY_POINT=2 ** 160 - 1,
+    METROPOLIS_STATEROOT_STORE=0x10,
+    METROPOLIS_BLOCKHASH_STORE=0x20,
+    METROPOLIS_WRAPAROUND=65536,
+    METROPOLIS_GETTER_CODE='6000355460205260206020f3'.decode('hex'),
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32