Merge pull request #383 from ethereum/metropolis_config

Add metropolis config

Author: konradkonrad

ethereum/blocks.py

@@ -73,12 +73,11 @@ def calc_difficulty(parent, timestamp):
     o = int(max(parent.difficulty + offset * sign, min(parent.difficulty, config['MIN_DIFF'])))
     period_count = (parent.number + 1) // config['EXPDIFF_PERIOD']
     if period_count >= config['EXPDIFF_FREE_PERIODS']:
-        o = max(o + 2**(period_count - config['EXPDIFF_FREE_PERIODS']), config['MIN_DIFF'])
+        o = max(o + 2 ** (period_count - config['EXPDIFF_FREE_PERIODS']), config['MIN_DIFF'])
     # print('Calculating difficulty of block %d, timestamp difference %d, parent diff %d, child diff %d' % (parent.number + 1, timestamp - parent.timestamp, parent.difficulty, o))
     return o
 
 
-
 class Account(rlp.Serializable):
 
     """An Ethereum account.
@@ -396,7 +395,7 @@ def __init__(self, header, transaction_list=[], uncles=[], env=None,
                  parent=None, making=False):
         assert isinstance(env, Env), "No Env object given"
         assert isinstance(env.db, BaseDB), "No database object given"
-        self.env = env # don't re-set after init
+        self.env = env  # don't re-set after init
         self.db = env.db
         self.config = env.config
 
@@ -442,7 +441,7 @@ def __init__(self, header, transaction_list=[], uncles=[], env=None,
                 raise ValueError("Gas used exceeds gas limit")
             if self.timestamp <= parent.header.timestamp:
                 raise ValueError("Timestamp equal to or before parent")
-            if self.timestamp >= 2**256:
+            if self.timestamp >= 2 ** 256:
                 raise ValueError("Timestamp waaaaaaaaaaayy too large")
 
         for uncle in uncles:
@@ -477,6 +476,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()
@@ -530,7 +530,7 @@ def must_le(what, a, b):
         if not self.check_fields():
             raise ValueError("Block is invalid")
         if len(to_string(self.header.extra_data)) > self.config['MAX_EXTRADATA_LENGTH']:
-            raise ValueError("Extra data cannot exceed %d bytes" \
+            raise ValueError("Extra data cannot exceed %d bytes"
                              % default_config['MAX_EXTRADATA_LENGTH'])
         if self.header.coinbase == '':
             raise ValueError("Coinbase cannot be empty address")
@@ -694,7 +694,7 @@ def get_ancestor_list(self, n):
         if n == 0 or self.header.number == 0:
             return []
         p = self.get_parent()
-        return [p] + p.get_ancestor_list(n-1)
+        return [p] + p.get_ancestor_list(n - 1)
 
     def get_ancestor_hash(self, n):
         assert n > 0
@@ -705,7 +705,7 @@ def get_ancestor_hash(self, n):
                 self.ancestor_hashes.append(
                     get_block(self.env,
                               self.ancestor_hashes[-1]).get_parent().hash)
-        return self.ancestor_hashes[n-1]
+        return self.ancestor_hashes[n - 1]
 
     # def get_ancestor(self, n):
     #     return self.get_block(self.get_ancestor_hash(n))
@@ -784,7 +784,7 @@ def _delta_item(self, address, param, value):
         new_value = self._get_acct_item(address, param) + value
         if new_value < 0:
             return False
-        self._set_acct_item(address, param, new_value % 2**256)
+        self._set_acct_item(address, param, new_value % 2 ** 256)
         return True
 
     def mk_transaction_receipt(self, tx):
@@ -1162,6 +1162,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

@@ -1,3 +1,4 @@
+from rlp.utils import decode_hex
 from ethereum import utils
 from ethereum.db import BaseDB
 
@@ -46,6 +47,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=decode_hex('6000355460205260206020f3'),
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32