Merge PR #397

This is a manual merge of #397.

Author: konradkonrad

ethereum/blocks.py

@@ -1171,14 +1171,6 @@ 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"])
@@ -1189,6 +1181,9 @@ def initialize(self, parent):
             self.set_storage_data(utils.normalize_address(self.config["METROPOLIS_BLOCKHASH_STORE"]),
                                   self.number % self.config["METROPOLIS_WRAPAROUND"],
                                   self.prevhash)
+        if self.number == self.config['DAO_FORK_BLKNUM']:
+            for acct in self.config['CHILD_DAO_LIST']:
+                self.transfer_value(acct, self.config['DAO_WITHDRAWER'], self.get_balance(acct))
 
     def finalize(self):
         """Apply rewards and commit."""

ethereum/child_dao_list.py

@@ -0,0 +1,12 @@
+from ethereum.utils import mk_contract_address, encode_hex
+source = '0x4a574510c7014e4ae985403536074abe582adfc8'
+
+L = []
+# DAO
+L.append('0xbb9bc244d798123fde783fcc1c72d3bb8c189413')
+# DAO extrabalance
+L.append('0x807640a13483f8ac783c557fcdf27be11ea4ac7a')
+# child DAOs (created by DAO creator)
+L.extend([b'0x' + encode_hex(mk_contract_address(source, i)) for i in range(1, 58)])
+# child extrabalances
+L.extend([b'0x' + encode_hex(mk_contract_address(mk_contract_address(source, i), 0)) for i in range(1, 58)])

ethereum/config.py

@@ -2,6 +2,8 @@
 
 from ethereum import utils
 from ethereum.db import BaseDB
+from ethereum.child_dao_list import L as child_dao_list
+
 
 default_config = dict(
     # Genesis block difficulty
@@ -57,10 +59,9 @@
     METROPOLIS_GETTER_CODE=decode_hex('6000355460205260206020f3'),
     METROPOLIS_DIFF_ADJUSTMENT_CUTOFF=9,
     # DAO fork
-    DAO_FORK_BLKNUM = 9999998,
-    DAO_ADDRESS_LIST = [],
-    DAO_MAIN_ADDR = '0xbb9bc244d798123fde783fcc1c72d3bb8c189413',
-    DAO_NEWCODE = ''
+    DAO_FORK_BLKNUM=1920000,
+    CHILD_DAO_LIST=map(utils.normalize_address, child_dao_list),
+    DAO_WITHDRAWER=utils.normalize_address('0xbf4ed7b27f1d666546e30d74d50d173d20bca754'),
 )
 assert default_config['NEPHEW_REWARD'] == \
     default_config['BLOCK_REWARD'] // 32

ethereum/tests/test_blocks.py

@@ -1,11 +1,8 @@
-import pytest
-
 from ethereum import blocks, utils, db
 from ethereum.exceptions import VerificationFailed, InvalidTransaction
 import rlp
 from rlp.utils import decode_hex, encode_hex, str_to_bytes
 from rlp import DecodingError, DeserializationError
-import os
 import sys
 import ethereum.testutils as testutils
 import copy
@@ -44,7 +41,7 @@ def valueconv(k, v):
     return v
 
 
-def run_block_test(params, config_overrides = {}):
+def run_block_test(params, config_overrides={}):
     b = blocks.genesis(env, start_alloc=params["pre"])
     gbh = params["genesisBlockHeader"]
     b.bloom = utils.scanners['int256b'](gbh["bloom"])
@@ -109,7 +106,10 @@ def run_block_test(params, config_overrides = {}):
 
 
 def test_block(filename, testname, testdata):
-    run_block_test(testdata, {'HOMESTEAD_FORK_BLKNUM':0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000 })
+    run_block_test(testdata, {
+        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
+        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000
+    })
 
 
 excludes = {
@@ -137,14 +137,16 @@ def main():
                     print("Testing: %s %s" % (filename, testname))
                     run_block_test(testdata, {
                         'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename
-                        else 1000000})
+                        else 1000000,
+                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
     else:
         for filename, tests in list(fixtures.items()):
             for testname, testdata in list(tests.items()):
                 if (filename.split('/')[-1], testname) not in excludes:
                     print("Testing: %s %s" % (filename, testname))
                     run_block_test(testdata, {
-                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000})
+                        'HOMESTEAD_FORK_BLKNUM': 0 if 'Homestead' in filename else 5 if 'TestNetwork' in filename else 1000000,
+                        'DAO_FORK_BLKNUM': 8 if 'bcTheDaoTest' in filename else 1920000})
 
 
 if __name__ == '__main__':