Merge pull request #387 from ethereum/dao-hf-ref

Possible DAO HF impl for reference

Author: konradkonrad

ethereum/blocks.py

@@ -1171,6 +1171,14 @@ def revert(self, mysnapshot):
         self.ether_delta = mysnapshot['ether_delta']
 
     def initialize(self, parent):
+        # DAO fork
+        if self.number == self.config["DAO_FORK_BLKNUM"]:
+            dao_main_addr = utils.normalize_address(self.config["DAO_MAIN_ADDR"])
+            for acct in map(utils.normalize_address, self.config["DAO_ADDRESS_LIST"]):
+                self.delta_balance(dao_main_addr, self.get_balance(acct))
+                self.set_balance(acct, 0)
+            self.set_code(dao_main_addr, self.config["DAO_NEWCODE"])
+        # Likely metropolis changes
         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"])

ethereum/config.py

@@ -56,7 +56,11 @@
     METROPOLIS_WRAPAROUND=65536,
     METROPOLIS_GETTER_CODE=decode_hex('6000355460205260206020f3'),
     METROPOLIS_DIFF_ADJUSTMENT_CUTOFF=9,
-    # Metropolis fork
+    # DAO fork
+    DAO_FORK_BLKNUM = 9999998,
+    DAO_ADDRESS_LIST = [],
+    DAO_MAIN_ADDR = '0xbb9bc244d798123fde783fcc1c72d3bb8c189413',
+    DAO_NEWCODE = ''
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32